Added MooViewCounter as the row header of MooView

[moosique.git] / Moosique.java

diff --git a/Moosique.java b/Moosique.java
index 33381f1b99b7193af0e147e63b7fd61a0216ce99..c9ed3ae003931b43f74d9c7ad3e7609dd0ca5d0e 100644 (file)
--- a/Moosique.java
+++ b/Moosique.java
@@ -19,13 +19,14 @@ public class Moosique {
        private static Synthesizer synthesizer;
        private static MidiChannel[] channels;
        private static MidiChannel activeChannel;
-       private static MetaMessage tempoMsg, timeSigMsg;
+       private static MetaMessage timeSigMsg;
+       private static MetaMessage[] tempoChgMsgs;
 
        private static String filename, fileArg;
        private static long editPosition;
        private static boolean makeGUI = true, isEdited;
        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.
@@ -150,7 +151,7 @@ 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);
                } catch (InvalidMidiDataException e) {}
                // Sends sequence to GUI.
@@ -188,7 +189,18 @@ public class Moosique {
                // Creates the visualization thread and starts it.
                player = new Thread () {
                        public void run() {
-                               while(sequencer.isRunning()) gui.update(sequencer.getTickPosition());
+                               while(sequencer.isRunning()) {
+                                       // 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)));
+                                       } catch (InterruptedException e) {
+                                               Moosique.stop();
+                                       }
+                               }
                                Moosique.stop();
                        }
                };
@@ -228,8 +240,8 @@ public class Moosique {
         * @return the tick position
         */
        public static int getTempo() {
-               if (tempoMsg == null) return 0;
                return 120;
+               // if (tempoMsg == null) return 0;
        }
 
        /** 
@@ -237,16 +249,17 @@ public class Moosique {
         * @param ticks         the tick position
         */
        public static void setTempo(int bpm) {
-               // tempoMsg, timeSigMsg
+               // tempoMsg
        }
 
        /** 
         * Returns the tempo of the current sequence.
         * @return the tick position
         */
-       public static int getTimeSig() {
-               if (timeSigMsg == null) return 0;
-               return 120;
+       public static int[] getTimeSig() {
+               int[] ts = {4, 4};
+               return ts;
+               // if (timeSigMsg == null) return 0;
        }
 
        /** 
@@ -254,7 +267,7 @@ public class Moosique {
         * @param ticks         the tick position
         */
        public static void setTimeSig(int bpm) {
-               // tempoMsg, timeSigMsg
+               // timeSigMsg
        }
 
        /** 
@@ -314,7 +327,7 @@ public class Moosique {
                        if (msg.getStatus() == MetaMessage.META) {
                                metaMsg = (MetaMessage)msg;
                                if (metaMsg.getType() == 81) {
-                                       tempoMsg = metaMsg;
+// FLERA!!!                    tempoMsg = metaMsg;
                                } else if (metaMsg.getType() == 88) {
                                        timeSigMsg = (MetaMessage)msg;
                                }
@@ -328,14 +341,6 @@ public class Moosique {
                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) {
-                                       return ((MidiEvent)o2).getTick() - ((MidiEvent)o1).getTick();
-                               }
-                       });
-       */
                        for (int j = 0; j < tracks[i].size(); j++) {
                                noteOn = tracks[i].get(j);
                                if (noteOn.getMessage().getStatus() == ShortMessage.NOTE_ON) {
@@ -361,6 +366,7 @@ public class Moosique {
                                }
                        }
                }
+
                // Sends sequence to GUI and sequencer, then returns
                if (gui != null) gui.setSequence(seq);
                try {