diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2017-08-06 11:39:03 +0200 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2017-08-06 11:39:03 +0200 |
| commit | 56047e1f068b2ea4386cabd73bc0f29f55068250 (patch) | |
| tree | 519dc3cca366faae17d147491a1119e983fe1288 /src/DabModulator.cpp | |
| parent | eaa257925ddef888402e1b601dda45646ad6a373 (diff) | |
| download | dabmod-56047e1f068b2ea4386cabd73bc0f29f55068250.tar.gz dabmod-56047e1f068b2ea4386cabd73bc0f29f55068250.tar.bz2 dabmod-56047e1f068b2ea4386cabd73bc0f29f55068250.zip | |
Remove raw flowgraph pointer from DabModulator
Diffstat (limited to 'src/DabModulator.cpp')
| -rw-r--r-- | src/DabModulator.cpp | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/DabModulator.cpp b/src/DabModulator.cpp index 4e0bc33..bebbedd 100644 --- a/src/DabModulator.cpp +++ b/src/DabModulator.cpp @@ -74,7 +74,7 @@ DabModulator::DabModulator( myNormalise(normalise), myGainmodeVariance(gainmodeVariance), myEtiSource(etiSource), - myFlowgraph(NULL), + myFlowgraph(), myFilterTapsFilename(filterTapsFilename), myPolyCoefFilename(polyCoefFilename), myTiiConfig(tiiConfig) @@ -90,14 +90,6 @@ DabModulator::DabModulator( } -DabModulator::~DabModulator() -{ - PDEBUG("DabModulator::~DabModulator() @ %p\n", this); - - delete myFlowgraph; -} - - void DabModulator::setMode(unsigned mode) { switch (mode) { @@ -145,7 +137,7 @@ int DabModulator::process(Buffer* dataOut) PDEBUG("DabModulator::process(dataOut: %p)\n", dataOut); - if (myFlowgraph == NULL) { + if (not myFlowgraph) { unsigned mode = myEtiSource.getMode(); if (myDabMode != 0) { mode = myDabMode; @@ -154,7 +146,7 @@ int DabModulator::process(Buffer* dataOut) } setMode(mode); - myFlowgraph = new Flowgraph(); + myFlowgraph = make_shared<Flowgraph>(); //////////////////////////////////////////////////////////////// // CIF data initialisation //////////////////////////////////////////////////////////////// |