aboutsummaryrefslogtreecommitdiffstats
path: root/src/ConfigParser.cpp
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2016-11-04 14:57:16 +0100
committerMatthias P. Braendli <matthias.braendli@mpb.li>2016-11-04 14:57:16 +0100
commit7405d574963abb37732de8a90dd9e42174e0410f (patch)
treef8d195c4b8d72cc0d854ae73e222b4df782e284e /src/ConfigParser.cpp
parent8db328c61832a92bf3f7641061b68767141104f3 (diff)
downloaddabmux-7405d574963abb37732de8a90dd9e42174e0410f.tar.gz
dabmux-7405d574963abb37732de8a90dd9e42174e0410f.tar.bz2
dabmux-7405d574963abb37732de8a90dd9e42174e0410f.zip
Use RawFile for DAB+ and for data
Diffstat (limited to 'src/ConfigParser.cpp')
-rw-r--r--src/ConfigParser.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/ConfigParser.cpp b/src/ConfigParser.cpp
index ddcb9ed..a311d63 100644
--- a/src/ConfigParser.cpp
+++ b/src/ConfigParser.cpp
@@ -936,7 +936,7 @@ static void setup_subchannel_from_ptree(DabSubchannel* subchan,
subchan->input = make_shared<Inputs::MPEGFile>();
}
else if (type == "dabplus") {
- subchan->input = make_shared<Inputs::DABPlusFile>();
+ subchan->input = make_shared<Inputs::RawFile>();
}
else {
throw logic_error("Incomplete handling of file input");
@@ -982,10 +982,8 @@ static void setup_subchannel_from_ptree(DabSubchannel* subchan,
else if (type == "data") {
if (proto == "udp") {
subchan->input = make_shared<Inputs::Udp>();
- } else if (proto == "file") {
- // TODO
- } else if (proto == "fifo") {
- // TODO
+ } else if (proto == "file" or proto == "fifo") {
+ subchan->input = make_shared<Inputs::RawFile>();
} else {
stringstream ss;
ss << "Subchannel with uid " << subchanuid <<