X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=MooGUI.java;h=9f171a3a8c6a11965eb118a2b3e044af17d483eb;hb=ca56fc1424e8887b09375a52e8e02605d5dff175;hp=146ca6daa8483350c78cbc2fcea6557d67a05121;hpb=ba84468acd609e00f4c2df575712b4ffd1399e58;p=moosique.git

diff --git a/MooGUI.java b/MooGUI.java
index 146ca6d..9f171a3 100644
--- a/MooGUI.java
+++ b/MooGUI.java
@@ -39,7 +39,7 @@ public class MooGUI extends JFrame {
 		pane.add(toolbar, BorderLayout.NORTH);
 
 		// Adds main view.
-		view = new MooView(seq);
+		view = new MooView(seq.getTracks());
 		pane.add(view, BorderLayout.CENTER);
 
 		// Adds status bar.
@@ -55,22 +55,27 @@ public class MooGUI extends JFrame {
 		statusBar.setBackground(bgColor);
 		view.setBackground(bgColor);
 
+		// Sets up global key listener
 		ActionMap am = getRootPane().getActionMap();
 
 		Action playAction = new AbstractAction() {
 			public void actionPerformed(ActionEvent ae) {
-				Moosique.resumepause();
+				if (!Moosique.getSequencer().isRunning()) {
+					Moosique.play();
+				} else {
+					Moosique.stop();
+				}
 			}};
-		am.put("play", playAction);
+		am.put("Play", playAction);
 
 		InputMap im = getRootPane().getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
 		KeyStroke playKey = KeyStroke.getKeyStroke(KeyEvent.VK_SPACE, 0);
-		im.put(playKey, "play");
-
+		im.put(playKey, "Play");
 
 		// Configures window.
 		addWindowListener(new MooGUICloser());
 		pack();
+		setIconImage(Toolkit.getDefaultToolkit().getImage("images/moose.gif"));
 		Dimension bounds = Toolkit.getDefaultToolkit().getScreenSize();
 		setSize(bounds.width,bounds.height - 40);
 		setLocation(0, 0);
@@ -94,7 +99,8 @@ public class MooGUI extends JFrame {
 	 */
 	public void setSequence(Sequence sequence) {
 		seq = sequence;
-		view.setSequence(seq);
+		view.setTracks(seq.getTracks());
+		toolbar.resetProgInd();
 	}
 
 	/** 
@@ -106,12 +112,12 @@ public class MooGUI extends JFrame {
 	}
 
 	/**
-	 * Update the view.
+	 * Calls on the main view to update the track views,
+	 * and on the toolbar to update the progress indicator.
 	 */
-	public void update(){
-		view.update();
-		// Calls on the toolbar to update the progress indicator.
-		//toolbar.updateProgInd();
+	public void update(long tickPosition){
+		view.update(tickPosition);
+		toolbar.updateProgInd(tickPosition);
 	}
 
 	class MooGUICloser extends WindowAdapter {