From 1d2d2bfd14ba0addab97692527d4414d3a87e13d Mon Sep 17 00:00:00 2001 From: Einar Pehrson Date: Fri, 23 May 2003 00:44:35 +0000 Subject: [PATCH] Fixed accessors, encoders and decoders for tempo and time signature. --- MooGUI.java | 4 +- MooInstrumentList.java | 21 ++-- MooMenu.java | 6 +- MooNote.java | 2 +- MooTrackTitle.java | 8 +- MooTrackView.java | 2 +- Moosique.java | 220 ++++++++++++++++++++++++++++++++--------- To Do.txt | 2 - 8 files changed, 197 insertions(+), 68 deletions(-) diff --git a/MooGUI.java b/MooGUI.java index 4900264..3ecb308 100644 --- a/MooGUI.java +++ b/MooGUI.java @@ -3,6 +3,7 @@ import javax.swing.*; import java.awt.*; import java.awt.event.*; import java.util.*; +import java.io.*; /** * Moosique's graphical user interface. @@ -27,8 +28,9 @@ public class MooGUI extends JFrame { * Creates the GUI. * @param seq The sequence that the program is operating on. */ - public MooGUI(Sequence seq) { + public MooGUI(Sequence seq, File file) { super("Moosique"); + if (file != null) setTitle("Moosique - " + file.getName()); this.seq = seq; advanceStatus(); diff --git a/MooInstrumentList.java b/MooInstrumentList.java index 4ae0cfa..34ff4da 100644 --- a/MooInstrumentList.java +++ b/MooInstrumentList.java @@ -11,15 +11,20 @@ import java.awt.event.*; public class MooInstrumentList extends JComboBox implements ActionListener { - protected int channel; + private int channel; + private ShortMessage programChangeMessage; public static final int INSTRUMENTS = 0, DRUMS = 1; /** * Creates the instrument list. - * @param chan The channel it will operate on. + * @param chan the channel it will operate on. + * @param type one of the constants: INSTRUMENTS and DRUMS + * @param chan the MIDI message assigning the initial program change */ - public MooInstrumentList(int chan, int listType) { + public MooInstrumentList(int chan, int listType, ShortMessage programMsg) { super(instruments[listType]); + programChangeMessage = programMsg; + setSelectedIndex(programChangeMessage.getData1()); setChannel(chan); setFont(Moosique.getGUI().FONT); addActionListener(this); @@ -30,20 +35,22 @@ public class MooInstrumentList extends JComboBox implements ActionListener { */ public void setChannel(int chan) { channel = chan; - setSelectedIndex(Moosique.getChannel(channel).getProgram()); + try {programChangeMessage.setMessage(programChangeMessage.getCommand(), chan, programChangeMessage.getData1(), 0);} + catch (InvalidMidiDataException e) {} } /** * Sets the instrument on a channel when it's changed in the combobox. */ public void actionPerformed(ActionEvent e) { - JComboBox box = (JComboBox)e.getSource(); - int instrument = box.getSelectedIndex(); + int instrument = ((JComboBox)e.getSource()).getSelectedIndex(); Moosique.getChannel(channel).programChange(instrument); + try {programChangeMessage.setMessage(programChangeMessage.getCommand(), programChangeMessage.getChannel(), instrument, 0);} + catch (InvalidMidiDataException ex) {} } /** - * The list with standard midi instruments. + * The list with standard MIDI instruments. */ public static final String[][] instruments = {{ " 0 Acoustic Grand Piano", diff --git a/MooMenu.java b/MooMenu.java index 7c6be00..25cab5c 100644 --- a/MooMenu.java +++ b/MooMenu.java @@ -167,9 +167,9 @@ public class MooMenu extends JMenuBar implements ActionListener { // Stores the current directory and loads the selected file. File file = chooser.getSelectedFile(); if(returnVal == JFileChooser.APPROVE_OPTION && isMidiFile(file)) { - directory = chooser.getSelectedFile().getParentFile(); + directory = file.getParentFile(); if (!Moosique.promptOnUnsavedChanges()) - Moosique.load(chooser.getSelectedFile().getAbsolutePath()); + Moosique.load(file); } } else if (command == "Save") { if (!Moosique.save()) showSaveAsDialog(); @@ -250,7 +250,7 @@ public class MooMenu extends JMenuBar implements ActionListener { File file = chooser.getSelectedFile(); if(returnVal == JFileChooser.APPROVE_OPTION && isMidiFile(file)) { directory = file.getParentFile(); - Moosique.saveAs(file.getAbsolutePath()); + Moosique.saveAs(file); } } diff --git a/MooNote.java b/MooNote.java index 34b0f2f..5628b1d 100644 --- a/MooNote.java +++ b/MooNote.java @@ -40,7 +40,7 @@ public class MooNote extends MidiEvent implements Cloneable, Comparable { noteOffMsg = (ShortMessage)noteOffEvent.getMessage(); try { noteOnMsg.setMessage(ShortMessage.NOTE_ON, channel, pitch, velocity); - noteOffMsg.setMessage(ShortMessage.NOTE_OFF, channel, pitch, 0); + noteOffMsg.setMessage(ShortMessage.NOTE_OFF, channel, pitch, 64); } catch (InvalidMidiDataException e) {System.out.println("Invalid data!");} } diff --git a/MooTrackTitle.java b/MooTrackTitle.java index 4079e45..6a3e1b5 100644 --- a/MooTrackTitle.java +++ b/MooTrackTitle.java @@ -39,7 +39,7 @@ public class MooTrackTitle extends JPanel { /** * Creates the title bar. - * @param aTrack the track that this tracktitle is operating on. + * @param aTrack the track that this track title is operating on. */ public MooTrackTitle (Track aTrack) { setDoubleBuffered(true); @@ -58,8 +58,7 @@ public class MooTrackTitle extends JPanel { } } else if (status >= 192 && status < 208) { programChangeMessage = (ShortMessage)msg; - // System.out.println("Program change " + programChangeMessage.getData1()); - channel = status - 192; + channel = programChangeMessage.getChannel(); } } @@ -77,8 +76,7 @@ public class MooTrackTitle extends JPanel { int type; if (channel == 9) type = MooInstrumentList.DRUMS; else type = MooInstrumentList.INSTRUMENTS; - instruments = new MooInstrumentList(channel, type); - // instruments = new MooInstrumentList(channel, type, programChangeMessage); + instruments = new MooInstrumentList(channel, type, programChangeMessage); add(instruments); channelBox = new JComboBox(); diff --git a/MooTrackView.java b/MooTrackView.java index 126ee63..916e8fc 100644 --- a/MooTrackView.java +++ b/MooTrackView.java @@ -45,6 +45,7 @@ public class MooTrackView extends JPanel { // Defines instance variables this.track = track; this.title = title; + ticksPerSixteenth = Moosique.getSequence().getResolution() / 4; insets = getInsets(); coords = new ArrayList(track.size() / 2); selection = new TreeSet(); @@ -137,7 +138,6 @@ public class MooTrackView extends JPanel { } // Creates temporary variables. - ticksPerSixteenth = Moosique.getSequence().getResolution() / 4; MooNote mn = elem.getNote(); int x, y, height; diff --git a/Moosique.java b/Moosique.java index 8da5285..e2b7f3e 100644 --- a/Moosique.java +++ b/Moosique.java @@ -20,14 +20,13 @@ public class Moosique { private static Receiver receiver; private static MidiChannel[] channels; private static MidiChannel activeChannel; - private static MidiEvent[] timeSignatures, tempoChanges; - private static ArrayList copyBuffer, emptyTracks; + private static ArrayList copyBuffer, emptyTracks, timeSignatures, tempoChanges; private static Map trackMute = new HashMap(); private static Map trackSolo = new HashMap(); private static Thread player; - private static String filename; + private static File file = null; private static long editPosition; private static boolean makeGUI = true, initSound = true, edited = false, drawEmptyTracks = false; public static final int DEFAULT_RESOLUTION = 96, DEFAULT_TRACKS = 4; @@ -40,7 +39,7 @@ public class Moosique { * loads a sequence and creates the GUI. */ public static void main (String[] args) { - System.out.println("\nMoosique version 1.0\n"); + out("\nMoosique version 1.0\n"); // Parses command-line arguments. String fileArg = null; @@ -69,10 +68,10 @@ public class Moosique { channels = synthesizer.getChannels(); setActiveChannel(0); } catch (MidiUnavailableException e) { - System.out.println("Failed, quitting."); + out("Failed, quitting."); System.exit(1); } - System.out.println("Done"); + out("Done"); // Loads user preferences (work directory, last opened files etc). loadPreferences(); @@ -80,11 +79,11 @@ public class Moosique { //If a filename is given as the command-line argument, attempts to load a sequence from the file. if (fileArg != null) { System.out.print("Loading MIDI sequence from " + fileArg + "..."); - if (!load(fileArg)) { - System.out.println("Failed, creating new sequence"); + if (!load(new File(fileArg))) { + out("Failed, creating new sequence"); clearSequence(); } else { - System.out.println("Done"); + out("Done"); } } else { // Otherwise creates a new empty one. @@ -97,13 +96,13 @@ public class Moosique { try { UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); } catch (Exception e) {} - gui = new MooGUI(seq); - System.out.println("Done"); + gui = new MooGUI(seq, file); + out("Done"); } else { System.out.print("Playing..."); play(); while (sequencer.isRunning()) {} - System.out.println("Done"); + out("Done"); quit(); } } @@ -142,14 +141,6 @@ public class Moosique { return channels[i]; } - /** - * Returns the MidiChannels of the selected synthesizer. - * @return the available MidiChannels - */ - public static MidiChannel[] getChannels() { - return channels; - } - /** * Returns the current copy buffer. * @return the current copy buffer @@ -215,12 +206,21 @@ public class Moosique { } /** - * Returns the tempo of the current sequence. - * @return the tick position + * Returns the tempo in the given tick position. + * @param tick the tick position for which to return the tempo + * @return the tempo at the specified tick position */ - public static int getTempo() { - return 120; - // if (tempoMsg == null) return 0; + public static int getTempo(long tick) { + if (tempoChanges.size() == 0) return 120; + MidiEvent tempoEvent = (MidiEvent)tempoChanges.get(0); + if (tempoChanges.size() > 1) { + for (int i = 1; i < tempoChanges.size(); i++) { + MidiEvent nextTempoEvent = (MidiEvent)tempoChanges.get(i); + if (nextTempoEvent.getTick() < tick && nextTempoEvent.getTick() > tempoEvent.getTick()) + tempoEvent = nextTempoEvent; + } + } + return decodeTempo(((MetaMessage)tempoEvent.getMessage()).getData()); } /** @@ -239,13 +239,22 @@ public class Moosique { } /** - * Returns the tempo of the current sequence. - * @return the tick position + * Returns the time signature in the given tick position. + * @param tick the tick position for which to return the time signature + * @return an array of two integers where [0] is the numerator and [1] the denominator */ - public static int[] getTimeSig() { + public static int[] getTimeSig(long tick) { int[] ts = {4, 4}; - return ts; - // if (timeSigMsg == null) return 0; + if (timeSignatures.size() == 0) return ts; + MidiEvent timeSigEvent = (MidiEvent)timeSignatures.get(0); + if (timeSignatures.size() > 1) { + for (int i = 1; i < timeSignatures.size(); i++) { + MidiEvent nextTimeSigEvent = (MidiEvent)timeSignatures.get(i); + if (nextTimeSigEvent.getTick() < tick && nextTimeSigEvent.getTick() > timeSigEvent.getTick()) + timeSigEvent = nextTimeSigEvent; + } + } + return decodeTimeSig(((MetaMessage)timeSigEvent.getMessage()).getData()); } /** @@ -387,6 +396,75 @@ public class Moosique { + /* *** + ** ENCODING / DECODING METHODS ** + *** */ + + + + + + + + + /** + * Returns the byte array for the given tempo. + * @param tempo the tempo in beats per minute + * @return an array of bytes representing the given tempo + */ + public static byte[] encodeTempo(int tempo) { + int microSecsPerQuarter = 60000000 / tempo; + byte[] b = new byte[3]; + b[0] = (byte)(microSecsPerQuarter / 65536); + b[1] = (byte)((microSecsPerQuarter - (b[0] * 65536)) / 256); + b[2] = (byte)(microSecsPerQuarter - (b[0] * 65536) - (b[1] * 256)); + return b; + } + + /** + * Returns the tempo for the given byte array. + * @param an array of three bytes representing the tempo + * @return the tempo in beats per minute + */ + public static int decodeTempo(byte[] bytes) { + return 60000000 / (bytes[0] * 65536 + bytes[1] * 256 + bytes[2]); // bytes[0] & 0xFF ??? + } + + /** + * Returns the byte array for the given time signature. + * @param numerator the numerator of the time signature + * @param denominator the denominator of the time signature + * @return an array of bytes representing the given time signature + */ + public static byte[] encodeTimeSig(int numerator, int denominator) { + byte[] b = { + (byte)numerator, + (byte)(Math.log(denominator) / Math.log(2)), + (byte)96, + (byte)8 + }; + return b; + } + /** + * Returns the time signature for the given byte array. + * @param an array of four bytes representing the time signature + * @return an array of two integers where [0] is the numerator and [1] the denominator + */ + public static int[] decodeTimeSig(byte[] bytes) { + int[] t = { + (int)bytes[0], + (int)(1 << bytes[1]) + }; + return t; + } + + + + + + + + /* *** ** PLAYBACK METHODS ** *** */ @@ -483,19 +561,58 @@ public class Moosique { * Replaces the current sequence with a new one, holding three empty tracks. */ public static void clearSequence() { - // Creates a new sequence and sends it to the sequencer. try { + // Creates a new sequence. seq = new Sequence(Sequence.PPQ, DEFAULT_RESOLUTION, DEFAULT_TRACKS); - sequencer.setSequence(seq); - filename = null; + Track[] tracks = seq.getTracks(); + + // Creates messages for default tempo (120) and time signature (4/4). + MetaMessage timeSigMsg = new MetaMessage(); + MetaMessage tempoMsg = new MetaMessage(); + try { + timeSigMsg.setMessage(88, encodeTimeSig(4, 4), 4); + tempoMsg.setMessage(81, encodeTempo(120), 3); + } catch (InvalidMidiDataException e) {} + + // Adds them to track 0. + tracks[0].add(new MidiEvent(timeSigMsg, (long)0)); + tracks[0].add(new MidiEvent(tempoMsg, (long)0)); + + // Sets program and title for the tracks. + initializeTrack(tracks[1], 0, 24, "Guitar"); + initializeTrack(tracks[2], 1, 33, "Bass"); + initializeTrack(tracks[3], 9, 0, "Drums"); + + file = null; emptyTracks = new ArrayList(); + timeSignatures = new ArrayList(); + tempoChanges = new ArrayList(); trackSolo = new HashMap(); trackMute = new HashMap(); copyBuffer = new ArrayList(); } catch (InvalidMidiDataException e) {} - // Sends sequence to GUI. + // Sends the sequence to the GUI. if (gui != null) gui.setSequence(seq); } + + /** + * Creates event in the given track for program change and title. + */ + private static void initializeTrack(Track track, int channel, int program, String title) { + // Creates program change and title message. + ShortMessage programMsg = new ShortMessage(); + MetaMessage titleMsg = new MetaMessage(); + + // Sets the data of the messages. + try { + programMsg.setMessage(ShortMessage.PROGRAM_CHANGE, channel, program, 0); + titleMsg.setMessage(3, title.getBytes(), title.length()); + } catch (InvalidMidiDataException e) {} + + // Adds them to the track. + track.add(new MidiEvent(programMsg, (long)0)); + track.add(new MidiEvent(titleMsg, (long)0)); + } /** * Wraps each NoteOn event in the track with its NoteOff event in a MooNote. @@ -566,15 +683,17 @@ public class Moosique { * Loads a MIDI sequence from the given file. * @param filename the filename to use */ - public static boolean load(String file) { + public static boolean load(File loadFile) { // Loads sequence from file - filename = file; - try {seq = MidiSystem.getSequence(new File(filename));} + try {seq = MidiSystem.getSequence(loadFile);} catch (Exception e) {return false;} + file = loadFile; edited = false; Track[] tracks = seq.getTracks(); emptyTracks = new ArrayList(); + timeSignatures = new ArrayList(); + tempoChanges = new ArrayList(); trackMute = new HashMap(); trackSolo = new HashMap(); copyBuffer = new ArrayList(); @@ -588,13 +707,11 @@ public class Moosique { if (event.getMessage().getStatus() == MetaMessage.META) { metaMsg = (MetaMessage)event.getMessage(); switch(metaMsg.getType()) { - case 81: tc.add(event); break; - case 88: ts.add(event); + case 81: tempoChanges.add(event); break; + case 88: timeSignatures.add(event); } } } - // timeSignatures = ts.toArray(timeSignatures); - // tempoChanges = tc.toArray(tempoChanges); // Converts tracks. for (int i = 0; i < tracks.length; i++) { @@ -652,9 +769,9 @@ public class Moosique { * Saves the current sequence to the previously given filename. */ public static boolean save() { - if (filename == null) return false; + if (file == null) return false; else { - saveAs(filename); + saveAs(file); return true; } } @@ -663,19 +780,26 @@ public class Moosique { * Saves the current sequence to the given filename * @param file the filename to use */ - public static boolean saveAs(String file) { + public static boolean saveAs(File saveFile) { try { - MidiSystem.write(seq, 1, new File(file)); - filename = file; + MidiSystem.write(seq, 1, saveFile); + file = saveFile; edited = false; - gui.setStatus("Saved " + file); + gui.setStatus("Saved " + file.getAbsolutePath()); return true; } catch (IOException e) { - gui.setStatus("Failed in saving " + file); + gui.setStatus("Failed in saving " + file.getAbsolutePath()); return false; } } + /** + * Prints the given string to the System output. + */ + private static void out(String text) { + System.out.println(text); + } + /** * Releases all reserved devices and exits the program. */ diff --git a/To Do.txt b/To Do.txt index 47f6068..f6b6d37 100644 --- a/To Do.txt +++ b/To Do.txt @@ -18,9 +18,7 @@ x Kopiera/flytta sp TEMPO / TAKTART -x Räkna ut tempo och taktart. Tempo > MooToolbar. x Implementera getTicksForPosition, getPositionForTicks och quantize i Moosique. -x Lägg till event för tempo, time signature, program change (inkl. kanal 1,2,10) i nya filer. ANNAT x Fixa InstrumentList. -- 2.39.2