X-Git-Url: https://ruin.nu/git/?p=moosique.git;a=blobdiff_plain;f=MooInstrumentList.java;h=388a9d6b4dc3d3748f82c826eee97428af0fbb93;hp=6f0211fa4931784707135b2bf4c92c048d014244;hb=c3a31c2aa833e2197f0929655c69a2090e8bbecc;hpb=d7666fadd2f8baca8a03cacae836f2563fe4dd5d

diff --git a/MooInstrumentList.java b/MooInstrumentList.java
index 6f0211f..388a9d6 100644
--- a/MooInstrumentList.java
+++ b/MooInstrumentList.java
@@ -6,24 +6,46 @@ import java.awt.event.*;
 /**
  * A Combo Box where the instrument of the currently active channel can be selected.
  * 
- * @author  Einar Pehrson
+ * @author  Einar Pehrson, Michael Andreen
  */
  
 public class MooInstrumentList extends JComboBox implements ActionListener {
 
-	public MooInstrumentList() {
-		super(instruments);
-		setFont(new Font("Times New Roman", Font.PLAIN, 10));
+	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, int listType) {
+		super(instruments[listType]);
+		setChannel(chan);	
+		setFont(new Font("Helvetica", Font.PLAIN, 10));
 		addActionListener(this);
 	}
 
+	/**
+	 * Sets the channel that it will operate on.
+	 */
+	public void setChannel(int chan) {
+		channel = chan;
+		setSelectedIndex(Moosique.getChannel(channel).getProgram());
+	}
+
+	/**
+	 * 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();
-		Moosique.getActiveChannel().programChange(instrument);
+		Moosique.getChannel(channel).programChange(instrument);
 	}
     
-	public static final String[] instruments = {
+	/**
+	 * The list with standard midi instruments.
+	 */
+	public static final String[][] instruments = {{
 		" 0 Acoustic Grand Piano",
 		" 1 Bright Acoustic Piano",
 		" 2 Electric Grand Piano",
@@ -152,5 +174,11 @@ public class MooInstrumentList extends JComboBox implements ActionListener {
 		" 125 Helicopter",
 		" 126 Applause",
 		" 127 Gunshot"
-	};
-}
\ No newline at end of file
+	}, new String[128]};
+	
+	static {
+		for (int i = 0; i < 128; i++) {
+			instruments[1][i] = " Program Change " + i;
+		}	
+	}
+}