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

Changed voice context so it can play SELCAL tones. This makes sense, as I can

Browse Source 
use the device information of this context. Sound shall be played on the
same computer as the voice.

* Adjusted .pro file
* Methods for SELCAL in context
* New XML file (DBus)
* changed the place where I can obtain the current in/output device
This commit is contained in:
Klaus Basan
2014-02-05 21:05:00 +00:00
committed by Mathew Sutcliffe
parent f9225814f9
commit 6485527062
9 changed files with 114 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/blackcore/voice_vatlib.h
View File

@@ -51,8 +51,6 @@ namespace BlackCore
virtual const BlackMisc::Voice::CAudioDeviceList &audioDevices() const ;
virtual const BlackMisc::Voice::CAudioDevice defaultAudioInputDevice() const;
virtual const BlackMisc::Voice::CAudioDevice defaultAudioOutputDevice() const;
virtual void setInputDevice(const BlackMisc::Voice::CAudioDevice &device);
virtual void setOutputDevice(const BlackMisc::Voice::CAudioDevice &device);
/************************************************
* SETUP TESTS
@@ -121,9 +119,27 @@ namespace BlackCore
virtual BlackMisc::Aviation::CCallsignList getVoiceRoomCallsigns(const ComUnit comUnit) const;
/*!
* \brief Switch audio output, enable or disable given COM unit.
* \param comUnit
* \param enable enable or disable output
* \copydoc IVoice::setInputDevice
*/
virtual void setInputDevice(const BlackMisc::Voice::CAudioDevice &device);
/*!
* \copydoc IVoice::setOutputDevice
*/
virtual void setOutputDevice(const BlackMisc::Voice::CAudioDevice &device);
/*!
* \brief Current input device
*/
virtual BlackMisc::Voice::CAudioDevice getCurrentInputDevice() const;
/*!
* \brief Current output device
*/
virtual BlackMisc::Voice::CAudioDevice getCurrentOutputDevice() const;
/*!
* \copydoc IVoice::switchAudioOutput
*/
virtual void switchAudioOutput(const ComUnit comUnit, bool enable);
@@ -281,6 +297,8 @@ namespace BlackCore
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;
QScopedPointer<CKeyboard> m_keyboardPtt; /*!< handler for PTT */
bool m_pushToTalk; /*!< flag, PTT pressed */
float m_inputSquelch;