flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-05 17:35:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

[AFV] Ref T730, allow to set AFV notifcation sounds in AFV settings

Browse Source
This commit is contained in:
Klaus Basan
2019-10-17 19:58:48 +02:00
parent 7fdc2c3db3
commit 1fe2109a89
3 changed files with 85 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -70,6 +70,10 @@ namespace BlackGui
Q_ASSERT(c); Q_ASSERT(c);
c = connect(ui->cb_SetupAudioNoTransmission, &QCheckBox::toggled, this, &CAudioNotificationComponent::onNotificationsToggled, Qt::QueuedConnection); c = connect(ui->cb_SetupAudioNoTransmission, &QCheckBox::toggled, this, &CAudioNotificationComponent::onNotificationsToggled, Qt::QueuedConnection);
Q_ASSERT(c); 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);
Q_ASSERT(c);
c = connect(ui->pb_SoundReset, &QPushButton::released, this, &CAudioNotificationComponent::resetNotificationSoundsDir, Qt::QueuedConnection); c = connect(ui->pb_SoundReset, &QPushButton::released, this, &CAudioNotificationComponent::resetNotificationSoundsDir, Qt::QueuedConnection);
Q_ASSERT(c); Q_ASSERT(c);
c = connect(ui->pb_SoundDir, &QPushButton::released, this, &CAudioNotificationComponent::selectNotificationSoundsDir, Qt::QueuedConnection); c = connect(ui->pb_SoundDir, &QPushButton::released, this, &CAudioNotificationComponent::selectNotificationSoundsDir, Qt::QueuedConnection);
@@ -88,7 +92,8 @@ namespace BlackGui
return ui->cb_SetupAudioPTTClickDown->isChecked() || ui->cb_SetupAudioPTTClickUp->isChecked() || return ui->cb_SetupAudioPTTClickDown->isChecked() || ui->cb_SetupAudioPTTClickUp->isChecked() ||
ui->cb_SetupAudioPTTBlocked->isChecked() || ui->cb_SetupAudioPTTBlocked->isChecked() ||
ui->cb_SetupAudioNotificationTextMessagePrivate->isChecked() || ui->cb_SetupAudioNotificationTextMessageSupervisor->isChecked() || ui->cb_SetupAudioNotificationTextMessagePrivate->isChecked() || ui->cb_SetupAudioNotificationTextMessageSupervisor->isChecked() ||
ui->cb_SetupAudioNotificationTextCallsignMentioned->isChecked() || ui->cb_SetupAudioNoTransmission->isChecked(); ui->cb_SetupAudioNotificationTextCallsignMentioned->isChecked() || ui->cb_SetupAudioNoTransmission->isChecked() ||
ui->cb_SetupAfvBlocked->isChecked() || ui->cb_SetupAfvClicked->isChecked();
} }
void CAudioNotificationComponent::reloadSettings() void CAudioNotificationComponent::reloadSettings()
@@ -104,6 +109,9 @@ namespace BlackGui
ui->cb_SetupAudioNotificationTextCallsignMentioned->setChecked(as.isNotificationFlagSet(CNotificationSounds::NotificationTextCallsignMentioned)); ui->cb_SetupAudioNotificationTextCallsignMentioned->setChecked(as.isNotificationFlagSet(CNotificationSounds::NotificationTextCallsignMentioned));
ui->cb_SetupAudioNoTransmission->setChecked(as.isNotificationFlagSet(CNotificationSounds::NotificationNoAudioTransmission)); ui->cb_SetupAudioNoTransmission->setChecked(as.isNotificationFlagSet(CNotificationSounds::NotificationNoAudioTransmission));
ui->cb_SetupAfvBlocked->setChecked(as.isNotificationFlagSet(CNotificationSounds::AFVBlocked));
ui->cb_SetupAfvClicked->setChecked(as.isNotificationFlagSet(CNotificationSounds::AFVClicked));
ui->le_SoundDir->setText(as.getNotificationSoundDirectory()); ui->le_SoundDir->setText(as.getNotificationSoundDirectory());
ui->sb_NotificationValueVolume->setValue(as.getNotificationVolume()); ui->sb_NotificationValueVolume->setValue(as.getNotificationVolume());
} }
@@ -123,12 +131,16 @@ namespace BlackGui
if (cb == ui->cb_SetupAudioPTTClickDown) { return CNotificationSounds::PTTClickKeyDown; } if (cb == ui->cb_SetupAudioPTTClickDown) { return CNotificationSounds::PTTClickKeyDown; }
if (cb == ui->cb_SetupAudioPTTClickUp) { return CNotificationSounds::PTTClickKeyUp; } if (cb == ui->cb_SetupAudioPTTClickUp) { return CNotificationSounds::PTTClickKeyUp; }
if (cb == ui->cb_SetupAudioPTTBlocked) { return CNotificationSounds::PTTBlocked; } if (cb == ui->cb_SetupAudioPTTBlocked) { return CNotificationSounds::PTTBlocked; }
if (cb == ui->cb_SetupAudioNotificationTextCallsignMentioned) { return CNotificationSounds::NotificationTextCallsignMentioned; } if (cb == ui->cb_SetupAudioNotificationTextCallsignMentioned) { return CNotificationSounds::NotificationTextCallsignMentioned; }
if (cb == ui->cb_SetupAudioNotificationTextMessagePrivate) { return CNotificationSounds::NotificationTextMessagePrivate; } if (cb == ui->cb_SetupAudioNotificationTextMessagePrivate) { return CNotificationSounds::NotificationTextMessagePrivate; }
if (cb == ui->cb_SetupAudioNotificationTextMessageSupervisor) { return CNotificationSounds::NotificationTextMessageSupervisor; } if (cb == ui->cb_SetupAudioNotificationTextMessageSupervisor) { return CNotificationSounds::NotificationTextMessageSupervisor; }
if (cb == ui->cb_SetupAudioNoTransmission) { return CNotificationSounds::NotificationNoAudioTransmission; } if (cb == ui->cb_SetupAudioNoTransmission) { return CNotificationSounds::NotificationNoAudioTransmission; }
if (cb == ui->cb_SetupAfvBlocked) { return CNotificationSounds::AFVBlocked; }
if (cb == ui->cb_SetupAfvClicked) { return CNotificationSounds::AFVClicked; }
return CNotificationSounds::NoNotifications; return CNotificationSounds::NoNotifications;
} }
@@ -146,6 +158,9 @@ namespace BlackGui
as.setNotificationFlag(CNotificationSounds::NotificationTextCallsignMentioned, ui->cb_SetupAudioNotificationTextCallsignMentioned->isChecked()); as.setNotificationFlag(CNotificationSounds::NotificationTextCallsignMentioned, ui->cb_SetupAudioNotificationTextCallsignMentioned->isChecked());
as.setNotificationFlag(CNotificationSounds::NotificationNoAudioTransmission, ui->cb_SetupAudioNoTransmission->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());
const CStatusMessage msg = m_audioSettings.set(as); const CStatusMessage msg = m_audioSettings.set(as);
CLogMessage(this).preformatted(msg); CLogMessage(this).preformatted(msg);

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

