From 9feb42ff3f5c615a609c0b156090c08326c56565 Mon Sep 17 00:00:00 2001
From: shebang <timbo@c-maxx.net>
Date: Thu, 18 Dec 2014 14:30:34 +0100
Subject: [PATCH] added Classloader without exception handling to audio

---
 HeatUp/src/de/heatup/audio/AudioFiles.java  |  2 +-
 HeatUp/src/de/heatup/audio/AudioPlayer.java | 20 +++++++++++++++-----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/HeatUp/src/de/heatup/audio/AudioFiles.java b/HeatUp/src/de/heatup/audio/AudioFiles.java
index 19505f9..1f68fb4 100644
--- a/HeatUp/src/de/heatup/audio/AudioFiles.java
+++ b/HeatUp/src/de/heatup/audio/AudioFiles.java
@@ -3,7 +3,7 @@ package de.heatup.audio;
 public class AudioFiles {
 	
 	//base path
-	private static final String basePath = "src/de/heatup/resources/audio/";
+	private static final String basePath = "de/heatup/resources/audio/";
 	
 	//sound files
 	private String Invaders;
diff --git a/HeatUp/src/de/heatup/audio/AudioPlayer.java b/HeatUp/src/de/heatup/audio/AudioPlayer.java
index 5e13e2a..fe02cd4 100644
--- a/HeatUp/src/de/heatup/audio/AudioPlayer.java
+++ b/HeatUp/src/de/heatup/audio/AudioPlayer.java
@@ -10,7 +10,11 @@ import javax.sound.sampled.LineListener;
 
 public class AudioPlayer {
 	
-	public AudioPlayer() {}
+	private ClassLoader cl;
+	
+	public AudioPlayer() {
+		this.cl = Thread.currentThread().getContextClassLoader();
+	}
 	
 	/** plays a file once */
 	public void play(String file) {		
@@ -26,13 +30,17 @@ public class AudioPlayer {
 				}
 			});
 			
+			/**
 			File f = new File(file);
 			if(!f.exists()) {
 				System.out.println("File not found: " + f.getAbsolutePath());
 				return;
-			}
+			}			
+			*/
 			
-			clip.open(AudioSystem.getAudioInputStream(f));
+			
+			
+			clip.open(AudioSystem.getAudioInputStream(cl.getResourceAsStream(file)));
 			clip.start();
 			
 		} catch (Exception e) {
@@ -54,13 +62,15 @@ public class AudioPlayer {
 				}
 			});
 			
+			/**
 			File f = new File(file);
 			if(!f.exists()) {
 				System.out.println("File not found: " + f.getAbsolutePath());
 				return;
-			}
+			}			
+			*/
 			
-			clip.open(AudioSystem.getAudioInputStream(f));
+			clip.open(AudioSystem.getAudioInputStream(cl.getResourceAsStream(file)));
 			clip.loop(clip.LOOP_CONTINUOUSLY);
 			
 		} catch(Exception e) {