From 4f07786449df89e15465180dbb934b2ee53152f9 Mon Sep 17 00:00:00 2001
From: Kusal Ekanayake <kre39@uclive.ac.nz>
Date: Mon, 11 Sep 2017 14:21:47 +1200
Subject: [PATCH 1/2] Changed the hover noise from a mediaplayer to an audio
 clip.

Fixes #50

#story[1249]
---
 src/main/java/seng302/utilities/Sounds.java | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/seng302/utilities/Sounds.java b/src/main/java/seng302/utilities/Sounds.java
index 9fe962b0..29cee5ec 100644
--- a/src/main/java/seng302/utilities/Sounds.java
+++ b/src/main/java/seng302/utilities/Sounds.java
@@ -1,5 +1,6 @@
 package seng302.utilities;
 
+import javafx.scene.media.AudioClip;
 import javafx.scene.media.Media;
 import javafx.scene.media.MediaPlayer;
 
@@ -13,6 +14,7 @@ public class Sounds {
     private static MediaPlayer musicPlayer;
     private static MediaPlayer soundEffect;
     private static MediaPlayer soundPlayer;
+    private static AudioClip hoverSoundPlayer = new AudioClip(Sounds.class.getClassLoader().getResource("sounds/sound-over.wav").toExternalForm());;
 
     private static boolean musicMuted = false;
     private static boolean soundEffectsMuted = false;
@@ -72,6 +74,7 @@ public class Sounds {
         Media raceMusic = new Media(Sounds.class.getClassLoader().getResource("sounds/Music-loop-120-bpm.mp3").toString());
         musicPlayer = new MediaPlayer(raceMusic);
         musicPlayer.setCycleCount(MediaPlayer.INDEFINITE);
+        musicPlayer.setVolume(0.3);
         musicPlayer.play();
         raceMusic = new Media(Sounds.class.getClassLoader().getResource("sounds/Sounds-of-the-ocean.mp3").toString());
         soundEffect = new MediaPlayer(raceMusic);
@@ -87,6 +90,7 @@ public class Sounds {
             Sounds.class.getClassLoader().getResource("sounds/Elevator-music.mp3").toString());
         musicPlayer = new MediaPlayer(menuMusic);
         musicPlayer.setCycleCount(MediaPlayer.INDEFINITE);
+        musicPlayer.setVolume(0.3);
         musicPlayer.play();
     }
 
@@ -95,6 +99,7 @@ public class Sounds {
         Media finishMusic = new Media(Sounds.class.getClassLoader().getResource("sounds/Happy-birthday-song.mp3").toString());
         musicPlayer = new MediaPlayer(finishMusic);
         musicPlayer.setCycleCount(MediaPlayer.INDEFINITE);
+        musicPlayer.setVolume(0.3);
         musicPlayer.play();
         musicPlayer.setMute(musicMuted);
     }
@@ -105,6 +110,7 @@ public class Sounds {
                 Sounds.class.getClassLoader().getResource("sounds/Button-click-sound.mp3")
                     .toString());
             soundPlayer = new MediaPlayer(buttonClick);
+            soundPlayer.setVolume(0.5);
             soundPlayer.play();
             soundPlayer.setMute(soundEffectsMuted);
         }
@@ -123,7 +129,6 @@ public class Sounds {
 
     public static void playMarkRoundingSound() {
         if (!soundEffectsMuted) {
-
             Media markRoundingSound = new Media(
                 Sounds.class.getClassLoader().getResource("sounds/sms-tone.mp3").toString());
             soundPlayer = new MediaPlayer(markRoundingSound);
@@ -133,7 +138,6 @@ public class Sounds {
 
     public static void playCapGunSound() {
         if (!soundEffectsMuted) {
-
             Media gunSound = new Media(
                 Sounds.class.getClassLoader().getResource("sounds/Gunshot-sound.mp3").toString());
             soundPlayer = new MediaPlayer(gunSound);
@@ -153,9 +157,8 @@ public class Sounds {
 
     public static void playHoverSound() {
         if (!soundEffectsMuted) {
-            Media hoverSound = new Media(Sounds.class.getClassLoader().getResource("sounds/sound-over.wav").toString());
-        soundPlayer = new MediaPlayer(hoverSound);
-        soundPlayer.play();
+            hoverSoundPlayer.setVolume(2.5);
+            hoverSoundPlayer.play();
         }
     }
 

From caf910c4c5ba1f3ef502c95f89043feb66fbac25 Mon Sep 17 00:00:00 2001
From: Kusal Ekanayake <kre39@uclive.ac.nz>
Date: Mon, 11 Sep 2017 14:39:40 +1200
Subject: [PATCH 2/2] Adjusted volume to make more balanced.

#story[1249]
---
 src/main/java/seng302/utilities/Sounds.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/seng302/utilities/Sounds.java b/src/main/java/seng302/utilities/Sounds.java
index 29cee5ec..a7cdbd70 100644
--- a/src/main/java/seng302/utilities/Sounds.java
+++ b/src/main/java/seng302/utilities/Sounds.java
@@ -79,7 +79,7 @@ public class Sounds {
         raceMusic = new Media(Sounds.class.getClassLoader().getResource("sounds/Sounds-of-the-ocean.mp3").toString());
         soundEffect = new MediaPlayer(raceMusic);
         soundEffect.setCycleCount(MediaPlayer.INDEFINITE);
-//        soundEffect.setVolume(0.3);
+        soundEffect.setVolume(0.3);
         soundEffect.play();
         musicPlayer.setMute(musicMuted);
         soundEffect.setMute(soundEffectsMuted);
@@ -122,6 +122,7 @@ public class Sounds {
                 Sounds.class.getClassLoader().getResource("sounds/Sms-notification.mp3")
                     .toString());
             soundPlayer = new MediaPlayer(finishSound);
+            soundPlayer.setVolume(0.5);
             soundPlayer.play();
         }
     }