VE7UWU
/
sdrangel
mirror of https://github.com/f4exb/sdrangel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Move AudioDeviceInfo singleton

This commit is contained in:
mxi-box 2024-03-30 14:24:05 +08:00
parent ce3e78322b
commit 556cc8ad45
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/samplesource/fcdpro/fcdproinput.cpp
View File

@ -174,7 +174,7 @@ void FCDProInput::closeDevice()
bool FCDProInput::openFCDAudio(const char* cardname) bool FCDProInput::openFCDAudio(const char* cardname)
{ {
AudioDeviceManager *audioDeviceManager = DSPEngine::instance()->getAudioDeviceManager(); AudioDeviceManager *audioDeviceManager = DSPEngine::instance()->getAudioDeviceManager();
const QList<AudioDeviceInfo>& audioList = audioDeviceManager->getInputDevices(); const QList<AudioDeviceInfo>& audioList = AudioDeviceInfo::availableInputDevices();
for (const auto &itAudio : audioList) for (const auto &itAudio : audioList)
{ {

2
plugins/samplesource/fcdproplus/fcdproplusinput.cpp
View File

@ -176,7 +176,7 @@ void FCDProPlusInput::closeDevice()
bool FCDProPlusInput::openFCDAudio(const char* cardname) bool FCDProPlusInput::openFCDAudio(const char* cardname)
{ {
AudioDeviceManager *audioDeviceManager = DSPEngine::instance()->getAudioDeviceManager(); AudioDeviceManager *audioDeviceManager = DSPEngine::instance()->getAudioDeviceManager();
const QList<AudioDeviceInfo>& audioList = audioDeviceManager->getInputDevices(); const QList<AudioDeviceInfo>& audioList = AudioDeviceInfo::availableInputDevices();
for (const auto &itAudio : audioList) for (const auto &itAudio : audioList)
{ {

16
sdrbase/audio/audiodeviceinfo.cpp
View File

@ -73,28 +73,28 @@ QString AudioDeviceInfo::realm() const
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
const QList<AudioDeviceInfo> &AudioDeviceInfo::availableInputDevices() const QList<AudioDeviceInfo> &AudioDeviceInfo::availableInputDevices()
{ {
if (!m_inputDevicesEnumerated) { if (!inputDevicesEnumerated) {
QList<QAudioDevice> devInfos = QMediaDevices::audioInputs(); QList<QAudioDevice> devInfos = QMediaDevices::audioInputs();
for (auto devInfo : devInfos) { for (auto devInfo : devInfos) {
m_inputDevices.append(AudioDeviceInfo(devInfo)); inputDevices.append(AudioDeviceInfo(devInfo));
} }
m_inputDevicesEnumerated = true; inputDevicesEnumerated = true;
} }
return m_inputDevices; return inputDevices;
} }
const QList<AudioDeviceInfo> &AudioDeviceInfo::availableOutputDevices() const QList<AudioDeviceInfo> &AudioDeviceInfo::availableOutputDevices()
{ {
if (!m_outputDevicesEnumerated) { if (!outputDevicesEnumerated) {
QList<QAudioDevice> devInfos = QMediaDevices::audioOutputs(); QList<QAudioDevice> devInfos = QMediaDevices::audioOutputs();
for (auto devInfo : devInfos) { for (auto devInfo : devInfos) {
m_outputDevices.append(AudioDeviceInfo(devInfo)); outputDevices.append(AudioDeviceInfo(devInfo));
} }
m_outputDevicesEnumerated = true; outputDevicesEnumerated = true;
} }
return m_outputDevices; return outputDevices;
} }
#else #else
const QList<AudioDeviceInfo> &AudioDeviceInfo::availableInputDevices() const QList<AudioDeviceInfo> &AudioDeviceInfo::availableInputDevices()

4
sdrbase/webapi/webapiadapter.cpp
View File

@ -454,8 +454,8 @@ int WebAPIAdapter::instanceAudioGet(
{ {
(void) error; (void) error;
DSPEngine *dspEngine = DSPEngine::instance(); DSPEngine *dspEngine = DSPEngine::instance();
const QList<AudioDeviceInfo>& audioInputDevices = dspEngine->getAudioDeviceManager()->getInputDevices(); const QList<AudioDeviceInfo>& audioInputDevices = AudioDeviceInfo::availableInputDevices();
const QList<AudioDeviceInfo>& audioOutputDevices = dspEngine->getAudioDeviceManager()->getOutputDevices(); const QList<AudioDeviceInfo>& audioOutputDevices = AudioDeviceInfo::availableOutputDevices();
int nbInputDevices = audioInputDevices.size(); int nbInputDevices = audioInputDevices.size();
int nbOutputDevices = audioOutputDevices.size(); int nbOutputDevices = audioOutputDevices.size();