flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-05 09:15:34 +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

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;