repositories
/
SugarCubes.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #21 from savanto/AntonK
[SugarCubes.git]
/
_UIImplementation.pde
diff --git
a/_UIImplementation.pde
b/_UIImplementation.pde
index df3a7e45236379847f17b35219f84c5599e2cb3b..0ea8073ddb57d6701a6a0a1b55df6fc88c89bbe8 100644
(file)
--- a/
_UIImplementation.pde
+++ b/
_UIImplementation.pde
@@
-13,9
+13,9
@@
class UIPatternDeck extends UIWindow {
class UIPatternDeck extends UIWindow {
-
Engine.
Deck deck;
+
LX
Deck deck;
- public UIPatternDeck(
Engine.
Deck deck, String label, float x, float y, float w, float h) {
+ public UIPatternDeck(
LX
Deck deck, String label, float x, float y, float w, float h) {
super(label, x, y, w, h);
this.deck = deck;
int yp = titleHeight;
super(label, x, y, w, h);
this.deck = deck;
int yp = titleHeight;
@@
-34,11
+34,11
@@
class UIPatternDeck extends UIWindow {
parameterKnobs[ki].addToContainer(this);
}
parameterKnobs[ki].addToContainer(this);
}
-
Engine.Listener lxListener = new Engine
.AbstractListener() {
- public void patternWillChange(
Engine.
Deck deck, LXPattern pattern, LXPattern nextPattern) {
+
LXDeck.Listener lxListener = new LXDeck
.AbstractListener() {
+ public void patternWillChange(
LX
Deck deck, LXPattern pattern, LXPattern nextPattern) {
patternList.redraw();
}
patternList.redraw();
}
- public void patternDidChange(
Engine.
Deck deck, LXPattern pattern) {
+ public void patternDidChange(
LX
Deck deck, LXPattern pattern) {
patternList.redraw();
int pi = 0;
for (LXParameter parameter : pattern.getParameters()) {
patternList.redraw();
int pi = 0;
for (LXParameter parameter : pattern.getParameters()) {
@@
-96,8
+96,8
@@
class UIBlendMode extends UIWindow {
final UIScrollList tList;
(tList = new UIScrollList(1, titleHeight, w-2, 60)).setItems(items).addToContainer(this);
final UIScrollList tList;
(tList = new UIScrollList(1, titleHeight, w-2, 60)).setItems(items).addToContainer(this);
- lx.engine.getDeck(
1).addListener(new Engine
.AbstractListener() {
- public void
blendTransitionDidChange(Engine.
Deck deck, LXTransition transition) {
+ lx.engine.getDeck(
GLucose.RIGHT_DECK).addListener(new LXDeck
.AbstractListener() {
+ public void
faderTransitionDidChange(LX
Deck deck, LXTransition transition) {
tList.redraw();
}
});
tList.redraw();
}
});
@@
-138,10
+138,15
@@
class UICrossfader extends UIWindow {
public UICrossfader(float x, float y, float w, float h) {
super("CROSSFADER", x, y, w, h);
public UICrossfader(float x, float y, float w, float h) {
super("CROSSFADER", x, y, w, h);
- new UIParameterSlider(4, titleHeight, w-9, 32).setParameter(lx.engine.getDeck(
1).getCrossf
ader()).addToContainer(this);
+ new UIParameterSlider(4, titleHeight, w-9, 32).setParameter(lx.engine.getDeck(
GLucose.RIGHT_DECK).getF
ader()).addToContainer(this);
(displayMode = new UIToggleSet(4, titleHeight + 36, w-9, 20)).setOptions(new String[] { "A", "COMP", "B" }).setValue("COMP").addToContainer(this);
}
(displayMode = new UIToggleSet(4, titleHeight + 36, w-9, 20)).setOptions(new String[] { "A", "COMP", "B" }).setValue("COMP").addToContainer(this);
}
+ public UICrossfader setDisplayMode(String value) {
+ displayMode.setValue(value);
+ return this;
+ }
+
public String getDisplayMode() {
return displayMode.getValue();
}
public String getDisplayMode() {
return displayMode.getValue();
}
@@
-467,10
+472,14
@@
class UIDebugText extends UIContext {
}
class UISpeed extends UIWindow {
}
class UISpeed extends UIWindow {
+
+ final BasicParameter speed;
+
UISpeed(float x, float y, float w, float h) {
super("SPEED", x, y, w, h);
UISpeed(float x, float y, float w, float h) {
super("SPEED", x, y, w, h);
+ speed = new BasicParameter("SPEED", 0.5);
new UIParameterSlider(4, titleHeight, w-10, 20)
new UIParameterSlider(4, titleHeight, w-10, 20)
- .setParameter(
new BasicParameter("SPEED", 0.5).addListener(new LXParameter.
Listener() {
+ .setParameter(
speed.addListener(new LXParameter
Listener() {
public void onParameterChanged(LXParameter parameter) {
lx.setSpeed(parameter.getValuef() * 2);
}
public void onParameterChanged(LXParameter parameter) {
lx.setSpeed(parameter.getValuef() * 2);
}
@@
-521,8
+530,8
@@
class UIMidi extends UIWindow {
return logMode.isActive();
}
return logMode.isActive();
}
- public
Engine.
Deck getFocusedDeck() {
- return lx.engine.getDeck(deckMode.getValue() == "A" ?
0 : 1
);
+ public
LX
Deck getFocusedDeck() {
+ return lx.engine.getDeck(deckMode.getValue() == "A" ?
GLucose.LEFT_DECK : GLucose.RIGHT_DECK
);
}
}
}
}