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

2 files changed, 6 insertions, 3 deletions

diff --git a/src/gameplay/SongPlayer.java b/src/gameplay/SongPlayer.java
index 0f374d1..15dbf01 100644
--- a/src/gameplay/SongPlayer.java
+++ b/src/gameplay/SongPlayer.java
@@ -7,7 +7,6 @@ import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.Queue;
 import java.util.Scanner;
-import java.util.logging.Level;
 
 import javax.sound.sampled.LineUnavailableException;
 import javax.sound.sampled.UnsupportedAudioFileException;
@@ -42,7 +41,7 @@ import sound.AudioFilePlayer;
 
 
 public class SongPlayer extends Pane {
-	private int bpm;		//initializes the bpm of the song, to be read in from a metadata file later
+	private Double bpm;		//initializes the bpm of the song, to be read in from a metadata file later
 	private int songLength; //initializes the length of the song in terms of the song's bpm, to be read in later
 
 	AudioFilePlayer music;
@@ -114,7 +113,7 @@ public class SongPlayer extends Pane {
 		level = lvl;
 		difficulty = d;
 		pane = p;
-		music = new AudioFilePlayer(difficulty.song.getPath());
+		music = new AudioFilePlayer(level.song.getPath());
 
 		System.out.println(d.bpm + " " + d.numBeats);
 
diff --git a/src/gameplay/Timer.java b/src/gameplay/Timer.java
index 4ffb1fb..5ff3b16 100644
--- a/src/gameplay/Timer.java
+++ b/src/gameplay/Timer.java
@@ -21,4 +21,8 @@ public class Timer
     public double time() {
         return ((double)(System.currentTimeMillis()-timeStart))*(bpm/60000.0);
     }
+
+    public String toString() {
+        return ""+((double)(System.currentTimeMillis()-timeStart))*(bpm/60000.0);
+    }
 }