From a14862a6bc0dbb1ae78cd4e2e4795d4194772583 Mon Sep 17 00:00:00 2001
From: sowgro <tpoke.ferrari@gmail.com>
Date: Mon, 5 Jun 2023 00:34:16 -0400
Subject: rewrote everything related to sound

---
 src/main/SoundController.java | 66 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 66 insertions(+)
 create mode 100644 src/main/SoundController.java

(limited to 'src/main/SoundController.java')

diff --git a/src/main/SoundController.java b/src/main/SoundController.java
new file mode 100644
index 0000000..55d40f4
--- /dev/null
+++ b/src/main/SoundController.java
@@ -0,0 +1,66 @@
+package main;
+
+import java.io.File;
+import java.util.HashMap;
+
+import gui.Driver;
+import javafx.scene.media.Media;
+import javafx.scene.media.MediaPlayer;
+
+public class SoundController 
+{
+    public MediaPlayer songMediaPlayer;
+    public MediaPlayer sfxMediaPlayer;
+    private HashMap<String,File> presets = new HashMap<>();
+    private File mainMenuSong = new File("src/assets/MenuMusicPlaceholder.wav");
+
+    public SoundController() 
+    {
+        presets.put("forward", new File("src/assets/MenuForward.wav"));
+        presets.put("backward", new File("src/assets/MenuBackward.wav"));
+        presets.put("hit", new File("src/assets/Hitsound.wav"));
+        presets.put("miss", new File("src/assets/Miss.wav"));
+        playMenuSong();
+    }
+
+    public void playSong(File songFile)
+    {
+        if (songMediaPlayer != null)
+        {
+            songMediaPlayer.stop();
+        }
+        Media song = new Media(songFile.toURI().toString());
+        songMediaPlayer = new MediaPlayer(song);
+        songMediaPlayer.volumeProperty().bind(Driver.settingsController.musicVol);
+        songMediaPlayer.play();
+    }
+
+    private void playMenuSong()
+    {
+        playSong(mainMenuSong);
+        songMediaPlayer.setCycleCount(MediaPlayer.INDEFINITE);
+        songMediaPlayer.play();
+    }
+
+    public void endSong()
+    {
+        playMenuSong();
+    }
+
+    public void playSfx(File sfxFile) 
+    {
+        if (sfxMediaPlayer != null)
+        {
+            sfxMediaPlayer.stop();
+        }
+        Media sound = new Media(sfxFile.toURI().toString());
+        sfxMediaPlayer = new MediaPlayer(sound);
+        sfxMediaPlayer.volumeProperty().bind(Driver.settingsController.effectsVol); //not working yet
+        sfxMediaPlayer.play();
+    }
+
+    public void playSfx(String preset)
+    {
+        playSfx(presets.get(preset));
+    }
+}
\ No newline at end of file
-- 
cgit v1.2.3


From e444503c77120908126de325d86b32bd3fb327e0 Mon Sep 17 00:00:00 2001
From: sowgro <tpoke.ferrari@gmail.com>
Date: Mon, 5 Jun 2023 08:27:43 -0400
Subject: seperate end song and start menu song

---
 src/main/SoundController.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/main/SoundController.java')

diff --git a/src/main/SoundController.java b/src/main/SoundController.java
index 55d40f4..0d2061c 100644
--- a/src/main/SoundController.java
+++ b/src/main/SoundController.java
@@ -35,7 +35,7 @@ public class SoundController
         songMediaPlayer.play();
     }
 
-    private void playMenuSong()
+    public void playMenuSong()
     {
         playSong(mainMenuSong);
         songMediaPlayer.setCycleCount(MediaPlayer.INDEFINITE);
@@ -44,7 +44,10 @@ public class SoundController
 
     public void endSong()
     {
-        playMenuSong();
+        if (songMediaPlayer != null)
+        {
+            songMediaPlayer.stop();
+        }
     }
 
     public void playSfx(File sfxFile) 
-- 
cgit v1.2.3