flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-31 12:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Methods for CContextVoice::getCom1/2VoiceRoom

Browse Source 
CContextVoice::getComVoiceRoomsWithAudioStatus() to const
This commit is contained in:
Klaus Basan
2014-01-25 01:53:38 +01:00
parent 36bab20f58
commit dd3803f9a9
4 changed files with 83 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/blackcore/context_voice.cpp
View File

@@ -40,12 +40,36 @@ namespace BlackCore
/*
* Voice rooms for COM
*/
CVoiceRoomList CContextVoice::getComVoiceRoomsWithAudioStatus()
CVoiceRoomList CContextVoice::getComVoiceRoomsWithAudioStatus() const
{
Q_ASSERT(this->m_voice);
return this->m_voice->getComVoiceRoomsWithAudioStatus();
}
/*
* Voice rooms for COM
*/
CVoiceRoom CContextVoice::getCom1VoiceRoom(bool withAudioStatus) const
{
Q_ASSERT(this->m_voice);
if (withAudioStatus)
return this->m_voice->getComVoiceRoomsWithAudioStatus()[0];
else
return this->m_voice->getComVoiceRooms()[1];
}
/*
* Voice rooms for COM
*/
CVoiceRoom CContextVoice::getCom2VoiceRoom(bool withAudioStatus) const
{
Q_ASSERT(this->m_voice);
if (withAudioStatus)
return this->m_voice->getComVoiceRoomsWithAudioStatus()[1];
else
return this->m_voice->getComVoiceRooms()[1];
}
/*
* Voice rooms for COM (const)
*/

30
src/blackcore/context_voice.h
View File

@@ -79,7 +79,17 @@ namespace BlackCore
/*!
* \copydoc IContextVoice::getComVoiceRoomsWithAudioStatus()
*/
virtual BlackMisc::Voice::CVoiceRoomList getComVoiceRoomsWithAudioStatus();
virtual BlackMisc::Voice::CVoiceRoomList getComVoiceRoomsWithAudioStatus() const;
/*!
* \copydoc IContextVoice::getCom1VoiceRoom
*/
virtual BlackMisc::Voice::CVoiceRoom getCom1VoiceRoom(bool withAudioStatus) const;
/*!
* \copydoc IContextVoice::getCom2VoiceRoom
*/
virtual BlackMisc::Voice::CVoiceRoom getCom2VoiceRoom(bool withAudioStatus) const;
/*!
* \copydoc IContextVoice::setComVoiceRooms()
@@ -88,13 +98,11 @@ namespace BlackCore
/*!
* \copydoc IContextVoice::getCom1RoomCallsigns()
* \return
*/
virtual BlackMisc::Aviation::CCallsignList getCom1RoomCallsigns() const;
/*!
* \copydoc IContextVoice::getCom2RoomCallsigns()
* \return
*/
virtual BlackMisc::Aviation::CCallsignList getCom2RoomCallsigns() const;
@@ -109,36 +117,32 @@ namespace BlackCore
virtual BlackMisc::Network::CUserList getCom2RoomUsers() const;
/*!
* Leave all voice rooms
* \copydoc IContextVoice::leaveAllVoiceRooms
*/
virtual void leaveAllVoiceRooms();
/*!
* \brief Audio devices
* \return all input/output devices
* \copydoc IContextVoice::getAudioDevices()
*/
virtual BlackMisc::Voice::CAudioDeviceList getAudioDevices() const;
/*!
* \brief Set current audio device
* \return get input and output device
* \copydoc IContextVoice::getCurrentAudioDevices()
*/
virtual BlackMisc::Voice::CAudioDeviceList getCurrentAudioDevices() const;
/*!
* \brief Set current audio device
* \copydoc IContextVoice::setCurrentAudioDevice()
*/
virtual void setCurrentAudioDevice(const BlackMisc::Voice::CAudioDevice &audioDevice);
/*!
* \brief Set volumes via com units, also allows to mute
* \see BlackMisc::Aviation::CComSystem::setVolumeInput()
* \see BlackMisc::Aviation::CComSystem::setVolumeOutput()
* \copydoc IContextVoice::setVolumes()
*/
virtual void setVolumes(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2);
/*!
* \brief Is muted?
* \copydoc IContextVoice::isMuted()
*/
virtual bool isMuted() const;

