libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-05 17:57:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bugfix for music not being stopped when music volume is set to zero

Browse Source 
svn-id: r43066
This commit is contained in:
Paul Gilbert 2009-08-05 10:44:37 +00:00
parent 4af0cfbdbd
commit 26b372603b
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
engines/tinsel/music.cpp
View File

@ -303,6 +303,8 @@ int GetMidiVolume() {
return volMusic;
}
static int priorVolMusic = 0;
/**
* Sets the volume of the MIDI music.
* @param vol New volume - 0..MAXMIDIVOL
@ -310,23 +312,24 @@ int GetMidiVolume() {
void SetMidiVolume(int vol) {
assert(vol >= 0 && vol <= Audio::Mixer::kMaxChannelVolume);
if (vol == 0 && volMusic == 0) {
if (vol == 0 && priorVolMusic == 0) {
// Nothing to do
} else if (vol == 0 && volMusic != 0) {
} else if (vol == 0 && priorVolMusic != 0) {
// Stop current midi sequence
StopMidi();
} else if (vol != 0 && volMusic == 0) {
_vm->_midiMusic->setVolume(vol);
} else if (vol != 0 && priorVolMusic == 0) {
// Perhaps restart last midi sequence
if (currentLoop) {
PlayMidiSequence(currentMidi, true);
_vm->_midiMusic->setVolume(vol);
}
} else if (vol != 0 && volMusic != 0) {
} else if (vol != 0 && priorVolMusic != 0) {
// Alter current volume
_vm->_midiMusic->setVolume(vol);
}
volMusic = vol;
priorVolMusic = vol;
}
/**