flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-05-01 22:55:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T494, fixed voiceroom member updates

Browse Source 
* changedUrl was actually equal URL, no idea how this ever did work out
* unnecessary redundant updates of voice room members fixed
This commit is contained in:
Klaus Basan
2018-12-31 09:41:43 +01:00
committed by Mat Sutcliffe
parent 3be93ab753
commit 13647329f9
1 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/blackgui/components/voiceroomscomponent.cpp
View File

@@ -80,19 +80,20 @@ namespace BlackGui
void CVoiceRoomsComponent::updateAudioVoiceRoomsFromContext(const CVoiceRoomList &selectedVoiceRooms, bool connected) void CVoiceRoomsComponent::updateAudioVoiceRoomsFromContext(const CVoiceRoomList &selectedVoiceRooms, bool connected)
{ {
Q_ASSERT(selectedVoiceRooms.size() == 2); if (!sGui || sGui->isShuttingDown()) { return; }
CVoiceRoom room1 = selectedVoiceRooms[0];
CVoiceRoom room2 = selectedVoiceRooms[1];
// remark Q_ASSERT(selectedVoiceRooms.size() == 2);
const CVoiceRoom room1 = selectedVoiceRooms[0];
const CVoiceRoom room2 = selectedVoiceRooms[1];
// remark:
// isAudioPlaying() is not set, as this is only a temporary value when really "something is playing" // isAudioPlaying() is not set, as this is only a temporary value when really "something is playing"
bool changedUrl1 = (room1.getVoiceRoomUrl() == ui->le_CockpitVoiceRoomCom1->text()); const bool changedUrl1 = (room1.getVoiceRoomUrl() != ui->le_CockpitVoiceRoomCom1->text());
ui->le_CockpitVoiceRoomCom1->setText(room1.getVoiceRoomUrl()); ui->le_CockpitVoiceRoomCom1->setText(room1.getVoiceRoomUrl());
if (room1.isConnected()) if (room1.isConnected())
{ {
ui->le_CockpitVoiceRoomCom1->setStyleSheet("background: green"); ui->le_CockpitVoiceRoomCom1->setStyleSheet("background: green");
if (sGui->getIContextAudio()) ui->tvp_CockpitVoiceRoom1->updateContainer(sGui->getIContextAudio()->getRoomUsers(BlackMisc::Aviation::CComSystem::Com1));
} }
else else
{ {
@@ -100,7 +101,7 @@ namespace BlackGui
ui->tvp_CockpitVoiceRoom1->clear(); ui->tvp_CockpitVoiceRoom1->clear();
} }
bool changedUrl2 = (room2.getVoiceRoomUrl() == ui->le_CockpitVoiceRoomCom2->text()); const bool changedUrl2 = (room2.getVoiceRoomUrl() != ui->le_CockpitVoiceRoomCom2->text());
ui->le_CockpitVoiceRoomCom2->setText(room2.getVoiceRoomUrl()); ui->le_CockpitVoiceRoomCom2->setText(room2.getVoiceRoomUrl());
if (room2.isConnected()) if (room2.isConnected())
{ {
@@ -111,16 +112,16 @@ namespace BlackGui
ui->le_CockpitVoiceRoomCom2->setStyleSheet(""); ui->le_CockpitVoiceRoomCom2->setStyleSheet("");
ui->tvp_CockpitVoiceRoom2->clear(); ui->tvp_CockpitVoiceRoom2->clear();
} }
// for unconnected we already
if (connected) { this->updateVoiceRoomMembers(); }
if (changedUrl1 || changedUrl2) if (changedUrl1 || changedUrl2)
{ {
this->updateVoiceRoomMembers();
// notify // notify
if (sGui->getIContextAudio()) if (sGui->getIContextAudio())
{ {
CNotificationSounds::NotificationFlag sound = connected ? const CNotificationSounds::NotificationFlag sound = connected ? CNotificationSounds::NotificationVoiceRoomJoined : CNotificationSounds::NotificationVoiceRoomLeft;
CNotificationSounds::NotificationVoiceRoomJoined :
CNotificationSounds::NotificationVoiceRoomLeft;
sGui->getIContextAudio()->playNotification(sound, true); sGui->getIContextAudio()->playNotification(sound, true);
} }
} }
@@ -128,10 +129,10 @@ namespace BlackGui
void CVoiceRoomsComponent::updateVoiceRoomMembers() void CVoiceRoomsComponent::updateVoiceRoomMembers()
{ {
if (!sGui->getIContextAudio()) { return; } if (!sGui || sGui->isShuttingDown() || !sGui->getIContextAudio()) { return; }
if (!ui->le_CockpitVoiceRoomCom1->text().trimmed().isEmpty()) if (!ui->le_CockpitVoiceRoomCom1->text().trimmed().isEmpty())
{ {
ui->tvp_CockpitVoiceRoom1->updateContainer(sGui->getIContextAudio()->getRoomUsers(BlackMisc::Aviation::CComSystem::Com1)); ui->tvp_CockpitVoiceRoom1->updateContainer(sGui->getIContextAudio()->getRoomUsers(CComSystem::Com1));
} }
else else
{ {
@@ -140,7 +141,7 @@ namespace BlackGui
if (!ui->le_CockpitVoiceRoomCom2->text().trimmed().isEmpty()) if (!ui->le_CockpitVoiceRoomCom2->text().trimmed().isEmpty())
{ {
ui->tvp_CockpitVoiceRoom2->updateContainer(sGui->getIContextAudio()->getRoomUsers(BlackMisc::Aviation::CComSystem::Com2)); ui->tvp_CockpitVoiceRoom2->updateContainer(sGui->getIContextAudio()->getRoomUsers(CComSystem::Com2));
} }
else else
{ {