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

Remove unused "no audio transmission" notification sound

Browse Source 
Related to #156
This commit is contained in:
Lars Toenning
2023-11-07 10:08:07 +01:00
parent 3187835315
commit b57dfa1cb8
8 changed files with 9 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/blackcore/context/contextaudio.cpp
View File

@@ -519,16 +519,6 @@ namespace BlackCore::Context
const CSettings settings = m_audioSettings.getThreadLocal();
const bool play = !considerSettings || settings.isNotificationFlagSet(notification);
if (!play) { return; }
if (notification == CNotificationSounds::PTTClickKeyDown && (considerSettings && settings.noAudioTransmission()))
{
/*
if (!this->canTalk())
{
// warning sound
notification = CNotificationSounds::NotificationNoAudioTransmission;
}
*/
}
if (volume < 0 || volume > 100)
{

8
src/blackgui/components/audionotificationcomponent.cpp
View File

@@ -67,8 +67,6 @@ namespace BlackGui::Components
Q_ASSERT(c);
c = connect(ui->cb_SetupAudioNotificationAtcTunedIn, &QCheckBox::toggled, this, &CAudioNotificationComponent::onNotificationsToggled, Qt::QueuedConnection);
Q_ASSERT(c);
c = connect(ui->cb_SetupAudioNoTransmission, &QCheckBox::toggled, this, &CAudioNotificationComponent::onNotificationsToggled, Qt::QueuedConnection);
Q_ASSERT(c);
c = connect(ui->cb_SetupAfvBlocked, &QCheckBox::toggled, this, &CAudioNotificationComponent::onNotificationsToggled, Qt::QueuedConnection);
Q_ASSERT(c);
c = connect(ui->cb_SetupAfvClicked, &QCheckBox::toggled, this, &CAudioNotificationComponent::onNotificationsToggled, Qt::QueuedConnection);
@@ -92,7 +90,7 @@ namespace BlackGui::Components
ui->cb_SetupAudioPTTBlocked->isChecked() ||
ui->cb_SetupAudioNotificationTextMessageFrequency->isChecked() || ui->cb_SetupAudioNotificationTextMessageUnicom->isChecked() ||
ui->cb_SetupAudioNotificationTextMessagePrivate->isChecked() || ui->cb_SetupAudioNotificationTextMessageSupervisor->isChecked() ||
ui->cb_SetupAudioNotificationTextCallsignMentioned->isChecked() || ui->cb_SetupAudioNoTransmission->isChecked() ||
ui->cb_SetupAudioNotificationTextCallsignMentioned->isChecked() ||
ui->cb_SetupAfvBlocked->isChecked() || ui->cb_SetupAfvClicked->isChecked() ||
ui->cb_SetupAudioNotificationAtcTunedIn->isChecked() || ui->cb_SetupAudioNotificationAtcTunedOut->isChecked();
}
@@ -112,7 +110,6 @@ namespace BlackGui::Components
ui->cb_SetupAudioNotificationTextCallsignMentioned->setChecked(as.isNotificationFlagSet(CNotificationSounds::NotificationTextCallsignMentioned));
ui->cb_SetupAudioNotificationAtcTunedIn->setChecked(as.isNotificationFlagSet(CNotificationSounds::NotificationAtcTunedIn));
ui->cb_SetupAudioNotificationAtcTunedOut->setChecked(as.isNotificationFlagSet(CNotificationSounds::NotificationAtcTunedOut));
ui->cb_SetupAudioNoTransmission->setChecked(as.isNotificationFlagSet(CNotificationSounds::NotificationNoAudioTransmission));
ui->cb_SetupAfvBlocked->setChecked(as.isNotificationFlagSet(CNotificationSounds::AFVBlocked));
ui->cb_SetupAfvClicked->setChecked(as.isNotificationFlagSet(CNotificationSounds::AFVClicked));
@@ -146,8 +143,6 @@ namespace BlackGui::Components
if (cb == ui->cb_SetupAudioNotificationAtcTunedIn) { return CNotificationSounds::NotificationAtcTunedIn; }
if (cb == ui->cb_SetupAudioNotificationAtcTunedOut) { return CNotificationSounds::NotificationAtcTunedOut; }
if (cb == ui->cb_SetupAudioNoTransmission) { return CNotificationSounds::NotificationNoAudioTransmission; }
if (cb == ui->cb_SetupAfvBlocked) { return CNotificationSounds::AFVBlocked; }
if (cb == ui->cb_SetupAfvClicked) { return CNotificationSounds::AFVClicked; }
@@ -168,7 +163,6 @@ namespace BlackGui::Components
as.setNotificationFlag(CNotificationSounds::NotificationTextMessageSupervisor, ui->cb_SetupAudioNotificationTextMessageSupervisor->isChecked());
as.setNotificationFlag(CNotificationSounds::NotificationTextMessageUnicom, ui->cb_SetupAudioNotificationTextMessageUnicom->isChecked());
as.setNotificationFlag(CNotificationSounds::NotificationTextCallsignMentioned, ui->cb_SetupAudioNotificationTextCallsignMentioned->isChecked());
as.setNotificationFlag(CNotificationSounds::NotificationNoAudioTransmission, ui->cb_SetupAudioNoTransmission->isChecked());
as.setNotificationFlag(CNotificationSounds::AFVBlocked, ui->cb_SetupAfvBlocked->isChecked());
as.setNotificationFlag(CNotificationSounds::AFVClicked, ui->cb_SetupAfvClicked->isChecked());

