VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-05-24 11:12:27 -04:00
Code Issues Projects Releases Wiki Activity

AudioDeviceManager: never stop default devices once started

Browse Source
This commit is contained in:
f4exb 2020-01-25 19:02:33 +01:00
parent f38d45f553
commit 583a144c67
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sdrbase/audio/audiodevicemanager.cpp
View File

@ -87,6 +87,9 @@ AudioDeviceManager::AudioDeviceManager()
for (int i = 0; i < m_outputDevicesInfo.size(); i++) { for (int i = 0; i < m_outputDevicesInfo.size(); i++) {
qDebug("AudioDeviceManager::AudioDeviceManager: output device #%d: %s", i, qPrintable(m_outputDevicesInfo[i].deviceName())); qDebug("AudioDeviceManager::AudioDeviceManager: output device #%d: %s", i, qPrintable(m_outputDevicesInfo[i].deviceName()));
} }
m_defaultInputStarted = false;
m_defaultOutputStarted = false;
} }
AudioDeviceManager::~AudioDeviceManager() AudioDeviceManager::~AudioDeviceManager()
@ -254,7 +257,9 @@ void AudioDeviceManager::addAudioSink(AudioFifo* audioFifo, MessageQueue *sample
m_audioOutputs[outputDeviceIndex] = new AudioOutput(); m_audioOutputs[outputDeviceIndex] = new AudioOutput();
} }
if (m_audioOutputs[outputDeviceIndex]->getNbFifos() == 0) { if ((m_audioOutputs[outputDeviceIndex]->getNbFifos() == 0) &&
((outputDeviceIndex != -1) || !m_defaultOutputStarted))
{
startAudioOutput(outputDeviceIndex); startAudioOutput(outputDeviceIndex);
} }
@ -293,7 +298,7 @@ void AudioDeviceManager::removeAudioSink(AudioFifo* audioFifo)
int audioOutputDeviceIndex = m_audioSinkFifos[audioFifo]; int audioOutputDeviceIndex = m_audioSinkFifos[audioFifo];
m_audioOutputs[audioOutputDeviceIndex]->removeFifo(audioFifo); m_audioOutputs[audioOutputDeviceIndex]->removeFifo(audioFifo);
if (m_audioOutputs[audioOutputDeviceIndex]->getNbFifos() == 0) { if ((audioOutputDeviceIndex != -1) && (m_audioOutputs[audioOutputDeviceIndex]->getNbFifos() == 0)) {
stopAudioOutput(audioOutputDeviceIndex); stopAudioOutput(audioOutputDeviceIndex);
} }
@ -310,7 +315,9 @@ void AudioDeviceManager::addAudioSource(AudioFifo* audioFifo, MessageQueue *samp
m_audioInputs[inputDeviceIndex] = new AudioInput(); m_audioInputs[inputDeviceIndex] = new AudioInput();
} }
if (m_audioInputs[inputDeviceIndex]->getNbFifos() == 0) { if ((m_audioInputs[inputDeviceIndex]->getNbFifos() == 0) &&
((inputDeviceIndex != -1) || !m_defaultInputStarted))
{
startAudioInput(inputDeviceIndex); startAudioInput(inputDeviceIndex);
} }
@ -347,7 +354,7 @@ void AudioDeviceManager::removeAudioSource(AudioFifo* audioFifo)
int audioInputDeviceIndex = m_audioSourceFifos[audioFifo]; int audioInputDeviceIndex = m_audioSourceFifos[audioFifo];
m_audioInputs[audioInputDeviceIndex]->removeFifo(audioFifo); m_audioInputs[audioInputDeviceIndex]->removeFifo(audioFifo);
if (m_audioInputs[audioInputDeviceIndex]->getNbFifos() == 0) { if ((audioInputDeviceIndex != -1) && (m_audioInputs[audioInputDeviceIndex]->getNbFifos() == 0)) {
stopAudioInput(audioInputDeviceIndex); stopAudioInput(audioInputDeviceIndex);
} }
@ -402,6 +409,7 @@ void AudioDeviceManager::startAudioOutput(int outputDeviceIndex)
m_audioOutputInfos[deviceName].udpChannelMode = udpChannelMode; m_audioOutputInfos[deviceName].udpChannelMode = udpChannelMode;
m_audioOutputInfos[deviceName].udpChannelCodec = udpChannelCodec; m_audioOutputInfos[deviceName].udpChannelCodec = udpChannelCodec;
m_audioOutputInfos[deviceName].udpDecimationFactor = decimationFactor; m_audioOutputInfos[deviceName].udpDecimationFactor = decimationFactor;
m_defaultOutputStarted = (outputDeviceIndex == -1);
} }
else else
{ {
@ -437,6 +445,7 @@ void AudioDeviceManager::startAudioInput(int inputDeviceIndex)
m_audioInputs[inputDeviceIndex]->setVolume(volume); m_audioInputs[inputDeviceIndex]->setVolume(volume);
m_audioInputInfos[deviceName].sampleRate = m_audioInputs[inputDeviceIndex]->getRate(); m_audioInputInfos[deviceName].sampleRate = m_audioInputs[inputDeviceIndex]->getRate();
m_audioInputInfos[deviceName].volume = volume; m_audioInputInfos[deviceName].volume = volume;
m_defaultInputStarted = (inputDeviceIndex == -1);
} }
else else
{ {

3
sdrbase/audio/audiodevicemanager.h
View File

@ -136,6 +136,9 @@ private:
QMap<int, AudioInput*> m_audioInputs; //!< audio device index to audio input map (index -1 is default device) 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 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(); void resetToDefaults();
QByteArray serialize() const; QByteArray serialize() const;
bool deserialize(const QByteArray& data); bool deserialize(const QByteArray& data);