comicsansg/CubicSDR
comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2025-09-06 07:07:48 -04:00
Code Issues Projects Releases Wiki Activity

Fixes #581 ?: Do not set std::shared_ptr to nullptr in constructors (useless anyway) since they could be wrongly interpreted

Browse Source
This commit is contained in:
vsonnier 2017-10-16 18:44:20 +02:00
parent 6019207bd4
commit 3cc49bdb15
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/CubicSDR.h
View File

@ -202,12 +202,12 @@ private:
SpectrumVisualDataThread *spectrumVisualThread = nullptr; SpectrumVisualDataThread *spectrumVisualThread = nullptr;
SpectrumVisualDataThread *demodVisualThread = nullptr; SpectrumVisualDataThread *demodVisualThread = nullptr;
SDRThreadIQDataQueuePtr pipeSDRIQData = nullptr; SDRThreadIQDataQueuePtr pipeSDRIQData;
DemodulatorThreadInputQueuePtr pipeIQVisualData = nullptr; DemodulatorThreadInputQueuePtr pipeIQVisualData;
DemodulatorThreadOutputQueuePtr pipeAudioVisualData = nullptr; DemodulatorThreadOutputQueuePtr pipeAudioVisualData;
DemodulatorThreadInputQueuePtr pipeDemodIQVisualData = nullptr; DemodulatorThreadInputQueuePtr pipeDemodIQVisualData;
DemodulatorThreadInputQueuePtr pipeWaterfallIQVisualData = nullptr; DemodulatorThreadInputQueuePtr pipeWaterfallIQVisualData;
DemodulatorThreadInputQueuePtr pipeActiveDemodIQVisualData = nullptr; DemodulatorThreadInputQueuePtr pipeActiveDemodIQVisualData;
ScopeVisualProcessor scopeProcessor; ScopeVisualProcessor scopeProcessor;

8
src/demod/DemodulatorThread.h
View File

@ -62,10 +62,10 @@ protected:
Modem *cModem = nullptr; Modem *cModem = nullptr;
ModemKit *cModemKit = nullptr; ModemKit *cModemKit = nullptr;
DemodulatorThreadPostInputQueuePtr iqInputQueue = nullptr; DemodulatorThreadPostInputQueuePtr iqInputQueue;
AudioThreadInputQueuePtr audioOutputQueue = nullptr; AudioThreadInputQueuePtr audioOutputQueue;
DemodulatorThreadOutputQueuePtr audioVisOutputQueue = nullptr; DemodulatorThreadOutputQueuePtr audioVisOutputQueue;
DemodulatorThreadControlCommandQueuePtr threadQueueControl = nullptr; DemodulatorThreadControlCommandQueuePtr threadQueueControl;
//protects the audioVisOutputQueue dynamic binding change at runtime (in DemodulatorMgr) //protects the audioVisOutputQueue dynamic binding change at runtime (in DemodulatorMgr)
std::mutex m_mutexAudioVisOutputQueue; std::mutex m_mutexAudioVisOutputQueue;

2
src/process/VisualProcessor.h
View File

@ -146,7 +146,7 @@ protected:
} }
//the incoming data queue //the incoming data queue
VisualInputQueueTypePtr input = nullptr; VisualInputQueueTypePtr input;
//the n-outputs where to process()-ed data is distribute()-ed. //the n-outputs where to process()-ed data is distribute()-ed.
std::vector<VisualOutputQueueTypePtr> outputs; std::vector<VisualOutputQueueTypePtr> outputs;