X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=MooTrackTitle.java;h=d3b9a8a754ce06c328d59570b316f2366fd64725;hb=cf968519ee77ab329c3e739c6340a9d688a31508;hp=412fb246f183a521d86246068ca5ec5eb99b8a3f;hpb=31f81450a303d52bf37ec8bcbb12e0f3b3b8b833;p=moosique.git

diff --git a/MooTrackTitle.java b/MooTrackTitle.java
index 412fb24..d3b9a8a 100644
--- a/MooTrackTitle.java
+++ b/MooTrackTitle.java
@@ -12,17 +12,18 @@ import javax.sound.midi.*;
  
 public class MooTrackTitle extends JPanel {
 
+	private Track track;
 	private MetaMessage trackNameMessage;
-	private String trackName = "";
 	private ShortMessage programChangeMessage;
-	private int programChange = 0, channel = 0;
+
 	private JTextField title;
 	private MooInstrumentList instruments;
 	private JComboBox channelBox;
 	private JCheckBox mute;
 	private JCheckBox solo;
-	private Track track;
-	private int trackNum;
+
+	private String trackName = "";
+	private int trackNum, channel = 0;
 
 	/** 
 	 * Creates the title bar.
@@ -32,30 +33,23 @@ public class MooTrackTitle extends JPanel {
 		track = aTrack;
 		this.trackNum = aTrackNum;
 
-		// Finds track name and program change
+		// Finds track name, program change and channel.
 		MidiMessage msg;
+		int status;
 		for (int i = 0; i < track.size(); i++) {
 			msg = track.get(i).getMessage();
-			if (msg.getStatus() == 255) {
+			status = msg.getStatus();
+			if (status == MetaMessage.META) {
 				if (((MetaMessage)msg).getType() == 3) {
 					trackNameMessage = (MetaMessage)msg;
 					trackName = new String(trackNameMessage.getData());
 				}
-			} else if (msg.getStatus() == 192) {
+			} else if (status >= 192 && status <= 207) {
 				programChangeMessage = (ShortMessage)msg;
-				programChange = programChangeMessage.getData1();
+				channel = status - 192;
 			}
 		}
 
-		MidiEvent event;
-		for (int i = 0; i < track.size(); i++) {
-			event = track.get(i);
-			if (event instanceof MooNote) {
-				channel = ((MooNote)event).getChannel();
-				break;
-			}
-		}
-		
 		// Creates and places components.
 		setLayout(new GridLayout(4,1));
 		setBorder(BorderFactory.createLineBorder(Color.black));
@@ -66,6 +60,10 @@ public class MooTrackTitle extends JPanel {
 		title.addFocusListener(new TitleFocusListener());
 		add(title);
 
+		instruments = new MooInstrumentList(channel);
+		// instruments = new MooInstrumentList(channel, programChangeMessage);
+		add(instruments);
+
 		channelBox = new JComboBox();
 		channelBox.setFont(Moosique.getGUI().FONT);
 		for (int i = 1; i <= 16; i++)
@@ -73,9 +71,6 @@ public class MooTrackTitle extends JPanel {
 
 		channelBox.setSelectedIndex(channel);
 
-		instruments = new MooInstrumentList(channelBox.getSelectedIndex());
-		add(instruments);
-
 		channelBox.addActionListener(new ActionListener(){
 				public void actionPerformed(ActionEvent e){
 					int chan = channelBox.getSelectedIndex();