@@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>298</width> <width>298</width>
<height>240</height> <height>297</height>
</rect> </rect>
</property> </property>
<property name="minimumSize"> <property name="minimumSize">
@@ -46,45 +46,14 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>296</width> <width>296</width>
<height>238</height> <height>295</height>
</rect> </rect>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="10" column="1"> <item row="11" column="1">
<widget class="QCheckBox" name="cb_SetupAudioPTTClickUp"> <widget class="QCheckBox" name="cb_SetupAudioPTTBlocked">
<property name="text"> <property name="text">
<string>PTT click (key up)</string> <string>PTT blocking</string>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QCheckBox" name="cb_SetupAudioNotificationTextMessageSupervisor">
<property name="text">
<string>supervisor messages</string>
</property>
</widget>
</item>
<item row="8" column="1">
<widget class="QCheckBox" name="cb_SetupAudioNoTransmission">
<property name="text">
<string>No audio transmission warning</string>
</property>
</widget>
</item>
<item row="9" column="1">
<widget class="QCheckBox" name="cb_SetupAudioPTTClickDown">
<property name="text">
<string>PTT click (key down)</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="lbl_Notifications">
<property name="toolTip">
<string>Notifications</string>
</property>
<property name="text">
<string>Volume:</string>
</property> </property>
</widget> </widget>
</item> </item>
@@ -127,10 +96,24 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="11" column="1"> <item row="4" column="1">
<widget class="QCheckBox" name="cb_SetupAudioPTTBlocked"> <widget class="QCheckBox" name="cb_SetupAudioNotificationTextMessagePrivate">
<property name="text"> <property name="text">
<string>PTT blocking</string> <string>notification for private text messages</string>
</property>
</widget>
</item>
<item row="12" column="1">
<widget class="QCheckBox" name="cb_SetupAfvClicked">
<property name="text">
<string>AFV click</string>
</property>
</widget>
</item>
<item row="9" column="1">
<widget class="QCheckBox" name="cb_SetupAudioPTTClickDown">
<property name="text">
<string>PTT click (key down)</string>
</property> </property>
</widget> </widget>
</item> </item>
@@ -150,6 +133,44 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0">
<widget class="QLabel" name="lbl_SoundDirectory">
<property name="text">
<string>Dir.:</string>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QCheckBox" name="cb_SetupAudioNotificationTextMessageSupervisor">
<property name="text">
<string>supervisor messages</string>
</property>
</widget>
</item>
<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="8" column="1">
<widget class="QCheckBox" name="cb_SetupAudioNoTransmission">
<property name="text">
<string>No audio transmission warning</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="lbl_Notifications">
<property name="toolTip">
<string>Notifications</string>
</property>
<property name="text">
<string>Volume:</string>
</property>
</widget>
</item>
<item row="6" column="1"> <item row="6" column="1">
<widget class="QCheckBox" name="cb_SetupAudioNotificationTextCallsignMentioned"> <widget class="QCheckBox" name="cb_SetupAudioNotificationTextCallsignMentioned">
<property name="text"> <property name="text">
@@ -157,17 +178,10 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="1"> <item row="13" column="1">
<widget class="QCheckBox" name="cb_SetupAudioNotificationTextMessagePrivate"> <widget class="QCheckBox" name="cb_SetupAfvBlocked">
<property name="text"> <property name="text">
<string>notification for private text messages</string> <string>AFV blocking</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="lbl_SoundDirectory">
<property name="text">
<string>Dir.:</string>
</property> </property>
</widget> </widget>
</item> </item>

