From: Mark Slee Date: Wed, 13 Nov 2013 11:42:54 +0000 (-0800) Subject: Update to new HeronLX packaging for LXParameter stuff X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=b8bb27489db7dc687bf150576e9d9439f1fa17a6;p=SugarCubes.git Update to new HeronLX packaging for LXParameter stuff --- diff --git a/_Internals.pde b/_Internals.pde index c27a75b..6a076da 100644 --- 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 36ec92c..7673f7f 100644 --- 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 9d5c305..91598ac 100644 --- 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 6d80ad6..8ecb7e9 100644 --- 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 95ac57d..0ea8073 100644 --- 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 ec6fa48..c27d414 100755 Binary files a/code/GLucose.jar and b/code/GLucose.jar differ diff --git a/code/HeronLX.jar b/code/HeronLX.jar index adb915b..e49c4df 100755 Binary files a/code/HeronLX.jar and b/code/HeronLX.jar differ