From 3cc49bdb15e5923adb5c0532d2d6bdd800481058 Mon Sep 17 00:00:00 2001
From: vsonnier <vsonnier@users.noreply.github.com>
Date: Mon, 16 Oct 2017 18:44:20 +0200
Subject: [PATCH] Fixes #581 ?: Do not set std::shared_ptr to nullptr in
 constructors (useless anyway) since they could be wrongly interpreted

---
 src/CubicSDR.h                | 12 ++++++------
 src/demod/DemodulatorThread.h |  8 ++++----
 src/process/VisualProcessor.h |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/CubicSDR.h b/src/CubicSDR.h
index c167509..c714ad7 100644
--- a/src/CubicSDR.h
+++ b/src/CubicSDR.h
@@ -202,12 +202,12 @@ private:
     SpectrumVisualDataThread *spectrumVisualThread = nullptr;
     SpectrumVisualDataThread *demodVisualThread = nullptr;
 
-    SDRThreadIQDataQueuePtr pipeSDRIQData = nullptr;
-    DemodulatorThreadInputQueuePtr pipeIQVisualData = nullptr;
-    DemodulatorThreadOutputQueuePtr pipeAudioVisualData = nullptr;
-    DemodulatorThreadInputQueuePtr pipeDemodIQVisualData = nullptr;
-    DemodulatorThreadInputQueuePtr pipeWaterfallIQVisualData = nullptr;
-    DemodulatorThreadInputQueuePtr pipeActiveDemodIQVisualData = nullptr;
+    SDRThreadIQDataQueuePtr pipeSDRIQData;
+    DemodulatorThreadInputQueuePtr pipeIQVisualData;
+    DemodulatorThreadOutputQueuePtr pipeAudioVisualData;
+    DemodulatorThreadInputQueuePtr pipeDemodIQVisualData;
+    DemodulatorThreadInputQueuePtr pipeWaterfallIQVisualData;
+    DemodulatorThreadInputQueuePtr pipeActiveDemodIQVisualData;
 
     ScopeVisualProcessor scopeProcessor;
     
diff --git a/src/demod/DemodulatorThread.h b/src/demod/DemodulatorThread.h
index bc4e2b0..836866c 100644
--- a/src/demod/DemodulatorThread.h
+++ b/src/demod/DemodulatorThread.h
@@ -62,10 +62,10 @@ protected:
     Modem *cModem = nullptr;
     ModemKit *cModemKit = nullptr;
     
-    DemodulatorThreadPostInputQueuePtr iqInputQueue = nullptr;
-    AudioThreadInputQueuePtr audioOutputQueue = nullptr;
-    DemodulatorThreadOutputQueuePtr audioVisOutputQueue = nullptr;
-    DemodulatorThreadControlCommandQueuePtr threadQueueControl = nullptr;
+    DemodulatorThreadPostInputQueuePtr iqInputQueue;
+    AudioThreadInputQueuePtr audioOutputQueue;
+    DemodulatorThreadOutputQueuePtr audioVisOutputQueue;
+    DemodulatorThreadControlCommandQueuePtr threadQueueControl;
 
     //protects the audioVisOutputQueue dynamic binding change at runtime (in DemodulatorMgr)
     std::mutex m_mutexAudioVisOutputQueue;
diff --git a/src/process/VisualProcessor.h b/src/process/VisualProcessor.h
index bdc5c2e..94bb9c7 100644
--- a/src/process/VisualProcessor.h
+++ b/src/process/VisualProcessor.h
@@ -146,7 +146,7 @@ protected:
     }
 
     //the incoming data queue 
-    VisualInputQueueTypePtr input = nullptr;
+    VisualInputQueueTypePtr input;
     
     //the n-outputs where to process()-ed data is distribute()-ed.
     std::vector<VisualOutputQueueTypePtr> outputs;