flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-02 15:15:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refs #140 , refs #85 Rename namespace voice to audio.

Browse Source 
In #85 the voice context will be renamed to audio context, so the CValueObject classes will be renamed to namespace Audio too.
As #140 changes many CValueClasses, this crossover change is done in the same unit of work.
This commit is contained in:
Klaus Basan
2014-03-10 14:43:06 +01:00
parent e93ef236af
commit dde9710144
33 changed files with 115 additions and 790 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackcore/context_network.h
View File

@@ -121,7 +121,7 @@ namespace BlackCore
virtual BlackMisc::Aviation::CInformationMessage getMetar(const QString &airportIcaoCode) override;
//! \copydoc IContextNetwork::getSelectedVoiceRooms()
virtual BlackMisc::Voice::CVoiceRoomList getSelectedVoiceRooms() const override;
virtual BlackMisc::Audio::CVoiceRoomList getSelectedVoiceRooms() const override;
//! \copydoc IContextNetwork::getSelectedAtcStations
virtual BlackMisc::Aviation::CAtcStationList getSelectedAtcStations() const override;

2
src/blackcore/context_network_atc.cpp
View File

@@ -20,7 +20,7 @@ using namespace BlackMisc::PhysicalQuantities;
using namespace BlackMisc::Aviation;
using namespace BlackMisc::Network;
using namespace BlackMisc::Geo;
using namespace BlackMisc::Voice;
using namespace BlackMisc::Audio;
namespace BlackCore
{

6
src/blackcore/context_network_interface.cpp
View File

@@ -4,7 +4,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "blackcore/context_network_interface.h"
#include "blackmisc/vvoiceroomlist.h"
#include "blackmisc/voiceroomlist.h"
#include <QObject>
#include <QMetaEnum>
#include <QDBusConnection>
@@ -91,9 +91,9 @@ namespace BlackCore
return this->m_dBusInterface->callDBusRet<BlackMisc::Network::CUserList>(QLatin1Literal("getUsersForCallsigns"), callsigns);
}
BlackMisc::Voice::CVoiceRoomList IContextNetwork::getSelectedVoiceRooms() const
BlackMisc::Audio::CVoiceRoomList IContextNetwork::getSelectedVoiceRooms() const
{
return this->m_dBusInterface->callDBusRet<BlackMisc::Voice::CVoiceRoomList>(QLatin1Literal("getSelectedVoiceRooms"));
return this->m_dBusInterface->callDBusRet<BlackMisc::Audio::CVoiceRoomList>(QLatin1Literal("getSelectedVoiceRooms"));
}
BlackMisc::Aviation::CAtcStationList IContextNetwork::getSelectedAtcStations() const

4
src/blackcore/context_network_interface.h
View File

@@ -13,7 +13,7 @@
#include "blackmisc/nwuserlist.h"
#include "blackmisc/genericdbusinterface.h"
#include "blackcore/network_vatlib.h"
#include "blackmisc/vvoiceroomlist.h"
#include "blackmisc/voiceroomlist.h"
#include <QObject>
#include <QStringList>
#include <QDBusAbstractInterface>
@@ -188,7 +188,7 @@ namespace BlackCore
virtual BlackMisc::Aviation::CInformationMessage getMetar(const QString &airportIcaoCode);
//! \brief Use the selected COM1/2 frequencies, and get the corresponding voice room for it
virtual BlackMisc::Voice::CVoiceRoomList getSelectedVoiceRooms() const;
virtual BlackMisc::Audio::CVoiceRoomList getSelectedVoiceRooms() const;
//! \brief Use the selected COM1/2 frequencies, and get the corresponding ATC stations for it
virtual BlackMisc::Aviation::CAtcStationList getSelectedAtcStations() const;

2
src/blackcore/context_voice.cpp
View File

