repositories
/
SugarCubes.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge local repository from hackathon
[SugarCubes.git]
/
_MIDI.pde
diff --git
a/_MIDI.pde
b/_MIDI.pde
index b75556c8bba2a92dd7032c8b0c213e6422afabc7..562aa869a3d3193b1294219ffb84355ac3b47920 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:
- uiSpeed.speed.set
Value
(0.5 - value*0.5);
+ uiSpeed.speed.set
Normalized
(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().setValue
(value);
+ lx.engine.getDeck(
RIGHT_DECK).getFader().setNormalized
(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,16
+471,17
@@
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;
}
}
if (number >= 20 && number <= 23) {
int effectIndex = number - 20;
return true;
}
}
if (number >= 20 && number <= 23) {
int effectIndex = number - 20;
- List<LXParameter> parameters = glucose.getSelectedEffect().getParameters();
+ // TODO(mclsee): fix selected effect
+ List<LXParameter> parameters = getSelectedEffect().getParameters();
if (effectIndex < parameters.size()) {
if (effectIndex < parameters.size()) {
-
parameters.get(effectIndex).setValue(
value);
+
setNormalized(parameters.get(effectIndex),
value);
return true;
}
}
return true;
}
}
@@
-496,10
+507,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);
@@
-527,7
+538,7
@@
public class APC40MidiInput extends GenericDeviceMidiInput {
case 91: // play
if (shiftOn) {
case 91: // play
if (shiftOn) {
- midiEngine.setFocusedDeck(
GLucose.
LEFT_DECK);
+ midiEngine.setFocusedDeck(LEFT_DECK);
} else {
uiCrossfader.setDisplayMode("A");
}
} else {
uiCrossfader.setDisplayMode("A");
}
@@
-539,7
+550,7
@@
public class APC40MidiInput extends GenericDeviceMidiInput {
case 93: // rec
if (shiftOn) {
case 93: // rec
if (shiftOn) {
- midiEngine.setFocusedDeck(
GLucose.
RIGHT_DECK);
+ midiEngine.setFocusedDeck(RIGHT_DECK);
} else {
uiCrossfader.setDisplayMode("B");
}
} else {
uiCrossfader.setDisplayMode("B");
}
@@
-547,7
+558,7
@@
public class APC40MidiInput extends GenericDeviceMidiInput {
case 94: // up bank
if (shiftOn) {
case 94: // up bank
if (shiftOn) {
-
glucose.incrementSelectedEffectBy(-
1);
+
selectedEffect.setValue(selectedEffect.getValuei() -
1);
} else {
getTargetDeck().goPrev();
}
} else {
getTargetDeck().goPrev();
}
@@
-555,7
+566,7
@@
public class APC40MidiInput extends GenericDeviceMidiInput {
case 95: // down bank
if (shiftOn) {
case 95: // down bank
if (shiftOn) {
-
glucose.incrementSelectedEffectBy(
1);
+
selectedEffect.setValue(selectedEffect.getValuei() +
1);
} else {
getTargetDeck().goNext();
}
} else {
getTargetDeck().goNext();
}
@@
-578,7
+589,7
@@
public class APC40MidiInput extends GenericDeviceMidiInput {
return true;
case 62: // Detail View / red 5
return true;
case 62: // Detail View / red 5
- releaseEffect = g
lucose.g
etSelectedEffect();
+ releaseEffect = getSelectedEffect();
if (releaseEffect.isMomentary()) {
releaseEffect.enable();
} else {
if (releaseEffect.isMomentary()) {
releaseEffect.enable();
} else {
@@
-587,7
+598,7
@@
public class APC40MidiInput extends GenericDeviceMidiInput {
return true;
case 63: // rec quantize / red 6
return true;
case 63: // rec quantize / red 6
- g
lucose.g
etSelectedEffect().disable();
+ getSelectedEffect().disable();
return true;
}
return true;
}
@@
-607,10
+618,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
+681,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;
}
}
@@
-679,11
+690,11
@@
class KorgNanoKontrolMidiInput extends GenericDeviceMidiInput {
switch (number) {
case 58: // Left track
switch (number) {
case 58: // Left track
- midiEngine.setFocusedDeck(
GLucose.
LEFT_DECK);
+ midiEngine.setFocusedDeck(LEFT_DECK);
return true;
case 59: // Right track
return true;
case 59: // Right track
- midiEngine.setFocusedDeck(
GLucose.
RIGHT_DECK);
+ midiEngine.setFocusedDeck(RIGHT_DECK);
return true;
case 43: // Left chevron
return true;
case 43: // Left chevron
@@
-700,7
+711,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;
@@
-727,8
+738,8
@@
class APC40MidiOutput implements LXParameter.Listener, GridOutput {
}
});
}
}
});
}
-
glucose.addEffectListener(new GLucose.Effect
Listener() {
- public void
effectSelected(LXEffect effect
) {
+
selectedEffect.addListener(new LXParameter
Listener() {
+ public void
onParameterChanged(LXParameter parameter
) {
resetEffectParameters();
}
});
resetEffectParameters();
}
});
@@
-832,7
+843,7
@@
class APC40MidiOutput implements LXParameter.Listener, GridOutput {
}
private void resetEffectParameters() {
}
private void resetEffectParameters() {
- LXEffect newEffect = g
lucose.g
etSelectedEffect();
+ LXEffect newEffect = getSelectedEffect();
if (newEffect == focusedEffect) {
return;
}
if (newEffect == focusedEffect) {
return;
}
@@
-853,7
+864,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
+925,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
+934,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;