repositories
/
SugarCubes.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
commented out DanKaminksy.pde
[SugarCubes.git]
/
_MIDI.pde
diff --git
a/_MIDI.pde
b/_MIDI.pde
index 4e1f20acbcf9a03bab451300007e87f394f376e7..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;
@@
-445,7
+445,7
@@
public class APC40MidiInput extends GenericDeviceMidiInput {
// Crossfader
case 15:
// Crossfader
case 15:
- lx.engine.getDeck(
GLucose.
RIGHT_DECK).getFader().setNormalized(value);
+ lx.engine.getDeck(RIGHT_DECK).getFader().setNormalized(value);
return true;
// Cue level
return true;
// Cue level
@@
-478,7
+478,8
@@
public class APC40MidiInput extends GenericDeviceMidiInput {
if (number >= 20 && number <= 23) {
int effectIndex = number - 20;
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()) {
setNormalized(parameters.get(effectIndex), value);
return true;
if (effectIndex < parameters.size()) {
setNormalized(parameters.get(effectIndex), value);
return true;
@@
-537,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");
}
@@
-549,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");
}
@@
-557,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();
}
@@
-565,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();
}
@@
-588,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 {
@@
-597,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;
}
@@
-689,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
@@
-737,8
+738,8
@@
class APC40MidiOutput implements LXParameterListener, GridOutput {
}
});
}
}
});
}
-
glucose.addEffectListener(new GLucose.Effect
Listener() {
- public void
effectSelected(LXEffect effect
) {
+
selectedEffect.addListener(new LXParameter
Listener() {
+ public void
onParameterChanged(LXParameter parameter
) {
resetEffectParameters();
}
});
resetEffectParameters();
}
});
@@
-842,7
+843,7
@@
class APC40MidiOutput implements LXParameterListener, GridOutput {
}
private void resetEffectParameters() {
}
private void resetEffectParameters() {
- LXEffect newEffect = g
lucose.g
etSelectedEffect();
+ LXEffect newEffect = getSelectedEffect();
if (newEffect == focusedEffect) {
return;
}
if (newEffect == focusedEffect) {
return;
}