[Scummvm-cvs-logs] SF.net SVN: scummvm:[33701] scummvm/branches/branch-0-12-0/engines/cine/ cine.cpp

buddha_ at users.sourceforge.net buddha_ at users.sourceforge.net
Fri Aug 8 16:56:35 CEST 2008


Revision: 33701
          http://scummvm.svn.sourceforge.net/scummvm/?rev=33701&view=rev
Author:   buddha_
Date:     2008-08-08 14:56:34 +0000 (Fri, 08 Aug 2008)

Log Message:
-----------
Backport of r33700: Partially fix Adlib volume setting in Cine (Now uses music volume for Adlib volume, previously always played with full volume. Doesn't differentiate between playing sound effects and music!).

Modified Paths:
--------------
    scummvm/branches/branch-0-12-0/engines/cine/cine.cpp

Modified: scummvm/branches/branch-0-12-0/engines/cine/cine.cpp
===================================================================
--- scummvm/branches/branch-0-12-0/engines/cine/cine.cpp	2008-08-08 14:46:19 UTC (rev 33700)
+++ scummvm/branches/branch-0-12-0/engines/cine/cine.cpp	2008-08-08 14:56:34 UTC (rev 33701)
@@ -57,6 +57,10 @@
 	// Setup mixer
 	_mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, ConfMan.getInt("sfx_volume"));
 	_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, ConfMan.getInt("music_volume"));
+	// Use music volume for plain sound types (At least the Adlib player uses a plain sound type
+	// so previously the music and sfx volume controls didn't affect it at all).
+	// FIXME: Make Adlib player differentiate between playing sound effects and music and remove this.
+	_mixer->setVolumeForSoundType(Audio::Mixer::kPlainSoundType, ConfMan.getInt("music_volume"));
 
 	g_cine = this;
 


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




More information about the Scummvm-git-logs mailing list