Fixed some error handling

diff --git a/MooGUI.java b/MooGUI.java
index 0095f42fc6906e60be3d06332bef79695718e833..c06dc3a078dca659aacd7c224c4e61a14cf0b64d 100644 (file)
--- a/MooGUI.java
+++ b/MooGUI.java
@@ -15,7 +15,7 @@ public class MooGUI {
        /* 
         * Creates the GUI.
         */
-       public MooGUI () {
+       public MooGUI (Sequence seq) {
 
        }
        
@@ -26,4 +26,4 @@ public class MooGUI {
        public void setSequence(Sequence sequence) {
                seq = sequence;
        }
-}
+}
\ No newline at end of file

diff --git a/Moosique.java b/Moosique.java
index 792a7f2ba5d564e47700542e2d082c808178f9a0..6efb2d1f747fa89e158abb2eefd15c40a3468391 100644 (file)
--- a/Moosique.java
+++ b/Moosique.java
@@ -2,16 +2,6 @@ import javax.sound.midi.*;
 import javax.swing.*;
 import java.io.*;
 
-/* UPDATES
-       Killed superfluous exportMIDI method.
-       Added public static void quit()
-       Removed Sequence seq property.
-       Changed forward(int measures) and rewind(int measures) to forward(long ticks) and rewind(long ticks).
-       Added public static long getPosition()
-       Added public static void setPosition(long ticks)
-       Added public static void resume()
-*/
-
 /*
  * Moosique - The MIDI Tracker
  * 
@@ -51,18 +41,16 @@ public class Moosique {
                }
 
                //If a filename is given as the command-line argument, attempts to load a sequence from the file.
-               try {
-                       if (args.length == 1) {
-                               if (!load(args[0])) seq = new Sequence(Sequence.PPQ, 96);
-                       } else {
-                               // Otherwise creates a new empty one.
-                               seq = new Sequence(Sequence.PPQ, 96);
-                       }
-               } catch (InvalidMidiDataException e) {}
+               if (args.length == 1) {
+                       if (!load(args[0])) createSequence();
+               } else {
+                       // Otherwise creates a new empty one.
+                       createSequence();
+               }
 
                // Sets up channels and GUI.
                channels = synthesizer.getChannels();
-               gui = new MooGUI();
+               gui = new MooGUI(seq);
        }
 
        /* 
@@ -73,14 +61,24 @@ public class Moosique {
                return seq;
        }
 
+       /* 
+        * Returns a pointer to the current sequence.
+        * @return the current sequence
+        */
+       public static void createSequence() {
+               try {
+                       seq = new Sequence(Sequence.PPQ, 96);
+               } catch (InvalidMidiDataException e) {}
+       }
+
        /* 
         * Starts playback of the current sequence.
         */
        public static void play() {
                try {
                        sequencer.setSequence(seq);
+                       sequencer.setTickPosition(position);
                } catch (InvalidMidiDataException e) {}
-               sequencer.setTickPosition(position);
                sequencer.start();
        }