From: Einar Pehrson <einarp@itstud.chalmers.se>
Date: Tue, 13 May 2003 23:31:50 +0000 (+0000)
Subject: no message
X-Git-Url: https://ruin.nu/git/?p=moosique.git;a=commitdiff_plain;h=31f81450a303d52bf37ec8bcbb12e0f3b3b8b833

no message
---

diff --git a/MooToolbar.java b/MooToolbar.java
index e5e46da..9852c6a 100644
--- a/MooToolbar.java
+++ b/MooToolbar.java
@@ -74,6 +74,7 @@ public class MooToolbar extends JToolBar {
 	 * @param tickPosition	the tick position to visualize
 	 */
 	public void updateProgInd(long tickPosition) {
+		ticksPerBeat = Moosique.getSequence().getResolution();
 		if (tickPosition == 0) {
 			resetProgInd();
 		} else {
diff --git a/MooTrackTitle.java b/MooTrackTitle.java
index a97844b..412fb24 100644
--- a/MooTrackTitle.java
+++ b/MooTrackTitle.java
@@ -61,15 +61,11 @@ public class MooTrackTitle extends JPanel {
 		setBorder(BorderFactory.createLineBorder(Color.black));
 
 		setPreferredSize(new Dimension(MooTrackView.VIEW_WIDTH,70));
-		title = new JTextField(trackName); // JTextField(String text, int columns) 
+		title = new JTextField(trackName);
 		title.setFont(Moosique.getGUI().FONT);
 		title.addFocusListener(new TitleFocusListener());
 		add(title);
 
-
-		JPanel checkboxes = new JPanel();
-		checkboxes.setLayout(new GridLayout(1,3));
-
 		channelBox = new JComboBox();
 		channelBox.setFont(Moosique.getGUI().FONT);
 		for (int i = 1; i <= 16; i++)
@@ -78,8 +74,7 @@ public class MooTrackTitle extends JPanel {
 		channelBox.setSelectedIndex(channel);
 
 		instruments = new MooInstrumentList(channelBox.getSelectedIndex());
-
-		instruments = new MooInstrumentList(channelBox.getSelectedIndex());
+		add(instruments);
 
 		channelBox.addActionListener(new ActionListener(){
 				public void actionPerformed(ActionEvent e){
@@ -94,11 +89,11 @@ public class MooTrackTitle extends JPanel {
 							mn.setChannel(chan);
 						}
     				}}});
-		channelBox.setSelectedIndex(channel);
-
-		add(instruments);
 		add(channelBox);
 
+		JPanel checkboxes = new JPanel();
+		checkboxes.setLayout(new GridLayout(1,3));
+
 		mute = new JCheckBox("Mute");
 		mute.setSelected(Moosique.getSequencer().getTrackMute(trackNum));
 		mute.setFont(Moosique.getGUI().FONT);
diff --git a/midi/test2.mid b/midi/test2.mid
new file mode 100644
index 0000000..dfe6b7e
Binary files /dev/null and b/midi/test2.mid differ
diff --git a/midi/test3.mid b/midi/test3.mid
new file mode 100644
index 0000000..baedc67
Binary files /dev/null and b/midi/test3.mid differ