Remove unused PTTBlocked notification sound

src/blackgui/components/audionotificationcomponent.cpp

@@ -51,8 +51,6 @@ namespace BlackGui::Components
         Q_ASSERT(c);
         c = connect(ui->cb_SetupAudioPTTClickUp, &QCheckBox::toggled, this, &CAudioNotificationComponent::onNotificationsToggled, Qt::QueuedConnection);
         Q_ASSERT(c);
-        c = connect(ui->cb_SetupAudioPTTBlocked, &QCheckBox::toggled, this, &CAudioNotificationComponent::onNotificationsToggled, Qt::QueuedConnection);
-        Q_ASSERT(c);
         c = connect(ui->cb_SetupAudioNotificationTextMessageFrequency, &QCheckBox::toggled, this, &CAudioNotificationComponent::onNotificationsToggled, Qt::QueuedConnection);
         Q_ASSERT(c);
         c = connect(ui->cb_SetupAudioNotificationTextMessagePrivate, &QCheckBox::toggled, this, &CAudioNotificationComponent::onNotificationsToggled, Qt::QueuedConnection);
@@ -87,7 +85,6 @@ namespace BlackGui::Components
     bool CAudioNotificationComponent::playNotificationSounds() const
     {
         return ui->cb_SetupAudioPTTClickDown->isChecked() || ui->cb_SetupAudioPTTClickUp->isChecked() ||
-               ui->cb_SetupAudioPTTBlocked->isChecked() ||
                ui->cb_SetupAudioNotificationTextMessageFrequency->isChecked() || ui->cb_SetupAudioNotificationTextMessageUnicom->isChecked() ||
                ui->cb_SetupAudioNotificationTextMessagePrivate->isChecked() || ui->cb_SetupAudioNotificationTextMessageSupervisor->isChecked() ||
                ui->cb_SetupAudioNotificationTextCallsignMentioned->isChecked() ||
@@ -100,7 +97,6 @@ namespace BlackGui::Components
 
         ui->cb_SetupAudioPTTClickDown->setChecked(as.isNotificationFlagSet(CNotificationSounds::PTTClickKeyDown));
         ui->cb_SetupAudioPTTClickUp->setChecked(as.isNotificationFlagSet(CNotificationSounds::PTTClickKeyUp));
-        ui->cb_SetupAudioPTTBlocked->setChecked(as.isNotificationFlagSet(CNotificationSounds::PTTBlocked));
 
         ui->cb_SetupAudioNotificationTextMessageFrequency->setChecked(as.isNotificationFlagSet(CNotificationSounds::NotificationTextMessageFrequency));
         ui->cb_SetupAudioNotificationTextMessagePrivate->setChecked(as.isNotificationFlagSet(CNotificationSounds::NotificationTextMessagePrivate));
@@ -133,7 +129,6 @@ namespace BlackGui::Components
 
         if (cb == ui->cb_SetupAudioPTTClickDown) { return CNotificationSounds::PTTClickKeyDown; }
         if (cb == ui->cb_SetupAudioPTTClickUp) { return CNotificationSounds::PTTClickKeyUp; }
-        if (cb == ui->cb_SetupAudioPTTBlocked) { return CNotificationSounds::PTTBlocked; }
 
         if (cb == ui->cb_SetupAudioNotificationTextCallsignMentioned) { return CNotificationSounds::NotificationTextCallsignMentioned; }
         if (cb == ui->cb_SetupAudioNotificationTextMessageFrequency) { return CNotificationSounds::NotificationTextMessageFrequency; }
@@ -157,7 +152,6 @@ namespace BlackGui::Components
 
         as.setNotificationFlag(CNotificationSounds::PTTClickKeyDown, ui->cb_SetupAudioPTTClickDown->isChecked());
         as.setNotificationFlag(CNotificationSounds::PTTClickKeyUp, ui->cb_SetupAudioPTTClickUp->isChecked());
-        as.setNotificationFlag(CNotificationSounds::PTTBlocked, ui->cb_SetupAudioPTTBlocked->isChecked());
 
         as.setNotificationFlag(CNotificationSounds::NotificationTextMessageFrequency, ui->cb_SetupAudioNotificationTextMessageFrequency->isChecked());
         as.setNotificationFlag(CNotificationSounds::NotificationTextMessagePrivate, ui->cb_SetupAudioNotificationTextMessagePrivate->isChecked());

src/blackgui/components/audionotificationcomponent.ui

@@ -51,13 +51,6 @@
       </property>
       <layout class="QGridLayout" name="gridLayout">
        <item row="12" column="1">
-        <widget class="QCheckBox" name="cb_SetupAudioPTTBlocked">
-         <property name="text">
-          <string>PTT blocking</string>
-         </property>
-        </widget>
-       </item>
-       <item row="13" column="1">
         <widget class="QCheckBox" name="cb_SetupAfvClicked">
          <property name="text">
           <string>AFV click</string>
@@ -192,14 +185,14 @@
          </property>
         </widget>
        </item>
-       <item row="14" column="1">
+       <item row="13" column="1">
         <widget class="QCheckBox" name="cb_SetupAudioNotificationLogin">
          <property name="text">
           <string>Login</string>
          </property>
         </widget>
        </item>
-       <item row="15" column="1">
+       <item row="14" column="1">
         <widget class="QCheckBox" name="cb_SetupAudioNotificationLogoff">
          <property name="text">
           <string>Logoff</string>
@@ -225,7 +218,6 @@
   <tabstop>cb_SetupAudioNotificationTextMessageSupervisor</tabstop>
   <tabstop>cb_SetupAudioPTTClickDown</tabstop>
   <tabstop>cb_SetupAudioPTTClickUp</tabstop>
-  <tabstop>cb_SetupAudioPTTBlocked</tabstop>
   <tabstop>cb_SetupAfvClicked</tabstop>
   <tabstop>cb_SetupAfvBlocked</tabstop>
   <tabstop>cb_SetupAudioNotificationLogin</tabstop>

src/blackmisc/audio/audiosettings.h

@@ -60,7 +60,6 @@ namespace BlackMisc::Audio
         bool textCallsignMentioned() const { return this->isNotificationFlagSet(CNotificationSounds::NotificationTextCallsignMentioned); }
         bool pttClickDown() const { return this->isNotificationFlagSet(CNotificationSounds::PTTClickKeyDown); }
         bool pttClickUp() const { return this->isNotificationFlagSet(CNotificationSounds::PTTClickKeyUp); }
-        bool pttBlocked() const { return this->isNotificationFlagSet(CNotificationSounds::PTTBlocked); }
 
         bool afvClicked() const { return this->isNotificationFlagSet(CNotificationSounds::AFVClicked); }
         bool afvBlocked() const { return this->isNotificationFlagSet(CNotificationSounds::AFVBlocked); }

src/blackmisc/audio/notificationsounds.cpp

@@ -21,7 +21,6 @@ namespace BlackMisc::Audio
         static const QString mentioned("cs mentioned");
         static const QString pttUp("PTT click up");
         static const QString pttDown("PTT click down");
-        static const QString pttBlocked("PTT blocked");
         static const QString afvclick("AFC click");
         static const QString afvblock("AFV blocked");
 
@@ -37,7 +36,6 @@ namespace BlackMisc::Audio
         case NotificationTextCallsignMentioned: return mentioned;
         case PTTClickKeyDown: return pttDown;
         case PTTClickKeyUp: return pttUp;
-        case PTTBlocked: return pttBlocked;
         case AFVClicked: return afvclick;
         case AFVBlocked: return afvblock;
 
@@ -60,7 +58,6 @@ namespace BlackMisc::Audio
 
         if (notification.testFlag(PTTClickKeyUp)) n << flagToString(PTTClickKeyUp);
         if (notification.testFlag(PTTClickKeyDown)) n << flagToString(PTTClickKeyDown);
-        if (notification.testFlag(PTTBlocked)) n << flagToString(PTTBlocked);
 
         if (notification.testFlag(AFVClicked)) n << flagToString(AFVClicked);
         if (notification.testFlag(AFVBlocked)) n << flagToString(AFVBlocked);

src/blackmisc/audio/notificationsounds.h

@@ -35,7 +35,7 @@ namespace BlackMisc::Audio
             // 1 << 11 previously used for NotificationAtcTunedOut
             PTTClickKeyDown = 1 << 7,
             PTTClickKeyUp = 1 << 8,
-            PTTBlocked = 1 << 9,
+            // 1 << 9 previously used for PTTBlocked
             AFVClicked = 1 << 14,
             AFVBlocked = 1 << 15
         };
@@ -49,7 +49,7 @@ namespace BlackMisc::Audio
         constexpr static Notification AllLoginNotifications = Notification(NotificationLogin | NotificationLogoff);
 
         //! All PTT notification flags
-        constexpr static Notification AllPTTNotifications = Notification(PTTBlocked | PTTClickKeyUp | PTTClickKeyDown);
+        constexpr static Notification AllPTTNotifications = Notification(PTTClickKeyUp | PTTClickKeyDown);
 
         //! All AFV flags
         constexpr static Notification AllAfv = Notification(AFVClicked | AFVBlocked);

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::PTTBlocked, directory, "pttblocked.wav");
         this->updateEffect(CNotificationSounds::PTTClickKeyDown, directory, "pttclick.wav");
         this->updateEffect(CNotificationSounds::PTTClickKeyUp, directory, "pttclick.wav");