diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2016-12-26 23:10:57 +0100 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2016-12-26 23:10:57 +0100 |
| commit | 67c82c97dfcfc68d4bd71f5773d21c34c8733c83 (patch) | |
| tree | fe3b9b22293bb5c19eef4b44d30c8cde9b32057b /src/FrameMultiplexer.h | |
| parent | 91d3331d467c05d673f965b9f6eb8d33715df2b7 (diff) | |
| download | dabmod-67c82c97dfcfc68d4bd71f5773d21c34c8733c83.tar.gz dabmod-67c82c97dfcfc68d4bd71f5773d21c34c8733c83.tar.bz2 dabmod-67c82c97dfcfc68d4bd71f5773d21c34c8733c83.zip | |
Use ref instead of pointer for subchannel sources
Diffstat (limited to 'src/FrameMultiplexer.h')
| -rw-r--r-- | src/FrameMultiplexer.h | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/FrameMultiplexer.h b/src/FrameMultiplexer.h index b1dd971..e01f4bf 100644 --- a/src/FrameMultiplexer.h +++ b/src/FrameMultiplexer.h @@ -1,6 +1,11 @@ /* Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 Her Majesty the Queen in Right of Canada (Communications Research Center Canada) + + Copyright (C) 2016 + Matthias P. Braendli, matthias.braendli@mpb.li + + http://opendigitalradio.org */ /* This file is part of ODR-DabMod. @@ -36,11 +41,12 @@ class FrameMultiplexer : public ModMux { public: - FrameMultiplexer(size_t frameSize, - const std::vector<std::shared_ptr<SubchannelSource> >* subchannels); + FrameMultiplexer( + size_t frameSize, + const std::vector<std::shared_ptr<SubchannelSource> >& subchannels); virtual ~FrameMultiplexer(); - FrameMultiplexer(const FrameMultiplexer&); - FrameMultiplexer& operator=(const FrameMultiplexer&); + FrameMultiplexer(const FrameMultiplexer&) = delete; + FrameMultiplexer& operator=(const FrameMultiplexer&) = delete; int process(std::vector<Buffer*> dataIn, Buffer* dataOut); @@ -48,7 +54,7 @@ public: protected: size_t d_frameSize; - const std::vector<std::shared_ptr<SubchannelSource> >* mySubchannels; + const std::vector<std::shared_ptr<SubchannelSource> >& mySubchannels; }; |