diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2017-01-06 11:35:35 +0100 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2017-01-06 11:35:35 +0100 |
| commit | 3633bcc99aedda5d9ea36c143fa339139c763d3e (patch) | |
| tree | 6c296bee8cfb6aabb292fe6fc040708c7e4d2e7a /src/FrameMultiplexer.h | |
| parent | 67c82c97dfcfc68d4bd71f5773d21c34c8733c83 (diff) | |
| download | dabmod-3633bcc99aedda5d9ea36c143fa339139c763d3e.tar.gz dabmod-3633bcc99aedda5d9ea36c143fa339139c763d3e.tar.bz2 dabmod-3633bcc99aedda5d9ea36c143fa339139c763d3e.zip | |
Replace EDI-to-ETI converter with a dedicated EDI source
Diffstat (limited to 'src/FrameMultiplexer.h')
| -rw-r--r-- | src/FrameMultiplexer.h | 13 |
1 files changed, 4 insertions, 9 deletions
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; }; |