repositories
/
SugarCubes.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More mapping cleanup, got rid of tons of mess code, clean definitions now
[SugarCubes.git]
/
_MIDI.pde
diff --git
a/_MIDI.pde
b/_MIDI.pde
index 36ec92c02f5b6e7906980c1152268564ffbb844a..18fa5a3437f4153d74fc092fe35c8a1ee0af4984 100644
(file)
--- a/
_MIDI.pde
+++ b/
_MIDI.pde
@@
-115,7
+115,7
@@
public interface SCMidiInputListener {
public void onEnabled(SCMidiInput controller, boolean enabled);
}
public void onEnabled(SCMidiInput controller, boolean enabled);
}
-public abstract class SCMidiInput extends
AbstractScroll
Item {
+public abstract class SCMidiInput extends
UIScrollList.Abstract
Item {
protected boolean enabled = false;
private final String name;
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;
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) {
}
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) {
}
private void sendKnob(int i, int value) {