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

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

View File

@@ -8,6 +8,7 @@
#include "../blackmisc/context.h"
#include "../blackmisc/avcallsignlist.h"
#include "../blackmisc/avselcal.h"
#include "../blackmisc/nwuserlist.h"
#include "../blackmisc/vvoiceroomlist.h"
#include "../blackmisc/vaudiodevicelist.h"
@@ -117,15 +118,25 @@ namespace BlackCore
public slots:
/*!
* \brief Input device to be used
* \brief Current input device
*/
virtual void setInputDevice(const BlackMisc::Voice::CAudioDevice &device) = 0;
virtual BlackMisc::Voice::CAudioDevice getCurrentInputDevice() const = 0;
/*!
* \brief Current output device
*/
virtual BlackMisc::Voice::CAudioDevice getCurrentOutputDevice() const = 0;
/*!
* \brief Output device to be used
*/
virtual void setOutputDevice(const BlackMisc::Voice::CAudioDevice &device) = 0;
/*!
* \brief Input device to be used
*/
virtual void setInputDevice(const BlackMisc::Voice::CAudioDevice &device) = 0;
/*!
* Get COM1/2 voice rooms, which then allows to retrieve information
* such as audio status etc.
@@ -177,6 +188,18 @@ namespace BlackCore
*/
virtual BlackMisc::Aviation::CCallsignList getVoiceRoomCallsigns(const ComUnit comUnit) const = 0;
/*!
* \brief Is muted?
*/
virtual bool isMuted() const = 0;
/*!
* \brief Switch audio output, enable or disable given COM unit.
* \param comUnit
* \param enable enable or disable output
*/
virtual void switchAudioOutput(const ComUnit comUnit, bool enable) = 0;
signals:
// Signals regarding the voice server connection
void notConnected(const ComUnit comUnit);