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

diff --git a/MooInstrumentList.java b/MooInstrumentList.java
index 7138c37..4ae0cfa 100644
--- a/MooInstrumentList.java
+++ b/MooInstrumentList.java
@@ -12,15 +12,16 @@ import java.awt.event.*;
 public class MooInstrumentList extends JComboBox implements ActionListener {
 
 	protected int channel;
+	public static final int INSTRUMENTS = 0, DRUMS = 1;
 	
 	/**
 	 * Creates the instrument list.
 	 * @param chan The channel it will operate on.
 	 */
-	public MooInstrumentList(int chan) {
-		super(instruments);
+	public MooInstrumentList(int chan, int listType) {
+		super(instruments[listType]);
 		setChannel(chan);	
-		setFont(new Font("Helvetica", Font.PLAIN, 10));
+		setFont(Moosique.getGUI().FONT);
 		addActionListener(this);
 	}
 
@@ -44,7 +45,7 @@ public class MooInstrumentList extends JComboBox implements ActionListener {
 	/**
 	 * 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 +174,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;
+		}	
+	}
 }