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

Ref T535, added supervisor notifcation sound

Browse Source
This commit is contained in:
Klaus Basan
2019-02-10 01:22:58 +01:00
committed by Mat Sutcliffe
parent bb7e81420c
commit a01f2e36a0
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/blackmisc/audio/notificationsounds.cpp
View File

@@ -22,6 +22,7 @@ namespace BlackMisc
static const QString login("login"); static const QString login("login");
static const QString logoff("logoff"); static const QString logoff("logoff");
static const QString privateMsg("private msg."); static const QString privateMsg("private msg.");
static const QString supMsg("supervisor msg.");
static const QString mentioned("cs mentioned"); static const QString mentioned("cs mentioned");
static const QString joined("room joined"); static const QString joined("room joined");
static const QString left("room left"); static const QString left("room left");
@@ -34,6 +35,7 @@ namespace BlackMisc
case NotificationLogin: return login; case NotificationLogin: return login;
case NotificationLogoff: return logoff; case NotificationLogoff: return logoff;
case NotificationTextMessagePrivate: return privateMsg; case NotificationTextMessagePrivate: return privateMsg;
case NotificationTextMessageSupervisor: return supMsg;
case NotificationTextCallsignMentioned: return mentioned; case NotificationTextCallsignMentioned: return mentioned;
case NotificationVoiceRoomJoined: return joined; case NotificationVoiceRoomJoined: return joined;
case NotificationVoiceRoomLeft: return left; case NotificationVoiceRoomLeft: return left;
@@ -51,6 +53,7 @@ namespace BlackMisc
if (notification.testFlag(NotificationLogin)) n << flagToString(NotificationLogin); if (notification.testFlag(NotificationLogin)) n << flagToString(NotificationLogin);
if (notification.testFlag(NotificationLogoff)) n << flagToString(NotificationLogoff); if (notification.testFlag(NotificationLogoff)) n << flagToString(NotificationLogoff);
if (notification.testFlag(NotificationTextMessagePrivate)) n << flagToString(NotificationTextMessagePrivate); if (notification.testFlag(NotificationTextMessagePrivate)) n << flagToString(NotificationTextMessagePrivate);
if (notification.testFlag(NotificationTextMessageSupervisor)) n << flagToString(NotificationTextMessageSupervisor);
if (notification.testFlag(NotificationTextCallsignMentioned)) n << flagToString(NotificationTextCallsignMentioned); if (notification.testFlag(NotificationTextCallsignMentioned)) n << flagToString(NotificationTextCallsignMentioned);
if (notification.testFlag(NotificationVoiceRoomJoined)) n << flagToString(NotificationVoiceRoomJoined); if (notification.testFlag(NotificationVoiceRoomJoined)) n << flagToString(NotificationVoiceRoomJoined);
if (notification.testFlag(NotificationVoiceRoomLeft)) n << flagToString(NotificationVoiceRoomLeft); if (notification.testFlag(NotificationVoiceRoomLeft)) n << flagToString(NotificationVoiceRoomLeft);

15
src/blackmisc/audio/notificationsounds.h
View File

@@ -42,16 +42,17 @@ namespace BlackMisc
NotificationLogin = 1 << 1, NotificationLogin = 1 << 1,
NotificationLogoff = 1 << 2, NotificationLogoff = 1 << 2,
NotificationTextMessagePrivate = 1 << 3, NotificationTextMessagePrivate = 1 << 3,
NotificationTextCallsignMentioned = 1 << 4, NotificationTextMessageSupervisor = 1 << 4,
NotificationVoiceRoomJoined = 1 << 5, NotificationTextCallsignMentioned = 1 << 5,
NotificationVoiceRoomLeft = 1 << 6, NotificationVoiceRoomJoined = 1 << 6,
PTTClick = 1 << 7, NotificationVoiceRoomLeft = 1 << 7,
LoadSounds = 1 << 8, //!< end marker and force loading of sounds, keep as last element PTTClick = 1 << 8,
AllTextNotifications = NotificationTextMessagePrivate | NotificationTextCallsignMentioned, LoadSounds = 1 << 9, //!< end marker and force loading of sounds, keep as last element
AllTextNotifications = NotificationTextMessagePrivate | NotificationTextCallsignMentioned | NotificationTextMessageSupervisor,
AllLoginNotifications = NotificationLogin | NotificationLogoff, AllLoginNotifications = NotificationLogin | NotificationLogoff,
AllVoiceRoomNotifications = NotificationVoiceRoomJoined | NotificationVoiceRoomLeft, AllVoiceRoomNotifications = NotificationVoiceRoomJoined | NotificationVoiceRoomLeft,
AllNotifications = NotificationError | AllTextNotifications | AllLoginNotifications | AllVoiceRoomNotifications, AllNotifications = NotificationError | AllTextNotifications | AllLoginNotifications | AllVoiceRoomNotifications,
DefaultNotifications = NotificationError | NotificationTextMessagePrivate | AllLoginNotifications | AllVoiceRoomNotifications, DefaultNotifications = NotificationError | AllTextNotifications | AllLoginNotifications | AllVoiceRoomNotifications,
All = AllNotifications | PTTClick All = AllNotifications | PTTClick
}; };
Q_DECLARE_FLAGS(Notification, NotificationFlag) Q_DECLARE_FLAGS(Notification, NotificationFlag)

1
src/blacksound/soundgenerator.cpp
View File

@@ -500,6 +500,7 @@ namespace BlackSound
success = playlist->addMedia(QUrl::fromLocalFile(CDirectoryUtils::soundFilesDirectory() + "/login.wav")) && success; success = playlist->addMedia(QUrl::fromLocalFile(CDirectoryUtils::soundFilesDirectory() + "/login.wav")) && success;
success = playlist->addMedia(QUrl::fromLocalFile(CDirectoryUtils::soundFilesDirectory() + "/logoff.wav")) && success; success = playlist->addMedia(QUrl::fromLocalFile(CDirectoryUtils::soundFilesDirectory() + "/logoff.wav")) && success;
success = playlist->addMedia(QUrl::fromLocalFile(CDirectoryUtils::soundFilesDirectory() + "/privatemessage.wav")) && success; success = playlist->addMedia(QUrl::fromLocalFile(CDirectoryUtils::soundFilesDirectory() + "/privatemessage.wav")) && success;
success = playlist->addMedia(QUrl::fromLocalFile(CDirectoryUtils::soundFilesDirectory() + "/supervisormessage.wav")) && success;
success = playlist->addMedia(QUrl::fromLocalFile(CDirectoryUtils::soundFilesDirectory() + "/callsignmentioned.wav")) && success; success = playlist->addMedia(QUrl::fromLocalFile(CDirectoryUtils::soundFilesDirectory() + "/callsignmentioned.wav")) && success;
success = playlist->addMedia(QUrl::fromLocalFile(CDirectoryUtils::soundFilesDirectory() + "/voiceroomjoined.wav")) && success; success = playlist->addMedia(QUrl::fromLocalFile(CDirectoryUtils::soundFilesDirectory() + "/voiceroomjoined.wav")) && success;
success = playlist->addMedia(QUrl::fromLocalFile(CDirectoryUtils::soundFilesDirectory() + "/voiceroomleft.wav")) && success; success = playlist->addMedia(QUrl::fromLocalFile(CDirectoryUtils::soundFilesDirectory() + "/voiceroomleft.wav")) && success;