From ce9a16d679f2058454af367e972888ba8e2c34c0 Mon Sep 17 00:00:00 2001
From: Michael Andreen <harv@ruin.nu>
Date: Fri, 16 May 2003 14:18:58 +0000
Subject: [PATCH] setting mute and solo on channel instead..

---
 MooTrackTitle.java | 17 ++++++++---------
 MooView.java       |  6 +++---
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/MooTrackTitle.java b/MooTrackTitle.java
index d3b9a8a..d5876c1 100644
--- a/MooTrackTitle.java
+++ b/MooTrackTitle.java
@@ -23,15 +23,14 @@ public class MooTrackTitle extends JPanel {
 	private JCheckBox solo;
 
 	private String trackName = "";
-	private int trackNum, channel = 0;
+	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, program change and channel.
 		MidiMessage msg;
@@ -90,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){
@@ -113,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);
diff --git a/MooView.java b/MooView.java
index 836629b..ee2880b 100644
--- a/MooView.java
+++ b/MooView.java
@@ -51,7 +51,7 @@ public class MooView extends JScrollPane {
 		if (numberOfTracks == 1) {
 			// If MIDI file is of type 0, creates a view for the track.
 			trackPanel.setLayout(new FlowLayout());
-			MooTrackTitle title = new MooTrackTitle(tracks[0],0);
+			MooTrackTitle title = new MooTrackTitle(tracks[0]);
 			titlePanel.add(title);
 			trackPanel.add(new MooTrackView(tracks[0], title));
 		} else {
@@ -71,7 +71,7 @@ public class MooView extends JScrollPane {
 			for (int i = 1; i < tracks.length; i++) {
 				if (Moosique.shouldBeDrawn(tracks[i])) {
 					System.out.println("Draws track " + i);
-					MooTrackTitle title = new MooTrackTitle(tracks[i],i);
+					MooTrackTitle title = new MooTrackTitle(tracks[i]);
 					titlePanel.add(title);
 					trackPanel.add(new MooTrackView(tracks[i], title));
 					progressBar.setValue(i);
@@ -116,7 +116,7 @@ public class MooView extends JScrollPane {
 	public void addTrackView(Track track, int index) {
 		((GridLayout)trackPanel.getLayout()).setColumns(++numberOfTracks);
 		((GridLayout)titlePanel.getLayout()).setColumns(++numberOfTracks);
-		MooTrackTitle title = new MooTrackTitle(track,index);
+		MooTrackTitle title = new MooTrackTitle(track);
 		titlePanel.add(title, index);
 		trackPanel.add(new MooTrackView(track, title), index);
 		validate();
-- 
2.39.2