Changes to implement the sound control.

Foo-Manroot · Jun 17, 2016 · 6c95155 · 6c95155
1 parent 3d77dea
commit 6c95155
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 7 deletions.
diff --git a/Time-Wanderer/src/misc/SoundInterface.java b/Time-Wanderer/src/misc/SoundInterface.java
@@ -1,15 +1,12 @@
 package misc;
 
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import main.MainClass;
 import org.lwjgl.input.Mouse;
 import org.newdawn.slick.GameContainer;
 import org.newdawn.slick.Graphics;
 import org.newdawn.slick.Image;
 import org.newdawn.slick.Input;
 import org.newdawn.slick.SlickException;
-import org.newdawn.slick.geom.Rectangle;
 import org.newdawn.slick.geom.Vector2f;
 import utils.NumberUtils;
 
@@ -88,7 +85,7 @@ public SoundInterface () {
     }
 
     /**
-     * Initialices the arrays with the images ({@code musicImages} and 
+     * Initializes the arrays with the images ({@code musicImages} and 
      * {@code effectsImages}) 
      */
     private void initImages () {
@@ -99,7 +96,7 @@ private void initImages () {
     }
 
     /**
-     * Inititalices the images array for the music icon.
+     * Initializes the images array for the music icon.
      */
     private void initMusicImages () {
 
@@ -169,7 +166,7 @@ private void initMusicImages () {
     }
 
     /**
-     * Inititalices the images array for the music icon.
+     * Initializes the images array for the music icon.
      */
     private void initEffectsImages () {
 

diff --git a/Time-Wanderer/src/sound/Jukebox.java b/Time-Wanderer/src/sound/Jukebox.java
@@ -70,8 +70,14 @@ public void play(Playlist sound, boolean finite) {
         String path;
         Playable p;
 
+        /* Checks if the sound can be played */
+        if (!check(sound)) {
+
+            return;
+        }
+
         waitUntilClearIfStopped();
-
+        
         if (sound != null) {
 
             switch (sound) {
@@ -198,6 +204,12 @@ public void play(Playlist sound, boolean finite) {
     public void play(Playlist sound, boolean finite, float decibels) {
         String path;
         Playable p;
+
+        /* Checks if the sound can be played */
+        if (!check(sound)) {
+
+            return;
+        }
 
         waitUntilClearIfStopped();
 
@@ -327,6 +339,12 @@ public void play(Playlist sound, boolean finite, float decibels) {
     public void play(Playlist sound, int start, int end) {
         String path;
         Playable p;
+
+        /* Checks if the sound can be played */
+        if (!check(sound)) {
+
+            return;
+        }
 
         waitUntilClearIfStopped();
 
@@ -458,6 +476,12 @@ public void play(Playlist sound, int start, int end) {
     public void play(Playlist sound, int start, int end, float decibels) {
         String path;
         Playable p;
+
+        /* Checks if the sound can be played */
+        if (!check(sound)) {
+
+            return;
+        }
 
         waitUntilClearIfStopped();
 
@@ -579,6 +603,32 @@ public void play(Playlist sound, int start, int end, float decibels) {
         }
 
     }
+
+    /**
+     * Checks if that sound can be played (depends on the attributes 
+     * {@code musicON} and {@code effectsON}).
+     */
+    private boolean check (Playlist sound) {
+
+        /* Checks if it's a music clip and can be played */
+        if (musicON && (
+                sound.equals(Playlist.GAME_OVER) ||
+                sound.equals(Playlist.GUITAR_CONCERT) ||
+                sound.equals(Playlist.MEMORIES) ||
+                sound.equals(Playlist.THE_LURKING_BEAST)
+            )) {
+
+            return true;
+        }
+
+        /* Checks if it's an effect clip and can be played */
+        return effectsON && !(
+                sound.equals(Playlist.GAME_OVER) &&
+                sound.equals(Playlist.GUITAR_CONCERT) &&
+                sound.equals(Playlist.MEMORIES) &&
+                sound.equals(Playlist.THE_LURKING_BEAST)
+                );
+    }
 
     /**
      * Awaits until the clips being played would terminate or until the time