src/microkontrol/MicroKontrolDevice.java src/microkontrol/MicroKontrolHardwareStub.java @@ -3,6 +3,7 @@ <classpathentry kind="src" path="src"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="lib" path="/Applications/Processing.app/Contents/Resources/Java/core.jar"/> + <classpathentry kind="lib" path="/Grimonium/src/rwmidi"/> <classpathentry kind="lib" path="/Applications/Processing.app/Contents/Resources/Java/libraries/rwmidi/library/rwmidi.jar"/> <classpathentry kind="output" path="bin"/> </classpath> .classpath @@ -38,7 +38,7 @@ public class MicroKontrol { PApplet applet; public final String VERSION = "0.1.0"; - private MicroKontrolHardware hardware; + private MicroKontrolDevice hardware; public Pad[] pads = new Pad[16]; public Hashtable<String, Button> buttons = new Hashtable<String, Button>(); @@ -91,6 +91,7 @@ public class MicroKontrol { "MicroKontrolHardware.input_device_b = \"" + MicroKontrolHardware.input_device_b + "\";\n" + "MicroKontrolHardware.output_device = \"" + MicroKontrolHardware.output_device + "\";"); PApplet.println("\nNote that you can still use the MicroKontrol class as normal even if the hardware unit is not connected."); + hardware = new MicroKontrolHardwareStub(applet); } go(); @@ -98,6 +99,9 @@ public class MicroKontrol { public void plugKeyboard(Object object){ hardware.plugKeyboard(object); } + public void plugPitchBend(Object object){ + hardware.plugPitchBend(object); + } void go() { main.setText(""); main.setColor("red"); src/microkontrol/MicroKontrol.java @@ -13,7 +13,7 @@ import rwmidi.Note; import rwmidi.RWMidi; import rwmidi.SysexMessage; -public class MicroKontrolHardware { +public class MicroKontrolHardware implements MicroKontrolDevice { public static String input_device_a = "PORT A(.*)KORG INC."; public static String input_device_b = "PORT B(.*)KORG INC."; public static String output_device = "CTRL(.*)KORG INC."; @@ -352,9 +352,6 @@ public class MicroKontrolHardware { send(PACKET4); } - void plugKeyboard(Object to) { - inputB.plug(to); - } /** * MIDI IN @@ -392,4 +389,12 @@ public class MicroKontrolHardware { private static String findInput(String regex) { return findInArray(regex, RWMidi.getInputDeviceNames()); } + public void plugPitchBend(Object object) { + inputB.plug(object,"pitchBendReceived"); + + } + public void plugKeyboard(Object to) { + inputB.plug(to); + } + } src/microkontrol/MicroKontrolHardware.java @@ -42,6 +42,7 @@ public class Button extends KorgControl{ } public void release(){ dispatchToListeners(RELEASED); + dispatchTo(releaseHandlers); } src/microkontrol/controls/Button.java @@ -4,12 +4,15 @@ import java.util.Observable; public class Joystick extends Observable { + private static final String MOVED = "moved"; private float x; private float y; public void set(float x, float y) { this.x = x; this.y = y; + setChanged(); + notifyObservers(MOVED); } public float getX() { src/microkontrol/controls/Joystick.java 57b915266e99c552c331ca387feba07890de5230 Michael Forrest michael.forrest@gmail.com http://github.com/michaelforrest/processing-korg-microkontrol/commit/9966087db9f9993b8efa6932407e265ff1317ba9 9966087db9f9993b8efa6932407e265ff1317ba9 2009-01-24T09:03:35-08:00 2009-01-24T09:03:35-08:00 removed dependence on hardware 9685410f14ce87a58ed46057f41b90284f3b3fab Michael Forrest michael.forrest@gmail.com