X-Git-Url: https://ruin.nu/git/?p=moosique.git;a=blobdiff_plain;f=Moosique.java;h=46efc7dc41e6acbadeba89067a09df0d566a3ec1;hp=edace75227333d65e706ced4755db1f2d11084eb;hb=948e069926266ead58bc5466520e131941f2466c;hpb=d50b6cfbebef6c3f620f916f0d2da838c4de3355 diff --git a/Moosique.java b/Moosique.java index edace75..46efc7d 100644 --- a/Moosique.java +++ b/Moosique.java @@ -19,12 +19,13 @@ public class Moosique { private static Synthesizer synthesizer; private static MidiChannel[] channels; private static MidiChannel activeChannel; + private static MetaMessage tempoMsg, timeSigMsg; 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. @@ -149,7 +150,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. @@ -168,14 +169,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 @@ -184,7 +188,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(); } }; @@ -197,10 +212,10 @@ public class Moosique { public static void stop() { if (sequencer.isRunning()) { sequencer.stop(); - sequencer.setTickPosition(editPosition); - player.interrupt(); - gui.update((long)0); } + sequencer.setTickPosition(editPosition); + if (player != null) player.interrupt(); + gui.update((long)0); } /** @@ -219,6 +234,41 @@ public class Moosique { editPosition = ticks; } + /** + * Returns the tempo of the current sequence. + * @return the tick position + */ + public static int getTempo() { + return 120; + // if (tempoMsg == null) return 0; + } + + /** + * Sets the current editing position of the sequencer. + * @param ticks the tick position + */ + public static void setTempo(int bpm) { + // tempoMsg + } + + /** + * Returns the tempo of the current sequence. + * @return the tick position + */ + public static int[] getTimeSig() { + int[] ts = {4, 4}; + return ts; + // if (timeSigMsg == null) return 0; + } + + /** + * Sets the current editing position of the sequencer. + * @param ticks the tick position + */ + public static void setTimeSig(int bpm) { + // timeSigMsg + } + /** * Returns true if the current sequence has been edited. * @return the tick position @@ -265,13 +315,32 @@ public class Moosique { return false; } isEdited = false; - - // Searches the sequence for NoteOn events + Track[] tracks = seq.getTracks(); + + // Stores tempo and time signature. + MidiMessage msg; + MetaMessage metaMsg; + for (int i = 0; i < tracks[0].size(); i++) { + msg = tracks[0].get(i).getMessage(); + if (msg.getStatus() == MetaMessage.META) { + metaMsg = (MetaMessage)msg; + if (metaMsg.getType() == 81) { + tempoMsg = metaMsg; + } else if (metaMsg.getType() == 88) { + timeSigMsg = (MetaMessage)msg; + } + + } + } + + // Searches the sequence for NoteOn events 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 +350,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)); + } } } } @@ -323,6 +390,7 @@ public class Moosique { MidiSystem.write(seq, 1, new File(filename)); } catch (IOException e) {} filename = file; + gui.setStatus("Saved " + file); } /**