aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/sound.cpp
diff options
context:
space:
mode:
authorTorbjörn Andersson2006-08-01 03:29:32 +0000
committerTorbjörn Andersson2006-08-01 03:29:32 +0000
commitc32c7e00c4e1d8688a4aa548d41c623acdb8ba3d (patch)
tree6557cd0ed99199a08cdfd0c2b093dfceeaddce14 /engines/kyra/sound.cpp
parentec8f1b092dffaee25e4396e1edc1632c63bc3572 (diff)
downloadscummvm-rg350-c32c7e00c4e1d8688a4aa548d41c623acdb8ba3d.tar.gz
scummvm-rg350-c32c7e00c4e1d8688a4aa548d41c623acdb8ba3d.tar.bz2
scummvm-rg350-c32c7e00c4e1d8688a4aa548d41c623acdb8ba3d.zip
Don't set the MIDI volume to 255 at the end of a fade-out. At least on my
hardware, that causes an annoying spike in the volume. We already reset the volume to 255 at the beginning of a new track anyway, as far as I can tell. svn-id: r23650
Diffstat (limited to 'engines/kyra/sound.cpp')
-rw-r--r--engines/kyra/sound.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/engines/kyra/sound.cpp b/engines/kyra/sound.cpp
index a279cb9499..a97f85c579 100644
--- a/engines/kyra/sound.cpp
+++ b/engines/kyra/sound.cpp
@@ -345,7 +345,6 @@ void SoundMidiPC::onTimer(void *refCon) {
byte volume = (byte)((musicFadeTime - (music->_engine->_system->getMillis() - music->_fadeStartTime)) * 255 / musicFadeTime);
music->setVolume(volume);
} else if (music->_fadeStartTime) {
- music->setVolume(255);
music->_fadeStartTime = 0;
music->_fadeMusicOut = false;
music->_isPlaying = false;