Merge pull request #79 from jamesrcounts/master

Use URLs for sound files and include sounds in JAR

Author: lynnlangit

.gitignore

@@ -17,3 +17,5 @@ TeachingKidsProgramming.Source.Java.iml
 .class.virtual_proctor.txt
 
 .virtual_proctor.txt
+*_BACKUP_*
+*_LOCAL_*

build.xml

@@ -41,6 +41,7 @@
 
 	<target name="stagesrc" description="Copy source files to temp build directory.">
 		<mkdir dir="${build}/src" />
+		<mkdir dir="${build}/soundFiles"/>
 		<copy todir="${build}/src">
 			<fileset dir="${src}" includes="${targetJavaClass}/*.java">
 				<exclude name="**/tests/**" if="excludeTests" />
@@ -49,9 +50,11 @@
 		<copy todir="${build}">
 			<fileset dir="${rsrc}" includes="*.png" />
 			<fileset dir="${rsrc}" includes="*.rtf" />
-			<!--need to fix to add .wav files at /soundFiles <fileset dir="${rsrc}" includes="*.wav" />-->
 			<!--need to fix to add .png files at /icons /> -->
 		</copy>
+		<copy toDir="${build}/soundFiles">
+			<fileset dir="${rsrc}/soundFiles" includes="*.wav" />
+		</copy>
 		<copy todir="${build}/src/org/teachingextensions/logo">
 			<fileset dir="${rsrc}" includes="*.png" />
 		</copy>

src/main/java/org/teachingextensions/logo/Sound.java

@@ -1,7 +1,6 @@
 package org.teachingextensions.logo;
 
 import java.awt.Toolkit;
-import java.io.File;
 import java.net.URL;
 
 import javax.sound.sampled.AudioInputStream;
@@ -29,7 +28,7 @@ public enum TKPSound {
     Ahem, Applause, BrainIsGone, CatMeow, Cheering, Crickets, DoctorMccoy, Fanfare, FargoYah, Gong, LLCoolJYaKnow,
     LosingPower, Malfunction, Pizza, RunAway, SheerIgnorance, SoBeIt, StrangePerson, Stubborn, Yahoo, Yay
   }
-  private String soundFilename = null;
+  private URL soundUrl = null;
   /**
    * Sets a sound that you can play through your speakers. 
    * Use a TKPSound (there is a list)<br>
@@ -44,8 +43,7 @@ public synchronized void setSound(TKPSound mySound)
       resource = this.getClass().getClassLoader().getResource(sound);
     }
     if (resource == null) { throw new IllegalStateException("Could not get TKPSound: " + sound); }
-    this.soundFilename = resource.toString();
-    this.soundFilename = this.soundFilename.replace("file:", "");
+    this.soundUrl = resource;
   }
   /**
    * Plays a TKPSound through your speakers. 
@@ -54,7 +52,7 @@ public synchronized void setSound(TKPSound mySound)
    */
   public synchronized void playSound()
   {
-    final String sound = this.soundFilename;
+    final URL sound = this.soundUrl;
     new Thread(new Runnable()
     {
       @Override
@@ -63,7 +61,7 @@ public void run()
         try
         {
           Clip clip = AudioSystem.getClip();
-          AudioInputStream inputStream = AudioSystem.getAudioInputStream(new File(sound));
+          AudioInputStream inputStream = AudioSystem.getAudioInputStream(sound);
           clip.open(inputStream);
           clip.start();
         }