setting mute and solo on channel instead..

[moosique.git] / MooTrackView.java

diff --git a/MooTrackView.java b/MooTrackView.java
index e6f614b1b3981dcb0e664c6cebbf3a2f36728214..8827f3187b89a6ef299f29aa11339ed4d189a651 100644 (file)
--- a/MooTrackView.java
+++ b/MooTrackView.java
@@ -14,20 +14,21 @@ import java.util.*;
 public class MooTrackView extends JPanel {
 
        private Track track;
+       private MooTrackTitle title;
        private Rectangle box;
 
        private JPopupMenu popup;
-       private JMenuItem menuItem;
+       private JMenuItem popupAdd;
        private ArrayList rects;
        protected static int viewLength = 0;
        protected static int extraHeight = 0;
        public static final int NOTE_HEIGHT = 10, NOTE_WIDTH = 40, VIEW_WIDTH = 200;
 
-       public MooTrackView (Track track) {
+       public MooTrackView (Track track, MooTrackTitle title) {
                super(true);
                this.track = track;
+               this.title = title;
 
-               extraHeight = Toolkit.getDefaultToolkit().getScreenSize().height - 150;
                // Configures panel
                setBackground(Color.white);
                setBorder(BorderFactory.createLineBorder(Color.black));
@@ -38,6 +39,7 @@ public class MooTrackView extends JPanel {
                MidiEvent note;
                MooNoteElement elem;
                rects = new ArrayList(track.size() / 2);
+               extraHeight = Toolkit.getDefaultToolkit().getScreenSize().height - 150;
 
                // Places note elements
                for (int i = 0; i < track.size(); i++) {
@@ -52,15 +54,17 @@ public class MooTrackView extends JPanel {
                        setPreferredSize(new Dimension(VIEW_WIDTH, viewLength + extraHeight));
 
                }
-               validate();
 
                // Creates pop-up menu.
                popup = new JPopupMenu();
-               menuItem = new JMenuItem("Add...");
-               // menuItem.addActionListener();
-               popup.add(menuItem);
-
-               addMouseListener(new PopupListener());
+               PopupListener pList = new PopupListener();
+               popupAdd = new JMenuItem("Add note...");
+               popupAdd.addActionListener(pList);
+               popup.add(popupAdd);
+
+               // Adds listeners for popup menu and keyboard synthesizer.
+               addMouseListener(new MAdapter());
+               addKeyListener(new MooKeyboard());
        }
 
        public void layoutElement(MooNoteElement elem, boolean old){
@@ -98,7 +102,6 @@ public class MooTrackView extends JPanel {
                        viewLength = y + height;
                        if(old)setPreferredSize(new Dimension(VIEW_WIDTH, viewLength + extraHeight));
                }
-
        }
 
        public Track getTrack() {
@@ -121,10 +124,19 @@ public class MooTrackView extends JPanel {
                return false;
        }
        
-       public void remove(MooNoteElement elem) {
-               remove((Component)elem);
+       public void addNote(MooNote mn) {
+               mn.addTo(track);
+               MooNoteElement elem = new MooNoteElement(this, mn);
+               add(elem);
+               layoutElement(elem, false);
+               setPreferredSize(new Dimension(VIEW_WIDTH, viewLength + extraHeight));
+               repaint();
+       }
+
+       public void removeNote(MooNoteElement elem, MooNote mn) {
+               mn.removeFrom(track);
+               remove(elem);
                elem.getNote().removeFrom(track);
-               validate();
                repaint();
        }
 
@@ -140,11 +152,26 @@ public class MooTrackView extends JPanel {
                }
        }
 
-       class PopupListener extends MouseAdapter {
+       class MAdapter extends MouseAdapter {
                public void mousePressed(MouseEvent e) {
                        if (e.isPopupTrigger()) {
                                popup.show(e.getComponent(), e.getX(), e.getY());
                        }
                }
+
+               public void mouseEntered(MouseEvent e) {
+                       // Moosique.setActiveChannel(track.getChannel());
+                       grabFocus();
+               }
+       }
+
+       class PopupListener implements ActionListener {
+               public void actionPerformed(ActionEvent e) {
+                       Object source = e.getSource();
+                       if  (source == popupAdd) {
+                               //addNote(new MooNote());
+                               // int channel, int pitch, int velocity, long timestamp, int duration
+                       }
+               }
        }
-}
+}
\ No newline at end of file