X-Git-Url: https://ruin.nu/git/?p=moosique.git;a=blobdiff_plain;f=Moosique.java;h=91cf4ff7ddc117a62e7109224e9c66add37ef474;hp=edace75227333d65e706ced4755db1f2d11084eb;hb=ce9a16d679f2058454af367e972888ba8e2c34c0;hpb=d50b6cfbebef6c3f620f916f0d2da838c4de3355

diff --git a/Moosique.java b/Moosique.java
index edace75..91cf4ff 100644
--- a/Moosique.java
+++ b/Moosique.java
@@ -19,12 +19,14 @@ public class Moosique {
 	private static Synthesizer synthesizer;
 	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 RESOLUTION = 96, DEFAULT_TRACKS = 4;
+	public static final int DEFAULT_RESOLUTION = 96, DEFAULT_TRACKS = 4;
 
 	/** 
 	 * Starts the application.
@@ -149,8 +151,9 @@ 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);
+			emptyTracks = new ArrayList();
 		} catch (InvalidMidiDataException e) {}
 		// Sends sequence to GUI.
 		if (gui != null) gui.setSequence(seq);
@@ -168,23 +171,46 @@ public class Moosique {
 	 * Pauses playback of the current sequence.
 	 */
 	public static void pause() {
-		sequencer.stop();
-		player.interrupt();
+		if (sequencer.isRunning()) {
+			sequencer.stop();
+		}
+		if (player != null) player.interrupt();
 	}
 
 	/** 
 	 * Resumes playback of the current sequence.
 	 */
 	public static void resume() {
+		gui.update(0);
 		sequencer.start();
 
 		// 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() {
-				while(sequencer.isRunning()) gui.update(sequencer.getTickPosition());
+				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)((15000 / getTempo()) * (tickDiff / ticksPerSixteenth)));
+						sleep (10);
+					} catch (InterruptedException e) {
+						Moosique.stop();
+					}
+				}
 				Moosique.stop();
 			}
 		};
@@ -197,17 +223,17 @@ public class Moosique {
 	public static void stop() {
 		if (sequencer.isRunning()) {
 			sequencer.stop();
-			sequencer.setTickPosition(editPosition);
-			player.interrupt();
-			gui.update((long)0);
 		}
+		sequencer.setTickPosition(editPosition);
+		if (player != null) player.interrupt();
+		gui.update((long)0);
 	}
 
 	/** 
 	 * Returns the current editing position of the sequencer.
 	 * @return the tick position
 	 */
-	public static long getPosition() {
+	public static long getEditPosition() {
 		return editPosition;
 	}
 
@@ -215,10 +241,45 @@ 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;
 	}
 
+	/** 
+	 * 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
@@ -250,6 +311,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
@@ -265,47 +344,89 @@ public class Moosique {
 			return false;
 		}
 		isEdited = false;
-		
-		// Searches the sequence for NoteOn events
+
 		Track[] tracks = seq.getTracks();
-		MidiEvent noteOn, noteOff = null, nextEvent;
-		MidiMessage nextMsg;
-		ShortMessage shortMsg;
+		emptyTracks = new ArrayList();
+
+		// Searches track 0 for changes in tempo and time signature.
+		MidiEvent event;
+		MetaMessage metaMsg;
+		ArrayList ts = new ArrayList(), tc = new ArrayList();
+		for (int i = 0; i < tracks[0].size(); i++) {
+			event = tracks[0].get(i);
+			if (event.getMessage().getStatus() == MetaMessage.META) {
+				metaMsg = (MetaMessage)event.getMessage();
+				switch(metaMsg.getType()) {
+					case 81: tc.add(event); break;
+					case 88: ts.add(event);
+				}
+			}
+		}
+//		timeSignatures = ts.toArray(timeSignatures);
+//		tempoChanges = tc.toArray(tempoChanges);
+
+		// Wraps each NoteOn event with its NoteOff event in a MooNote
+		ArrayList noteOns, noteOffs;
 		for (int i = 0; i < tracks.length; i++) {
-	/*
-			Collections.sort(track[i].events, new Comparator() {
+			// Searches the sequence for NoteOn and NoteOff events
+			noteOns = new ArrayList(tracks[i].size() / 2);
+			noteOffs = new ArrayList(tracks[i].size() / 2);
+			for (int j = 0; j < tracks[i].size(); j++) {
+				event = tracks[i].get(j);
+				if (event.getMessage().getStatus() >= 144 &&
+				    event.getMessage().getStatus() < 160) noteOns.add(event);
+				if (event.getMessage().getStatus() >= 128 &&
+				    event.getMessage().getStatus() < 144) noteOffs.add(event);
+			}
+			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() {
 				public int compare(Object o1, Object o2) {
-					return ((MidiEvent)o2).getTick() - ((MidiEvent)o1).getTick();
+					return (int)(((MidiEvent)o1).getTick() - ((MidiEvent)o2).getTick());
 				}
-		        });
-	*/
-			for (int j = 0; j < tracks[i].size(); j++) {
-				noteOn = tracks[i].get(j);
-				if (noteOn.getMessage() instanceof ShortMessage) {
-					if (((ShortMessage)noteOn.getMessage()).getCommand() == 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));
-						}
+			};
+			Collections.sort(noteOns, c);
+			Collections.sort(noteOffs, c);
+
+			// For each NoteOn event, finds its NoteOff event and replaces it with a MooNote.
+			Iterator iOn = noteOns.iterator(), iOff;
+			MidiEvent on, off = null, nextOff;
+			ShortMessage onMsg, nextOffMsg;
+			while(iOn.hasNext()) {
+				on = (MidiEvent)iOn.next();
+				onMsg = (ShortMessage)on.getMessage();
+				iOff = noteOffs.iterator();
+				while(iOff.hasNext()) {
+					nextOff = (MidiEvent)iOff.next();
+					nextOffMsg = (ShortMessage)nextOff.getMessage();
+					if(onMsg.getChannel() == nextOffMsg.getChannel() &&
+					   onMsg.getData1() == nextOffMsg.getData1() &&
+					   c.compare(nextOff, on) > 0) {
+						off = nextOff;
+						iOff.remove();
+						break;
 					}
+					   	
+				}
+				tracks[i].remove(on);
+				if (off != null) {
+					tracks[i].add(new MooNote(on, off));
+				} else {
+					tracks[i].add(new MooNote(on));
 				}
+				iOn.remove();
 			}
 		}
+
 		// Sends sequence to GUI and sequencer, then returns
 		if (gui != null) gui.setSequence(seq);
 		try {
@@ -323,6 +444,7 @@ public class Moosique {
 			MidiSystem.write(seq, 1, new File(filename));
 		} catch (IOException e) {}
 		filename = file;
+		gui.setStatus("Saved " + file);
 	}
 
 	/** 
@@ -340,4 +462,4 @@ public class Moosique {
 		if (synthesizer.isOpen()) synthesizer.close();
 		System.exit(0);
 	}
-}
+}
\ No newline at end of file