inte helt klar

[moosique.git] / MooInstrumentList.java

diff --git a/MooInstrumentList.java b/MooInstrumentList.java
index 3e538d489d9b7edc672984addd0f5e077839d8aa..ed976dd4434d952c614a113bc77030980b2d6855 100644 (file)
--- a/MooInstrumentList.java
+++ b/MooInstrumentList.java
@@ -1,24 +1,33 @@
 import javax.sound.midi.*;
 import javax.swing.*;
+import java.awt.*;
 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 = {
@@ -151,4 +160,4 @@ public class MooInstrumentList extends JComboBox implements ActionListener {
                " 126 Applause",
                " 127 Gunshot"
        };
-}
\ No newline at end of file
+}