[Scummvm-cvs-logs] SF.net SVN: scummvm: [28687] scummvm/branches/gsoc2007-mixer/sound/rate.cpp

[dogmatixman at users.sourceforge.net]

Revision: 28687
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28687&view=rev
Author:   dogmatixman
Date:     2007-08-21 08:03:58 -0700 (Tue, 21 Aug 2007)

Log Message:
-----------
Whoops!  Integer division was making audio output silent at anything less than full volume for the FilteringRateConverter.

Modified Paths:
--------------
    scummvm/branches/gsoc2007-mixer/sound/rate.cpp

Modified: scummvm/branches/gsoc2007-mixer/sound/rate.cpp
===================================================================
--- scummvm/branches/gsoc2007-mixer/sound/rate.cpp	2007-08-21 14:59:02 UTC (rev 28686)
+++ scummvm/branches/gsoc2007-mixer/sound/rate.cpp	2007-08-21 15:03:58 UTC (rev 28687)
@@ -470,7 +470,7 @@
 		accum0 *= kFudgeFactor / filtGain;
 		
 		/* Scale down according to the volume settings. */
-		accum0 *= vol_l / Audio::Mixer::kMaxMixerVolume;
+		accum0 *= (double)vol_l / Audio::Mixer::kMaxMixerVolume;
 		
 		/*
 		 * The overall effect of the following code is to add dithering of up
@@ -507,7 +507,7 @@
 		if (stereo || vol_l != vol_r) {
 			accum1 *= kFudgeFactor / filtGain;
 			
-			accum1 *= vol_r / Audio::Mixer::kMaxMixerVolume;
+			accum1 *= (double)vol_r / Audio::Mixer::kMaxMixerVolume;
 			
 			double dither1 = ((accum1 >= 0) ? 1 : -1) * 
 					( (double)(rand->getRandomNumber(kRandMax)) + 


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