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

diff --git a/MooTrackTitle.java b/MooTrackTitle.java
index 412fb24..d5876c1 100644
--- a/MooTrackTitle.java
+++ b/MooTrackTitle.java
@@ -12,50 +12,43 @@ 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 channel = 0;
 
 	/** 
 	 * Creates the title bar.
 	 */
-	public MooTrackTitle (Track aTrack, int aTrackNum) {
+	public MooTrackTitle (Track aTrack) {
 		setDoubleBuffered(true);
 		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 +59,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 +70,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();
@@ -95,22 +89,22 @@ public class MooTrackTitle extends JPanel {
 		checkboxes.setLayout(new GridLayout(1,3));
 
 		mute = new JCheckBox("Mute");
-		mute.setSelected(Moosique.getSequencer().getTrackMute(trackNum));
+		mute.setSelected(Moosique.getChannel(channel).getMute());
 		mute.setFont(Moosique.getGUI().FONT);
 		mute.addActionListener(new ActionListener(){
 				public void actionPerformed(ActionEvent event){
 					boolean selected = mute.isSelected();
 					if (selected){
 						solo.setSelected(false);
-						Moosique.getSequencer().setTrackSolo(trackNum, false);
+						Moosique.getChannel(channel).setSolo(false);
 					}
-					Moosique.getSequencer().setTrackMute(trackNum, selected);
+					Moosique.getChannel(channel).setMute(selected);
 
 				}});
 		checkboxes.add(mute);
 
 		solo = new JCheckBox("Solo");
-		solo.setSelected(Moosique.getSequencer().getTrackSolo(trackNum));
+		solo.setSelected(Moosique.getChannel(channel).getSolo());
 		solo.setFont(Moosique.getGUI().FONT);
 		solo.addActionListener(new ActionListener(){
 				public void actionPerformed(ActionEvent event){
@@ -118,9 +112,9 @@ public class MooTrackTitle extends JPanel {
 					boolean selected = solo.isSelected();
 					if (selected){
 						mute.setSelected(false);
-						Moosique.getSequencer().setTrackMute(trackNum, false);
+						Moosique.getChannel(channel).setMute(false);
 					}
-					Moosique.getSequencer().setTrackSolo(trackNum, selected);
+					Moosique.getChannel(channel).setSolo(selected);
 				}});
 		checkboxes.add(solo);
 		add(checkboxes);