diff options
| author | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2019-11-19 18:59:18 +0100 |
|---|---|---|
| committer | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2020-02-29 17:48:41 +0100 |
| commit | 09f6982393641dbcdb2e8a76f16353700c0006d5 (patch) | |
| tree | d6270c3f58310aa3f8ae06cd9c739c36ff62705a /res/controllers | |
| parent | 1dad29440f2005fb90e3bef68b66b78c25831679 (diff) | |
Roland DJ-505: Rename Component.colors to .colorMapper
Diffstat (limited to 'res/controllers')
| -rw-r--r-- | res/controllers/Roland_DJ-505-scripts.js | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/res/controllers/Roland_DJ-505-scripts.js b/res/controllers/Roland_DJ-505-scripts.js index 8e733c2b85..6e6c45284d 100644 --- a/res/controllers/Roland_DJ-505-scripts.js +++ b/res/controllers/Roland_DJ-505-scripts.js @@ -1246,7 +1246,6 @@ DJ505.HotcueMode = function(deck, offset) { this.ledControl = DJ505.PadMode.HOTCUE; this.color = DJ505.PadColor.WHITE; - var hotcueColors = DJ505.PadColorMap; this.pads = new components.ComponentContainer(); for (var i = 0; i <= 7; i++) { this.pads[i] = new components.HotcueButton({ @@ -1258,7 +1257,7 @@ DJ505.HotcueMode = function(deck, offset) { group: deck.currentDeck, on: this.color, off: this.color + DJ505.PadColor.DIM_MODIFIER, - colors: hotcueColors, + colorMapper: DJ505.PadColorMap, outConnect: false, }); } @@ -1294,7 +1293,6 @@ DJ505.CueLoopMode = function(deck, offset) { this.ledControl = DJ505.PadMode.HOTCUE; this.color = DJ505.PadColor.BLUE; - var cueloopColors = DJ505.PadColorMap; this.PerformancePad = function(n) { this.midi = [0x94 + offset, 0x14 + n]; this.number = n + 1; @@ -1310,7 +1308,7 @@ DJ505.CueLoopMode = function(deck, offset) { group: deck.currentDeck, on: this.color, off: this.color + DJ505.PadColor.DIM_MODIFIER, - colors: cueloopColors, + colorMapper: DJ505.PadColorMap, outConnect: false, unshift: function() { this.input = function(channel, control, value, status, group) { @@ -1603,13 +1601,12 @@ DJ505.PitchPlayMode = function(deck, offset) { this.color = DJ505.PadColor.GREEN; this.cuepoint = 1; this.range = PitchPlayRange.MID; - var pitchplayColors = DJ505.PadColorMap; this.PerformancePad = function(n) { this.midi = [0x94 + offset, 0x14 + n]; this.number = n + 1; this.on = this.color + DJ505.PadColor.DIM_MODIFIER; - this.colors = pitchplayColors; + this.colorMapper = DJ505.PadColorMap; this.colorKey = "hotcue_" + this.number + "_color"; components.Button.call(this); }; @@ -1623,7 +1620,7 @@ DJ505.PitchPlayMode = function(deck, offset) { off: DJ505.PadColor.OFF, outputColor: function(colorCode) { // For colored hotcues (shifted only) - var midiColor = this.colors.getNearestValue(colorCode); + var midiColor = this.colorMapper.getNearestValue(colorCode); this.send((this.mode.cuepoint === this.number) ? midiColor : (midiColor + DJ505.PadColor.DIM_MODIFIER)); }, unshift: function() { |