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

refs #372 Move voice channel sharing into CContextAudio

Browse Source 
Before a very complex mechanism was implemented in order to share
a vatlib voice channel resource if more than one COM unit was connected
to the same channel. This is now moved into CContextAudio by mapping
a COM unit to a shared voice channel pointer.
This commit is contained in:
Roland Winklmeier
2015-02-03 21:22:11 +01:00
committed by Klaus Basan
parent 33dddf795e
commit 84ac5e9972
12 changed files with 354 additions and 530 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/blackcore/context_audio_proxy.cpp
View File

@@ -64,33 +64,17 @@ namespace BlackCore
/*
* COM1 callsigns
*/
BlackMisc::Aviation::CCallsignList CContextAudioProxy::getCom1RoomCallsigns() const
BlackMisc::Aviation::CCallsignList CContextAudioProxy::getRoomCallsigns(int comUnitValue) const
{
return this->m_dBusInterface->callDBusRet<BlackMisc::Aviation::CCallsignList>(QLatin1Literal("getCom1RoomCallsigns"));
}
/*
* COM2 callsigns
*/
BlackMisc::Aviation::CCallsignList CContextAudioProxy::getCom2RoomCallsigns() const
{
return this->m_dBusInterface->callDBusRet<BlackMisc::Aviation::CCallsignList>(QLatin1Literal("getCom2RoomCallsigns"));
return this->m_dBusInterface->callDBusRet<BlackMisc::Aviation::CCallsignList>(QLatin1Literal("getRoomCallsigns"), comUnitValue);
}
/*
* COM1 users
*/
BlackMisc::Network::CUserList CContextAudioProxy::getCom1RoomUsers() const
BlackMisc::Network::CUserList CContextAudioProxy::getRoomUsers(int comUnitValue) const
{
return this->m_dBusInterface->callDBusRet<BlackMisc::Network::CUserList>(QLatin1Literal("getCom1RoomUsers"));
}
/*
* COM2 users
*/
BlackMisc::Network::CUserList CContextAudioProxy::getCom2RoomUsers() const
{
return this->m_dBusInterface->callDBusRet<BlackMisc::Network::CUserList>(QLatin1Literal("getCom2RoomUsers"));
return this->m_dBusInterface->callDBusRet<BlackMisc::Network::CUserList>(QLatin1Literal("getRoomUsers"), comUnitValue);
}
/*
@@ -136,17 +120,9 @@ namespace BlackCore
/*
* Voice room
*/
CVoiceRoom CContextAudioProxy::getCom1VoiceRoom(bool withAudioStatus) const
CVoiceRoom CContextAudioProxy::getVoiceRoom(int comUnitValue, bool withAudioStatus) const
{
return this->m_dBusInterface->callDBusRet<CVoiceRoom>(QLatin1Literal("getCom1VoiceRoom"), withAudioStatus);
}
/*
* Voice room
*/
CVoiceRoom CContextAudioProxy::getCom2VoiceRoom(bool withAudioStatus) const
{
return this->m_dBusInterface->callDBusRet<CVoiceRoom>(QLatin1Literal("getCom2VoiceRoom"), withAudioStatus);
return this->m_dBusInterface->callDBusRet<CVoiceRoom>(QLatin1Literal("getVoiceRoom"), comUnitValue, withAudioStatus);
}
/*