More terminate()-and-flush calls missed before

src/demod/DemodulatorThread.h

@@ -25,8 +25,8 @@ public:
 
     void onBindOutput(std::string name, ThreadQueueBasePtr threadQueue);
     
-    void run();
+    virtual void run();
-    void terminate();
+    virtual void terminate();
     
     void setMuted(bool state);
     bool isMuted();

src/process/FFTVisualDataThread.cpp

@@ -84,3 +84,9 @@ void FFTVisualDataThread::run() {
 //    std::cout << "FFT visual data thread done." << std::endl;
 }
 
+void FFTVisualDataThread::terminate() {
+    IOThread::terminate();
+    fftDistrib.flushQueues();
+    wproc.flushQueues();
+}
+

src/process/FFTVisualDataThread.h

@@ -18,6 +18,8 @@ public:
     
     virtual void run();
 
+    virtual void terminate();
+    
 protected:
     FFTDataDistributor fftDistrib;
     DemodulatorThreadInputQueuePtr fftQueue = std::make_shared<DemodulatorThreadInputQueue>();

src/process/SpectrumVisualDataThread.cpp

@@ -28,3 +28,7 @@ void SpectrumVisualDataThread::run() {
 //    std::cout << "Spectrum visual data thread done." << std::endl;
 }
 
+void SpectrumVisualDataThread::terminate() {
+    IOThread::terminate();
+    sproc.flushQueues();
+}

src/process/SpectrumVisualDataThread.h

@@ -14,6 +14,8 @@ public:
     
     virtual void run();
 
+    virtual void terminate();
+    
 protected:
     SpectrumVisualProcessor sproc;
 };

src/process/VisualProcessor.h

@@ -82,6 +82,17 @@ public:
             outputs.erase(i);
         }
     }
+    //Flush all queues, either input or outputs clearing their accumulated messages.
+    //this is purposefully non-blocking call.
+    void flushQueues() {
+        //DO NOT take the busy_update, we want a never blocking op how imperfect it could be.
+        input->flush();
+
+        for (auto single_output : outputs) {
+
+            single_output->flush();
+        }
+    }
     
     //Call process() repeateadly until all available 'input' data is consumed.
     void run() {

src/sdr/SoapySDRThread.cpp

@@ -564,6 +564,15 @@ void SDRThread::run() {
     std::cout << "SDR thread done." << std::endl;
 }
 
+void SDRThread::terminate() {
+    IOThread::terminate();
+
+    SDRThreadIQDataQueuePtr iqDataOutQueue = std::static_pointer_cast<SDRThreadIQDataQueue>(getOutputQueue("IQDataOutput"));
+
+    if (iqDataOutQueue != nullptr) {
+        iqDataOutQueue->flush();
+    }
+}
 
 SDRDeviceInfo *SDRThread::getDevice() {
     return deviceInfo.load();

src/sdr/SoapySDRThread.h

@@ -61,6 +61,7 @@ public:
     enum SDRThreadState { SDR_THREAD_MESSAGE, SDR_THREAD_INITIALIZED, SDR_THREAD_FAILED};
     
     virtual void run();
+    virtual void terminate();
 
     SDRDeviceInfo *getDevice();
     void setDevice(SDRDeviceInfo *dev);