rewrote everything related to sound

3 files changed, 15 insertions, 12 deletions

diff --git a/src/devmenu/DebugMenu.java b/src/devmenu/DebugMenu.java
index 19fc8e1..654d15b 100644
--- a/src/devmenu/DebugMenu.java
+++ b/src/devmenu/DebugMenu.java
@@ -32,7 +32,7 @@ public class DebugMenu
 
         Button testVol = new Button();
         testVol.setText("print volumes");
-        testVol.setOnAction(e -> System.out.println("sfx:"+Driver.settingsController.effectsVol+" msc:"+Driver.settingsController.musicVol));
+        testVol.setOnAction(e -> System.out.println("setc:"+Driver.settingsController.effectsVol+" sndc:"+Driver.soundController.songMediaPlayer.getVolume()));
 
         primaryPane.getChildren().addAll(wallpaperTest,wallpaperTest2,wallpaperTest3,testVol);
         
diff --git a/src/devmenu/DiffEditor.java b/src/devmenu/DiffEditor.java
index e2ce5d8..bf745e8 100644
--- a/src/devmenu/DiffEditor.java
+++ b/src/devmenu/DiffEditor.java
@@ -3,6 +3,10 @@ package devmenu;
 import java.io.FileNotFoundException;
 import java.io.UnsupportedEncodingException;
 
+import gui.Driver;
+import gui.LevelSelector;
+import gui.LevelSurround;
+import gui.MainMenu;
 import javafx.scene.Scene;
 import javafx.scene.control.Button;
 import javafx.scene.control.TextField;
@@ -44,7 +48,11 @@ public class DiffEditor
             }
         });
 
-        Button editScores = new Button("Edit leaderboard");
+        Button editScores = new Button("Clear leaderboard");
+        editScores.setOnAction(e -> diff.getLeaderboard().clear());
+
+        Button playLevel = new Button("Launch level");
+        playLevel.setOnAction(e -> Driver.setMenu(new LevelSurround(diff.level, diff, new MainMenu())));
 
         Button save = new Button("Save");
         save.setOnAction(e -> { //assigns text feilds to values
@@ -55,7 +63,7 @@ public class DiffEditor
         });
 
         VBox main = new VBox();
-        main.getChildren().addAll(folderNameLabel,folderName,titleLabel,title,bpmLabel,bpm,numBeatsLabel,numBeats,editNotes,editScores,save);
+        main.getChildren().addAll(folderNameLabel,folderName,titleLabel,title,bpmLabel,bpm,numBeatsLabel,numBeats,editNotes,editScores,playLevel,save);
         Scene scene = new Scene(main);
         primaryStage.setScene(scene);
         primaryStage.show();
diff --git a/src/devmenu/NotesEditor.java b/src/devmenu/NotesEditor.java
index c3ce1fa..a0aa26a 100644
--- a/src/devmenu/NotesEditor.java
+++ b/src/devmenu/NotesEditor.java
@@ -9,6 +9,7 @@ import java.io.PrintWriter;
 import java.io.UnsupportedEncodingException;
 
 import gameplay.Timer;
+import gui.Driver;
 import javafx.scene.Scene;
 import javafx.scene.control.Button;
 import javafx.scene.input.KeyCode;
@@ -20,16 +21,13 @@ import javafx.scene.media.MediaView;
 import javafx.scene.text.Text;
 import javafx.stage.Stage;
 import main.Difficulty;
-import sound.AudioFilePlayer;
 
 public class NotesEditor
 {
     Text help;
-    String t1 = "Press Start to begin recording. Use the same keys.";
+    String t1 = "Press Start to begin recording. Use the same keys. Note: existing notes will be overwitten.";
     String t2 = "Now recording. Press Stop or ESC to finish";
-    MediaPlayer mediaPlayer;
     Difficulty diff;
-    AudioFilePlayer music;
     Timer timer;
     PrintWriter writer;
     public NotesEditor(Difficulty diff) throws FileNotFoundException, UnsupportedEncodingException
@@ -37,7 +35,6 @@ public class NotesEditor
         this.diff = diff;
 
         help = new Text(t1);
-
         Text cur = new Text("-----");
 
         Button start = new Button("Start");
@@ -49,8 +46,6 @@ public class NotesEditor
         stop.setFocusTraversable(false);
 
         Media song = new Media(diff.level.song.toURI().toString());
-        mediaPlayer = new MediaPlayer(song);
-        new MediaView(mediaPlayer);
 
         VBox main = new VBox();
         main.getChildren().addAll(help,cur,start,stop);
@@ -94,7 +89,7 @@ public class NotesEditor
 
     private void start()
     {
-        mediaPlayer.play();
+        Driver.soundController.playSong(diff.level.song);
         timer = new Timer(diff.bpm);
         help.setText(t2);
     }
@@ -102,7 +97,7 @@ public class NotesEditor
     private void stop()
     {
         try {
-        mediaPlayer.stop();
+        Driver.soundController.endSong();
         diff.numBeats = (int)timer.time();
         timer = null;
         writer.close();