flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-05-01 14:45:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T730, notification player, use latest files

Browse Source
This commit is contained in:
Klaus Basan
2019-09-28 19:42:45 +02:00
committed by Mat Sutcliffe
parent 9abbbd262a
commit 34848ddd46
2 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/blacksound/notificationplayer.cpp
View File

@@ -7,7 +7,9 @@
*/ */
#include "notificationplayer.h" #include "notificationplayer.h"
#include "blackmisc/logmessage.h"
#include "blackmisc/fileutils.h" #include "blackmisc/fileutils.h"
#include "blacksound/sampleprovider/samples.h"
#include <QTimer> #include <QTimer>
using namespace BlackMisc; using namespace BlackMisc;
@@ -50,7 +52,8 @@ namespace BlackSound
if (directory == m_directory && !m_effects.isEmpty()) { return; } if (directory == m_directory && !m_effects.isEmpty()) { return; }
m_directory = directory; m_directory = directory;
QStringList types = QSoundEffect::supportedMimeTypes(); const QStringList types = QSoundEffect::supportedMimeTypes();
CLogMessage(this).info(u"Notification mime types: %1") << types.join(", ");
this->updateEffect(CNotificationSounds::NotificationError, directory, "error.wav"); this->updateEffect(CNotificationSounds::NotificationError, directory, "error.wav");
this->updateEffect(CNotificationSounds::NotificationLogin, directory, "login.wav"); this->updateEffect(CNotificationSounds::NotificationLogin, directory, "login.wav");
@@ -58,10 +61,9 @@ namespace BlackSound
this->updateEffect(CNotificationSounds::NotificationTextMessagePrivate, directory, "privatemessage.wav"); this->updateEffect(CNotificationSounds::NotificationTextMessagePrivate, directory, "privatemessage.wav");
this->updateEffect(CNotificationSounds::NotificationTextMessageSupervisor, directory, "supervisormessage.wav"); this->updateEffect(CNotificationSounds::NotificationTextMessageSupervisor, directory, "supervisormessage.wav");
this->updateEffect(CNotificationSounds::NotificationTextCallsignMentioned, directory, "callsignmentioned.wav"); this->updateEffect(CNotificationSounds::NotificationTextCallsignMentioned, directory, "callsignmentioned.wav");
this->updateEffect(CNotificationSounds::NotificationVoiceRoomJoined, directory, "voiceroomjoined.wav");
this->updateEffect(CNotificationSounds::NotificationVoiceRoomLeft, directory, "voiceroomleft.wav");
this->updateEffect(CNotificationSounds::NotificationNoAudioTransmission, directory, "noaudiotransmission.wav"); this->updateEffect(CNotificationSounds::NotificationNoAudioTransmission, directory, "noaudiotransmission.wav");
this->updateEffect(CNotificationSounds::PTTClickKeyDown, directory, "pttclick.wav"); this->updateEffect(CNotificationSounds::PTTBlocked, directory, "pttblocked.wav");
this->updateEffect(CNotificationSounds::PTTClickKeyDown, directory, SampleProvider::Samples::fnClick());
this->updateEffect(CNotificationSounds::PTTClickKeyUp, directory, "pttclick.wav"); this->updateEffect(CNotificationSounds::PTTClickKeyUp, directory, "pttclick.wav");
} }
@@ -75,12 +77,22 @@ namespace BlackSound
void CNotificationPlayer::updateEffect(CNotificationSounds::NotificationFlag f, const QString &directory, const QString &name) void CNotificationPlayer::updateEffect(CNotificationSounds::NotificationFlag f, const QString &directory, const QString &name)
{ {
QSoundEffect *e = nullptr; QSoundEffect *e = nullptr;
QSoundEffect *effect = new QSoundEffect(this);
effect->setSource(CFileUtils::soundFileQUrl(directory, name));
if (m_effects.contains(f)) { e = m_effects[f]; } if (m_effects.contains(f)) { e = m_effects[f]; }
if (e) { e->deleteLater(); }
// file if existing
const QUrl url = CFileUtils::soundFileQUrlOrDefault(directory, name);
if (url.isEmpty()) {
// remove notification as not existing
m_effects.remove(f);
return;
}
// new effect
QSoundEffect *effect = new QSoundEffect(this);
effect->setSource(CFileUtils::soundFileQUrlOrDefault(directory, name));
m_effects[f] = effect; m_effects[f] = effect;
effect->setLoopCount(0); effect->setLoopCount(0);
connect(effect, &QSoundEffect::playingChanged, this, &CNotificationPlayer::onPlayingChanged, Qt::QueuedConnection); connect(effect, &QSoundEffect::playingChanged, this, &CNotificationPlayer::onPlayingChanged, Qt::QueuedConnection);
if (e) { e->deleteLater(); }
} }
} // ns } // ns

2
src/blacksound/notificationplayer.h
View File

@@ -50,6 +50,6 @@ namespace BlackSound
//! Update an effect //! Update an effect
void updateEffect(BlackMisc::Audio::CNotificationSounds::NotificationFlag f, const QString &directory, const QString &name); void updateEffect(BlackMisc::Audio::CNotificationSounds::NotificationFlag f, const QString &directory, const QString &name);
}; };
} } // ns
#endif // guard #endif // guard