X-Git-Url: https://ruin.nu/git/?p=moosique.git;a=blobdiff_plain;f=Moosique.java;h=46efc7dc41e6acbadeba89067a09df0d566a3ec1;hp=e72cdf560d3df1e1b2e55dbdefb6ae0aecaad323;hb=948e069926266ead58bc5466520e131941f2466c;hpb=b5028dc9c03585cdf231a37d8996a7e836932c3e

diff --git a/Moosique.java b/Moosique.java
index e72cdf5..46efc7d 100644
--- a/Moosique.java
+++ b/Moosique.java
@@ -19,12 +19,13 @@ public class Moosique {
 	private static Synthesizer synthesizer;
 	private static MidiChannel[] channels;
 	private static MidiChannel activeChannel;
+	private static MetaMessage tempoMsg, timeSigMsg;
 
 	private static String filename, fileArg;
 	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.
@@ -149,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.
@@ -187,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();
 			}
 		};
@@ -222,6 +234,41 @@ public class Moosique {
 		editPosition = ticks;
 	}
 
+	/** 
+	 * Returns the tempo of the current sequence.
+	 * @return the tick position
+	 */
+	public static int getTempo() {
+		return 120;
+		// if (tempoMsg == null) return 0;
+	}
+
+	/** 
+	 * Sets the current editing position of the sequencer.
+	 * @param ticks		the tick position
+	 */
+	public static void setTempo(int bpm) {
+		// tempoMsg
+	}
+
+	/** 
+	 * Returns the tempo of the current sequence.
+	 * @return the tick position
+	 */
+	public static int[] getTimeSig() {
+		int[] ts = {4, 4};
+		return ts;
+		// if (timeSigMsg == null) return 0;
+	}
+
+	/** 
+	 * Sets the current editing position of the sequencer.
+	 * @param ticks		the tick position
+	 */
+	public static void setTimeSig(int bpm) {
+		// timeSigMsg
+	}
+
 	/** 
 	 * Returns true if the current sequence has been edited.
 	 * @return the tick position
@@ -268,9 +315,26 @@ public class Moosique {
 			return false;
 		}
 		isEdited = false;
-		
-		// Searches the sequence for NoteOn events
+
 		Track[] tracks = seq.getTracks();
+
+		// Stores tempo and time signature.
+		MidiMessage msg;
+		MetaMessage metaMsg;
+		for (int i = 0; i < tracks[0].size(); i++) {
+			msg = tracks[0].get(i).getMessage();
+			if (msg.getStatus() == MetaMessage.META) {
+				metaMsg = (MetaMessage)msg;
+				if (metaMsg.getType() == 81) {
+					tempoMsg = metaMsg;
+				} else if (metaMsg.getType() == 88) {
+					timeSigMsg = (MetaMessage)msg;
+				}
+
+			}
+		}
+
+		// Searches the sequence for NoteOn events
 		MidiEvent noteOn, noteOff = null, nextEvent;
 		MidiMessage nextMsg;
 		ShortMessage shortMsg;
@@ -326,6 +390,7 @@ public class Moosique {
 			MidiSystem.write(seq, 1, new File(filename));
 		} catch (IOException e) {}
 		filename = file;
+		gui.setStatus("Saved " + file);
 	}
 
 	/**