[Scummvm-git-logs] scummvm master -> 831694699cc2c0ae00332162055fdff35940a99b
dreammaster
dreammaster at scummvm.org
Fri Oct 28 05:23:03 CEST 2016
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
831694699c TITANIC: Fix interrupting playing sounds
Commit: 831694699cc2c0ae00332162055fdff35940a99b
https://github.com/scummvm/scummvm/commit/831694699cc2c0ae00332162055fdff35940a99b
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-10-27T23:22:59-04:00
Commit Message:
TITANIC: Fix interrupting playing sounds
Changed paths:
engines/titanic/sound/qmixer.cpp
diff --git a/engines/titanic/sound/qmixer.cpp b/engines/titanic/sound/qmixer.cpp
index 7331649..f05f8c3 100644
--- a/engines/titanic/sound/qmixer.cpp
+++ b/engines/titanic/sound/qmixer.cpp
@@ -60,7 +60,12 @@ void QMixer::qsWaveMixFreeWave(Audio::SoundHandle &handle) {
}
void QMixer::qsWaveMixFlushChannel(int iChannel, uint flags) {
- // Not currently implemented in ScummVM
+ Common::List<SoundEntry>::iterator i;
+ Common::List<SoundEntry> &sounds = _channels[iChannel]._sounds;
+ for (i = sounds.begin(); i != sounds.end(); ++i)
+ _mixer->stopHandle((*i)._soundHandle);
+
+ sounds.clear();
}
void QMixer::qsWaveMixSetPanRate(int iChannel, uint flags, uint rate) {
More information about the Scummvm-git-logs
mailing list