Skip to content
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

Remove deprecations from controller mappings (2.5) #14235

Closed
wants to merge 4 commits into from
Closed

Remove deprecations from controller mappings (2.5) #14235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5b5a714
refactor(controllers): drop lodash dependency
git-developer Jan 26, 2025
705be3c
refactor(controllers): remove deepMerge
git-developer Jan 26, 2025
bf81118
refactor(controllers): remove Qt5 quirk
git-developer Jan 26, 2025
b42dcca
style(controllers): prefer const & let over var
git-developer Jan 26, 2025
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
3 changes: 1 addition & 2 deletions res/controllers/Behringer BCR2000.midi.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<MixxxControllerPreset schemaVersion="1" mixxxVersion="2.2.3+">
<MixxxControllerPreset schemaVersion="1" mixxxVersion="2.5.0+">
<info>
<name>Behringer BCR2000</name>
<author>Christian</author>
<description>Mixxx controller preset for a Behringer B-Control BCR2000 controller.</description>
</info>
<controller id="BCR2000">
<scriptfiles>
<file filename="lodash.mixxx.js"/>
<file filename="midi-components-0.0.js"/>
<file filename="Behringer-Extension-scripts.js" />
<file filename="Behringer-BCR2000-preset-scripts.js" />
Expand Down
3 changes: 1 addition & 2 deletions res/controllers/Behringer DDM4000.midi.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<MixxxControllerPreset schemaVersion="1" mixxxVersion="2.2.3+">
<MixxxControllerPreset schemaVersion="1" mixxxVersion="2.5.0+">
<info>
<name>Behringer DDM4000</name>
<author>Christian</author>
<description>Mixxx controller preset for a Behringer DDM4000 mixer.</description>
</info>
<controller id="DDM4000">
<scriptfiles>
<file filename="lodash.mixxx.js" />
<file filename="midi-components-0.0.js" />
<file filename="Behringer-Extension-scripts.js" />
<file filename="Behringer-DDM4000-scripts.js" functionprefix="DDM4000" />
Expand Down
56 changes: 28 additions & 28 deletions res/controllers/Behringer-BCR2000-preset-scripts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,30 +4,30 @@
(function(global) {

/* Controller-specific constants */
var ROW_SIZE = 8;
var PUSHENCODERGROUP_COUNT = 4;
var BUTTONROW_COUNT = 2;
var ENCODERROW_COUNT = 3;
var BUTTONBOX_SIZE = 4;
var PRESET_MIN = 1;
var PRESET_MAX = 32;
var STATUS_CONTROL_CHANGE = 0xB0;
var STATUS_PROGRAM_CHANGE = 0xC0;
const ROW_SIZE = 8;
const PUSHENCODERGROUP_COUNT = 4;
const BUTTONROW_COUNT = 2;
const ENCODERROW_COUNT = 3;
const BUTTONBOX_SIZE = 4;
const PRESET_MIN = 1;
const PRESET_MAX = 32;
const STATUS_CONTROL_CHANGE = 0xB0;
const STATUS_PROGRAM_CHANGE = 0xC0;

/* Preset-specific constants */
var PUSHENCODERGROUP_START = 0x01;
var PUSHENCODERGROUP_BUTTON_OFFSET = 0x20;
var BUTTONROW_START = 0x41;
var ENCODERROW_START = 0x51;
var BUTTONBOX_START = 0x69;
const PUSHENCODERGROUP_START = 0x01;
const PUSHENCODERGROUP_BUTTON_OFFSET = 0x20;
const BUTTONROW_START = 0x41;
const ENCODERROW_START = 0x51;
const BUTTONBOX_START = 0x69;

/**
* Select a preset in the controller.
*
* @param {number} A preset number (integer 1..32)
* @public
*/
var setPreset = function(presetNumber) {
const setPreset = function(presetNumber) {
if (presetNumber) {
presetNumber = Math.max(PRESET_MIN, presetNumber);
presetNumber = Math.min(PRESET_MAX, presetNumber);
Expand All @@ -43,7 +43,7 @@
* @return {Array} Array containing values
* @private
*/
var createElements = function(size, elementFactory) {
const createElements = function(size, elementFactory) {
return Object.keys(Array.apply(0, Array(size))).map(
function(_v, i) { return elementFactory.call(this, i); });
};
Expand All @@ -64,10 +64,10 @@
* @return {Array<number>} Array of MIDI addresses for the given range
* @private
*/
var calculateRange = function(startAddress, rangeNumber, size) {
const calculateRange = function(startAddress, rangeNumber, size) {
size = size || ROW_SIZE;
var rangeOffset = rangeNumber * ROW_SIZE;
var rangeStart = startAddress + rangeOffset;
const rangeOffset = rangeNumber * ROW_SIZE;
const rangeStart = startAddress + rangeOffset;
return createElements(size, function(i) { return rangeStart + i; });
};

Expand All @@ -81,7 +81,7 @@
* @return {Array<number>} Address range for the encoders in the encoder group
* @private
*/
var createPushEncoderGroup = function(groupNumber) {
const createPushEncoderGroup = function(groupNumber) {
return calculateRange(PUSHENCODERGROUP_START, groupNumber).map(function(encoder) {
return {"encoder": encoder, "button": encoder + PUSHENCODERGROUP_BUTTON_OFFSET};
});
Expand All @@ -95,7 +95,7 @@
* @return {Array<number>} Address range for the encoders in the encoder row
* @private
*/
var createEncoderRow = function(rowNumber) {
const createEncoderRow = function(rowNumber) {
return calculateRange(ENCODERROW_START, rowNumber);
};

Expand All @@ -107,7 +107,7 @@
* @return {Array<number>} Address range for the buttons in the button row
* @private
*/
var createButtonRow = function(rowNumber) {
const createButtonRow = function(rowNumber) {
return calculateRange(BUTTONROW_START, rowNumber);
};

Expand All @@ -118,17 +118,17 @@
* @return {Array<number>} Address range for the buttons in the button box
* @private
*/
var createButtonBox = function() {
const createButtonBox = function() {
return calculateRange(BUTTONBOX_START, 0, BUTTONBOX_SIZE);
};

/* Definition of MIDI controls */
var pushEncoderGroups = createElements(PUSHENCODERGROUP_COUNT, createPushEncoderGroup);
var buttonRows = createElements(BUTTONROW_COUNT, createButtonRow);
var encoderRows = createElements(ENCODERROW_COUNT, createEncoderRow);
var buttonBox = createButtonBox();
const pushEncoderGroups = createElements(PUSHENCODERGROUP_COUNT, createPushEncoderGroup);
const buttonRows = createElements(BUTTONROW_COUNT, createButtonRow);
const encoderRows = createElements(ENCODERROW_COUNT, createEncoderRow);
const buttonBox = createButtonBox();

var exports = {};
const exports = {};
exports.STATUS_CONTROL_CHANGE = STATUS_CONTROL_CHANGE;
exports.setPreset = setPreset;
exports.pushEncoderGroups = pushEncoderGroups;
Expand Down
11 changes: 6 additions & 5 deletions res/controllers/Behringer-BCR2000-scripts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,17 @@
*/

/* Globally available objects are declared as variables to avoid linter errors */
// eslint-next-line-disable no-var
var behringer = behringer, BCR2000Preset = BCR2000Preset;

var BCR2000 = new behringer.extension.GenericMidiController({
const BCR2000 = new behringer.extension.GenericMidiController({
configurationProvider: function() {

/* Shortcut variables */
var c = components;
var e = behringer.extension;
var p = BCR2000Preset;
var cc = p.STATUS_CONTROL_CHANGE;
const c = components;
const e = behringer.extension;
const p = BCR2000Preset;
const cc = p.STATUS_CONTROL_CHANGE;

return {
init: function() {
Expand Down
61 changes: 31 additions & 30 deletions res/controllers/Behringer-DDM4000-scripts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,24 @@
*/

/* Globally available objects are declared as variables to avoid linter errors */
// eslint-next-line-disable no-var
var behringer = behringer;

var DDM4000 = new behringer.extension.GenericMidiController({
const DDM4000 = new behringer.extension.GenericMidiController({
configurationProvider: function() {

var DEFAULT_LONGPRESS_DURATION = 500;
var DEFAULT_BLINK_DURATION = 425;
var THROTTLE_DELAY = 40;
const DEFAULT_LONGPRESS_DURATION = 500;
const DEFAULT_BLINK_DURATION = 425;
const THROTTLE_DELAY = 40;

/* Shortcut variables */
var c = components;
var e = behringer.extension;
var cc = 0xB0;
var note = 0x90;
var toggle = c.Button.prototype.types.toggle;
const c = components;
const e = behringer.extension;
const cc = 0xB0;
const note = 0x90;
const toggle = c.Button.prototype.types.toggle;

var CrossfaderAssignLED = function(options) {
const CrossfaderAssignLED = function(options) {
options = options || {};
options.outKey = options.outKey || "orientation";
e.CustomButton.call(this, options);
Expand All @@ -31,16 +32,16 @@ var DDM4000 = new behringer.extension.GenericMidiController({
right: 2
}
});
var left = CrossfaderAssignLED.prototype.position.left;
var center = CrossfaderAssignLED.prototype.position.center;
var right = CrossfaderAssignLED.prototype.position.right;
const left = CrossfaderAssignLED.prototype.position.left;
const center = CrossfaderAssignLED.prototype.position.center;
const right = CrossfaderAssignLED.prototype.position.right;

var CrossfaderUnit = function(options) {
var unitOptions = options || {};
const CrossfaderUnit = function(options) {
const unitOptions = options || {};
unitOptions.group = unitOptions.group || "[Master]";
c.ComponentContainer.call(this, unitOptions);

var Crossfader = function(options) {
const Crossfader = function(options) {
options = options || {};
options.inKey = options.inKey || options.key || "crossfader";
options.group = options.group || unitOptions.group;
Expand All @@ -56,9 +57,9 @@ var DDM4000 = new behringer.extension.GenericMidiController({
engine.setValue("[Master]", "crossfader_set_default", 1);
},
});
var crossfader = new Crossfader(options.crossfader);
const crossfader = new Crossfader(options.crossfader);

var CrossfaderToggleButton = function(options) {
const CrossfaderToggleButton = function(options) {
options = options || {};
if (options.type === undefined) {
options.type = c.Button.prototype.types.toggle;
Expand Down Expand Up @@ -96,7 +97,7 @@ var DDM4000 = new behringer.extension.GenericMidiController({
* @param {number} options Options object
* @public
*/
var CrossfaderReverseTapButton = function(options) {
const CrossfaderReverseTapButton = function(options) {
options = options || {};
options.inKey = options.inKey || "xFaderReverse";
c.Button.call(this, options);
Expand All @@ -108,7 +109,7 @@ var DDM4000 = new behringer.extension.GenericMidiController({
},
});

var Blinker = function(target, blinkDuration, outValueScale) {
const Blinker = function(target, blinkDuration, outValueScale) {
this.target = target;
this.outValueScale = outValueScale || components.Component.prototype.outValueScale;

Expand All @@ -125,11 +126,11 @@ var DDM4000 = new behringer.extension.GenericMidiController({
},
};

var SamplerBank = function(bankOptions) {
const SamplerBank = function(bankOptions) {
c.ComponentContainer.call(this);
var bank = this;
const bank = this;

var PlayButton = function(options) {
const PlayButton = function(options) {
options = options || {};
options.inKey = options.inKey || "cue_gotoandplay";
options.outKey = options.outKey || "track_loaded";
Expand All @@ -151,7 +152,7 @@ var DDM4000 = new behringer.extension.GenericMidiController({
group: bankOptions.group,
});

var PlayIndicatorLED = function(options) {
const PlayIndicatorLED = function(options) {
options = options || {};
options.outKey = options.outKey || "play_indicator";
this.blinker = new Blinker(this, options.blinkDuration);
Expand All @@ -171,35 +172,35 @@ var DDM4000 = new behringer.extension.GenericMidiController({
blinkDuration: DEFAULT_BLINK_DURATION,
});

var ReverseMode = function(options) {
const ReverseMode = function(options) {
options = options || {};
options.key = options.key || "reverse";
c.Button.call(this, options);
};
ReverseMode.prototype = e.deriveFrom(c.Button);
this.reverseMode = new ReverseMode({midi: bankOptions.reverse, group: bankOptions.group});

var LoopMode = function(options) {
const LoopMode = function(options) {
options = options || {};
options.key = options.inKey || "beatloop_activate";
c.Button.call(this, options);
this.inSetValue(true);
};
LoopMode.prototype = e.deriveFrom(c.Button, {
outValueScale: function(value) {
var button = c.Button.prototype;
const button = c.Button.prototype;
bank.playButton.type = value ? button.types.toggle : button.types.push;
if (!value) {
var beatloopSize = engine.getValue(this.group, "beatloop_size");
var key = "beatloop_" + beatloopSize;
const beatloopSize = engine.getValue(this.group, "beatloop_size");
const key = `beatloop_${beatloopSize}`;
engine.setValue(this.group, key, 0);
}
return button.outValueScale(value);
},
});
this.loopMode = new LoopMode({midi: bankOptions.loop, group: bankOptions.group});

var ModeButton = function(options) {
const ModeButton = function(options) {
options = options || {};
options.key = options.key || "mode";
options.longPressTimeout = options.longPressTimeout || DEFAULT_LONGPRESS_DURATION;
Expand Down
Loading
Loading