@@ -10,7 +10,7 @@
using namespace BlackMisc;
using namespace BlackMisc::Aviation;
using namespace BlackMisc::Voice;
using namespace BlackMisc::Audio;
namespace BlackCore
{

16
src/blackcore/context_voice.h
View File

@@ -67,19 +67,19 @@ namespace BlackCore
virtual void setOwnAircraft(const BlackMisc::Aviation::CAircraft &ownAircraft) override;
//! \copydoc IContextVoice::getComVoiceRooms()
virtual BlackMisc::Voice::CVoiceRoomList getComVoiceRooms() const override;
virtual BlackMisc::Audio::CVoiceRoomList getComVoiceRooms() const override;
//! \copydoc IContextVoice::getComVoiceRoomsWithAudioStatus()
virtual BlackMisc::Voice::CVoiceRoomList getComVoiceRoomsWithAudioStatus() const override;
virtual BlackMisc::Audio::CVoiceRoomList getComVoiceRoomsWithAudioStatus() const override;
//! \copydoc IContextVoice::getCom1VoiceRoom
virtual BlackMisc::Voice::CVoiceRoom getCom1VoiceRoom(bool withAudioStatus) const override;
virtual BlackMisc::Audio::CVoiceRoom getCom1VoiceRoom(bool withAudioStatus) const override;
//! \copydoc IContextVoice::getCom2VoiceRoom
virtual BlackMisc::Voice::CVoiceRoom getCom2VoiceRoom(bool withAudioStatus) const override;
virtual BlackMisc::Audio::CVoiceRoom getCom2VoiceRoom(bool withAudioStatus) const override;
//! \copydoc IContextVoice::setComVoiceRooms()
virtual void setComVoiceRooms(const BlackMisc::Voice::CVoiceRoom &voiceRoomCom1, const BlackMisc::Voice::CVoiceRoom &voiceRoomCom2) override;
virtual void setComVoiceRooms(const BlackMisc::Audio::CVoiceRoom &voiceRoomCom1, const BlackMisc::Audio::CVoiceRoom &voiceRoomCom2) override;
//! \copydoc IContextVoice::getCom1RoomCallsigns()
virtual BlackMisc::Aviation::CCallsignList getCom1RoomCallsigns() const override;
@@ -97,13 +97,13 @@ namespace BlackCore
virtual void leaveAllVoiceRooms() override;
//! \copydoc IContextVoice::getAudioDevices()
virtual BlackMisc::Voice::CAudioDeviceList getAudioDevices() const override;
virtual BlackMisc::Audio::CAudioDeviceList getAudioDevices() const override;
//! \copydoc IContextVoice::getCurrentAudioDevices()
virtual BlackMisc::Voice::CAudioDeviceList getCurrentAudioDevices() const override;
virtual BlackMisc::Audio::CAudioDeviceList getCurrentAudioDevices() const override;
//! \copydoc IContextVoice::setCurrentAudioDevice()
virtual void setCurrentAudioDevice(const BlackMisc::Voice::CAudioDevice &audioDevice) override;
virtual void setCurrentAudioDevice(const BlackMisc::Audio::CAudioDevice &audioDevice) override;
//! \copydoc IContextVoice::setVolumes()
virtual void setVolumes(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2) override;

6
src/blackcore/context_voice_interface.cpp
View File

@@ -7,7 +7,7 @@
#include <QObject>
#include <QDBusConnection>
using namespace BlackMisc::Voice;
using namespace BlackMisc::Audio;
using namespace BlackMisc::Network;
using namespace BlackMisc::Aviation;
@@ -91,7 +91,7 @@ namespace BlackCore
/*
* Get current audio devices
*/
BlackMisc::Voice::CAudioDeviceList IContextVoice::getCurrentAudioDevices() const
BlackMisc::Audio::CAudioDeviceList IContextVoice::getCurrentAudioDevices() const
{
return this->m_dBusInterface->callDBusRet<CAudioDeviceList>(QLatin1Literal("getCurrentAudioDevices"));
}
@@ -139,7 +139,7 @@ namespace BlackCore
/*
* Set voice rooms
*/
void IContextVoice::setComVoiceRooms(const BlackMisc::Voice::CVoiceRoom &voiceRoomCom1, const BlackMisc::Voice::CVoiceRoom &voiceRoomCom2)
void IContextVoice::setComVoiceRooms(const BlackMisc::Audio::CVoiceRoom &voiceRoomCom1, const BlackMisc::Audio::CVoiceRoom &voiceRoomCom2)
{
this->m_dBusInterface->callDBus(QLatin1Literal("setComVoiceRooms"), voiceRoomCom1, voiceRoomCom2);
}

20
src/blackcore/context_voice_interface.h
View File

@@ -7,8 +7,8 @@
#define BLACKCORE_CONTEXTVOICE_INTERFACE_H
#include "blackmisc/genericdbusinterface.h"
#include "blackmisc/vaudiodevicelist.h"
#include "blackmisc/vvoiceroomlist.h"
#include "blackmisc/audiodevicelist.h"
#include "blackmisc/voiceroomlist.h"
#include "blackmisc/nwuserlist.h"
#include "blackmisc/avaircraft.h"
#include "blackcore/voice_vatlib.h"
@@ -112,32 +112,32 @@ namespace BlackCore
* Get voice rooms for COM1, COM2:
* From this connection audio status can be obtained
*/
virtual BlackMisc::Voice::CVoiceRoomList getComVoiceRoomsWithAudioStatus() const;
virtual BlackMisc::Audio::CVoiceRoomList getComVoiceRoomsWithAudioStatus() const;
/*!
* Get voice rooms for COM1, COM2, but without latest audio status
* \return all voice rooms
*/
virtual BlackMisc::Voice::CVoiceRoomList getComVoiceRooms() const;
virtual BlackMisc::Audio::CVoiceRoomList getComVoiceRooms() const;
/*!
* \brief COM 1 voice room
* \param withAudioStatus update audio status
* \return
*/
virtual BlackMisc::Voice::CVoiceRoom getCom1VoiceRoom(bool withAudioStatus) const;
virtual BlackMisc::Audio::CVoiceRoom getCom1VoiceRoom(bool withAudioStatus) const;
/*!
* \brief COM 2 voice room
* \param withAudioStatus update audio status
* \return
*/
virtual BlackMisc::Voice::CVoiceRoom getCom2VoiceRoom(bool withAudioStatus) const;
virtual BlackMisc::Audio::CVoiceRoom getCom2VoiceRoom(bool withAudioStatus) const;
/*!
* \brief Set voice rooms
*/
virtual void setComVoiceRooms(const BlackMisc::Voice::CVoiceRoom &voiceRoomCom1, const BlackMisc::Voice::CVoiceRoom &voiceRoomCom2);
virtual void setComVoiceRooms(const BlackMisc::Audio::CVoiceRoom &voiceRoomCom1, const BlackMisc::Audio::CVoiceRoom &voiceRoomCom2);
/*!
* Leave all voice rooms
@@ -167,19 +167,19 @@ namespace BlackCore
/*!
* \brief Audio devices
*/
virtual BlackMisc::Voice::CAudioDeviceList getAudioDevices() const;
virtual BlackMisc::Audio::CAudioDeviceList getAudioDevices() const;
/*!
* \brief Get current audio device
* \return input and output devices
*/
virtual BlackMisc::Voice::CAudioDeviceList getCurrentAudioDevices() const;
virtual BlackMisc::Audio::CAudioDeviceList getCurrentAudioDevices() const;
/*!
* \brief Set current audio device
* \param audioDevice can be input or audio device
*/
virtual void setCurrentAudioDevice(const BlackMisc::Voice::CAudioDevice &audioDevice);
virtual void setCurrentAudioDevice(const BlackMisc::Audio::CAudioDevice &audioDevice);
/*!
* \brief Set volumes via com units, also allows to mute

24
src/blackcore/voice.h
View File

@@ -10,8 +10,8 @@
#include "../blackmisc/avcallsignlist.h"
#include "../blackmisc/avselcal.h"
#include "../blackmisc/nwuserlist.h"
#include "../blackmisc/vvoiceroomlist.h"
#include "../blackmisc/vaudiodevicelist.h"
#include "../blackmisc/voiceroomlist.h"
#include "../blackmisc/audiodevicelist.h"
#include <vatlib/vatlib.h>
#include <QObject>
#include <QSet>
@@ -81,19 +81,19 @@ namespace BlackCore
* \brief Audio devices
* \return
*/
virtual const BlackMisc::Voice::CAudioDeviceList &audioDevices() const = 0;
virtual const BlackMisc::Audio::CAudioDeviceList &audioDevices() const = 0;
/*!
* \brief Default input device
* \return
*/
virtual const BlackMisc::Voice::CAudioDevice defaultAudioInputDevice() const = 0;
virtual const BlackMisc::Audio::CAudioDevice defaultAudioInputDevice() const = 0;
/*!
* \brief Default output device
* \return
*/
virtual const BlackMisc::Voice::CAudioDevice defaultAudioOutputDevice() const = 0;
virtual const BlackMisc::Audio::CAudioDevice defaultAudioOutputDevice() const = 0;
/************************************************
* SETUP TESTS
@@ -132,40 +132,40 @@ namespace BlackCore
/*!
* \brief Current input device
*/
virtual BlackMisc::Voice::CAudioDevice getCurrentInputDevice() const = 0;
virtual BlackMisc::Audio::CAudioDevice getCurrentInputDevice() const = 0;
/*!
* \brief Current output device
*/
virtual BlackMisc::Voice::CAudioDevice getCurrentOutputDevice() const = 0;
virtual BlackMisc::Audio::CAudioDevice getCurrentOutputDevice() const = 0;
/*!
* \brief Output device to be used
*/
virtual void setOutputDevice(const BlackMisc::Voice::CAudioDevice &device) = 0;
virtual void setOutputDevice(const BlackMisc::Audio::CAudioDevice &device) = 0;
/*!
* \brief Input device to be used
*/
virtual void setInputDevice(const BlackMisc::Voice::CAudioDevice &device) = 0;
virtual void setInputDevice(const BlackMisc::Audio::CAudioDevice &device) = 0;
/*!
* Get COM1/2 voice rooms, which then allows to retrieve information
* such as audio status etc.
*/
virtual BlackMisc::Voice::CVoiceRoomList getComVoiceRoomsWithAudioStatus() const = 0;
virtual BlackMisc::Audio::CVoiceRoomList getComVoiceRoomsWithAudioStatus() const = 0;
/*!
* Get COM1/2 voice rooms, const and with no status update
*/
virtual BlackMisc::Voice::CVoiceRoomList getComVoiceRooms() const = 0;
virtual BlackMisc::Audio::CVoiceRoomList getComVoiceRooms() const = 0;
/*!
* \brief Join voice room
* \param comUnit COM1/2
* \param voiceRoom
*/
virtual void joinVoiceRoom(const ComUnit comUnit, const BlackMisc::Voice::CVoiceRoom &voiceRoom) = 0;
virtual void joinVoiceRoom(const ComUnit comUnit, const BlackMisc::Audio::CVoiceRoom &voiceRoom) = 0;
/*!
* \brief Leave voice room

24
src/blackcore/voice_vatlib.cpp
View File

@@ -7,7 +7,7 @@
#include <QDebug>
#include <QTimer>
using namespace BlackMisc::Voice;
using namespace BlackMisc::Audio;
using namespace BlackMisc::Aviation;
namespace BlackCore
@@ -67,7 +67,7 @@ namespace BlackCore
/*
* Devices
*/
const BlackMisc::Voice::CAudioDeviceList &CVoiceVatlib::audioDevices() const
const BlackMisc::Audio::CAudioDeviceList &CVoiceVatlib::audioDevices() const
{
return m_devices;
}
@@ -75,19 +75,19 @@ namespace BlackCore
/*
* Default input device
*/
const BlackMisc::Voice::CAudioDevice CVoiceVatlib::defaultAudioInputDevice() const
const BlackMisc::Audio::CAudioDevice CVoiceVatlib::defaultAudioInputDevice() const
{
// Constructor creates already a default device
return BlackMisc::Voice::CAudioDevice(BlackMisc::Voice::CAudioDevice::InputDevice, BlackMisc::Voice::CAudioDevice::defaultDeviceIndex(), "default");
return BlackMisc::Audio::CAudioDevice(BlackMisc::Audio::CAudioDevice::InputDevice, BlackMisc::Audio::CAudioDevice::defaultDeviceIndex(), "default");
}
/*
* Default output device
*/
const BlackMisc::Voice::CAudioDevice CVoiceVatlib::defaultAudioOutputDevice() const
const BlackMisc::Audio::CAudioDevice CVoiceVatlib::defaultAudioOutputDevice() const
{
// Constructor creates already a default device
return BlackMisc::Voice::CAudioDevice(BlackMisc::Voice::CAudioDevice::OutputDevice, BlackMisc::Voice::CAudioDevice::defaultDeviceIndex(), "default");
return BlackMisc::Audio::CAudioDevice(BlackMisc::Audio::CAudioDevice::OutputDevice, BlackMisc::Audio::CAudioDevice::defaultDeviceIndex(), "default");
}
/*
@@ -109,7 +109,7 @@ namespace BlackCore
/*
* Set input device
*/
void CVoiceVatlib::setInputDevice(const BlackMisc::Voice::CAudioDevice &device)
void CVoiceVatlib::setInputDevice(const BlackMisc::Audio::CAudioDevice &device)
{
Q_ASSERT_X(m_voice->IsValid() && m_voice->IsSetup(), "CVoiceVatlib", "Cvatlib_Voice_Simple invalid or not setup!");
if (!device.isValid())
@@ -139,7 +139,7 @@ namespace BlackCore
/*
* Set output device
*/
void CVoiceVatlib::setOutputDevice(const BlackMisc::Voice::CAudioDevice &device)
void CVoiceVatlib::setOutputDevice(const BlackMisc::Audio::CAudioDevice &device)
{
Q_ASSERT_X(m_voice->IsValid() && m_voice->IsSetup(), "CVoiceVatlib", "Cvatlib_Voice_Simple invalid or not setup!");
if (!device.isValid())
@@ -167,7 +167,7 @@ namespace BlackCore
/*
* Get voice rooms, with the latest status updated
*/
BlackMisc::Voice::CVoiceRoomList CVoiceVatlib::getComVoiceRoomsWithAudioStatus() const
BlackMisc::Audio::CVoiceRoomList CVoiceVatlib::getComVoiceRoomsWithAudioStatus() const
{
Q_ASSERT_X(m_voiceRooms.size() == 2, "CVoiceVatlib", "Wrong numer of COM voice rooms");
CVoiceRoomList voiceRooms;
@@ -317,7 +317,7 @@ namespace BlackCore
/*
* Voice room
*/
void CVoiceVatlib::joinVoiceRoom(const ComUnit comUnit, const BlackMisc::Voice::CVoiceRoom &voiceRoom)
void CVoiceVatlib::joinVoiceRoom(const ComUnit comUnit, const BlackMisc::Audio::CVoiceRoom &voiceRoom)
{
Q_ASSERT_X(m_voice->IsValid() && m_voice->IsSetup(), "CVoiceVatlib", "Cvatlib_Voice_Simple invalid or not setup!");
Q_ASSERT_X(m_voice->IsRoomValid(static_cast<qint32>(comUnit)), "CVoiceVatlib", "Room index out of bounds!");
@@ -641,7 +641,7 @@ namespace BlackCore
void CVoiceVatlib::onInputHardwareDeviceReceived(Cvatlib_Voice_Simple *obj, const char *name, void *cbVar)
{
Q_UNUSED(obj)
BlackMisc::Voice::CAudioDevice inputDevice(BlackMisc::Voice::CAudioDevice::InputDevice, cbvar_cast_voice(cbVar)->m_devices.count(BlackMisc::Voice::CAudioDevice::InputDevice), QString(name));
BlackMisc::Audio::CAudioDevice inputDevice(BlackMisc::Audio::CAudioDevice::InputDevice, cbvar_cast_voice(cbVar)->m_devices.count(BlackMisc::Audio::CAudioDevice::InputDevice), QString(name));
cbvar_cast_voice(cbVar)->m_devices.push_back(inputDevice);
}
@@ -651,7 +651,7 @@ namespace BlackCore
void CVoiceVatlib::onOutputHardwareDeviceReceived(Cvatlib_Voice_Simple *obj, const char *name, void *cbVar)
{
Q_UNUSED(obj)
BlackMisc::Voice::CAudioDevice outputDevice(BlackMisc::Voice::CAudioDevice::OutputDevice, cbvar_cast_voice(cbVar)->m_devices.count(BlackMisc::Voice::CAudioDevice::OutputDevice), QString(name));
BlackMisc::Audio::CAudioDevice outputDevice(BlackMisc::Audio::CAudioDevice::OutputDevice, cbvar_cast_voice(cbVar)->m_devices.count(BlackMisc::Audio::CAudioDevice::OutputDevice), QString(name));
cbvar_cast_voice(cbVar)->m_devices.push_back(outputDevice);
}

34
src/blackcore/voice_vatlib.h
View File

@@ -8,7 +8,7 @@
#include "voice.h"
#include "../blacksound/soundgenerator.h"
#include "../blackmisc/vaudiodevicelist.h"
#include "../blackmisc/audiodevicelist.h"
#include "../blackmisc/nwuserlist.h"
#include "../blackmisc/avcallsignlist.h"
@@ -49,13 +49,13 @@ namespace BlackCore
// and ATC to headspeakers. Is not important to implement that now, if ever.
//! \copydoc IVoice::audioDevices()
virtual const BlackMisc::Voice::CAudioDeviceList &audioDevices() const override;
virtual const BlackMisc::Audio::CAudioDeviceList &audioDevices() const override;
//! \copydoc IVoice::defaultAudioInputDevice()
virtual const BlackMisc::Voice::CAudioDevice defaultAudioInputDevice() const override;
virtual const BlackMisc::Audio::CAudioDevice defaultAudioInputDevice() const override;
//! \copydoc IVoice::defaultAudioOutputDevice()
virtual const BlackMisc::Voice::CAudioDevice defaultAudioOutputDevice() const override;
virtual const BlackMisc::Audio::CAudioDevice defaultAudioOutputDevice() const override;
/************************************************
* SETUP TESTS
@@ -81,7 +81,7 @@ namespace BlackCore
virtual void setMyAircraftCallsign(const BlackMisc::Aviation::CCallsign &callsign) override;
//! \copydoc IVoice::joinVoiceRoom()
virtual void joinVoiceRoom(const ComUnit comUnit, const BlackMisc::Voice::CVoiceRoom &voiceRoom) override;
virtual void joinVoiceRoom(const ComUnit comUnit, const BlackMisc::Audio::CVoiceRoom &voiceRoom) override;
//! \copydoc IVoice::leaveVoiceRoom()
virtual void leaveVoiceRoom(const ComUnit comUnit) override;
@@ -99,10 +99,10 @@ namespace BlackCore
virtual void stopTransmitting(const ComUnit comUnit) override;
//! \copydoc IVoice::getComVoiceRoomsWithAudioStatus()
virtual BlackMisc::Voice::CVoiceRoomList getComVoiceRoomsWithAudioStatus() const override;
virtual BlackMisc::Audio::CVoiceRoomList getComVoiceRoomsWithAudioStatus() const override;
//! \copydoc IVoice::getComVoiceRooms()
virtual BlackMisc::Voice::CVoiceRoomList getComVoiceRooms() const override
virtual BlackMisc::Audio::CVoiceRoomList getComVoiceRooms() const override
{
return this->m_voiceRooms;
}
@@ -111,16 +111,16 @@ namespace BlackCore
virtual BlackMisc::Aviation::CCallsignList getVoiceRoomCallsigns(const ComUnit comUnit) const override;
//! \copydoc IVoice::setInputDevice
virtual void setInputDevice(const BlackMisc::Voice::CAudioDevice &device) override;
virtual void setInputDevice(const BlackMisc::Audio::CAudioDevice &device) override;
//! \copydoc IVoice::setOutputDevice
virtual void setOutputDevice(const BlackMisc::Voice::CAudioDevice &device) override;
virtual void setOutputDevice(const BlackMisc::Audio::CAudioDevice &device) override;
//! \copydoc IVoice::getCurrentInputDevice()
virtual BlackMisc::Voice::CAudioDevice getCurrentInputDevice() const override;
virtual BlackMisc::Audio::CAudioDevice getCurrentInputDevice() const override;
//! \copydoc IVoice::getCurrentOutputDevice()
virtual BlackMisc::Voice::CAudioDevice getCurrentOutputDevice() const override;
virtual BlackMisc::Audio::CAudioDevice getCurrentOutputDevice() const override;
//! \copydoc IVoice::switchAudioOutput
virtual void switchAudioOutput(const ComUnit comUnit, bool enable) override;
@@ -189,8 +189,8 @@ namespace BlackCore
static void onInputHardwareDeviceReceived(Cvatlib_Voice_Simple *obj, const char *name, void *cbVar);
static void onOutputHardwareDeviceReceived(Cvatlib_Voice_Simple *obj, const char *name, void *cbVar);
BlackMisc::Voice::CVoiceRoom voiceRoomForUnit(const ComUnit comUnit) const;
void setVoiceRoomForUnit(const IVoice::ComUnit comUnit, const BlackMisc::Voice::CVoiceRoom &voiceRoom);
BlackMisc::Audio::CVoiceRoom voiceRoomForUnit(const ComUnit comUnit) const;
void setVoiceRoomForUnit(const IVoice::ComUnit comUnit, const BlackMisc::Audio::CVoiceRoom &voiceRoom);
void addTemporaryCallsignForRoom(const ComUnit comUnit, const BlackMisc::Aviation::CCallsign &callsign);
void removeUserFromRoom(const ComUnit comUnit, const QString &callsign);
void exceptionDispatcher(const char *caller);
@@ -279,10 +279,10 @@ namespace BlackCore
QScopedPointer<Cvatlib_Voice_Simple, Cvatlib_Voice_Simple_Deleter> m_voice;
QScopedPointer<QAudioOutput> m_audioOutput;
BlackMisc::Aviation::CCallsign m_aircraftCallsign; /*!< own callsign to join voice rooms */
BlackMisc::Voice::CVoiceRoomList m_voiceRooms;
BlackMisc::Voice::CAudioDeviceList m_devices; /*!< in and output devices */
BlackMisc::Voice::CAudioDevice m_currentOutputDevice;
BlackMisc::Voice::CAudioDevice m_currentInputDevice;
BlackMisc::Audio::CVoiceRoomList m_voiceRooms;
BlackMisc::Audio::CAudioDeviceList m_devices; /*!< in and output devices */
BlackMisc::Audio::CAudioDevice m_currentOutputDevice;
BlackMisc::Audio::CAudioDevice m_currentInputDevice;
QScopedPointer<CKeyboard> m_keyboardPtt; /*!< handler for PTT */
bool m_pushToTalk; /*!< flag, PTT pressed */
float m_inputSquelch;

2
src/blackcore/voice_vatlib_ptt.cpp
View File

@@ -6,7 +6,7 @@
#include "voice_vatlib.h"
#include <QDebug>
using namespace BlackMisc::Voice;
using namespace BlackMisc::Audio;
namespace BlackCore
{