[Scummvm-cvs-logs] SF.net SVN: scummvm:[46654] scummvm/trunk/engines/sci/sfx/music.cpp

[m_kiewitz at users.sourceforge.net]

Revision: 46654
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46654&view=rev
Author:   m_kiewitz
Date:     2009-12-27 18:24:48 +0000 (Sun, 27 Dec 2009)

Log Message:
-----------
SCI/newmusic: fix getting of mastervolume. cause of rounding we will otherwise decrease mastervolume by 1 on every access resulting in no sound after a while :) (fixes lb2, sq4cd and others)

Modified Paths:
--------------
    scummvm/trunk/engines/sci/sfx/music.cpp

Modified: scummvm/trunk/engines/sci/sfx/music.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/music.cpp	2009-12-27 18:21:49 UTC (rev 46653)
+++ scummvm/trunk/engines/sci/sfx/music.cpp	2009-12-27 18:24:48 UTC (rev 46654)
@@ -478,8 +478,7 @@
 
 //---------------------------------------------
 uint16 SciMusic::soundGetMasterVolume() {
-	return _pMixer->getVolumeForSoundType(Audio::Mixer::kMusicSoundType) * 0xF
-			/ Audio::Mixer::kMaxMixerVolume;
+	return (_pMixer->getVolumeForSoundType(Audio::Mixer::kMusicSoundType) + 8) * 0xF / Audio::Mixer::kMaxMixerVolume;
 }
 //---------------------------------------------
 void SciMusic::soundSetMasterVolume(uint16 vol) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.