From 3633bcc99aedda5d9ea36c143fa339139c763d3e Mon Sep 17 00:00:00 2001
From: "Matthias P. Braendli" <matthias.braendli@mpb.li>
Date: Fri, 6 Jan 2017 11:35:35 +0100
Subject: Replace EDI-to-ETI converter with a dedicated EDI source

---
 src/FrameMultiplexer.h | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

(limited to 'src/FrameMultiplexer.h')

diff --git a/src/FrameMultiplexer.h b/src/FrameMultiplexer.h
index e01f4bf..680cdc7 100644
--- a/src/FrameMultiplexer.h
+++ b/src/FrameMultiplexer.h
@@ -2,7 +2,7 @@
    Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 Her Majesty
    the Queen in Right of Canada (Communications Research Center Canada)
 
-   Copyright (C) 2016
+   Copyright (C) 2017
    Matthias P. Braendli, matthias.braendli@mpb.li
 
     http://opendigitalradio.org
@@ -33,6 +33,7 @@
 
 #include "ModPlugin.h"
 #include "SubchannelSource.h"
+#include "EtiReader.h"
 #include <memory>
 
 #include <sys/types.h>
@@ -42,19 +43,13 @@ class FrameMultiplexer : public ModMux
 {
 public:
     FrameMultiplexer(
-            size_t frameSize,
-            const std::vector<std::shared_ptr<SubchannelSource> >& subchannels);
-    virtual ~FrameMultiplexer();
-    FrameMultiplexer(const FrameMultiplexer&) = delete;
-    FrameMultiplexer& operator=(const FrameMultiplexer&) = delete;
-
+            const EtiSource& etiSource);
 
     int process(std::vector<Buffer*> dataIn, Buffer* dataOut);
     const char* name() { return "FrameMultiplexer"; }
 
 protected:
-    size_t d_frameSize;
-    const std::vector<std::shared_ptr<SubchannelSource> >& mySubchannels;
+    const EtiSource& m_etiSource;
 };
 
 
-- 
cgit v1.2.3