no message

diff --git a/MooToolbar.java b/MooToolbar.java
index e5e46da50e7a17cb39a362cf256cf4be315e0cef..9852c6a4fe72cba4667aeaa5e9c6c2cb38d43357 100644 (file)
--- 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 a97844b2f208fc755c7f7e89b10cfb307e6dd480..412fb246f183a521d86246068ca5ec5eb99b8a3f 100644 (file)
--- 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 (file)
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 (file)
index 0000000..baedc67
Binary files /dev/null and b/midi/test3.mid differ