X-Git-Url: https://ruin.nu/git/?p=moosique.git;a=blobdiff_plain;f=Moosique.java;h=46efc7dc41e6acbadeba89067a09df0d566a3ec1;hp=33381f1b99b7193af0e147e63b7fd61a0216ce99;hb=bad66a3619fc01696605892caeef49249df364ae;hpb=9d5d6dc48ef1650f70db268b2606c5d15a7a4093

diff --git a/Moosique.java b/Moosique.java
index 33381f1..46efc7d 100644
--- a/Moosique.java
+++ b/Moosique.java
@@ -25,7 +25,7 @@ public class Moosique {
 	private static long editPosition;
 	private static boolean makeGUI = true, isEdited;
 	private static Thread player;
-	public static final int RESOLUTION = 96, DEFAULT_TRACKS = 4;
+	public static final int DEFAULT_RESOLUTION = 96, DEFAULT_TRACKS = 4;
 
 	/** 
 	 * Starts the application.
@@ -150,7 +150,7 @@ public class Moosique {
 	public static void clearSequence() {
 		// Creates a new sequence and sends it to the sequencer.
 		try {
-			seq = new Sequence(Sequence.PPQ, RESOLUTION, DEFAULT_TRACKS);
+			seq = new Sequence(Sequence.PPQ, DEFAULT_RESOLUTION, DEFAULT_TRACKS);
 			sequencer.setSequence(seq);
 		} catch (InvalidMidiDataException e) {}
 		// Sends sequence to GUI.
@@ -188,7 +188,18 @@ public class Moosique {
 		// Creates the visualization thread and starts it.
 		player = new Thread () {
 			public void run() {
-				while(sequencer.isRunning()) gui.update(sequencer.getTickPosition());
+				while(sequencer.isRunning()) {
+					// Updates the GUI with the current tick position.
+					gui.update(sequencer.getTickPosition());
+
+					// Puts the thread to sleep for as long as it takes
+					// the sequencer to reach the next sixteenth.
+					try {
+						sleep((long)((1000 * 60 * 1) / (getTempo() * 4)));
+					} catch (InterruptedException e) {
+						Moosique.stop();
+					}
+				}
 				Moosique.stop();
 			}
 		};
@@ -228,8 +239,8 @@ public class Moosique {
 	 * @return the tick position
 	 */
 	public static int getTempo() {
-		if (tempoMsg == null) return 0;
 		return 120;
+		// if (tempoMsg == null) return 0;
 	}
 
 	/** 
@@ -237,16 +248,17 @@ public class Moosique {
 	 * @param ticks		the tick position
 	 */
 	public static void setTempo(int bpm) {
-		// tempoMsg, timeSigMsg
+		// tempoMsg
 	}
 
 	/** 
 	 * Returns the tempo of the current sequence.
 	 * @return the tick position
 	 */
-	public static int getTimeSig() {
-		if (timeSigMsg == null) return 0;
-		return 120;
+	public static int[] getTimeSig() {
+		int[] ts = {4, 4};
+		return ts;
+		// if (timeSigMsg == null) return 0;
 	}
 
 	/** 
@@ -254,7 +266,7 @@ public class Moosique {
 	 * @param ticks		the tick position
 	 */
 	public static void setTimeSig(int bpm) {
-		// tempoMsg, timeSigMsg
+		// timeSigMsg
 	}
 
 	/**