[Scummvm-cvs-logs] scummvm master -> e08ddf70b2c7a1cef13e9db39735a58902caa2ae

[eriktorbjorn]

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:
e08ddf70b2 KYRA: Don't restore music volume right after it has faded down


Commit: e08ddf70b2c7a1cef13e9db39735a58902caa2ae
    https://github.com/scummvm/scummvm/commit/e08ddf70b2c7a1cef13e9db39735a58902caa2ae
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2013-04-07T13:10:48-07:00

Commit Message:
KYRA: Don't restore music volume right after it has faded down

Since the music volume is set in playTrack(), it shouldn't be
necessary to set it back to the default level when a fade out has
been completed.

This change prevents the volume from spiking right before quitting
the game. I hope it doesn't cause regressions.

Changed paths:
    engines/kyra/sound_midi.cpp



diff --git a/engines/kyra/sound_midi.cpp b/engines/kyra/sound_midi.cpp
index a54c526..b93b42f 100644
--- a/engines/kyra/sound_midi.cpp
+++ b/engines/kyra/sound_midi.cpp
@@ -783,7 +783,6 @@ void SoundMidiPC::onTimer(void *data) {
 				midi->_sfx[i]->stopPlaying();
 			}
 
-			midi->_output->setSourceVolume(0, midi->_musicVolume, true);
 			midi->_fadeMusicOut = false;
 		}
 	}