inte helt klar

[moosique.git] / MooInstrumentList.java

diff --git a/MooInstrumentList.java b/MooInstrumentList.java
index 716cd182830340d35da72b8b174e1ce08ef6ffd4..ed976dd4434d952c614a113bc77030980b2d6855 100644 (file)
--- 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);
+               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 = {