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

Issue #168 Trigger notification sounds

Browse Source 
"Text message on ATC frequency" and "Text message on UNICOM" sounds
weren't triggered before.
This commit is contained in:
Lars Toenning
2022-06-21 23:40:57 +02:00
parent 521859f9ac
commit ddc7b3f87b
1 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -189,6 +189,7 @@ namespace BlackGui::Components
for (const CTextMessage &message : messages) for (const CTextMessage &message : messages)
{ {
bool relevantForMe = false; bool relevantForMe = false;
CNotificationSounds::NotificationFlag notification = CNotificationSounds::NoNotifications;
// SELCAL // SELCAL
if (!m_usedAsOverlayWidget && message.isSelcalMessage() && ownAircraft.isSelcalSelected(message.getSelcalCode())) if (!m_usedAsOverlayWidget && message.isSelcalMessage() && ownAircraft.isSelcalSelected(message.getSelcalCode()))
@@ -211,6 +212,12 @@ namespace BlackGui::Components
if (message.isSendToUnicom()) if (message.isSendToUnicom())
{ {
ui->tep_TextMessagesUnicom->insertTextMessage(message); ui->tep_TextMessagesUnicom->insertTextMessage(message);
// Message was received from others
if (!message.wasSent())
{
notification = CNotificationSounds::NotificationTextMessageUnicom;
}
relevantForMe = true; relevantForMe = true;
} }
@@ -231,18 +238,26 @@ namespace BlackGui::Components
if (message.isSendToFrequency(ownAircraft.getCom1System().getFrequencyActive())) if (message.isSendToFrequency(ownAircraft.getCom1System().getFrequencyActive()))
{ {
ui->tep_TextMessagesCOM1->insertTextMessage(message); ui->tep_TextMessagesCOM1->insertTextMessage(message);
if (!message.isSendToUnicom())
{
notification = CNotificationSounds::NotificationTextMessageFrequency;
}
relevantForMe = true; relevantForMe = true;
} }
if (message.isSendToFrequency(ownAircraft.getCom2System().getFrequencyActive())) if (message.isSendToFrequency(ownAircraft.getCom2System().getFrequencyActive()))
{ {
ui->tep_TextMessagesCOM2->insertTextMessage(message); ui->tep_TextMessagesCOM2->insertTextMessage(message);
if (!message.isSendToUnicom())
{
notification = CNotificationSounds::NotificationTextMessageFrequency;
}
relevantForMe = true; relevantForMe = true;
} }
// callsign mentioned notification // callsign mentioned notification
if (relevantForMe && audioCsMentioned && ownAircraft.hasCallsign() && message.mentionsCallsign(ownAircraft.getCallsign())) if (relevantForMe && audioCsMentioned && ownAircraft.hasCallsign() && message.mentionsCallsign(ownAircraft.getCallsign()))
{ {
sGui->getCContextAudioBase()->playNotification(CNotificationSounds::NotificationTextCallsignMentioned, false); notification = CNotificationSounds::NotificationTextCallsignMentioned;
// Flash taskbar icon // Flash taskbar icon
QApplication::alert(QWidget::topLevelWidget()); QApplication::alert(QWidget::topLevelWidget());
} }
@@ -270,6 +285,12 @@ namespace BlackGui::Components
} }
if (!relevantForMe) { continue; } if (!relevantForMe) { continue; }
// Play notification
if (playNotification && notification != CNotificationSounds::NoNotifications)
{
sGui->getCContextAudioBase()->playNotification(notification, true);
}
// overlay message if this channel is not selected // overlay message if this channel is not selected
if (message.isServerMessage()) { continue; } if (message.isServerMessage()) { continue; }
if (message.isBroadcastMessage()) { continue; } if (message.isBroadcastMessage()) { continue; }