From 60d2febeda55d80d541452703fa9aa41df38574f Mon Sep 17 00:00:00 2001
From: Charlie Groves <charlie@threerings.net>
Date: Tue, 26 Aug 2008 22:17:11 +0000
Subject: [PATCH] Allow streams and sounds to have their gain controlled
 individually as well as from the overall control

git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@649 ed5b42cb-e716-0410-a449-f6a68f950b19
---
 .../threerings/openal/OpenALSoundPlayer.java  | 27 ++++++++++++++-----
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/java/com/threerings/openal/OpenALSoundPlayer.java b/src/java/com/threerings/openal/OpenALSoundPlayer.java
index 585fc72a..162ccf4c 100644
--- a/src/java/com/threerings/openal/OpenALSoundPlayer.java
+++ b/src/java/com/threerings/openal/OpenALSoundPlayer.java
@@ -174,14 +174,19 @@ public class OpenALSoundPlayer extends SoundPlayer
         getSoundQueue().postRunnable(new Runnable(){
             public void run () {
                 Stream s = new Stream(_alSoundManager) {
-
                     @Override
                     protected void update (float time) {
                         super.update(time);
                         if (_state != AL10.AL_PLAYING) {
                             return;
                         }
-                        setGain(_clipVol);
+                        super.setGain(_clipVol * _streamGain);
+                    }
+
+                    @Override
+                    public void setGain (float gain) {
+                        _streamGain = gain;
+                        super.setGain(_clipVol * _streamGain);
                     }
 
                     @Override
@@ -203,9 +208,12 @@ public class OpenALSoundPlayer extends SoundPlayer
                             read += dec.read(buf);
                         }
                         return read;
-                    }};
-                    s.setGain(_clipVol);
-                    listener.requestCompleted(s);
+                    }
+
+                    protected float _streamGain = 1F;
+                };
+                s.setGain(_clipVol);
+                listener.requestCompleted(s);
             }});
     }
 
@@ -243,12 +251,19 @@ public class OpenALSoundPlayer extends SoundPlayer
 
     @Override
     public void play (String pkgPath, String key, float pan)
+    {
+        play(pkgPath, key, pan, getClipVolume());
+    }
+
+    public void play (String pkgPath, String key, float pan, final float gain)
     {
         getSoundQueue().postRunnable(new SoundGrabber(pkgPath, key) {
             @Override
             protected void soundLoaded () {
+                sound.setGain(gain);
                 sound.play(true);
-            }});
+            }
+        });
     }
 
     @Override