aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2015-03-21 16:11:33 +0100
committerMatthias P. Braendli <matthias.braendli@mpb.li>2015-03-21 16:11:33 +0100
commit4bacc6c70383c20ade0ee6fd2bcc9d1934e925bb (patch)
treeda91255653885a87c40e5c380e3e2db2c068ee38
parentabcb1a86381195ffb382297233158da2fa4aacc7 (diff)
downloaddabmux-4bacc6c70383c20ade0ee6fd2bcc9d1934e925bb.tar.gz
dabmux-4bacc6c70383c20ade0ee6fd2bcc9d1934e925bb.tar.bz2
dabmux-4bacc6c70383c20ade0ee6fd2bcc9d1934e925bb.zip
Fix -e option
-rw-r--r--src/DabMux.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/DabMux.cpp b/src/DabMux.cpp
index cbbd612..8ef30ba 100644
--- a/src/DabMux.cpp
+++ b/src/DabMux.cpp
@@ -380,7 +380,6 @@ int main(int argc, char *argv[])
throw MuxInitException();
}
}
-#if ENABLE_CMDLINE_OPTIONS
else if (argc > 1 && strncmp(argv[1], "-e", 2) == 0) { // use external config file
try {
@@ -391,9 +390,10 @@ int main(int argc, char *argv[])
string conf_file = argv[2];
- parse_configfile(conf_file, outputs, ensemble, &enableTist, &FICL,
- &factumAnalyzer, &limit, &rc, &mgmtserverport, &edi_conf);
+ read_info(conf_file, pt);
+ parse_ptree(pt, outputs, ensemble, &enableTist, &FICL,
+ &factumAnalyzer, &limit, &rc, &mgmtserverport, &edi_conf);
}
catch (runtime_error &e) {
etiLog.log(error, "Configuration file parsing error: %s\n",
@@ -401,6 +401,7 @@ int main(int argc, char *argv[])
throw MuxInitException();
}
}
+#if ENABLE_CMDLINE_OPTIONS
else {
if (!parse_cmdline(argv, argc, outputs, ensemble, &enableTist, &FICL,
&factumAnalyzer, &limit)) {