22
src/blackgui/components/audionotificationcomponent.ui
View File

@@ -50,14 +50,14 @@
</rect>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="13" column="1">
<item row="12" column="1">
<widget class="QCheckBox" name="cb_SetupAudioPTTBlocked">
<property name="text">
<string>PTT blocking</string>
</property>
</widget>
</item>
<item row="14" column="1">
<item row="13" column="1">
<widget class="QCheckBox" name="cb_SetupAfvClicked">
<property name="text">
<string>AFV click</string>
@@ -150,7 +150,7 @@
</property>
</widget>
</item>
<item row="12" column="1">
<item row="11" column="1">
<widget class="QCheckBox" name="cb_SetupAfvBlocked">
<property name="text">
<string>AFV blocking</string>
@@ -171,14 +171,14 @@
</property>
</widget>
</item>
<item row="15" column="1">
<item row="14" column="1">
<widget class="QCheckBox" name="cb_SetupAudioNotificationAtcTunedIn">
<property name="text">
<string>ATC frequency selected</string>
</property>
</widget>
</item>
<item row="10" column="1">
<item row="9" column="1">
<widget class="QCheckBox" name="cb_SetupAudioPTTClickDown">
<property name="text">
<string>PTT click (key down)</string>
@@ -192,21 +192,14 @@
</property>
</widget>
</item>
<item row="9" column="1">
<widget class="QCheckBox" name="cb_SetupAudioNoTransmission">
<property name="text">
<string>No audio transmission warning</string>
</property>
</widget>
</item>
<item row="11" column="1">
<item row="10" column="1">
<widget class="QCheckBox" name="cb_SetupAudioPTTClickUp">
<property name="text">
<string>PTT click (key up)</string>
</property>
</widget>
</item>
<item row="16" column="1">
<item row="15" column="1">
<widget class="QCheckBox" name="cb_SetupAudioNotificationAtcTunedOut">
<property name="text">
<string>ATC frequency deselected</string>
@@ -230,7 +223,6 @@
<tabstop>cb_SetupAudioNotificationTextCallsignMentioned</tabstop>
<tabstop>cb_SetupAudioNotificationTextMessagePrivate</tabstop>
<tabstop>cb_SetupAudioNotificationTextMessageSupervisor</tabstop>
<tabstop>cb_SetupAudioNoTransmission</tabstop>
<tabstop>cb_SetupAudioPTTClickDown</tabstop>
<tabstop>cb_SetupAudioPTTClickUp</tabstop>
<tabstop>cb_SetupAudioPTTBlocked</tabstop>

