summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2016-11-04 15:09:29 +0100
committerMatthias P. Braendli <matthias.braendli@mpb.li>2016-11-04 15:11:25 +0100
commit076b370ddcf6f8d69bd728dd5ae7b18b18a77b23 (patch)
treed389a3d6a510e86c2bd15968e095a1ad3668e3f7 /src
parent7405d574963abb37732de8a90dd9e42174e0410f (diff)
downloaddabmux-076b370ddcf6f8d69bd728dd5ae7b18b18a77b23.tar.gz
dabmux-076b370ddcf6f8d69bd728dd5ae7b18b18a77b23.tar.bz2
dabmux-076b370ddcf6f8d69bd728dd5ae7b18b18a77b23.zip
Treat DMB input as data, update TODO accordingly
Diffstat (limited to 'src')
-rw-r--r--src/ConfigParser.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/ConfigParser.cpp b/src/ConfigParser.cpp
index a311d63..3167d49 100644
--- a/src/ConfigParser.cpp
+++ b/src/ConfigParser.cpp
@@ -979,7 +979,7 @@ static void setup_subchannel_from_ptree(DabSubchannel* subchan,
subchan->type = subchannel_type_t::DataDmb;
subchan->bitrate = DEFAULT_DATA_BITRATE;
}
- else if (type == "data") {
+ else if (type == "data" or type == "dmb") {
if (proto == "udp") {
subchan->input = make_shared<Inputs::Udp>();
} else if (proto == "file" or proto == "fifo") {
@@ -994,6 +994,14 @@ static void setup_subchannel_from_ptree(DabSubchannel* subchan,
subchan->type = subchannel_type_t::DataDmb;
subchan->bitrate = DEFAULT_DATA_BITRATE;
+
+ if (type == "dmb") {
+ /* The old dmb input took care of interleaving and Reed-Solomon encoding. This
+ * code is unported.
+ * See dabInputDmbFile.cpp
+ */
+ etiLog.level(warn) << "uid " << subchanuid << " of type Dmb uses RAW input";
+ }
}
else {
stringstream ss;