Converts the project to use a licensed WAVE file reader.

This is easier to distribute.

interface/src/main/java/edu/regis/universeplayer/localPlayer/AudioFile.java

@@ -7,8 +7,7 @@ package edu.regis.universeplayer.localPlayer;
 import java.io.IOException;
 import java.io.InputStream;
 
-import wave.WavHeader;
-import wave.WavHeaderReader;
+import com.intervigil.wave.WaveReader;
 
 /**
  * Contains information on a WAV audio file, along with a reference to the stream of raw data.
@@ -20,7 +19,7 @@ public class AudioFile extends InputStream
     /**
      * Contains header information.
      */
-    private final WavHeaderReader header;
+    private final WaveReader header;
     /**
      * Contains a link to the process reading the audio file.
      */
@@ -40,13 +39,13 @@ public class AudioFile extends InputStream
     {
         this.process = stream;
         this.stream = stream.getInputStream();
-        this.header = new WavHeaderReader(this.stream);
-        this.header.read();
+        this.header = new WaveReader(this.stream);
+        this.header.openWave();
     }
 
-    public WavHeader getHeader()
+    public WaveReader getHeader()
     {
-        return this.header.getHeader();
+        return this.header;
     }
 
     /**
@@ -55,7 +54,11 @@ public class AudioFile extends InputStream
      */
     public byte[] getByteStream()
     {
-        return this.header.getBuf();
+        try {
+            return this.header.getHeaderBytes();
+        } catch (IOException e) {
+            throw new RuntimeException("Could not recreate header");
+        }
     }
 
     @Override
@@ -69,4 +72,10 @@ public class AudioFile extends InputStream
     {
         return this.process.isAlive() ? Integer.MAX_VALUE : super.available();
     }
+
+    @Override
+    public void close() throws IOException {
+        super.close();
+        this.header.closeWaveFile();
+    }
 }

interface/src/main/java/edu/regis/universeplayer/localPlayer/Player.java

@@ -3,6 +3,8 @@
  */
 package edu.regis.universeplayer.localPlayer;
 
+import com.intervigil.wave.WaveReader;
+
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
@@ -10,8 +12,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.LinkedList;
 
-import wave.WavHeader;
-
 /**
  * This allows for the control of playback of files on the local file system
  *
@@ -36,11 +36,11 @@ public class Player
      */
     public void setCurrentFile(AudioFile file)
     {
-        WavHeader header = file.getHeader();
+        WaveReader header = file.getHeader();
         this.currentFile = file;
         // TODO - Ensure that bytes per sample and bits per sample don't bother things
-        this.currentId = this.setCurrentFile(this.currentFile, header.getNumChannels(), header
-                .getBitsPerSample(), header.getSampleRate());
+        this.currentId = this.setCurrentFile(this.currentFile, (short) header.getChannels(), (short) header
+                .getPcmFormat(), header.getSampleRate());
     }
 
     /**