X-Git-Url: https://ruin.nu/git/?p=moosique.git;a=blobdiff_plain;f=MooKeyboard.java;h=5581172e6d10792cbe5d6cbbae30c10b88ce492e;hp=7031c40711c1831c50802947fe01cf186066b1e2;hb=623c453a916803c781d32f667fca8698d0814c8c;hpb=a8b0b5e27d120df964c5b6d8554a6207951b00d0

diff --git a/MooKeyboard.java b/MooKeyboard.java
index 7031c40..5581172 100644
--- a/MooKeyboard.java
+++ b/MooKeyboard.java
@@ -11,29 +11,34 @@ public class MooKeyboard extends KeyAdapter {
 
 	private boolean[] isOn;
 	private static int startNote;
-	private static int[] keyToNote;
+	private static int[] keyToNote = new int[120];
 
 	/**
 	 * Sets up the synthesizer emulation.
 	 */
 	public MooKeyboard() {
 		isOn = new boolean[120];
-		keyToNote = new int[120];
-		setOctave(4);
 	}
 
+	static {
+		startNote = 48;
+		makeKeyboardMapping();
+	}
+	
 	/**
 	 * Plays the appropriate MIDI NoteOn event.
 	 */
 	public void keyPressed(KeyEvent e) {
-		try {
-			// Retrieves the notenumber from the conversion array.
-			int noteNumber = keyToNote[e.getKeyCode()];
-			// If note is not already on and the key is mapped to a note, sends the NoteOn event.
-			if (!isOn[noteNumber] && noteNumber > 0) Moosique.getActiveChannel().noteOn(noteNumber, 127);
-			isOn[noteNumber] = true;
-		} catch (ArrayIndexOutOfBoundsException x) {
-			return;
+		if (!e.isControlDown()) {
+			try {
+				// Retrieves the notenumber from the conversion array.
+				int noteNumber = keyToNote[e.getKeyCode()];
+				// If note is not already on and the key is mapped to a note, sends the NoteOn event.
+				if (!isOn[noteNumber] && noteNumber > 0) Moosique.getActiveChannel().noteOn(noteNumber, 127);
+				isOn[noteNumber] = true;
+			} catch (ArrayIndexOutOfBoundsException x) {
+				return;
+			}
 		}
 	}
 	
@@ -41,14 +46,16 @@ public class MooKeyboard extends KeyAdapter {
 	 * Plays the appropriate MIDI NoteOff event.
 	 */
 	public void keyReleased(KeyEvent e) {
-		try {
-			// Retrieves the notenumber from the conversion array.
-			int noteNumber = keyToNote[e.getKeyCode()];
-			// Sends the NoteOff event.
-			Moosique.getActiveChannel().noteOff(noteNumber);
-			isOn[noteNumber] = false;
-		} catch (ArrayIndexOutOfBoundsException x) {
-			return;
+		if (!e.isControlDown()) {
+			try {
+				// Retrieves the notenumber from the conversion array.
+				int noteNumber = keyToNote[e.getKeyCode()];
+				// Sends the NoteOff event.
+				Moosique.getActiveChannel().noteOff(noteNumber);
+				isOn[noteNumber] = false;
+			} catch (ArrayIndexOutOfBoundsException x) {
+				return;
+			}
 		}
 	}
 
@@ -57,7 +64,7 @@ public class MooKeyboard extends KeyAdapter {
 	 * @param n	the octave to start at
 	 */
 	public static void setOctave(int n) {
-		if (startNote == 0 || startNote == 108) return;
+		if ((startNote == 0 && n == -1) || (startNote == 108 && n == 1)) return;
 		startNote += n*12;
 		makeKeyboardMapping();
 	}