X-Git-Url: https://ruin.nu/git/?p=moosique.git;a=blobdiff_plain;f=Moosique.java;h=01b6b7664345685d633f6585aeaace8c8d011fad;hp=795772f46e9b04742b81fb4dffc72d65b3f43769;hb=c3a31c2aa833e2197f0929655c69a2090e8bbecc;hpb=8183d3bd4989dc30165b8f3a4656819ce086fbef

diff --git a/Moosique.java b/Moosique.java
index 795772f..01b6b76 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;
 
@@ -152,6 +153,7 @@ public class Moosique {
 		try {
 			seq = new Sequence(Sequence.PPQ, DEFAULT_RESOLUTION, DEFAULT_TRACKS);
 			sequencer.setSequence(seq);
+			emptyTracks = new ArrayList();
 		} catch (InvalidMidiDataException e) {}
 		// Sends sequence to GUI.
 		if (gui != null) gui.setSequence(seq);
@@ -185,17 +187,26 @@ public class Moosique {
 		// Disables input to volatile components
 		// gui.disable();
 
-		// Creates the visualization thread and starts it.
+		// 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();
+					long tickDiff = pos - position;
+					System.out.print(" ... " + tickDiff);
+					position = pos;
+
 					// 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)));
+						//sleep((long)((15000 / getTempo()) * (tickDiff / ticksPerSixteenth)));
+						sleep (10);
 					} catch (InterruptedException e) {
 						Moosique.stop();
 					}
@@ -222,7 +233,7 @@ public class Moosique {
 	 * Returns the current editing position of the sequencer.
 	 * @return the tick position
 	 */
-	public static long getPosition() {
+	public static long getEditPosition() {
 		return editPosition;
 	}
 
@@ -230,7 +241,7 @@ public class Moosique {
 	 * Sets the current editing position of the sequencer.
 	 * @param ticks		the tick position
 	 */
-	public static void setPosition(long ticks) {
+	public static void setEditPosition(long ticks) {
 		editPosition = ticks;
 	}
 
@@ -300,6 +311,24 @@ public class Moosique {
 		editPosition += ticks;
 	}
 
+	/** 
+	 * Returns whether the given track should be drawn
+	 * @return true if the given track should be drawn
+	 */
+	public static boolean shouldBeDrawn(Track track) {
+		if (drawEmptyTracks) return true;
+		else return (!emptyTracks.contains(track));
+	}
+
+
+	/** 
+	 * Sets whether empty tracks should be drawn
+	 * @param state		true if empty tracks should be drawn
+	 */
+	public static void setDrawEmptyTracks(boolean state) {
+		drawEmptyTracks = state;
+	}
+
 	/** 
 	 * Loads the MooSequence in the given file.
 	 * @param filename	the filename to use
@@ -317,6 +346,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;
@@ -350,6 +380,7 @@ public class Moosique {
 			}
 			noteOns.trimToSize();
 			noteOffs.trimToSize();
+			if (noteOns.size() == 0) emptyTracks.add(tracks[i]);
 			
 			// Sorts the note lists by tick position.
 			Comparator c = new Comparator() {
@@ -390,45 +421,6 @@ public class Moosique {
 			}
 		}
 
-	/*
-		Collections.sort(track[i].events, new Comparator() {
-			public int compare(Object o1, Object o2) {
-				return ((MidiEvent)o2).getTick() - ((MidiEvent)o1).getTick();
-			}
-	        });
-
-		// Searches the sequence for NoteOn events
-		MidiEvent noteOn, noteOff = null, nextEvent;
-		MidiMessage nextMsg;
-		ShortMessage shortMsg;
-
-		for (int i = 0; i < tracks.length; i++) {
-			for (int j = 0; j < tracks[i].size(); j++) {
-				noteOn = tracks[i].get(j);
-				if (noteOn.getMessage().getStatus() == ShortMessage.NOTE_ON) {
-					// Finds the corresponding NoteOff event
-					for (int k = j + 1; k < tracks[i].size(); k++) {
-						nextEvent = tracks[i].get(k);
-						nextMsg = nextEvent.getMessage();
-						if (nextMsg instanceof ShortMessage) {
-							shortMsg = (ShortMessage) nextMsg;
-							if (shortMsg.getCommand() == ShortMessage.NOTE_OFF && shortMsg.getChannel() == ((ShortMessage)noteOn.getMessage()).getChannel() && shortMsg.getData1() == ((ShortMessage)noteOn.getMessage()).getData1()) {
-								noteOff = nextEvent;
-								break;
-							}
-						}
-					}
-					// Replaces the NoteOn event with a MooNote, if possible with the corresponding NoteOff event
-					tracks[i].remove(noteOn);
-					if (noteOff != null) {
-						tracks[i].add(new MooNote(noteOn, noteOff));
-					} else {
-						tracks[i].add(new MooNote(noteOn));
-					}
-				}
-			}
-		}
-*/
 		// Sends sequence to GUI and sequencer, then returns
 		if (gui != null) gui.setSequence(seq);
 		try {