X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=Moosique.java;h=9ecc0d886121d032f8a3d23a350a1dd9ec0adaa1;hb=f8acd2446a3907efc197bbf52ff55377fce0482a;hp=89669d37e972d197ffdba584062477e2c6ae5c84;hpb=83ec11f99e143607d057db2a68c262ca9672e524;p=moosique.git diff --git a/Moosique.java b/Moosique.java index 89669d3..9ecc0d8 100644 --- a/Moosique.java +++ b/Moosique.java @@ -20,10 +20,14 @@ public class Moosique { private static MidiChannel[] channels; 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; + private static boolean makeGUI = true, isEdited = false, drawEmptyTracks = false; private static Thread player; public static final int DEFAULT_RESOLUTION = 96, DEFAULT_TRACKS = 4; @@ -34,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];} @@ -53,7 +58,6 @@ public class Moosique { setActiveChannel(0); } catch (MidiUnavailableException e) { System.out.println("Failed, quitting."); -// System.exit(1); } System.out.println("Done"); @@ -61,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"); @@ -73,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) {} @@ -152,6 +156,8 @@ 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. if (gui != null) gui.setSequence(seq); @@ -180,29 +186,42 @@ 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 // gui.disable(); - System.out.println("Ticks/16: " + seq.getResolution()/4); - // Creates the visualisation thread and starts it. player = new Thread () { public void run() { - long position = sequencer.getTickPosition(); while(sequencer.isRunning()) { - long pos = sequencer.getTickPosition(); - System.out.print(" ... " + (pos - position)); - position = pos; - // 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)(15000 / getTempo())); + //sleep((long)((15000 / getTempo()) * (tickDiff / ticksPerSixteenth))); + sleep (10); } catch (InterruptedException e) { Moosique.stop(); } @@ -307,6 +326,24 @@ public class Moosique { editPosition += ticks; } + /** + * Returns whether the given track should be drawn + * @return true if the given track should be drawn + */ + public static boolean shouldBeDrawn(Track track) { + if (drawEmptyTracks) return true; + else return (!emptyTracks.contains(track)); + } + + + /** + * Sets whether empty tracks should be drawn + * @param state true if empty tracks should be drawn + */ + public static void setDrawEmptyTracks(boolean state) { + drawEmptyTracks = state; + } + /** * Loads the MooSequence in the given file. * @param filename the filename to use @@ -324,6 +361,9 @@ public class Moosique { isEdited = false; 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; @@ -357,6 +397,7 @@ public class Moosique { } noteOns.trimToSize(); noteOffs.trimToSize(); + if (noteOns.size() == 0) emptyTracks.add(tracks[i]); // Sorts the note lists by tick position. Comparator c = new Comparator() { @@ -367,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; @@ -396,46 +437,6 @@ public class Moosique { iOn.remove(); } } - - /* - Collections.sort(track[i].events, new Comparator() { - public int compare(Object o1, Object o2) { - return ((MidiEvent)o2).getTick() - ((MidiEvent)o1).getTick(); - } - }); - - // Searches the sequence for NoteOn events - MidiEvent noteOn, noteOff = null, nextEvent; - MidiMessage nextMsg; - ShortMessage shortMsg; - - for (int i = 0; i < tracks.length; i++) { - for (int j = 0; j < tracks[i].size(); j++) { - noteOn = tracks[i].get(j); - 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)); - } - } - } - } -*/ // Sends sequence to GUI and sequencer, then returns if (gui != null) gui.setSequence(seq); try { @@ -448,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; + } } /** @@ -471,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)); + } +}