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

Ref T775, special handling for "broadcast" messages

Browse Source 
* identify broadcast messages
* do NOT play sound
* use "own" tab for text messages (group together)
This commit is contained in:
Klaus Basan
2020-02-03 17:45:53 +01:00
committed by Mat Sutcliffe
parent 4de544a991
commit 00ed15f111
5 changed files with 70 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/blackgui/components/textmessagecomponent.cpp
View File

@@ -214,8 +214,18 @@ namespace BlackGui
relevantForMe = true;
}
// check message
if (message.isRadioMessage())
// check message, handle special cases first
if (message.isServerMessage())
{
// void
}
else if (message.isBroadcastMessage())
{
// FAKE private message
this->addPrivateChannelTextMessage(message);
relevantForMe = true;
}
else if (message.isRadioMessage())
{
// check for own COM frequencies
if (message.isSendToFrequency(ownAircraft.getCom1System().getFrequencyActive()))
@@ -235,12 +245,17 @@ namespace BlackGui
sGui->getCContextAudioBase()->playNotification(CNotificationSounds::NotificationTextCallsignMentioned, false);
}
}
else if (message.isPrivateMessage() && !message.isServerMessage())
else if (message.isPrivateMessage())
{
// private message
this->addPrivateChannelTextMessage(message);
relevantForMe = true;
}
else
{
BLACK_AUDIT_X(false, Q_FUNC_INFO, "Wrong message type");
continue;
}
// message for me? right frequency? otherwise quit
if (this->hasAllMessagesTab() && (relevantForMe || message.isServerMessage()))
@@ -252,7 +267,10 @@ namespace BlackGui
if (!relevantForMe) { continue; }
// overlay message if this channel is not selected
if (!message.wasSent() && !message.isSendToUnicom() && !message.isServerMessage())
if (message.isServerMessage()) { continue; }
if (message.isBroadcastMessage()) { continue; }
if (!message.wasSent() && !message.isSendToUnicom())
{
// if the channel is selected, do nothing
if (!this->isCorrespondingTextMessageTabSelected(message))
@@ -526,8 +544,12 @@ namespace BlackGui
void CTextMessageComponent::addPrivateChannelTextMessage(const CTextMessage &textMessage)
{
if (!textMessage.isPrivateMessage()) { return; }
const CCallsign cs = textMessage.wasSent() ? textMessage.getRecipientCallsign() : textMessage.getSenderCallsign();
CCallsign cs = textMessage.wasSent() ? textMessage.getRecipientCallsign() : textMessage.getSenderCallsign();
if (cs.isEmpty()) { return; }
const bool isBroadcast = textMessage.isBroadcastMessage();
if (isBroadcast) { cs.markAsBroadcastCallsign(); }
const QWidget *tab = this->findTextMessageTabByCallsign(cs);
if (!tab) { tab = this->addNewTextMessageTab(cs); }
Q_ASSERT_X(tab, Q_FUNC_INFO, "Missing tab");
@@ -537,6 +559,9 @@ namespace BlackGui
textEdit->insertTextMessage(textMessage);
// sound
if (textMessage.isServerMessage()) { return; }
if (isBroadcast) { return; }
const bool playSound = !textMessage.wasSent() && !m_usedAsOverlayWidget && sGui && !sGui->isShuttingDown() && sGui->getIContextAudio();
if (sGui && sGui->getIContextAudio() && playSound)
{