28
src/blackcore/context_voice_interface.cpp
View File

@@ -55,7 +55,7 @@ namespace BlackCore
}
/*
* COM1 callsigns
* COM1 users
*/
BlackMisc::Network::CUserList IContextVoice::getCom1RoomUsers() const
{
@@ -63,7 +63,7 @@ namespace BlackCore
}
/*
* COM2 callsigns
* COM2 users
*/
BlackMisc::Network::CUserList IContextVoice::getCom2RoomUsers() const
{
@@ -79,7 +79,7 @@ namespace BlackCore
}
/*
* Set current audio device
* Get current audio devices
*/
BlackMisc::Voice::CAudioDeviceList IContextVoice::getCurrentAudioDevices() const
{
@@ -87,21 +87,37 @@ namespace BlackCore
}
/*
* Relay to DBus
* Voice rooms, with audio status
*/
CVoiceRoomList IContextVoice::getComVoiceRoomsWithAudioStatus()
CVoiceRoomList IContextVoice::getComVoiceRoomsWithAudioStatus() const
{
return this->m_dBusInterface->callDBusRet<CVoiceRoomList>(QLatin1Literal("getComVoiceRoomsWithAudioStatus"));
}
/*
* Relay to DBus
* Voice rooms, without audio status
*/
CVoiceRoomList IContextVoice::getComVoiceRooms() const
{
return this->m_dBusInterface->callDBusRet<CVoiceRoomList>(QLatin1Literal("getComVoiceRooms"));
}
/*
* Voice room
*/
CVoiceRoom IContextVoice::getCom1VoiceRoom(bool withAudioStatus) const
{
return this->m_dBusInterface->callDBusRet<CVoiceRoom>(QLatin1Literal("getCom1VoiceRoom"), withAudioStatus);
}
/*
* Voice room
*/
CVoiceRoom IContextVoice::getCom2VoiceRoom(bool withAudioStatus) const
{
return this->m_dBusInterface->callDBusRet<CVoiceRoom>(QLatin1Literal("getCom2VoiceRoom"), withAudioStatus);
}
/*
* Set voice rooms
*/

22
src/blackcore/context_voice_interface.h
View File

@@ -60,7 +60,7 @@ namespace BlackCore
* \param connection
* \param parent
*/
IContextVoice(const QString &serviceName, QDBusConnection &connection, QObject *parent = 0);
IContextVoice(const QString &serviceName, QDBusConnection &connection, QObject *parent = nullptr);
/*!
* Destructor
@@ -106,7 +106,7 @@ namespace BlackCore
* Get voice rooms for COM1, COM2:
* From this connection audio status can be obtained
*/
virtual BlackMisc::Voice::CVoiceRoomList getComVoiceRoomsWithAudioStatus();
virtual BlackMisc::Voice::CVoiceRoomList getComVoiceRoomsWithAudioStatus() const;
/*!
* Get voice rooms for COM1, COM2, but without latest audio status
@@ -114,6 +114,20 @@ namespace BlackCore
*/
virtual BlackMisc::Voice::CVoiceRoomList getComVoiceRooms() const;
/*!
* \brief COM 1 voice room
* \param withAudioStatus update audio status
* \return
*/
virtual BlackMisc::Voice::CVoiceRoom getCom1VoiceRoom(bool withAudioStatus) const;
/*!
* \brief COM 2 voice room
* \param withAudioStatus update audio status
* \return
*/
virtual BlackMisc::Voice::CVoiceRoom getCom2VoiceRoom(bool withAudioStatus) const;
/*!
* \brief Set voice rooms
*/
@@ -162,7 +176,9 @@ namespace BlackCore
virtual void setCurrentAudioDevice(const BlackMisc::Voice::CAudioDevice &audioDevice);
/*!
* \brief Set volumnes for COM1/2
* \brief Set volumes via com units, also allows to mute
* \see BlackMisc::Aviation::CComSystem::setVolumeInput()
* \see BlackMisc::Aviation::CComSystem::setVolumeOutput()
*/
virtual void setVolumes(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2);