no message

[moosique.git] / MooInstrumentList.java

diff --git a/MooInstrumentList.java b/MooInstrumentList.java
index 1b3378240502d654ca1b3dba95f42b7c189ccea1..91f8eea239733139899db97a5401ed8b585f978b 100644 (file)
--- a/MooInstrumentList.java
+++ b/MooInstrumentList.java
@@ -11,27 +11,48 @@ import java.awt.event.*;
  
 public class MooInstrumentList extends JComboBox implements ActionListener {
 
-       protected int channel;
+       private int channel;
+       private ShortMessage programChangeMessage;
+       public static final int INSTRUMENTS = 0, DRUMS = 1;
        
-       public MooInstrumentList(int chan) {
-               super(instruments);
+       /**
+        * Creates the instrument list.
+        * @param chan the channel it will operate on.
+        * @param type one of the constants: INSTRUMENTS and DRUMS
+        * @param chan the MIDI message assigning the initial program change
+        */
+       public MooInstrumentList(int chan, int listType, ShortMessage programMsg) {
+               super(instruments[listType]);
+               programChangeMessage = programMsg;
+               if (programChangeMessage != null) setSelectedIndex(programChangeMessage.getData1());
                setChannel(chan);       
-               setFont(new Font("Helvetica", Font.PLAIN, 10));
+               setFont(Moosique.getGUI().FONT);
                addActionListener(this);
        }
 
+       /**
+        * Sets the channel that it will operate on.
+        */
        public void setChannel(int chan) {
                channel = chan;
-               setSelectedIndex(Moosique.getChannel(channel).getProgram());
+               try {programChangeMessage.setMessage(programChangeMessage.getCommand(), chan, programChangeMessage.getData1(), 0);}
+               catch (Exception e) {}
        }
 
+       /**
+        * 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();
+               int instrument = ((JComboBox)e.getSource()).getSelectedIndex();
                Moosique.getChannel(channel).programChange(instrument);
+               try {programChangeMessage.setMessage(programChangeMessage.getCommand(), programChangeMessage.getChannel(), instrument, 0);}
+               catch (InvalidMidiDataException ex) {}
        }
     
-       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",
@@ -160,5 +181,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;
+               }       
+       }
 }