repositories
/
SugarCubes.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
No more SCEffect or SCTransition
[SugarCubes.git]
/
_MIDI.pde
diff --git
a/_MIDI.pde
b/_MIDI.pde
index a0031f6f14821fb20bf5c1dc641ef627cec544ca..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;
@@
-218,6
+218,16
@@
public abstract class SCMidiInput extends AbstractScrollItem {
getTargetPattern().noteOff(note);
}
}
getTargetPattern().noteOff(note);
}
}
+
+ protected void setNormalized(LXParameter parameter, float value) {
+ if (parameter != null) {
+ if (parameter instanceof BasicParameter) {
+ ((BasicParameter)parameter).setNormalized(value);
+ } else {
+ parameter.setValue(value);
+ }
+ }
+ }
// Subclasses may implement these to map top-level functionality
protected boolean handleProgramChange(ProgramChange pc) { return false; }
// Subclasses may implement these to map top-level functionality
protected boolean handleProgramChange(ProgramChange pc) { return false; }
@@
-411,31
+421,31
@@
public class APC40MidiInput extends GenericDeviceMidiInput {
case 7:
switch (channel) {
case 0:
case 7:
switch (channel) {
case 0:
-
// effects.colorFucker.hueShift.setValue(value
);
+
uiSpeed.speed.setNormalized(0.5 - value*0.5
);
return true;
case 1:
return true;
case 1:
- effects.colorFucker.desat.set
Value
(value);
+ effects.colorFucker.desat.set
Normalized
(value);
return true;
case 2:
return true;
case 2:
- effects.colorFucker.
sharp.setValue
(value);
+ effects.colorFucker.
desat.setNormalized
(value);
return true;
case 3:
return true;
case 3:
- effects.blur.amount.set
Value
(value);
+ effects.blur.amount.set
Normalized
(value);
return true;
case 4:
return true;
case 4:
- effects.quantize.amount.set
Value
(value);
+ effects.quantize.amount.set
Normalized
(value);
return true;
}
break;
// Master bright
case 14:
return true;
}
break;
// Master bright
case 14:
- effects.colorFucker.level.set
Value
(value);
+ effects.colorFucker.level.set
Normalized
(value);
return true;
// Crossfader
case 15:
return true;
// Crossfader
case 15:
- lx.engine.getDeck(GLucose.RIGHT_DECK).getFader().set
Value
(value);
+ lx.engine.getDeck(GLucose.RIGHT_DECK).getFader().set
Normalized
(value);
return true;
// Cue level
return true;
// Cue level
@@
-448,7
+458,7
@@
public class APC40MidiInput extends GenericDeviceMidiInput {
cv = cv - 64;
}
val += (cv - 64) / 500.;
cv = cv - 64;
}
val += (cv - 64) / 500.;
- effects.colorFucker.hueShift.set
Value
((val+1) % 1);
+ effects.colorFucker.hueShift.set
Normalized
((val+1) % 1);
return true;
}
return true;
}
@@
-461,7
+471,7
@@
public class APC40MidiInput extends GenericDeviceMidiInput {
if (parameterIndex >= 0) {
List<LXParameter> parameters = getTargetPattern().getParameters();
if (parameterIndex < parameters.size()) {
if (parameterIndex >= 0) {
List<LXParameter> parameters = getTargetPattern().getParameters();
if (parameterIndex < parameters.size()) {
-
parameters.get(parameterIndex).setValue(
value);
+
setNormalized(parameters.get(parameterIndex),
value);
return true;
}
}
return true;
}
}
@@
-470,7
+480,7
@@
public class APC40MidiInput extends GenericDeviceMidiInput {
int effectIndex = number - 20;
List<LXParameter> parameters = glucose.getSelectedEffect().getParameters();
if (effectIndex < parameters.size()) {
int effectIndex = number - 20;
List<LXParameter> parameters = glucose.getSelectedEffect().getParameters();
if (effectIndex < parameters.size()) {
-
parameters.get(effectIndex).setValue(
value);
+
setNormalized(parameters.get(effectIndex),
value);
return true;
}
}
return true;
}
}
@@
-496,10
+506,10
@@
public class APC40MidiInput extends GenericDeviceMidiInput {
case 49: // SOLO/CUE
switch (nChan) {
case 4:
case 49: // SOLO/CUE
switch (nChan) {
case 4:
- effects.colorFucker.mono.set
Value
(1);
+ effects.colorFucker.mono.set
Normalized
(1);
return true;
case 5:
return true;
case 5:
- effects.colorFucker.invert.set
Value
(1);
+ effects.colorFucker.invert.set
Normalized
(1);
return true;
case 6:
lx.cycleBaseHue(60000);
return true;
case 6:
lx.cycleBaseHue(60000);
@@
-607,10
+617,10
@@
public class APC40MidiInput extends GenericDeviceMidiInput {
case 49: // SOLO/CUE
switch (nChan) {
case 4:
case 49: // SOLO/CUE
switch (nChan) {
case 4:
- effects.colorFucker.mono.set
Value
(0);
+ effects.colorFucker.mono.set
Normalized
(0);
return true;
case 5:
return true;
case 5:
- effects.colorFucker.invert.set
Value
(0);
+ effects.colorFucker.invert.set
Normalized
(0);
return true;
case 6:
lx.setBaseHue(lx.getBaseHue());
return true;
case 6:
lx.setBaseHue(lx.getBaseHue());
@@
-670,7
+680,7
@@
class KorgNanoKontrolMidiInput extends GenericDeviceMidiInput {
int parameterIndex = number - 16;
List<LXParameter> parameters = midiEngine.getFocusedPattern().getParameters();
if (parameterIndex < parameters.size()) {
int parameterIndex = number - 16;
List<LXParameter> parameters = midiEngine.getFocusedPattern().getParameters();
if (parameterIndex < parameters.size()) {
-
parameters.get(parameterIndex).setValue(
cc.getValue() / 127.);
+
setNormalized(parameters.get(parameterIndex),
cc.getValue() / 127.);
return true;
}
}
return true;
}
}
@@
-700,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;
@@
-853,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) {
@@
-910,7
+924,7
@@
class ArturiaMinilabMidiInput extends GenericDeviceMidiInput {
case 75:
float val = effects.colorFucker.hueShift.getValuef();
val += (cc.getValue() - 64) / 256.;
case 75:
float val = effects.colorFucker.hueShift.getValuef();
val += (cc.getValue() - 64) / 256.;
- effects.colorFucker.hueShift.set
Value
((val+1) % 1);
+ effects.colorFucker.hueShift.set
Normalized
((val+1) % 1);
break;
}
if (parameterIndex >= 0) {
break;
}
if (parameterIndex >= 0) {
@@
-919,7
+933,7
@@
class ArturiaMinilabMidiInput extends GenericDeviceMidiInput {
LXParameter p = parameters.get(parameterIndex);
float curVal = p.getValuef();
curVal += (cc.getValue() - 64) / 127.;
LXParameter p = parameters.get(parameterIndex);
float curVal = p.getValuef();
curVal += (cc.getValue() - 64) / 127.;
-
p.setValue(
constrain(curVal, 0, 1));
+
setNormalized(p,
constrain(curVal, 0, 1));
}
}
return false;
}
}
return false;