diff options
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/Driver.java | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/gui/Driver.java b/src/gui/Driver.java index 162d1fe..39cda73 100644 --- a/src/gui/Driver.java +++ b/src/gui/Driver.java @@ -22,6 +22,8 @@ import main.LevelController; import main.SettingsController; import sound.AudioFilePlayer; +import java.nio.file.Paths; + import javax.sound.sampled.AudioFileFormat; // import javafx.scene.image.ImageView; @@ -37,8 +39,8 @@ import gameplay.SongPlayer; public class Driver extends Application { - gameplay.SongPlayer placeHolder = new gameplay.SongPlayer(); - public static AudioFilePlayer mediaPlayer; + + public static MediaPlayer mediaPlayer; public static Stage primaryStage; static Pane primaryPane = new Pane(); @@ -62,7 +64,9 @@ public class Driver extends Application @Override public void start(Stage newPrimaryStage) { - mediaPlayer = new AudioFilePlayer("src/assets/MenuMusicPlaceholder.wav"); + Media song = new Media(Paths.get("src/assets/MenuMusicPlaceholder.wav").toUri().toString()); + mediaPlayer = new MediaPlayer(song); + new MediaView(mediaPlayer); mediaPlayer.play(); primaryStage = newPrimaryStage; @@ -73,7 +77,7 @@ public class Driver extends Application primaryStage.setScene(primaryScene); primaryStage.setTitle("NPE Hero"); - fixMenuSync(); + setMenu(new MainMenu()); setBackground("assets/forest.png"); @@ -87,11 +91,6 @@ public class Driver extends Application primaryStage.show(); } - private void fixMenuSync() { - primaryPane.getChildren().addAll(placeHolder); - primaryPane.getChildren().removeAll(placeHolder); - } - /** * Replaces/adds a new pane to the primaryPane * @param pane the new pane |