Choose a random sound from multi-option sounds in the SoundLoader when told to

play a particular key.
Set the gain on streams before returning them in addition to during each update.



git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@644 ed5b42cb-e716-0410-a449-f6a68f950b19

src/java/com/threerings/media/sound/SoundLoader.java

@@ -12,7 +12,6 @@ import org.apache.commons.io.IOUtils;
 import com.samskivert.util.Config;
 import com.samskivert.util.ConfigUtil;
 import com.samskivert.util.LRUHashMap;
-
 import com.threerings.resource.ResourceManager;
 
 /**
@@ -34,22 +33,38 @@ public class SoundLoader
     public byte[][] load (String packagePath, String key)
         throws IOException
     {
-        // otherwise, randomize between all available sounds
-        Config c = getConfig(packagePath);
-        String[] names = c.getValue(key, (String[])null);
-        if (names == null) {
+        String[] paths = getPaths(packagePath, key);
+        if (paths == null) {
             log.warning("No such sound", "key", key);
             return null;
         }
 
-        byte[][] data = new byte[names.length][];
-        String bundle = c.getValue("bundle", (String)null);
-        for (int ii = 0; ii < names.length; ii++) {
-            data[ii] = loadClipData(bundle, names[ii]);
+        byte[][] data = new byte[paths.length][];
+        String bundle = getBundle(packagePath);
+        for (int ii = 0; ii < paths.length; ii++) {
+            data[ii] = loadClipData(bundle, paths[ii]);
         }
         return data;
     }
 
+    /**
+     * Returns the paths to sounds for <code>key</code> in the given package. Returns null if no
+     * sounds are found.
+     */
+    public String[] getPaths (String packagePath, String key)
+    {
+        return getConfig(packagePath).getValue(key, (String[])null);
+    }
+
+
+    /**
+     * Returns the bundle for sounds in the given package.  Returns null if the bundle isn't found.
+     */
+    public String getBundle (String packagePath)
+    {
+        return getConfig(packagePath).getValue("bundle", (String)null);
+    }
+
     /**
      * Attempts to load a sound stream from the given path from the given bundle and from the
      * classpath. If nothing is found, a FileNotFoundException is thrown.