VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-02-03 09:44:01 -05:00
Code Issues Projects Releases Wiki Activity

AudioOutput: fixed core dump on program exit

Browse Source
This commit is contained in:
f4exb 2016-10-08 06:54:49 +02:00
parent 6f054a51d8
commit bb541e9fb2
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sdrbase/audio/audiooutput.cpp
View File

@ -26,6 +26,7 @@ AudioOutput::AudioOutput() :
m_mutex(), m_mutex(),
m_audioOutput(0), m_audioOutput(0),
m_audioUsageCount(0), m_audioUsageCount(0),
m_onExit(false),
m_audioFifos() m_audioFifos()
{ {
} }
@ -124,7 +125,10 @@ void AudioOutput::stop()
if (m_audioUsageCount == 0) if (m_audioUsageCount == 0)
{ {
QIODevice::close(); QIODevice::close();
delete m_audioOutput;
if (!m_onExit) {
delete m_audioOutput;
}
} }
} }
} }

2
sdrbase/audio/audiooutput.h
View File

@ -41,11 +41,13 @@ public:
void removeFifo(AudioFifo* audioFifo); void removeFifo(AudioFifo* audioFifo);
uint getRate() const { return m_audioFormat.sampleRate(); } uint getRate() const { return m_audioFormat.sampleRate(); }
void setOnExit(bool onExit) { m_onExit = onExit; }
private: private:
QMutex m_mutex; QMutex m_mutex;
QAudioOutput* m_audioOutput; QAudioOutput* m_audioOutput;
uint m_audioUsageCount; uint m_audioUsageCount;
bool m_onExit;
typedef std::list<AudioFifo*> AudioFifos; typedef std::list<AudioFifo*> AudioFifos;
AudioFifos m_audioFifos; AudioFifos m_audioFifos;

2
sdrbase/dsp/dspengine.cpp
View File

@ -28,6 +28,8 @@ DSPEngine::DSPEngine() :
DSPEngine::~DSPEngine() DSPEngine::~DSPEngine()
{ {
m_audioOutput.setOnExit(true);
std::vector<DSPDeviceSourceEngine*>::iterator it = m_deviceEngines.begin(); std::vector<DSPDeviceSourceEngine*>::iterator it = m_deviceEngines.begin();
while (it != m_deviceEngines.end()) while (it != m_deviceEngines.end())