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

diff --git a/MooInstrumentList.java b/MooInstrumentList.java
index 6f0211f..ed976dd 100644
--- a/MooInstrumentList.java
+++ b/MooInstrumentList.java
@@ -6,21 +6,28 @@ 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() {
+	protected int channel;
+	public MooInstrumentList(int chan) {
 		super(instruments);
-		setFont(new Font("Times New Roman", Font.PLAIN, 10));
+		setChannel(chan);	
+		setFont(new Font("Helvetica", Font.PLAIN, 10));
 		addActionListener(this);
 	}
 
+	public void setChannel(int chan){
+		channel = chan;
+		setSelectedIndex(Moosique.getChannel(channel).getProgram());
+	}
+
 	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 = {
@@ -153,4 +160,4 @@ public class MooInstrumentList extends JComboBox implements ActionListener {
 		" 126 Applause",
 		" 127 Gunshot"
 	};
-}
\ No newline at end of file
+}