Merge pull request #11 from haschdl/fix-sysexmessage

Fix Sysexmessages

Author: haschdl

.idea/artifacts/processingLibrariesLocal.xml

@@ -9,83 +9,87 @@ import pLaunchControl.*;
 
 LaunchControl controller;
 
-        void setup() {
-        size(1000, 500);
-
-        try {
-        controller = new LaunchControl(this, true);
-        }
-        catch(Exception e) {
-        println("Unfortunately we could not detect that Launch Control is connected to this computer :(");
-        }
-        textAlign(CENTER);
-        }
-
-
-        void draw() {
-        background(0);
-        translate(20, 20);
-        stroke(255);
-        strokeWeight(3);
-        float s = width/16;
-        translate(s/2, s);
-
-        drawKnobs(s);
-        drawPads(s);
-
-        }
+void setup() {
+  size(1000, 500);
+
+  try {
+    controller = new LaunchControl(this, true);
+    // If you have renamed your Launch Control in the system
+    // preferences, use this version of the constructor:
+    // controller = new LaunchControl(this, true, "THE NAME YOU GAVE TO THE CONTROLLER");
+  }
+  catch(Exception e) {
+    println("Unfortunately we could not detect that Launch Control is connected to this computer :(");
+    println(e);
+    noLoop();
+  }
+  textAlign(CENTER);
+}
+
+
+void draw() {
+  background(0);
+  translate(20, 20);
+  stroke(255);
+  strokeWeight(3);
+  float s = width/16;
+  translate(s/2, s);
+  if (controller !=null) {
+    drawKnobs(s);
+    drawPads(s);
+  }
+}
 
 /**
  * Draws the knobs of the controller as simple arcs.
  */
-        void drawKnobs(float s) {
-
-        //drawing positions
-        float start = HALF_PI * 1.3;
-        float end = TWO_PI + HALF_PI * .7;
-
-        pushMatrix();
-        for (int i = 0; i < 16; i++) {
-        //draw knob background, simple arc
-        fill(255);
-        arc(2*s*(i%8), 0, s, s, start, end);
-
-        //draw knob position
-        fill(80);
-        Knob knob = controller.getKnob(i);
-        float normal = knob.valueNormal();
-        float realValue = knob.value();
-
-        arc(2*s*(i%8), 0, s, s, start, start + normal*(end-start));
-        fill(255);
-        text(round(realValue), 2*s*(i%8), s );
-
-        if (i == 7)
-        translate(0, height * .3);
-        }
-        popMatrix();
-        }
+void drawKnobs(float s) {
+
+  //drawing positions
+  float start = HALF_PI * 1.3;
+  float end = TWO_PI + HALF_PI * .7;
+
+  pushMatrix();
+  for (int i = 0; i < 16; i++) {
+    //draw knob background, simple arc
+    fill(255);
+    arc(2*s*(i%8), 0, s, s, start, end);
+
+    //draw knob position
+    fill(80);
+    Knob knob = controller.getKnob(i);
+    float normal = knob.valueNormal();
+    float realValue = knob.value();
+
+    arc(2*s*(i%8), 0, s, s, start, start + normal*(end-start));
+    fill(255);
+    text(round(realValue), 2*s*(i%8), s );
+
+    if (i == 7)
+      translate(0, height * .3);
+  }
+  popMatrix();
+}
 
 /**
  * Draws the pads of the controller as simple arcs.
  */
-        void drawPads(float s) {
-        translate(0,height * .6);
-        rectMode(CENTER);
-
-        for (int i = 0; i < 8; i++) {
-        //draw pad background, simple arc
-        fill(255);
-        rect(2*s*i,0,s,s);
-
-        //draw pad state position
-        fill(80);
-        boolean padState = controller.getPad(i).value();
-        if(padState)
-        rect(2*s*i,0,s,s);
-
-        fill(255);
-        text(round(i), 2*s*(i%8), s );
-
-        }
-        }
+void drawPads(float s) {
+  translate(0, height * .6);
+  rectMode(CENTER);
+
+  for (int i = 0; i < 8; i++) {
+    //draw pad background, simple arc
+    fill(255);
+    rect(2*s*i, 0, s, s);
+
+    //draw pad state position
+    fill(80);
+    boolean padState = controller.getPad(i).value();
+    if (padState)
+      rect(2*s*i, 0, s, s);
+
+    fill(255);
+    text(round(i), 2*s*(i%8), s );
+  }
+}

.idea/workspace.xml

