From 29ab63e86f8c4cc6dc5081ea8131da663c763fcd Mon Sep 17 00:00:00 2001
From: Andrzej Kapolka <andrzej@threerings.net>
Date: Thu, 12 Aug 2010 20:25:26 +0000
Subject: [PATCH] Be consistent in how we apply the base gain.

git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@979 ed5b42cb-e716-0410-a449-f6a68f950b19
---
 src/java/com/threerings/openal/OpenALSoundPlayer.java | 4 +---
 src/java/com/threerings/openal/Sound.java             | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/java/com/threerings/openal/OpenALSoundPlayer.java b/src/java/com/threerings/openal/OpenALSoundPlayer.java
index 128d90d1..09d4c0ca 100644
--- a/src/java/com/threerings/openal/OpenALSoundPlayer.java
+++ b/src/java/com/threerings/openal/OpenALSoundPlayer.java
@@ -240,11 +240,9 @@ public class OpenALSoundPlayer extends SoundPlayer
     @Override
     protected Frob loop (String pkgPath, String key, float pan)
     {
-        final float volume = getClipVolume();
         final SoundGrabber loader = new SoundGrabber(pkgPath, key) {
             @Override
             protected void soundLoaded () {
-                sound.setGain(volume);
                 sound.loop(true);
             }};
         getSoundQueue().postRunnable(loader);
@@ -274,7 +272,7 @@ public class OpenALSoundPlayer extends SoundPlayer
     @Override
     public void play (String pkgPath, String key, float pan)
     {
-        play(pkgPath, key, pan, getClipVolume());
+        play(pkgPath, key, pan, 1f);
     }
 
     public void play (String pkgPath, String key, float pan, final float gain)
diff --git a/src/java/com/threerings/openal/Sound.java b/src/java/com/threerings/openal/Sound.java
index c29ed4cd..4a811ae2 100644
--- a/src/java/com/threerings/openal/Sound.java
+++ b/src/java/com/threerings/openal/Sound.java
@@ -85,12 +85,12 @@ public class Sound
     }
 
     /**
-     * Sets the gain of the sound.
+     * Sets the gain of the sound (which will be multiplied by the base gain).
      */
     public void setGain (float gain)
     {
         if (_source != null) {
-            _source.setGain(gain);
+            _source.setGain(gain * _group.getBaseGain());
         }
         _gain = gain;
     }