6
src/blacksound/notificationplayer.cpp
View File

@@ -15,6 +15,7 @@
using namespace BlackMisc; using namespace BlackMisc;
using namespace BlackMisc::Audio; using namespace BlackMisc::Audio;
using namespace BlackSound::SampleProvider;
namespace BlackSound namespace BlackSound
{ {
@@ -44,7 +45,7 @@ namespace BlackSound
// used for too long or hanging sounds // used for too long or hanging sounds
QPointer<CNotificationPlayer> myself(this); QPointer<CNotificationPlayer> myself(this);
QTimer::singleShot(2000, effect, [ = ] QTimer::singleShot(3000, effect, [ = ]
{ {
if (!myself || !m_playingEffect) { return; } if (!myself || !m_playingEffect) { return; }
m_playingEffect->stop(); m_playingEffect->stop();
@@ -71,6 +72,9 @@ namespace BlackSound
this->updateEffect(CNotificationSounds::PTTBlocked, directory, "pttblocked.wav"); this->updateEffect(CNotificationSounds::PTTBlocked, directory, "pttblocked.wav");
this->updateEffect(CNotificationSounds::PTTClickKeyDown, directory, "pttclick.wav"); this->updateEffect(CNotificationSounds::PTTClickKeyDown, directory, "pttclick.wav");
this->updateEffect(CNotificationSounds::PTTClickKeyUp, directory, "pttclick.wav"); this->updateEffect(CNotificationSounds::PTTClickKeyUp, directory, "pttclick.wav");
// CNotificationSounds::AFVBlocked is generated
this->updateEffect(CNotificationSounds::AFVClicked, directory, Samples::fnClick());
} }
void CNotificationPlayer::onPlayingChanged() void CNotificationPlayer::onPlayingChanged()