aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2015-02-21 22:51:19 +0100
committerMatthias P. Braendli <matthias.braendli@mpb.li>2015-02-21 22:51:19 +0100
commita225d3aeac3bff0669b9eac7615364c3dd1650bc (patch)
tree66393645a60347fa992667902d3c7f21c2beddc9 /src
parentd4797ace7fcee41d9c9cdf35a3cac54e4c0235db (diff)
downloaddabmux-a225d3aeac3bff0669b9eac7615364c3dd1650bc.tar.gz
dabmux-a225d3aeac3bff0669b9eac7615364c3dd1650bc.tar.bz2
dabmux-a225d3aeac3bff0669b9eac7615364c3dd1650bc.zip
Fix incorrect inputoperations for DAB file input
Diffstat (limited to 'src')
-rw-r--r--src/ParserConfigfile.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/ParserConfigfile.cpp b/src/ParserConfigfile.cpp
index c94a370..0a76c9f 100644
--- a/src/ParserConfigfile.cpp
+++ b/src/ParserConfigfile.cpp
@@ -3,9 +3,11 @@
2011, 2012 Her Majesty the Queen in Right of Canada (Communications
Research Center Canada)
- Copyright (C) 2014
+ Copyright (C) 2014, 2015
Matthias P. Braendli, matthias.braendli@mpb.li
+ http://www.opendigitalradio.org
+
The command-line parser reads settings from a configuration file
whose definition is given in doc/example.config
*/
@@ -616,7 +618,7 @@ void setup_subchannel_from_ptree(dabSubchannel* subchan,
if (0) {
#if defined(HAVE_INPUT_FILE)
} else if (strcmp(subchan->inputProto, "file") == 0) {
- operations = dabInputDabplusFileOperations;
+ operations = dabInputMpegFileOperations;
#endif // defined(HAVE_INPUT_FILE)
#if defined(HAVE_INPUT_ZEROMQ)
}
@@ -922,8 +924,7 @@ void setup_subchannel_from_ptree(dabSubchannel* subchan,
case 0:
if (operations == dabInputMpegFileOperations) {
operations = dabInputMpegFifoOperations;
- } else if (operations ==
- dabInputDabplusFileOperations) {
+ } else if (operations == dabInputDabplusFileOperations) {
operations = dabInputDabplusFifoOperations;
} else {
stringstream ss;