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

diff --git a/MooGUI.java b/MooGUI.java
index 146ca6d..71b1493 100644
--- a/MooGUI.java
+++ b/MooGUI.java
@@ -2,6 +2,7 @@ import javax.sound.midi.*;
 import javax.swing.*;
 import java.awt.*;
 import java.awt.event.*;
+import java.util.*;
 
 /**
  * Moosique's graphical user interface.
@@ -16,6 +17,8 @@ public class MooGUI extends JFrame {
 	private MooToolbar toolbar;
 	private MooView view;
 	private JLabel statusBar;
+	private java.util.Timer timer;
+	public static final int statusResetDelay = 3000;
 	public static final Font FONT = new Font("Helvetica", Font.PLAIN, 10);
 	public static final Color bgColor = new Color(192, 224, 255);
 	
@@ -39,7 +42,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 +58,42 @@ public class MooGUI extends JFrame {
 		statusBar.setBackground(bgColor);
 		view.setBackground(bgColor);
 
+		// Creates timer.
+		timer = new java.util.Timer();
+
+		// 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);
+		am.put("Octave change 2", createOctaveAction(2));
+		am.put("Octave change 4", createOctaveAction(4));
+		am.put("Octave change 6", createOctaveAction(6));
+		am.put("Octave change 8", createOctaveAction(8));
 
 		InputMap im = getRootPane().getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
 		KeyStroke playKey = KeyStroke.getKeyStroke(KeyEvent.VK_SPACE, 0);
-		im.put(playKey, "play");
-
+		KeyStroke octave2Key = KeyStroke.getKeyStroke(KeyEvent.VK_F9, 0);
+		KeyStroke octave4Key = KeyStroke.getKeyStroke(KeyEvent.VK_F10, 0);
+		KeyStroke octave6Key = KeyStroke.getKeyStroke(KeyEvent.VK_F11, 0);
+		KeyStroke octave8Key = KeyStroke.getKeyStroke(KeyEvent.VK_F12, 0);
+		im.put(playKey, "Play");
+		im.put(octave2Key, "Octave change 2");
+		im.put(octave4Key, "Octave change 4");
+		im.put(octave6Key, "Octave change 6");
+		im.put(octave8Key, "Octave change 8");
 
 		// 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 +117,8 @@ public class MooGUI extends JFrame {
 	 */
 	public void setSequence(Sequence sequence) {
 		seq = sequence;
-		view.setSequence(seq);
+		view.setTracks(seq.getTracks());
+		toolbar.resetProgInd();
 	}
 
 	/** 
@@ -103,15 +127,24 @@ public class MooGUI extends JFrame {
 	 */
 	public void setStatus(String text) {
 		statusBar.setText(text);
+		timer.schedule(new StatusResetTask(), statusResetDelay);
 	}
 
 	/**
-	 * 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);
+	}
+
+	private Action createOctaveAction(final int octave) {
+		Action octaveAction = new AbstractAction() {
+			public void actionPerformed(ActionEvent ae) {
+				MooKeyboard.setOctave(octave);
+			}};
+		return octaveAction;
 	}
 
 	class MooGUICloser extends WindowAdapter {
@@ -119,4 +152,10 @@ public class MooGUI extends JFrame {
 			Moosique.quit();
 		}
 	}
+	
+	class StatusResetTask extends TimerTask {
+		public void run() {
+			setStatus(" ");
+		}
+	}
 }