X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=Moosique.java;h=c51336423b7d8297a27032b0c32d834429b44e13;hb=2236a670e9f9c0a83c97b9cd4ae8ffaa0a051519;hp=89669d37e972d197ffdba584062477e2c6ae5c84;hpb=83ec11f99e143607d057db2a68c262ca9672e524;p=moosique.git

diff --git a/Moosique.java b/Moosique.java
index 89669d3..c513364 100644
--- a/Moosique.java
+++ b/Moosique.java
@@ -20,10 +20,11 @@ public class Moosique {
 	private static MidiChannel[] channels;
 	private static MidiChannel activeChannel;
 	private static MidiEvent[] timeSignatures, tempoChanges;
+	private static ArrayList emptyTracks;
 
 	private static String filename, fileArg;
 	private static long editPosition;
-	private static boolean makeGUI = true, isEdited;
+	private static boolean makeGUI = true, isEdited = false, drawEmptyTracks = false;
 	private static Thread player;
 	public static final int DEFAULT_RESOLUTION = 96, DEFAULT_TRACKS = 4;
 
@@ -185,15 +186,16 @@ public class Moosique {
 		// Disables input to volatile components
 		// gui.disable();
 
-		System.out.println("Ticks/16: " + seq.getResolution()/4);
-
 		// Creates the visualisation thread and starts it.
 		player = new Thread () {
 			public void run() {
+				long ticksPerSixteenth = seq.getResolution()/4;
+				System.out.println("Ticks/16: " + ticksPerSixteenth);
 				long position = sequencer.getTickPosition();
 				while(sequencer.isRunning()) {
 					long pos = sequencer.getTickPosition();
-					System.out.print(" ... " + (pos - position));
+					long tickDiff = pos - position;
+					System.out.print(" ... " + tickDiff);
 					position = pos;
 
 					// Updates the GUI with the current tick position.
@@ -202,7 +204,7 @@ public class Moosique {
 					// Puts the thread to sleep for as long as it takes
 					// the sequencer to reach the next sixteenth.
 					try {
-						sleep((long)(15000 / getTempo()));
+						sleep((long)((15000 / getTempo()) * (tickDiff / ticksPerSixteenth)));
 					} catch (InterruptedException e) {
 						Moosique.stop();
 					}
@@ -307,6 +309,24 @@ public class Moosique {
 		editPosition += ticks;
 	}
 
+	/** 
+	 * Shows the given message in the status bar.
+	 * @param text	the message to show
+	 */
+	public static boolean shouldBeDrawn(Track track) {
+		if (drawEmptyTracks) return true;
+		else return (!emptyTracks.contains(track));
+	}
+
+
+	/** 
+	 * Shows the given message in the status bar.
+	 * @param text	the message to show
+	 */
+	public static void setDrawEmptyTracks(boolean state) {
+		drawEmptyTracks = state;
+	}
+
 	/** 
 	 * Loads the MooSequence in the given file.
 	 * @param filename	the filename to use
@@ -324,6 +344,7 @@ public class Moosique {
 		isEdited = false;
 
 		Track[] tracks = seq.getTracks();
+		emptyTracks = new ArrayList();
 
 		// Searches track 0 for changes in tempo and time signature.
 		MidiEvent event;
@@ -357,6 +378,13 @@ public class Moosique {
 			}
 			noteOns.trimToSize();
 			noteOffs.trimToSize();
+			boolean isEmpty = (noteOns.size() == 0);
+			String text = "Track " + i + " has " + noteOns.size() + "/" + noteOffs.size() + "/" + tracks[i].size();
+			if (isEmpty) {
+				text += " and will be removed.";
+				emptyTracks.add(tracks[i]);
+			}
+			System.out.println(text);
 			
 			// Sorts the note lists by tick position.
 			Comparator c = new Comparator() {