diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2018-04-11 15:54:34 +0200 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2018-04-11 15:54:34 +0200 |
| commit | 00d7d4141614ef295d8bbfeece0e9dc11152a6ae (patch) | |
| tree | ca6825ef236a483404c05973974d5df5b6a34ce0 /src/DabMod.cpp | |
| parent | a1bd2965c58806dd9c2d0323b1f97deeff2f048f (diff) | |
| parent | 9a1f5fa40020247ed25fbe553d2ce71fa53d9e95 (diff) | |
| download | dabmod-00d7d4141614ef295d8bbfeece0e9dc11152a6ae.tar.gz dabmod-00d7d4141614ef295d8bbfeece0e9dc11152a6ae.tar.bz2 dabmod-00d7d4141614ef295d8bbfeece0e9dc11152a6ae.zip | |
Merge branch 'next' into easydabv3
Diffstat (limited to 'src/DabMod.cpp')
| -rw-r--r-- | src/DabMod.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/DabMod.cpp b/src/DabMod.cpp index f384e78..0d4a180 100644 --- a/src/DabMod.cpp +++ b/src/DabMod.cpp @@ -383,6 +383,7 @@ int launch_modulator(int argc, char* argv[]) #else auto inputZeroMQReader = make_shared<InputZeroMQReader>(); inputZeroMQReader->Open(mod_settings.inputName, mod_settings.inputMaxFramesQueued); + rcs.enrol(inputZeroMQReader.get()); inputReader = inputZeroMQReader; #endif } @@ -444,11 +445,13 @@ int launch_modulator(int argc, char* argv[]) } } #if defined(HAVE_ZEROMQ) - else if (dynamic_pointer_cast<InputZeroMQReader>(inputReader)) { + else if (auto in_zmq = dynamic_pointer_cast<InputZeroMQReader>(inputReader)) { run_again = true; // Create a new input reader + rcs.remove_controllable(in_zmq.get()); auto inputZeroMQReader = make_shared<InputZeroMQReader>(); inputZeroMQReader->Open(mod_settings.inputName, mod_settings.inputMaxFramesQueued); + rcs.enrol(inputZeroMQReader.get()); inputReader = inputZeroMQReader; } #endif |