From: Einar Pehrson <einarp@itstud.chalmers.se>
Date: Fri, 16 May 2003 12:02:17 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Url: https://ruin.nu/git/?p=moosique.git;a=commitdiff_plain;h=049faea5b17c1cd2c7af02bd8b162ae5c7f0eb45

*** empty log message ***
---

diff --git a/MooGUI.java b/MooGUI.java
index 71b1493..78105be 100644
--- a/MooGUI.java
+++ b/MooGUI.java
@@ -18,6 +18,7 @@ public class MooGUI extends JFrame {
 	private MooView view;
 	private JLabel statusBar;
 	private java.util.Timer timer;
+	private boolean drawEmptyTracks = false;
 	public static final int statusResetDelay = 3000;
 	public static final Font FONT = new Font("Helvetica", Font.PLAIN, 10);
 	public static final Color bgColor = new Color(192, 224, 255);
@@ -139,6 +140,22 @@ public class MooGUI extends JFrame {
 		toolbar.updateProgInd(tickPosition);
 	}
 
+	/** 
+	 * Shows the given message in the status bar.
+	 * @param text	the message to show
+	 */
+	public boolean drawEmptyTracks() {
+		return drawEmptyTracks;
+	}
+
+	/** 
+	 * Shows the given message in the status bar.
+	 * @param text	the message to show
+	 */
+	public void setDrawEmptyTracks(boolean state) {
+		drawEmptyTracks = state;
+	}
+
 	private Action createOctaveAction(final int octave) {
 		Action octaveAction = new AbstractAction() {
 			public void actionPerformed(ActionEvent ae) {
diff --git a/Moosique.java b/Moosique.java
index 89669d3..7eafb6c 100644
--- a/Moosique.java
+++ b/Moosique.java
@@ -20,6 +20,7 @@ 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;
@@ -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();
 					}
@@ -324,6 +326,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 +360,11 @@ 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 not be removed.";
+			System.out.println(text);
+			emptyTracks.add(tracks[i]);
 			
 			// Sorts the note lists by tick position.
 			Comparator c = new Comparator() {
diff --git a/midi/test3.mid b/midi/test3.mid
index 5080a16..5893970 100644
Binary files a/midi/test3.mid and b/midi/test3.mid differ