From 0df2d75e6d407534d5c6762798b57c5223fea3a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Pinkava?= Date: Thu, 15 Sep 2022 21:59:42 +0200 Subject: [PATCH] Replace deprecated QMutex(Recursive) with QRecursiveMutex --- logging/logger.cpp | 7 ++++--- logging/logger.h | 4 ++-- .../beamsteeringcwmod/beamsteeringcwmodbaseband.cpp | 5 ++--- .../beamsteeringcwmod/beamsteeringcwmodbaseband.h | 4 ++-- plugins/channelmimo/doa2/doa2baseband.cpp | 3 +-- plugins/channelmimo/doa2/doa2baseband.h | 4 ++-- .../interferometer/interferometerbaseband.cpp | 3 +-- .../channelmimo/interferometer/interferometerbaseband.h | 4 ++-- plugins/channelrx/chanalyzer/chanalyzerbaseband.cpp | 3 +-- plugins/channelrx/chanalyzer/chanalyzerbaseband.h | 4 ++-- plugins/channelrx/demodadsb/adsbdemodbaseband.cpp | 3 +-- plugins/channelrx/demodadsb/adsbdemodbaseband.h | 4 ++-- plugins/channelrx/demodadsb/adsbdemodworker.cpp | 3 +-- plugins/channelrx/demodadsb/adsbdemodworker.h | 2 +- plugins/channelrx/demodais/aisdemodbaseband.cpp | 3 +-- plugins/channelrx/demodais/aisdemodbaseband.h | 4 ++-- plugins/channelrx/demodam/amdemodbaseband.cpp | 3 +-- plugins/channelrx/demodam/amdemodbaseband.h | 4 ++-- plugins/channelrx/demodapt/aptdemodbaseband.cpp | 3 +-- plugins/channelrx/demodapt/aptdemodbaseband.h | 4 ++-- plugins/channelrx/demodapt/aptdemodimageworker.cpp | 3 +-- plugins/channelrx/demodapt/aptdemodimageworker.h | 4 ++-- plugins/channelrx/demodatv/atvdemodbaseband.cpp | 3 +-- plugins/channelrx/demodatv/atvdemodbaseband.h | 4 ++-- plugins/channelrx/demodbfm/bfmdemodbaseband.cpp | 1 - plugins/channelrx/demodbfm/bfmdemodbaseband.h | 4 ++-- .../channelrx/demodchirpchat/chirpchatdemodbaseband.cpp | 3 +-- .../channelrx/demodchirpchat/chirpchatdemodbaseband.h | 4 ++-- plugins/channelrx/demoddab/dabdemodbaseband.cpp | 3 +-- plugins/channelrx/demoddab/dabdemodbaseband.h | 4 ++-- plugins/channelrx/demoddatv/datvdemodbaseband.cpp | 3 +-- plugins/channelrx/demoddatv/datvdemodbaseband.h | 4 ++-- plugins/channelrx/demoddatv/datvdemodsink.cpp | 3 +-- plugins/channelrx/demoddatv/datvdemodsink.h | 4 ++-- plugins/channelrx/demoddatv/datvideostream.cpp | 3 +-- plugins/channelrx/demoddsd/dsddemod.cpp | 1 - plugins/channelrx/demoddsd/dsddemod.h | 4 ++-- plugins/channelrx/demoddsd/dsddemodbaseband.cpp | 3 +-- plugins/channelrx/demoddsd/dsddemodbaseband.h | 4 ++-- plugins/channelrx/demodfreedv/freedvdemodbaseband.cpp | 1 - plugins/channelrx/demodfreedv/freedvdemodbaseband.h | 4 ++-- plugins/channelrx/demodfreedv/freedvdemodsink.cpp | 3 +-- plugins/channelrx/demodfreedv/freedvdemodsink.h | 4 ++-- plugins/channelrx/demodm17/m17demodbaseband.cpp | 3 +-- plugins/channelrx/demodm17/m17demodbaseband.h | 4 ++-- plugins/channelrx/demodnfm/dcsdetector.cpp | 3 +-- plugins/channelrx/demodnfm/dcsdetector.h | 4 ++-- plugins/channelrx/demodnfm/nfmdemodbaseband.cpp | 3 +-- plugins/channelrx/demodnfm/nfmdemodbaseband.h | 4 ++-- plugins/channelrx/demodpacket/packetdemodbaseband.cpp | 3 +-- plugins/channelrx/demodpacket/packetdemodbaseband.h | 4 ++-- plugins/channelrx/demodpager/pagerdemodbaseband.cpp | 3 +-- plugins/channelrx/demodpager/pagerdemodbaseband.h | 4 ++-- .../demodradiosonde/radiosondedemodbaseband.cpp | 3 +-- .../channelrx/demodradiosonde/radiosondedemodbaseband.h | 4 ++-- plugins/channelrx/demodssb/ssbdemod.cpp | 1 - plugins/channelrx/demodssb/ssbdemod.h | 4 ++-- plugins/channelrx/demodssb/ssbdemodbaseband.cpp | 3 +-- plugins/channelrx/demodssb/ssbdemodbaseband.h | 4 ++-- plugins/channelrx/demodvor/vordemodbaseband.cpp | 3 +-- plugins/channelrx/demodvor/vordemodbaseband.h | 4 ++-- plugins/channelrx/demodvormc/vordemodmcbaseband.cpp | 1 - plugins/channelrx/demodvormc/vordemodmcbaseband.h | 4 ++-- plugins/channelrx/demodwfm/wfmdemodbaseband.cpp | 3 +-- plugins/channelrx/demodwfm/wfmdemodbaseband.h | 4 ++-- plugins/channelrx/filesink/filesink.cpp | 1 - plugins/channelrx/filesink/filesink.h | 4 ++-- plugins/channelrx/filesink/filesinkbaseband.cpp | 3 +-- plugins/channelrx/filesink/filesinkbaseband.h | 4 ++-- plugins/channelrx/freqtracker/freqtrackerbaseband.cpp | 3 +-- plugins/channelrx/freqtracker/freqtrackerbaseband.h | 4 ++-- plugins/channelrx/localsink/localsinkbaseband.cpp | 3 +-- plugins/channelrx/localsink/localsinkbaseband.h | 4 ++-- plugins/channelrx/noisefigure/noisefigurebaseband.cpp | 3 +-- plugins/channelrx/noisefigure/noisefigurebaseband.h | 4 ++-- .../channelrx/radioastronomy/radioastronomybaseband.cpp | 3 +-- .../channelrx/radioastronomy/radioastronomybaseband.h | 4 ++-- .../channelrx/radioastronomy/radioastronomyworker.cpp | 1 - plugins/channelrx/radioastronomy/radioastronomyworker.h | 2 +- plugins/channelrx/radioclock/radioclockbaseband.cpp | 3 +-- plugins/channelrx/radioclock/radioclockbaseband.h | 4 ++-- plugins/channelrx/remotesink/remotesinkbaseband.cpp | 3 +-- plugins/channelrx/remotesink/remotesinkbaseband.h | 4 ++-- .../channelrx/remotetcpsink/remotetcpsinkbaseband.cpp | 3 +-- plugins/channelrx/remotetcpsink/remotetcpsinkbaseband.h | 4 ++-- plugins/channelrx/remotetcpsink/remotetcpsinksink.cpp | 1 - plugins/channelrx/remotetcpsink/remotetcpsinksink.h | 2 +- plugins/channelrx/sigmffilesink/sigmffilesink.cpp | 1 - plugins/channelrx/sigmffilesink/sigmffilesink.h | 4 ++-- .../channelrx/sigmffilesink/sigmffilesinkbaseband.cpp | 3 +-- plugins/channelrx/sigmffilesink/sigmffilesinkbaseband.h | 4 ++-- plugins/channelrx/udpsink/udpsinkbaseband.cpp | 3 +-- plugins/channelrx/udpsink/udpsinkbaseband.h | 4 ++-- plugins/channeltx/filesource/filesource.cpp | 1 - plugins/channeltx/filesource/filesource.h | 2 +- plugins/channeltx/filesource/filesourcebaseband.cpp | 5 ++--- plugins/channeltx/filesource/filesourcebaseband.h | 4 ++-- plugins/channeltx/localsource/localsourcebaseband.cpp | 3 +-- plugins/channeltx/localsource/localsourcebaseband.h | 4 ++-- plugins/channeltx/mod802.15.4/ieee_802_15_4_mod.cpp | 3 +-- plugins/channeltx/mod802.15.4/ieee_802_15_4_mod.h | 4 ++-- .../channeltx/mod802.15.4/ieee_802_15_4_modbaseband.cpp | 3 +-- .../channeltx/mod802.15.4/ieee_802_15_4_modbaseband.h | 4 ++-- plugins/channeltx/modais/aismod.cpp | 1 - plugins/channeltx/modais/aismod.h | 4 ++-- plugins/channeltx/modais/aismodbaseband.cpp | 3 +-- plugins/channeltx/modais/aismodbaseband.h | 4 ++-- plugins/channeltx/modam/ammod.cpp | 1 - plugins/channeltx/modam/ammod.h | 4 ++-- plugins/channeltx/modam/ammodbaseband.cpp | 3 +-- plugins/channeltx/modam/ammodbaseband.h | 4 ++-- plugins/channeltx/modam/ammodsource.cpp | 3 +-- plugins/channeltx/modam/ammodsource.h | 4 ++-- plugins/channeltx/modatv/atvmodbaseband.cpp | 5 ++--- plugins/channeltx/modatv/atvmodbaseband.h | 4 ++-- plugins/channeltx/modchirpchat/chirpchatmod.cpp | 1 - plugins/channeltx/modchirpchat/chirpchatmod.h | 4 ++-- plugins/channeltx/modchirpchat/chirpchatmodbaseband.cpp | 3 +-- plugins/channeltx/modchirpchat/chirpchatmodbaseband.h | 4 ++-- plugins/channeltx/moddatv/datvmodbaseband.cpp | 3 +-- plugins/channeltx/moddatv/datvmodbaseband.h | 4 ++-- plugins/channeltx/modfreedv/freedvmod.cpp | 1 - plugins/channeltx/modfreedv/freedvmod.h | 4 ++-- plugins/channeltx/modfreedv/freedvmodbaseband.cpp | 3 +-- plugins/channeltx/modfreedv/freedvmodbaseband.h | 4 ++-- plugins/channeltx/modfreedv/freedvmodsource.cpp | 3 +-- plugins/channeltx/modfreedv/freedvmodsource.h | 4 ++-- plugins/channeltx/modm17/m17mod.cpp | 1 - plugins/channeltx/modm17/m17mod.h | 4 ++-- plugins/channeltx/modm17/m17modbaseband.cpp | 3 +-- plugins/channeltx/modm17/m17modbaseband.h | 4 ++-- plugins/channeltx/modm17/m17modsource.cpp | 3 +-- plugins/channeltx/modm17/m17modsource.h | 4 ++-- plugins/channeltx/modnfm/nfmmod.cpp | 1 - plugins/channeltx/modnfm/nfmmod.h | 4 ++-- plugins/channeltx/modnfm/nfmmodbaseband.cpp | 3 +-- plugins/channeltx/modnfm/nfmmodbaseband.h | 4 ++-- plugins/channeltx/modnfm/nfmmodsource.cpp | 3 +-- plugins/channeltx/modnfm/nfmmodsource.h | 4 ++-- plugins/channeltx/modpacket/packetmod.cpp | 1 - plugins/channeltx/modpacket/packetmod.h | 4 ++-- plugins/channeltx/modpacket/packetmodbaseband.cpp | 3 +-- plugins/channeltx/modpacket/packetmodbaseband.h | 4 ++-- plugins/channeltx/modssb/ssbmod.cpp | 1 - plugins/channeltx/modssb/ssbmod.h | 4 ++-- plugins/channeltx/modssb/ssbmodbaseband.cpp | 3 +-- plugins/channeltx/modssb/ssbmodbaseband.h | 4 ++-- plugins/channeltx/modssb/ssbmodsource.cpp | 3 +-- plugins/channeltx/modssb/ssbmodsource.h | 4 ++-- plugins/channeltx/modwfm/wfmmod.cpp | 1 - plugins/channeltx/modwfm/wfmmod.h | 4 ++-- plugins/channeltx/modwfm/wfmmodbaseband.cpp | 3 +-- plugins/channeltx/modwfm/wfmmodbaseband.h | 4 ++-- plugins/channeltx/modwfm/wfmmodsource.cpp | 3 +-- plugins/channeltx/modwfm/wfmmodsource.h | 4 ++-- plugins/channeltx/remotesource/remotesourcebaseband.cpp | 3 +-- plugins/channeltx/remotesource/remotesourcebaseband.h | 4 ++-- plugins/channeltx/remotesource/remotesourceworker.cpp | 1 - plugins/channeltx/remotesource/remotesourceworker.h | 2 +- plugins/channeltx/udpsource/udpsource.cpp | 3 +-- plugins/channeltx/udpsource/udpsource.h | 2 +- plugins/channeltx/udpsource/udpsourcebaseband.cpp | 5 ++--- plugins/channeltx/udpsource/udpsourcebaseband.h | 4 ++-- plugins/feature/afc/afcworker.cpp | 3 +-- plugins/feature/afc/afcworker.h | 2 +- plugins/feature/aprs/aprsworker.cpp | 1 - plugins/feature/aprs/aprsworker.h | 2 +- plugins/feature/demodanalyzer/demodanalyzerworker.cpp | 3 +-- plugins/feature/demodanalyzer/demodanalyzerworker.h | 4 ++-- .../feature/gs232controller/gs232controllerworker.cpp | 1 - plugins/feature/gs232controller/gs232controllerworker.h | 2 +- plugins/feature/map/map.cpp | 3 +-- plugins/feature/map/map.h | 4 ++-- plugins/feature/pertester/pertesterworker.cpp | 1 - plugins/feature/pertester/pertesterworker.h | 2 +- plugins/feature/rigctlserver/rigctlserverworker.cpp | 3 +-- plugins/feature/rigctlserver/rigctlserverworker.h | 2 +- .../feature/satellitetracker/satellitetrackerworker.cpp | 1 - .../feature/satellitetracker/satellitetrackerworker.h | 2 +- plugins/feature/simpleptt/simplepttworker.cpp | 3 +-- plugins/feature/simpleptt/simplepttworker.h | 2 +- plugins/feature/startracker/startrackerworker.cpp | 1 - plugins/feature/startracker/startrackerworker.h | 2 +- plugins/feature/vorlocalizer/vorlocalizerworker.cpp | 1 - plugins/feature/vorlocalizer/vorlocalizerworker.h | 2 +- plugins/samplemimo/metismiso/metismisoudphandler.cpp | 1 - plugins/samplemimo/metismiso/metismisoudphandler.h | 4 ++-- plugins/samplemimo/testmi/testmiworker.cpp | 3 +-- plugins/samplemimo/testmi/testmiworker.h | 2 +- plugins/samplesource/remoteinput/remoteinput.cpp | 1 - plugins/samplesource/remoteinput/remoteinput.h | 2 +- plugins/samplesource/remotetcpinput/remotetcpinput.cpp | 1 - plugins/samplesource/remotetcpinput/remotetcpinput.h | 2 +- .../remotetcpinput/remotetcpinputtcphandler.cpp | 1 - .../remotetcpinput/remotetcpinputtcphandler.h | 4 ++-- plugins/samplesource/testsource/testsourceworker.cpp | 1 - plugins/samplesource/testsource/testsourceworker.h | 2 +- qrtplib/rtpudptransmitter.cpp | 3 +-- qrtplib/rtpudptransmitter.h | 4 ++-- sdrbase/audio/audioinputdevice.cpp | 1 - sdrbase/audio/audioinputdevice.h | 4 ++-- sdrbase/audio/audioopus.cpp | 3 +-- sdrbase/audio/audioopus.h | 4 ++-- sdrbase/audio/audiooutputdevice.cpp | 1 - sdrbase/audio/audiooutputdevice.h | 4 ++-- sdrbase/channel/remotedataqueue.cpp | 1 - sdrbase/channel/remotedataqueue.h | 4 ++-- sdrbase/dsp/cwkeyer.cpp | 1 - sdrbase/dsp/cwkeyer.h | 6 +++--- sdrbase/dsp/datafifo.cpp | 9 +++------ sdrbase/dsp/datafifo.h | 4 ++-- sdrbase/dsp/fftfactory.cpp | 5 ++--- sdrbase/dsp/fftfactory.h | 4 ++-- sdrbase/dsp/filerecord.cpp | 6 ++---- sdrbase/dsp/filerecord.h | 2 +- sdrbase/dsp/samplemififo.cpp | 6 ++---- sdrbase/dsp/samplemififo.h | 4 ++-- sdrbase/dsp/samplemofifo.cpp | 6 ++---- sdrbase/dsp/samplemofifo.h | 4 ++-- sdrbase/dsp/samplesinkfifo.cpp | 9 +++------ sdrbase/dsp/samplesinkfifo.h | 4 ++-- sdrbase/dsp/scopevis.cpp | 1 - sdrbase/dsp/scopevis.h | 2 +- sdrbase/dsp/spectrumvis.cpp | 3 +-- sdrbase/dsp/spectrumvis.h | 4 ++-- sdrbase/pipes/elementpipesregistrations.h | 8 ++++---- sdrbase/pipes/objectpipesregistrations.cpp | 3 +-- sdrbase/pipes/objectpipesregistrations.h | 4 ++-- sdrbase/util/messagequeue.cpp | 1 - sdrbase/util/messagequeue.h | 4 ++-- sdrbase/util/rtpsink.cpp | 3 +-- sdrbase/util/rtpsink.h | 4 ++-- sdrgui/gui/tvscreen.cpp | 1 - sdrgui/gui/tvscreen.h | 4 ++-- 234 files changed, 310 insertions(+), 432 deletions(-) diff --git a/logging/logger.cpp b/logging/logger.cpp index a608fad54..17809331b 100644 --- a/logging/logger.cpp +++ b/logging/logger.cpp @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include @@ -19,7 +20,7 @@ Logger* Logger::defaultLogger=0; QThreadStorage*> Logger::logVars; -QMutex Logger::mutex; +QRecursiveMutex Logger::mutex; Logger::Logger(QObject* parent) @@ -43,8 +44,8 @@ Logger::Logger(const QString msgFormat, const QString timestampFormat, const QtM void Logger::msgHandler(const QtMsgType type, const QString &message, const QString &file, const QString &function, const int line) { - static QMutex recursiveMutex(QMutex::Recursive); - static QMutex nonRecursiveMutex(QMutex::NonRecursive); + static QRecursiveMutex recursiveMutex; + static QMutex nonRecursiveMutex; // Prevent multiple threads from calling this method simultaneoulsy. // But allow recursive calls, which is required to prevent a deadlock diff --git a/logging/logger.h b/logging/logger.h index 9169691f8..83a9840d4 100644 --- a/logging/logger.h +++ b/logging/logger.h @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include "logglobal.h" #include "logmessage.h" @@ -139,7 +139,7 @@ protected: int bufferSize; /** Used to synchronize access of concurrent threads */ - static QMutex mutex; + static QRecursiveMutex mutex; /** Decorate and write a log message to stderr. Override this method diff --git a/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodbaseband.cpp b/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodbaseband.cpp index 25ddfcf92..c197fe513 100644 --- a/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodbaseband.cpp +++ b/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodbaseband.cpp @@ -27,8 +27,7 @@ MESSAGE_CLASS_DEFINITION(BeamSteeringCWModBaseband::MsgConfigureBeamSteeringCWModBaseband, Message) MESSAGE_CLASS_DEFINITION(BeamSteeringCWModBaseband::MsgSignalNotification, Message) -BeamSteeringCWModBaseband::BeamSteeringCWModBaseband() : - m_mutex(QMutex::Recursive) +BeamSteeringCWModBaseband::BeamSteeringCWModBaseband() { m_sampleMOFifo.init(2, SampleMOFifo::getSizePolicy(48000)); m_vbegin.resize(2); @@ -244,4 +243,4 @@ void BeamSteeringCWModBaseband::applySettings(const BeamSteeringCWModSettings& s } m_settings = settings; -} \ No newline at end of file +} diff --git a/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodbaseband.h b/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodbaseband.h index 94f51cd5f..cc04433f6 100644 --- a/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodbaseband.h +++ b/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodbaseband.h @@ -19,7 +19,7 @@ #define INCLUDE_BEAMSTEERINGCWMODBASEBAND_H #include -#include +#include #include "dsp/samplemofifo.h" #include "util/message.h" @@ -93,7 +93,7 @@ private: UpChannelizer *m_channelizers[2]; BeamSteeringCWModStreamSource m_streamSources[2]; MessageQueue m_inputMessageQueue; //!< Queue for asynchronous inbound communication - QMutex m_mutex; + QRecursiveMutex m_mutex; unsigned int m_lastStream; private slots: diff --git a/plugins/channelmimo/doa2/doa2baseband.cpp b/plugins/channelmimo/doa2/doa2baseband.cpp index c47481441..b039d2dc3 100644 --- a/plugins/channelmimo/doa2/doa2baseband.cpp +++ b/plugins/channelmimo/doa2/doa2baseband.cpp @@ -42,8 +42,7 @@ DOA2Baseband::DOA2Baseband(int fftSize) : m_magThreshold(0.0f), m_fftAvg(1), m_fftAvgCount(0), - m_scopeSink(nullptr), - m_mutex(QMutex::Recursive) + m_scopeSink(nullptr) { m_sampleMIFifo.init(2, 96000 * 8); m_vbegin.resize(2); diff --git a/plugins/channelmimo/doa2/doa2baseband.h b/plugins/channelmimo/doa2/doa2baseband.h index b0c34c0d8..eb2d635bc 100644 --- a/plugins/channelmimo/doa2/doa2baseband.h +++ b/plugins/channelmimo/doa2/doa2baseband.h @@ -19,7 +19,7 @@ #define INCLUDE_DOA2BASEBAND_H #include -#include +#include #include "dsp/samplemififo.h" #include "util/messagequeue.h" @@ -137,7 +137,7 @@ private: DownChannelizer *m_channelizers[2]; ScopeVis *m_scopeSink; MessageQueue m_inputMessageQueue; //!< Queue for asynchronous inbound communication - QMutex m_mutex; + QRecursiveMutex m_mutex; unsigned int m_lastStream; private slots: diff --git a/plugins/channelmimo/interferometer/interferometerbaseband.cpp b/plugins/channelmimo/interferometer/interferometerbaseband.cpp index b30b32cf7..ccc4c589d 100644 --- a/plugins/channelmimo/interferometer/interferometerbaseband.cpp +++ b/plugins/channelmimo/interferometer/interferometerbaseband.cpp @@ -33,8 +33,7 @@ MESSAGE_CLASS_DEFINITION(InterferometerBaseband::MsgConfigureCorrelation, Messag InterferometerBaseband::InterferometerBaseband(int fftSize) : m_correlator(fftSize), m_spectrumSink(nullptr), - m_scopeSink(nullptr), - m_mutex(QMutex::Recursive) + m_scopeSink(nullptr) { m_sampleMIFifo.init(2, 96000 * 8); m_vbegin.resize(2); diff --git a/plugins/channelmimo/interferometer/interferometerbaseband.h b/plugins/channelmimo/interferometer/interferometerbaseband.h index f7e89e5af..fa508504c 100644 --- a/plugins/channelmimo/interferometer/interferometerbaseband.h +++ b/plugins/channelmimo/interferometer/interferometerbaseband.h @@ -19,7 +19,7 @@ #define INCLUDE_INTERFEROMETERBASEBAND_H #include -#include +#include #include "dsp/samplemififo.h" #include "util/messagequeue.h" @@ -126,7 +126,7 @@ private: BasebandSampleSink *m_spectrumSink; ScopeVis *m_scopeSink; MessageQueue m_inputMessageQueue; //!< Queue for asynchronous inbound communication - QMutex m_mutex; + QRecursiveMutex m_mutex; unsigned int m_lastStream; private slots: diff --git a/plugins/channelrx/chanalyzer/chanalyzerbaseband.cpp b/plugins/channelrx/chanalyzer/chanalyzerbaseband.cpp index fe25313ce..4d0ac5140 100644 --- a/plugins/channelrx/chanalyzer/chanalyzerbaseband.cpp +++ b/plugins/channelrx/chanalyzer/chanalyzerbaseband.cpp @@ -26,8 +26,7 @@ MESSAGE_CLASS_DEFINITION(ChannelAnalyzerBaseband::MsgConfigureChannelAnalyzerBaseband, Message) ChannelAnalyzerBaseband::ChannelAnalyzerBaseband() : - m_running(false), - m_mutex(QMutex::Recursive) + m_running(false) { qDebug("ChannelAnalyzerBaseband::ChannelAnalyzerBaseband"); m_sampleFifo.setSize(SampleSinkFifo::getSizePolicy(48000)); diff --git a/plugins/channelrx/chanalyzer/chanalyzerbaseband.h b/plugins/channelrx/chanalyzer/chanalyzerbaseband.h index 86d8a1398..9439c16f6 100644 --- a/plugins/channelrx/chanalyzer/chanalyzerbaseband.h +++ b/plugins/channelrx/chanalyzer/chanalyzerbaseband.h @@ -19,7 +19,7 @@ #define INCLUDE_CHANNELANALYZERBASEBAND_H #include -#include +#include #include "dsp/samplesinkfifo.h" #include "util/message.h" @@ -81,7 +81,7 @@ private: MessageQueue m_inputMessageQueue; //!< Queue for asynchronous inbound communication ChannelAnalyzerSettings m_settings; bool m_running; - QMutex m_mutex; + QRecursiveMutex m_mutex; bool handleMessage(const Message& cmd); void applySettings(const ChannelAnalyzerSettings& settings, bool force = false); diff --git a/plugins/channelrx/demodadsb/adsbdemodbaseband.cpp b/plugins/channelrx/demodadsb/adsbdemodbaseband.cpp index 6277b737a..b3b8229d7 100644 --- a/plugins/channelrx/demodadsb/adsbdemodbaseband.cpp +++ b/plugins/channelrx/demodadsb/adsbdemodbaseband.cpp @@ -27,8 +27,7 @@ MESSAGE_CLASS_DEFINITION(ADSBDemodBaseband::MsgConfigureADSBDemodBaseband, Message) -ADSBDemodBaseband::ADSBDemodBaseband() : - m_mutex(QMutex::Recursive) +ADSBDemodBaseband::ADSBDemodBaseband() { m_sampleFifo.setSize(SampleSinkFifo::getSizePolicy(8000000)); m_channelizer = new DownChannelizer(&m_sink); diff --git a/plugins/channelrx/demodadsb/adsbdemodbaseband.h b/plugins/channelrx/demodadsb/adsbdemodbaseband.h index 1b4501049..d54c027b0 100644 --- a/plugins/channelrx/demodadsb/adsbdemodbaseband.h +++ b/plugins/channelrx/demodadsb/adsbdemodbaseband.h @@ -20,7 +20,7 @@ #define INCLUDE_ADSBDEMODBASEBAND_H #include -#include +#include #include "dsp/samplesinkfifo.h" #include "util/message.h" @@ -77,7 +77,7 @@ private: ADSBDemodSink m_sink; MessageQueue m_inputMessageQueue; //!< Queue for asynchronous inbound communication ADSBDemodSettings m_settings; - QMutex m_mutex; + QRecursiveMutex m_mutex; bool handleMessage(const Message& cmd); void applySettings(const ADSBDemodSettings& settings, bool force = false); diff --git a/plugins/channelrx/demodadsb/adsbdemodworker.cpp b/plugins/channelrx/demodadsb/adsbdemodworker.cpp index d03e1455f..5feb986a7 100644 --- a/plugins/channelrx/demodadsb/adsbdemodworker.cpp +++ b/plugins/channelrx/demodadsb/adsbdemodworker.cpp @@ -80,8 +80,7 @@ void ADSBBeastServer::discardClient() } ADSBDemodWorker::ADSBDemodWorker() : - m_running(false), - m_mutex(QMutex::Recursive) + m_running(false) { connect(&m_heartbeatTimer, SIGNAL(timeout()), this, SLOT(heartbeat())); connect(&m_socket, SIGNAL(readyRead()),this, SLOT(recv())); diff --git a/plugins/channelrx/demodadsb/adsbdemodworker.h b/plugins/channelrx/demodadsb/adsbdemodworker.h index 858b4fa11..16a96e8e5 100644 --- a/plugins/channelrx/demodadsb/adsbdemodworker.h +++ b/plugins/channelrx/demodadsb/adsbdemodworker.h @@ -92,7 +92,7 @@ private: MessageQueue m_inputMessageQueue; ADSBDemodSettings m_settings; bool m_running; - QMutex m_mutex; + QRecursiveMutex m_mutex; QTimer m_heartbeatTimer; QTcpSocket m_socket; QFile m_logFile; diff --git a/plugins/channelrx/demodais/aisdemodbaseband.cpp b/plugins/channelrx/demodais/aisdemodbaseband.cpp index 423f2caf1..9dfc12669 100644 --- a/plugins/channelrx/demodais/aisdemodbaseband.cpp +++ b/plugins/channelrx/demodais/aisdemodbaseband.cpp @@ -28,8 +28,7 @@ MESSAGE_CLASS_DEFINITION(AISDemodBaseband::MsgConfigureAISDemodBaseband, Message AISDemodBaseband::AISDemodBaseband(AISDemod *aisDemod) : m_sink(aisDemod), - m_running(false), - m_mutex(QMutex::Recursive) + m_running(false) { qDebug("AISDemodBaseband::AISDemodBaseband"); diff --git a/plugins/channelrx/demodais/aisdemodbaseband.h b/plugins/channelrx/demodais/aisdemodbaseband.h index 71114f869..2821b8fa0 100644 --- a/plugins/channelrx/demodais/aisdemodbaseband.h +++ b/plugins/channelrx/demodais/aisdemodbaseband.h @@ -20,7 +20,7 @@ #define INCLUDE_AISDEMODBASEBAND_H #include -#include +#include #include "dsp/samplesinkfifo.h" #include "dsp/scopevis.h" @@ -87,7 +87,7 @@ private: AISDemodSettings m_settings; ScopeVis m_scopeSink; bool m_running; - QMutex m_mutex; + QRecursiveMutex m_mutex; bool handleMessage(const Message& cmd); void calculateOffset(AISDemodSink *sink); diff --git a/plugins/channelrx/demodam/amdemodbaseband.cpp b/plugins/channelrx/demodam/amdemodbaseband.cpp index e252665f9..5f840095a 100644 --- a/plugins/channelrx/demodam/amdemodbaseband.cpp +++ b/plugins/channelrx/demodam/amdemodbaseband.cpp @@ -26,8 +26,7 @@ MESSAGE_CLASS_DEFINITION(AMDemodBaseband::MsgConfigureAMDemodBaseband, Message) AMDemodBaseband::AMDemodBaseband() : - m_running(false), - m_mutex(QMutex::Recursive) + m_running(false) { qDebug("AMDemodBaseband::AMDemodBaseband"); diff --git a/plugins/channelrx/demodam/amdemodbaseband.h b/plugins/channelrx/demodam/amdemodbaseband.h index cc12af36a..9df22e007 100644 --- a/plugins/channelrx/demodam/amdemodbaseband.h +++ b/plugins/channelrx/demodam/amdemodbaseband.h @@ -19,7 +19,7 @@ #define INCLUDE_AMDEMODBASEBAND_H #include -#include +#include #include "dsp/samplesinkfifo.h" #include "util/message.h" @@ -85,7 +85,7 @@ private: MessageQueue m_inputMessageQueue; //!< Queue for asynchronous inbound communication AMDemodSettings m_settings; bool m_running; - QMutex m_mutex; + QRecursiveMutex m_mutex; bool handleMessage(const Message& cmd); void applySettings(const AMDemodSettings& settings, bool force = false); diff --git a/plugins/channelrx/demodapt/aptdemodbaseband.cpp b/plugins/channelrx/demodapt/aptdemodbaseband.cpp index 9a700a1b7..0009d3288 100644 --- a/plugins/channelrx/demodapt/aptdemodbaseband.cpp +++ b/plugins/channelrx/demodapt/aptdemodbaseband.cpp @@ -29,8 +29,7 @@ MESSAGE_CLASS_DEFINITION(APTDemodBaseband::MsgConfigureAPTDemodBaseband, Message APTDemodBaseband::APTDemodBaseband(APTDemod *packetDemod) : m_sink(packetDemod), - m_running(false), - m_mutex(QMutex::Recursive) + m_running(false) { qDebug("APTDemodBaseband::APTDemodBaseband"); diff --git a/plugins/channelrx/demodapt/aptdemodbaseband.h b/plugins/channelrx/demodapt/aptdemodbaseband.h index 92797e8bc..e9f75156e 100644 --- a/plugins/channelrx/demodapt/aptdemodbaseband.h +++ b/plugins/channelrx/demodapt/aptdemodbaseband.h @@ -20,7 +20,7 @@ #define INCLUDE_APTDEMODBASEBAND_H #include -#include +#include #include "dsp/samplesinkfifo.h" #include "util/message.h" @@ -81,7 +81,7 @@ private: MessageQueue m_inputMessageQueue; //!< Queue for asynchronous inbound communication APTDemodSettings m_settings; bool m_running; - QMutex m_mutex; + QRecursiveMutex m_mutex; bool handleMessage(const Message& cmd); void calculateOffset(APTDemodSink *sink); diff --git a/plugins/channelrx/demodapt/aptdemodimageworker.cpp b/plugins/channelrx/demodapt/aptdemodimageworker.cpp index 54f94cc87..9c08c0de3 100644 --- a/plugins/channelrx/demodapt/aptdemodimageworker.cpp +++ b/plugins/channelrx/demodapt/aptdemodimageworker.cpp @@ -38,8 +38,7 @@ APTDemodImageWorker::APTDemodImageWorker(APTDemod *aptDemod) : m_messageQueueToGUI(nullptr), m_aptDemod(aptDemod), m_sgp4(nullptr), - m_running(false), - m_mutex(QMutex::Recursive) + m_running(false) { for (int y = 0; y < APT_MAX_HEIGHT; y++) { diff --git a/plugins/channelrx/demodapt/aptdemodimageworker.h b/plugins/channelrx/demodapt/aptdemodimageworker.h index 0e83c47ab..d2ea79030 100644 --- a/plugins/channelrx/demodapt/aptdemodimageworker.h +++ b/plugins/channelrx/demodapt/aptdemodimageworker.h @@ -20,7 +20,7 @@ #define INCLUDE_APTDEMODIMAGEWORKER_H #include -#include +#include #include #include @@ -137,7 +137,7 @@ private: QList m_palettes; bool m_running; - QMutex m_mutex; + QRecursiveMutex m_mutex; bool handleMessage(const Message& cmd); void applySettings(const APTDemodSettings& settings, bool force = false); diff --git a/plugins/channelrx/demodatv/atvdemodbaseband.cpp b/plugins/channelrx/demodatv/atvdemodbaseband.cpp index 2fe3f102c..7bb7d37e1 100644 --- a/plugins/channelrx/demodatv/atvdemodbaseband.cpp +++ b/plugins/channelrx/demodatv/atvdemodbaseband.cpp @@ -26,8 +26,7 @@ MESSAGE_CLASS_DEFINITION(ATVDemodBaseband::MsgConfigureATVDemodBaseband, Message) ATVDemodBaseband::ATVDemodBaseband() : - m_running(false), - m_mutex(QMutex::Recursive) + m_running(false) { qDebug("ATVDemodBaseband::ATVDemodBaseband"); m_sink.setScopeSink(&m_scopeSink); diff --git a/plugins/channelrx/demodatv/atvdemodbaseband.h b/plugins/channelrx/demodatv/atvdemodbaseband.h index c09645d3f..8a5658cbf 100644 --- a/plugins/channelrx/demodatv/atvdemodbaseband.h +++ b/plugins/channelrx/demodatv/atvdemodbaseband.h @@ -19,7 +19,7 @@ #define INCLUDE_ATVDEMODBASEBAND_H #include -#include +#include #include "dsp/samplesinkfifo.h" #include "dsp/scopevis.h" @@ -82,7 +82,7 @@ private: ATVDemodSettings m_settings; ScopeVis m_scopeSink; bool m_running; - QMutex m_mutex; + QRecursiveMutex m_mutex; bool handleMessage(const Message& cmd); void applySettings(const ATVDemodSettings& settings, bool force = false); diff --git a/plugins/channelrx/demodbfm/bfmdemodbaseband.cpp b/plugins/channelrx/demodbfm/bfmdemodbaseband.cpp index b831cb57e..9c7697fae 100644 --- a/plugins/channelrx/demodbfm/bfmdemodbaseband.cpp +++ b/plugins/channelrx/demodbfm/bfmdemodbaseband.cpp @@ -28,7 +28,6 @@ MESSAGE_CLASS_DEFINITION(BFMDemodBaseband::MsgConfigureBFMDemodBaseband, Message) BFMDemodBaseband::BFMDemodBaseband() : - m_mutex(QMutex::Recursive), m_messageQueueToGUI(nullptr), m_spectrumVis(nullptr) { diff --git a/plugins/channelrx/demodbfm/bfmdemodbaseband.h b/plugins/channelrx/demodbfm/bfmdemodbaseband.h index a5f5101f4..a9d7d9f3b 100644 --- a/plugins/channelrx/demodbfm/bfmdemodbaseband.h +++ b/plugins/channelrx/demodbfm/bfmdemodbaseband.h @@ -19,7 +19,7 @@ #define INCLUDE_BFMDEMODBASEBAND_H #include -#include +#include #include "dsp/samplesinkfifo.h" #include "util/message.h" @@ -90,7 +90,7 @@ private: BFMDemodSink m_sink; MessageQueue m_inputMessageQueue; //!< Queue for asynchronous inbound communication BFMDemodSettings m_settings; - QMutex m_mutex; + QRecursiveMutex m_mutex; MessageQueue *m_messageQueueToGUI; SpectrumVis *m_spectrumVis; diff --git a/plugins/channelrx/demodchirpchat/chirpchatdemodbaseband.cpp b/plugins/channelrx/demodchirpchat/chirpchatdemodbaseband.cpp index 125f22588..a9b653924 100644 --- a/plugins/channelrx/demodchirpchat/chirpchatdemodbaseband.cpp +++ b/plugins/channelrx/demodchirpchat/chirpchatdemodbaseband.cpp @@ -25,8 +25,7 @@ MESSAGE_CLASS_DEFINITION(ChirpChatDemodBaseband::MsgConfigureChirpChatDemodBaseband, Message) -ChirpChatDemodBaseband::ChirpChatDemodBaseband() : - m_mutex(QMutex::Recursive) +ChirpChatDemodBaseband::ChirpChatDemodBaseband() { m_sampleFifo.setSize(SampleSinkFifo::getSizePolicy(48000)); m_channelizer = new DownChannelizer(&m_sink); diff --git a/plugins/channelrx/demodchirpchat/chirpchatdemodbaseband.h b/plugins/channelrx/demodchirpchat/chirpchatdemodbaseband.h index 2bfa5eca2..504ba3e22 100644 --- a/plugins/channelrx/demodchirpchat/chirpchatdemodbaseband.h +++ b/plugins/channelrx/demodchirpchat/chirpchatdemodbaseband.h @@ -19,7 +19,7 @@ #define INCLUDE_CHIRPCHATDEMODBASEBAND_H #include -#include +#include #include "dsp/samplesinkfifo.h" #include "util/message.h" @@ -76,7 +76,7 @@ private: ChirpChatDemodSink m_sink; MessageQueue m_inputMessageQueue; //!< Queue for asynchronous inbound communication ChirpChatDemodSettings m_settings; - QMutex m_mutex; + QRecursiveMutex m_mutex; bool handleMessage(const Message& cmd); void applySettings(const ChirpChatDemodSettings& settings, bool force = false); diff --git a/plugins/channelrx/demoddab/dabdemodbaseband.cpp b/plugins/channelrx/demoddab/dabdemodbaseband.cpp index 0a6d227f4..7d408f476 100644 --- a/plugins/channelrx/demoddab/dabdemodbaseband.cpp +++ b/plugins/channelrx/demoddab/dabdemodbaseband.cpp @@ -29,8 +29,7 @@ MESSAGE_CLASS_DEFINITION(DABDemodBaseband::MsgConfigureDABDemodBaseband, Message DABDemodBaseband::DABDemodBaseband(DABDemod *packetDemod) : m_sink(packetDemod), - m_running(false), - m_mutex(QMutex::Recursive) + m_running(false) { qDebug("DABDemodBaseband::DABDemodBaseband"); diff --git a/plugins/channelrx/demoddab/dabdemodbaseband.h b/plugins/channelrx/demoddab/dabdemodbaseband.h index 99607ed9e..1df809832 100644 --- a/plugins/channelrx/demoddab/dabdemodbaseband.h +++ b/plugins/channelrx/demoddab/dabdemodbaseband.h @@ -20,7 +20,7 @@ #define INCLUDE_DABDEMODBASEBAND_H #include -#include +#include #include "dsp/samplesinkfifo.h" #include "util/message.h" @@ -85,7 +85,7 @@ private: MessageQueue m_inputMessageQueue; //!< Queue for asynchronous inbound communication DABDemodSettings m_settings; bool m_running; - QMutex m_mutex; + QRecursiveMutex m_mutex; bool handleMessage(const Message& cmd); void applySettings(const DABDemodSettings& settings, bool force = false); diff --git a/plugins/channelrx/demoddatv/datvdemodbaseband.cpp b/plugins/channelrx/demoddatv/datvdemodbaseband.cpp index c065b8ecf..93ab1c66a 100644 --- a/plugins/channelrx/demoddatv/datvdemodbaseband.cpp +++ b/plugins/channelrx/demoddatv/datvdemodbaseband.cpp @@ -26,8 +26,7 @@ MESSAGE_CLASS_DEFINITION(DATVDemodBaseband::MsgConfigureDATVDemodBaseband, Message) DATVDemodBaseband::DATVDemodBaseband() : - m_running(false), - m_mutex(QMutex::Recursive) + m_running(false) { qDebug("DATVDemodBaseband::DATVDemodBaseband"); m_sampleFifo.setSize(SampleSinkFifo::getSizePolicy(48000)); diff --git a/plugins/channelrx/demoddatv/datvdemodbaseband.h b/plugins/channelrx/demoddatv/datvdemodbaseband.h index ad7c60ce2..7f961a7b1 100644 --- a/plugins/channelrx/demoddatv/datvdemodbaseband.h +++ b/plugins/channelrx/demoddatv/datvdemodbaseband.h @@ -19,7 +19,7 @@ #define INCLUDE_DATVDEMODBASEBAND_H #include -#include +#include #include "dsp/samplesinkfifo.h" #include "util/message.h" @@ -101,7 +101,7 @@ private: MessageQueue m_inputMessageQueue; //!< Queue for asynchronous inbound communication DATVDemodSettings m_settings; bool m_running; - QMutex m_mutex; + QRecursiveMutex m_mutex; bool handleMessage(const Message& cmd); void applySettings(const DATVDemodSettings& settings, bool force = false); diff --git a/plugins/channelrx/demoddatv/datvdemodsink.cpp b/plugins/channelrx/demoddatv/datvdemodsink.cpp index bb693d7c8..3d96bb13e 100644 --- a/plugins/channelrx/demoddatv/datvdemodsink.cpp +++ b/plugins/channelrx/demoddatv/datvdemodsink.cpp @@ -46,8 +46,7 @@ DATVDemodSink::DATVDemodSink() : m_modcodCodeRate(-1), m_enmModulation(DATVDemodSettings::BPSK /*DATV_FM1*/), m_channelSampleRate(1024000), - m_messageQueueToGUI(nullptr), - m_mutex(QMutex::Recursive) + m_messageQueueToGUI(nullptr) { //*************** DATV PARAMETERS *************** m_blnInitialized=false; diff --git a/plugins/channelrx/demoddatv/datvdemodsink.h b/plugins/channelrx/demoddatv/datvdemodsink.h index 79fd59e5f..a4f697efb 100644 --- a/plugins/channelrx/demoddatv/datvdemodsink.h +++ b/plugins/channelrx/demoddatv/datvdemodsink.h @@ -18,7 +18,7 @@ #ifndef INCLUDE_DATVDEMODSINK_H #define INCLUDE_DATVDEMODSINK_H -#include +#include //LeanSDR #include "leansdr/framework.h" @@ -345,7 +345,7 @@ private: MovingAverageUtil m_objMagSqAverage; MessageQueue *m_messageQueueToGUI; - QMutex m_mutex; + QRecursiveMutex m_mutex; static const unsigned int m_rfFilterFftLength; }; diff --git a/plugins/channelrx/demoddatv/datvideostream.cpp b/plugins/channelrx/demoddatv/datvideostream.cpp index e4d0481a2..358444fe1 100644 --- a/plugins/channelrx/demoddatv/datvideostream.cpp +++ b/plugins/channelrx/demoddatv/datvideostream.cpp @@ -19,8 +19,7 @@ #include "datvideostream.h" #include -DATVideostream::DATVideostream(): - m_mutex(QMutex::NonRecursive) +DATVideostream::DATVideostream() { cleanUp(); m_totalReceived = 0; diff --git a/plugins/channelrx/demoddsd/dsddemod.cpp b/plugins/channelrx/demoddsd/dsddemod.cpp index 120425a37..5c6debe93 100644 --- a/plugins/channelrx/demoddsd/dsddemod.cpp +++ b/plugins/channelrx/demoddsd/dsddemod.cpp @@ -58,7 +58,6 @@ const int DSDDemod::m_udpBlockSize = 512; DSDDemod::DSDDemod(DeviceAPI *deviceAPI) : ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSink), m_deviceAPI(deviceAPI), - m_mutex(QMutex::Recursive), m_running(false), m_basebandSampleRate(0) { diff --git a/plugins/channelrx/demoddsd/dsddemod.h b/plugins/channelrx/demoddsd/dsddemod.h index 3d7b94ee6..100527e1c 100644 --- a/plugins/channelrx/demoddsd/dsddemod.h +++ b/plugins/channelrx/demoddsd/dsddemod.h @@ -22,7 +22,7 @@ #include #include -#include +#include #include "dsp/basebandsamplesink.h" #include "channel/channelapi.h" @@ -171,7 +171,7 @@ private: DeviceAPI *m_deviceAPI; QThread *m_thread; DSDDemodBaseband *m_basebandSink; - QMutex m_mutex; + QRecursiveMutex m_mutex; bool m_running; DSDDemodSettings m_settings; int m_basebandSampleRate; //!< stored from device message used when starting baseband sink diff --git a/plugins/channelrx/demoddsd/dsddemodbaseband.cpp b/plugins/channelrx/demoddsd/dsddemodbaseband.cpp index b19119467..bd8c8a8eb 100644 --- a/plugins/channelrx/demoddsd/dsddemodbaseband.cpp +++ b/plugins/channelrx/demoddsd/dsddemodbaseband.cpp @@ -25,8 +25,7 @@ MESSAGE_CLASS_DEFINITION(DSDDemodBaseband::MsgConfigureDSDDemodBaseband, Message) DSDDemodBaseband::DSDDemodBaseband() : - m_channelizer(&m_sink), - m_mutex(QMutex::Recursive) + m_channelizer(&m_sink) { qDebug("DSDDemodBaseband::DSDDemodBaseband"); m_sampleFifo.setSize(SampleSinkFifo::getSizePolicy(48000)); diff --git a/plugins/channelrx/demoddsd/dsddemodbaseband.h b/plugins/channelrx/demoddsd/dsddemodbaseband.h index 6e2b647ff..4cf7ab15c 100644 --- a/plugins/channelrx/demoddsd/dsddemodbaseband.h +++ b/plugins/channelrx/demoddsd/dsddemodbaseband.h @@ -19,7 +19,7 @@ #define INCLUDE_DSDDEMODBASEBAND_H #include -#include +#include #include "dsp/samplesinkfifo.h" #include "dsp/downchannelizer.h" @@ -85,7 +85,7 @@ private: DSDDemodSink m_sink; MessageQueue m_inputMessageQueue; //!< Queue for asynchronous inbound communication DSDDemodSettings m_settings; - QMutex m_mutex; + QRecursiveMutex m_mutex; bool handleMessage(const Message& cmd); void applySettings(const DSDDemodSettings& settings, bool force = false); diff --git a/plugins/channelrx/demodfreedv/freedvdemodbaseband.cpp b/plugins/channelrx/demodfreedv/freedvdemodbaseband.cpp index 553bb5232..341d710b0 100644 --- a/plugins/channelrx/demodfreedv/freedvdemodbaseband.cpp +++ b/plugins/channelrx/demodfreedv/freedvdemodbaseband.cpp @@ -27,7 +27,6 @@ MESSAGE_CLASS_DEFINITION(FreeDVDemodBaseband::MsgConfigureFreeDVDemodBaseband, M MESSAGE_CLASS_DEFINITION(FreeDVDemodBaseband::MsgResyncFreeDVDemod, Message) FreeDVDemodBaseband::FreeDVDemodBaseband() : - m_mutex(QMutex::Recursive), m_messageQueueToGUI(nullptr) { qDebug("FreeDVDemodBaseband::FreeDVDemodBaseband"); diff --git a/plugins/channelrx/demodfreedv/freedvdemodbaseband.h b/plugins/channelrx/demodfreedv/freedvdemodbaseband.h index 52224b865..c3c7fb054 100644 --- a/plugins/channelrx/demodfreedv/freedvdemodbaseband.h +++ b/plugins/channelrx/demodfreedv/freedvdemodbaseband.h @@ -19,7 +19,7 @@ #define INCLUDE_FREEDVDEMODBASEBAND_H #include -#include +#include #include "dsp/samplesinkfifo.h" #include "util/message.h" @@ -107,7 +107,7 @@ private: FreeDVDemodSink m_sink; MessageQueue m_inputMessageQueue; //!< Queue for asynchronous inbound communication FreeDVDemodSettings m_settings; - QMutex m_mutex; + QRecursiveMutex m_mutex; MessageQueue *m_messageQueueToGUI; MessageQueue *getMessageQueueToGUI() { return m_messageQueueToGUI; } diff --git a/plugins/channelrx/demodfreedv/freedvdemodsink.cpp b/plugins/channelrx/demodfreedv/freedvdemodsink.cpp index 7d14072aa..fdbcd0422 100644 --- a/plugins/channelrx/demodfreedv/freedvdemodsink.cpp +++ b/plugins/channelrx/demodfreedv/freedvdemodsink.cpp @@ -150,8 +150,7 @@ FreeDVDemodSink::FreeDVDemodSink() : m_iModem(0), m_speechOut(nullptr), m_modIn(nullptr), - m_levelInNbSamples(480), // 10ms @ 48 kS/s - m_mutex(QMutex::Recursive) + m_levelInNbSamples(480) // 10ms @ 48 kS/s { m_audioBuffer.resize(1<<14); m_audioBufferFill = 0; diff --git a/plugins/channelrx/demodfreedv/freedvdemodsink.h b/plugins/channelrx/demodfreedv/freedvdemodsink.h index aa12a732e..a9a8ad0bf 100644 --- a/plugins/channelrx/demodfreedv/freedvdemodsink.h +++ b/plugins/channelrx/demodfreedv/freedvdemodsink.h @@ -21,7 +21,7 @@ #include #include -#include +#include #include "dsp/channelsamplesink.h" #include "dsp/ncof.h" @@ -200,7 +200,7 @@ private: int m_levelInNbSamples; Real m_rmsLevel; Real m_peakLevel; - QMutex m_mutex; + QRecursiveMutex m_mutex; static const unsigned int m_ssbFftLen; static const float m_agcTarget; diff --git a/plugins/channelrx/demodm17/m17demodbaseband.cpp b/plugins/channelrx/demodm17/m17demodbaseband.cpp index a202af3d0..f05ff236d 100644 --- a/plugins/channelrx/demodm17/m17demodbaseband.cpp +++ b/plugins/channelrx/demodm17/m17demodbaseband.cpp @@ -25,8 +25,7 @@ MESSAGE_CLASS_DEFINITION(M17DemodBaseband::MsgConfigureM17DemodBaseband, Message) -M17DemodBaseband::M17DemodBaseband() : - m_mutex(QMutex::Recursive) +M17DemodBaseband::M17DemodBaseband() { qDebug("M17DemodBaseband::M17DemodBaseband"); m_sampleFifo.setSize(SampleSinkFifo::getSizePolicy(48000)); diff --git a/plugins/channelrx/demodm17/m17demodbaseband.h b/plugins/channelrx/demodm17/m17demodbaseband.h index ad5e46936..07b055785 100644 --- a/plugins/channelrx/demodm17/m17demodbaseband.h +++ b/plugins/channelrx/demodm17/m17demodbaseband.h @@ -19,7 +19,7 @@ #define INCLUDE_M17DEMODBASEBAND_H #include -#include +#include #include "dsp/samplesinkfifo.h" #include "util/message.h" @@ -129,7 +129,7 @@ private: M17DemodSink m_sink; MessageQueue m_inputMessageQueue; //!< Queue for asynchronous inbound communication M17DemodSettings m_settings; - QMutex m_mutex; + QRecursiveMutex m_mutex; bool handleMessage(const Message& cmd); void applySettings(const M17DemodSettings& settings, const QList& settingsKeys, bool force = false); diff --git a/plugins/channelrx/demodnfm/dcsdetector.cpp b/plugins/channelrx/demodnfm/dcsdetector.cpp index 1f6149fcb..1c4ec7ef6 100644 --- a/plugins/channelrx/demodnfm/dcsdetector.cpp +++ b/plugins/channelrx/demodnfm/dcsdetector.cpp @@ -28,8 +28,7 @@ DCSDetector::DCSDetector() : m_low(0.0f), m_mid(0.0f), m_prevSample(0.0f), - m_dcsWord(0), - m_mutex(QMutex::Recursive) + m_dcsWord(0) { setBitrate(134.3); setEqWindow(23); diff --git a/plugins/channelrx/demodnfm/dcsdetector.h b/plugins/channelrx/demodnfm/dcsdetector.h index f58179b88..db8196e15 100644 --- a/plugins/channelrx/demodnfm/dcsdetector.h +++ b/plugins/channelrx/demodnfm/dcsdetector.h @@ -18,7 +18,7 @@ #ifndef INCLUDE_DSP_DCSDETECTOR_H_ #define INCLUDE_DSP_DCSDETECTOR_H_ -#include +#include #include "dsp/dsptypes.h" #include "util/golay2312.h" @@ -49,7 +49,7 @@ private: float m_prevSample; unsigned int m_dcsWord; //!< 23 bit DCS code word Golay2312 m_golay2312; - QMutex m_mutex; + QRecursiveMutex m_mutex; }; #endif // INCLUDE_DSP_DCSDETECTOR_H_ diff --git a/plugins/channelrx/demodnfm/nfmdemodbaseband.cpp b/plugins/channelrx/demodnfm/nfmdemodbaseband.cpp index 7d73b0e4c..5e982e275 100644 --- a/plugins/channelrx/demodnfm/nfmdemodbaseband.cpp +++ b/plugins/channelrx/demodnfm/nfmdemodbaseband.cpp @@ -25,8 +25,7 @@ MESSAGE_CLASS_DEFINITION(NFMDemodBaseband::MsgConfigureNFMDemodBaseband, Message) NFMDemodBaseband::NFMDemodBaseband() : - m_channelizer(&m_sink), - m_mutex(QMutex::Recursive) + m_channelizer(&m_sink) { m_sampleFifo.setSize(SampleSinkFifo::getSizePolicy(48000)); diff --git a/plugins/channelrx/demodnfm/nfmdemodbaseband.h b/plugins/channelrx/demodnfm/nfmdemodbaseband.h index 11d540fed..6ed6a79e1 100644 --- a/plugins/channelrx/demodnfm/nfmdemodbaseband.h +++ b/plugins/channelrx/demodnfm/nfmdemodbaseband.h @@ -19,7 +19,7 @@ #define INCLUDE_NFMDEMODBASEBAND_H #include -#include +#include #include "dsp/samplesinkfifo.h" #include "dsp/downchannelizer.h" @@ -80,7 +80,7 @@ private: NFMDemodSink m_sink; MessageQueue m_inputMessageQueue; //!< Queue for asynchronous inbound communication NFMDemodSettings m_settings; - QMutex m_mutex; + QRecursiveMutex m_mutex; bool handleMessage(const Message& cmd); void applySettings(const NFMDemodSettings& settings, bool force = false); diff --git a/plugins/channelrx/demodpacket/packetdemodbaseband.cpp b/plugins/channelrx/demodpacket/packetdemodbaseband.cpp index 904295b88..0a4ded3a7 100644 --- a/plugins/channelrx/demodpacket/packetdemodbaseband.cpp +++ b/plugins/channelrx/demodpacket/packetdemodbaseband.cpp @@ -28,8 +28,7 @@ MESSAGE_CLASS_DEFINITION(PacketDemodBaseband::MsgConfigurePacketDemodBaseband, M PacketDemodBaseband::PacketDemodBaseband(PacketDemod *packetDemod) : m_sink(packetDemod), - m_running(false), - m_mutex(QMutex::Recursive) + m_running(false) { qDebug("PacketDemodBaseband::PacketDemodBaseband"); diff --git a/plugins/channelrx/demodpacket/packetdemodbaseband.h b/plugins/channelrx/demodpacket/packetdemodbaseband.h index 5a7ba097d..e1de07ce1 100644 --- a/plugins/channelrx/demodpacket/packetdemodbaseband.h +++ b/plugins/channelrx/demodpacket/packetdemodbaseband.h @@ -20,7 +20,7 @@ #define INCLUDE_PACKETDEMODBASEBAND_H #include -#include +#include #include "dsp/samplesinkfifo.h" #include "util/message.h" @@ -84,7 +84,7 @@ private: MessageQueue m_inputMessageQueue; //!< Queue for asynchronous inbound communication PacketDemodSettings m_settings; bool m_running; - QMutex m_mutex; + QRecursiveMutex m_mutex; bool handleMessage(const Message& cmd); void calculateOffset(PacketDemodSink *sink); diff --git a/plugins/channelrx/demodpager/pagerdemodbaseband.cpp b/plugins/channelrx/demodpager/pagerdemodbaseband.cpp index 490ee1731..e4c74e987 100644 --- a/plugins/channelrx/demodpager/pagerdemodbaseband.cpp +++ b/plugins/channelrx/demodpager/pagerdemodbaseband.cpp @@ -28,8 +28,7 @@ MESSAGE_CLASS_DEFINITION(PagerDemodBaseband::MsgConfigurePagerDemodBaseband, Mes PagerDemodBaseband::PagerDemodBaseband(PagerDemod *pagerDemod) : m_sink(pagerDemod), - m_running(false), - m_mutex(QMutex::Recursive) + m_running(false) { qDebug("PagerDemodBaseband::PagerDemodBaseband"); diff --git a/plugins/channelrx/demodpager/pagerdemodbaseband.h b/plugins/channelrx/demodpager/pagerdemodbaseband.h index 569061fce..afaadc8e5 100644 --- a/plugins/channelrx/demodpager/pagerdemodbaseband.h +++ b/plugins/channelrx/demodpager/pagerdemodbaseband.h @@ -20,7 +20,7 @@ #define INCLUDE_PAGERDEMODBASEBAND_H #include -#include +#include #include "dsp/samplesinkfifo.h" #include "dsp/scopevis.h" @@ -88,7 +88,7 @@ private: PagerDemodSettings m_settings; ScopeVis m_scopeSink; bool m_running; - QMutex m_mutex; + QRecursiveMutex m_mutex; bool handleMessage(const Message& cmd); void calculateOffset(PagerDemodSink *sink); diff --git a/plugins/channelrx/demodradiosonde/radiosondedemodbaseband.cpp b/plugins/channelrx/demodradiosonde/radiosondedemodbaseband.cpp index a2df39d1e..22258515e 100644 --- a/plugins/channelrx/demodradiosonde/radiosondedemodbaseband.cpp +++ b/plugins/channelrx/demodradiosonde/radiosondedemodbaseband.cpp @@ -28,8 +28,7 @@ MESSAGE_CLASS_DEFINITION(RadiosondeDemodBaseband::MsgConfigureRadiosondeDemodBas RadiosondeDemodBaseband::RadiosondeDemodBaseband(RadiosondeDemod *radiosondeDemod) : m_sink(radiosondeDemod), - m_running(false), - m_mutex(QMutex::Recursive) + m_running(false) { qDebug("RadiosondeDemodBaseband::RadiosondeDemodBaseband"); diff --git a/plugins/channelrx/demodradiosonde/radiosondedemodbaseband.h b/plugins/channelrx/demodradiosonde/radiosondedemodbaseband.h index 182aa3360..d7082d851 100644 --- a/plugins/channelrx/demodradiosonde/radiosondedemodbaseband.h +++ b/plugins/channelrx/demodradiosonde/radiosondedemodbaseband.h @@ -20,7 +20,7 @@ #define INCLUDE_RADIOSONDEDEMODBASEBAND_H #include -#include +#include #include "dsp/samplesinkfifo.h" #include "dsp/scopevis.h" @@ -87,7 +87,7 @@ private: RadiosondeDemodSettings m_settings; ScopeVis m_scopeSink; bool m_running; - QMutex m_mutex; + QRecursiveMutex m_mutex; bool handleMessage(const Message& cmd); void calculateOffset(RadiosondeDemodSink *sink); diff --git a/plugins/channelrx/demodssb/ssbdemod.cpp b/plugins/channelrx/demodssb/ssbdemod.cpp index d043bbcf6..0e6a0c0bb 100644 --- a/plugins/channelrx/demodssb/ssbdemod.cpp +++ b/plugins/channelrx/demodssb/ssbdemod.cpp @@ -52,7 +52,6 @@ const char* const SSBDemod::m_channelId = "SSBDemod"; SSBDemod::SSBDemod(DeviceAPI *deviceAPI) : ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSink), m_deviceAPI(deviceAPI), - m_mutex(QMutex::Recursive), m_running(false), m_spectrumVis(SDR_RX_SCALEF), m_basebandSampleRate(0) diff --git a/plugins/channelrx/demodssb/ssbdemod.h b/plugins/channelrx/demodssb/ssbdemod.h index 3bb7e4cf9..c53488a2d 100644 --- a/plugins/channelrx/demodssb/ssbdemod.h +++ b/plugins/channelrx/demodssb/ssbdemod.h @@ -21,7 +21,7 @@ #include -#include +#include #include #include "dsp/basebandsamplesink.h" @@ -143,7 +143,7 @@ private: DeviceAPI *m_deviceAPI; QThread *m_thread; SSBDemodBaseband* m_basebandSink; - QMutex m_mutex; + QRecursiveMutex m_mutex; bool m_running; SSBDemodSettings m_settings; SpectrumVis m_spectrumVis; diff --git a/plugins/channelrx/demodssb/ssbdemodbaseband.cpp b/plugins/channelrx/demodssb/ssbdemodbaseband.cpp index 6af3ae540..061be8454 100644 --- a/plugins/channelrx/demodssb/ssbdemodbaseband.cpp +++ b/plugins/channelrx/demodssb/ssbdemodbaseband.cpp @@ -28,8 +28,7 @@ MESSAGE_CLASS_DEFINITION(SSBDemodBaseband::MsgConfigureSSBDemodBaseband, Message SSBDemodBaseband::SSBDemodBaseband() : m_channelizer(&m_sink), m_messageQueueToGUI(nullptr), - m_spectrumVis(nullptr), - m_mutex(QMutex::Recursive) + m_spectrumVis(nullptr) { m_sampleFifo.setSize(SampleSinkFifo::getSizePolicy(48000)); diff --git a/plugins/channelrx/demodssb/ssbdemodbaseband.h b/plugins/channelrx/demodssb/ssbdemodbaseband.h index f39ab87bf..fa356df7b 100644 --- a/plugins/channelrx/demodssb/ssbdemodbaseband.h +++ b/plugins/channelrx/demodssb/ssbdemodbaseband.h @@ -19,7 +19,7 @@ #define INCLUDE_SSBDEMODBASEBAND_H #include -#include +#include #include "dsp/samplesinkfifo.h" #include "dsp/downchannelizer.h" @@ -85,7 +85,7 @@ private: int m_channelSampleRate; MessageQueue *m_messageQueueToGUI; SpectrumVis *m_spectrumVis; - QMutex m_mutex; + QRecursiveMutex m_mutex; bool handleMessage(const Message& cmd); void applySettings(const SSBDemodSettings& settings, bool force = false); diff --git a/plugins/channelrx/demodvor/vordemodbaseband.cpp b/plugins/channelrx/demodvor/vordemodbaseband.cpp index a7daed5c3..6b3593ce8 100644 --- a/plugins/channelrx/demodvor/vordemodbaseband.cpp +++ b/plugins/channelrx/demodvor/vordemodbaseband.cpp @@ -29,8 +29,7 @@ MESSAGE_CLASS_DEFINITION(VORDemodBaseband::MsgConfigureVORDemodBaseband, Message VORDemodBaseband::VORDemodBaseband() : m_messageQueueToGUI(nullptr), - m_running(false), - m_mutex(QMutex::Recursive) + m_running(false) { qDebug("VORDemodBaseband::VORDemodBaseband"); m_sampleFifo.setSize(SampleSinkFifo::getSizePolicy(48000)); diff --git a/plugins/channelrx/demodvor/vordemodbaseband.h b/plugins/channelrx/demodvor/vordemodbaseband.h index 39c2f37af..557b1b181 100644 --- a/plugins/channelrx/demodvor/vordemodbaseband.h +++ b/plugins/channelrx/demodvor/vordemodbaseband.h @@ -20,7 +20,7 @@ #define INCLUDE_VORDEMODSCBASEBAND_H #include -#include +#include #include "dsp/samplesinkfifo.h" #include "util/message.h" @@ -82,7 +82,7 @@ private: VORDemodSettings m_settings; MessageQueue *m_messageQueueToGUI; bool m_running; - QMutex m_mutex; + QRecursiveMutex m_mutex; bool handleMessage(const Message& cmd); void applySettings(const VORDemodSettings& settings, bool force = false); diff --git a/plugins/channelrx/demodvormc/vordemodmcbaseband.cpp b/plugins/channelrx/demodvormc/vordemodmcbaseband.cpp index 063ffa34f..71e6a63ff 100644 --- a/plugins/channelrx/demodvormc/vordemodmcbaseband.cpp +++ b/plugins/channelrx/demodvormc/vordemodmcbaseband.cpp @@ -29,7 +29,6 @@ MESSAGE_CLASS_DEFINITION(VORDemodMCBaseband::MsgConfigureVORDemodBaseband, Messa VORDemodMCBaseband::VORDemodMCBaseband() : m_running(false), - m_mutex(QMutex::Recursive), m_messageQueueToGUI(nullptr), m_basebandSampleRate(0) { diff --git a/plugins/channelrx/demodvormc/vordemodmcbaseband.h b/plugins/channelrx/demodvormc/vordemodmcbaseband.h index dac1f9ae3..9e0a5e383 100644 --- a/plugins/channelrx/demodvormc/vordemodmcbaseband.h +++ b/plugins/channelrx/demodvormc/vordemodmcbaseband.h @@ -20,7 +20,7 @@ #define INCLUDE_VORDEMODBASEBAND_H #include -#include +#include #include "dsp/samplesinkfifo.h" #include "util/message.h" @@ -120,7 +120,7 @@ private: MessageQueue m_inputMessageQueue; //!< Queue for asynchronous inbound communication VORDemodMCSettings m_settings; bool m_running; - QMutex m_mutex; + QRecursiveMutex m_mutex; MessageQueue *m_messageQueueToGUI; int m_basebandSampleRate; int m_centerFrequency; diff --git a/plugins/channelrx/demodwfm/wfmdemodbaseband.cpp b/plugins/channelrx/demodwfm/wfmdemodbaseband.cpp index 586df00fb..239235ba5 100644 --- a/plugins/channelrx/demodwfm/wfmdemodbaseband.cpp +++ b/plugins/channelrx/demodwfm/wfmdemodbaseband.cpp @@ -25,8 +25,7 @@ MESSAGE_CLASS_DEFINITION(WFMDemodBaseband::MsgConfigureWFMDemodBaseband, Message) -WFMDemodBaseband::WFMDemodBaseband() : - m_mutex(QMutex::Recursive) +WFMDemodBaseband::WFMDemodBaseband() { m_sampleFifo.setSize(SampleSinkFifo::getSizePolicy(48000)); m_channelizer = new DownChannelizer(&m_sink); diff --git a/plugins/channelrx/demodwfm/wfmdemodbaseband.h b/plugins/channelrx/demodwfm/wfmdemodbaseband.h index e9b1d79d5..16a73a4ad 100644 --- a/plugins/channelrx/demodwfm/wfmdemodbaseband.h +++ b/plugins/channelrx/demodwfm/wfmdemodbaseband.h @@ -19,7 +19,7 @@ #define INCLUDE_WFMDEMODBASEBAND_H #include -#include +#include #include "dsp/samplesinkfifo.h" #include "util/message.h" @@ -81,7 +81,7 @@ private: WFMDemodSink m_sink; MessageQueue m_inputMessageQueue; //!< Queue for asynchronous inbound communication WFMDemodSettings m_settings; - QMutex m_mutex; + QRecursiveMutex m_mutex; bool handleMessage(const Message& cmd); void applySettings(const WFMDemodSettings& settings, bool force = false); diff --git a/plugins/channelrx/filesink/filesink.cpp b/plugins/channelrx/filesink/filesink.cpp index 80319868b..de6609421 100644 --- a/plugins/channelrx/filesink/filesink.cpp +++ b/plugins/channelrx/filesink/filesink.cpp @@ -54,7 +54,6 @@ const char* const FileSink::m_channelId = "FileSink"; FileSink::FileSink(DeviceAPI *deviceAPI) : ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSink), m_deviceAPI(deviceAPI), - m_mutex(QMutex::Recursive), m_running(false), m_spectrumVis(SDR_RX_SCALEF), m_centerFrequency(0), diff --git a/plugins/channelrx/filesink/filesink.h b/plugins/channelrx/filesink/filesink.h index 5468564ff..60a60bf43 100644 --- a/plugins/channelrx/filesink/filesink.h +++ b/plugins/channelrx/filesink/filesink.h @@ -19,7 +19,7 @@ #define INCLUDE_FILESINK_H_ #include -#include +#include #include #include "dsp/basebandsamplesink.h" @@ -161,7 +161,7 @@ private: DeviceAPI *m_deviceAPI; QThread *m_thread; FileSinkBaseband *m_basebandSink; - QMutex m_mutex; + QRecursiveMutex m_mutex; bool m_running; FileSinkSettings m_settings; SpectrumVis m_spectrumVis; diff --git a/plugins/channelrx/filesink/filesinkbaseband.cpp b/plugins/channelrx/filesink/filesinkbaseband.cpp index 98841978f..0e287f3bf 100644 --- a/plugins/channelrx/filesink/filesinkbaseband.cpp +++ b/plugins/channelrx/filesink/filesinkbaseband.cpp @@ -33,8 +33,7 @@ FileSinkBaseband::FileSinkBaseband() : m_channelizer(&m_sink), m_specMax(0), m_squelchLevel(0), - m_squelchOpen(false), - m_mutex(QMutex::Recursive) + m_squelchOpen(false) { qDebug("FileSinkBaseband::FileSinkBaseband"); m_sampleFifo.setSize(SampleSinkFifo::getSizePolicy(48000)); diff --git a/plugins/channelrx/filesink/filesinkbaseband.h b/plugins/channelrx/filesink/filesinkbaseband.h index 62005c4dd..1e9507e7c 100644 --- a/plugins/channelrx/filesink/filesinkbaseband.h +++ b/plugins/channelrx/filesink/filesinkbaseband.h @@ -19,7 +19,7 @@ #define INCLUDE_FILESINKBASEBAND_H_ #include -#include +#include #include "dsp/samplesinkfifo.h" #include "dsp/downchannelizer.h" @@ -113,7 +113,7 @@ private: float m_squelchLevel; bool m_squelchOpen; int64_t m_centerFrequency; - QMutex m_mutex; + QRecursiveMutex m_mutex; QTimer *m_timer; void stopWork(); diff --git a/plugins/channelrx/freqtracker/freqtrackerbaseband.cpp b/plugins/channelrx/freqtracker/freqtrackerbaseband.cpp index f7498ba06..e121fa6cb 100644 --- a/plugins/channelrx/freqtracker/freqtrackerbaseband.cpp +++ b/plugins/channelrx/freqtracker/freqtrackerbaseband.cpp @@ -26,8 +26,7 @@ MESSAGE_CLASS_DEFINITION(FreqTrackerBaseband::MsgConfigureFreqTrackerBaseband, Message) -FreqTrackerBaseband::FreqTrackerBaseband() : - m_mutex(QMutex::Recursive) +FreqTrackerBaseband::FreqTrackerBaseband() { m_sampleFifo.setSize(SampleSinkFifo::getSizePolicy(48000)); m_channelizer = new DownChannelizer(&m_sink); diff --git a/plugins/channelrx/freqtracker/freqtrackerbaseband.h b/plugins/channelrx/freqtracker/freqtrackerbaseband.h index 0002abfd9..7bbfbe14f 100644 --- a/plugins/channelrx/freqtracker/freqtrackerbaseband.h +++ b/plugins/channelrx/freqtracker/freqtrackerbaseband.h @@ -19,7 +19,7 @@ #define INCLUDE_FREQTRACKERBASEBAND_H #include -#include +#include #include "dsp/samplesinkfifo.h" #include "util/message.h" @@ -84,7 +84,7 @@ private: FreqTrackerSettings m_settings; unsigned int m_basebandSampleRate; SpectrumVis *m_spectrumVis; - QMutex m_mutex; + QRecursiveMutex m_mutex; bool handleMessage(const Message& cmd); void applySettings(const FreqTrackerSettings& settings, bool force = false); diff --git a/plugins/channelrx/localsink/localsinkbaseband.cpp b/plugins/channelrx/localsink/localsinkbaseband.cpp index e05ef74fa..e53cb31c8 100644 --- a/plugins/channelrx/localsink/localsinkbaseband.cpp +++ b/plugins/channelrx/localsink/localsinkbaseband.cpp @@ -28,8 +28,7 @@ MESSAGE_CLASS_DEFINITION(LocalSinkBaseband::MsgConfigureLocalSinkWork, Message) MESSAGE_CLASS_DEFINITION(LocalSinkBaseband::MsgConfigureLocalDeviceSampleSource, Message) LocalSinkBaseband::LocalSinkBaseband() : - m_localSampleSource(nullptr), - m_mutex(QMutex::Recursive) + m_localSampleSource(nullptr) { m_sampleFifo.setSize(SampleSinkFifo::getSizePolicy(48000)); m_channelizer = new DownChannelizer(&m_sink); diff --git a/plugins/channelrx/localsink/localsinkbaseband.h b/plugins/channelrx/localsink/localsinkbaseband.h index 2d6f383cb..00b5e1946 100644 --- a/plugins/channelrx/localsink/localsinkbaseband.h +++ b/plugins/channelrx/localsink/localsinkbaseband.h @@ -19,7 +19,7 @@ #define INCLUDE_LOCALSINKBASEBAND_H #include -#include +#include #include "dsp/samplesinkfifo.h" #include "util/message.h" @@ -114,7 +114,7 @@ private: MessageQueue m_inputMessageQueue; //!< Queue for asynchronous inbound communication LocalSinkSettings m_settings; DeviceSampleSource *m_localSampleSource; - QMutex m_mutex; + QRecursiveMutex m_mutex; bool handleMessage(const Message& cmd); void applySettings(const LocalSinkSettings& settings, bool force = false); diff --git a/plugins/channelrx/noisefigure/noisefigurebaseband.cpp b/plugins/channelrx/noisefigure/noisefigurebaseband.cpp index e641b35b0..c8eed861b 100644 --- a/plugins/channelrx/noisefigure/noisefigurebaseband.cpp +++ b/plugins/channelrx/noisefigure/noisefigurebaseband.cpp @@ -28,8 +28,7 @@ MESSAGE_CLASS_DEFINITION(NoiseFigureBaseband::MsgConfigureNoiseFigureBaseband, M NoiseFigureBaseband::NoiseFigureBaseband(NoiseFigure *aisDemod) : m_sink(aisDemod), - m_running(false), - m_mutex(QMutex::Recursive) + m_running(false) { qDebug("NoiseFigureBaseband::NoiseFigureBaseband"); diff --git a/plugins/channelrx/noisefigure/noisefigurebaseband.h b/plugins/channelrx/noisefigure/noisefigurebaseband.h index ec14ba207..dccf3ec61 100644 --- a/plugins/channelrx/noisefigure/noisefigurebaseband.h +++ b/plugins/channelrx/noisefigure/noisefigurebaseband.h @@ -20,7 +20,7 @@ #define INCLUDE_NOISEFIGUREBASEBAND_H #include -#include +#include #include "dsp/samplesinkfifo.h" #include "dsp/scopevis.h" @@ -85,7 +85,7 @@ private: MessageQueue m_inputMessageQueue; //!< Queue for asynchronous inbound communication NoiseFigureSettings m_settings; bool m_running; - QMutex m_mutex; + QRecursiveMutex m_mutex; bool handleMessage(const Message& cmd); void calculateOffset(NoiseFigureSink *sink); diff --git a/plugins/channelrx/radioastronomy/radioastronomybaseband.cpp b/plugins/channelrx/radioastronomy/radioastronomybaseband.cpp index 6cb8c1916..12452838e 100644 --- a/plugins/channelrx/radioastronomy/radioastronomybaseband.cpp +++ b/plugins/channelrx/radioastronomy/radioastronomybaseband.cpp @@ -29,8 +29,7 @@ MESSAGE_CLASS_DEFINITION(RadioAstronomyBaseband::MsgConfigureRadioAstronomyBaseb RadioAstronomyBaseband::RadioAstronomyBaseband(RadioAstronomy *aisDemod) : m_sink(aisDemod), - m_running(false), - m_mutex(QMutex::Recursive) + m_running(false) { qDebug("RadioAstronomyBaseband::RadioAstronomyBaseband"); diff --git a/plugins/channelrx/radioastronomy/radioastronomybaseband.h b/plugins/channelrx/radioastronomy/radioastronomybaseband.h index 48f291493..ab4d7530d 100644 --- a/plugins/channelrx/radioastronomy/radioastronomybaseband.h +++ b/plugins/channelrx/radioastronomy/radioastronomybaseband.h @@ -20,7 +20,7 @@ #define INCLUDE_RADIOASTRONOMYBASEBAND_H #include -#include +#include #include "dsp/samplesinkfifo.h" #include "dsp/scopevis.h" @@ -84,7 +84,7 @@ private: MessageQueue m_inputMessageQueue; //!< Queue for asynchronous inbound communication RadioAstronomySettings m_settings; bool m_running; - QMutex m_mutex; + QRecursiveMutex m_mutex; bool handleMessage(const Message& cmd); void calculateOffset(RadioAstronomySink *sink); diff --git a/plugins/channelrx/radioastronomy/radioastronomyworker.cpp b/plugins/channelrx/radioastronomy/radioastronomyworker.cpp index 99d8a0776..17066831b 100644 --- a/plugins/channelrx/radioastronomy/radioastronomyworker.cpp +++ b/plugins/channelrx/radioastronomy/radioastronomyworker.cpp @@ -30,7 +30,6 @@ RadioAstronomyWorker::RadioAstronomyWorker(RadioAstronomy* radioAstronomy) : m_msgQueueToChannel(nullptr), m_msgQueueToGUI(nullptr), m_running(false), - m_mutex(QMutex::Recursive), m_sensorTimer(this) { connect(&m_sensorTimer, SIGNAL(timeout()), this, SLOT(measureSensors())); diff --git a/plugins/channelrx/radioastronomy/radioastronomyworker.h b/plugins/channelrx/radioastronomy/radioastronomyworker.h index 760210d62..5d79bd05f 100644 --- a/plugins/channelrx/radioastronomy/radioastronomyworker.h +++ b/plugins/channelrx/radioastronomy/radioastronomyworker.h @@ -75,7 +75,7 @@ private: MessageQueue *m_msgQueueToGUI; RadioAstronomySettings m_settings; bool m_running; - QMutex m_mutex; + QRecursiveMutex m_mutex; VISA m_visa; ViSession m_session[RADIOASTRONOMY_SENSORS]; diff --git a/plugins/channelrx/radioclock/radioclockbaseband.cpp b/plugins/channelrx/radioclock/radioclockbaseband.cpp index e73cf3e04..02c9c9c00 100644 --- a/plugins/channelrx/radioclock/radioclockbaseband.cpp +++ b/plugins/channelrx/radioclock/radioclockbaseband.cpp @@ -29,8 +29,7 @@ MESSAGE_CLASS_DEFINITION(RadioClockBaseband::MsgConfigureRadioClockBaseband, Mes RadioClockBaseband::RadioClockBaseband(RadioClock *radioClock) : m_sink(radioClock), - m_running(false), - m_mutex(QMutex::Recursive) + m_running(false) { qDebug("RadioClockBaseband::RadioClockBaseband"); diff --git a/plugins/channelrx/radioclock/radioclockbaseband.h b/plugins/channelrx/radioclock/radioclockbaseband.h index 65b21d0cf..618280c80 100644 --- a/plugins/channelrx/radioclock/radioclockbaseband.h +++ b/plugins/channelrx/radioclock/radioclockbaseband.h @@ -20,7 +20,7 @@ #define INCLUDE_RADIOCLOCKBASEBAND_H #include -#include +#include #include "dsp/samplesinkfifo.h" #include "dsp/scopevis.h" @@ -87,7 +87,7 @@ private: RadioClockSettings m_settings; ScopeVis m_scopeSink; bool m_running; - QMutex m_mutex; + QRecursiveMutex m_mutex; bool handleMessage(const Message& cmd); void applySettings(const RadioClockSettings& settings, bool force = false); diff --git a/plugins/channelrx/remotesink/remotesinkbaseband.cpp b/plugins/channelrx/remotesink/remotesinkbaseband.cpp index daab8eeab..17c207e25 100644 --- a/plugins/channelrx/remotesink/remotesinkbaseband.cpp +++ b/plugins/channelrx/remotesink/remotesinkbaseband.cpp @@ -25,8 +25,7 @@ MESSAGE_CLASS_DEFINITION(RemoteSinkBaseband::MsgConfigureRemoteSinkBaseband, Message) -RemoteSinkBaseband::RemoteSinkBaseband() : - m_mutex(QMutex::Recursive) +RemoteSinkBaseband::RemoteSinkBaseband() { qDebug("RemoteSinkBaseband::RemoteSinkBaseband"); m_sampleFifo.setSize(SampleSinkFifo::getSizePolicy(48000)); diff --git a/plugins/channelrx/remotesink/remotesinkbaseband.h b/plugins/channelrx/remotesink/remotesinkbaseband.h index c62515e1d..bc5677360 100644 --- a/plugins/channelrx/remotesink/remotesinkbaseband.h +++ b/plugins/channelrx/remotesink/remotesinkbaseband.h @@ -19,7 +19,7 @@ #define INCLUDE_REMOTESINKBASEBAND_H #include -#include +#include #include "dsp/samplesinkfifo.h" #include "util/message.h" @@ -82,7 +82,7 @@ private: RemoteSinkSink m_sink; MessageQueue m_inputMessageQueue; //!< Queue for asynchronous inbound communication RemoteSinkSettings m_settings; - QMutex m_mutex; + QRecursiveMutex m_mutex; bool handleMessage(const Message& cmd); void applySettings(const RemoteSinkSettings& settings, bool force = false); diff --git a/plugins/channelrx/remotetcpsink/remotetcpsinkbaseband.cpp b/plugins/channelrx/remotetcpsink/remotetcpsinkbaseband.cpp index 440c884a5..1f0f51892 100644 --- a/plugins/channelrx/remotetcpsink/remotetcpsinkbaseband.cpp +++ b/plugins/channelrx/remotetcpsink/remotetcpsinkbaseband.cpp @@ -25,8 +25,7 @@ #include "remotetcpsinkbaseband.h" #include "remotetcpsink.h" -RemoteTCPSinkBaseband::RemoteTCPSinkBaseband() : - m_mutex(QMutex::Recursive) +RemoteTCPSinkBaseband::RemoteTCPSinkBaseband() { qDebug("RemoteTCPSinkBaseband::RemoteTCPSinkBaseband"); m_sampleFifo.setSize(SampleSinkFifo::getSizePolicy(48000)); diff --git a/plugins/channelrx/remotetcpsink/remotetcpsinkbaseband.h b/plugins/channelrx/remotetcpsink/remotetcpsinkbaseband.h index 94d82a3fb..537dcbac8 100644 --- a/plugins/channelrx/remotetcpsink/remotetcpsinkbaseband.h +++ b/plugins/channelrx/remotetcpsink/remotetcpsinkbaseband.h @@ -20,7 +20,7 @@ #define INCLUDE_REMOTETCPSINKBASEBAND_H #include -#include +#include #include "dsp/samplesinkfifo.h" #include "util/message.h" @@ -60,7 +60,7 @@ private: RemoteTCPSinkSink m_sink; MessageQueue m_inputMessageQueue; //!< Queue for asynchronous inbound communication RemoteTCPSinkSettings m_settings; - QMutex m_mutex; + QRecursiveMutex m_mutex; bool handleMessage(const Message& cmd); void applySettings(const RemoteTCPSinkSettings& settings, bool force = false, bool remoteChange = false); diff --git a/plugins/channelrx/remotetcpsink/remotetcpsinksink.cpp b/plugins/channelrx/remotetcpsink/remotetcpsinksink.cpp index ca86bc931..2dee9283c 100644 --- a/plugins/channelrx/remotetcpsink/remotetcpsinksink.cpp +++ b/plugins/channelrx/remotetcpsink/remotetcpsinksink.cpp @@ -36,7 +36,6 @@ RemoteTCPSinkSink::RemoteTCPSinkSink() : m_channelFrequencyOffset(0), m_channelSampleRate(48000), m_linearGain(1.0f), - m_mutex(QMutex::Recursive), m_server(nullptr) { qDebug("RemoteTCPSinkSink::RemoteTCPSinkSink"); diff --git a/plugins/channelrx/remotetcpsink/remotetcpsinksink.h b/plugins/channelrx/remotetcpsink/remotetcpsinksink.h index 23455766d..bda150677 100644 --- a/plugins/channelrx/remotetcpsink/remotetcpsinksink.h +++ b/plugins/channelrx/remotetcpsink/remotetcpsinksink.h @@ -75,7 +75,7 @@ private: uint32_t m_channelIndex; float m_linearGain; - QMutex m_mutex; + QRecursiveMutex m_mutex; QTcpServer *m_server; QList m_clients; diff --git a/plugins/channelrx/sigmffilesink/sigmffilesink.cpp b/plugins/channelrx/sigmffilesink/sigmffilesink.cpp index b4d755283..8dccf1b6a 100644 --- a/plugins/channelrx/sigmffilesink/sigmffilesink.cpp +++ b/plugins/channelrx/sigmffilesink/sigmffilesink.cpp @@ -54,7 +54,6 @@ const char* const SigMFFileSink::m_channelId = "SigMFFileSink"; SigMFFileSink::SigMFFileSink(DeviceAPI *deviceAPI) : ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSink), m_deviceAPI(deviceAPI), - m_mutex(QMutex::Recursive), m_running(false), m_spectrumVis(SDR_RX_SCALEF), m_centerFrequency(0), diff --git a/plugins/channelrx/sigmffilesink/sigmffilesink.h b/plugins/channelrx/sigmffilesink/sigmffilesink.h index a1c959484..66bfd413e 100644 --- a/plugins/channelrx/sigmffilesink/sigmffilesink.h +++ b/plugins/channelrx/sigmffilesink/sigmffilesink.h @@ -19,7 +19,7 @@ #define INCLUDE_SIGMFFILESINK_H_ #include -#include +#include #include #include "dsp/basebandsamplesink.h" @@ -161,7 +161,7 @@ private: DeviceAPI *m_deviceAPI; QThread *m_thread; SigMFFileSinkBaseband *m_basebandSink; - QMutex m_mutex; + QRecursiveMutex m_mutex; bool m_running; SigMFFileSinkSettings m_settings; SpectrumVis m_spectrumVis; diff --git a/plugins/channelrx/sigmffilesink/sigmffilesinkbaseband.cpp b/plugins/channelrx/sigmffilesink/sigmffilesinkbaseband.cpp index 591674604..768dcbeab 100644 --- a/plugins/channelrx/sigmffilesink/sigmffilesinkbaseband.cpp +++ b/plugins/channelrx/sigmffilesink/sigmffilesinkbaseband.cpp @@ -33,8 +33,7 @@ SigMFFileSinkBaseband::SigMFFileSinkBaseband() : m_channelizer(&m_sink), m_specMax(0), m_squelchLevel(0), - m_squelchOpen(false), - m_mutex(QMutex::Recursive) + m_squelchOpen(false) { qDebug("SigMFFileSinkBaseband::SigMFFileSinkBaseband"); m_sampleFifo.setSize(SampleSinkFifo::getSizePolicy(48000)); diff --git a/plugins/channelrx/sigmffilesink/sigmffilesinkbaseband.h b/plugins/channelrx/sigmffilesink/sigmffilesinkbaseband.h index 791e74ff9..000ca04ae 100644 --- a/plugins/channelrx/sigmffilesink/sigmffilesinkbaseband.h +++ b/plugins/channelrx/sigmffilesink/sigmffilesinkbaseband.h @@ -19,7 +19,7 @@ #define INCLUDE_SIFMFFILESINKBASEBAND_H_ #include -#include +#include #include "dsp/samplesinkfifo.h" #include "dsp/downchannelizer.h" @@ -113,7 +113,7 @@ private: float m_squelchLevel; bool m_squelchOpen; int64_t m_centerFrequency; - QMutex m_mutex; + QRecursiveMutex m_mutex; QTimer *m_timer; void stopWork(); diff --git a/plugins/channelrx/udpsink/udpsinkbaseband.cpp b/plugins/channelrx/udpsink/udpsinkbaseband.cpp index 47477389a..95fae702f 100644 --- a/plugins/channelrx/udpsink/udpsinkbaseband.cpp +++ b/plugins/channelrx/udpsink/udpsinkbaseband.cpp @@ -26,8 +26,7 @@ MESSAGE_CLASS_DEFINITION(UDPSinkBaseband::MsgConfigureUDPSinkBaseband, Message) MESSAGE_CLASS_DEFINITION(UDPSinkBaseband::MsgEnableSpectrum, Message) -UDPSinkBaseband::UDPSinkBaseband() : - m_mutex(QMutex::Recursive) +UDPSinkBaseband::UDPSinkBaseband() { m_sampleFifo.setSize(SampleSinkFifo::getSizePolicy(48000)); m_channelizer = new DownChannelizer(&m_sink); diff --git a/plugins/channelrx/udpsink/udpsinkbaseband.h b/plugins/channelrx/udpsink/udpsinkbaseband.h index 7b114a651..c03cc35c5 100644 --- a/plugins/channelrx/udpsink/udpsinkbaseband.h +++ b/plugins/channelrx/udpsink/udpsinkbaseband.h @@ -19,7 +19,7 @@ #define INCLUDE_UDPSINKBASEBAND_H #include -#include +#include #include "dsp/samplesinkfifo.h" #include "util/message.h" @@ -97,7 +97,7 @@ private: UDPSinkSink m_sink; MessageQueue m_inputMessageQueue; //!< Queue for asynchronous inbound communication UDPSinkSettings m_settings; - QMutex m_mutex; + QRecursiveMutex m_mutex; bool handleMessage(const Message& cmd); void applySettings(const UDPSinkSettings& settings, bool force = false); diff --git a/plugins/channeltx/filesource/filesource.cpp b/plugins/channeltx/filesource/filesource.cpp index 9830cb0f9..cf058596f 100644 --- a/plugins/channeltx/filesource/filesource.cpp +++ b/plugins/channeltx/filesource/filesource.cpp @@ -53,7 +53,6 @@ const char* const FileSource::m_channelId ="FileSource"; FileSource::FileSource(DeviceAPI *deviceAPI) : ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSource), m_deviceAPI(deviceAPI), - m_settingsMutex(QMutex::Recursive), m_frequencyOffset(0), m_basebandSampleRate(0), m_linearGain(0.0) diff --git a/plugins/channeltx/filesource/filesource.h b/plugins/channeltx/filesource/filesource.h index b3e101122..940dfe3c7 100644 --- a/plugins/channeltx/filesource/filesource.h +++ b/plugins/channeltx/filesource/filesource.h @@ -228,7 +228,7 @@ private: FileSourceSettings m_settings; SampleVector m_sampleBuffer; - QMutex m_settingsMutex; + QRecursiveMutex m_settingsMutex; uint64_t m_frequencyOffset; uint32_t m_basebandSampleRate; double m_linearGain; diff --git a/plugins/channeltx/filesource/filesourcebaseband.cpp b/plugins/channeltx/filesource/filesourcebaseband.cpp index 0cee4acb0..623522c11 100644 --- a/plugins/channeltx/filesource/filesourcebaseband.cpp +++ b/plugins/channeltx/filesource/filesourcebaseband.cpp @@ -31,8 +31,7 @@ MESSAGE_CLASS_DEFINITION(FileSourceBaseband::MsgConfigureFileSourceSeek, Message FileSourceBaseband::FileSourceBaseband() : m_avg(0.0), m_peak(0.0), - m_nbSamples(1), - m_mutex(QMutex::Recursive) + m_nbSamples(1) { m_sampleFifo.resize(SampleSourceFifo::getSizePolicy(48000)); m_channelizer = new UpChannelizer(&m_source); @@ -216,4 +215,4 @@ int FileSourceBaseband::getChannelSampleRate() const quint64 FileSourceBaseband::getSamplesCount() const { return m_source.getSamplesCount(); -} \ No newline at end of file +} diff --git a/plugins/channeltx/filesource/filesourcebaseband.h b/plugins/channeltx/filesource/filesourcebaseband.h index 7ab3c8073..5630537f9 100644 --- a/plugins/channeltx/filesource/filesourcebaseband.h +++ b/plugins/channeltx/filesource/filesourcebaseband.h @@ -19,7 +19,7 @@ #define INCLUDE_FILESOURCEBASEBAND_H #include -#include +#include #include "dsp/samplesourcefifo.h" #include "util/message.h" @@ -147,7 +147,7 @@ private: double m_avg; double m_peak; int m_nbSamples; - QMutex m_mutex; + QRecursiveMutex m_mutex; void processFifo(SampleVector& data, unsigned int iBegin, unsigned int iEnd); bool handleMessage(const Message& cmd); diff --git a/plugins/channeltx/localsource/localsourcebaseband.cpp b/plugins/channeltx/localsource/localsourcebaseband.cpp index 31f900ec8..580c7c5fd 100644 --- a/plugins/channeltx/localsource/localsourcebaseband.cpp +++ b/plugins/channeltx/localsource/localsourcebaseband.cpp @@ -28,8 +28,7 @@ MESSAGE_CLASS_DEFINITION(LocalSourceBaseband::MsgConfigureLocalSourceWork, Messa MESSAGE_CLASS_DEFINITION(LocalSourceBaseband::MsgConfigureLocalDeviceSampleSink, Message) LocalSourceBaseband::LocalSourceBaseband() : - m_localSampleSink(nullptr), - m_mutex(QMutex::Recursive) + m_localSampleSink(nullptr) { m_sampleFifo.resize(SampleSourceFifo::getSizePolicy(48000)); m_channelizer = new UpChannelizer(&m_source); diff --git a/plugins/channeltx/localsource/localsourcebaseband.h b/plugins/channeltx/localsource/localsourcebaseband.h index 4d388fbe0..804ceaf95 100644 --- a/plugins/channeltx/localsource/localsourcebaseband.h +++ b/plugins/channeltx/localsource/localsourcebaseband.h @@ -19,7 +19,7 @@ #define INCLUDE_LOCALSOURCEBASEBAND_H #include -#include +#include #include "dsp/samplesourcefifo.h" #include "util/message.h" @@ -113,7 +113,7 @@ private: MessageQueue m_inputMessageQueue; //!< Queue for asynchronous inbound communication LocalSourceSettings m_settings; DeviceSampleSink *m_localSampleSink; - QMutex m_mutex; + QRecursiveMutex m_mutex; void processFifo(SampleVector& data, unsigned int iBegin, unsigned int iEnd); bool handleMessage(const Message& cmd); diff --git a/plugins/channeltx/mod802.15.4/ieee_802_15_4_mod.cpp b/plugins/channeltx/mod802.15.4/ieee_802_15_4_mod.cpp index 5bd158a84..afcf4c29a 100644 --- a/plugins/channeltx/mod802.15.4/ieee_802_15_4_mod.cpp +++ b/plugins/channeltx/mod802.15.4/ieee_802_15_4_mod.cpp @@ -57,8 +57,7 @@ const char* const IEEE_802_15_4_Mod::m_channelId = "IEEE_802_15_4_Mod"; IEEE_802_15_4_Mod::IEEE_802_15_4_Mod(DeviceAPI *deviceAPI) : ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSource), m_deviceAPI(deviceAPI), - m_spectrumVis(SDR_TX_SCALEF), - m_settingsMutex(QMutex::Recursive) + m_spectrumVis(SDR_TX_SCALEF) { setObjectName(m_channelId); diff --git a/plugins/channeltx/mod802.15.4/ieee_802_15_4_mod.h b/plugins/channeltx/mod802.15.4/ieee_802_15_4_mod.h index 0c168aadd..d121b3214 100644 --- a/plugins/channeltx/mod802.15.4/ieee_802_15_4_mod.h +++ b/plugins/channeltx/mod802.15.4/ieee_802_15_4_mod.h @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include "dsp/basebandsamplesource.h" @@ -169,7 +169,7 @@ private: SpectrumVis m_spectrumVis; SampleVector m_sampleBuffer; - QMutex m_settingsMutex; + QRecursiveMutex m_settingsMutex; QNetworkAccessManager *m_networkManager; QNetworkRequest m_networkRequest; diff --git a/plugins/channeltx/mod802.15.4/ieee_802_15_4_modbaseband.cpp b/plugins/channeltx/mod802.15.4/ieee_802_15_4_modbaseband.cpp index 17d914019..f3ed1b773 100644 --- a/plugins/channeltx/mod802.15.4/ieee_802_15_4_modbaseband.cpp +++ b/plugins/channeltx/mod802.15.4/ieee_802_15_4_modbaseband.cpp @@ -27,8 +27,7 @@ MESSAGE_CLASS_DEFINITION(IEEE_802_15_4_ModBaseband::MsgConfigureIEEE_802_15_4_ModBaseband, Message) -IEEE_802_15_4_ModBaseband::IEEE_802_15_4_ModBaseband() : - m_mutex(QMutex::Recursive) +IEEE_802_15_4_ModBaseband::IEEE_802_15_4_ModBaseband() { m_sampleFifo.resize(SampleSourceFifo::getSizePolicy(48000)); m_channelizer = new UpChannelizer(&m_source); diff --git a/plugins/channeltx/mod802.15.4/ieee_802_15_4_modbaseband.h b/plugins/channeltx/mod802.15.4/ieee_802_15_4_modbaseband.h index 39f5240c0..b24f8126d 100644 --- a/plugins/channeltx/mod802.15.4/ieee_802_15_4_modbaseband.h +++ b/plugins/channeltx/mod802.15.4/ieee_802_15_4_modbaseband.h @@ -20,7 +20,7 @@ #define INCLUDE_IEEE_802_15_4_MODBASEBAND_H #include -#include +#include #include "dsp/samplesourcefifo.h" #include "dsp/scopevis.h" @@ -86,7 +86,7 @@ private: MessageQueue m_inputMessageQueue; //!< Queue for asynchronous inbound communication IEEE_802_15_4_ModSettings m_settings; ScopeVis m_scopeSink; - QMutex m_mutex; + QRecursiveMutex m_mutex; void processFifo(SampleVector& data, unsigned int iBegin, unsigned int iEnd); bool handleMessage(const Message& cmd); diff --git a/plugins/channeltx/modais/aismod.cpp b/plugins/channeltx/modais/aismod.cpp index 46dafffc2..5729da8e4 100644 --- a/plugins/channeltx/modais/aismod.cpp +++ b/plugins/channeltx/modais/aismod.cpp @@ -59,7 +59,6 @@ AISMod::AISMod(DeviceAPI *deviceAPI) : ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSource), m_deviceAPI(deviceAPI), m_spectrumVis(SDR_TX_SCALEF), - m_settingsMutex(QMutex::Recursive), m_udpSocket(nullptr) { setObjectName(m_channelId); diff --git a/plugins/channeltx/modais/aismod.h b/plugins/channeltx/modais/aismod.h index 7275fffb8..d22d6153f 100644 --- a/plugins/channeltx/modais/aismod.h +++ b/plugins/channeltx/modais/aismod.h @@ -21,7 +21,7 @@ #include -#include +#include #include #include "dsp/basebandsamplesource.h" @@ -230,7 +230,7 @@ private: AISModSettings m_settings; SpectrumVis m_spectrumVis; - QMutex m_settingsMutex; + QRecursiveMutex m_settingsMutex; QNetworkAccessManager *m_networkManager; QNetworkRequest m_networkRequest; diff --git a/plugins/channeltx/modais/aismodbaseband.cpp b/plugins/channeltx/modais/aismodbaseband.cpp index fe6516447..9eed787c6 100644 --- a/plugins/channeltx/modais/aismodbaseband.cpp +++ b/plugins/channeltx/modais/aismodbaseband.cpp @@ -27,8 +27,7 @@ MESSAGE_CLASS_DEFINITION(AISModBaseband::MsgConfigureAISModBaseband, Message) -AISModBaseband::AISModBaseband() : - m_mutex(QMutex::Recursive) +AISModBaseband::AISModBaseband() { m_sampleFifo.resize(SampleSourceFifo::getSizePolicy(48000)); m_channelizer = new UpChannelizer(&m_source); diff --git a/plugins/channeltx/modais/aismodbaseband.h b/plugins/channeltx/modais/aismodbaseband.h index e5aa4090f..8f9e7d84e 100644 --- a/plugins/channeltx/modais/aismodbaseband.h +++ b/plugins/channeltx/modais/aismodbaseband.h @@ -20,7 +20,7 @@ #define INCLUDE_AISMODBASEBAND_H #include -#include +#include #include "dsp/samplesourcefifo.h" #include "dsp/scopevis.h" @@ -87,7 +87,7 @@ private: MessageQueue m_inputMessageQueue; //!< Queue for asynchronous inbound communication AISModSettings m_settings; ScopeVis m_scopeSink; - QMutex m_mutex; + QRecursiveMutex m_mutex; void processFifo(SampleVector& data, unsigned int iBegin, unsigned int iEnd); bool handleMessage(const Message& cmd); diff --git a/plugins/channeltx/modam/ammod.cpp b/plugins/channeltx/modam/ammod.cpp index 287176ebb..ecd400fe1 100644 --- a/plugins/channeltx/modam/ammod.cpp +++ b/plugins/channeltx/modam/ammod.cpp @@ -56,7 +56,6 @@ const char* const AMMod::m_channelId ="AMMod"; AMMod::AMMod(DeviceAPI *deviceAPI) : ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSource), m_deviceAPI(deviceAPI), - m_settingsMutex(QMutex::Recursive), m_fileSize(0), m_recordLength(0), m_sampleRate(48000) diff --git a/plugins/channeltx/modam/ammod.h b/plugins/channeltx/modam/ammod.h index 1d2839eae..27df0dcc6 100644 --- a/plugins/channeltx/modam/ammod.h +++ b/plugins/channeltx/modam/ammod.h @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include "dsp/basebandsamplesource.h" @@ -251,7 +251,7 @@ private: AMModSettings m_settings; SampleVector m_sampleBuffer; - QMutex m_settingsMutex; + QRecursiveMutex m_settingsMutex; std::ifstream m_ifstream; QString m_fileName; diff --git a/plugins/channeltx/modam/ammodbaseband.cpp b/plugins/channeltx/modam/ammodbaseband.cpp index 989b59c05..2d72f7962 100644 --- a/plugins/channeltx/modam/ammodbaseband.cpp +++ b/plugins/channeltx/modam/ammodbaseband.cpp @@ -25,8 +25,7 @@ MESSAGE_CLASS_DEFINITION(AMModBaseband::MsgConfigureAMModBaseband, Message) -AMModBaseband::AMModBaseband() : - m_mutex(QMutex::Recursive) +AMModBaseband::AMModBaseband() { m_sampleFifo.resize(SampleSourceFifo::getSizePolicy(48000)); m_channelizer = new UpChannelizer(&m_source); diff --git a/plugins/channeltx/modam/ammodbaseband.h b/plugins/channeltx/modam/ammodbaseband.h index 785eedf72..9f526170b 100644 --- a/plugins/channeltx/modam/ammodbaseband.h +++ b/plugins/channeltx/modam/ammodbaseband.h @@ -19,7 +19,7 @@ #define INCLUDE_AMMODBASEBAND_H #include -#include +#include #include "dsp/samplesourcefifo.h" #include "util/message.h" @@ -87,7 +87,7 @@ private: AMModSource m_source; MessageQueue m_inputMessageQueue; //!< Queue for asynchronous inbound communication AMModSettings m_settings; - QMutex m_mutex; + QRecursiveMutex m_mutex; void processFifo(SampleVector& data, unsigned int iBegin, unsigned int iEnd); bool handleMessage(const Message& cmd); diff --git a/plugins/channeltx/modam/ammodsource.cpp b/plugins/channeltx/modam/ammodsource.cpp index 7ce953f43..fa31baef6 100644 --- a/plugins/channeltx/modam/ammodsource.cpp +++ b/plugins/channeltx/modam/ammodsource.cpp @@ -34,8 +34,7 @@ AMModSource::AMModSource() : m_levelCalcCount(0), m_peakLevel(0.0f), m_levelSum(0.0f), - m_ifstream(nullptr), - m_mutex(QMutex::Recursive) + m_ifstream(nullptr) { m_audioFifo.setLabel("AMModSource.m_audioFifo"); m_feedbackAudioFifo.setLabel("AMModSource.m_feedbackAudioFifo"); diff --git a/plugins/channeltx/modam/ammodsource.h b/plugins/channeltx/modam/ammodsource.h index af97dde02..5cd4c1669 100644 --- a/plugins/channeltx/modam/ammodsource.h +++ b/plugins/channeltx/modam/ammodsource.h @@ -19,7 +19,7 @@ #define INCLUDE_AMMODSOURCE_H #include -#include +#include #include #include @@ -113,7 +113,7 @@ private: std::ifstream *m_ifstream; CWKeyer m_cwKeyer; - QMutex m_mutex; + QRecursiveMutex m_mutex; static const int m_levelNbSamples; diff --git a/plugins/channeltx/modatv/atvmodbaseband.cpp b/plugins/channeltx/modatv/atvmodbaseband.cpp index ade9e01cc..d3b816bd7 100644 --- a/plugins/channeltx/modatv/atvmodbaseband.cpp +++ b/plugins/channeltx/modatv/atvmodbaseband.cpp @@ -32,8 +32,7 @@ MESSAGE_CLASS_DEFINITION(ATVModBaseband::MsgConfigureVideoFileSourceStreamTiming MESSAGE_CLASS_DEFINITION(ATVModBaseband::MsgConfigureCameraIndex, Message) MESSAGE_CLASS_DEFINITION(ATVModBaseband::MsgConfigureCameraData, Message) -ATVModBaseband::ATVModBaseband() : - m_mutex(QMutex::Recursive) +ATVModBaseband::ATVModBaseband() { m_sampleFifo.resize(SampleSourceFifo::getSizePolicy(48000)); m_channelizer = new UpChannelizer(&m_source); @@ -264,4 +263,4 @@ int ATVModBaseband::getChannelSampleRate() const void ATVModBaseband::getCameraNumbers(std::vector& numbers) { m_source.getCameraNumbers(numbers); -} \ No newline at end of file +} diff --git a/plugins/channeltx/modatv/atvmodbaseband.h b/plugins/channeltx/modatv/atvmodbaseband.h index 33c953449..72e2faef9 100644 --- a/plugins/channeltx/modatv/atvmodbaseband.h +++ b/plugins/channeltx/modatv/atvmodbaseband.h @@ -19,7 +19,7 @@ #define INCLUDE_ATVMODBASEBAND_H #include -#include +#include #include "dsp/samplesourcefifo.h" #include "util/message.h" @@ -237,7 +237,7 @@ private: ATVModSource m_source; MessageQueue m_inputMessageQueue; //!< Queue for asynchronous inbound communication ATVModSettings m_settings; - QMutex m_mutex; + QRecursiveMutex m_mutex; void processFifo(SampleVector& data, unsigned int iBegin, unsigned int iEnd); bool handleMessage(const Message& cmd); diff --git a/plugins/channeltx/modchirpchat/chirpchatmod.cpp b/plugins/channeltx/modchirpchat/chirpchatmod.cpp index 37f7fd8ec..91c270021 100644 --- a/plugins/channeltx/modchirpchat/chirpchatmod.cpp +++ b/plugins/channeltx/modchirpchat/chirpchatmod.cpp @@ -55,7 +55,6 @@ ChirpChatMod::ChirpChatMod(DeviceAPI *deviceAPI) : ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSource), m_deviceAPI(deviceAPI), m_currentPayloadTime(0.0), - m_settingsMutex(QMutex::Recursive), m_sampleRate(48000), m_udpSocket(nullptr) { diff --git a/plugins/channeltx/modchirpchat/chirpchatmod.h b/plugins/channeltx/modchirpchat/chirpchatmod.h index 18214d66e..490b9a666 100644 --- a/plugins/channeltx/modchirpchat/chirpchatmod.h +++ b/plugins/channeltx/modchirpchat/chirpchatmod.h @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include "dsp/basebandsamplesource.h" @@ -162,7 +162,7 @@ private: float m_currentPayloadTime; SampleVector m_sampleBuffer; - QMutex m_settingsMutex; + QRecursiveMutex m_settingsMutex; int m_sampleRate; diff --git a/plugins/channeltx/modchirpchat/chirpchatmodbaseband.cpp b/plugins/channeltx/modchirpchat/chirpchatmodbaseband.cpp index ebd1cd4d3..bf6acee63 100644 --- a/plugins/channeltx/modchirpchat/chirpchatmodbaseband.cpp +++ b/plugins/channeltx/modchirpchat/chirpchatmodbaseband.cpp @@ -26,8 +26,7 @@ MESSAGE_CLASS_DEFINITION(ChirpChatModBaseband::MsgConfigureChirpChatModBaseband, Message) MESSAGE_CLASS_DEFINITION(ChirpChatModBaseband::MsgConfigureChirpChatModPayload, Message) -ChirpChatModBaseband::ChirpChatModBaseband() : - m_mutex(QMutex::Recursive) +ChirpChatModBaseband::ChirpChatModBaseband() { m_sampleFifo.resize(SampleSourceFifo::getSizePolicy(48000)); m_channelizer = new UpChannelizer(&m_source); diff --git a/plugins/channeltx/modchirpchat/chirpchatmodbaseband.h b/plugins/channeltx/modchirpchat/chirpchatmodbaseband.h index 87f55a93d..9a5277a77 100644 --- a/plugins/channeltx/modchirpchat/chirpchatmodbaseband.h +++ b/plugins/channeltx/modchirpchat/chirpchatmodbaseband.h @@ -19,7 +19,7 @@ #define INCLUDE_CHIRPCHATMODBASEBAND_H #include -#include +#include #include "dsp/samplesourcefifo.h" #include "util/message.h" @@ -104,7 +104,7 @@ private: ChirpChatModSource m_source; MessageQueue m_inputMessageQueue; //!< Queue for asynchronous inbound communication ChirpChatModSettings m_settings; - QMutex m_mutex; + QRecursiveMutex m_mutex; void processFifo(SampleVector& data, unsigned int iBegin, unsigned int iEnd); bool handleMessage(const Message& cmd); diff --git a/plugins/channeltx/moddatv/datvmodbaseband.cpp b/plugins/channeltx/moddatv/datvmodbaseband.cpp index d1dfe5c0b..afc17040e 100644 --- a/plugins/channeltx/moddatv/datvmodbaseband.cpp +++ b/plugins/channeltx/moddatv/datvmodbaseband.cpp @@ -25,8 +25,7 @@ #include "datvmodbaseband.h" #include "datvmod.h" -DATVModBaseband::DATVModBaseband() : - m_mutex(QMutex::Recursive) +DATVModBaseband::DATVModBaseband() { m_sampleFifo.resize(SampleSourceFifo::getSizePolicy(48000)); m_channelizer = new UpChannelizer(&m_source); diff --git a/plugins/channeltx/moddatv/datvmodbaseband.h b/plugins/channeltx/moddatv/datvmodbaseband.h index 4b7a85dcf..c2478e07c 100644 --- a/plugins/channeltx/moddatv/datvmodbaseband.h +++ b/plugins/channeltx/moddatv/datvmodbaseband.h @@ -23,7 +23,7 @@ #include #include -#include +#include #include "dsp/samplesourcefifo.h" #include "util/message.h" @@ -66,7 +66,7 @@ private: DATVModSource m_source; MessageQueue m_inputMessageQueue; DATVModSettings m_settings; - QMutex m_mutex; + QRecursiveMutex m_mutex; void processFifo(SampleVector& data, unsigned int iBegin, unsigned int iEnd); bool handleMessage(const Message& cmd); diff --git a/plugins/channeltx/modfreedv/freedvmod.cpp b/plugins/channeltx/modfreedv/freedvmod.cpp index 8ffa17f3b..88a01ac86 100644 --- a/plugins/channeltx/modfreedv/freedvmod.cpp +++ b/plugins/channeltx/modfreedv/freedvmod.cpp @@ -56,7 +56,6 @@ FreeDVMod::FreeDVMod(DeviceAPI *deviceAPI) : ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSource), m_deviceAPI(deviceAPI), m_spectrumVis(SDR_TX_SCALEF), - m_settingsMutex(QMutex::Recursive), m_fileSize(0), m_recordLength(0), m_fileSampleRate(8000) // all modes take 8000 S/s input diff --git a/plugins/channeltx/modfreedv/freedvmod.h b/plugins/channeltx/modfreedv/freedvmod.h index 0ed5c8feb..905702deb 100644 --- a/plugins/channeltx/modfreedv/freedvmod.h +++ b/plugins/channeltx/modfreedv/freedvmod.h @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include "dsp/basebandsamplesource.h" @@ -259,7 +259,7 @@ private: SpectrumVis m_spectrumVis; SampleVector m_sampleBuffer; - QMutex m_settingsMutex; + QRecursiveMutex m_settingsMutex; std::ifstream m_ifstream; QString m_fileName; diff --git a/plugins/channeltx/modfreedv/freedvmodbaseband.cpp b/plugins/channeltx/modfreedv/freedvmodbaseband.cpp index 4d382d367..7f64a18b3 100644 --- a/plugins/channeltx/modfreedv/freedvmodbaseband.cpp +++ b/plugins/channeltx/modfreedv/freedvmodbaseband.cpp @@ -25,8 +25,7 @@ MESSAGE_CLASS_DEFINITION(FreeDVModBaseband::MsgConfigureFreeDVModBaseband, Message) -FreeDVModBaseband::FreeDVModBaseband() : - m_mutex(QMutex::Recursive) +FreeDVModBaseband::FreeDVModBaseband() { m_sampleFifo.resize(SampleSourceFifo::getSizePolicy(48000)); m_channelizer = new UpChannelizer(&m_source); diff --git a/plugins/channeltx/modfreedv/freedvmodbaseband.h b/plugins/channeltx/modfreedv/freedvmodbaseband.h index 088e85602..b5900e6e4 100644 --- a/plugins/channeltx/modfreedv/freedvmodbaseband.h +++ b/plugins/channeltx/modfreedv/freedvmodbaseband.h @@ -19,7 +19,7 @@ #define INCLUDE_FREEDVMODBASEBAND_H #include -#include +#include #include "dsp/samplesourcefifo.h" #include "util/message.h" @@ -87,7 +87,7 @@ private: FreeDVModSource m_source; MessageQueue m_inputMessageQueue; //!< Queue for asynchronous inbound communication FreeDVModSettings m_settings; - QMutex m_mutex; + QRecursiveMutex m_mutex; void processFifo(SampleVector& data, unsigned int iBegin, unsigned int iEnd); bool handleMessage(const Message& cmd); diff --git a/plugins/channeltx/modfreedv/freedvmodsource.cpp b/plugins/channeltx/modfreedv/freedvmodsource.cpp index 373360614..37411b9af 100644 --- a/plugins/channeltx/modfreedv/freedvmodsource.cpp +++ b/plugins/channeltx/modfreedv/freedvmodsource.cpp @@ -46,8 +46,7 @@ FreeDVModSource::FreeDVModSource() : m_iModem(0), m_speechIn(nullptr), m_modOut(nullptr), - m_scaleFactor(SDR_TX_SCALEF), - m_mutex(QMutex::Recursive) + m_scaleFactor(SDR_TX_SCALEF) { m_audioFifo.setLabel("FreeDVModSource.m_audioFifo"); m_SSBFilter = new fftfilt(m_lowCutoff / m_audioSampleRate, m_hiCutoff / m_audioSampleRate, m_ssbFftLen); diff --git a/plugins/channeltx/modfreedv/freedvmodsource.h b/plugins/channeltx/modfreedv/freedvmodsource.h index 052d48a31..64085b402 100644 --- a/plugins/channeltx/modfreedv/freedvmodsource.h +++ b/plugins/channeltx/modfreedv/freedvmodsource.h @@ -19,7 +19,7 @@ #define INCLUDE_FREEDVMODSOURCE_H #include -#include +#include #include #include @@ -128,7 +128,7 @@ private: float m_scaleFactor; //!< divide by this amount to scale from int16 to float in [-1.0, 1.0] interval AudioResampler m_audioResampler; - QMutex m_mutex; + QRecursiveMutex m_mutex; static const int m_levelNbSamples; diff --git a/plugins/channeltx/modm17/m17mod.cpp b/plugins/channeltx/modm17/m17mod.cpp index 57880d8f1..293ce3b60 100644 --- a/plugins/channeltx/modm17/m17mod.cpp +++ b/plugins/channeltx/modm17/m17mod.cpp @@ -55,7 +55,6 @@ const char* const M17Mod::m_channelId = "M17Mod"; M17Mod::M17Mod(DeviceAPI *deviceAPI) : ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSource), m_deviceAPI(deviceAPI), - m_settingsMutex(QMutex::Recursive), m_fileSize(0), m_recordLength(0), m_sampleRate(48000) diff --git a/plugins/channeltx/modm17/m17mod.h b/plugins/channeltx/modm17/m17mod.h index 3c890fa52..2a5bb7180 100644 --- a/plugins/channeltx/modm17/m17mod.h +++ b/plugins/channeltx/modm17/m17mod.h @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include @@ -255,7 +255,7 @@ private: M17ModSettings m_settings; SampleVector m_sampleBuffer; - QMutex m_settingsMutex; + QRecursiveMutex m_settingsMutex; std::ifstream m_ifstream; QString m_fileName; diff --git a/plugins/channeltx/modm17/m17modbaseband.cpp b/plugins/channeltx/modm17/m17modbaseband.cpp index 3cb788eec..067463a61 100644 --- a/plugins/channeltx/modm17/m17modbaseband.cpp +++ b/plugins/channeltx/modm17/m17modbaseband.cpp @@ -25,8 +25,7 @@ MESSAGE_CLASS_DEFINITION(M17ModBaseband::MsgConfigureM17ModBaseband, Message) -M17ModBaseband::M17ModBaseband() : - m_mutex(QMutex::Recursive) +M17ModBaseband::M17ModBaseband() { m_sampleFifo.resize(SampleSourceFifo::getSizePolicy(48000)); m_channelizer = new UpChannelizer(&m_source); diff --git a/plugins/channeltx/modm17/m17modbaseband.h b/plugins/channeltx/modm17/m17modbaseband.h index 7ecc298ae..c0cc26661 100644 --- a/plugins/channeltx/modm17/m17modbaseband.h +++ b/plugins/channeltx/modm17/m17modbaseband.h @@ -19,7 +19,7 @@ #define INCLUDE_M17MODBASEBAND_H #include -#include +#include #include "dsp/samplesourcefifo.h" #include "util/message.h" @@ -89,7 +89,7 @@ private: M17ModSource m_source; MessageQueue m_inputMessageQueue; //!< Queue for asynchronous inbound communication M17ModSettings m_settings; - QMutex m_mutex; + QRecursiveMutex m_mutex; void processFifo(SampleVector& data, unsigned int iBegin, unsigned int iEnd); bool handleMessage(const Message& cmd); diff --git a/plugins/channeltx/modm17/m17modsource.cpp b/plugins/channeltx/modm17/m17modsource.cpp index eb2a84af1..9901bd209 100644 --- a/plugins/channeltx/modm17/m17modsource.cpp +++ b/plugins/channeltx/modm17/m17modsource.cpp @@ -39,8 +39,7 @@ M17ModSource::M17ModSource() : m_peakLevel(0.0f), m_levelSum(0.0f), m_ifstream(nullptr), - m_preemphasisFilter(m_preemphasis*48000), - m_mutex(QMutex::Recursive) + m_preemphasisFilter(m_preemphasis*48000) { m_audioFifo.setLabel("M17ModSource.m_audioFifo"); m_feedbackAudioFifo.setLabel("M17ModSource.m_feedbackAudioFifo"); diff --git a/plugins/channeltx/modm17/m17modsource.h b/plugins/channeltx/modm17/m17modsource.h index a282ba573..d2257ca57 100644 --- a/plugins/channeltx/modm17/m17modsource.h +++ b/plugins/channeltx/modm17/m17modsource.h @@ -19,7 +19,7 @@ #define INCLUDE_M17MODSOURCE_H #include -#include +#include #include #include @@ -128,7 +128,7 @@ private: QThread m_processorThread; HighPassFilterRC m_preemphasisFilter; - QMutex m_mutex; + QRecursiveMutex m_mutex; static const int m_levelNbSamples; static const float m_preemphasis; diff --git a/plugins/channeltx/modnfm/nfmmod.cpp b/plugins/channeltx/modnfm/nfmmod.cpp index 50800d4b8..967e02033 100644 --- a/plugins/channeltx/modnfm/nfmmod.cpp +++ b/plugins/channeltx/modnfm/nfmmod.cpp @@ -57,7 +57,6 @@ const char* const NFMMod::m_channelId = "NFMMod"; NFMMod::NFMMod(DeviceAPI *deviceAPI) : ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSource), m_deviceAPI(deviceAPI), - m_settingsMutex(QMutex::Recursive), m_fileSize(0), m_recordLength(0), m_sampleRate(48000) diff --git a/plugins/channeltx/modnfm/nfmmod.h b/plugins/channeltx/modnfm/nfmmod.h index 43f610168..fcac00352 100644 --- a/plugins/channeltx/modnfm/nfmmod.h +++ b/plugins/channeltx/modnfm/nfmmod.h @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include "dsp/basebandsamplesource.h" @@ -251,7 +251,7 @@ private: NFMModSettings m_settings; SampleVector m_sampleBuffer; - QMutex m_settingsMutex; + QRecursiveMutex m_settingsMutex; std::ifstream m_ifstream; QString m_fileName; diff --git a/plugins/channeltx/modnfm/nfmmodbaseband.cpp b/plugins/channeltx/modnfm/nfmmodbaseband.cpp index 083524e45..4804c04f3 100644 --- a/plugins/channeltx/modnfm/nfmmodbaseband.cpp +++ b/plugins/channeltx/modnfm/nfmmodbaseband.cpp @@ -25,8 +25,7 @@ MESSAGE_CLASS_DEFINITION(NFMModBaseband::MsgConfigureNFMModBaseband, Message) -NFMModBaseband::NFMModBaseband() : - m_mutex(QMutex::Recursive) +NFMModBaseband::NFMModBaseband() { m_sampleFifo.resize(SampleSourceFifo::getSizePolicy(48000)); m_channelizer = new UpChannelizer(&m_source); diff --git a/plugins/channeltx/modnfm/nfmmodbaseband.h b/plugins/channeltx/modnfm/nfmmodbaseband.h index 0057fd5ff..925c2040f 100644 --- a/plugins/channeltx/modnfm/nfmmodbaseband.h +++ b/plugins/channeltx/modnfm/nfmmodbaseband.h @@ -19,7 +19,7 @@ #define INCLUDE_NFMMODBASEBAND_H #include -#include +#include #include "dsp/samplesourcefifo.h" #include "util/message.h" @@ -87,7 +87,7 @@ private: NFMModSource m_source; MessageQueue m_inputMessageQueue; //!< Queue for asynchronous inbound communication NFMModSettings m_settings; - QMutex m_mutex; + QRecursiveMutex m_mutex; void processFifo(SampleVector& data, unsigned int iBegin, unsigned int iEnd); bool handleMessage(const Message& cmd); diff --git a/plugins/channeltx/modnfm/nfmmodsource.cpp b/plugins/channeltx/modnfm/nfmmodsource.cpp index 0cd49d9a0..4b07e1bde 100644 --- a/plugins/channeltx/modnfm/nfmmodsource.cpp +++ b/plugins/channeltx/modnfm/nfmmodsource.cpp @@ -37,8 +37,7 @@ NFMModSource::NFMModSource() : m_levelCalcCount(0), m_peakLevel(0.0f), m_levelSum(0.0f), - m_ifstream(nullptr), - m_mutex(QMutex::Recursive) + m_ifstream(nullptr) { m_audioFifo.setLabel("NFMModSource.m_audioFifo"); m_feedbackAudioFifo.setLabel("NFMModSource.m_feedbackAudioFifo"); diff --git a/plugins/channeltx/modnfm/nfmmodsource.h b/plugins/channeltx/modnfm/nfmmodsource.h index 29a46e377..553d7bc6f 100644 --- a/plugins/channeltx/modnfm/nfmmodsource.h +++ b/plugins/channeltx/modnfm/nfmmodsource.h @@ -19,7 +19,7 @@ #define INCLUDE_NFMMODSOURCE_H #include -#include +#include #include #include @@ -127,7 +127,7 @@ private: AudioCompressorSnd m_audioCompressor; - QMutex m_mutex; + QRecursiveMutex m_mutex; static const int m_levelNbSamples; static const float m_preemphasis; diff --git a/plugins/channeltx/modpacket/packetmod.cpp b/plugins/channeltx/modpacket/packetmod.cpp index b9f3ca8b5..0979d2808 100644 --- a/plugins/channeltx/modpacket/packetmod.cpp +++ b/plugins/channeltx/modpacket/packetmod.cpp @@ -61,7 +61,6 @@ PacketMod::PacketMod(DeviceAPI *deviceAPI) : ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSource), m_deviceAPI(deviceAPI), m_spectrumVis(SDR_TX_SCALEF), - m_settingsMutex(QMutex::Recursive), m_sampleRate(48000), m_udpSocket(nullptr) { diff --git a/plugins/channeltx/modpacket/packetmod.h b/plugins/channeltx/modpacket/packetmod.h index afd992f2b..7a2c28d2a 100644 --- a/plugins/channeltx/modpacket/packetmod.h +++ b/plugins/channeltx/modpacket/packetmod.h @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include "dsp/basebandsamplesource.h" @@ -224,7 +224,7 @@ private: SpectrumVis m_spectrumVis; SampleVector m_sampleBuffer; - QMutex m_settingsMutex; + QRecursiveMutex m_settingsMutex; int m_sampleRate; diff --git a/plugins/channeltx/modpacket/packetmodbaseband.cpp b/plugins/channeltx/modpacket/packetmodbaseband.cpp index a438b1859..553c18eb3 100644 --- a/plugins/channeltx/modpacket/packetmodbaseband.cpp +++ b/plugins/channeltx/modpacket/packetmodbaseband.cpp @@ -27,8 +27,7 @@ MESSAGE_CLASS_DEFINITION(PacketModBaseband::MsgConfigurePacketModBaseband, Message) -PacketModBaseband::PacketModBaseband() : - m_mutex(QMutex::Recursive) +PacketModBaseband::PacketModBaseband() { m_sampleFifo.resize(SampleSourceFifo::getSizePolicy(48000)); m_channelizer = new UpChannelizer(&m_source); diff --git a/plugins/channeltx/modpacket/packetmodbaseband.h b/plugins/channeltx/modpacket/packetmodbaseband.h index df7231a24..7147c1ed1 100644 --- a/plugins/channeltx/modpacket/packetmodbaseband.h +++ b/plugins/channeltx/modpacket/packetmodbaseband.h @@ -20,7 +20,7 @@ #define INCLUDE_PACKETMODBASEBAND_H #include -#include +#include #include "dsp/samplesourcefifo.h" #include "util/message.h" @@ -84,7 +84,7 @@ private: PacketModSource m_source; MessageQueue m_inputMessageQueue; //!< Queue for asynchronous inbound communication PacketModSettings m_settings; - QMutex m_mutex; + QRecursiveMutex m_mutex; void processFifo(SampleVector& data, unsigned int iBegin, unsigned int iEnd); bool handleMessage(const Message& cmd); diff --git a/plugins/channeltx/modssb/ssbmod.cpp b/plugins/channeltx/modssb/ssbmod.cpp index f9e997c92..134b00d3e 100644 --- a/plugins/channeltx/modssb/ssbmod.cpp +++ b/plugins/channeltx/modssb/ssbmod.cpp @@ -57,7 +57,6 @@ SSBMod::SSBMod(DeviceAPI *deviceAPI) : ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSource), m_deviceAPI(deviceAPI), m_spectrumVis(SDR_TX_SCALEF), - m_settingsMutex(QMutex::Recursive), m_fileSize(0), m_recordLength(0), m_sampleRate(48000) diff --git a/plugins/channeltx/modssb/ssbmod.h b/plugins/channeltx/modssb/ssbmod.h index d09f97ed2..5768d7cf4 100644 --- a/plugins/channeltx/modssb/ssbmod.h +++ b/plugins/channeltx/modssb/ssbmod.h @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include "dsp/basebandsamplesource.h" @@ -255,7 +255,7 @@ private: SpectrumVis m_spectrumVis; SampleVector m_sampleBuffer; - QMutex m_settingsMutex; + QRecursiveMutex m_settingsMutex; std::ifstream m_ifstream; QString m_fileName; diff --git a/plugins/channeltx/modssb/ssbmodbaseband.cpp b/plugins/channeltx/modssb/ssbmodbaseband.cpp index 1102b2d51..7e87efa16 100644 --- a/plugins/channeltx/modssb/ssbmodbaseband.cpp +++ b/plugins/channeltx/modssb/ssbmodbaseband.cpp @@ -26,8 +26,7 @@ MESSAGE_CLASS_DEFINITION(SSBModBaseband::MsgConfigureSSBModBaseband, Message) -SSBModBaseband::SSBModBaseband() : - m_mutex(QMutex::Recursive) +SSBModBaseband::SSBModBaseband() { m_sampleFifo.resize(SampleSourceFifo::getSizePolicy(48000)); m_channelizer = new UpChannelizer(&m_source); diff --git a/plugins/channeltx/modssb/ssbmodbaseband.h b/plugins/channeltx/modssb/ssbmodbaseband.h index 5776698f8..a4feaffc3 100644 --- a/plugins/channeltx/modssb/ssbmodbaseband.h +++ b/plugins/channeltx/modssb/ssbmodbaseband.h @@ -19,7 +19,7 @@ #define INCLUDE_SSBMODBASEBAND_H #include -#include +#include #include "dsp/samplesourcefifo.h" #include "util/message.h" @@ -91,7 +91,7 @@ private: MessageQueue m_inputMessageQueue; //!< Queue for asynchronous inbound communication SSBModSettings m_settings; SpectrumVis *m_spectrumVis; - QMutex m_mutex; + QRecursiveMutex m_mutex; void processFifo(SampleVector& data, unsigned int iBegin, unsigned int iEnd); bool handleMessage(const Message& cmd); diff --git a/plugins/channeltx/modssb/ssbmodsource.cpp b/plugins/channeltx/modssb/ssbmodsource.cpp index f22457de0..145a05fe7 100644 --- a/plugins/channeltx/modssb/ssbmodsource.cpp +++ b/plugins/channeltx/modssb/ssbmodsource.cpp @@ -38,8 +38,7 @@ SSBModSource::SSBModSource() : m_levelCalcCount(0), m_peakLevel(0.0f), m_levelSum(0.0f), - m_ifstream(nullptr), - m_mutex(QMutex::Recursive) + m_ifstream(nullptr) { m_audioFifo.setLabel("SSBModSource.m_audioFifo"); m_feedbackAudioFifo.setLabel("SSBModSource.m_feedbackAudioFifo"); diff --git a/plugins/channeltx/modssb/ssbmodsource.h b/plugins/channeltx/modssb/ssbmodsource.h index 8618dbca0..116758959 100644 --- a/plugins/channeltx/modssb/ssbmodsource.h +++ b/plugins/channeltx/modssb/ssbmodsource.h @@ -19,7 +19,7 @@ #define INCLUDE_SSBMODSOURCE_H #include -#include +#include #include #include @@ -135,7 +135,7 @@ private: AudioCompressorSnd m_audioCompressor; int m_agcStepLength; - QMutex m_mutex; + QRecursiveMutex m_mutex; static const int m_levelNbSamples; diff --git a/plugins/channeltx/modwfm/wfmmod.cpp b/plugins/channeltx/modwfm/wfmmod.cpp index e95a01a3e..d081dee36 100644 --- a/plugins/channeltx/modwfm/wfmmod.cpp +++ b/plugins/channeltx/modwfm/wfmmod.cpp @@ -55,7 +55,6 @@ const char* const WFMMod::m_channelId = "WFMMod"; WFMMod::WFMMod(DeviceAPI *deviceAPI) : ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSource), m_deviceAPI(deviceAPI), - m_settingsMutex(QMutex::Recursive), m_fileSize(0), m_recordLength(0), m_sampleRate(48000) diff --git a/plugins/channeltx/modwfm/wfmmod.h b/plugins/channeltx/modwfm/wfmmod.h index d209ef708..75d7090f9 100644 --- a/plugins/channeltx/modwfm/wfmmod.h +++ b/plugins/channeltx/modwfm/wfmmod.h @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include "dsp/basebandsamplesource.h" @@ -261,7 +261,7 @@ private: WFMModSettings m_settings; SampleVector m_sampleBuffer; - QMutex m_settingsMutex; + QRecursiveMutex m_settingsMutex; std::ifstream m_ifstream; QString m_fileName; diff --git a/plugins/channeltx/modwfm/wfmmodbaseband.cpp b/plugins/channeltx/modwfm/wfmmodbaseband.cpp index a335e5e30..1401adb87 100644 --- a/plugins/channeltx/modwfm/wfmmodbaseband.cpp +++ b/plugins/channeltx/modwfm/wfmmodbaseband.cpp @@ -25,8 +25,7 @@ MESSAGE_CLASS_DEFINITION(WFMModBaseband::MsgConfigureWFMModBaseband, Message) -WFMModBaseband::WFMModBaseband() : - m_mutex(QMutex::Recursive) +WFMModBaseband::WFMModBaseband() { m_sampleFifo.resize(SampleSourceFifo::getSizePolicy(48000)); m_channelizer = new UpChannelizer(&m_source); diff --git a/plugins/channeltx/modwfm/wfmmodbaseband.h b/plugins/channeltx/modwfm/wfmmodbaseband.h index a7ef056cf..58ada5d11 100644 --- a/plugins/channeltx/modwfm/wfmmodbaseband.h +++ b/plugins/channeltx/modwfm/wfmmodbaseband.h @@ -19,7 +19,7 @@ #define INCLUDE_WFMMODBASEBAND_H #include -#include +#include #include "dsp/samplesourcefifo.h" #include "util/message.h" @@ -86,7 +86,7 @@ private: WFMModSource m_source; MessageQueue m_inputMessageQueue; //!< Queue for asynchronous inbound communication WFMModSettings m_settings; - QMutex m_mutex; + QRecursiveMutex m_mutex; void processFifo(SampleVector& data, unsigned int iBegin, unsigned int iEnd); bool handleMessage(const Message& cmd); diff --git a/plugins/channeltx/modwfm/wfmmodsource.cpp b/plugins/channeltx/modwfm/wfmmodsource.cpp index 9b4868cef..c30fc15b6 100644 --- a/plugins/channeltx/modwfm/wfmmodsource.cpp +++ b/plugins/channeltx/modwfm/wfmmodsource.cpp @@ -36,8 +36,7 @@ WFMModSource::WFMModSource() : m_levelCalcCount(0), m_peakLevel(0.0f), m_levelSum(0.0f), - m_ifstream(nullptr), - m_mutex(QMutex::Recursive) + m_ifstream(nullptr) { m_audioFifo.setLabel("WFMModSource.m_audioFifo"); m_feedbackAudioFifo.setLabel("WFMModSource.m_feedbackAudioFifo"); diff --git a/plugins/channeltx/modwfm/wfmmodsource.h b/plugins/channeltx/modwfm/wfmmodsource.h index 78fa6e399..0255b6921 100644 --- a/plugins/channeltx/modwfm/wfmmodsource.h +++ b/plugins/channeltx/modwfm/wfmmodsource.h @@ -19,7 +19,7 @@ #define INCLUDE_WFMMODSOURCE_H #include -#include +#include #include #include @@ -122,7 +122,7 @@ private: std::ifstream *m_ifstream; CWKeyer m_cwKeyer; - QMutex m_mutex; + QRecursiveMutex m_mutex; static const int m_levelNbSamples; diff --git a/plugins/channeltx/remotesource/remotesourcebaseband.cpp b/plugins/channeltx/remotesource/remotesourcebaseband.cpp index 3e82ed9c5..392d736c9 100644 --- a/plugins/channeltx/remotesource/remotesourcebaseband.cpp +++ b/plugins/channeltx/remotesource/remotesourcebaseband.cpp @@ -26,8 +26,7 @@ MESSAGE_CLASS_DEFINITION(RemoteSourceBaseband::MsgConfigureRemoteSourceBaseband, Message) MESSAGE_CLASS_DEFINITION(RemoteSourceBaseband::MsgConfigureRemoteSourceWork, Message) -RemoteSourceBaseband::RemoteSourceBaseband() : - m_mutex(QMutex::Recursive) +RemoteSourceBaseband::RemoteSourceBaseband() { m_sampleFifo.resize(SampleSourceFifo::getSizePolicy(48000)); m_channelizer = new UpChannelizer(&m_source); diff --git a/plugins/channeltx/remotesource/remotesourcebaseband.h b/plugins/channeltx/remotesource/remotesourcebaseband.h index c2b22230b..111566d5a 100644 --- a/plugins/channeltx/remotesource/remotesourcebaseband.h +++ b/plugins/channeltx/remotesource/remotesourcebaseband.h @@ -19,7 +19,7 @@ #define INCLUDE_REMOTESOURCEBASEBAND_H #include -#include +#include #include "dsp/samplesourcefifo.h" #include "util/message.h" @@ -94,7 +94,7 @@ private: RemoteSourceSource m_source; MessageQueue m_inputMessageQueue; //!< Queue for asynchronous inbound communication RemoteSourceSettings m_settings; - QMutex m_mutex; + QRecursiveMutex m_mutex; void processFifo(SampleVector& data, unsigned int iBegin, unsigned int iEnd); bool handleMessage(const Message& cmd); diff --git a/plugins/channeltx/remotesource/remotesourceworker.cpp b/plugins/channeltx/remotesource/remotesourceworker.cpp index 258d4fc6b..8d2f9dffe 100644 --- a/plugins/channeltx/remotesource/remotesourceworker.cpp +++ b/plugins/channeltx/remotesource/remotesourceworker.cpp @@ -32,7 +32,6 @@ RemoteSourceWorker::RemoteSourceWorker(RemoteDataQueue *dataQueue, QObject* pare m_dataQueue(dataQueue), m_address(QHostAddress::LocalHost), m_socket(this), - m_mutex(QMutex::Recursive), m_sampleRate(0), m_udpReadBytes(0) { diff --git a/plugins/channeltx/remotesource/remotesourceworker.h b/plugins/channeltx/remotesource/remotesourceworker.h index 5784413e2..89b18990f 100644 --- a/plugins/channeltx/remotesource/remotesourceworker.h +++ b/plugins/channeltx/remotesource/remotesourceworker.h @@ -69,7 +69,7 @@ private: QHostAddress m_address; QUdpSocket m_socket; - QMutex m_mutex; + QRecursiveMutex m_mutex; static const uint32_t m_nbDataFrames = 4; //!< number of data frames in the ring buffer RemoteDataFrame *m_dataFrames[m_nbDataFrames]; //!< ring buffer of data frames indexed by frame affinity diff --git a/plugins/channeltx/udpsource/udpsource.cpp b/plugins/channeltx/udpsource/udpsource.cpp index 9068c6526..62753e585 100644 --- a/plugins/channeltx/udpsource/udpsource.cpp +++ b/plugins/channeltx/udpsource/udpsource.cpp @@ -44,8 +44,7 @@ const char* const UDPSource::m_channelId = "UDPSource"; UDPSource::UDPSource(DeviceAPI *deviceAPI) : ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSource), m_deviceAPI(deviceAPI), - m_spectrumVis(SDR_TX_SCALEF), - m_settingsMutex(QMutex::Recursive) + m_spectrumVis(SDR_TX_SCALEF) { setObjectName(m_channelId); diff --git a/plugins/channeltx/udpsource/udpsource.h b/plugins/channeltx/udpsource/udpsource.h index 6bab5cd1e..c7337954c 100644 --- a/plugins/channeltx/udpsource/udpsource.h +++ b/plugins/channeltx/udpsource/udpsource.h @@ -174,7 +174,7 @@ private: SpectrumVis m_spectrumVis; SampleVector m_sampleBuffer; - QMutex m_settingsMutex; + QRecursiveMutex m_settingsMutex; QNetworkAccessManager *m_networkManager; QNetworkRequest m_networkRequest; diff --git a/plugins/channeltx/udpsource/udpsourcebaseband.cpp b/plugins/channeltx/udpsource/udpsourcebaseband.cpp index 07e3b57e9..ddb2b2603 100644 --- a/plugins/channeltx/udpsource/udpsourcebaseband.cpp +++ b/plugins/channeltx/udpsource/udpsourcebaseband.cpp @@ -29,8 +29,7 @@ MESSAGE_CLASS_DEFINITION(UDPSourceBaseband::MsgConfigureChannelizer, Message) MESSAGE_CLASS_DEFINITION(UDPSourceBaseband::MsgUDPSourceSpectrum, Message) MESSAGE_CLASS_DEFINITION(UDPSourceBaseband::MsgResetReadIndex, Message) -UDPSourceBaseband::UDPSourceBaseband() : - m_mutex(QMutex::Recursive) +UDPSourceBaseband::UDPSourceBaseband() { m_sampleFifo.resize(SampleSourceFifo::getSizePolicy(48000)); m_channelizer = new UpChannelizer(&m_source); @@ -202,4 +201,4 @@ int UDPSourceBaseband::getChannelSampleRate() const bool UDPSourceBaseband::isSquelchOpen() const { return m_source.getSquelchOpen(); -} \ No newline at end of file +} diff --git a/plugins/channeltx/udpsource/udpsourcebaseband.h b/plugins/channeltx/udpsource/udpsourcebaseband.h index f88a6a365..855924860 100644 --- a/plugins/channeltx/udpsource/udpsourcebaseband.h +++ b/plugins/channeltx/udpsource/udpsourcebaseband.h @@ -19,7 +19,7 @@ #define INCLUDE_UDPSOURCEBASEBAND_H #include -#include +#include #include "dsp/samplesourcefifo.h" #include "util/message.h" @@ -144,7 +144,7 @@ private: UDPSourceSource m_source; MessageQueue m_inputMessageQueue; //!< Queue for asynchronous inbound communication UDPSourceSettings m_settings; - QMutex m_mutex; + QRecursiveMutex m_mutex; void processFifo(SampleVector& data, unsigned int iBegin, unsigned int iEnd); bool handleMessage(const Message& cmd); diff --git a/plugins/feature/afc/afcworker.cpp b/plugins/feature/afc/afcworker.cpp index 631f8e278..53d78df5b 100644 --- a/plugins/feature/afc/afcworker.cpp +++ b/plugins/feature/afc/afcworker.cpp @@ -46,8 +46,7 @@ AFCWorker::AFCWorker(WebAPIAdapterInterface *webAPIAdapterInterface) : m_freqTracker(nullptr), m_trackerDeviceFrequency(0), m_trackerChannelOffset(0), - m_updateTimer(this), - m_mutex(QMutex::Recursive) + m_updateTimer(this) { qDebug("AFCWorker::AFCWorker"); connect(&m_updateTimer, SIGNAL(timeout()), this, SLOT(updateTarget())); diff --git a/plugins/feature/afc/afcworker.h b/plugins/feature/afc/afcworker.h index 25eb0200e..795b1b6a1 100644 --- a/plugins/feature/afc/afcworker.h +++ b/plugins/feature/afc/afcworker.h @@ -153,7 +153,7 @@ private: int m_trackerChannelOffset; QMap m_channelsMap; QTimer m_updateTimer; - QMutex m_mutex; + QRecursiveMutex m_mutex; bool handleMessage(const Message& cmd); void applySettings(const AFCSettings& settings, bool force = false); diff --git a/plugins/feature/aprs/aprsworker.cpp b/plugins/feature/aprs/aprsworker.cpp index 09f8e3cab..29b70bf1a 100644 --- a/plugins/feature/aprs/aprsworker.cpp +++ b/plugins/feature/aprs/aprsworker.cpp @@ -38,7 +38,6 @@ APRSWorker::APRSWorker(APRS *aprs, WebAPIAdapterInterface *webAPIAdapterInterfac m_msgQueueToFeature(nullptr), m_msgQueueToGUI(nullptr), m_running(false), - m_mutex(QMutex::Recursive), m_socket(this) { connect(&m_socket, SIGNAL(readyRead()),this, SLOT(recv())); diff --git a/plugins/feature/aprs/aprsworker.h b/plugins/feature/aprs/aprsworker.h index 225afa96f..5174fd716 100644 --- a/plugins/feature/aprs/aprsworker.h +++ b/plugins/feature/aprs/aprsworker.h @@ -76,7 +76,7 @@ private: MessageQueue *m_msgQueueToGUI; APRSSettings m_settings; bool m_running; - QMutex m_mutex; + QRecursiveMutex m_mutex; QTcpSocket m_socket; bool m_loggedIn; diff --git a/plugins/feature/demodanalyzer/demodanalyzerworker.cpp b/plugins/feature/demodanalyzer/demodanalyzerworker.cpp index 2b28a1cee..f12227ceb 100644 --- a/plugins/feature/demodanalyzer/demodanalyzerworker.cpp +++ b/plugins/feature/demodanalyzer/demodanalyzerworker.cpp @@ -29,8 +29,7 @@ DemodAnalyzerWorker::DemodAnalyzerWorker() : m_dataFifo(nullptr), m_msgQueueToFeature(nullptr), m_sampleBufferSize(0), - m_running(false), - m_mutex(QMutex::Recursive) + m_running(false) { qDebug("DemodAnalyzerWorker::DemodAnalyzerWorker"); } diff --git a/plugins/feature/demodanalyzer/demodanalyzerworker.h b/plugins/feature/demodanalyzer/demodanalyzerworker.h index 5a446c59a..9b6d802ed 100644 --- a/plugins/feature/demodanalyzer/demodanalyzerworker.h +++ b/plugins/feature/demodanalyzer/demodanalyzerworker.h @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include "dsp/dsptypes.h" @@ -123,7 +123,7 @@ private: MovingAverageUtil m_channelPowerAvg; ScopeVis* m_scopeVis; bool m_running; - QMutex m_mutex; + QRecursiveMutex m_mutex; bool handleMessage(const Message& cmd); void decimate(int countSamples); diff --git a/plugins/feature/gs232controller/gs232controllerworker.cpp b/plugins/feature/gs232controller/gs232controllerworker.cpp index 4f9a3d500..a53e3bbaf 100644 --- a/plugins/feature/gs232controller/gs232controllerworker.cpp +++ b/plugins/feature/gs232controller/gs232controllerworker.cpp @@ -33,7 +33,6 @@ MESSAGE_CLASS_DEFINITION(GS232ControllerReport::MsgReportAzAl, Message) GS232ControllerWorker::GS232ControllerWorker() : m_msgQueueToFeature(nullptr), m_running(false), - m_mutex(QMutex::Recursive), m_device(nullptr), m_serialPort(this), m_socket(this), diff --git a/plugins/feature/gs232controller/gs232controllerworker.h b/plugins/feature/gs232controller/gs232controllerworker.h index fae1fe087..57f7be131 100644 --- a/plugins/feature/gs232controller/gs232controllerworker.h +++ b/plugins/feature/gs232controller/gs232controllerworker.h @@ -71,7 +71,7 @@ private: MessageQueue *m_msgQueueToFeature; //!< Queue to report channel change to main feature object GS232ControllerSettings m_settings; bool m_running; - QMutex m_mutex; + QRecursiveMutex m_mutex; QIODevice *m_device; QSerialPort m_serialPort; QTcpSocket m_socket; diff --git a/plugins/feature/map/map.cpp b/plugins/feature/map/map.cpp index b7f2a66c1..003ae21ab 100644 --- a/plugins/feature/map/map.cpp +++ b/plugins/feature/map/map.cpp @@ -46,8 +46,7 @@ const char* const Map::m_featureId = "Map"; Map::Map(WebAPIAdapterInterface *webAPIAdapterInterface) : Feature(m_featureIdURI, webAPIAdapterInterface), - m_multiplier(0.0), - m_dateTimeMutex(QMutex::Recursive) + m_multiplier(0.0) { qDebug("Map::Map: webAPIAdapterInterface: %p", webAPIAdapterInterface); setObjectName(m_featureId); diff --git a/plugins/feature/map/map.h b/plugins/feature/map/map.h index 5b62526e3..5d8778c82 100644 --- a/plugins/feature/map/map.h +++ b/plugins/feature/map/map.h @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include "feature/feature.h" #include "util/message.h" @@ -187,7 +187,7 @@ private: QDateTime m_mapDateTime; QDateTime m_systemDateTime; double m_multiplier; - QMutex m_dateTimeMutex; + QRecursiveMutex m_dateTimeMutex; private slots: void networkManagerFinished(QNetworkReply *reply); diff --git a/plugins/feature/pertester/pertesterworker.cpp b/plugins/feature/pertester/pertesterworker.cpp index 9f0a0eb8b..25572a241 100644 --- a/plugins/feature/pertester/pertesterworker.cpp +++ b/plugins/feature/pertester/pertesterworker.cpp @@ -40,7 +40,6 @@ PERTesterWorker::PERTesterWorker() : m_msgQueueToFeature(nullptr), m_msgQueueToGUI(nullptr), m_running(false), - m_mutex(QMutex::Recursive), m_rxUDPSocket(nullptr), m_txUDPSocket(this), m_txTimer(this), diff --git a/plugins/feature/pertester/pertesterworker.h b/plugins/feature/pertester/pertesterworker.h index 2cecaa341..5499ddac7 100644 --- a/plugins/feature/pertester/pertesterworker.h +++ b/plugins/feature/pertester/pertesterworker.h @@ -72,7 +72,7 @@ private: MessageQueue *m_msgQueueToGUI; PERTesterSettings m_settings; bool m_running; - QMutex m_mutex; + QRecursiveMutex m_mutex; QUdpSocket *m_rxUDPSocket; //!< UDP socket to receive packets on QUdpSocket m_txUDPSocket; QTimer m_txTimer; diff --git a/plugins/feature/rigctlserver/rigctlserverworker.cpp b/plugins/feature/rigctlserver/rigctlserverworker.cpp index 56150a0e2..88f9a7882 100644 --- a/plugins/feature/rigctlserver/rigctlserverworker.cpp +++ b/plugins/feature/rigctlserver/rigctlserverworker.cpp @@ -55,8 +55,7 @@ RigCtlServerWorker::RigCtlServerWorker(WebAPIAdapterInterface *webAPIAdapterInte m_clientConnection(nullptr), m_webAPIAdapterInterface(webAPIAdapterInterface), m_msgQueueToFeature(nullptr), - m_running(false), - m_mutex(QMutex::Recursive) + m_running(false) { qDebug("RigCtlServerWorker::RigCtlServerWorker"); } diff --git a/plugins/feature/rigctlserver/rigctlserverworker.h b/plugins/feature/rigctlserver/rigctlserverworker.h index 0b5f6e6ce..0c528d663 100644 --- a/plugins/feature/rigctlserver/rigctlserverworker.h +++ b/plugins/feature/rigctlserver/rigctlserverworker.h @@ -118,7 +118,7 @@ private: MessageQueue *m_msgQueueToFeature; //!< Queue to report channel change to main feature object RigCtlServerSettings m_settings; bool m_running; - QMutex m_mutex; + QRecursiveMutex m_mutex; static const unsigned int m_CmdLength; static const unsigned int m_ResponseLength; diff --git a/plugins/feature/satellitetracker/satellitetrackerworker.cpp b/plugins/feature/satellitetracker/satellitetrackerworker.cpp index f8012a1cb..55e6392ab 100644 --- a/plugins/feature/satellitetracker/satellitetrackerworker.cpp +++ b/plugins/feature/satellitetracker/satellitetrackerworker.cpp @@ -56,7 +56,6 @@ SatelliteTrackerWorker::SatelliteTrackerWorker(SatelliteTracker* satelliteTracke m_msgQueueToFeature(nullptr), m_msgQueueToGUI(nullptr), m_running(false), - m_mutex(QMutex::Recursive), m_pollTimer(this), m_recalculatePasses(true), m_flipRotation(false), diff --git a/plugins/feature/satellitetracker/satellitetrackerworker.h b/plugins/feature/satellitetracker/satellitetrackerworker.h index a9eca360e..45d057d87 100644 --- a/plugins/feature/satellitetracker/satellitetrackerworker.h +++ b/plugins/feature/satellitetracker/satellitetrackerworker.h @@ -111,7 +111,7 @@ private: MessageQueue *m_msgQueueToGUI; SatelliteTrackerSettings m_settings; bool m_running; - QMutex m_mutex; + QRecursiveMutex m_mutex; QTimer m_pollTimer; QHash m_satellites; QHash m_workerState; diff --git a/plugins/feature/simpleptt/simplepttworker.cpp b/plugins/feature/simpleptt/simplepttworker.cpp index 3f2a85f53..ef735cc2f 100644 --- a/plugins/feature/simpleptt/simplepttworker.cpp +++ b/plugins/feature/simpleptt/simplepttworker.cpp @@ -42,8 +42,7 @@ SimplePTTWorker::SimplePTTWorker(WebAPIAdapterInterface *webAPIAdapterInterface) m_voxLevel(1.0), m_voxHoldCount(0), m_voxState(false), - m_updateTimer(this), - m_mutex(QMutex::Recursive) + m_updateTimer(this) { m_audioReadBuffer.resize(16384); m_audioReadBufferFill = 0; diff --git a/plugins/feature/simpleptt/simplepttworker.h b/plugins/feature/simpleptt/simplepttworker.h index e1d67098e..f51b55cd2 100644 --- a/plugins/feature/simpleptt/simplepttworker.h +++ b/plugins/feature/simpleptt/simplepttworker.h @@ -106,7 +106,7 @@ private: int m_voxHoldCount; bool m_voxState; QTimer m_updateTimer; - QMutex m_mutex; + QRecursiveMutex m_mutex; bool handleMessage(const Message& cmd); void applySettings(const SimplePTTSettings& settings, bool force = false); diff --git a/plugins/feature/startracker/startrackerworker.cpp b/plugins/feature/startracker/startrackerworker.cpp index c21643929..373832794 100644 --- a/plugins/feature/startracker/startrackerworker.cpp +++ b/plugins/feature/startracker/startrackerworker.cpp @@ -51,7 +51,6 @@ StarTrackerWorker::StarTrackerWorker(StarTracker* starTracker, WebAPIAdapterInte m_msgQueueToFeature(nullptr), m_msgQueueToGUI(nullptr), m_running(false), - m_mutex(QMutex::Recursive), m_pollTimer(this), m_tcpServer(nullptr), m_clientConnection(nullptr), diff --git a/plugins/feature/startracker/startrackerworker.h b/plugins/feature/startracker/startrackerworker.h index 26d1f9908..a2923f6c5 100644 --- a/plugins/feature/startracker/startrackerworker.h +++ b/plugins/feature/startracker/startrackerworker.h @@ -82,7 +82,7 @@ private: MessageQueue *m_msgQueueToGUI; StarTrackerSettings m_settings; bool m_running; - QMutex m_mutex; + QRecursiveMutex m_mutex; QTimer m_pollTimer; QTcpServer *m_tcpServer; QTcpSocket *m_clientConnection; diff --git a/plugins/feature/vorlocalizer/vorlocalizerworker.cpp b/plugins/feature/vorlocalizer/vorlocalizerworker.cpp index 2c2affb67..b5c841199 100644 --- a/plugins/feature/vorlocalizer/vorlocalizerworker.cpp +++ b/plugins/feature/vorlocalizer/vorlocalizerworker.cpp @@ -47,7 +47,6 @@ VorLocalizerWorker::VorLocalizerWorker(WebAPIAdapterInterface *webAPIAdapterInte m_availableChannels(nullptr), m_running(false), m_updateTimer(this), - m_mutex(QMutex::Recursive), m_rrTimer(this) { qDebug("VorLocalizerWorker::VorLocalizerWorker"); diff --git a/plugins/feature/vorlocalizer/vorlocalizerworker.h b/plugins/feature/vorlocalizer/vorlocalizerworker.h index daf693c44..f5b360308 100644 --- a/plugins/feature/vorlocalizer/vorlocalizerworker.h +++ b/plugins/feature/vorlocalizer/vorlocalizerworker.h @@ -148,7 +148,7 @@ private: QHash *m_availableChannels; bool m_running; QTimer m_updateTimer; - QMutex m_mutex; + QRecursiveMutex m_mutex; QTimer m_rrTimer; std::vector> m_rrPlans; //!< Round robin plans for each device std::vector m_rrTurnCounters; //!< Round robin turn count for each device diff --git a/plugins/samplemimo/metismiso/metismisoudphandler.cpp b/plugins/samplemimo/metismiso/metismisoudphandler.cpp index daa96ae4a..2f0f78237 100644 --- a/plugins/samplemimo/metismiso/metismisoudphandler.cpp +++ b/plugins/samplemimo/metismiso/metismisoudphandler.cpp @@ -34,7 +34,6 @@ MetisMISOUDPHandler::MetisMISOUDPHandler(SampleMIFifo *sampleMIFifo, SampleMOFif m_sampleCount(0), m_sampleTxCount(0), m_messageQueueToGUI(nullptr), - m_mutex(QMutex::Recursive), m_commandBase(0), m_receiveSequence(0), m_receiveSequenceError(0) diff --git a/plugins/samplemimo/metismiso/metismisoudphandler.h b/plugins/samplemimo/metismiso/metismisoudphandler.h index 24e0986b0..85a6138ad 100644 --- a/plugins/samplemimo/metismiso/metismisoudphandler.h +++ b/plugins/samplemimo/metismiso/metismisoudphandler.h @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include "dsp/decimators.h" #include "util/messagequeue.h" @@ -88,7 +88,7 @@ private: MessageQueue *m_messageQueueToGUI; MessageQueue m_inputMessageQueue; MetisMISOSettings m_settings; - QMutex m_mutex; + QRecursiveMutex m_mutex; MetisMISODecimators m_decimators; unsigned long m_sendSequence; diff --git a/plugins/samplemimo/testmi/testmiworker.cpp b/plugins/samplemimo/testmi/testmiworker.cpp index 4b4007e57..5a334ca3d 100644 --- a/plugins/samplemimo/testmi/testmiworker.cpp +++ b/plugins/samplemimo/testmi/testmiworker.cpp @@ -61,8 +61,7 @@ TestMIWorker::TestMIWorker(SampleMIFifo* sampleFifo, int streamIndex, QObject* p m_frequency(435*1000), m_fcPosShift(0), m_throttlems(TESTMI_THROTTLE_MS), - m_throttleToggle(false), - m_mutex(QMutex::Recursive) + m_throttleToggle(false) { connect(&m_inputMessageQueue, SIGNAL(messageEnqueued()), this, SLOT(handleInputMessages()), Qt::QueuedConnection); } diff --git a/plugins/samplemimo/testmi/testmiworker.h b/plugins/samplemimo/testmi/testmiworker.h index 5680244b5..62db1b0b6 100644 --- a/plugins/samplemimo/testmi/testmiworker.h +++ b/plugins/samplemimo/testmi/testmiworker.h @@ -105,7 +105,7 @@ private: QTimer m_timer; QElapsedTimer m_elapsedTimer; bool m_throttleToggle; - QMutex m_mutex; + QRecursiveMutex m_mutex; MessageQueue m_inputMessageQueue; diff --git a/plugins/samplesource/remoteinput/remoteinput.cpp b/plugins/samplesource/remoteinput/remoteinput.cpp index 3328e248d..c936b70ba 100644 --- a/plugins/samplesource/remoteinput/remoteinput.cpp +++ b/plugins/samplesource/remoteinput/remoteinput.cpp @@ -51,7 +51,6 @@ MESSAGE_CLASS_DEFINITION(RemoteInput::MsgRequestFixedData, Message) RemoteInput::RemoteInput(DeviceAPI *deviceAPI) : m_deviceAPI(deviceAPI), m_sampleRate(48000), - m_mutex(QMutex::Recursive), m_settings(), m_remoteInputUDPHandler(nullptr), m_deviceDescription("RemoteInput"), diff --git a/plugins/samplesource/remoteinput/remoteinput.h b/plugins/samplesource/remoteinput/remoteinput.h index e23abf282..90ca4c7e2 100644 --- a/plugins/samplesource/remoteinput/remoteinput.h +++ b/plugins/samplesource/remoteinput/remoteinput.h @@ -403,7 +403,7 @@ public: private: DeviceAPI *m_deviceAPI; int m_sampleRate; - QMutex m_mutex; + QRecursiveMutex m_mutex; RemoteInputSettings m_settings; RemoteChannelSettings m_remoteChannelSettings; RemoteInputUDPHandler* m_remoteInputUDPHandler; diff --git a/plugins/samplesource/remotetcpinput/remotetcpinput.cpp b/plugins/samplesource/remotetcpinput/remotetcpinput.cpp index 33c88eda5..ba5d76978 100644 --- a/plugins/samplesource/remotetcpinput/remotetcpinput.cpp +++ b/plugins/samplesource/remotetcpinput/remotetcpinput.cpp @@ -44,7 +44,6 @@ MESSAGE_CLASS_DEFINITION(RemoteTCPInput::MsgReportTCPBuffer, Message) RemoteTCPInput::RemoteTCPInput(DeviceAPI *deviceAPI) : m_deviceAPI(deviceAPI), - m_mutex(QMutex::Recursive), m_settings(), m_remoteInputTCPPHandler(nullptr), m_deviceDescription("RemoteTCPInput") diff --git a/plugins/samplesource/remotetcpinput/remotetcpinput.h b/plugins/samplesource/remotetcpinput/remotetcpinput.h index 8fd9e2e80..d34a04793 100644 --- a/plugins/samplesource/remotetcpinput/remotetcpinput.h +++ b/plugins/samplesource/remotetcpinput/remotetcpinput.h @@ -177,7 +177,7 @@ public: private: DeviceAPI *m_deviceAPI; - QMutex m_mutex; + QRecursiveMutex m_mutex; RemoteTCPInputSettings m_settings; RemoteTCPInputTCPHandler* m_remoteInputTCPPHandler; QString m_deviceDescription; diff --git a/plugins/samplesource/remotetcpinput/remotetcpinputtcphandler.cpp b/plugins/samplesource/remotetcpinput/remotetcpinputtcphandler.cpp index 25ed2e98e..4e1dc8d57 100644 --- a/plugins/samplesource/remotetcpinput/remotetcpinputtcphandler.cpp +++ b/plugins/samplesource/remotetcpinput/remotetcpinputtcphandler.cpp @@ -43,7 +43,6 @@ RemoteTCPInputTCPHandler::RemoteTCPInputTCPHandler(SampleSinkFifo *sampleFifo, D m_reconnectTimer(this), m_converterBuffer(nullptr), m_converterBufferNbSamples(0), - m_mutex(QMutex::Recursive), m_settings() { m_tcpBuf = new char[m_sampleFifo->size()*2*4]; diff --git a/plugins/samplesource/remotetcpinput/remotetcpinputtcphandler.h b/plugins/samplesource/remotetcpinput/remotetcpinputtcphandler.h index c7e89853b..72c3fad29 100644 --- a/plugins/samplesource/remotetcpinput/remotetcpinputtcphandler.h +++ b/plugins/samplesource/remotetcpinput/remotetcpinputtcphandler.h @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include "util/messagequeue.h" @@ -138,7 +138,7 @@ private: int32_t *m_converterBuffer; uint32_t m_converterBufferNbSamples; - QMutex m_mutex; + QRecursiveMutex m_mutex; RemoteTCPInputSettings m_settings; void applyTCPLink(const QString& address, quint16 port); diff --git a/plugins/samplesource/testsource/testsourceworker.cpp b/plugins/samplesource/testsource/testsourceworker.cpp index 4da7a74e0..f06bcf89e 100644 --- a/plugins/samplesource/testsource/testsourceworker.cpp +++ b/plugins/samplesource/testsource/testsourceworker.cpp @@ -60,7 +60,6 @@ TestSourceWorker::TestSourceWorker(SampleSinkFifo* sampleFifo, QObject* parent) m_fcPosShift(0), m_throttlems(TESTSOURCE_THROTTLE_MS), m_throttleToggle(false), - m_mutex(QMutex::Recursive), m_histoCounter(0) { connect(&m_inputMessageQueue, SIGNAL(messageEnqueued()), this, SLOT(handleInputMessages()), Qt::QueuedConnection); diff --git a/plugins/samplesource/testsource/testsourceworker.h b/plugins/samplesource/testsource/testsourceworker.h index 90fcebc30..df70a17f3 100644 --- a/plugins/samplesource/testsource/testsourceworker.h +++ b/plugins/samplesource/testsource/testsourceworker.h @@ -105,7 +105,7 @@ private: QTimer m_timer; QElapsedTimer m_elapsedTimer; bool m_throttleToggle; - QMutex m_mutex; + QRecursiveMutex m_mutex; MessageQueue m_inputMessageQueue; diff --git a/qrtplib/rtpudptransmitter.cpp b/qrtplib/rtpudptransmitter.cpp index 4b1d1ff1c..47016ada6 100644 --- a/qrtplib/rtpudptransmitter.cpp +++ b/qrtplib/rtpudptransmitter.cpp @@ -41,8 +41,7 @@ namespace qrtplib { -RTPUDPTransmitter::RTPUDPTransmitter() : - m_rawPacketQueueLock(QMutex::Recursive) +RTPUDPTransmitter::RTPUDPTransmitter() { m_created = false; m_init = false; diff --git a/qrtplib/rtpudptransmitter.h b/qrtplib/rtpudptransmitter.h index ded4f8a3c..f925dd742 100644 --- a/qrtplib/rtpudptransmitter.h +++ b/qrtplib/rtpudptransmitter.h @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include #include @@ -362,7 +362,7 @@ private: std::list m_acceptList; std::list m_ignoreList; QQueue m_rawPacketQueue; - QMutex m_rawPacketQueueLock; + QRecursiveMutex m_rawPacketQueueLock; bool ShouldAcceptData(const RTPAddress& address); diff --git a/sdrbase/audio/audioinputdevice.cpp b/sdrbase/audio/audioinputdevice.cpp index b62f7c41c..2fcc91e10 100644 --- a/sdrbase/audio/audioinputdevice.cpp +++ b/sdrbase/audio/audioinputdevice.cpp @@ -23,7 +23,6 @@ #include "audio/audiofifo.h" AudioInputDevice::AudioInputDevice() : - m_mutex(QMutex::Recursive), m_audioInput(0), m_audioUsageCount(0), m_onExit(false), diff --git a/sdrbase/audio/audioinputdevice.h b/sdrbase/audio/audioinputdevice.h index 3360a79be..0973ac51b 100644 --- a/sdrbase/audio/audioinputdevice.h +++ b/sdrbase/audio/audioinputdevice.h @@ -18,7 +18,7 @@ #ifndef SDRBASE_AUDIO_AUDIOINPUTDEVICE_H_ #define SDRBASE_AUDIO_AUDIOINPUTDEVICE_H_ -#include +#include #include #include #include @@ -47,7 +47,7 @@ public: void setVolume(float volume); private: - QMutex m_mutex; + QRecursiveMutex m_mutex; QAudioInput* m_audioInput; uint m_audioUsageCount; bool m_onExit; diff --git a/sdrbase/audio/audioopus.cpp b/sdrbase/audio/audioopus.cpp index 7e43dd97c..25ff8ffc8 100644 --- a/sdrbase/audio/audioopus.cpp +++ b/sdrbase/audio/audioopus.cpp @@ -27,8 +27,7 @@ AudioOpus::AudioOpus() : m_encoderState(0), - m_encoderOK(false), - m_mutex(QMutex::Recursive) + m_encoderOK(false) { qDebug("AudioOpus::AudioOpus: libopus version %s", opus_get_version_string()); } diff --git a/sdrbase/audio/audioopus.h b/sdrbase/audio/audioopus.h index 5444c5e82..712c2c520 100644 --- a/sdrbase/audio/audioopus.h +++ b/sdrbase/audio/audioopus.h @@ -20,7 +20,7 @@ #define SDRBASE_AUDIO_AUDIOOPUS_H_ #include -#include +#include #include "export.h" struct OpusEncoder; @@ -40,7 +40,7 @@ public: private: OpusEncoder *m_encoderState; bool m_encoderOK; - QMutex m_mutex; + QRecursiveMutex m_mutex; }; #endif /* SDRBASE_AUDIO_AUDIOOPUS_H_ */ diff --git a/sdrbase/audio/audiooutputdevice.cpp b/sdrbase/audio/audiooutputdevice.cpp index 72e591d67..0408c868a 100644 --- a/sdrbase/audio/audiooutputdevice.cpp +++ b/sdrbase/audio/audiooutputdevice.cpp @@ -25,7 +25,6 @@ #include "audionetsink.h" AudioOutputDevice::AudioOutputDevice() : - m_mutex(QMutex::Recursive), m_audioOutput(0), m_audioNetSink(0), m_copyAudioToUdp(false), diff --git a/sdrbase/audio/audiooutputdevice.h b/sdrbase/audio/audiooutputdevice.h index 13417dce1..572ed2ee1 100644 --- a/sdrbase/audio/audiooutputdevice.h +++ b/sdrbase/audio/audiooutputdevice.h @@ -19,7 +19,7 @@ #ifndef INCLUDE_AUDIOOUTPUTDEVICE_H #define INCLUDE_AUDIOOUTPUTDEVICE_H -#include +#include #include #include #include @@ -74,7 +74,7 @@ public: void setVolume(float volume); private: - QMutex m_mutex; + QRecursiveMutex m_mutex; QAudioOutput* m_audioOutput; AudioNetSink* m_audioNetSink; bool m_copyAudioToUdp; diff --git a/sdrbase/channel/remotedataqueue.cpp b/sdrbase/channel/remotedataqueue.cpp index fc334fecf..301ef38ef 100644 --- a/sdrbase/channel/remotedataqueue.cpp +++ b/sdrbase/channel/remotedataqueue.cpp @@ -29,7 +29,6 @@ RemoteDataQueue::RemoteDataQueue(QObject* parent) : QObject(parent), - m_lock(QMutex::Recursive), m_queue() { } diff --git a/sdrbase/channel/remotedataqueue.h b/sdrbase/channel/remotedataqueue.h index 51ec1df39..eff1dac80 100644 --- a/sdrbase/channel/remotedataqueue.h +++ b/sdrbase/channel/remotedataqueue.h @@ -26,7 +26,7 @@ #define CHANNEL_REMOTEDATAQUEUE_H_ #include -#include +#include #include #include "export.h" @@ -50,7 +50,7 @@ signals: void dataBlockEnqueued(); private: - QMutex m_lock; + QRecursiveMutex m_lock; QQueue m_queue; }; diff --git a/sdrbase/dsp/cwkeyer.cpp b/sdrbase/dsp/cwkeyer.cpp index 3281127f4..94360ceea 100644 --- a/sdrbase/dsp/cwkeyer.cpp +++ b/sdrbase/dsp/cwkeyer.cpp @@ -161,7 +161,6 @@ const signed char CWKeyer::m_asciiToMorse[128][7] = { }; CWKeyer::CWKeyer() : - m_mutex(QMutex::Recursive), m_textPointer(0), m_elementPointer(0), m_samplePointer(0), diff --git a/sdrbase/dsp/cwkeyer.h b/sdrbase/dsp/cwkeyer.h index 6335308ca..c4c3910f8 100644 --- a/sdrbase/dsp/cwkeyer.h +++ b/sdrbase/dsp/cwkeyer.h @@ -20,7 +20,7 @@ #define SDRBASE_DSP_CWKEYER_H_ #include -#include +#include #include "export.h" #include "util/message.h" @@ -41,7 +41,7 @@ public: bool getFadeSample(bool on, float& sample); private: - QMutex m_mutex; + QRecursiveMutex m_mutex; unsigned int m_fadeInCounter; unsigned int m_fadeOutCounter; unsigned int m_nbFadeSamples; @@ -129,7 +129,7 @@ public: ); private: - QMutex m_mutex; + QRecursiveMutex m_mutex; CWKeyerSettings m_settings; MessageQueue m_inputMessageQueue; int m_dotLength; //!< dot length in samples diff --git a/sdrbase/dsp/datafifo.cpp b/sdrbase/dsp/datafifo.cpp index 329b62e2b..7bc638f28 100644 --- a/sdrbase/dsp/datafifo.cpp +++ b/sdrbase/dsp/datafifo.cpp @@ -41,8 +41,7 @@ void DataFifo::reset() DataFifo::DataFifo(QObject* parent) : QObject(parent), m_data(), - m_currentDataType(DataTypeI16), - m_mutex(QMutex::Recursive) + m_currentDataType(DataTypeI16) { setObjectName("DataFifo"); m_suppressed = -1; @@ -55,8 +54,7 @@ DataFifo::DataFifo(QObject* parent) : DataFifo::DataFifo(int size, QObject* parent) : QObject(parent), m_data(), - m_currentDataType(DataTypeI16), - m_mutex(QMutex::Recursive) + m_currentDataType(DataTypeI16) { setObjectName("DataFifo"); m_suppressed = -1; @@ -66,8 +64,7 @@ DataFifo::DataFifo(int size, QObject* parent) : DataFifo::DataFifo(const DataFifo& other) : QObject(other.parent()), m_data(other.m_data), - m_currentDataType(DataTypeI16), - m_mutex(QMutex::Recursive) + m_currentDataType(DataTypeI16) { setObjectName("DataFifo"); m_suppressed = -1; diff --git a/sdrbase/dsp/datafifo.h b/sdrbase/dsp/datafifo.h index a2e995a32..a7c813de0 100644 --- a/sdrbase/dsp/datafifo.h +++ b/sdrbase/dsp/datafifo.h @@ -20,7 +20,7 @@ #define INCLUDE_DATAFIFO_H #include -#include +#include #include #include @@ -65,7 +65,7 @@ private: int m_suppressed; QByteArray m_data; DataType m_currentDataType; - QMutex m_mutex; + QRecursiveMutex m_mutex; unsigned int m_size; unsigned int m_fill; diff --git a/sdrbase/dsp/fftfactory.cpp b/sdrbase/dsp/fftfactory.cpp index 46cb7efc6..f073abbb5 100644 --- a/sdrbase/dsp/fftfactory.cpp +++ b/sdrbase/dsp/fftfactory.cpp @@ -19,8 +19,7 @@ #include "fftfactory.h" FFTFactory::FFTFactory(const QString& fftwWisdomFileName) : - m_fftwWisdomFileName(fftwWisdomFileName), - m_mutex(QMutex::Recursive) + m_fftwWisdomFileName(fftwWisdomFileName) {} FFTFactory::~FFTFactory() @@ -139,4 +138,4 @@ void FFTFactory::releaseEngine(unsigned int fftSize, bool inverse, unsigned int engines[engineSequence].m_inUse = false; } } -} \ No newline at end of file +} diff --git a/sdrbase/dsp/fftfactory.h b/sdrbase/dsp/fftfactory.h index 65859757e..85aa5244e 100644 --- a/sdrbase/dsp/fftfactory.h +++ b/sdrbase/dsp/fftfactory.h @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include "export.h" @@ -52,7 +52,7 @@ private: QString m_fftwWisdomFileName; std::map> m_fftEngineBySize; std::map> m_invFFTEngineBySize; - QMutex m_mutex; + QRecursiveMutex m_mutex; }; #endif // _SDRBASE_FFTWFACTORY_H diff --git a/sdrbase/dsp/filerecord.cpp b/sdrbase/dsp/filerecord.cpp index 84b05052b..675ecb1e8 100644 --- a/sdrbase/dsp/filerecord.cpp +++ b/sdrbase/dsp/filerecord.cpp @@ -35,8 +35,7 @@ FileRecord::FileRecord(quint32 sampleRate, quint64 centerFrequency) : m_recordOn(false), m_recordStart(false), m_byteCount(0), - m_msShift(0), - m_mutex(QMutex::Recursive) + m_msShift(0) { setObjectName("FileRecord"); } @@ -48,8 +47,7 @@ FileRecord::FileRecord(const QString& fileBase) : m_centerFrequency(0), m_recordOn(false), m_recordStart(false), - m_byteCount(0), - m_mutex(QMutex::Recursive) + m_byteCount(0) { setObjectName("FileRecord"); } diff --git a/sdrbase/dsp/filerecord.h b/sdrbase/dsp/filerecord.h index 145cd9a45..533263e3c 100644 --- a/sdrbase/dsp/filerecord.h +++ b/sdrbase/dsp/filerecord.h @@ -77,7 +77,7 @@ private: QString m_curentFileName; quint64 m_byteCount; qint64 m_msShift; - QMutex m_mutex; + QRecursiveMutex m_mutex; void writeHeader(); }; diff --git a/sdrbase/dsp/samplemififo.cpp b/sdrbase/dsp/samplemififo.cpp index d7c8372d5..0d485cf1a 100644 --- a/sdrbase/dsp/samplemififo.cpp +++ b/sdrbase/dsp/samplemififo.cpp @@ -53,14 +53,12 @@ SampleMIFifo::SampleMIFifo(QObject *parent) : m_nbStreams(0), m_size(0), m_fill(0), - m_head(0), - m_mutex(QMutex::Recursive) + m_head(0) { } SampleMIFifo::SampleMIFifo(unsigned int nbStreams, unsigned int size, QObject *parent) : - QObject(parent), - m_mutex(QMutex::Recursive) + QObject(parent) { init(nbStreams, size); } diff --git a/sdrbase/dsp/samplemififo.h b/sdrbase/dsp/samplemififo.h index ee435e75e..2dabdfa7f 100644 --- a/sdrbase/dsp/samplemififo.h +++ b/sdrbase/dsp/samplemififo.h @@ -19,7 +19,7 @@ #define INCLUDE_SAMPLEMIFIFO_H #include -#include +#include #include #include "dsp/dsptypes.h" #include "export.h" @@ -95,7 +95,7 @@ private: unsigned int m_head; //!< Number of samples read from beginning of samples vector (sync) std::vector m_vFill; //!< Number of samples written from beginning of samples vector (async) std::vector m_vHead; //!< Number of samples read from beginning of samples vector (async) - QMutex m_mutex; + QRecursiveMutex m_mutex; }; #endif // INCLUDE_SAMPLEMIFIFO_H \ No newline at end of file diff --git a/sdrbase/dsp/samplemofifo.cpp b/sdrbase/dsp/samplemofifo.cpp index 414d9a1eb..a4bed8568 100644 --- a/sdrbase/dsp/samplemofifo.cpp +++ b/sdrbase/dsp/samplemofifo.cpp @@ -22,13 +22,11 @@ const unsigned int SampleMOFifo::m_guardDivisor = 10; SampleMOFifo::SampleMOFifo(QObject *parent) : QObject(parent), - m_nbStreams(0), - m_mutex(QMutex::Recursive) + m_nbStreams(0) {} SampleMOFifo::SampleMOFifo(unsigned int nbStreams, unsigned int size, QObject *parent) : - QObject(parent), - m_mutex(QMutex::Recursive) + QObject(parent) { init(nbStreams, size); } diff --git a/sdrbase/dsp/samplemofifo.h b/sdrbase/dsp/samplemofifo.h index 7d1d16785..f2e77e6ab 100644 --- a/sdrbase/dsp/samplemofifo.h +++ b/sdrbase/dsp/samplemofifo.h @@ -19,7 +19,7 @@ #define INCLUDE_SAMPLEMOFIFO_H #include -#include +#include #include "dsp/dsptypes.h" #include "export.h" @@ -102,7 +102,7 @@ private: std::vector m_vReadCount; std::vector m_vReadHead; std::vector m_vWriteHead; - QMutex m_mutex; + QRecursiveMutex m_mutex; }; #endif // INCLUDE_SAMPLEMOFIFO_H \ No newline at end of file diff --git a/sdrbase/dsp/samplesinkfifo.cpp b/sdrbase/dsp/samplesinkfifo.cpp index b8ef8d8e7..fe73694bb 100644 --- a/sdrbase/dsp/samplesinkfifo.cpp +++ b/sdrbase/dsp/samplesinkfifo.cpp @@ -45,8 +45,7 @@ SampleSinkFifo::SampleSinkFifo(QObject* parent) : m_data(), m_total(0), m_writtenSignalCount(0), - m_writtenSignalRateDivider(1), - m_mutex(QMutex::Recursive) + m_writtenSignalRateDivider(1) { m_suppressed = -1; m_size = 0; @@ -60,8 +59,7 @@ SampleSinkFifo::SampleSinkFifo(int size, QObject* parent) : m_data(), m_total(0), m_writtenSignalCount(0), - m_writtenSignalRateDivider(1), - m_mutex(QMutex::Recursive) + m_writtenSignalRateDivider(1) { m_suppressed = -1; create(size); @@ -72,8 +70,7 @@ SampleSinkFifo::SampleSinkFifo(const SampleSinkFifo& other) : m_data(other.m_data), m_total(0), m_writtenSignalCount(0), - m_writtenSignalRateDivider(1), - m_mutex(QMutex::Recursive) + m_writtenSignalRateDivider(1) { m_suppressed = -1; m_size = m_data.size(); diff --git a/sdrbase/dsp/samplesinkfifo.h b/sdrbase/dsp/samplesinkfifo.h index d29520abf..cd4f2d2e2 100644 --- a/sdrbase/dsp/samplesinkfifo.h +++ b/sdrbase/dsp/samplesinkfifo.h @@ -20,7 +20,7 @@ #define INCLUDE_SAMPLEFIFO_H #include -#include +#include #include #include "dsp/dsptypes.h" #include "export.h" @@ -35,7 +35,7 @@ private: int m_total; unsigned int m_writtenSignalCount; unsigned int m_writtenSignalRateDivider; - QMutex m_mutex; + QRecursiveMutex m_mutex; unsigned int m_size; unsigned int m_fill; diff --git a/sdrbase/dsp/scopevis.cpp b/sdrbase/dsp/scopevis.cpp index a5a276936..702a81482 100644 --- a/sdrbase/dsp/scopevis.cpp +++ b/sdrbase/dsp/scopevis.cpp @@ -63,7 +63,6 @@ ScopeVis::ScopeVis() : m_traceDiscreteMemory(GLScopeSettings::m_nbTraceMemories), m_freeRun(true), m_maxTraceDelay(0), - m_mutex(QMutex::Recursive), m_triggerOneShot(false), m_triggerWaitForReset(false), m_currentTraceMemoryIndex(0) diff --git a/sdrbase/dsp/scopevis.h b/sdrbase/dsp/scopevis.h index e31a9467a..1ed6dc8a8 100644 --- a/sdrbase/dsp/scopevis.h +++ b/sdrbase/dsp/scopevis.h @@ -1242,7 +1242,7 @@ private: bool m_freeRun; //!< True if free running (trigger globally disabled) int m_maxTraceDelay; //!< Maximum trace delay TriggerComparator m_triggerComparator; //!< Compares sample level to trigger level - QMutex m_mutex; + QRecursiveMutex m_mutex; Real m_projectorCache[(int) Projector::nbProjectionTypes]; bool m_triggerOneShot; //!< True when one shot mode is active bool m_triggerWaitForReset; //!< In one shot mode suspended until reset by UI diff --git a/sdrbase/dsp/spectrumvis.cpp b/sdrbase/dsp/spectrumvis.cpp index b5705f8cf..f1625aed2 100644 --- a/sdrbase/dsp/spectrumvis.cpp +++ b/sdrbase/dsp/spectrumvis.cpp @@ -55,8 +55,7 @@ SpectrumVis::SpectrumVis(Real scalef) : m_sampleRate(48000), m_ofs(0), m_powFFTDiv(1.0), - m_guiMessageQueue(nullptr), - m_mutex(QMutex::Recursive) + m_guiMessageQueue(nullptr) { setObjectName("SpectrumVis"); connect(&m_inputMessageQueue, SIGNAL(messageEnqueued()), this, SLOT(handleInputMessages())); diff --git a/sdrbase/dsp/spectrumvis.h b/sdrbase/dsp/spectrumvis.h index e214062a3..3ef254f59 100644 --- a/sdrbase/dsp/spectrumvis.h +++ b/sdrbase/dsp/spectrumvis.h @@ -19,7 +19,7 @@ #define INCLUDE_SPECTRUMVIS_H #include -#include +#include #include "dsp/basebandsamplesink.h" #include "dsp/fftengine.h" @@ -246,7 +246,7 @@ private: MessageQueue m_inputMessageQueue; MessageQueue *m_guiMessageQueue; //!< Input message queue to the GUI - QMutex m_mutex; + QRecursiveMutex m_mutex; void processFFT(bool positiveOnly); void setRunning(bool running) { m_running = running; } diff --git a/sdrbase/pipes/elementpipesregistrations.h b/sdrbase/pipes/elementpipesregistrations.h index d1487d2f7..723fa6eb5 100644 --- a/sdrbase/pipes/elementpipesregistrations.h +++ b/sdrbase/pipes/elementpipesregistrations.h @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include "elementpipescommon.h" @@ -31,7 +31,7 @@ class ElementPipesRegistrations public: ElementPipesRegistrations() : m_typeCount(0), - m_mutex(QMutex::Recursive) + m_mutex(QRecursiveMutex::Recursive) {} ~ElementPipesRegistrations() @@ -125,7 +125,7 @@ public: QMap, QList> *getElements() { return &m_elements; } QMap, QList> *getConsumers() { return &m_consumers; } - QMutex *getMutex() { return &m_mutex; } + QRecursiveMutex *getMutex() { return &m_mutex; } private: @@ -133,7 +133,7 @@ private: int m_typeCount; QMap, QList> m_elements; QMap, QList> m_consumers; - QMutex m_mutex; + QRecursiveMutex m_mutex; }; #endif // SDRBASE_PIPES_ELEMNTPIPESREGISTRATION_H_ diff --git a/sdrbase/pipes/objectpipesregistrations.cpp b/sdrbase/pipes/objectpipesregistrations.cpp index 928a2b9fb..1532db2b0 100644 --- a/sdrbase/pipes/objectpipesregistrations.cpp +++ b/sdrbase/pipes/objectpipesregistrations.cpp @@ -20,8 +20,7 @@ ObjectPipesRegistrations::ObjectPipesRegistrations(ObjectPipeElementsStore *objectPipeElementsStore) : m_typeCount(0), m_pipeId(0), - m_objectPipeElementsStore(objectPipeElementsStore), - m_mutex(QMutex::Recursive) + m_objectPipeElementsStore(objectPipeElementsStore) {} ObjectPipesRegistrations::~ObjectPipesRegistrations() diff --git a/sdrbase/pipes/objectpipesregistrations.h b/sdrbase/pipes/objectpipesregistrations.h index d8ae0ab53..18da3cdd1 100644 --- a/sdrbase/pipes/objectpipesregistrations.h +++ b/sdrbase/pipes/objectpipesregistrations.h @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include @@ -69,7 +69,7 @@ private: QMap, QList> m_producerAndTypeIdPipes; QMap, ObjectPipe*> m_pipeMap; - QMutex m_mutex; + QRecursiveMutex m_mutex; }; #endif // SDRBASE_PIPES_OBJECTPIPESREGISTRATION_H_ diff --git a/sdrbase/util/messagequeue.cpp b/sdrbase/util/messagequeue.cpp index e9fcccf9a..805c348b6 100644 --- a/sdrbase/util/messagequeue.cpp +++ b/sdrbase/util/messagequeue.cpp @@ -23,7 +23,6 @@ MessageQueue::MessageQueue(QObject* parent) : QObject(parent), - m_lock(QMutex::Recursive), m_queue() { setObjectName("MessageQueue"); diff --git a/sdrbase/util/messagequeue.h b/sdrbase/util/messagequeue.h index 2262f69e9..61893c120 100644 --- a/sdrbase/util/messagequeue.h +++ b/sdrbase/util/messagequeue.h @@ -21,7 +21,7 @@ #include #include -#include +#include #include "export.h" class Message; @@ -43,7 +43,7 @@ signals: void messageEnqueued(); private: - QMutex m_lock; + QRecursiveMutex m_lock; QQueue m_queue; }; diff --git a/sdrbase/util/rtpsink.cpp b/sdrbase/util/rtpsink.cpp index 78702c552..044416e9f 100644 --- a/sdrbase/util/rtpsink.cpp +++ b/sdrbase/util/rtpsink.cpp @@ -28,8 +28,7 @@ RTPSink::RTPSink(QUdpSocket *udpSocket, int sampleRate, bool stereo) : m_bufferSize(0), m_sampleBufferIndex(0), m_byteBuffer(0), - m_destport(9998), - m_mutex(QMutex::Recursive) + m_destport(9998) { m_rtpSessionParams.SetOwnTimestampUnit(1.0 / (double) m_sampleRate); m_rtpTransmissionParams.SetRTCPMultiplexing(true); // do not allocate another socket for RTCP diff --git a/sdrbase/util/rtpsink.h b/sdrbase/util/rtpsink.h index ad2148888..505639ef3 100644 --- a/sdrbase/util/rtpsink.h +++ b/sdrbase/util/rtpsink.h @@ -20,7 +20,7 @@ #define SDRBASE_UTIL_RTPSINK_H_ #include -#include +#include #include #include #include @@ -84,7 +84,7 @@ protected: qrtplib::RTPUDPTransmissionParams m_rtpTransmissionParams; qrtplib::RTPUDPTransmitter m_rtpTransmitter; bool m_endianReverse; - QMutex m_mutex; + QRecursiveMutex m_mutex; }; diff --git a/sdrgui/gui/tvscreen.cpp b/sdrgui/gui/tvscreen.cpp index 5227478e9..4d0d97382 100644 --- a/sdrgui/gui/tvscreen.cpp +++ b/sdrgui/gui/tvscreen.cpp @@ -34,7 +34,6 @@ // Note: When this object is created, QWidget* is converted to bool TVScreen::TVScreen(bool color, QWidget* parent) : QOpenGLWidget(parent), - m_mutex(QMutex::Recursive), m_glShaderArray(color) { setAttribute(Qt::WA_OpaquePaintEvent); diff --git a/sdrgui/gui/tvscreen.h b/sdrgui/gui/tvscreen.h index eadc25cde..94631d053 100644 --- a/sdrgui/gui/tvscreen.h +++ b/sdrgui/gui/tvscreen.h @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include "dsp/dsptypes.h" @@ -77,7 +77,7 @@ private: // state QTimer m_timer; - QMutex m_mutex; + QRecursiveMutex m_mutex; bool m_dataChanged; GLShaderTVArray m_glShaderArray;