hmm.. this doesn't want to work..

[moosique.git] / Moosique.java

diff --git a/Moosique.java b/Moosique.java
index 01b6b7664345685d633f6585aeaace8c8d011fad..9ecc0d886121d032f8a3d23a350a1dd9ec0adaa1 100644 (file)
--- a/Moosique.java
+++ b/Moosique.java
@@ -21,8 +21,11 @@ public class Moosique {
        private static MidiChannel activeChannel;
        private static MidiEvent[] timeSignatures, tempoChanges;
        private static ArrayList emptyTracks;
+       private static Map trackMute;
+       private static Map trackSolo;
 
-       private static String filename, fileArg;
+
+       private static String filename;
        private static long editPosition;
        private static boolean makeGUI = true, isEdited = false, drawEmptyTracks = false;
        private static Thread player;
@@ -35,6 +38,7 @@ public class Moosique {
                System.out.println("\nMoosique version 1.0\n");
 
                // Parses command-line arguments.
+               String fileArg = null;
                for (int i = 0; i < args.length; i++) {
                        if (args[i].equals("-n")) {makeGUI = false;}
                        else if (fileArg == null) {fileArg = args[i];}
@@ -54,7 +58,6 @@ public class Moosique {
                        setActiveChannel(0);
                } catch (MidiUnavailableException e) {
                        System.out.println("Failed, quitting.");
-//                     System.exit(1);
                }
                System.out.println("Done");
 
@@ -62,7 +65,7 @@ public class Moosique {
                if (fileArg != null) {
                        System.out.print("Loading MIDI sequence from " + fileArg + "...");
                        if (!load(fileArg)) {
-                               System.out.println("Failed");
+                               System.out.println("Failed, creating new sequence");
                                clearSequence();
                        } else {
                                System.out.println("Done");
@@ -74,7 +77,7 @@ public class Moosique {
 
                // Builds GUI, unless n-flag is set.
                if (makeGUI) {
-                       System.out.print("Building GUI...");
+                       System.out.print("Building GUI.");
                        try {
                                UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
                        } catch (Exception e) {}
@@ -153,6 +156,7 @@ public class Moosique {
                try {
                        seq = new Sequence(Sequence.PPQ, DEFAULT_RESOLUTION, DEFAULT_TRACKS);
                        sequencer.setSequence(seq);
+                       filename = null;
                        emptyTracks = new ArrayList();
                } catch (InvalidMidiDataException e) {}
                // Sends sequence to GUI.
@@ -182,6 +186,25 @@ public class Moosique {
         */
        public static void resume() {
                gui.update(0);
+               try {
+                       sequencer.setSequence(seq);
+                       Track[] tracks = seq.getTracks();
+
+                       for (int i = 0; i < tracks.length; i++) {
+                               
+                               Object ob = trackSolo.get(tracks[i]);
+                               if(ob instanceof Boolean){
+                                       System.out.println("Track solo " + i + "= "+ ob);
+                                       sequencer.setTrackSolo(i,((Boolean)ob).booleanValue());
+                               }
+
+                               ob = trackMute.get(tracks[i]);
+                               if(ob instanceof Boolean){
+                                       System.out.println("Track mute " + i + "= "+ ob);
+                                       sequencer.setTrackMute(i,((Boolean)ob).booleanValue());
+                               }
+                       }
+               } catch (InvalidMidiDataException e) {}
                sequencer.start();
 
                // Disables input to volatile components
@@ -190,15 +213,7 @@ public class Moosique {
                // Creates the visualisation thread and starts it.
                player = new Thread () {
                        public void run() {
-                               long ticksPerSixteenth = seq.getResolution()/4;
-                               System.out.println("Ticks/16: " + ticksPerSixteenth);
-                               long position = sequencer.getTickPosition();
                                while(sequencer.isRunning()) {
-                                       long pos = sequencer.getTickPosition();
-                                       long tickDiff = pos - position;
-                                       System.out.print(" ... " + tickDiff);
-                                       position = pos;
-
                                        // Updates the GUI with the current tick position.
                                        gui.update(sequencer.getTickPosition());
 
@@ -347,6 +362,8 @@ public class Moosique {
 
                Track[] tracks = seq.getTracks();
                emptyTracks = new ArrayList();
+               trackMute = new HashMap();
+               trackSolo = new HashMap();
 
                // Searches track 0 for changes in tempo and time signature.
                MidiEvent event;
@@ -391,7 +408,7 @@ public class Moosique {
                        Collections.sort(noteOns, c);
                        Collections.sort(noteOffs, c);
 
-                       // For each NoteOn event, finds its NoteOff event and replaces it with a MooNote.
+                       // Replaces each NoteOn event it with a MooNote containing a reference to the NoteOff event.
                        Iterator iOn = noteOns.iterator(), iOff;
                        MidiEvent on, off = null, nextOff;
                        ShortMessage onMsg, nextOffMsg;
@@ -420,7 +437,6 @@ public class Moosique {
                                iOn.remove();
                        }
                }
-
                // Sends sequence to GUI and sequencer, then returns
                if (gui != null) gui.setSequence(seq);
                try {
@@ -433,19 +449,27 @@ public class Moosique {
         * Saves the current sequence to the given filename
         * @param file  the filename to use
         */
-       public static void saveAs(String file) {
+       public static boolean saveAs(String file) {
                try {
-                       MidiSystem.write(seq, 1, new File(filename));
-               } catch (IOException e) {}
-               filename = file;
-               gui.setStatus("Saved " + file);
+                       MidiSystem.write(seq, 1, new File(file));
+                       filename = file;
+                       gui.setStatus("Saved " + file);
+                       return true;
+               } catch (IOException e) {
+                       gui.setStatus("Failed in saving " + file);
+                       return false;
+               }
        }
 
        /** 
         * Saves the current sequence to the previously given filename.
         */
-       public static void save() {
-               saveAs(filename);
+       public static boolean save() {
+               if (filename == null) return false;
+               else {
+                       saveAs(filename);
+                       return true;
+               }
        }
 
        /** 
@@ -456,4 +480,12 @@ public class Moosique {
                if (synthesizer.isOpen()) synthesizer.close();
                System.exit(0);
        }
-}
\ No newline at end of file
+       
+       public static void setTrackSolo(Track track, boolean on){
+               trackSolo.put(track, new Boolean(on));  
+       }
+
+       public static void setTrackMute(Track track, boolean on){
+               trackMute.put(track, new Boolean(on));  
+       }
+}