From 59baf237cc26399916e65f76bac8674a03c025bf Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Thu, 17 Oct 2019 23:37:17 +0200 Subject: [PATCH] [AFV] Ref T730, added notification files for "station tuned in" Those will be a replacement for the "joined voice room" --- src/blackmisc/audio/notificationsounds.cpp | 9 +++++++++ src/blackmisc/audio/notificationsounds.h | 2 ++ .../sounds/{voiceroomjoined.wav => atctunedin.wav} | Bin .../sounds/{voiceroomleft.wav => atctunedout.wav} | Bin 4 files changed, 11 insertions(+) rename src/blacksound/share/sounds/{voiceroomjoined.wav => atctunedin.wav} (100%) rename src/blacksound/share/sounds/{voiceroomleft.wav => atctunedout.wav} (100%) diff --git a/src/blackmisc/audio/notificationsounds.cpp b/src/blackmisc/audio/notificationsounds.cpp index 671ff47a1..58e212d29 100644 --- a/src/blackmisc/audio/notificationsounds.cpp +++ b/src/blackmisc/audio/notificationsounds.cpp @@ -35,6 +35,8 @@ namespace BlackMisc static const QString noaudiotx("No audio tx"); static const QString afvclick("AFC click"); static const QString afvblock("AFV blocked"); + static const QString tunein("ATC tuned in"); + static const QString tuneout("ATC tuned off"); switch (notification) { @@ -45,11 +47,14 @@ namespace BlackMisc case NotificationTextMessageSupervisor: return supMsg; case NotificationTextCallsignMentioned: return mentioned; case NotificationNoAudioTransmission: return noaudiotx; + case NotificationAtcTunedIn: return tunein; + case NotificationAtcTunedOut: return tuneout; case PTTClickKeyDown: return pttDown; case PTTClickKeyUp: return pttUp; case PTTBlocked: return pttBlocked; case AFVClicked: return afvclick; case AFVBlocked: return afvblock; + default: break; } return unknown; @@ -65,6 +70,10 @@ namespace BlackMisc if (notification.testFlag(NotificationTextMessageSupervisor)) n << flagToString(NotificationTextMessageSupervisor); if (notification.testFlag(NotificationTextCallsignMentioned)) n << flagToString(NotificationTextCallsignMentioned); if (notification.testFlag(NotificationNoAudioTransmission)) n << flagToString(NotificationNoAudioTransmission); + + if (notification.testFlag(NotificationAtcTunedIn)) n << flagToString(NotificationAtcTunedIn); + if (notification.testFlag(NotificationAtcTunedOut)) n << flagToString(NotificationAtcTunedOut); + if (notification.testFlag(PTTClickKeyUp)) n << flagToString(PTTClickKeyUp); if (notification.testFlag(PTTClickKeyDown)) n << flagToString(PTTClickKeyDown); if (notification.testFlag(PTTBlocked)) n << flagToString(PTTBlocked); diff --git a/src/blackmisc/audio/notificationsounds.h b/src/blackmisc/audio/notificationsounds.h index a0e63c97a..721166caa 100644 --- a/src/blackmisc/audio/notificationsounds.h +++ b/src/blackmisc/audio/notificationsounds.h @@ -44,6 +44,8 @@ namespace BlackMisc NotificationTextMessageSupervisor = 1 << 4, NotificationTextCallsignMentioned = 1 << 5, NotificationNoAudioTransmission = 1 << 6, + NotificationAtcTunedIn = 1 << 10, + NotificationAtcTunedOut = 1 << 11, PTTClickKeyDown = 1 << 7, PTTClickKeyUp = 1 << 8, PTTBlocked = 1 << 9, diff --git a/src/blacksound/share/sounds/voiceroomjoined.wav b/src/blacksound/share/sounds/atctunedin.wav similarity index 100% rename from src/blacksound/share/sounds/voiceroomjoined.wav rename to src/blacksound/share/sounds/atctunedin.wav diff --git a/src/blacksound/share/sounds/voiceroomleft.wav b/src/blacksound/share/sounds/atctunedout.wav similarity index 100% rename from src/blacksound/share/sounds/voiceroomleft.wav rename to src/blacksound/share/sounds/atctunedout.wav