@@ -1,10 +1,10 @@
 # UTF-8 supported.
 
 # The name of your library as you want it formatted.
-name = Novation Launch Controller client
+name = Novation Launch Control client
 
 # List of authors. Links can be provided using the syntax [author name](url).
-authors = [Half Scheidl](https://github.com/haschdl)
+authors = [Half Scheidl](https://github.com/haschdl), [Jonathan Newman](https://github.com/poetoflight)
 
 # A web page for your library, NOT a direct link to where to download it.
 url = https://github.com/haschdl/pLaunchController
@@ -24,15 +24,14 @@ categories = I/O
 # repeating the name of your library here. Also, avoid saying anything redundant
 # like mentioning that it's a library. This should start with a capitalized
 # letter, and end with a period.
-sentence = Control your sketches using the knobs and pads from Novation ® Launch Control®.
+sentence = Control your sketches using the knobs, pads and slider from MIDI controllers such as Novation ® Launch Control®.
 
 # Additional information suitable for the Processing website. The value of
 # 'sentence' always will be prepended, so you should start by writing the
 # second sentence here. If your library only works on certain operating systems,
 # mention it here.
-paragraph = Once connected to your computer, use the MIDI controller to control your sketch by\
-  adjusting the values of variables. This is library is not created by or supported by Novation, \
-  the manufacturer of the device. It uses standard MIDI protocols, thus does not require any additional drivers.
+paragraph = Once connected to your computer, use the MIDI controller to control your sketch by \
+  adjusting the values of variables. This is library is not created by or supported by Novation.
 
 # Links in the 'sentence' and 'paragraph' attributes can be inserted using the
 # same syntax as for authors.
@@ -42,11 +41,11 @@ paragraph = Once connected to your computer, use the MIDI controller to control
 # compare different versions of the same library, and check if an update is
 # available. You should think of it as a counter, counting the total number of
 # releases you've had.
-version = 4  # This must be parsable as an int
+version = 5  # This must be parsable as an int
 
 # The version as the user will see it. If blank, the version attribute will be
 # used here. This should be a single word, with no spaces.
-prettyVersion = 1.2  # This is treated as a String
+prettyVersion = 2.0.0-alpha  # This is treated as a String
 
 # The min and max revision of Processing compatible with your library.
 # Note that these fields use the revision and not the version of Processing,

examples/LaunchControlDemo/LaunchControlDemo.pde

@@ -3,10 +3,12 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="processing4" level="project" />
+    <orderEntry type="library" name="uk.co.xfactory.librarians.coremidi4j" level="project" />
   </component>
 </module>

library.properties

@@ -217,7 +217,7 @@
       <zipfileset dir="${basedir}/src" prefix="pLaunchController/src"/>
       <zipfileset file="${basedir}/export.txt" prefix="pLaunchController/library"/>
       <zipfileset file="${temp.jar.path.pLaunchController.jar2}" prefix="pLaunchController/library"/>
-      <zipfileset dir="${basedir}/examples" prefix="pLaunchController/examples"/>
+      <zipfileset dir="/resources/examples" prefix="pLaunchController/examples"/>
       <zipfileset file="${basedir}/library.properties" prefix="pLaunchController"/>
     </zip>
     <mkdir dir="${artifact.output.processinglib}/pLaunchController"/>
@@ -226,7 +226,7 @@
     <copy file="${temp.jar.path.pLaunchController.jar}" tofile="${artifact.output.processinglib}/pLaunchController/library/pLaunchController.jar"/>
     <mkdir dir="${artifact.output.processinglib}/pLaunchController/examples"/>
     <copy todir="${artifact.output.processinglib}/pLaunchController/examples">
-      <fileset dir="${basedir}/examples"/>
+      <fileset dir="/resources/examples"/>
     </copy>
     <mkdir dir="${artifact.output.processinglib}/pLaunchController/src"/>
     <copy todir="${artifact.output.processinglib}/pLaunchController/src">

pLaunchController.iml

@@ -7,6 +7,11 @@
 import javax.sound.midi.MidiUnavailableException;
 import java.lang.reflect.Method;
 
+import uk.co.xfactorylibrarians.coremidi4j.CoreMidiDeviceProvider;
+import uk.co.xfactorylibrarians.coremidi4j.CoreMidiNotification;
+import uk.co.xfactorylibrarians.coremidi4j.CoreMidiException;
+
+
 import static processing.core.PApplet.println;
 
 /***
@@ -37,6 +42,7 @@
  *
  */
 public class LaunchControl implements MidiDevice {
+    public static final String DEVICE_NAME_SUFFIX = "Launch Control";
     Method controllerChangedEventMethod, knobChangedEventMethod, padChangedEventMethod;
     private static final String controlChangedEventName = "LaunchControlChanged";
     private static final String knobChangedEventName = "LaunchControlKnobChanged";
@@ -76,7 +82,7 @@ public Knob getKnob(KNOBS knob) {
     public Knob getKnob(int knobIndex) {
         //TODO validate knobIndex
         KNOBS knobAtPosition = KNOBS.values()[knobIndex];
-        return  knobValues[knobAtPosition.code()];
+        return knobValues[knobAtPosition.code()];
     }
 
 
@@ -118,34 +124,46 @@ public void setSliderValueRange(float slider_min, float slider_max) {
         throw new UnsupportedOperationException("Method not available. This device does not have sliders.");
     }
 
+
+    public LaunchControl(PApplet parent, boolean debug) throws MidiUnavailableException {
+        this(parent, debug, null);
+    }
+
     public LaunchControl(PApplet parent) throws MidiUnavailableException {
-        this(parent, false);
+        this(parent, false, null);
     }
-    public LaunchControl(PApplet parent, boolean debug) throws MidiUnavailableException {
+
+
+    public LaunchControl(PApplet parent, boolean debug, String deviceName) throws MidiUnavailableException {
         this.parent = parent;
-        this.debug=debug;
+        this.debug = debug;
         for (int i = 0, l = KNOB_COUNT; i < l; i++) {
             knobValues[i] = new Knob(i, parent);
         }
         for (int i = 0, l = PAD_COUNT; i < l; i++) {
-            padValues[i] = new Pad(i,parent);
+            padValues[i] = new Pad(i, parent);
         }
-        infos = MidiSystem.getMidiDeviceInfo();
+        infos = CoreMidiDeviceProvider.getMidiDeviceInfo();
         for (javax.sound.midi.MidiDevice.Info info : infos) {
-            if (info.getName().equals("Launch Control")) {
-                javax.sound.midi.MidiDevice device = MidiSystem.getMidiDevice(info);
-                if (info.getClass().getName().equals("com.sun.media.sound.MidiInDeviceProvider$MidiInDeviceInfo")) {
+            javax.sound.midi.MidiDevice device = MidiSystem.getMidiDevice(info);
+            if (this.debug)
+                System.out.println(String.format("Device: %s \t Receivers: %d \t Transmitters: %d", info, device.getMaxReceivers(), device.getMaxTransmitters()));
+            if ((deviceName != null && info.getName().endsWith(deviceName)) || info.getName().endsWith(DEVICE_NAME_SUFFIX)) {
+                if (device.getMaxReceivers() == 0) {
                     deviceIn = device;
-                    println("Connected to Launch Control MIDI Input.");
-                } else {
-                    println("Connected to Launch Control MIDI Output.");
+                    println("Connected to MIDI Input.");
+                } else if (device.getMaxTransmitters() == 0) {
+                    println("Connected to MIDI Output.");
                     deviceOut = device;
                 }
             }
         }
 
         if (deviceIn == null) {
-            println("Launch Control not connected!");
+            if (deviceName == null)
+                System.out.printf("A device with name ending with %s was not detected.\n", DEVICE_NAME_SUFFIX);
+            else
+                System.out.printf("A device with name you provided was not detected.\nCheck the device name: %s \n", deviceName);
             return;
         }
 
@@ -216,7 +234,7 @@ public Pad[] getPads() {
     public Pad getPad(int padIndex) {
         //TODO validate padIndex
         PADS padAtPosition = PADS.values()[padIndex];
-        return  padValues[padAtPosition.code()];
+        return padValues[padAtPosition.code()];
     }
 
 
@@ -239,7 +257,7 @@ public void setPad(PADS pad, boolean value, boolean disableEvents) {
         if (padValues[pad.code()].value() != value) {
             padValues[pad.code()].value(value);
             receiver.sendLedOnOff(value, pad);
-            if(!disableEvents) {
+            if (!disableEvents) {
                 midiLaunchControlChanged();
                 padChanged(pad);
             }

pLaunchController.xml

@@ -2,6 +2,8 @@
 
 import javax.naming.OperationNotSupportedException;
 import javax.sound.midi.MidiMessage;
+import uk.co.xfactorylibrarians.coremidi4j.CoreMidiReceiver;
+
 import javax.sound.midi.Receiver;
 import javax.sound.midi.SysexMessage;