rename beatloop_activate to beatloop_toggle

beatloop_toggle makes more sense with the new behavior of deactivating the current loop if pressed when looping is enabled.
mixxxdj · Nov 13, 2021 · 1ffa07a · 1ffa07a
1 parent 1b079da
commit 1ffa07a
Show file tree

Hide file tree

Showing 48 changed files with 126 additions and 122 deletions.
diff --git a/res/controllers/Allen-and-Heath-Xone-K2-scripts.js b/res/controllers/Allen-and-Heath-Xone-K2-scripts.js
@@ -545,7 +545,7 @@ XoneK2.Deck = function (column, deckNumber, midiChannel) {
 
     this.bottomButtonLayers.loop[2] = new components.Button({
         unshift: function () {
-            this.inKey = 'beatloop_activate';
+            this.inKey = 'beatloop_toggle';
         },
         shift: function () {
             this.inKey = 'beatlooproll_activate';

diff --git a/res/controllers/Behringer-DDM4000-scripts.js b/res/controllers/Behringer-DDM4000-scripts.js
@@ -180,7 +180,7 @@ var DDM4000 = new behringer.extension.GenericMidiController({
 
             var LoopMode = function(options) {
                 options = options || {};
-                options.key = options.inKey || "beatloop_activate";
+                options.key = options.inKey || "beatloop_toggle";
                 c.Button.call(this, options);
                 this.inSetValue(true);
             };

diff --git a/res/controllers/Behringer-Extension-scripts.js b/res/controllers/Behringer-Extension-scripts.js
@@ -514,7 +514,7 @@
                 var beatjumpSize = engine.getValue(group, "beatjump_size");
                 engine.setValue(group, "beatjump_size", loopSize);
                 script.triggerControl(group, "beatjump_backward");
-                script.triggerControl(group, "beatloop_activate");
+                script.triggerControl(group, "beatloop_toggle");
                 engine.setValue(group, "beatjump_size", beatjumpSize);
             } else {
                 script.triggerControl(group, "reloop_toggle");

diff --git a/res/controllers/Denon-MC6000MK2-scripts.js b/res/controllers/Denon-MC6000MK2-scripts.js
@@ -965,7 +965,7 @@ DenonMC6000MK2.OldDeck.prototype.onAutoLoopButton = function(isButtonPressed) {
             if (this.getShiftState()) {
                 this.setValue("beatlooproll_activate", true);
             } else {
-                this.setValue("beatloop_activate", true);
+                this.setValue("beatloop_toggle", true);
             }
         }
     }

diff --git a/res/controllers/Denon-MC7000.midi.xml b/res/controllers/Denon-MC7000.midi.xml
@@ -1645,7 +1645,7 @@
             </control>
             <control>
                 <group>[Channel1]</group>
-                <key>beatloop_activate</key>
+                <key>beatloop_toggle</key>
                 <description>AutoLoop Ch1</description>
                 <status>0x94</status>
                 <midino>0x32</midino>
@@ -1655,7 +1655,7 @@
             </control>
             <control>
                 <group>[Channel2]</group>
-                <key>beatloop_activate</key>
+                <key>beatloop_toggle</key>
                 <description>AutoLoop Ch2</description>
                 <status>0x95</status>
                 <midino>0x32</midino>
@@ -1665,7 +1665,7 @@
             </control>
             <control>
                 <group>[Channel3]</group>
-                <key>beatloop_activate</key>
+                <key>beatloop_toggle</key>
                 <description>AutoLoop Ch3</description>
                 <status>0x96</status>
                 <midino>0x32</midino>
@@ -1675,7 +1675,7 @@
             </control>
             <control>
                 <group>[Channel4]</group>
-                <key>beatloop_activate</key>
+                <key>beatloop_toggle</key>
                 <description>AutoLoop Ch4</description>
                 <status>0x97</status>
                 <midino>0x32</midino>

diff --git a/res/controllers/Hercules-P32-scripts.js b/res/controllers/Hercules-P32-scripts.js
@@ -259,13 +259,13 @@ P32.Deck = function(deckNumbers, channel) {
                     if (engine.getValue(this.group, "loop_enabled") === 1) {
                         engine.setValue(this.group, "reloop_toggle", 1);
                     } else {
-                        engine.setValue(this.group, "beatloop_activate", 1);
+                        engine.setValue(this.group, "beatloop_toggle", 1);
                     }
                 } else {
                     if (engine.getValue(this.group, "reloop_toggle") !== 1) {
                         engine.setValue(this.group, "reloop_toggle", 0);
-                    } else if (engine.getValue(this.group, "beatloop_activate") !== 0) {
-                        engine.setValue(this.group, "beatloop_activate", 0);
+                    } else if (engine.getValue(this.group, "beatloop_toggle") !== 0) {
+                        engine.setValue(this.group, "beatloop_toggle", 0);
                     }
                 }
             };
@@ -276,8 +276,8 @@ P32.Deck = function(deckNumbers, channel) {
             if (engine.getValue(this.group, "reloop_toggle") !== 0) {
                 engine.setValue(this.group, "reloop_toggle", 0);
             }
-            if (engine.getValue(this.group, "beatloop_activate") !== 0) {
-                engine.setValue(this.group, "beatloop_activate", 0);
+            if (engine.getValue(this.group, "beatloop_toggle") !== 0) {
+                engine.setValue(this.group, "beatloop_toggle", 0);
             }
 
             this.input = function(_channel, _control, value, _status, _group) {

diff --git a/res/controllers/Hercules_DJControl_Jogvision-scripts.js b/res/controllers/Hercules_DJControl_Jogvision-scripts.js
@@ -399,7 +399,7 @@ var DJCJV = {
         // If "MODE" button IS pressed, activate beatloop at current playposition
         if (DJCJV.Channel[group].modePressed) {
             engine.setValue(group, "slip_enabled", value);
-            engine.setValue(group, "beatloop_activate", value);
+            engine.setValue(group, "beatloop_toggle", value);
         } else {
             engine.setValue(group, "reloop_toggle", value);
         }

diff --git a/res/controllers/Korg-KAOSS-DJ.midi.xml b/res/controllers/Korg-KAOSS-DJ.midi.xml
@@ -724,7 +724,7 @@
             </control>
             <control>
                 <group>[Channel2]</group>
-                <key>beatloop_activate</key>
+                <key>beatloop_toggle</key>
                 <description>MIDI Learned from 4 messages.</description>
                 <status>0x98</status>
                 <midino>0x29</midino>
@@ -744,7 +744,7 @@
             </control>
             <control>
                 <group>[Channel1]</group>
-                <key>beatloop_activate</key>
+                <key>beatloop_toggle</key>
                 <description>MIDI Learned from 2 messages.</description>
                 <status>0x97</status>
                 <midino>0x29</midino>

diff --git a/res/controllers/Numark-Mixtrack-Pro-FX-scripts.js b/res/controllers/Numark-Mixtrack-Pro-FX-scripts.js
@@ -297,7 +297,7 @@ MixtrackProFX.Deck = function(number) {
 
             if (!MixtrackProFX.shifted) {
                 if (engine.getValue(group, "loop_enabled") === 0) {
-                    script.triggerControl(group, "beatloop_activate");
+                    script.triggerControl(group, "beatloop_toggle");
                 } else {
                     script.triggerControl(group, "beatlooproll_activate");
                 }

diff --git a/res/controllers/Numark-N4-scripts.js b/res/controllers/Numark-N4-scripts.js
@@ -150,8 +150,8 @@ NumarkN4.topContainer = function(channel) {
         },
         unshift: function() {
             this.type=components.Button.prototype.types.push;
-            this.inKey="beatloop_activate";
-            this.outKey="beatloop_activate";
+            this.inKey="beatloop_toggle";
+            this.outKey="beatloop_toggle";
         },
     });
     this.btnSample4 = new components.Button({

diff --git a/res/controllers/Pioneer-DDJ-SB2-scripts.js b/res/controllers/Pioneer-DDJ-SB2-scripts.js
@@ -292,8 +292,8 @@ PioneerDDJSB2.Deck = function(deckNumber) {
     this.topPadRow.autoLoopLayer.beatloopButton = new components.Button({
         midi: [0x96 + deckNumber, 0x10],
         unshift: function() {
-            this.inKey = "beatloop_activate";
-            this.outKey = "beatloop_activate";
+            this.inKey = "beatloop_toggle";
+            this.outKey = "beatloop_toggle";
             this.disconnect();
             this.connect();
             this.trigger();

diff --git a/res/controllers/Pioneer-DDJ-SX-scripts.js b/res/controllers/Pioneer-DDJ-SX-scripts.js
@@ -1116,7 +1116,7 @@ PioneerDDJSX.slicerButtons = function(channel, control, value, status, group) {
     if (PioneerDDJSX.activeSlicerMode[deck] === PioneerDDJSX.slicerModes.contSlice) {
         engine.setValue(group, "slip_enabled", value);
         engine.setValue(group, "beatloop_size", PioneerDDJSX.selectedSlicerQuantization[deck]);
-        engine.setValue(group, "beatloop_activate", value);
+        engine.setValue(group, "beatloop_toggle", value);
     }
 };
 
@@ -1418,8 +1418,8 @@ PioneerDDJSX.autoLoopButton = function(channel, control, value, status, group) {
             engine.setValue(group, "reloop_toggle", true);
             engine.setValue(group, "reloop_toggle", false);
         } else {
-            engine.setValue(group, "beatloop_activate", true);
-            engine.setValue(group, "beatloop_activate", false);
+            engine.setValue(group, "beatloop_toggle", true);
+            engine.setValue(group, "beatloop_toggle", false);
         }
     }
 };

diff --git a/res/controllers/Reloop Terminal Mix 2-4.js b/res/controllers/Reloop Terminal Mix 2-4.js
@@ -209,7 +209,7 @@ TerminalMix.crossfaderCurve = function (channel, control, value, status, group)
 TerminalMix.loopLengthPress = function (channel, control, value, status, group) {
   if (value) {
     if (engine.getValue(group,"loop_enabled") === 0) {
-      script.triggerControl(group,"beatloop_activate",100);
+      script.triggerControl(group,"beatloop_toggle",100);
     } else {
       script.triggerControl(group,"reloop_toggle",100);
     }

diff --git a/res/controllers/Roland_DJ-505-scripts.js b/res/controllers/Roland_DJ-505-scripts.js
@@ -534,7 +534,7 @@ DJ505.Deck = function(deckNumbers, offset) {
     });
     this.autoLoop = new components.Button({
         midi: [0x94 + offset, 0x40],
-        inKey: "beatloop_activate",
+        inKey: "beatloop_toggle",
         outKey: "loop_enabled",
     });
 

diff --git a/res/controllers/Soundless_joyMIDI_scripts.js b/res/controllers/Soundless_joyMIDI_scripts.js
@@ -343,7 +343,7 @@ joyMIDI.hotcueButton = function(channel, control, value, status, group) {
 joyMIDI.reloopToggleButton = function(channel, control, value, status, group) {
     var usr = joyMIDI.userSetting.beatLoopRollEnable;
     var sft = joyMIDI[group].btnShift;
-    var cmd = sft ? (usr?"beatlooproll_activate":"beatloop_activate") : "reloop_toggle";
+    var cmd = sft ? (usr?"beatlooproll_activate":"beatloop_toggle") : "reloop_toggle";
     var val = (value > 0) ? 1 : 0;
 
     engine.setValue(group, cmd, val);

diff --git a/res/controllers/Stanton-DJC-4.midi.xml b/res/controllers/Stanton-DJC-4.midi.xml
@@ -24,7 +24,7 @@
       </control>
       <control>
         <group>[Channel1]</group>
-        <key>beatloop_activate</key>
+        <key>beatloop_toggle</key>
         <status>0x90</status>
         <midino>0x01</midino>
         <options>
@@ -42,7 +42,7 @@
       </control>
       <control>
         <group>[Channel2]</group>
-        <key>beatloop_activate</key>
+        <key>beatloop_toggle</key>
         <status>0x91</status>
         <midino>0x01</midino>
         <options>
@@ -60,7 +60,7 @@
       </control>
       <control>
         <group>[Channel3]</group>
-        <key>beatloop_activate</key>
+        <key>beatloop_toggle</key>
         <status>0x92</status>
         <midino>0x01</midino>
         <options>
@@ -78,7 +78,7 @@
       </control>
       <control>
         <group>[Channel4]</group>
-        <key>beatloop_activate</key>
+        <key>beatloop_toggle</key>
         <status>0x93</status>
         <midino>0x01</midino>
         <options>

diff --git a/res/controllers/Traktor-Kontrol-S2-MK2-hid-scripts.js b/res/controllers/Traktor-Kontrol-S2-MK2-hid-scripts.js
@@ -1260,7 +1260,7 @@ TraktorS2MK2.rightEncoderPress = function(field) {
         if (loopEnabled) {
             script.triggerControl(group, "reloop_toggle");
         } else {
-            script.triggerControl(group, "beatloop_activate");
+            script.triggerControl(group, "beatloop_toggle");
         }
     }
 };

diff --git a/res/controllers/Traktor-Kontrol-S2-MK3-hid-scripts.js b/res/controllers/Traktor-Kontrol-S2-MK3-hid-scripts.js
@@ -445,7 +445,7 @@ TraktorS2MK3.activateLoopHandler = function (field) {
     if (TraktorS2MK3.shiftPressed[field.group]) {
         engine.setValue(field.group, "reloop_toggle", field.value);
     } else {
-        engine.setValue(field.group, "beatloop_activate", field.value);
+        engine.setValue(field.group, "beatloop_toggle", field.value);
     }
 };
 

diff --git a/res/controllers/Traktor-Kontrol-S3-hid-scripts.js b/res/controllers/Traktor-Kontrol-S3-hid-scripts.js
@@ -549,7 +549,7 @@ TraktorS3.Deck.prototype.activateLoopHandler = function(field) {
         if (isLoopActive) {
             engine.setValue(this.activeChannel, "reloop_toggle", field.value);
         } else {
-            engine.setValue(this.activeChannel, "beatloop_activate", field.value);
+            engine.setValue(this.activeChannel, "beatloop_toggle", field.value);
         }
     }
 };

diff --git a/res/controllers/Traktor-Kontrol-S4-MK2-hid-scripts.js b/res/controllers/Traktor-Kontrol-S4-MK2-hid-scripts.js
@@ -1458,7 +1458,7 @@ TraktorS4MK2.loopSetHandler = function(field) {
     if (TraktorS4MK2.controller.shift_pressed[group]) {
         engine.setValue(field.group, "pitch_adjust_set_default", field.value);
     } else {
-        engine.setValue(field.group, "beatloop_activate", field.value);
+        engine.setValue(field.group, "beatloop_toggle", field.value);
     }
 };
 

diff --git a/res/controllers/Vestax-VCI-100MKII-scripts.js b/res/controllers/Vestax-VCI-100MKII-scripts.js
@@ -323,8 +323,8 @@ VCI102.loop = function(ch, midino, value, status, group) {
         if (engine.getValue(group, "loop_enabled")) {
             engine.setValue(group, "reloop_toggle", 1);
         } else {
-            engine.setValue(group, "beatloop_activate", 1);
-            engine.setValue(group, "beatloop_activate", 0);
+            engine.setValue(group, "beatloop_toggle", 1);
+            engine.setValue(group, "beatloop_toggle", 0);
         }
     }
 };

diff --git a/res/keyboard/cs_CZ.kbd.cfg b/res/keyboard/cs_CZ.kbd.cfg
@@ -70,7 +70,7 @@ loop_out_goto Shift+3
 reloop_toggle č
 reloop_andstop Shift+4
 
-beatloop_activate q
+beatloop_toggle q
 beatlooproll_activate Shift+q
 loop_halve w
 loop_double e
@@ -124,7 +124,7 @@ loop_out_goto Shift+8
 reloop_toggle í
 reloop_andstop Shift+9
 
-beatloop_activate u
+beatloop_toggle u
 beatlooproll_activate Shift+u
 loop_halve i
 loop_double o

diff --git a/res/keyboard/da_DK.kbd.cfg b/res/keyboard/da_DK.kbd.cfg
@@ -70,7 +70,7 @@ loop_out_goto Shift+#
 reloop_toggle 4
 reloop_andstop Shift+$
 
-beatloop_activate q
+beatloop_toggle q
 beatlooproll_activate Shift+q
 loop_halve w
 loop_double e
@@ -124,7 +124,7 @@ loop_out_goto Shift+(
 reloop_toggle 9
 reloop_andstop Shift+)
 
-beatloop_activate u
+beatloop_toggle u
 beatlooproll_activate Shift+u
 loop_halve i
 loop_double o

diff --git a/res/keyboard/de_CH.kbd.cfg b/res/keyboard/de_CH.kbd.cfg
@@ -70,7 +70,7 @@ loop_out_goto Shift+*
 reloop_toggle 4
 reloop_andstop Shift+ç
 
-beatloop_activate q
+beatloop_toggle q
 beatlooproll_activate Shift+q
 loop_halve w
 loop_double e
@@ -124,7 +124,7 @@ loop_out_goto Shift+(
 reloop_toggle 9
 reloop_andstop Shift+)
 
-beatloop_activate u
+beatloop_toggle u
 beatlooproll_activate Shift+u
 loop_halve i
 loop_double o

diff --git a/res/keyboard/de_DE.kbd.cfg b/res/keyboard/de_DE.kbd.cfg
@@ -70,7 +70,7 @@ loop_out_goto Shift+§
 reloop_toggle 4
 reloop_andstop Shift+$
 
-beatloop_activate q
+beatloop_toggle q
 beatlooproll_activate Shift+q
 loop_halve w
 loop_double e
@@ -124,7 +124,7 @@ loop_out_goto Shift+(
 reloop_toggle 9
 reloop_andstop Shift+)
 
-beatloop_activate u
+beatloop_toggle u
 beatlooproll_activate Shift+u
 loop_halve i
 loop_double o

diff --git a/res/keyboard/el_GR.kbd.cfg b/res/keyboard/el_GR.kbd.cfg
@@ -70,7 +70,7 @@ loop_out_goto Shift+#
 reloop_toggle 4
 reloop_andstop Shift+$
 
-beatloop_activate ;
+beatloop_toggle ;
 beatlooproll_activate Shift+:
 loop_halve ς
 loop_double ε
@@ -128,7 +128,7 @@ loop_out_goto Shift+*
 reloop_toggle 9
 reloop_andstop Shift+(
 
-beatloop_activate θ
+beatloop_toggle θ
 beatlooproll_activate Shift+Θ
 loop_halve ι
 loop_double ο

diff --git a/res/keyboard/en_US.kbd.cfg b/res/keyboard/en_US.kbd.cfg
@@ -70,7 +70,7 @@ loop_out_goto Shift+#
 reloop_toggle 4
 reloop_andstop Shift+$
 
-beatloop_activate q
+beatloop_toggle q
 beatlooproll_activate Shift+q
 loop_halve w
 loop_double e
@@ -124,7 +124,7 @@ loop_out_goto Shift+*
 reloop_toggle 9
 reloop_andstop Shift+(
 
-beatloop_activate u
+beatloop_toggle u
 beatlooproll_activate Shift+u
 loop_halve i
 loop_double o