summaryrefslogtreecommitdiffstats
path: root/src/dabplus-enc.cpp
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2016-03-04 21:02:28 +0100
committerMatthias P. Braendli <matthias.braendli@mpb.li>2016-03-04 21:02:28 +0100
commit9379701fa0b8aabceef3e67e351a9327e8dbe658 (patch)
treee42ef452a4a50882598a4fa4539972e0ff2e9955 /src/dabplus-enc.cpp
parent4da379804526d4ceabd2f9cc8da614744438eabd (diff)
parent61b5ba527efef75565336dfa87f0a2432dd5f50b (diff)
downloadODR-AudioEnc-9379701fa0b8aabceef3e67e351a9327e8dbe658.tar.gz
ODR-AudioEnc-9379701fa0b8aabceef3e67e351a9327e8dbe658.tar.bz2
ODR-AudioEnc-9379701fa0b8aabceef3e67e351a9327e8dbe658.zip
Merge branch 'next' into libtoolame
Diffstat (limited to 'src/dabplus-enc.cpp')
-rw-r--r--src/dabplus-enc.cpp13
1 files changed, 10 insertions, 3 deletions
diff --git a/src/dabplus-enc.cpp b/src/dabplus-enc.cpp
index 42a58f9..5c2f1cb 100644
--- a/src/dabplus-enc.cpp
+++ b/src/dabplus-enc.cpp
@@ -120,6 +120,8 @@ void usage(const char* name) {
" much too loud.\n"
" -V Increase the VLC verbosity by one (can be given \n"
" multiple times)\n"
+ " -L OPTION Give an additional options to VLC (can be given\n"
+ " multiple times)\n"
" -w, --write-icy-text=filename Write the ICY Text into the file, so that mot-encoder can read it.\n"
#else
" The VLC input was disabled at compile-time\n"
@@ -281,6 +283,7 @@ int main(int argc, char *argv[])
std::string vlc_icytext_file = "";
std::string vlc_gain = "";
std::string vlc_cache = "";
+ std::vector<std::string> vlc_additional_opts;
unsigned verbosity = 0;
// For the file output
@@ -343,6 +346,7 @@ int main(int argc, char *argv[])
{"vlc-cache", required_argument, 0, 'C'},
{"vlc-gain", required_argument, 0, 'g'},
{"vlc-uri", required_argument, 0, 'v'},
+ {"vlc-opt", required_argument, 0, 'L'},
{"write-icy-text", required_argument, 0, 'w'},
{"aaclc", no_argument, 0, 0 },
{"dab", no_argument, 0, 'a'},
@@ -377,7 +381,7 @@ int main(int argc, char *argv[])
int index;
while(ch != -1) {
- ch = getopt_long(argc, argv, "aAhDlVb:c:f:i:j:k:o:r:d:p:P:s:v:w:g:C:", longopts, &index);
+ ch = getopt_long(argc, argv, "aAhDlVb:c:f:i:j:k:L:o:r:d:p:P:s:v:w:g:C:", longopts, &index);
switch (ch) {
case 0: // AAC-LC
aot = AOT_DABPLUS_AAC_LC;
@@ -472,6 +476,9 @@ int main(int argc, char *argv[])
case 'C':
vlc_cache = optarg;
break;
+ case 'L':
+ vlc_additional_opts.push_back(optarg);
+ break;
#else
case 'v':
case 'w':
@@ -711,8 +718,8 @@ int main(int argc, char *argv[])
JackInput jack_in(jack_name, channels, sample_rate, queue);
#endif
#if HAVE_VLC
- VLCInputDirect vlc_in_direct(vlc_uri, sample_rate, channels, verbosity, vlc_gain, vlc_cache);
- VLCInputThreaded vlc_in_threaded(vlc_uri, sample_rate, channels, verbosity, vlc_gain, vlc_cache, queue);
+ VLCInputDirect vlc_in_direct(vlc_uri, sample_rate, channels, verbosity, vlc_gain, vlc_cache, vlc_additional_opts);
+ VLCInputThreaded vlc_in_threaded(vlc_uri, sample_rate, channels, verbosity, vlc_gain, vlc_cache, vlc_additional_opts, queue);
#endif
if (infile) {