aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/gameplay/SongPlayer.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gameplay/SongPlayer.java b/src/gameplay/SongPlayer.java
index 7ea6bfa..acf9d6b 100644
--- a/src/gameplay/SongPlayer.java
+++ b/src/gameplay/SongPlayer.java
@@ -115,8 +115,8 @@ public class SongPlayer extends Pane {
difficulty = d;
pane = p;
- songLength = 28;
- timer = new Timer(120); //Sets the timer's bpm to that of the song
+ songLength = d.numBeats;
+ timer = new Timer(d.bpm); //Sets the timer's bpm to that of the song
scoreCounter = cntrl; //Uses the song's designated scoreCounter
try {
@@ -176,7 +176,7 @@ public class SongPlayer extends Pane {
super.getChildren().addAll(root); //puts all of the combonents in the pane to be rendered
gameLoop.start(); //starts the gameLoop, a periodic backround task runner that runs the methods within it 60 times every second
- music = new AudioFilePlayer("src/assets/TestSync120bpm.wav");
+ music = new AudioFilePlayer(d.song.getPath());
music.play();
}