Skip to content

Components SyncButton and PlayButton changes #1244

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
daschuer merged 3 commits into from
May 6, 2017
Merged

Components SyncButton and PlayButton changes #1244

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3711f15
Components: long press SyncButton for master sync
Be-ing Apr 28, 2017
99fa591
Components: change shift + play for reverse from hold to toggle
Be-ing Apr 28, 2017
f798397
Merge remote-tracking branch 'upstream/master' into components_transp…
Be-ing May 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 20 additions & 14 deletions res/controllers/midi-components-0.0.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,10 +161,9 @@
onlyOnPress: true,
on: 127,
off: 0,
// Time in milliseconds to distinguish a short press from a long press
// In the provided Components, only EffectUnit.effectFocusButton uses
// this, but it is recommended to refer to it (as this.longPressTimeout)
// in any custom Buttons that act differently with short and long presses
// Time in milliseconds to distinguish a short press from a long press.
// It is recommended to refer to it (as this.longPressTimeout)
// in any Buttons that act differently with short and long presses
// to keep the timeouts uniform.
longPressTimeout: 275,
isPress: function (channel, control, value, status) {
Expand All @@ -191,16 +190,9 @@
PlayButton.prototype = new Button({
unshift: function () {
this.inKey = 'play';
this.input = Button.prototype.input;
// Stop reversing playback if the user releases the shift button before releasing this PlayButton.
if (engine.getValue(this.group, 'reverse') === 1) {
engine.setValue(this.group, 'reverse', 0);
}
},
shift: function () {
this.input = function (channel, control, value, status, group) {
engine.setValue(this.group, 'reverse', this.isPress(channel, control, value, status));
};
this.inKey = 'reverse';
},
outKey: 'play_indicator',
});
Expand All @@ -226,10 +218,24 @@
};
SyncButton.prototype = new Button({
unshift: function () {
this.inKey = 'beatsync';
this.input = function (channel, control, value, status, group) {
if (this.isPress(channel, control, value, status)) {
if (engine.getValue(this.group, 'sync_enabled') === 0) {
engine.setValue(this.group, 'beatsync', 1);
this.longPressTimer = engine.beginTimer(this.longPressTimeout, function () {
engine.setValue(this.group, 'sync_enabled', 1);
}, true);
} else {
engine.setValue(this.group, 'sync_enabled', 0);
}
} else {
engine.stopTimer(this.longPressTimer);
}
};
},
shift: function () {
this.inKey = 'sync_enabled';
this.inKey = 'quantize';
this.input = Button.prototype.input;
},
outKey: 'sync_enabled',
});
Expand Down