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

Ref T730, some adjustments for CNotification for testing with WSAPI

Browse Source
This commit is contained in:
Klaus Basan
2019-10-01 01:24:37 +02:00
committed by Mat Sutcliffe
parent be4776ce85
commit 0e4c1f958b
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/blacksound/notificationplayer.cpp
View File

@@ -11,6 +11,7 @@
#include "blackmisc/fileutils.h" #include "blackmisc/fileutils.h"
#include "blacksound/sampleprovider/samples.h" #include "blacksound/sampleprovider/samples.h"
#include <QTimer> #include <QTimer>
#include <QSound>
using namespace BlackMisc; using namespace BlackMisc;
using namespace BlackMisc::Audio; using namespace BlackMisc::Audio;
@@ -32,17 +33,22 @@ namespace BlackSound
{ {
const qreal v = volume / 100.0f; const qreal v = volume / 100.0f;
m_playingEffect = effect; m_playingEffect = effect;
effect->setVolume(v); effect->setVolume(v); // 0..1
effect->play(); effect->play();
/** could be used for too long or hanging sounds /** for testing
QString fn = effect->source().toLocalFile();
QSound s(fn);
s.play();
**/
// used for too long or hanging sounds
QPointer<CNotificationPlayer> myself(this); QPointer<CNotificationPlayer> myself(this);
QTimer::singleShot(2000, effect, [ = ] QTimer::singleShot(2000, effect, [ = ]
{ {
if (!myself || !m_playingEffect) { return; } if (!myself || !m_playingEffect) { return; }
m_playingEffect->stop(); m_playingEffect->stop();
}); });
**/
} }
} }
} }
@@ -82,17 +88,20 @@ namespace BlackSound
// file if existing // file if existing
const QUrl url = CFileUtils::soundFileQUrlOrDefault(directory, name); const QUrl url = CFileUtils::soundFileQUrlOrDefault(directory, name);
if (url.isEmpty()) { if (url.isEmpty() || !url.isLocalFile())
{
// remove notification as not existing // remove notification as not existing
m_effects.remove(f); m_effects.remove(f);
return; return;
} }
// new effect // new effect
// QString fn = url.toLocalFile();
QSoundEffect *effect = new QSoundEffect(this); QSoundEffect *effect = new QSoundEffect(this);
effect->setSource(CFileUtils::soundFileQUrlOrDefault(directory, name)); effect->setSource(url);
effect->setLoopCount(1);
effect->setMuted(false);
m_effects[f] = effect; m_effects[f] = effect;
effect->setLoopCount(0);
connect(effect, &QSoundEffect::playingChanged, this, &CNotificationPlayer::onPlayingChanged, Qt::QueuedConnection); connect(effect, &QSoundEffect::playingChanged, this, &CNotificationPlayer::onPlayingChanged, Qt::QueuedConnection);
} }
} // ns } // ns