X-Git-Url: https://ruin.nu/git/?p=moosique.git;a=blobdiff_plain;f=MooInstrumentList.java;h=91f8eea239733139899db97a5401ed8b585f978b;hp=7138c374f2c2e0379eee9907eb5ea0cfa64e70a4;hb=HEAD;hpb=a714980001770d23628599710a48260e12f09be4

diff --git a/MooInstrumentList.java b/MooInstrumentList.java
index 7138c37..91f8eea 100644
--- a/MooInstrumentList.java
+++ b/MooInstrumentList.java
@@ -11,16 +11,22 @@ 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) {
-		super(instruments);
+	public MooInstrumentList(int chan, int listType, ShortMessage programMsg) {
+		super(instruments[listType]);
+		programChangeMessage = programMsg;
+		if (programChangeMessage != null) setSelectedIndex(programChangeMessage.getData1());
 		setChannel(chan);	
-		setFont(new Font("Helvetica", Font.PLAIN, 10));
+		setFont(Moosique.getGUI().FONT);
 		addActionListener(this);
 	}
 
@@ -29,22 +35,24 @@ 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 (Exception 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 = {
+	public static final String[][] instruments = {{
 		" 0 Acoustic Grand Piano",
 		" 1 Bright Acoustic Piano",
 		" 2 Electric Grand Piano",
@@ -173,5 +181,11 @@ public class MooInstrumentList extends JComboBox implements ActionListener {
 		" 125 Helicopter",
 		" 126 Applause",
 		" 127 Gunshot"
-	};
+	}, new String[128]};
+	
+	static {
+		for (int i = 0; i < 128; i++) {
+			instruments[1][i] = " Program Change " + i;
+		}	
+	}
 }