diff --git a/src/blackcore/context/contextaudio.cpp b/src/blackcore/context/contextaudio.cpp index f4313d1d3..e299f093b 100644 --- a/src/blackcore/context/contextaudio.cpp +++ b/src/blackcore/context/contextaudio.cpp @@ -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) { diff --git a/src/blackgui/components/audionotificationcomponent.cpp b/src/blackgui/components/audionotificationcomponent.cpp index 3f3d94ab2..3d1af2cec 100644 --- a/src/blackgui/components/audionotificationcomponent.cpp +++ b/src/blackgui/components/audionotificationcomponent.cpp @@ -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()); diff --git a/src/blackgui/components/audionotificationcomponent.ui b/src/blackgui/components/audionotificationcomponent.ui index 07b37c6ff..855021ea7 100644 --- a/src/blackgui/components/audionotificationcomponent.ui +++ b/src/blackgui/components/audionotificationcomponent.ui @@ -50,14 +50,14 @@ - + PTT blocking - + AFV click @@ -150,7 +150,7 @@ - + AFV blocking @@ -171,14 +171,14 @@ - + ATC frequency selected - + PTT click (key down) @@ -192,21 +192,14 @@ - - - - No audio transmission warning - - - - + PTT click (key up) - + ATC frequency deselected @@ -230,7 +223,6 @@ cb_SetupAudioNotificationTextCallsignMentioned cb_SetupAudioNotificationTextMessagePrivate cb_SetupAudioNotificationTextMessageSupervisor - cb_SetupAudioNoTransmission cb_SetupAudioPTTClickDown cb_SetupAudioPTTClickUp cb_SetupAudioPTTBlocked diff --git a/src/blackmisc/audio/audiosettings.h b/src/blackmisc/audio/audiosettings.h index 7dc35a56b..f2f0547d6 100644 --- a/src/blackmisc/audio/audiosettings.h +++ b/src/blackmisc/audio/audiosettings.h @@ -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); } diff --git a/src/blackmisc/audio/notificationsounds.cpp b/src/blackmisc/audio/notificationsounds.cpp index b779ef0fe..80d83039a 100644 --- a/src/blackmisc/audio/notificationsounds.cpp +++ b/src/blackmisc/audio/notificationsounds.cpp @@ -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); diff --git a/src/blackmisc/audio/notificationsounds.h b/src/blackmisc/audio/notificationsounds.h index 6f48851c0..0a512685f 100644 --- a/src/blackmisc/audio/notificationsounds.h +++ b/src/blackmisc/audio/notificationsounds.h @@ -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, diff --git a/src/blacksound/notificationplayer.cpp b/src/blacksound/notificationplayer.cpp index ef72fe5f4..7c15b7a4a 100644 --- a/src/blacksound/notificationplayer.cpp +++ b/src/blacksound/notificationplayer.cpp @@ -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"); diff --git a/src/blacksound/share/sounds/noaudiotransmission.wav b/src/blacksound/share/sounds/noaudiotransmission.wav deleted file mode 100644 index 25a0fb9dc..000000000 Binary files a/src/blacksound/share/sounds/noaudiotransmission.wav and /dev/null differ