From 7405d574963abb37732de8a90dd9e42174e0410f Mon Sep 17 00:00:00 2001
From: "Matthias P. Braendli" <matthias.braendli@mpb.li>
Date: Fri, 4 Nov 2016 14:57:16 +0100
Subject: Use RawFile for DAB+ and for data

---
 src/ConfigParser.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'src/ConfigParser.cpp')

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 <<
-- 
cgit v1.2.3