jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-10 00:04:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Avoid multiple sounds playing at the same time

Browse source
This commit is contained in:
Fabio Bas 2015-09-13 17:22:58 +02:00
parent 85aa866e02
commit f78c01fa88
2 changed files with 28 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

27
cockatrice/src/soundengine.cpp
View file

@ -33,7 +33,7 @@
#define TEST_SOUND_FILENAME "player_join"
SoundEngine::SoundEngine(QObject *parent)
: QObject(parent), enabled(false)
: QObject(parent), engine(0)
{
ensureThemeDirectoryExists();
connect(settingsCache, SIGNAL(soundThemeChanged()), this, SLOT(themeChangedSlot()));
@ -43,6 +43,15 @@ SoundEngine::SoundEngine(QObject *parent)
themeChangedSlot();
}
SoundEngine::~SoundEngine()
{
if(engine)
{
delete engine;
engine = 0;
}
}
void SoundEngine::soundEnabledChanged()
{
if (settingsCache->getSoundEnabled()) {
@ -57,7 +66,7 @@ void SoundEngine::soundEnabledChanged()
}
#else
qDebug("SoundEngine: enabling sound");
enabled = true;
enabled = true;
#endif
} else {
qDebug("SoundEngine: disabling sound");
@ -76,7 +85,19 @@ void SoundEngine::playSound(QString fileName)
if(!fi.exists())
return;
QSound::play(fi.absoluteFilePath());
if(engine)
{
if(engine->isFinished())
{
engine->stop();
delete engine;
} else {
return;
}
}
engine = new QSound(fi.absoluteFilePath());
engine->play();
}
void SoundEngine::testSound()