[Scummvm-cvs-logs] CVS: scummvm/sound mixer.cpp,1.183,1.184 mixer.h,1.95,1.96

Max Horn fingolfin at users.sourceforge.net
Sun Feb 6 12:36:40 CET 2005


Update of /cvsroot/scummvm/scummvm/sound
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7043

Modified Files:
	mixer.cpp mixer.h 
Log Message:
It's kMaxMixerVolume, not 256 (we might change it to 255 eventually)

Index: mixer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mixer.cpp,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -d -r1.183 -r1.184
--- mixer.cpp	30 Jan 2005 11:03:45 -0000	1.183
+++ mixer.cpp	6 Feb 2005 20:35:05 -0000	1.184
@@ -480,7 +480,7 @@
 		// slightly odd divisor: the 255 reflects the fact that the maximal
 		// value for _volume is 255, while the 127 is there because the
 		// balance value ranges from -127 to 127.  The mixer (music/sound)
-		// volume is in the range 0 - 256.
+		// volume is in the range 0 - kMaxMixerVolume.
 		// Hence, the vol_l/vol_r values will be in that range, too
 		
 		int vol = _mixer->getVolumeForSoundType(_type) * _volume;

Index: mixer.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mixer.h,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -d -r1.95 -r1.96
--- mixer.h	30 Jan 2005 11:03:45 -0000	1.95
+++ mixer.h	6 Feb 2005 20:35:06 -0000	1.96
@@ -255,14 +255,14 @@
 	/**
 	 * Set the volume for the given sound type.
 	 *
-	 * @param volume the new global volume, 0-256
+	 * @param volume the new global volume, 0-kMaxMixerVolume
 	 */
 	void setVolumeForSoundType(SoundType type, int volume);
 
 	/**
 	 * Query the global volume.
 	 *
-	 * @return the global music volume, 0-256
+	 * @return the global music volume, 0-kMaxMixerVolume
 	 */
 	int getVolumeForSoundType(SoundType type) const;
 





More information about the Scummvm-git-logs mailing list