X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=_MIDI.pde;h=18fa5a3437f4153d74fc092fe35c8a1ee0af4984;hb=4e6626a95f23831319a73d3702789621b2248bb9;hp=36ec92c02f5b6e7906980c1152268564ffbb844a;hpb=05ebfd1557366c6e6845c26090c1ae02a4d9f835;p=SugarCubes.git

diff --git a/_MIDI.pde b/_MIDI.pde
index 36ec92c..18fa5a3 100644
--- a/_MIDI.pde
+++ b/_MIDI.pde
@@ -115,7 +115,7 @@ public interface SCMidiInputListener {
   public void onEnabled(SCMidiInput controller, boolean enabled);
 }
 
-public abstract class SCMidiInput extends AbstractScrollItem {
+public abstract class SCMidiInput extends UIScrollList.AbstractItem {
 
   protected boolean enabled = false;
   private final String name;
@@ -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;
@@ -863,7 +863,11 @@ class APC40MidiOutput implements LXParameter.Listener, GridOutput {
   }
 
   private void sendKnob(int i, LXParameter p) {
-    sendKnob(i, (int) (p.getValuef() * 127.));
+    float pv = constrain(p.getValuef(), 0, 1);
+    if (p instanceof LXNormalizedParameter) {
+      pv = ((LXNormalizedParameter)p).getNormalizedf();
+    }
+    sendKnob(i, (int) (pv * 127.));
   }
   
   private void sendKnob(int i, int value) {