libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-19 00:15:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for bug #1660559: MANIAC/ZAK: Music does not stop when pausing (regression)

Browse Source 
svn-id: r25605
This commit is contained in:
Max Horn 2007-02-15 12:47:09 +00:00
parent 57f529e36e
commit 8cef52294c
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sound/mixer.cpp
View File

@ -246,7 +246,7 @@ void Mixer::mix(int16 *buf, uint len) {
// zero the buf
memset(buf, 0, 2 * len * sizeof(int16));
if (_premixChannel)
if (_premixChannel && !_premixChannel->isPaused())
_premixChannel->mix(buf, len);
// now mix all channels
@ -270,13 +270,16 @@ void Mixer::mixCallback(void *s, byte *samples, int len) {
void Mixer::stopAll(bool force) {
Common::StackLock lock(_mutex);
for (int i = 0; i != NUM_CHANNELS; i++)
for (int i = 0; i != NUM_CHANNELS; i++) {
if (_channels[i] != 0) {
if (force || !_channels[i]->isPermanent()) {
delete _channels[i];
_channels[i] = 0;
}
}
}
// Note: the _premixChannel is *not* affected by stopAll!
}
void Mixer::stopID(int id) {
@ -338,6 +341,10 @@ void Mixer::pauseAll(bool paused) {
_channels[i]->pause(paused);
}
}
// Unlike stopAll, we also pause the premix channel, if present.
if (_premixChannel)
_premixChannel->pause(paused);
}
void Mixer::pauseID(int id, bool paused) {