*** empty log message ***

[moosique.git] / Moosique.java

diff --git a/Moosique.java b/Moosique.java
index 3ab75865495ce013afe7c989bb61faa7b4b2ac8a..e72cdf560d3df1e1b2e55dbdefb6ae0aecaad323 100644 (file)
--- a/Moosique.java
+++ b/Moosique.java
@@ -21,7 +21,7 @@ public class Moosique {
        private static MidiChannel activeChannel;
 
        private static String filename, fileArg;
-       private static long position;
+       private static long editPosition;
        private static boolean makeGUI = true, isEdited;
        private static Thread player;
        public static final int RESOLUTION = 96, DEFAULT_TRACKS = 4;
@@ -160,7 +160,7 @@ public class Moosique {
         * Starts playback of the current sequence.
         */
        public static void play() {
-               sequencer.setTickPosition(position);
+               sequencer.setTickPosition(editPosition);
                resume();
        }
 
@@ -168,14 +168,17 @@ 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
@@ -197,26 +200,26 @@ public class Moosique {
        public static void stop() {
                if (sequencer.isRunning()) {
                        sequencer.stop();
-                       sequencer.setTickPosition(position);
-                       player.interrupt();
-                       gui.update((long)0);
                }
+               sequencer.setTickPosition(editPosition);
+               if (player != null) player.interrupt();
+               gui.update((long)0);
        }
 
        /** 
-        * Returns the current tick position of the sequencer.
+        * Returns the current editing position of the sequencer.
         * @return the tick position
         */
        public static long getPosition() {
-               return sequencer.getTickPosition();
+               return editPosition;
        }
 
        /** 
-        * Sets the current tick position of the sequencer.
+        * Sets the current editing position of the sequencer.
         * @param ticks         the tick position
         */
        public static void setPosition(long ticks) {
-               sequencer.setTickPosition(ticks);
+               editPosition = ticks;
        }
 
        /** 
@@ -239,7 +242,7 @@ public class Moosique {
         * @param measures      the number of measures to rewind
         */
        public static void rewind(long ticks) {
-               setPosition(position - ticks);
+               editPosition -= ticks;
        }
 
        /** 
@@ -247,7 +250,7 @@ public class Moosique {
         * @param measures      the number of measures to fast forward
         */
        public static void forward(long ticks) {
-               setPosition(position + ticks);
+               editPosition += ticks;
        }
 
        /** 
@@ -271,7 +274,9 @@ public class Moosique {
                MidiEvent noteOn, noteOff = null, nextEvent;
                MidiMessage nextMsg;
                ShortMessage shortMsg;
+               ArrayList noteOns, noteOffs;
                for (int i = 0; i < tracks.length; i++) {
+                        noteOns = new ArrayList(tracks.length);
        /*
                        Collections.sort(track[i].events, new Comparator() {
                                public int compare(Object o1, Object o2) {
@@ -281,28 +286,26 @@ public class Moosique {
        */
                        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;
-                                                               }
+                               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));
                                                }
                                        }
+                                       // 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));
+                                       }
                                }
                        }
                }