Update to new HeronLX packaging for LXParameter stuff

diff --git a/_Internals.pde b/_Internals.pde
index c27a75b79c24a9c1138f8fd4dd06ce56d4a28f86..6a076da811d8be1eba0f2430fb67b13d39177c6a 100644 (file)
--- a/_Internals.pde
+++ b/_Internals.pde
@@ -16,9 +16,9 @@
 import glucose.*;
 import glucose.model.*;
 import heronarts.lx.*;
-import heronarts.lx.control.*;
 import heronarts.lx.effect.*;
 import heronarts.lx.modulator.*;
+import heronarts.lx.parameter.*;
 import heronarts.lx.pattern.*;
 import heronarts.lx.transform.*;
 import heronarts.lx.transition.*;

diff --git a/_MIDI.pde b/_MIDI.pde
index 36ec92c02f5b6e7906980c1152268564ffbb844a..7673f7ffd87d6cadf3630ed7abfa64efc0e50c7e 100644 (file)
--- a/_MIDI.pde
+++ b/_MIDI.pde
@@ -710,7 +710,7 @@ class KorgNanoKontrolMidiInput extends GenericDeviceMidiInput {
   }
 }
 
-class APC40MidiOutput implements LXParameter.Listener, GridOutput {
+class APC40MidiOutput implements LXParameterListener, GridOutput {
   
   private final MidiEngine midiEngine;
   private final MidiOutput output;

diff --git a/_Presets.pde b/_Presets.pde
index 9d5c305f3f33949d9e9d4b2c81980e97577cc5e9..91598ac2078e04dff0f2805575ddd77bd96bfee2 100644 (file)
--- a/_Presets.pde
+++ b/_Presets.pde
@@ -10,7 +10,7 @@ class PresetManager {
   public static final String FILENAME = "data/presets.txt";
   public static final String DELIMITER = "\t";
   
-  class DeckState implements LXParameter.Listener {
+  class DeckState implements LXParameterListener {
     
     final LXDeck deck;
     LXPattern selectedPattern = null;    

diff --git a/_UIFramework.pde b/_UIFramework.pde
index 6d80ad61424924bc940bdcb8ed38faa6306b6815..8ecb7e9a59c91e10b0dd683e04b59b1f02909425 100644 (file)
--- a/_UIFramework.pde
+++ b/_UIFramework.pde
@@ -527,7 +527,7 @@ public class UIToggleSet extends UIObject {
 }
 
 
-public abstract class UIParameterControl extends UIObject implements LXParameter.Listener {
+public abstract class UIParameterControl extends UIObject implements LXParameterListener {
   protected LXParameter parameter = null;
     
   protected UIParameterControl(float x, float y, float w, float h) {

diff --git a/_UIImplementation.pde b/_UIImplementation.pde
index 95ac57dc5dd6acdbeb4f6e1bc79ae8649b7f449b..0ea8073ddb57d6701a6a0a1b55df6fc88c89bbe8 100644 (file)
--- a/_UIImplementation.pde
+++ b/_UIImplementation.pde
@@ -479,7 +479,7 @@ class UISpeed extends UIWindow {
     super("SPEED", x, y, w, h);
     speed = new BasicParameter("SPEED", 0.5);
     new UIParameterSlider(4, titleHeight, w-10, 20)
-    .setParameter(speed.addListener(new LXParameter.Listener() {
+    .setParameter(speed.addListener(new LXParameterListener() {
       public void onParameterChanged(LXParameter parameter) {
         lx.setSpeed(parameter.getValuef() * 2);
       }

diff --git a/code/GLucose.jar b/code/GLucose.jar
index ec6fa48643e7fb37c223e208c2633742e0c9f9d7..c27d4149b3b764e9dc098901eced14c8410735b1 100755 (executable)
Binary files a/code/GLucose.jar and b/code/GLucose.jar differ

diff --git a/code/HeronLX.jar b/code/HeronLX.jar
index adb915b319be334832f7d26da818c41019958e35..e49c4df177eec90a02277f720e3a1b5a03952bd4 100755 (executable)
Binary files a/code/HeronLX.jar and b/code/HeronLX.jar differ