From a1ef1d4484c423064b362c57f103d7a6d915434d Mon Sep 17 00:00:00 2001 From: Roland Winklmeier Date: Thu, 25 Dec 2014 20:12:58 +0100 Subject: [PATCH] refs #320 Rename CAudioDevice to CAudioDeviceInfo CAudioDevice implied a device handler instead of device information --- samples/voiceclient/client.cpp | 6 ++--- src/blackcore/context_audio.h | 12 ++++----- src/blackcore/context_audio_impl.cpp | 14 +++++----- src/blackcore/context_audio_impl.h | 6 ++--- src/blackcore/context_audio_proxy.cpp | 14 +++++----- src/blackcore/context_audio_proxy.h | 8 +++--- src/blackcore/voice.h | 16 ++++++------ src/blackcore/voice_vatlib.cpp | 22 ++++++++-------- src/blackcore/voice_vatlib.h | 21 +++++++-------- .../components/audiosetupcomponent.cpp | 24 ++++++++--------- src/blackgui/components/audiosetupcomponent.h | 6 ++--- src/blackmisc/audioallclasses.h | 4 +-- .../{audiodevice.cpp => audiodeviceinfo.cpp} | 8 +++--- .../{audiodevice.h => audiodeviceinfo.h} | 22 ++++++++-------- ...devicelist.cpp => audiodeviceinfolist.cpp} | 26 +++++++++---------- ...udiodevicelist.h => audiodeviceinfolist.h} | 20 +++++++------- src/blackmisc/blackmiscfreefunctions.cpp | 4 +-- src/blacksound/soundgenerator.cpp | 6 ++--- src/blacksound/soundgenerator.h | 6 ++--- src/swiftcore/tool.cpp | 4 +-- 20 files changed, 124 insertions(+), 125 deletions(-) rename src/blackmisc/{audiodevice.cpp => audiodeviceinfo.cpp} (83%) rename src/blackmisc/{audiodevice.h => audiodeviceinfo.h} (78%) rename src/blackmisc/{audiodevicelist.cpp => audiodeviceinfolist.cpp} (57%) rename src/blackmisc/{audiodevicelist.h => audiodeviceinfolist.h} (77%) diff --git a/samples/voiceclient/client.cpp b/samples/voiceclient/client.cpp index 0d26e227b..9ce9c8f9b 100644 --- a/samples/voiceclient/client.cpp +++ b/samples/voiceclient/client.cpp @@ -5,7 +5,7 @@ #include "client.h" #include "blackcore/voice_vatlib.h" -#include "blackmisc/audiodevicelist.h" +#include "blackmisc/audiodeviceinfolist.h" #include "blackmisc/avcallsignlist.h" using namespace BlackMisc::Audio; @@ -142,7 +142,7 @@ void Client::terminateConnectionCmd(QTextStream & /** args **/) void Client::inputDevicesCmd(QTextStream & /** args **/) { - foreach(BlackMisc::Audio::CAudioDevice device, this->m_voice->audioDevices().getInputDevices()) + for(auto &device : m_voice->audioDevices().getInputDevices()) { std::cout << device.getName().toStdString() << std::endl; } @@ -154,7 +154,7 @@ void Client::inputDevicesCmd(QTextStream & /** args **/) */ void Client::outputDevicesCmd(QTextStream & /** args **/) { - foreach(BlackMisc::Audio::CAudioDevice device, this->m_voice->audioDevices().getOutputDevices()) + for(auto &device : m_voice->audioDevices().getOutputDevices()) { std::cout << device.getName().toStdString() << std::endl; } diff --git a/src/blackcore/context_audio.h b/src/blackcore/context_audio.h index b99f00b79..67f379576 100644 --- a/src/blackcore/context_audio.h +++ b/src/blackcore/context_audio.h @@ -14,7 +14,7 @@ #include "blackcore/context.h" #include "blackmisc/genericdbusinterface.h" -#include "blackmisc/audiodevicelist.h" +#include "blackmisc/audiodeviceinfolist.h" #include "blackmisc/voiceroomlist.h" #include "blackmisc/nwuserlist.h" #include "blackmisc/avaircraft.h" @@ -89,10 +89,10 @@ namespace BlackCore void changedMute(bool muted); //! Changed audio devices (e.g. device enabled/disable) - void changedAudioDevices(const BlackMisc::Audio::CAudioDeviceList &devices); + void changedAudioDevices(const BlackMisc::Audio::CAudioDeviceInfoList &devices); //! Changed slection of audio devices - void changedSelectedAudioDevices(const BlackMisc::Audio::CAudioDeviceList &devices); + void changedSelectedAudioDevices(const BlackMisc::Audio::CAudioDeviceInfoList &devices); public slots: //! Get voice rooms for COM1, COM2: @@ -134,19 +134,19 @@ namespace BlackCore virtual BlackMisc::Network::CUserList getCom2RoomUsers() const = 0; //! Audio devices - virtual BlackMisc::Audio::CAudioDeviceList getAudioDevices() const = 0; + virtual BlackMisc::Audio::CAudioDeviceInfoList getAudioDevices() const = 0; /*! * \brief Get current audio device * \return input and output devices */ - virtual BlackMisc::Audio::CAudioDeviceList getCurrentAudioDevices() const = 0; + virtual BlackMisc::Audio::CAudioDeviceInfoList getCurrentAudioDevices() const = 0; /*! * \brief Set current audio device * \param audioDevice can be input or audio device */ - virtual void setCurrentAudioDevice(const BlackMisc::Audio::CAudioDevice &audioDevice) = 0; + virtual void setCurrentAudioDevice(const BlackMisc::Audio::CAudioDeviceInfo &audioDevice) = 0; /*! * \brief Set volumes via com units, also allows to mute diff --git a/src/blackcore/context_audio_impl.cpp b/src/blackcore/context_audio_impl.cpp index ad87d5ba1..4707c5676 100644 --- a/src/blackcore/context_audio_impl.cpp +++ b/src/blackcore/context_audio_impl.cpp @@ -127,7 +127,7 @@ namespace BlackCore /* * Audio devices */ - CAudioDeviceList CContextAudio::getAudioDevices() const + CAudioDeviceInfoList CContextAudio::getAudioDevices() const { Q_ASSERT(this->m_voice); CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; @@ -137,11 +137,11 @@ namespace BlackCore /* * Audio default devices */ - CAudioDeviceList CContextAudio::getCurrentAudioDevices() const + CAudioDeviceInfoList CContextAudio::getCurrentAudioDevices() const { Q_ASSERT(this->m_voice); CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; - CAudioDeviceList devices; + CAudioDeviceInfoList devices; devices.push_back(this->m_voice->getCurrentInputDevice()); devices.push_back(this->m_voice->getCurrentOutputDevice()); return devices; @@ -150,13 +150,13 @@ namespace BlackCore /* * Set current device */ - void CContextAudio::setCurrentAudioDevice(const CAudioDevice &audioDevice) + void CContextAudio::setCurrentAudioDevice(const CAudioDeviceInfo &audioDevice) { Q_ASSERT(this->m_voice); - Q_ASSERT(audioDevice.getType() != CAudioDevice::Unknown); + Q_ASSERT(audioDevice.getType() != CAudioDeviceInfo::Unknown); CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << audioDevice; bool changed = false; - if (audioDevice.getType() == CAudioDevice::InputDevice) + if (audioDevice.getType() == CAudioDeviceInfo::InputDevice) { if (this->m_voice->getCurrentInputDevice() != audioDevice) { @@ -342,7 +342,7 @@ namespace BlackCore { Q_ASSERT(this->m_voice); CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << selcal; - CAudioDevice outputDevice = m_voice->getCurrentOutputDevice(); + CAudioDeviceInfo outputDevice = m_voice->getCurrentOutputDevice(); BlackSound::CSoundGenerator::playSelcal(90, selcal, outputDevice); } diff --git a/src/blackcore/context_audio_impl.h b/src/blackcore/context_audio_impl.h index 4edcaaf3c..b4a6bf9b4 100644 --- a/src/blackcore/context_audio_impl.h +++ b/src/blackcore/context_audio_impl.h @@ -77,13 +77,13 @@ namespace BlackCore virtual void leaveAllVoiceRooms() override; //! \copydoc IContextAudio::getAudioDevices() - virtual BlackMisc::Audio::CAudioDeviceList getAudioDevices() const override; + virtual BlackMisc::Audio::CAudioDeviceInfoList getAudioDevices() const override; //! \copydoc IContextAudio::getCurrentAudioDevices() - virtual BlackMisc::Audio::CAudioDeviceList getCurrentAudioDevices() const override; + virtual BlackMisc::Audio::CAudioDeviceInfoList getCurrentAudioDevices() const override; //! \copydoc IContextAudio::setCurrentAudioDevice() - virtual void setCurrentAudioDevice(const BlackMisc::Audio::CAudioDevice &audioDevice) override; + virtual void setCurrentAudioDevice(const BlackMisc::Audio::CAudioDeviceInfo &audioDevice) override; //! \copydoc IContextAudio::setVolumes virtual void setVolumes(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2) override; diff --git a/src/blackcore/context_audio_proxy.cpp b/src/blackcore/context_audio_proxy.cpp index 1c0943d59..42a483eb3 100644 --- a/src/blackcore/context_audio_proxy.cpp +++ b/src/blackcore/context_audio_proxy.cpp @@ -42,10 +42,10 @@ namespace BlackCore "changedAudioVolumes", this, SIGNAL(changedAudioVolumes(qint32, qint32))); Q_ASSERT(s); s = connection.connect(serviceName, IContextAudio::ObjectPath(), IContextAudio::InterfaceName(), - "changedAudioDevices", this, SIGNAL(changedAudioDevices(BlackMisc::Audio::CAudioDeviceList))); + "changedAudioDevices", this, SIGNAL(changedAudioDevices(BlackMisc::Audio::CAudioDeviceInfoList))); Q_ASSERT(s); s = connection.connect(serviceName, IContextAudio::ObjectPath(), IContextAudio::InterfaceName(), - "changedSelectedAudioDevices", this, SIGNAL(changedSelectedAudioDevices(BlackMisc::Audio::CAudioDeviceList))); + "changedSelectedAudioDevices", this, SIGNAL(changedSelectedAudioDevices(BlackMisc::Audio::CAudioDeviceInfoList))); Q_ASSERT(s); s = connection.connect(serviceName, IContextAudio::ObjectPath(), IContextAudio::InterfaceName(), "changedMute", this, SIGNAL(changedMute(bool))); @@ -96,23 +96,23 @@ namespace BlackCore /* * Audio devices */ - CAudioDeviceList CContextAudioProxy::getAudioDevices() const + CAudioDeviceInfoList CContextAudioProxy::getAudioDevices() const { - return this->m_dBusInterface->callDBusRet(QLatin1Literal("getAudioDevices")); + return this->m_dBusInterface->callDBusRet(QLatin1Literal("getAudioDevices")); } /* * Get current audio devices */ - BlackMisc::Audio::CAudioDeviceList CContextAudioProxy::getCurrentAudioDevices() const + CAudioDeviceInfoList CContextAudioProxy::getCurrentAudioDevices() const { - return this->m_dBusInterface->callDBusRet(QLatin1Literal("getCurrentAudioDevices")); + return this->m_dBusInterface->callDBusRet(QLatin1Literal("getCurrentAudioDevices")); } /* * Set current audio device */ - void CContextAudioProxy::setCurrentAudioDevice(const CAudioDevice &audioDevice) + void CContextAudioProxy::setCurrentAudioDevice(const CAudioDeviceInfo &audioDevice) { this->m_dBusInterface->callDBus(QLatin1Literal("setCurrentAudioDevice"), audioDevice); } diff --git a/src/blackcore/context_audio_proxy.h b/src/blackcore/context_audio_proxy.h index 3f7e3fc89..5412d72f1 100644 --- a/src/blackcore/context_audio_proxy.h +++ b/src/blackcore/context_audio_proxy.h @@ -15,7 +15,7 @@ #include "context_audio.h" #include "blackmisc/genericdbusinterface.h" -#include "blackmisc/audiodevicelist.h" +#include "blackmisc/audiodeviceinfolist.h" #include "blackmisc/voiceroomlist.h" #include "blackmisc/nwuserlist.h" #include "blackmisc/avaircraft.h" @@ -82,13 +82,13 @@ namespace BlackCore virtual void leaveAllVoiceRooms() override; //! \copydoc IContextAudio::getAudioDevices() - virtual BlackMisc::Audio::CAudioDeviceList getAudioDevices() const override; + virtual BlackMisc::Audio::CAudioDeviceInfoList getAudioDevices() const override; //! \copydoc IContextAudio::getCurrentAudioDevices() - virtual BlackMisc::Audio::CAudioDeviceList getCurrentAudioDevices() const override; + virtual BlackMisc::Audio::CAudioDeviceInfoList getCurrentAudioDevices() const override; //! \copydoc IContextAudio::setCurrentAudioDevice() - virtual void setCurrentAudioDevice(const BlackMisc::Audio::CAudioDevice &audioDevice) override; + virtual void setCurrentAudioDevice(const BlackMisc::Audio::CAudioDeviceInfo &audioDevice) override; //! \copydoc IContextAudio::setVolumes() virtual void setVolumes(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2) override; diff --git a/src/blackcore/voice.h b/src/blackcore/voice.h index a98e22e23..ea1c90af3 100644 --- a/src/blackcore/voice.h +++ b/src/blackcore/voice.h @@ -10,7 +10,7 @@ #include "../blackmisc/avselcal.h" #include "../blackmisc/nwuserlist.h" #include "../blackmisc/voiceroomlist.h" -#include "../blackmisc/audiodevicelist.h" +#include "../blackmisc/audiodeviceinfolist.h" #include "../blackmisc/statusmessage.h" #include @@ -57,19 +57,19 @@ namespace BlackCore * \brief Audio devices * \return */ - virtual const BlackMisc::Audio::CAudioDeviceList &audioDevices() const = 0; + virtual const BlackMisc::Audio::CAudioDeviceInfoList &audioDevices() const = 0; /*! * \brief Default input device * \return */ - virtual const BlackMisc::Audio::CAudioDevice defaultAudioInputDevice() const = 0; + virtual const BlackMisc::Audio::CAudioDeviceInfo defaultAudioInputDevice() const = 0; /*! * \brief Default output device * \return */ - virtual const BlackMisc::Audio::CAudioDevice defaultAudioOutputDevice() const = 0; + virtual const BlackMisc::Audio::CAudioDeviceInfo defaultAudioOutputDevice() const = 0; /************************************************ * SETUP TESTS @@ -111,22 +111,22 @@ namespace BlackCore /*! * \brief Current input device */ - virtual BlackMisc::Audio::CAudioDevice getCurrentInputDevice() const = 0; + virtual BlackMisc::Audio::CAudioDeviceInfo getCurrentInputDevice() const = 0; /*! * \brief Current output device */ - virtual BlackMisc::Audio::CAudioDevice getCurrentOutputDevice() const = 0; + virtual BlackMisc::Audio::CAudioDeviceInfo getCurrentOutputDevice() const = 0; /*! * \brief Output device to be used */ - virtual void setOutputDevice(const BlackMisc::Audio::CAudioDevice &device) = 0; + virtual void setOutputDevice(const BlackMisc::Audio::CAudioDeviceInfo &device) = 0; /*! * \brief Input device to be used */ - virtual void setInputDevice(const BlackMisc::Audio::CAudioDevice &device) = 0; + virtual void setInputDevice(const BlackMisc::Audio::CAudioDeviceInfo &device) = 0; /*! * \brief Enable audio loopback to route recorded voice from microphone to speakers diff --git a/src/blackcore/voice_vatlib.cpp b/src/blackcore/voice_vatlib.cpp index e2f6b5347..8d17238f5 100644 --- a/src/blackcore/voice_vatlib.cpp +++ b/src/blackcore/voice_vatlib.cpp @@ -66,7 +66,7 @@ namespace BlackCore /* * Devices */ - const BlackMisc::Audio::CAudioDeviceList &CVoiceVatlib::audioDevices() const + const BlackMisc::Audio::CAudioDeviceInfoList &CVoiceVatlib::audioDevices() const { QMutexLocker lockForReading(&m_lockDeviceList); return m_devices; @@ -75,25 +75,25 @@ namespace BlackCore /* * Default input device */ - const BlackMisc::Audio::CAudioDevice CVoiceVatlib::defaultAudioInputDevice() const + const BlackMisc::Audio::CAudioDeviceInfo CVoiceVatlib::defaultAudioInputDevice() const { // Constructor creates already a default device - return BlackMisc::Audio::CAudioDevice(BlackMisc::Audio::CAudioDevice::InputDevice, BlackMisc::Audio::CAudioDevice::defaultDeviceIndex(), "default"); + return BlackMisc::Audio::CAudioDeviceInfo(BlackMisc::Audio::CAudioDeviceInfo::InputDevice, BlackMisc::Audio::CAudioDeviceInfo::defaultDeviceIndex(), "default"); } /* * Default output device */ - const BlackMisc::Audio::CAudioDevice CVoiceVatlib::defaultAudioOutputDevice() const + const BlackMisc::Audio::CAudioDeviceInfo CVoiceVatlib::defaultAudioOutputDevice() const { // Constructor creates already a default device - return BlackMisc::Audio::CAudioDevice(BlackMisc::Audio::CAudioDevice::OutputDevice, BlackMisc::Audio::CAudioDevice::defaultDeviceIndex(), "default"); + return BlackMisc::Audio::CAudioDeviceInfo(BlackMisc::Audio::CAudioDeviceInfo::OutputDevice, BlackMisc::Audio::CAudioDeviceInfo::defaultDeviceIndex(), "default"); } /* * Current output device */ - CAudioDevice CVoiceVatlib::getCurrentOutputDevice() const + CAudioDeviceInfo CVoiceVatlib::getCurrentOutputDevice() const { QMutexLocker locker(&m_lockCurrentOutputDevice); return m_currentOutputDevice; @@ -102,7 +102,7 @@ namespace BlackCore /* * Current input device */ - CAudioDevice CVoiceVatlib::getCurrentInputDevice() const + CAudioDeviceInfo CVoiceVatlib::getCurrentInputDevice() const { QMutexLocker locker(&m_lockCurrentInputDevice); return m_currentInputDevice; @@ -111,7 +111,7 @@ namespace BlackCore /* * Set input device */ - void CVoiceVatlib::setInputDevice(const BlackMisc::Audio::CAudioDevice &device) + void CVoiceVatlib::setInputDevice(const BlackMisc::Audio::CAudioDeviceInfo &device) { std::lock_guard locker(m_vatlib); Q_ASSERT_X(m_vatlib->IsValid() && m_vatlib->IsSetup(), "CVoiceVatlib", "Cvatlib_Voice_Simple invalid or not setup!"); @@ -143,7 +143,7 @@ namespace BlackCore /* * Set output device */ - void CVoiceVatlib::setOutputDevice(const BlackMisc::Audio::CAudioDevice &device) + void CVoiceVatlib::setOutputDevice(const BlackMisc::Audio::CAudioDeviceInfo &device) { std::lock_guard locker(m_vatlib); Q_ASSERT_X(m_vatlib->IsValid() && m_vatlib->IsSetup(), "CVoiceVatlib", "Cvatlib_Voice_Simple invalid or not setup!"); @@ -400,7 +400,7 @@ namespace BlackCore void CVoiceVatlib::onInputHardwareDeviceReceived(Cvatlib_Voice_Simple *obj, const char *name, void *cbVar) { Q_UNUSED(obj) - BlackMisc::Audio::CAudioDevice inputDevice(BlackMisc::Audio::CAudioDevice::InputDevice, cbvar_cast_voice(cbVar)->m_devices.count(BlackMisc::Audio::CAudioDevice::InputDevice), QString(name)); + BlackMisc::Audio::CAudioDeviceInfo inputDevice(BlackMisc::Audio::CAudioDeviceInfo::InputDevice, cbvar_cast_voice(cbVar)->m_devices.count(BlackMisc::Audio::CAudioDeviceInfo::InputDevice), QString(name)); QMutexLocker lockForWriting(&(cbvar_cast_voice(cbVar)->m_lockDeviceList)); cbvar_cast_voice(cbVar)->m_devices.push_back(inputDevice); } @@ -411,7 +411,7 @@ namespace BlackCore void CVoiceVatlib::onOutputHardwareDeviceReceived(Cvatlib_Voice_Simple *obj, const char *name, void *cbVar) { Q_UNUSED(obj) - BlackMisc::Audio::CAudioDevice outputDevice(BlackMisc::Audio::CAudioDevice::OutputDevice, cbvar_cast_voice(cbVar)->m_devices.count(BlackMisc::Audio::CAudioDevice::OutputDevice), QString(name)); + BlackMisc::Audio::CAudioDeviceInfo outputDevice(BlackMisc::Audio::CAudioDeviceInfo::OutputDevice, cbvar_cast_voice(cbVar)->m_devices.count(BlackMisc::Audio::CAudioDeviceInfo::OutputDevice), QString(name)); QMutexLocker lockForWriting(&(cbvar_cast_voice(cbVar)->m_lockDeviceList)); cbvar_cast_voice(cbVar)->m_devices.push_back(outputDevice); } diff --git a/src/blackcore/voice_vatlib.h b/src/blackcore/voice_vatlib.h index ab9b615e4..d101a6314 100644 --- a/src/blackcore/voice_vatlib.h +++ b/src/blackcore/voice_vatlib.h @@ -8,7 +8,6 @@ #include "voice.h" #include "../blacksound/soundgenerator.h" -#include "../blackmisc/audiodevicelist.h" #include "../blackmisc/nwuserlist.h" #include "../blackmisc/avcallsignlist.h" #include "../blackmisc/sharedlockablepointer.h" @@ -74,13 +73,13 @@ namespace BlackCore // and ATC to headspeakers. Is not important to implement that now, if ever. //! \copydoc IVoice::audioDevices() - virtual const BlackMisc::Audio::CAudioDeviceList &audioDevices() const override; + virtual const BlackMisc::Audio::CAudioDeviceInfoList &audioDevices() const override; //! \copydoc IVoice::defaultAudioInputDevice() - virtual const BlackMisc::Audio::CAudioDevice defaultAudioInputDevice() const override; + virtual const BlackMisc::Audio::CAudioDeviceInfo defaultAudioInputDevice() const override; //! \copydoc IVoice::defaultAudioOutputDevice() - virtual const BlackMisc::Audio::CAudioDevice defaultAudioOutputDevice() const override; + virtual const BlackMisc::Audio::CAudioDeviceInfo defaultAudioOutputDevice() const override; /************************************************ * SETUP TESTS @@ -105,16 +104,16 @@ namespace BlackCore virtual IVoiceChannel *getVoiceChannel(qint32 channelIndex) const override; //! \copydoc IVoice::setInputDevice - virtual void setInputDevice(const BlackMisc::Audio::CAudioDevice &device) override; + virtual void setInputDevice(const BlackMisc::Audio::CAudioDeviceInfo &device) override; //! \copydoc IVoice::setOutputDevice - virtual void setOutputDevice(const BlackMisc::Audio::CAudioDevice &device) override; + virtual void setOutputDevice(const BlackMisc::Audio::CAudioDeviceInfo &device) override; //! \copydoc IVoice::getCurrentInputDevice() - virtual BlackMisc::Audio::CAudioDevice getCurrentInputDevice() const override; + virtual BlackMisc::Audio::CAudioDeviceInfo getCurrentInputDevice() const override; //! \copydoc IVoice::getCurrentOutputDevice() - virtual BlackMisc::Audio::CAudioDevice getCurrentOutputDevice() const override; + virtual BlackMisc::Audio::CAudioDeviceInfo getCurrentOutputDevice() const override; //! \copydoc IVoice::enableAudioLoopback virtual void enableAudioLoopback(bool enable = true) override; @@ -148,9 +147,9 @@ namespace BlackCore void onRoomStatusUpdate(qint32 roomIndex, Cvatlib_Voice_Simple::roomStatusUpdate roomStatus); TVatlibPointer m_vatlib; - BlackMisc::Audio::CAudioDeviceList m_devices; /*!< in and output devices */ - BlackMisc::Audio::CAudioDevice m_currentOutputDevice; - BlackMisc::Audio::CAudioDevice m_currentInputDevice; + BlackMisc::Audio::CAudioDeviceInfoList m_devices; /*!< in and output devices */ + BlackMisc::Audio::CAudioDeviceInfo m_currentOutputDevice; + BlackMisc::Audio::CAudioDeviceInfo m_currentInputDevice; std::atomic m_inputSquelch; std::atomic m_micTestResult; QHash m_hashChannelIndex; diff --git a/src/blackgui/components/audiosetupcomponent.cpp b/src/blackgui/components/audiosetupcomponent.cpp index 06defb1d6..befdb5fb4 100644 --- a/src/blackgui/components/audiosetupcomponent.cpp +++ b/src/blackgui/components/audiosetupcomponent.cpp @@ -198,53 +198,53 @@ namespace BlackGui if (!this->getIContextAudio()) return; if (index < 0)return; - CAudioDeviceList devices = this->getIContextAudio()->getAudioDevices(); + CAudioDeviceInfoList devices = this->getIContextAudio()->getAudioDevices(); if (devices.isEmpty()) return; - CAudioDevice selectedDevice; + CAudioDeviceInfo selectedDevice; QObject *sender = QObject::sender(); if (sender == this->ui->cb_SetupAudioInputDevice) { - CAudioDeviceList inputDevices = devices.getInputDevices(); + CAudioDeviceInfoList inputDevices = devices.getInputDevices(); if (index >= inputDevices.size()) return; selectedDevice = inputDevices[index]; this->getIContextAudio()->setCurrentAudioDevice(selectedDevice); } else if (sender == this->ui->cb_SetupAudioOutputDevice) { - CAudioDeviceList outputDevices = devices.getOutputDevices(); + CAudioDeviceInfoList outputDevices = devices.getOutputDevices(); if (index >= outputDevices.size()) return; selectedDevice = outputDevices[index]; this->getIContextAudio()->setCurrentAudioDevice(selectedDevice); } } - void CAudioSetupComponent::ps_onCurrentAudioDevicesChanged(const BlackMisc::Audio::CAudioDeviceList &devices) + void CAudioSetupComponent::ps_onCurrentAudioDevicesChanged(const CAudioDeviceInfoList &devices) { - foreach(CAudioDevice device, devices) + for(auto &device : devices) { - if (device.getType() == CAudioDevice::InputDevice) + if (device.getType() == CAudioDeviceInfo::InputDevice) { this->ui->cb_SetupAudioInputDevice->setCurrentText(device.toQString(true)); } - else if (device.getType() == CAudioDevice::OutputDevice) + else if (device.getType() == CAudioDeviceInfo::OutputDevice) { this->ui->cb_SetupAudioOutputDevice->setCurrentText(device.toQString(true)); } } } - void CAudioSetupComponent::ps_onAudioDevicesChanged(const BlackMisc::Audio::CAudioDeviceList &devices) + void CAudioSetupComponent::ps_onAudioDevicesChanged(const CAudioDeviceInfoList &devices) { this->ui->cb_SetupAudioOutputDevice->clear(); this->ui->cb_SetupAudioInputDevice->clear(); - foreach(CAudioDevice device, devices) + for(auto &device : devices) { - if (device.getType() == CAudioDevice::InputDevice) + if (device.getType() == CAudioDeviceInfo::InputDevice) { this->ui->cb_SetupAudioInputDevice->addItem(device.toQString(true)); } - else if (device.getType() == CAudioDevice::OutputDevice) + else if (device.getType() == CAudioDeviceInfo::OutputDevice) { this->ui->cb_SetupAudioOutputDevice->addItem(device.toQString(true)); } diff --git a/src/blackgui/components/audiosetupcomponent.h b/src/blackgui/components/audiosetupcomponent.h index 894913b1e..b18c543cd 100644 --- a/src/blackgui/components/audiosetupcomponent.h +++ b/src/blackgui/components/audiosetupcomponent.h @@ -13,7 +13,7 @@ #define BLACKGUI_AUDIOSETUPCOMPONENT_H #include "enableforruntime.h" -#include "blackmisc/audiodevicelist.h" +#include "blackmisc/audiodeviceinfolist.h" #include #include @@ -66,10 +66,10 @@ namespace BlackGui void ps_audioDeviceSelected(int index); //! Current audio devices changed - void ps_onCurrentAudioDevicesChanged(const Audio::CAudioDeviceList &devices); + void ps_onCurrentAudioDevicesChanged(const Audio::CAudioDeviceInfoList &devices); //! Audio devices changed - void ps_onAudioDevicesChanged(const Audio::CAudioDeviceList &devices); + void ps_onAudioDevicesChanged(const Audio::CAudioDeviceInfoList &devices); private: //! Audio test modes diff --git a/src/blackmisc/audioallclasses.h b/src/blackmisc/audioallclasses.h index b97c8424e..345a82445 100644 --- a/src/blackmisc/audioallclasses.h +++ b/src/blackmisc/audioallclasses.h @@ -10,8 +10,8 @@ #ifndef BLACKMISC_AUDIOALLCLASSES_H #define BLACKMISC_AUDIOALLCLASSES_H -#include "blackmisc/audiodevice.h" -#include "blackmisc/audiodevicelist.h" +#include "blackmisc/audiodeviceinfo.h" +#include "blackmisc/audiodeviceinfolist.h" #include "blackmisc/voiceroom.h" #include "blackmisc/voiceroomlist.h" diff --git a/src/blackmisc/audiodevice.cpp b/src/blackmisc/audiodeviceinfo.cpp similarity index 83% rename from src/blackmisc/audiodevice.cpp rename to src/blackmisc/audiodeviceinfo.cpp index 750e6b2fe..50a607858 100644 --- a/src/blackmisc/audiodevice.cpp +++ b/src/blackmisc/audiodeviceinfo.cpp @@ -7,7 +7,7 @@ * contained in the LICENSE file. */ -#include "audiodevice.h" +#include "audiodeviceinfo.h" #include "blackmisc/blackmiscfreefunctions.h" #include @@ -18,7 +18,7 @@ namespace BlackMisc /* * Constructor */ - CAudioDevice::CAudioDevice() : + CAudioDeviceInfo::CAudioDeviceInfo() : m_type(Unknown), m_deviceIndex(invalidDeviceIndex()), m_deviceName(""), m_hostName(BlackMisc::localHostName()) { @@ -28,7 +28,7 @@ namespace BlackMisc /* * Constructor */ - CAudioDevice::CAudioDevice(DeviceType type, const qint16 index, const QString &name) : + CAudioDeviceInfo::CAudioDeviceInfo(DeviceType type, const qint16 index, const QString &name) : m_type(type), m_deviceIndex(index), m_deviceName(name), m_hostName(BlackMisc::localHostName()) { @@ -38,7 +38,7 @@ namespace BlackMisc /* * As String */ - QString CAudioDevice::convertToQString(bool /* i18n */) const + QString CAudioDeviceInfo::convertToQString(bool /* i18n */) const { if (this->m_hostName.isEmpty()) return m_deviceName; QString s(this->m_deviceName); diff --git a/src/blackmisc/audiodevice.h b/src/blackmisc/audiodeviceinfo.h similarity index 78% rename from src/blackmisc/audiodevice.h rename to src/blackmisc/audiodeviceinfo.h index 3251d8e61..c6588774a 100644 --- a/src/blackmisc/audiodevice.h +++ b/src/blackmisc/audiodeviceinfo.h @@ -25,7 +25,7 @@ namespace BlackMisc * If you want to safe this object, use the name instead of the index, since the index can change after * a restart. */ - class CAudioDevice : public CValueObjectStdTuple + class CAudioDeviceInfo : public CValueObjectStdTuple { public: //! Type @@ -41,10 +41,10 @@ namespace BlackMisc * If m_deviceIndex is -1, default should be used. However on Windows this doesnt work. Needs * to be checked in Vatlib. */ - CAudioDevice(); + CAudioDeviceInfo(); //! Constructor. - CAudioDevice(DeviceType type, const qint16 index, const QString &getName); + CAudioDeviceInfo(DeviceType type, const qint16 index, const QString &getName); //! Get the device index qint16 getIndex() const { return m_deviceIndex; } @@ -68,15 +68,15 @@ namespace BlackMisc static qint16 invalidDeviceIndex() {return -2;} //! Default output device - static CAudioDevice getDefaultOutputDevice() + static CAudioDeviceInfo getDefaultOutputDevice() { - return CAudioDevice(OutputDevice, defaultDeviceIndex(), "default"); + return CAudioDeviceInfo(OutputDevice, defaultDeviceIndex(), "default"); } //! Default input device - static CAudioDevice getDefaultInputDevice() + static CAudioDeviceInfo getDefaultInputDevice() { - return CAudioDevice(InputDevice, defaultDeviceIndex(), "default"); + return CAudioDeviceInfo(InputDevice, defaultDeviceIndex(), "default"); } protected: @@ -84,8 +84,8 @@ namespace BlackMisc virtual QString convertToQString(bool i18n = false) const override; private: - BLACK_ENABLE_TUPLE_CONVERSION(CAudioDevice) - //! Device type, @see CAudioDevice::DeviceType + BLACK_ENABLE_TUPLE_CONVERSION(CAudioDeviceInfo) + //! Device type, @see CAudioDeviceInfo::DeviceType DeviceType m_type; /*! * deviceIndex is the number is the reference for the VVL. The device is selected by this index. @@ -100,7 +100,7 @@ namespace BlackMisc } // namespace } // namespace -BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Audio::CAudioDevice, (o.m_type, o.m_deviceIndex, o.m_deviceName, o.m_hostName)) -Q_DECLARE_METATYPE(BlackMisc::Audio::CAudioDevice) +BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Audio::CAudioDeviceInfo, (o.m_type, o.m_deviceIndex, o.m_deviceName, o.m_hostName)) +Q_DECLARE_METATYPE(BlackMisc::Audio::CAudioDeviceInfo) #endif // guard diff --git a/src/blackmisc/audiodevicelist.cpp b/src/blackmisc/audiodeviceinfolist.cpp similarity index 57% rename from src/blackmisc/audiodevicelist.cpp rename to src/blackmisc/audiodeviceinfolist.cpp index 5d8d35395..5fa2f8de3 100644 --- a/src/blackmisc/audiodevicelist.cpp +++ b/src/blackmisc/audiodeviceinfolist.cpp @@ -7,7 +7,7 @@ * contained in the LICENSE file. */ -#include "audiodevicelist.h" +#include "audiodeviceinfolist.h" #include "predicates.h" namespace BlackMisc @@ -17,37 +17,37 @@ namespace BlackMisc /* * Default constructor */ - CAudioDeviceList::CAudioDeviceList() { } + CAudioDeviceInfoList::CAudioDeviceInfoList() { } /* * Construct from base class object */ - CAudioDeviceList::CAudioDeviceList(const CSequence &other) : + CAudioDeviceInfoList::CAudioDeviceInfoList(const CSequence &other) : CSequence(other) { } /* * Output devices */ - CAudioDeviceList CAudioDeviceList::getOutputDevices() const + CAudioDeviceInfoList CAudioDeviceInfoList::getOutputDevices() const { - return this->findBy(&CAudioDevice::getType, CAudioDevice::OutputDevice); + return this->findBy(&CAudioDeviceInfo::getType, CAudioDeviceInfo::OutputDevice); } /* * Output devices */ - CAudioDeviceList CAudioDeviceList::getInputDevices() const + CAudioDeviceInfoList CAudioDeviceInfoList::getInputDevices() const { - return this->findBy(&CAudioDevice::getType, CAudioDevice::InputDevice); + return this->findBy(&CAudioDeviceInfo::getType, CAudioDeviceInfo::InputDevice); } /* * Count as of type */ - int CAudioDeviceList::count(CAudioDevice::DeviceType type) const + int CAudioDeviceInfoList::count(CAudioDeviceInfo::DeviceType type) const { - return std::count_if(this->begin(), this->end(), [type](const CAudioDevice &device) + return std::count_if(this->begin(), this->end(), [type](const CAudioDeviceInfo &device) { return device.getType() == type; }); @@ -56,11 +56,11 @@ namespace BlackMisc /* * Register metadata */ - void CAudioDeviceList::registerMetadata() + void CAudioDeviceInfoList::registerMetadata() { - qRegisterMetaType(); - qDBusRegisterMetaType(); - registerMetaValueType(); + qRegisterMetaType(); + qDBusRegisterMetaType(); + registerMetaValueType(); } } // namespace diff --git a/src/blackmisc/audiodevicelist.h b/src/blackmisc/audiodeviceinfolist.h similarity index 77% rename from src/blackmisc/audiodevicelist.h rename to src/blackmisc/audiodeviceinfolist.h index d36acb26e..34676fd53 100644 --- a/src/blackmisc/audiodevicelist.h +++ b/src/blackmisc/audiodeviceinfolist.h @@ -12,7 +12,7 @@ #ifndef BLACKMISC_AUDIODEVICELIST_H #define BLACKMISC_AUDIODEVICELIST_H -#include "audiodevice.h" +#include "audiodeviceinfo.h" #include "sequence.h" #include "collection.h" #include @@ -26,23 +26,23 @@ namespace BlackMisc /*! * Value object encapsulating a list of audio devices. */ - class CAudioDeviceList : public CSequence + class CAudioDeviceInfoList : public CSequence { public: //! Default constructor. - CAudioDeviceList(); + CAudioDeviceInfoList(); //! Construct from a base class object. - CAudioDeviceList(const CSequence &other); + CAudioDeviceInfoList(const CSequence &other); //! Get output devices in that list - CAudioDeviceList getOutputDevices() const; + CAudioDeviceInfoList getOutputDevices() const; //! Get output devices in that list - CAudioDeviceList getInputDevices() const; + CAudioDeviceInfoList getInputDevices() const; //! Count (as of type) - int count(CAudioDevice::DeviceType type) const; + int count(CAudioDeviceInfo::DeviceType type) const; //! \copydoc CValueObject::toQVariant virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } @@ -57,8 +57,8 @@ namespace BlackMisc } //namespace } // namespace -Q_DECLARE_METATYPE(BlackMisc::Audio::CAudioDeviceList) -Q_DECLARE_METATYPE(BlackMisc::CCollection) -Q_DECLARE_METATYPE(BlackMisc::CSequence) +Q_DECLARE_METATYPE(BlackMisc::Audio::CAudioDeviceInfoList) +Q_DECLARE_METATYPE(BlackMisc::CCollection) +Q_DECLARE_METATYPE(BlackMisc::CSequence) #endif //guard diff --git a/src/blackmisc/blackmiscfreefunctions.cpp b/src/blackmisc/blackmiscfreefunctions.cpp index 2d9206509..ecd7b4ead 100644 --- a/src/blackmisc/blackmiscfreefunctions.cpp +++ b/src/blackmisc/blackmiscfreefunctions.cpp @@ -67,8 +67,8 @@ void BlackMisc::Settings::registerMetadata() */ void BlackMisc::Audio::registerMetadata() { - CAudioDevice::registerMetadata(); - CAudioDeviceList::registerMetadata(); + CAudioDeviceInfo::registerMetadata(); + CAudioDeviceInfoList::registerMetadata(); CVoiceRoom::registerMetadata(); CVoiceRoomList::registerMetadata(); } diff --git a/src/blacksound/soundgenerator.cpp b/src/blacksound/soundgenerator.cpp index 7a39a79a3..22ea6e0ff 100644 --- a/src/blacksound/soundgenerator.cpp +++ b/src/blacksound/soundgenerator.cpp @@ -362,9 +362,9 @@ namespace BlackSound /* * BlackMisc to Qt audio device */ - QAudioDeviceInfo CSoundGenerator::findClosestOutputDevice(const BlackMisc::Audio::CAudioDevice &audioDevice) + QAudioDeviceInfo CSoundGenerator::findClosestOutputDevice(const CAudioDeviceInfo &audioDevice) { - Q_ASSERT(audioDevice.getType() == CAudioDevice::OutputDevice); + Q_ASSERT(audioDevice.getType() == CAudioDeviceInfo::OutputDevice); const QString lookFor = audioDevice.getName().toLower(); QAudioDeviceInfo qtDevice = QAudioDeviceInfo::defaultOutputDevice(); if (lookFor.startsWith("default")) return qtDevice; @@ -452,7 +452,7 @@ namespace BlackSound // CSoundGenerator::playSignalRecorded(volume, tones, device); } - void CSoundGenerator::playSelcal(qint32 volume, const CSelcal &selcal, const CAudioDevice &audioDevice) + void CSoundGenerator::playSelcal(qint32 volume, const CSelcal &selcal, const CAudioDeviceInfo &audioDevice) { if (CSoundGenerator::s_selcalStarted.msecsTo(QDateTime::currentDateTimeUtc()) < 2500) return; // simple check not to play 2 SELCAL at the same time CSoundGenerator::s_selcalStarted = QDateTime::currentDateTimeUtc(); diff --git a/src/blacksound/soundgenerator.h b/src/blacksound/soundgenerator.h index 4a63c55c2..35b6ac10d 100644 --- a/src/blacksound/soundgenerator.h +++ b/src/blacksound/soundgenerator.h @@ -7,7 +7,7 @@ #define BLACKSOUND_SOUNDGENERATOR_H #include "blackmisc/avselcal.h" -#include "blackmisc/audiodevice.h" +#include "blackmisc/audiodeviceinfo.h" #include "blackmisc/pqtime.h" #include "blackmisc/notificationsounds.h" #include @@ -122,7 +122,7 @@ namespace BlackSound * \param audioDevice output audio device * \return */ - static QAudioDeviceInfo findClosestOutputDevice(const BlackMisc::Audio::CAudioDevice &audioDevice); + static QAudioDeviceInfo findClosestOutputDevice(const BlackMisc::Audio::CAudioDeviceInfo &audioDevice); /*! * \brief Play signal of tones once @@ -166,7 +166,7 @@ namespace BlackSound * \param audioDevice device to be used * \see BlackMisc::Aviation::CSelcal */ - static void playSelcal(qint32 volume, const BlackMisc::Aviation::CSelcal &selcal, const BlackMisc::Audio::CAudioDevice &audioDevice); + static void playSelcal(qint32 volume, const BlackMisc::Aviation::CSelcal &selcal, const BlackMisc::Audio::CAudioDeviceInfo &audioDevice); //! One cycle of tones takes t milliseconds diff --git a/src/swiftcore/tool.cpp b/src/swiftcore/tool.cpp index 88591f5a1..3c3e69873 100644 --- a/src/swiftcore/tool.cpp +++ b/src/swiftcore/tool.cpp @@ -96,10 +96,10 @@ namespace BlackMiscTest { qtout << "-------------" << endl; qtout << "vatlib audio devices" << endl; - CAudioDeviceList devices; + CAudioDeviceInfoList devices; QMetaObject::invokeMethod(runtime->getIContextAudio(), "getAudioDevices", Qt::BlockingQueuedConnection, - Q_RETURN_ARG(BlackMisc::Audio::CAudioDeviceList, devices)); + Q_RETURN_ARG(BlackMisc::Audio::CAudioDeviceInfoList, devices)); qtout << devices << endl; } else if (line.startsWith("2"))