X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=Moosique.java;h=8de399fc3f2f11c884a4cffd4a5facd4144a756c;hb=4526e51b70110f7272b0c2a3a5f207657d690029;hp=42b3637cf21db7d67b6a3659f279741723b987e3;hpb=570c4561b55541309efb977d0930777b8d214336;p=moosique.git

diff --git a/Moosique.java b/Moosique.java
index 42b3637..8de399f 100644
--- a/Moosique.java
+++ b/Moosique.java
@@ -21,15 +21,15 @@ public class Moosique {
 	private static MidiChannel[] channels;
 	private static MidiChannel activeChannel;
 	private static MidiEvent[] timeSignatures, tempoChanges;
+
 	private static ArrayList emptyTracks;
 	private static Map trackMute = new HashMap();
 	private static Map trackSolo = new HashMap();
-
+	private static Thread player;
 
 	private static String filename;
 	private static long editPosition;
-	private static boolean makeGUI = true, initSound = true, isEdited = false, drawEmptyTracks = false;
-	private static Thread player;
+	private static boolean makeGUI = true, initSound = true, edited = false, drawEmptyTracks = false;
 	public static final int DEFAULT_RESOLUTION = 96, DEFAULT_TRACKS = 4;
 
 	/** 
@@ -236,7 +236,7 @@ public class Moosique {
 	 * @return the tick position
 	 */
 	public static boolean isEdited() {
-		return isEdited;
+		return edited;
 	}
 
 	/** 
@@ -302,7 +302,7 @@ public class Moosique {
 	 * Sets the current sequence as edited, which implies prompts when loading a new sequence.
 	 */
 	public static void setEdited() {
-		isEdited = true;
+		edited = true;
 	}
 
 	/** 
@@ -485,7 +485,7 @@ public class Moosique {
 		} catch (IOException e) {
 			return false;
 		}
-		isEdited = false;
+		edited = false;
 
 		Track[] tracks = seq.getTracks();
 		emptyTracks = new ArrayList();
@@ -527,7 +527,7 @@ public class Moosique {
 			if (noteOns.size() == 0) emptyTracks.add(tracks[i]);
 			
 			// Sorts the note lists by tick position.
-			Comparator c = new NoteComparator();
+			Comparator c = new MidiEventComparator();
 			Collections.sort(noteOns, c);
 			Collections.sort(noteOffs, c);
 
@@ -572,7 +572,7 @@ public class Moosique {
 	 * Prompts the user .
 	 */
 	public static boolean promptOnUnsavedChanges() {
-		if (!isEdited) return false;
+		if (!edited) return false;
 		int exitOption = JOptionPane.showConfirmDialog(gui,
 			"The current sequence has been edited, but not saved.\nDo you wish to continue anyway?",
 			"File not saved - continue?", 
@@ -601,7 +601,7 @@ public class Moosique {
 		try {
 			MidiSystem.write(seq, 1, new File(file));
 			filename = file;
-			isEdited = false;
+			edited = false;
 			gui.setStatus("Saved " + file);
 			return true;
 		} catch (IOException e) {
@@ -625,7 +625,7 @@ public class Moosique {
 	/** 
 	 * A Comparator for sorting lists of MidiEvents.
 	 */
-	public static class NoteComparator implements Comparator {
+	public static class MidiEventComparator implements Comparator {
 		public int compare(Object o1, Object o2) {
 			return (int)(((MidiEvent)o1).getTick() - ((MidiEvent)o2).getTick());
 		}