diff --git a/sdrbase/audio/audioinputdevice.cpp b/sdrbase/audio/audioinputdevice.cpp index d966a9e2c..be72d5021 100644 --- a/sdrbase/audio/audioinputdevice.cpp +++ b/sdrbase/audio/audioinputdevice.cpp @@ -187,14 +187,14 @@ void AudioInputDevice::stop() void AudioInputDevice::addFifo(AudioFifo* audioFifo) { - QMutexLocker mutexLocker(&m_mutex); + QMutexLocker mutexLocker(&m_fifosMutex); m_audioFifos.push_back(audioFifo); } void AudioInputDevice::removeFifo(AudioFifo* audioFifo) { - QMutexLocker mutexLocker(&m_mutex); + QMutexLocker mutexLocker(&m_fifosMutex); m_audioFifos.remove(audioFifo); } @@ -230,6 +230,9 @@ qint64 AudioInputDevice::writeData(const char *data, qint64 len) return 0; } + // FIFOs are added and removed from other threads (e.g. a modulator being started) + QMutexLocker mutexLocker(&m_fifosMutex); + for (std::list::iterator it = m_audioFifos.begin(); it != m_audioFifos.end(); ++it) { (*it)->write(reinterpret_cast(data), len/4); diff --git a/sdrbase/audio/audioinputdevice.h b/sdrbase/audio/audioinputdevice.h index df267d2df..c685044e6 100644 --- a/sdrbase/audio/audioinputdevice.h +++ b/sdrbase/audio/audioinputdevice.h @@ -22,6 +22,7 @@ #ifndef SDRBASE_AUDIO_AUDIOINPUTDEVICE_H_ #define SDRBASE_AUDIO_AUDIOINPUTDEVICE_H_ +#include #include #include #include @@ -114,7 +115,7 @@ public: void addFifo(AudioFifo* audioFifo); void removeFifo(AudioFifo* audioFifo); - int getNbFifos() const { return m_audioFifos.size(); } + int getNbFifos() const { QMutexLocker mutexLocker(&m_fifosMutex); return m_audioFifos.size(); } uint getRate() const { return m_audioFormat.sampleRate(); } void setOnExit(bool onExit) { m_onExit = onExit; } @@ -126,6 +127,7 @@ public: private: QRecursiveMutex m_mutex; + mutable QMutex m_fifosMutex; //!< guards m_audioFifos, which writeData reads on the audio thread #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) QAudioSource* m_audioInput; #else