X-Git-Url: https://ruin.nu/git/?p=moosique.git;a=blobdiff_plain;f=Moosique.java;h=90ad9a0aeea4eb9f0bbba829fcdf928298abce83;hp=298c045ff30523290cc1ee234668f9355119ed9b;hb=f7097bc07b6688d1629e6894c1c42dc06485dc12;hpb=f13c7fbb2a8cc841367e0a4563596592b89cd33b

diff --git a/Moosique.java b/Moosique.java
index 298c045..90ad9a0 100644
--- a/Moosique.java
+++ b/Moosique.java
@@ -31,6 +31,7 @@ public class Moosique {
 	private static long editPosition;
 	private static boolean makeGUI = true, initSound = true, edited = false, drawEmptyTracks = false;
 	public static final int DEFAULT_RESOLUTION = 96, DEFAULT_TRACKS = 4;
+	public static final int WHOLE_NOTE = 0, HALF_NOTE = 1, QUARTER_NOTE = 2, EIGHTH_NOTE = 3, SIXTEENTH_NOTE = 4;
 
 	/** 
 	 * Starts the application.
@@ -52,12 +53,18 @@ public class Moosique {
 		// Acquires MIDI devices and connects them.
 		System.out.print("Initializing MIDI devices.");
 		try {
+			// Configures sequencer
 			sequencer = MidiSystem.getSequencer();
 			System.out.print(".");
 			sequencer.open();
+			sequencer.addMetaEventListener(new SongEndListener());
+
+			// Configures synthesizer
 			synthesizer = MidiSystem.getSynthesizer();
 			System.out.print(".");
 			synthesizer.open();
+
+			// Configures receiver, transmitter and channels.
 			receiver = synthesizer.getReceiver();
 			sequencer.getTransmitter().setReceiver(receiver);
 			channels = synthesizer.getChannels();
@@ -172,7 +179,7 @@ public class Moosique {
 	 * Calculates the position (measures, beats, ticks) in the current sequence for the given tick position.
 	 * @return an array of integers where index 0 is measures, 1 is beats and 2 is ticks.
 	 */
-	public static int[] getPositionForTick(long ticks) {
+	public static int[] getPositionForTicks(long ticks) {
 		/*
 		int measures, beats, ticks;
 		for (int i = 0; i < timeSignatures.length; i++) {
@@ -511,12 +518,15 @@ public class Moosique {
 	
 	/** 
 	 * Wraps each NoteOn event in the track with its NoteOff event in a MooNote.
+	 * @param track		the track to convert
+	 * @param quantize	whether to round locations and durations in the track to nearest 16th
+	 * @return a list of the created MooNotes
 	 */
-	public static List convertTrack(Track track) {
+	public static List convertTrack(Track track, boolean quantize) {
 		// Searches the track for NoteOn and NoteOff events
 		ArrayList noteOns = new ArrayList(track.size() / 2);
 		ArrayList noteOffs = new ArrayList(track.size() / 2);
-		ArrayList mooNotes = new ArrayList();
+		ArrayList newMooNotes = new ArrayList();
 		MidiEvent event;
 		for (int j = 0; j < track.size(); j++) {
 			event = track.get(j);
@@ -563,11 +573,12 @@ public class Moosique {
 					mn = new MooNote(on, new MidiEvent((ShortMessage)on.getMessage().clone(), on.getTick() + 48));
 				}
 				track.add(mn);
-				mooNotes.add(mn);
+				newMooNotes.add(mn);
 				iOn.remove();
 			}
 		}
-		return mooNotes;
+		if (quantize) quantize(newMooNotes, SIXTEENTH_NOTE, true, true);
+		return newMooNotes;
 	}
 
 	/** 
@@ -577,13 +588,8 @@ public class Moosique {
 	public static boolean load(String file) {
 		// Loads sequence from file
 		filename = file;
-		try {
-			seq = MidiSystem.getSequence(new File(filename));
-		} catch (InvalidMidiDataException e) {
-			return false;
-		} catch (IOException e) {
-			return false;
-		}
+		try {seq = MidiSystem.getSequence(new File(filename));}
+		catch (Exception e) {return false;}
 		edited = false;
 
 		Track[] tracks = seq.getTracks();
@@ -611,7 +617,7 @@ public class Moosique {
 
 		// Converts tracks.
 		for (int i = 0; i < tracks.length; i++) {
-			convertTrack(tracks[i]);
+			convertTrack(tracks[i], false);
 		}
 
 		// Sends sequence to GUI and sequencer, then returns
@@ -622,6 +628,17 @@ public class Moosique {
 		return true;
 	}
 
+	/** 
+	 * Quantizes the given list of MIDI events
+	 * @param notes		a list of the notes to quantize
+	 * @param resolution	the note size to round each note to
+	 * @param location	whether the quantize should affect the location of the note
+	 * @param duration	whether the quantize should affect the duration of the note
+	 */
+	public static void quantize(List notes, int resolution, boolean location, boolean duration) {
+		// Math.round(mn.getTick() / ticksPerSixteenth);
+	}
+
 	/** 
 	 * Loads the user preferences.
 	 */
@@ -692,11 +709,20 @@ public class Moosique {
 	}
 	
 	/** 
-	 * A Comparator for sorting lists of MidiEvents.
+	 * A Ccmparator for sorting lists of MidiEvents.
 	 */
 	public static class MidiEventComparator implements Comparator {
 		public int compare(Object o1, Object o2) {
 			return (int)(((MidiEvent)o1).getTick() - ((MidiEvent)o2).getTick());
 		}
 	}
+
+	/** 
+	 * A listener for detecting the end of the sequence.
+	 */
+	public static void class SongEndListener implements MetaEventListener {
+		public void meta(MetaMessage event) {
+			if (event.getType() == 47 ) sequencer.stop(); // End of stream
+		}
+	}
 }