Fixed (dsdirectsound): Linear to logarithmic sound effect volume tran…

…slation which resulted in no audible sound if both 3D sound positioning was enabled and the Doomsday sound effects volume control was lower than maximum volume.
skyjake · Feb 1, 2009 · ab02ea0 · ab02ea0
1 parent 165cf97
commit ab02ea0
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/doomsday/plugins/directsound/src/driver_directsound.cpp b/doomsday/plugins/directsound/src/driver_directsound.cpp
@@ -757,7 +757,8 @@ static int volLinearToLog(float vol)
         return DSBVOLUME_MAX;
 
     // Straighten the volume curve.
-    return MIN_OF(DSBVOLUME_MIN, (int) (100 * 20 * log10(vol)));
+    return MINMAX_OF(DSBVOLUME_MIN, (int) (100 * 20 * log10(vol)),
+                     DSBVOLUME_MAX);
 }
 
 /**
@@ -799,12 +800,17 @@ Con_Error("dsDS9::DS_DSoundSet: Unknown prop %i.", prop);
         break;
 
     case SFXBP_VOLUME:
+        {
+        LONG            volume;
+
         if(value <= 0) // Use logarithmic attenuation.
-            DSBUF(buf)->SetVolume((LONG) ((-1 - value) * 10000));
+            volume = (LONG) ((-1 - value) * 10000);
         else // Linear volume.
-            DSBUF(buf)->SetVolume(volLinearToLog(value));
-        break;
+            volume = (LONG) volLinearToLog(value);
 
+        DSBUF(buf)->SetVolume(volume);
+        break;
+        }
     case SFXBP_FREQUENCY:
         {
         unsigned int    freq = (unsigned int) (buf->rate * value);