From 583a144c67c71208c2edcd251904902ecd372c15 Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Sat, 25 Jan 2020 19:02:33 +0100
Subject: [PATCH] AudioDeviceManager: never stop default devices once started

---
 sdrbase/audio/audiodevicemanager.cpp | 17 +++++++++++++----
 sdrbase/audio/audiodevicemanager.h   |  3 +++
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/sdrbase/audio/audiodevicemanager.cpp b/sdrbase/audio/audiodevicemanager.cpp
index 1541094f7..44ebe6f56 100644
--- a/sdrbase/audio/audiodevicemanager.cpp
+++ b/sdrbase/audio/audiodevicemanager.cpp
@@ -87,6 +87,9 @@ AudioDeviceManager::AudioDeviceManager()
     for (int i = 0; i < m_outputDevicesInfo.size(); i++) {
         qDebug("AudioDeviceManager::AudioDeviceManager: output device #%d: %s", i, qPrintable(m_outputDevicesInfo[i].deviceName()));
     }
+
+    m_defaultInputStarted = false;
+    m_defaultOutputStarted = false;
 }
 
 AudioDeviceManager::~AudioDeviceManager()
@@ -254,7 +257,9 @@ void AudioDeviceManager::addAudioSink(AudioFifo* audioFifo, MessageQueue *sample
         m_audioOutputs[outputDeviceIndex] = new AudioOutput();
     }
 
-    if (m_audioOutputs[outputDeviceIndex]->getNbFifos() == 0) {
+    if ((m_audioOutputs[outputDeviceIndex]->getNbFifos() == 0) &&
+       ((outputDeviceIndex != -1) || !m_defaultOutputStarted))
+    {
         startAudioOutput(outputDeviceIndex);
     }
 
@@ -293,7 +298,7 @@ void AudioDeviceManager::removeAudioSink(AudioFifo* audioFifo)
     int audioOutputDeviceIndex = m_audioSinkFifos[audioFifo];
     m_audioOutputs[audioOutputDeviceIndex]->removeFifo(audioFifo);
 
-    if (m_audioOutputs[audioOutputDeviceIndex]->getNbFifos() == 0) {
+    if ((audioOutputDeviceIndex != -1) && (m_audioOutputs[audioOutputDeviceIndex]->getNbFifos() == 0)) {
         stopAudioOutput(audioOutputDeviceIndex);
     }
 
@@ -310,7 +315,9 @@ void AudioDeviceManager::addAudioSource(AudioFifo* audioFifo, MessageQueue *samp
         m_audioInputs[inputDeviceIndex] = new AudioInput();
     }
 
-    if (m_audioInputs[inputDeviceIndex]->getNbFifos() == 0) {
+    if ((m_audioInputs[inputDeviceIndex]->getNbFifos() == 0) &&
+       ((inputDeviceIndex != -1) || !m_defaultInputStarted))
+    {
         startAudioInput(inputDeviceIndex);
     }
 
@@ -347,7 +354,7 @@ void AudioDeviceManager::removeAudioSource(AudioFifo* audioFifo)
     int audioInputDeviceIndex = m_audioSourceFifos[audioFifo];
     m_audioInputs[audioInputDeviceIndex]->removeFifo(audioFifo);
 
-    if (m_audioInputs[audioInputDeviceIndex]->getNbFifos() == 0) {
+    if ((audioInputDeviceIndex != -1) && (m_audioInputs[audioInputDeviceIndex]->getNbFifos() == 0)) {
         stopAudioInput(audioInputDeviceIndex);
     }
 
@@ -402,6 +409,7 @@ void AudioDeviceManager::startAudioOutput(int outputDeviceIndex)
         m_audioOutputInfos[deviceName].udpChannelMode = udpChannelMode;
         m_audioOutputInfos[deviceName].udpChannelCodec = udpChannelCodec;
         m_audioOutputInfos[deviceName].udpDecimationFactor = decimationFactor;
+        m_defaultOutputStarted = (outputDeviceIndex == -1);
     }
     else
     {
@@ -437,6 +445,7 @@ void AudioDeviceManager::startAudioInput(int inputDeviceIndex)
         m_audioInputs[inputDeviceIndex]->setVolume(volume);
         m_audioInputInfos[deviceName].sampleRate = m_audioInputs[inputDeviceIndex]->getRate();
         m_audioInputInfos[deviceName].volume = volume;
+        m_defaultInputStarted = (inputDeviceIndex == -1);
     }
     else
     {
diff --git a/sdrbase/audio/audiodevicemanager.h b/sdrbase/audio/audiodevicemanager.h
index eaf7de3b2..a95e53d2a 100644
--- a/sdrbase/audio/audiodevicemanager.h
+++ b/sdrbase/audio/audiodevicemanager.h
@@ -136,6 +136,9 @@ private:
     QMap<int, AudioInput*> m_audioInputs; //!< audio device index to audio input map (index -1 is default device)
     QMap<QString, InputDeviceInfo> m_audioInputInfos; //!< audio device name to audio input device info
 
+    bool m_defaultOutputStarted; //!< True if the default audio output (-1) has already been started
+    bool m_defaultInputStarted;  //!< True if the default audio input (-1) has already been started
+
     void resetToDefaults();
     QByteArray serialize() const;
     bool deserialize(const QByteArray& data);