diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2015-02-22 20:52:20 +0100 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2015-02-22 20:52:20 +0100 |
| commit | 7cee56f37001640b88f4ac1249624c9c9758e844 (patch) | |
| tree | c1e4b172f53a51b79f35fc6736a5a4124c19cf5e /src/FrameMultiplexer.cpp | |
| parent | 7d7cbc19bc5509aa9fb8fb430132fe82855cf8c4 (diff) | |
| download | dabmod-7cee56f37001640b88f4ac1249624c9c9758e844.tar.gz dabmod-7cee56f37001640b88f4ac1249624c9c9758e844.tar.bz2 dabmod-7cee56f37001640b88f4ac1249624c9c9758e844.zip | |
Replace pointers by shared_ptr in all flowgraph
Diffstat (limited to 'src/FrameMultiplexer.cpp')
| -rw-r--r-- | src/FrameMultiplexer.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/FrameMultiplexer.cpp b/src/FrameMultiplexer.cpp index c5e58b7..843f72d 100644 --- a/src/FrameMultiplexer.cpp +++ b/src/FrameMultiplexer.cpp @@ -30,8 +30,11 @@ typedef std::complex<float> complexf; +using namespace boost; -FrameMultiplexer::FrameMultiplexer(size_t framesize, const std::vector<SubchannelSource*>* subchannels) : +FrameMultiplexer::FrameMultiplexer( + size_t framesize, + const std::vector<shared_ptr<SubchannelSource> >* subchannels) : ModMux(ModFormat(framesize), ModFormat(framesize)), d_frameSize(framesize), mySubchannels(subchannels) @@ -76,7 +79,7 @@ int FrameMultiplexer::process(std::vector<Buffer*> dataIn, Buffer* dataOut) ++in; // Write subchannel assert(mySubchannels->size() == dataIn.size() - 1); - std::vector<SubchannelSource*>::const_iterator subchannel = + std::vector<shared_ptr<SubchannelSource> >::const_iterator subchannel = mySubchannels->begin(); while (in != dataIn.end()) { assert((*subchannel)->framesizeCu() * 8 == (*in)->getLength()); @@ -88,3 +91,4 @@ int FrameMultiplexer::process(std::vector<Buffer*> dataIn, Buffer* dataOut) return dataOut->getLength(); } + |