Merge branch 'main' of https://gitlab.sowgro.net/guitarheros/guitarhero

8 files changed, 25 insertions, 36 deletions

diff --git a/src/gui/Driver.java b/src/gui/Driver.java
index c708d80..00a71cf 100644
--- a/src/gui/Driver.java
+++ b/src/gui/Driver.java
@@ -21,8 +21,7 @@ import javafx.stage.Stage;
 import javafx.util.Duration;
 import main.LevelController;
 import main.SettingsController;
-import sound.AudioFilePlayer;
-import sound.ShortAudioPlayer;
+import main.SoundController;
 
 import java.nio.file.Paths;
 
@@ -40,15 +39,12 @@ import gameplay.SongPlayer;
 
 
 public class Driver extends Application 
-{
-    public static ShortAudioPlayer menuFx = new ShortAudioPlayer();
-
-    public static MediaPlayer mediaPlayer;
-    
+{    
     public static Stage primaryStage;
     static Pane primaryPane = new Pane();
 
     public static SettingsController settingsController = new SettingsController();
+    public static SoundController soundController = new SoundController();
     public static LevelController levelController = new LevelController();
     public static DebugMenu debug = new DebugMenu();
 
@@ -67,15 +63,11 @@ public class Driver extends Application
     @Override
     public void start(Stage newPrimaryStage)
     {   
-        Media song = new Media(Paths.get("src/assets/MenuMusicPlaceholder.wav").toUri().toString());
-        mediaPlayer = new MediaPlayer(song);
-        new MediaView(mediaPlayer);
-        mediaPlayer.setCycleCount(Integer.MAX_VALUE);
-        mediaPlayer.play();
+
         
         primaryStage = newPrimaryStage;
 
-        Scene primaryScene = new Scene(primaryPane, 800, 600);
+        Scene primaryScene = new Scene(primaryPane, 800,600);
         primaryScene.getStylesheets().add("gui/style.css");
 
         primaryStage.setScene(primaryScene);
diff --git a/src/gui/GameOver.java b/src/gui/GameOver.java
index e504437..f5b46ec 100644
--- a/src/gui/GameOver.java
+++ b/src/gui/GameOver.java
@@ -70,7 +70,7 @@ public class GameOver extends Pane
         save.setOnAction(new EventHandler<ActionEvent>() { //this is the same as the "e ->" thing but it allows more than one line to be added 
             @Override
             public void handle(ActionEvent event) {
-                Driver.menuFx.play("src/assets/MenuForward.wav");
+                Driver.soundController.playSfx("forward");
                 save.setDisable(true);
                 name.setDisable(true);
                 diff.addToLeaderboard(name.getText(), score2);
@@ -91,14 +91,14 @@ public class GameOver extends Pane
         Button exit = new Button();
         exit.setText("Back");
         exit.setOnAction(e -> {
-            Driver.menuFx.play("src/assets/MenuBackward.wav");
+            Driver.soundController.playSfx("backward");
             Driver.setMenu(lastMenu);
         });
 
         Button replay = new Button();
         replay.setText("Replay");
         replay.setOnAction(e -> {
-            Driver.menuFx.play("src/assets/MenuForward.wav");
+            Driver.soundController.playSfx("forward");
             Driver.setMenu(new LevelSurround(level, diff, lastMenu));
         });
 
diff --git a/src/gui/Leaderboard.java b/src/gui/Leaderboard.java
index 4c7a1b5..39df409 100644
--- a/src/gui/Leaderboard.java
+++ b/src/gui/Leaderboard.java
@@ -50,7 +50,7 @@ public class Leaderboard extends Pane
         Button exit = new Button();
         exit.setText("Back");
         exit.setOnAction(e -> {
-            Driver.menuFx.play("src/assets/MenuBackward.wav");
+            Driver.soundController.playSfx("backward");
             Driver.setMenu(prev);
         });
 
diff --git a/src/gui/LevelDetails.java b/src/gui/LevelDetails.java
index f9239e7..af55b9c 100644
--- a/src/gui/LevelDetails.java
+++ b/src/gui/LevelDetails.java
@@ -96,13 +96,13 @@ public class LevelDetails extends VBox
             }
             play.disableProperty().bind(diffToggleGroup.selectedToggleProperty().isNull()); //disables play button when no difficulty is selected
             play.setOnAction(e -> {
-                Driver.menuFx.play("src/assets/MenuForward.wav");
+                Driver.soundController.playSfx("forward");
                 Driver.setMenu(new LevelSurround(level, (Difficulty)diffToggleGroup.getSelectedToggle().getUserData(), Driver.getMenu()));
             });
 
             leaderboard.disableProperty().bind(diffToggleGroup.selectedToggleProperty().isNull());
             leaderboard.setOnAction(e -> {
-                Driver.menuFx.play("src/assets/MenuForward.wav");
+                Driver.soundController.playSfx("forward");
                 Driver.setMenu(new Leaderboard(level, (Difficulty)diffToggleGroup.getSelectedToggle().getUserData(), Driver.getMenu()));
             });
 
diff --git a/src/gui/LevelSelector.java b/src/gui/LevelSelector.java
index 2a95b6c..6fd6aca 100644
--- a/src/gui/LevelSelector.java
+++ b/src/gui/LevelSelector.java
@@ -44,7 +44,7 @@ public class LevelSelector extends Pane
         Button exit = new Button();
         exit.setText("Back");
         exit.setOnAction(e -> {Driver.setMenu(new MainMenu());
-            Driver.menuFx.play("src/assets/MenuBackward.wav");
+            Driver.soundController.playSfx("backward");
         });
 
         VBox leftBox = new VBox();
diff --git a/src/gui/LevelSurround.java b/src/gui/LevelSurround.java
index c89ef6d..3739879 100644
--- a/src/gui/LevelSurround.java
+++ b/src/gui/LevelSurround.java
@@ -35,15 +35,12 @@ public class LevelSurround extends Pane
         exit.setText("Back");
         exit.setOnAction(e -> {
             Driver.setMenu(prev);
-            Driver.menuFx.play("src/assets/MenuBackward.wav");
+            Driver.soundController.playSfx("backward");
             game.cancel();
         });
 
-        Button pause = new Button();
-        pause.setText("Pause");
-
         HBox buttonBox = new HBox();
-        buttonBox.getChildren().addAll(exit,pause);
+        buttonBox.getChildren().addAll(exit);
         buttonBox.setAlignment(Pos.TOP_LEFT);
         buttonBox.setSpacing(10);
 
diff --git a/src/gui/MainMenu.java b/src/gui/MainMenu.java
index 56a0a05..84a7508 100644
--- a/src/gui/MainMenu.java
+++ b/src/gui/MainMenu.java
@@ -32,19 +32,19 @@ public class MainMenu extends Pane
         Button play = new Button();
         play.setText("Play");
         play.setOnAction(e -> {Driver.setMenu(new LevelSelector());
-            Driver.menuFx.play("src/assets/MenuForward.wav");
+            Driver.soundController.playSfx("forward");
         });
 
         Button settings = new Button();
         settings.setText("Settings");
         settings.setOnAction(e -> {Driver.setMenu(new Settings());
-            Driver.menuFx.play("src/assets/MenuForward.wav");
+            Driver.soundController.playSfx("forward");
         });
 
         Button exit = new Button();
         exit.setText("Quit");
         exit.setOnAction(e -> {Driver.quit();
-            Driver.menuFx.play("src/assets/MenuBackward.wav");
+            Driver.soundController.playSfx("backward");
         });
 
         VBox buttonBox = new VBox();
diff --git a/src/gui/Settings.java b/src/gui/Settings.java
index 4e82056..2144e16 100644
--- a/src/gui/Settings.java
+++ b/src/gui/Settings.java
@@ -25,9 +25,9 @@ public class Settings extends Pane
         musicText.getStyleClass().add("t3");
 
         Slider musicSlider = new Slider();
-        musicSlider.setMax(100);
-        musicSlider.setMin(0);
         musicSlider.valueProperty().bindBidirectional(Driver.settingsController.musicVol);
+        musicSlider.setMin(0.0);
+        musicSlider.setMax(1.0);
 
         VBox musicBox = new VBox();
         musicBox.getChildren().addAll(musicText, musicSlider);
@@ -40,9 +40,9 @@ public class Settings extends Pane
         SFXText.getStyleClass().add("t3");
 
         Slider SFXSlider = new Slider();
-        SFXSlider.setMax(100);
-        SFXSlider.setMin(0);
         SFXSlider.valueProperty().bindBidirectional(Driver.settingsController.effectsVol);
+        SFXSlider.setMin(0.0);
+        SFXSlider.setMax(1.0);
 
         VBox SFXBox = new VBox();
         SFXBox.getChildren().addAll(SFXText, SFXSlider);
@@ -59,7 +59,7 @@ public class Settings extends Pane
         fullscreen.getStyleClass().remove("toggle-button");
         fullscreen.getStyleClass().add("button");
         fullscreen.setOnAction(e -> {
-            Driver.menuFx.play("src/assets/MenuForward.wav");
+            Driver.soundController.playSfx("forward");
             Driver.primaryStage.setFullScreen(!Driver.primaryStage.isFullScreen());
         });
 
@@ -74,14 +74,14 @@ public class Settings extends Pane
         
         Button levelEdit = new Button("Level Utility");
         levelEdit.setOnAction(e -> {
-            Driver.menuFx.play("src/assets/MenuForward.wav");
+            Driver.soundController.playSfx("forward");
             new devmenu.LevelList();
         });
 
         Button devMenu = new Button();
         devMenu.setText("Debug Menu");
         devMenu.setOnAction(e -> {
-            Driver.menuFx.play("src/assets/MenuForward.wav");
+            Driver.soundController.playSfx("forward");
             Driver.debug.show();
         });
 
@@ -101,7 +101,7 @@ public class Settings extends Pane
         Button exit = new Button();
         exit.setText("Back");
         exit.setOnAction(e -> {
-            Driver.menuFx.play("src/assets/MenuBackward.wav");
+            Driver.soundController.playSfx("backward");
             Driver.setMenu(new MainMenu());
         });