flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-05-06 10:26:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #220, fixed issue with voice room resolution (not required for changed position / situation), some refactoring

Browse Source
This commit is contained in:
Klaus Basan
2014-06-05 13:37:36 +02:00
parent 137bded355
commit db08e409e0
1 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/blackcore/context_ownaircraft_impl.cpp
View File

@@ -74,20 +74,14 @@ namespace BlackCore
if (this->m_voiceRoom1UrlOverride.isEmpty() && this->m_voiceRoom2UrlOverride.isEmpty() && !this->m_automaticVoiceRoomResolution) return; if (this->m_voiceRoom1UrlOverride.isEmpty() && this->m_voiceRoom2UrlOverride.isEmpty() && !this->m_automaticVoiceRoomResolution) return;
if (!this->getIContextNetwork()) return; // no chance to resolve rooms if (!this->getIContextNetwork()) return; // no chance to resolve rooms
if (!this->getIContextAudio()) return; // no place to set rooms if (!this->getIContextAudio()) return; // no place to set rooms
if (!this->m_automaticVoiceRoomResolution) return; // not responsible
CVoiceRoomList rooms; CVoiceRoomList rooms;
if (this->m_automaticVoiceRoomResolution)
{ // requires correct frequencies set
// requires correct frequencies set // but local network uses exactly this object here, so if frequencies are set here,
// but local network uses exactly this object here, so if frequencies are set here, // they are for network context as well
// they are for network context as well rooms = this->getIContextNetwork()->getSelectedVoiceRooms();
rooms = this->getIContextNetwork()->getSelectedVoiceRooms();
}
else
{
rooms.push_back(CVoiceRoom());
rooms.push_back(CVoiceRoom());
}
if (!this->m_voiceRoom1UrlOverride.isEmpty()) rooms[0] = CVoiceRoom(this->m_voiceRoom1UrlOverride); if (!this->m_voiceRoom1UrlOverride.isEmpty()) rooms[0] = CVoiceRoom(this->m_voiceRoom1UrlOverride);
if (!this->m_voiceRoom2UrlOverride.isEmpty()) rooms[1] = CVoiceRoom(this->m_voiceRoom2UrlOverride); if (!this->m_voiceRoom2UrlOverride.isEmpty()) rooms[1] = CVoiceRoom(this->m_voiceRoom2UrlOverride);
@@ -105,10 +99,10 @@ namespace BlackCore
// trigger the correct signals // trigger the correct signals
bool changedCockpit = this->updateOwnCockpit(aircraft.getCom1System(), aircraft.getCom2System(), aircraft.getTransponder(), originator); bool changedCockpit = this->updateOwnCockpit(aircraft.getCom1System(), aircraft.getCom2System(), aircraft.getTransponder(), originator);
bool changedPosition = this->updateOwnPosition(aircraft.getPosition(), aircraft.getAltitude() , originator); this->updateOwnPosition(aircraft.getPosition(), aircraft.getAltitude() , originator);
bool changedSituation = this->updateOwnSituation(aircraft.getSituation(), originator); this->updateOwnSituation(aircraft.getSituation(), originator);
if (changedCockpit || changedPosition || changedSituation) this->resolveVoiceRooms(); if (changedCockpit) this->resolveVoiceRooms();
// all the rest // all the rest
this->m_ownAircraft = aircraft; this->m_ownAircraft = aircraft;