1
src/blackmisc/audio/audiosettings.h
View File

@@ -58,7 +58,6 @@ namespace BlackMisc::Audio
bool textMessagePrivate() const { return this->isNotificationFlagSet(CNotificationSounds::NotificationTextMessagePrivate); }
bool textMessageSupervisor() const { return this->isNotificationFlagSet(CNotificationSounds::NotificationTextMessageSupervisor); }
bool textCallsignMentioned() const { return this->isNotificationFlagSet(CNotificationSounds::NotificationTextCallsignMentioned); }
bool noAudioTransmission() const { return this->isNotificationFlagSet(CNotificationSounds::NotificationNoAudioTransmission); }
bool pttClickDown() const { return this->isNotificationFlagSet(CNotificationSounds::PTTClickKeyDown); }
bool pttClickUp() const { return this->isNotificationFlagSet(CNotificationSounds::PTTClickKeyUp); }
bool pttBlocked() const { return this->isNotificationFlagSet(CNotificationSounds::PTTBlocked); }

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

@@ -22,7 +22,6 @@ namespace BlackMisc::Audio
static const QString pttUp("PTT click up");
static const QString pttDown("PTT click down");
static const QString pttBlocked("PTT blocked");
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");
@@ -38,7 +37,6 @@ namespace BlackMisc::Audio
case NotificationTextMessageSupervisor: return supMsg;
case NotificationTextMessageUnicom: return unicomMsg;
case NotificationTextCallsignMentioned: return mentioned;
case NotificationNoAudioTransmission: return noaudiotx;
case NotificationAtcTunedIn: return tunein;
case NotificationAtcTunedOut: return tuneout;
case PTTClickKeyDown: return pttDown;
@@ -63,7 +61,6 @@ namespace BlackMisc::Audio
if (notification.testFlag(NotificationTextMessageSupervisor)) n << flagToString(NotificationTextMessageSupervisor);
if (notification.testFlag(NotificationTextMessageUnicom)) n << flagToString(NotificationTextMessageUnicom);
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);

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

@@ -30,7 +30,7 @@ namespace BlackMisc::Audio
NotificationTextMessageSupervisor = 1 << 4,
NotificationTextMessageUnicom = 1 << 13,
NotificationTextCallsignMentioned = 1 << 5,
NotificationNoAudioTransmission = 1 << 6,
// 1 << 6 previously used for NoAudioTransmission
NotificationAtcTunedIn = 1 << 10,
NotificationAtcTunedOut = 1 << 11,
PTTClickKeyDown = 1 << 7,

1
src/blacksound/notificationplayer.cpp
View File

@@ -65,7 +65,6 @@ namespace BlackSound
this->updateEffect(CNotificationSounds::NotificationTextMessageSupervisor, directory, "supervisormessage.wav");
this->updateEffect(CNotificationSounds::NotificationTextMessageUnicom, directory, "unicommessage.wav");
this->updateEffect(CNotificationSounds::NotificationTextCallsignMentioned, directory, "callsignmentioned.wav");
this->updateEffect(CNotificationSounds::NotificationNoAudioTransmission, directory, "noaudiotransmission.wav");
this->updateEffect(CNotificationSounds::NotificationAtcTunedIn, directory, "atctunedin.wav");
this->updateEffect(CNotificationSounds::NotificationAtcTunedOut, directory, "atctunedout.wav");
this->updateEffect(CNotificationSounds::PTTBlocked, directory, "pttblocked.wav");

BIN
src/blacksound/share/sounds/noaudiotransmission.wav
View File

Binary file not shown.