mirror
/
sdrangel
kopia lustrzana https://github.com/f4exb/sdrangel
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Make AudioDeviceInfo singleton, remove the ones in AudioDeviceManager

pull/2038/head
mxi-box 2024-03-30 12:10:21 +08:00
rodzic 346ff80c19
commit eef0084a6e
8 zmienionych plików z 86 dodań i 75 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

3
plugins/samplesource/audioinput/audioinputgui.cpp
Wyświetl plik

@ -186,8 +186,7 @@ void AudioInputGui::updateSampleRateAndFrequency()
void AudioInputGui::refreshDeviceList() void AudioInputGui::refreshDeviceList()
{ {
ui->device->blockSignals(true); ui->device->blockSignals(true);
AudioDeviceManager *audioDeviceManager = DSPEngine::instance()->getAudioDeviceManager(); const QList<AudioDeviceInfo>& audioList = AudioDeviceInfo::availableInputDevices();
const QList<AudioDeviceInfo>& audioList = audioDeviceManager->getInputDevices();
ui->device->clear(); ui->device->clear();
for (const auto &itAudio : audioList) for (const auto &itAudio : audioList)

84
sdrbase/audio/audiodeviceinfo.cpp
Wyświetl plik

@ -20,6 +20,10 @@
#include "audiodeviceinfo.h" #include "audiodeviceinfo.h"
bool inputDevicesEnumerated = false, outputDevicesEnumerated = false;
QList<AudioDeviceInfo> inputDevices, outputDevices;
AudioDeviceInfo defaultInputDevice_, defaultOutputDevice_;
QString AudioDeviceInfo::deviceName() const QString AudioDeviceInfo::deviceName() const
{ {
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
@ -67,69 +71,81 @@ QString AudioDeviceInfo::realm() const
} }
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
QList<AudioDeviceInfo> AudioDeviceInfo::availableInputDevices() const QList<AudioDeviceInfo> &AudioDeviceInfo::availableInputDevices()
{ {
QList<QAudioDevice> devInfos = QMediaDevices::audioInputs(); if (!m_inputDevicesEnumerated) {
QList<AudioDeviceInfo> list; QList<QAudioDevice> devInfos = QMediaDevices::audioInputs();
for (auto devInfo : devInfos) {
for (auto devInfo : devInfos) { m_inputDevices.append(AudioDeviceInfo(devInfo));
list.append(AudioDeviceInfo(devInfo)); }
m_inputDevicesEnumerated = true;
} }
return list; return m_inputDevices;
} }
QList<AudioDeviceInfo> AudioDeviceInfo::availableOutputDevices() const QList<AudioDeviceInfo> &AudioDeviceInfo::availableOutputDevices()
{ {
QList<QAudioDevice> devInfos = QMediaDevices::audioOutputs(); if (!m_outputDevicesEnumerated) {
QList<AudioDeviceInfo> list; QList<QAudioDevice> devInfos = QMediaDevices::audioOutputs();
for (auto devInfo : devInfos) {
for (auto devInfo : devInfos) { m_outputDevices.append(AudioDeviceInfo(devInfo));
list.append(AudioDeviceInfo(devInfo)); }
m_outputDevicesEnumerated = true;
} }
return list; return m_outputDevices;
} }
#else #else
QList<AudioDeviceInfo> AudioDeviceInfo::availableInputDevices() const QList<AudioDeviceInfo> &AudioDeviceInfo::availableInputDevices()
{ {
QList<QAudioDeviceInfo> devInfos = QAudioDeviceInfo::availableDevices(QAudio::AudioInput); if (!inputDevicesEnumerated) {
QList<AudioDeviceInfo> list; QList<QAudioDeviceInfo> devInfos = QAudioDeviceInfo::availableDevices(QAudio::AudioInput);
for (auto devInfo : devInfos) {
for (auto devInfo : devInfos) { inputDevices.append(AudioDeviceInfo(devInfo));
list.append(AudioDeviceInfo(devInfo)); }
inputDevicesEnumerated = true;
} }
return list; return inputDevices;
} }
QList<AudioDeviceInfo> AudioDeviceInfo::availableOutputDevices() const QList<AudioDeviceInfo> &AudioDeviceInfo::availableOutputDevices()
{ {
QList<QAudioDeviceInfo> devInfos = QAudioDeviceInfo::availableDevices(QAudio::AudioOutput); if (!outputDevicesEnumerated) {
QList<AudioDeviceInfo> list; QList<QAudioDeviceInfo> devInfos = QAudioDeviceInfo::availableDevices(QAudio::AudioOutput);
for (auto devInfo : devInfos) {
for (auto devInfo : devInfos) { outputDevices.append(AudioDeviceInfo(devInfo));
list.append(AudioDeviceInfo(devInfo)); }
outputDevicesEnumerated = true;
} }
return list; return outputDevices;
} }
#endif #endif
AudioDeviceInfo AudioDeviceInfo::defaultOutputDevice() const AudioDeviceInfo &AudioDeviceInfo::defaultOutputDevice()
{ {
if (defaultOutputDevice_.m_deviceInfo.isNull())
{
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
return AudioDeviceInfo(QMediaDevices::defaultAudioOutput()); defaultOutputDevice_ = AudioDeviceInfo(QMediaDevices::defaultAudioOutput());
#else #else
return AudioDeviceInfo(QAudioDeviceInfo::defaultOutputDevice()); defaultOutputDevice_ = AudioDeviceInfo(QAudioDeviceInfo::defaultOutputDevice());
#endif #endif
}
return defaultOutputDevice_;
} }
AudioDeviceInfo AudioDeviceInfo::defaultInputDevice() const AudioDeviceInfo &AudioDeviceInfo::defaultInputDevice()
{ {
if (defaultInputDevice_.m_deviceInfo.isNull())
{
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
return AudioDeviceInfo(QMediaDevices::defaultAudioInput()); defaultInputDevice_ = AudioDeviceInfo(QMediaDevices::defaultAudioInput());
#else #else
return AudioDeviceInfo(QAudioDeviceInfo::defaultInputDevice()); defaultInputDevice_ = AudioDeviceInfo(QAudioDeviceInfo::defaultInputDevice());
#endif #endif
}
return defaultInputDevice_;
} }

8
sdrbase/audio/audiodeviceinfo.h
Wyświetl plik

@ -67,10 +67,10 @@ public:
bool isFormatSupported(const QAudioFormat &settings) const; bool isFormatSupported(const QAudioFormat &settings) const;
QList<int> supportedSampleRates() const; QList<int> supportedSampleRates() const;
static QList<AudioDeviceInfo> availableInputDevices(); static const QList<AudioDeviceInfo> &availableInputDevices();
static QList<AudioDeviceInfo> availableOutputDevices(); static const QList<AudioDeviceInfo> &availableOutputDevices();
static AudioDeviceInfo defaultInputDevice(); static const AudioDeviceInfo &defaultInputDevice();
static AudioDeviceInfo defaultOutputDevice(); static const AudioDeviceInfo &defaultOutputDevice();
private: private:

50
sdrbase/audio/audiodevicemanager.cpp
Wyświetl plik

@ -82,20 +82,22 @@ QDataStream& operator>>(QDataStream& ds, AudioDeviceManager::OutputDeviceInfo& i
AudioDeviceManager::AudioDeviceManager() AudioDeviceManager::AudioDeviceManager()
{ {
qDebug("AudioDeviceManager::AudioDeviceManager: scan input devices"); qDebug("AudioDeviceManager::AudioDeviceManager: scan input devices");
m_inputDevicesInfo = AudioDeviceInfo::availableInputDevices(); {
auto &devicesInfo = AudioDeviceInfo::availableInputDevices();
for (int i = 0; i < m_inputDevicesInfo.size(); i++) { for (int i = 0; i < devicesInfo.size(); i++) {
qDebug("AudioDeviceManager::AudioDeviceManager: input device #%d: %s", i, qPrintable(m_inputDevicesInfo[i].deviceName())); qDebug("AudioDeviceManager::AudioDeviceManager: input device #%d: %s", i, qPrintable(devicesInfo[i].deviceName()));
}
} }
qDebug("AudioDeviceManager::AudioDeviceManager: scan output devices"); qDebug("AudioDeviceManager::AudioDeviceManager: scan output devices");
m_outputDevicesInfo = AudioDeviceInfo::availableOutputDevices(); {
auto &devicesInfo = AudioDeviceInfo::availableOutputDevices();
for (int i = 0; i < m_outputDevicesInfo.size(); i++) { for (int i = 0; i < devicesInfo.size(); i++) {
qDebug("AudioDeviceManager::AudioDeviceManager: output device #%d: %s", i, qPrintable(m_outputDevicesInfo[i].deviceName())); qDebug("AudioDeviceManager::AudioDeviceManager: output device #%d: %s", i, qPrintable(devicesInfo[i].deviceName()));
}
} }
m_defaultInputStarted = false; m_defaultInputStarted = false;
m_defaultOutputStarted = false; m_defaultOutputStarted = false;
@ -142,9 +144,9 @@ bool AudioDeviceManager::getOutputDeviceName(int outputDeviceIndex, QString &dev
} }
else else
{ {
if (outputDeviceIndex < m_outputDevicesInfo.size()) if (outputDeviceIndex < AudioDeviceInfo::availableOutputDevices().size())
{ {
deviceName = m_outputDevicesInfo[outputDeviceIndex].deviceName(); deviceName = AudioDeviceInfo::availableOutputDevices()[outputDeviceIndex].deviceName();
return true; return true;
} }
else else
@ -163,9 +165,9 @@ bool AudioDeviceManager::getInputDeviceName(int inputDeviceIndex, QString &devic
} }
else else
{ {
if (inputDeviceIndex < m_inputDevicesInfo.size()) if (inputDeviceIndex < AudioDeviceInfo::availableInputDevices().size())
{ {
deviceName = m_inputDevicesInfo[inputDeviceIndex].deviceName(); deviceName = AudioDeviceInfo::availableInputDevices()[inputDeviceIndex].deviceName();
return true; return true;
} }
else else
@ -177,10 +179,10 @@ bool AudioDeviceManager::getInputDeviceName(int inputDeviceIndex, QString &devic
int AudioDeviceManager::getOutputDeviceIndex(const QString &deviceName) const int AudioDeviceManager::getOutputDeviceIndex(const QString &deviceName) const
{ {
for (int i = 0; i < m_outputDevicesInfo.size(); i++) for (int i = 0; i < AudioDeviceInfo::availableOutputDevices().size(); i++)
{ {
//qDebug("AudioDeviceManager::getOutputDeviceIndex: %d: %s|%s", i, qPrintable(deviceName), qPrintable(m_outputDevicesInfo[i].deviceName())); //qDebug("AudioDeviceManager::getOutputDeviceIndex: %d: %s|%s", i, qPrintable(deviceName), qPrintable(AudioDeviceInfo::availableOutputDevices()[i].deviceName()));
if (deviceName == m_outputDevicesInfo[i].deviceName()) { if (deviceName == AudioDeviceInfo::availableOutputDevices()[i].deviceName()) {
return i; return i;
} }
} }
@ -190,10 +192,10 @@ int AudioDeviceManager::getOutputDeviceIndex(const QString &deviceName) const
int AudioDeviceManager::getInputDeviceIndex(const QString &deviceName) const int AudioDeviceManager::getInputDeviceIndex(const QString &deviceName) const
{ {
for (int i = 0; i < m_inputDevicesInfo.size(); i++) for (int i = 0; i < AudioDeviceInfo::availableInputDevices().size(); i++)
{ {
//qDebug("AudioDeviceManager::getInputDeviceIndex: %d: %s|%s", i, qPrintable(deviceName), qPrintable(m_inputDevicesInfo[i].deviceName())); //qDebug("AudioDeviceManager::getInputDeviceIndex: %d: %s|%s", i, qPrintable(deviceName), qPrintable(AudioDeviceInfo::availableInputDevices()[i].deviceName()));
if (deviceName == m_inputDevicesInfo[i].deviceName()) { if (deviceName == AudioDeviceInfo::availableInputDevices()[i].deviceName()) {
return i; return i;
} }
} }
@ -295,7 +297,7 @@ void AudioDeviceManager::addAudioSink(AudioFifo* audioFifo, MessageQueue *sample
if (outputDeviceIndex < 0) { if (outputDeviceIndex < 0) {
audioOutputDevice->setDeviceName("System default"); audioOutputDevice->setDeviceName("System default");
} else { } else {
audioOutputDevice->setDeviceName(m_outputDevicesInfo[outputDeviceIndex].deviceName()); audioOutputDevice->setDeviceName(AudioDeviceInfo::availableOutputDevices()[outputDeviceIndex].deviceName());
} }
qDebug("AudioDeviceManager::addAudioSink: new AudioOutputDevice on thread: %p", thread); qDebug("AudioDeviceManager::addAudioSink: new AudioOutputDevice on thread: %p", thread);
@ -382,7 +384,7 @@ void AudioDeviceManager::addAudioSource(AudioFifo* audioFifo, MessageQueue *samp
if (inputDeviceIndex < 0) { if (inputDeviceIndex < 0) {
audioInputDevice->setDeviceName("System default"); audioInputDevice->setDeviceName("System default");
} else { } else {
audioInputDevice->setDeviceName(m_outputDevicesInfo[inputDeviceIndex].deviceName()); audioInputDevice->setDeviceName(AudioDeviceInfo::availableOutputDevices()[inputDeviceIndex].deviceName());
} }
qDebug("AudioDeviceManager::addAudioSource: new AudioInputDevice on thread: %p", thread); qDebug("AudioDeviceManager::addAudioSource: new AudioInputDevice on thread: %p", thread);
@ -789,9 +791,9 @@ void AudioDeviceManager::inputInfosCleanup()
{ {
QSet<QString> deviceNames; QSet<QString> deviceNames;
deviceNames.insert(m_defaultDeviceName); deviceNames.insert(m_defaultDeviceName);
QList<AudioDeviceInfo>::const_iterator itd = m_inputDevicesInfo.begin(); QList<AudioDeviceInfo>::const_iterator itd = AudioDeviceInfo::availableInputDevices().begin();
for (; itd != m_inputDevicesInfo.end(); ++itd) for (; itd != AudioDeviceInfo::availableInputDevices().end(); ++itd)
{ {
qDebug("AudioDeviceManager::inputInfosCleanup: device: %s", qPrintable(itd->deviceName())); qDebug("AudioDeviceManager::inputInfosCleanup: device: %s", qPrintable(itd->deviceName()));
deviceNames.insert(itd->deviceName()); deviceNames.insert(itd->deviceName());
@ -817,9 +819,9 @@ void AudioDeviceManager::outputInfosCleanup()
{ {
QSet<QString> deviceNames; QSet<QString> deviceNames;
deviceNames.insert(m_defaultDeviceName); deviceNames.insert(m_defaultDeviceName);
QList<AudioDeviceInfo>::const_iterator itd = m_outputDevicesInfo.begin(); QList<AudioDeviceInfo>::const_iterator itd = AudioDeviceInfo::availableOutputDevices().begin();
for (; itd != m_outputDevicesInfo.end(); ++itd) for (; itd != AudioDeviceInfo::availableOutputDevices().end(); ++itd)
{ {
qDebug("AudioDeviceManager::outputInfosCleanup: device: %s", qPrintable(itd->deviceName())); qDebug("AudioDeviceManager::outputInfosCleanup: device: %s", qPrintable(itd->deviceName()));
deviceNames.insert(itd->deviceName()); deviceNames.insert(itd->deviceName());

6
sdrbase/audio/audiodevicemanager.h
Wyświetl plik

@ -102,9 +102,6 @@ public:
AudioDeviceManager(); AudioDeviceManager();
~AudioDeviceManager(); ~AudioDeviceManager();
const QList<AudioDeviceInfo>& getInputDevices() const { return m_inputDevicesInfo; }
const QList<AudioDeviceInfo>& getOutputDevices() const { return m_outputDevicesInfo; }
bool getOutputDeviceName(int outputDeviceIndex, QString &deviceName) const; bool getOutputDeviceName(int outputDeviceIndex, QString &deviceName) const;
bool getInputDeviceName(int inputDeviceIndex, QString &deviceName) const; bool getInputDeviceName(int inputDeviceIndex, QString &deviceName) const;
int getOutputDeviceIndex(const QString &deviceName) const; int getOutputDeviceIndex(const QString &deviceName) const;
@ -136,9 +133,6 @@ public:
static const QString m_defaultDeviceName; static const QString m_defaultDeviceName;
private: private:
QList<AudioDeviceInfo> m_inputDevicesInfo;
QList<AudioDeviceInfo> m_outputDevicesInfo;
QMap<AudioFifo*, int> m_audioSinkFifos; //< audio sink FIFO to audio output device index-1 map QMap<AudioFifo*, int> m_audioSinkFifos; //< audio sink FIFO to audio output device index-1 map
QMap<AudioFifo*, MessageQueue*> m_audioFifoToSinkMessageQueues; //!< audio sink FIFO to attached sink message queue QMap<AudioFifo*, MessageQueue*> m_audioFifoToSinkMessageQueues; //!< audio sink FIFO to attached sink message queue
QMap<int, QList<MessageQueue*> > m_outputDeviceSinkMessageQueues; //!< sink message queues attached to device QMap<int, QList<MessageQueue*> > m_outputDeviceSinkMessageQueues; //!< sink message queues attached to device

2
sdrbase/audio/audiooutputdevice.cpp
Wyświetl plik

@ -91,7 +91,7 @@ bool AudioOutputDevice::start(int deviceIndex, int sampleRate)
} }
else else
{ {
QList<AudioDeviceInfo> devicesInfo = AudioDeviceInfo::availableOutputDevices(); auto &devicesInfo = AudioDeviceInfo::availableOutputDevices();
if (deviceIndex < devicesInfo.size()) if (deviceIndex < devicesInfo.size())
{ {

6
sdrgui/gui/audiodialog.cpp
Wyświetl plik

@ -40,14 +40,14 @@ AudioDialogX::AudioDialogX(AudioDeviceManager* audioDeviceManager, QWidget* pare
// out panel // out panel
AudioDeviceManager::OutputDeviceInfo outDeviceInfo; AudioDeviceManager::OutputDeviceInfo outDeviceInfo;
AudioDeviceInfo defaultOutputDeviceInfo = AudioDeviceInfo::defaultOutputDevice(); const AudioDeviceInfo &defaultOutputDeviceInfo = AudioDeviceInfo::defaultOutputDevice();
treeItem = new QTreeWidgetItem(ui->audioOutTree); treeItem = new QTreeWidgetItem(ui->audioOutTree);
treeItem->setText(1, AudioDeviceManager::m_defaultDeviceName); treeItem->setText(1, AudioDeviceManager::m_defaultDeviceName);
bool found = m_audioDeviceManager->getOutputDeviceInfo(AudioDeviceManager::m_defaultDeviceName, outDeviceInfo); bool found = m_audioDeviceManager->getOutputDeviceInfo(AudioDeviceManager::m_defaultDeviceName, outDeviceInfo);
treeItem->setText(0, found ? "__" : "_D"); treeItem->setText(0, found ? "__" : "_D");
ui->audioOutTree->setCurrentItem(treeItem); ui->audioOutTree->setCurrentItem(treeItem);
const QList<AudioDeviceInfo>& outputDevices = m_audioDeviceManager->getOutputDevices(); const QList<AudioDeviceInfo>& outputDevices = AudioDeviceInfo::availableOutputDevices();
for(QList<AudioDeviceInfo>::const_iterator it = outputDevices.begin(); it != outputDevices.end(); ++it) for(QList<AudioDeviceInfo>::const_iterator it = outputDevices.begin(); it != outputDevices.end(); ++it)
{ {
@ -75,7 +75,7 @@ AudioDialogX::AudioDialogX(AudioDeviceManager* audioDeviceManager, QWidget* pare
treeItem->setText(0, found ? "__" : "_D"); treeItem->setText(0, found ? "__" : "_D");
ui->audioInTree->setCurrentItem(treeItem); ui->audioInTree->setCurrentItem(treeItem);
const QList<AudioDeviceInfo>& inputDevices = m_audioDeviceManager->getInputDevices(); const QList<AudioDeviceInfo>& inputDevices = AudioDeviceInfo::availableInputDevices();
for(QList<AudioDeviceInfo>::const_iterator it = inputDevices.begin(); it != inputDevices.end(); ++it) for(QList<AudioDeviceInfo>::const_iterator it = inputDevices.begin(); it != inputDevices.end(); ++it)
{ {

2
sdrgui/gui/audioselectdialog.cpp
Wyświetl plik

@ -40,7 +40,7 @@ AudioSelectDialog::AudioSelectDialog(const AudioDeviceManager* audioDeviceManage
defaultItem->setText(2, tr("%1").arg(sampleRate)); defaultItem->setText(2, tr("%1").arg(sampleRate));
defaultItem->setTextAlignment(2, Qt::AlignRight); defaultItem->setTextAlignment(2, Qt::AlignRight);
QList<AudioDeviceInfo> devices = input ? m_audioDeviceManager->getInputDevices() : m_audioDeviceManager->getOutputDevices(); const QList<AudioDeviceInfo> &devices = input ? AudioDeviceInfo::availableInputDevices() : AudioDeviceInfo::availableOutputDevices();
for(QList<AudioDeviceInfo>::const_iterator it = devices.begin(); it != devices.end(); ++it) for(QList<AudioDeviceInfo>::const_iterator it = devices.begin(); it != devices.end(); ++it)
{ {