flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-31 21:15:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Do not play QSoundEffect while it is still playing

Browse Source 
* added m_playEffect as flag
* hooked up signals to reset the flags
This commit is contained in:
Klaus Basan
2019-09-20 15:10:00 +02:00
committed by Mat Sutcliffe
parent 55f70a794e
commit d944d0f6ee
8 changed files with 46 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/blacksound/notificationplayer.cpp
View File

@@ -21,13 +21,27 @@ namespace BlackSound
// lazy init at play
}
void CNotificationPlayer::play(CNotificationSounds::NotificationFlag notification, int volume) const
void CNotificationPlayer::play(CNotificationSounds::NotificationFlag notification, int volume)
{
QSoundEffect *effect = m_effects.value(notification, nullptr);
if (effect)
{
effect->setVolume(volume / 100.0);
effect->play();
if (!m_playingEffect && effect->isLoaded() && !effect->isPlaying())
{
const qreal v = volume / 100.0f;
m_playingEffect = effect;
effect->setVolume(v);
effect->play();
/** could be used for too long or hanging sounds
QPointer<CNotificationPlayer> myself(this);
QTimer::singleShot(2000, effect, [ = ]
{
if (!myself || !m_playingEffect) { return; }
m_playingEffect->stop();
});
**/
}
}
}
@@ -36,6 +50,8 @@ namespace BlackSound
if (directory == m_directory && !m_effects.isEmpty()) { return; }
m_directory = directory;
QStringList types = QSoundEffect::supportedMimeTypes();
this->updateEffect(CNotificationSounds::NotificationError, directory, "error.wav");
this->updateEffect(CNotificationSounds::NotificationLogin, directory, "login.wav");
this->updateEffect(CNotificationSounds::NotificationLogoff, directory, "logoff.wav");
@@ -49,6 +65,13 @@ namespace BlackSound
this->updateEffect(CNotificationSounds::PTTClickKeyUp, directory, "pttclick.wav");
}
void CNotificationPlayer::onPlayingChanged()
{
if (!m_playingEffect) { return; }
if (m_playingEffect->isPlaying()) { return; }
m_playingEffect.clear();
}
void CNotificationPlayer::updateEffect(CNotificationSounds::NotificationFlag f, const QString &directory, const QString &name)
{
QSoundEffect *e = nullptr;
@@ -56,6 +79,8 @@ namespace BlackSound
effect->setSource(CFileUtils::soundFileQUrl(directory, name));
if (m_effects.contains(f)) { e = m_effects[f]; }
m_effects[f] = effect;
effect->setLoopCount(0);
connect(effect, &QSoundEffect::playingChanged, this, &CNotificationPlayer::onPlayingChanged, Qt::QueuedConnection);
if (e) { e->deleteLater(); }
}
} // ns

7
src/blacksound/notificationplayer.h
View File

@@ -17,6 +17,7 @@
#include <QObject>
#include <QHash>
#include <QSoundEffect>
#include <QPointer>
namespace BlackSound
{
@@ -33,7 +34,7 @@ namespace BlackSound
virtual ~CNotificationPlayer() override {}
//! Play notification sound
void play(BlackMisc::Audio::CNotificationSounds::NotificationFlag notification, int volume = 100) const;
void play(BlackMisc::Audio::CNotificationSounds::NotificationFlag notification, int volume = 100);
//! Update the directory
void updateDirectory(const QString &directory);
@@ -41,6 +42,10 @@ namespace BlackSound
private:
QHash<BlackMisc::Audio::CNotificationSounds::NotificationFlag, QSoundEffect *> m_effects;
QString m_directory;
QPointer<QSoundEffect> m_playingEffect;
//! Playing of effect has been changed
void onPlayingChanged();
//! Update an effect
void updateEffect(BlackMisc::Audio::CNotificationSounds::NotificationFlag f, const QString &directory, const QString &name);