summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCraig Easton <Mixxx@ShelobsLair.net>2016-01-26 23:14:24 +0000
committerCraig Easton <Mixxx@ShelobsLair.net>2016-01-26 23:14:24 +0000
commit87a8afa6af4ccdab022dd6c47772d45a1bf070a9 (patch)
tree1b8a39b849b99dd91a471d3f0f3d4326c0a93206
parentfe8616c84c2aca537d9503ec904c356d754dc8ad (diff)
BehringerCMDStudio4a mapping v1.4
Minor typos corrected. Changed the slip "re-sync" timer after the discussion in https://bugs.launchpad.net/mixxx/+bug/1538200
-rw-r--r--res/controllers/Behringer-CMDStudio4a-scripts.js8
1 files changed, 6 insertions, 2 deletions
diff --git a/res/controllers/Behringer-CMDStudio4a-scripts.js b/res/controllers/Behringer-CMDStudio4a-scripts.js
index 42ba30dc91..240bcef2f5 100644
--- a/res/controllers/Behringer-CMDStudio4a-scripts.js
+++ b/res/controllers/Behringer-CMDStudio4a-scripts.js
@@ -136,7 +136,7 @@ BehringerCMDStudio4a.scratch = function (channel, control, value, status, group)
midi.sendShortMsg(status, control, BehringerCMDStudio4a.scratchButtonState[channel] ? 0x01 : 0x00);
}
-// Function to deal with the FX Assign buttons, (becasue the also act as "shift" buttons).
+// Function to deal with the FX Assign buttons, (becasue they also act as "shift" buttons).
BehringerCMDStudio4a.fxAssign = function (channel, control, value, status, group) {
// FX Assign buttons start at 0x52.
var fxAssignButton = (control - 0x52) & 1; // Either 0 or 1 depending on button (1 or 2).
@@ -208,7 +208,11 @@ BehringerCMDStudio4a.hotcue = function (channel, control, value, status, group)
// turn it on directly here, the only work-around I could
// think of was to create a (very short) timed call-back
// to turn it off!
- engine.beginTimer(50, function() { engine.setValue(group, "slip_enabled", 1); }, 1);
+ // Raised bug about this.
+ // https://bugs.launchpad.net/mixxx/+bug/1538200
+ // Changed timer from 50 to 100 after the pathology of this
+ // bug was explined in the bug report.
+ engine.beginTimer(100, function() { engine.setValue(group, "slip_enabled", 1); }, 1);
}
}
} else {