X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=MooTrackView.java;h=1a612e47eb01f7f748ed05e70d01cc88351b7be0;hb=65ea2a43eb97459592d222ea00082e46343c9d8b;hp=e6f614b1b3981dcb0e664c6cebbf3a2f36728214;hpb=0e48363a96ebd7c8c7f142daa38568da3e64facc;p=moosique.git

diff --git a/MooTrackView.java b/MooTrackView.java
index e6f614b..1a612e4 100644
--- a/MooTrackView.java
+++ b/MooTrackView.java
@@ -17,7 +17,7 @@ public class MooTrackView extends JPanel {
 	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;
@@ -27,7 +27,6 @@ public class MooTrackView extends JPanel {
 		super(true);
 		this.track = track;
 
-		extraHeight = Toolkit.getDefaultToolkit().getScreenSize().height - 150;
 		// Configures panel
 		setBackground(Color.white);
 		setBorder(BorderFactory.createLineBorder(Color.black));
@@ -38,6 +37,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++) {
@@ -56,11 +56,14 @@ public class MooTrackView extends JPanel {
 
 		// 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 +101,6 @@ public class MooTrackView extends JPanel {
 			viewLength = y + height;
 			if(old)setPreferredSize(new Dimension(VIEW_WIDTH, viewLength + extraHeight));
 		}
-
 	}
 
 	public Track getTrack() {
@@ -121,8 +123,17 @@ 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));
+	}
+
+	public void removeNote(MooNoteElement elem, MooNote mn) {
+		mn.removeFrom(track);
+		remove(elem);
 		elem.getNote().removeFrom(track);
 		validate();
 		repaint();
@@ -140,11 +151,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