lib/core.jar lib/oscP5.jar @@ -120,7 +120,7 @@ public class MonomeOSC extends Monome { ////////////////////////////////////////////////// helper methods private OscMessage makeMessage(String command) { - return oscP5.newMsg(command); + return new OscMessage(command); } private void setRowOrColumn(String command, int i, int bitVals) { @@ -133,8 +133,8 @@ public class MonomeOSC extends Monome { ////////////////////////////////////////////////// osc communication private void send(OscMessage m) { - if (debug == FINE) System.out.println("$$ sending " + m.getMsgName() + " " + m.getArgs()); - oscP5.sendMsg(m); + if (debug == FINE) System.out.println("$$ sending " + m.address() + " " + m.arguments()); + oscP5.send(m); } private void initOsc(String host, int sendPort, int receivePort) { @@ -150,7 +150,7 @@ public class MonomeOSC extends Monome { void unpackMessage(OscIn oscIn) { if (boxName == null) { - String a = oscIn.getAddrPattern(); + String a = oscIn.addrPattern(); if (a.indexOf("m40h") != -1) { String newBox = a.substring(1, a.indexOf('/', 1)); System.out.println("discovered new monome 40h: " + newBox); @@ -173,8 +173,8 @@ public class MonomeOSC extends Monome { } else { if (debug == FINE) { System.out.println("you have received an osc message " - + oscIn.getAddrPattern() + " " + oscIn.getTypetag()); - Object[] o = oscIn.getData(); + + oscIn.addrPattern() + " " + oscIn.typetag()); + Object[] o = oscIn.arguments(); for (int i = 0; i < o.length; i++) { System.out.println(i + " " + o[i]); } @@ -185,7 +185,7 @@ public class MonomeOSC extends Monome { ////////////////////////////////////////////////// cleanup protected void finalize() throws Throwable { - oscP5.disconnectFromTEMP(); + oscP5.stop(); oscP5 = null; super.finalize(); } src/jklabs/monomic/MonomeOSC.java @@ -10,7 +10,7 @@ public void setup() { //m = new MonomeOSC(this); m = new MonomeSerial(this); - m.setDebug(m.FINE); + m.setDebug(MonomeSerial.FINE); //m.lightsOn(); //m.lightsOff(); @@ -18,7 +18,6 @@ public void setup() { m.lightOff(0,1); int[] vals = new int[]{0,0,1,1,0,0,1,1}; - //int[] vals = new int[]{1,1,1,1,1,1,1,1}; int[][] matrix = new int[][]{ {0,1,0,1,0,1,0,1}, {1,0,1,0,1,0,1,0}, test/MonomeTest.java bb39e9407886e830e96eb8452948f284f6a55596 Jesse Kriss jkriss@ivan.local http://github.com/jkriss/monomic/commit/432e3b9773a8cc35bc4cc40c36b0e1e5c37ca19b 432e3b9773a8cc35bc4cc40c36b0e1e5c37ca19b 2008-05-11T07:20:04-07:00 2008-05-11T07:20:04-07:00 updated core and oscP5 libraries, first attempt at moving to new OscP5 api. 72f026d3e509e65a81cc5afc202cd36ca5aeca88 Jesse Kriss jkriss@ivan.local