Look at the big smart programmer using the library code instead of rolling his own, hacked-up shit

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

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

@@ -5,15 +5,9 @@ import static com.threerings.media.Log.log;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
-import java.nio.ByteBuffer;
 import java.util.Map;
 
-import javax.sound.sampled.AudioFormat;
+import org.lwjgl.util.WaveData;
-import javax.sound.sampled.AudioInputStream;
-import javax.sound.sampled.AudioSystem;
-import javax.sound.sampled.UnsupportedAudioFileException;
-
-import org.lwjgl.openal.AL10;
 
 import com.google.common.collect.Maps;
 
@@ -44,41 +38,9 @@ public class OpenALSoundManager extends AbstractSoundManager
     public Clip loadClip (String path)
         throws IOException
     {
-        byte[] data;
-        AudioInputStream in;
         int pkgEnd = path.lastIndexOf("/") + 1;
-        try {
+        byte[] data = _loader.load(path.substring(0, pkgEnd), path.substring(pkgEnd))[0];
-            data = _loader.load(path.substring(0, pkgEnd), path.substring(pkgEnd))[0];
+        return new Clip(WaveData.create(new ByteArrayInputStream(data)));
-            in = AudioSystem.getAudioInputStream(new ByteArrayInputStream(data));
-        } catch (UnsupportedAudioFileException e) {
-            throw new RuntimeException("Unsupported format: " + path, e);
-        }
-        AudioFormat format = in.getFormat();
-        int alformat = 0;
-        if (format.getChannels() == 1) {
-            if (format.getSampleSizeInBits() == 8) {
-                alformat = AL10.AL_FORMAT_MONO8;
-            } else if (format.getSampleSizeInBits() == 16) {
-                alformat = AL10.AL_FORMAT_MONO16;
-            } else {
-                throw new IOException("Illegal audio sample size: " + path);
-            }
-        } else if (format.getChannels() == 2) {
-            if (format.getSampleSizeInBits() == 8) {
-                alformat = AL10.AL_FORMAT_STEREO8;
-            } else if (format.getSampleSizeInBits() == 16) {
-                alformat = AL10.AL_FORMAT_STEREO16;
-            } else {
-                throw new IOException("Illegal audio sample size: " + path);
-            }
-        } else {
-            throw new IOException("Only mono and stereo are supported: " + path);
-        }
-        Clip clip = new Clip();
-        clip.format = alformat;
-        clip.data = ByteBuffer.wrap(data);
-        clip.frequency = (int)format.getFrameRate();
-        return clip;
     }
 
     @Override

src/java/com/threerings/openal/Clip.java

@@ -24,12 +24,26 @@ package com.threerings.openal;
 import java.nio.ByteBuffer;
 
 import org.lwjgl.openal.AL10;
+import org.lwjgl.util.WaveData;
 
 /**
  * Contains data for a single sampled sound.
  */
 public class Clip
 {
+    public Clip ()
+    {}
+
+    /**
+     * Fills in a clip from the given wave data.
+     */
+    public Clip (WaveData data)
+    {
+        format = data.format;
+        frequency = data.samplerate;
+        this.data = data.data;
+    }
+
     /** The OpenAL format of this clip: {@link AL10#AL_FORMAT_MONO8}, etc. */
     public int format;
 

src/java/com/threerings/openal/WaveDataClipProvider.java

@@ -31,16 +31,13 @@ import org.lwjgl.util.WaveData;
  */
 public class WaveDataClipProvider implements ClipProvider
 {
-    public Clip loadClip (String path) throws IOException
+    public Clip loadClip (String path)
+        throws IOException
     {
-        Clip clip = new Clip();
         WaveData file = WaveData.create(path);
         if (file == null) {
             throw new IOException("Error loading " + path);
         }
-        clip.format = file.format;
+        return new Clip(file);
-        clip.frequency = file.samplerate;
-        clip.data = file.data;
-        return clip;
     }
 }