Audio class restructured

Author: redomar

build.gradle

@@ -6,11 +6,11 @@ apply plugin: 'java'
 
 sourceSets{
     main{
-        java.srcDir 'src'
-        resources.srcDir 'res'
+        java.srcDirs = ['src']
+        resources.srcDirs = ['res']
     }
     test{
-        java.srcDir 'test'
+        java.srcDirs = ['test']
     }
 }
 

res/music/small.mp3

@@ -1,6 +1,7 @@
 package com.redomar.game.audio;
 
 import javax.sound.sampled.*;
+import java.io.File;
 
 
 public class AudioHandler {
@@ -9,6 +10,23 @@ public class AudioHandler {
 	private boolean active = false;
 
 	public AudioHandler(String path){
+		initiate(path);
+	}
+
+	public AudioHandler(File file){
+		try {
+			if(file.toString() != ""){
+				initiate(file.toString());
+			} else {
+				throw new NullPointerException();
+			}
+		} catch (NullPointerException e){
+			System.err.println("Destination Cannot be empty");
+			throw e;
+		}
+	}
+
+	private void initiate(String path){
 		try{
 			AudioInputStream audioInputStream = AudioSystem.getAudioInputStream(getClass().getResourceAsStream(path));
 			AudioFormat baseformat = audioInputStream.getFormat();

res/sfx/smallProjectile.wav

@@ -2,7 +2,6 @@
 
 import com.redomar.game.Game;
 import com.redomar.game.InputHandler;
-import com.redomar.game.audio.AudioEffect;
 import com.redomar.game.entities.efx.Swim;
 import com.redomar.game.entities.projectiles.Medium;
 import com.redomar.game.entities.projectiles.Projectile;

src/com/redomar/game/audio/AudioEffect.java

@@ -1,13 +1,17 @@
 package com.redomar.game.entities.projectiles;
 
-import com.redomar.game.audio.AudioEffect;
+import com.redomar.game.audio.AudioHandler;
 import com.redomar.game.gfx.Colours;
 import com.redomar.game.gfx.Screen;
 import com.redomar.game.level.LevelHandler;
 
+import java.io.File;
+
 public class Small extends Projectile{
 
 	public static final int FIRE_RATE = 10;
+	private static final File smallShot = new File("/music/small.mp3");
+	private static AudioHandler smallSound;
 
 	public Small(LevelHandler level, int x, int y, double dir) {
 		super(level, x, y, dir);
@@ -18,10 +22,8 @@ public Small(LevelHandler level, int x, int y, double dir) {
 		nx = speed * Math.cos(angle);
 		ny = speed * Math.sin(angle);
 
-		//smallSound.setVolume(-15);
-
-		AudioEffect smallSound;
-		smallSound = new AudioEffect("/sfx/smallProjectile.wav");
+		smallSound = new AudioHandler(smallShot);
+		smallSound.setVolume(-15);
 		smallSound.play();
 	}
 

src/com/redomar/game/audio/AudioHandler.java

@@ -1,9 +1,7 @@
 package com.redomar.game.menu;
 
 import com.redomar.game.Game;
-import com.redomar.game.audio.AudioEffect;
 import com.redomar.game.audio.AudioHandler;
-import com.redomar.game.entities.Player;
 import com.redomar.game.lib.Font;
 import com.redomar.game.lib.Mouse;
 import com.thehowtotutorial.splashscreen.JSplash;
@@ -24,7 +22,7 @@ public class Menu implements Runnable {
 	private static final String NAME = "Menu";
 
 	private static boolean running = false;
-	private static boolean selectedStart = false;
+	private static boolean selectedStart = true;
 	private static boolean selectedExit = false;
 	private static boolean gameOver = false;
 
@@ -49,13 +47,11 @@ public static void play() {
 			splash.toFront();
 			splash.requestFocus();
 			splash.splashOn();
-			splash.setProgress(10, "Initializing SFX");
-
-			splash.setProgress(30, "Loading Music");
+			splash.setProgress(20, "Loading Music");
 			Game.setBackgroundMusic(new AudioHandler("/music/Towards The End.mp3"));
-			splash.setProgress(40, "Setting Volume");
+			splash.setProgress(50, "Setting Volume");
 			Game.getBackgroundMusic().setVolume(-20);
-			splash.setProgress(50, "Acquiring data: Multiplayer");
+			splash.setProgress(60, "Acquiring data: Multiplayer");
 			Thread.sleep(125);
 			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
 			String multiMsg = "Sorry but multiplayer has been disabled on this version.\nIf you would like multiplayer checkout Alpha 1.6";

src/com/redomar/game/entities/Player.java

@@ -19,4 +19,10 @@ public void bgMusicExists() throws Exception {
 		assertTrue(sfx.exists());
 	}
 
+	@Test(expected = NullPointerException.class)
+	public void expectReturnExceptionFileEmptyDir(){
+		File empty = new File("");
+		AudioHandler audio = new AudioHandler(empty);
+	}
+
 }