From 3a469d4654657aa9ced069df0b58ac5d7288646f Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Thu, 17 Oct 2019 17:43:31 +0200 Subject: [PATCH] [AFV] Ref T730, bring back swift PTT click sounds --- src/blacksound/notificationplayer.cpp | 2 +- src/swiftguistandard/swiftguistd.cpp | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/blacksound/notificationplayer.cpp b/src/blacksound/notificationplayer.cpp index 8586df217..17693d862 100644 --- a/src/blacksound/notificationplayer.cpp +++ b/src/blacksound/notificationplayer.cpp @@ -69,7 +69,7 @@ namespace BlackSound this->updateEffect(CNotificationSounds::NotificationTextCallsignMentioned, directory, "callsignmentioned.wav"); this->updateEffect(CNotificationSounds::NotificationNoAudioTransmission, directory, "noaudiotransmission.wav"); this->updateEffect(CNotificationSounds::PTTBlocked, directory, "pttblocked.wav"); - this->updateEffect(CNotificationSounds::PTTClickKeyDown, directory, SampleProvider::Samples::fnClick()); + this->updateEffect(CNotificationSounds::PTTClickKeyDown, directory, "pttclick.wav"); this->updateEffect(CNotificationSounds::PTTClickKeyUp, directory, "pttclick.wav"); } diff --git a/src/swiftguistandard/swiftguistd.cpp b/src/swiftguistandard/swiftguistd.cpp index 5ca8c826e..7e18d5baa 100644 --- a/src/swiftguistandard/swiftguistd.cpp +++ b/src/swiftguistandard/swiftguistd.cpp @@ -311,7 +311,7 @@ void SwiftGuiStd::onConnectionStatusChanged(const CConnectionStatus &from, const // sounds switch (to.getConnectionStatus()) { - case CConnectionStatus::Connected: this->playNotifcationSound(CNotificationSounds::NotificationLogin); break; + case CConnectionStatus::Connected: this->playNotifcationSound(CNotificationSounds::NotificationLogin); break; case CConnectionStatus::Disconnected: this->playNotifcationSound(CNotificationSounds::NotificationLogoff); break; default: break; } @@ -543,13 +543,12 @@ void SwiftGuiStd::displayNetworkSettings() void SwiftGuiStd::onPttChanged(bool enabled) { Q_UNUSED(enabled) - if (!sGui || !sGui->getIContextAudio()) { return; } + if (!sGui || !sGui->getCContextAudioBase()) { return; } - /** wit AFV no longer play - sGui->getIContextAudio()->playNotification( + // based on user request still play with AFV + sGui->getCContextAudioBase()->playNotification( enabled ? CNotificationSounds::PTTClickKeyDown : CNotificationSounds::PTTClickKeyUp, true); - **/ } void SwiftGuiStd::displayDBusReconnectDialog()