summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorJan Holthuis <jan.holthuis@ruhr-uni-bochum.de>2020-05-10 13:19:01 +0200
committerJan Holthuis <jan.holthuis@ruhr-uni-bochum.de>2020-05-10 13:22:47 +0200
commitac3c516942ff16d6164f54eba57b3da14c13a39f (patch)
tree1413f39297cb24f0c0efc92ec7cbda4308892326 /res
parent5e0d1627d6ec82dfad94e0d2059f2c34fdf2b45e (diff)
Roland DJ-505: Remove explicit master support
Explicit master is currently not working correctly. Until this has been fixed, the support for it is removed from this mapping to prevent users from activating it by mistake. Zulip Discussion: https://mixxx.zulipchat.com/#narrow/stream/109171-development/topic/explicit.20master.20behavior/near/196993295
Diffstat (limited to 'res')
-rw-r--r--res/controllers/Roland_DJ-505-scripts.js26
1 files changed, 2 insertions, 24 deletions
diff --git a/res/controllers/Roland_DJ-505-scripts.js b/res/controllers/Roland_DJ-505-scripts.js
index 0bf074caf0..658e1d3f10 100644
--- a/res/controllers/Roland_DJ-505-scripts.js
+++ b/res/controllers/Roland_DJ-505-scripts.js
@@ -599,12 +599,8 @@ DJ505.Deck = function(deckNumbers, offset) {
this.sync = new components.Button({
midi: [0x90 + offset, 0x02],
group: "[Channel" + deckNumbers + "]",
- outKey: "sync_mode",
- flickerState: false,
+ outKey: "sync_enabled",
output: function(value, _group, _control) {
- if (value === 3) {
- value = this.flickerState;
- }
midi.sendShortMsg(this.midi[0], value ? 0x02 : 0x03, this.on);
},
input: function(channel, control, value, _status, _group) {
@@ -625,11 +621,7 @@ DJ505.Deck = function(deckNumbers, offset) {
script.triggerControl(this.group, "beatsync", 1);
};
this.onLongPress = function() {
- if (engine.getValue(this.group, "sync_enabled")) {
- script.toggleControl(this.group, "sync_master");
- } else {
- engine.setValue(this.group, "sync_enabled", 1);
- }
+ engine.setValue(this.group, "sync_enabled", 1);
};
},
shift: function() {
@@ -640,20 +632,6 @@ DJ505.Deck = function(deckNumbers, offset) {
script.toggleControl(this.group, "quantize");
};
},
- connect: function() {
- components.Button.prototype.connect.call(this); // call parent connect
- this.flickerTimer = engine.beginTimer(500, function() {
- this.flickerState = !this.flickerState;
- this.trigger();
- });
- },
- disconnect: function() {
- components.Button.prototype.disconnect.call(this); // call parent disconnect
- if (this.flickerTimer) {
- engine.stopTimer(this.flickerTimer);
- this.flickerTimer = 0;
- }
- },
});
// =============================== MIXER ====================================