Skip to content

Commit 5435d47

Browse files
ronso0ronso0
committed
chore: Use new controls in mappings and skins [WIP]
1 parent 6c306a3 commit 5435d47

189 files changed

Lines changed: 1441 additions & 1439 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎res/controllers/Akai MPD24.midi.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<controller id="Akai MPD24 MIDI 1">
1111
<controls>
1212
<control>
13-
<group>[Master]</group>
13+
<group>[Mixer]</group>
1414
<key>crossfader</key>
1515
<status>0xB0</status>
1616
<midino>17</midino>
@@ -24,22 +24,22 @@
2424
</control>
2525

2626
<control>
27-
<group>[Master]</group>
28-
<key>volume</key>
27+
<group>[Mixer]</group>
28+
<key>main_gain</key>
2929
<status>0xB0</status>
3030
<midino>3</midino>
3131
</control>
3232

3333
<control>
34-
<group>[Master]</group>
35-
<key>headVolume</key>
34+
<group>[Mixer]</group>
35+
<key>headphone_gain</key>
3636
<status>0xB0</status>
3737
<midino>26</midino>
3838
</control>
3939

4040
<control>
41-
<group>[Master]</group>
42-
<key>headMix</key>
41+
<group>[Mixer]</group>
42+
<key>headphone_mix</key>
4343
<status>0xB0</status>
4444
<midino>4</midino>
4545
</control>

‎res/controllers/Akai-LPD8-RK-scripts.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ LPD8RK.loops["b33"] = new Array("[Sampler2]", "8", 0xB3, 0x03);
242242
LPD8RK.init = function (id, debug) { // called when the device is opened & set up
243243
if (LPD8RK.debug){print("###init##############")};
244244
//soft takeovers
245-
engine.softTakeover("[Master]","crossfader",true);
245+
engine.softTakeover("[Mixer]","crossfader",true);
246246
engine.softTakeover("[Channel1]","volume",true);
247247
engine.softTakeover("[Channel1]","rate",true);
248248
engine.softTakeover("[Channel2]","volume",true);

‎res/controllers/Akai-LPD8-RK.midi.xml‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
</options>
2626
</control>
2727
<control>
28-
<group>[Master]</group>
28+
<group>[Mixer]</group>
2929
<key>LPD8RK.softXfade</key>
3030
<status>0xB0</status>
3131
<midino>0x66</midino>
@@ -34,17 +34,17 @@
3434
</options>
3535
</control>
3636
<control>
37-
<group>[Master]</group>
38-
<key>headVolume</key>
37+
<group>[Mixer]</group>
38+
<key>headphone_gain</key>
3939
<status>0xB0</status>
4040
<midino>0x67</midino>
4141
<options>
4242
<normal/>
4343
</options>
4444
</control>
4545
<control>
46-
<group>[Master]</group>
47-
<key>headMix</key>
46+
<group>[Mixer]</group>
47+
<key>headphone_mix</key>
4848
<status>0xB0</status>
4949
<midino>0x68</midino>
5050
<options>
@@ -343,7 +343,7 @@
343343
</options>
344344
</control>
345345
<control>
346-
<group>[Master]</group>
346+
<group>[Mixer]</group>
347347
<key>LPD8RK.softXfade</key>
348348
<status>0xB1</status>
349349
<midino>0x66</midino>
@@ -352,17 +352,17 @@
352352
</options>
353353
</control>
354354
<control>
355-
<group>[Master]</group>
356-
<key>headVolume</key>
355+
<group>[Mixer]</group>
356+
<key>headphone_gain</key>
357357
<status>0xB1</status>
358358
<midino>0x67</midino>
359359
<options>
360360
<normal/>
361361
</options>
362362
</control>
363363
<control>
364-
<group>[Master]</group>
365-
<key>headMix</key>
364+
<group>[Mixer]</group>
365+
<key>headphone_mix</key>
366366
<status>0xB1</status>
367367
<midino>0x68</midino>
368368
<options>
@@ -663,7 +663,7 @@
663663
</options>
664664
</control>
665665
<control>
666-
<group>[Master]</group>
666+
<group>[Mixer]</group>
667667
<key>LPD8RK.softXfade</key>
668668
<status>0xB2</status>
669669
<midino>0x66</midino>
@@ -672,17 +672,17 @@
672672
</options>
673673
</control>
674674
<control>
675-
<group>[Master]</group>
676-
<key>headVolume</key>
675+
<group>[Mixer]</group>
676+
<key>headphone_gain</key>
677677
<status>0xB2</status>
678678
<midino>0x67</midino>
679679
<options>
680680
<normal/>
681681
</options>
682682
</control>
683683
<control>
684-
<group>[Master]</group>
685-
<key>headMix</key>
684+
<group>[Mixer]</group>
685+
<key>headphone_mix</key>
686686
<status>0xB2</status>
687687
<midino>0x68</midino>
688688
<options>
@@ -983,7 +983,7 @@
983983
</options>
984984
</control>
985985
<control>
986-
<group>[Master]</group>
986+
<group>[Mixer]</group>
987987
<key>LPD8RK.softXfade</key>
988988
<status>0xb3</status>
989989
<midino>0x66</midino>
@@ -992,17 +992,17 @@
992992
</options>
993993
</control>
994994
<control>
995-
<group>[Master]</group>
996-
<key>headVolume</key>
995+
<group>[Mixer]</group>
996+
<key>headphone_gain</key>
997997
<status>0xb3</status>
998998
<midino>0x67</midino>
999999
<options>
10001000
<normal/>
10011001
</options>
10021002
</control>
10031003
<control>
1004-
<group>[Master]</group>
1005-
<key>headMix</key>
1004+
<group>[Mixer]</group>
1005+
<key>headphone_mix</key>
10061006
<status>0xb3</status>
10071007
<midino>0x68</midino>
10081008
<options>

‎res/controllers/Allen-and-Heath-Xone-K2-scripts.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ XoneK2.shutdown = function(id) {
114114
XoneK2.decksBottomLeftEncoderPress = function (channel, control, value, status) {
115115
XoneK2.controllers[channel].leftEncoderIsPressed = (status & 0xF0) === 0x90;
116116
if (XoneK2.controllers[channel].isShifted && XoneK2.controllers[channel].leftEncoderIsPressed) {
117-
script.toggleControl('[Master]', 'headSplit');
117+
script.toggleControl('[Mixer]', 'headphone_split');
118118
}
119119
};
120120
XoneK2.decksBottomLeftEncoder = function (channel, control, value, status) {
@@ -128,22 +128,22 @@ XoneK2.decksBottomLeftEncoder = function (channel, control, value, status) {
128128
}
129129
engine.setValue("[InternalClock]", "bpm", bpm);
130130
} else {
131-
var mix = engine.getValue("[Master]", "headMix");
131+
var mix = engine.getValue("[Mixer]", "headphone_mix");
132132
if (value === 1) {
133133
mix += 1;
134134
} else {
135135
mix -= 1;
136136
}
137-
engine.setValue("[Master]", "headMix", mix);
137+
engine.setValue("[Mixer]", "headphone_mix", mix);
138138
}
139139
} else {
140-
var gain = engine.getValue("[Master]", "headGain");
140+
var gain = engine.getValue("[Mixer]", "headphone_gain");
141141
if (value === 1) {
142142
gain += 0.025;
143143
} else {
144144
gain -= 0.025;
145145
}
146-
engine.setValue("[Master]", "headGain", gain);
146+
engine.setValue("[Mixer]", "headphone_gain", gain);
147147
}
148148
};
149149

@@ -183,13 +183,13 @@ XoneK2.decksBottomRightEncoder = function (channel, control, value, status) {
183183
}
184184
engine.setValue("[InternalClock]", "bpm", bpm);
185185
} else {
186-
var gain = engine.getValue("[Master]", "gain");
186+
var gain = engine.getValue("[Mixer]", "main_gain");
187187
if (value === 1) {
188188
gain += 0.025;
189189
} else {
190190
gain -= 0.025;
191191
}
192-
engine.setValue("[Master]", "gain", gain);
192+
engine.setValue("[Mixer]", "main_gain", gain);
193193
}
194194
};
195195

@@ -895,7 +895,7 @@ XoneK2.EffectUnit = function (column, unitNumber, midiChannel, twoDeck) {
895895
this.valueAtLastEffectSwitch = this.previousValueReceived;
896896
// Floor the threshold to ensure that every effect can be selected
897897
this.changeThreshold = Math.floor(this.max /
898-
engine.getValue('[Master]', 'num_effectsavailable'));
898+
engine.getValue('[App]', 'num_effectsavailable'));
899899

900900
this.input = function (channel, control, value, status, group) {
901901
var change = value - this.valueAtLastEffectSwitch;

‎res/controllers/American Audio VMS2.midi.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1268,34 +1268,34 @@
12681268
</control>
12691269
<!-- Mixer main-->
12701270
<control>
1271-
<group>[Master]</group>
1272-
<key>headMix</key>
1271+
<group>[Mixer]</group>
1272+
<key>headphone_mix</key>
12731273
<status>0xB0</status>
12741274
<midino>0x22</midino>
12751275
<options>
12761276
<!-- soft-takeover /-->
12771277
</options>
12781278
</control>
12791279
<control>
1280-
<group>[Master]</group>
1281-
<key>headVolume</key>
1280+
<group>[Mixer]</group>
1281+
<key>headphone_gain</key>
12821282
<status>0xB0</status>
12831283
<midino>0x23</midino>
12841284
<options>
12851285
<!-- soft-takeover /-->
12861286
</options>
12871287
</control>
12881288
<control>
1289-
<group>[Master]</group>
1290-
<key>volume</key>
1289+
<group>[Mixer]</group>
1290+
<key>main_gain</key>
12911291
<status>0xB0</status>
12921292
<midino>0x1C</midino>
12931293
<options>
12941294
<!-- soft-takeover /-->
12951295
</options>
12961296
</control>
12971297
<control>
1298-
<group>[Master]</group>
1298+
<group>[Mixer]</group>
12991299
<key>balance</key>
13001300
<status>0xB0</status>
13011301
<midino>0x1D</midino>

‎res/controllers/American Audio VMS4.midi.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1468,34 +1468,34 @@ Assumes "Post EQ" mode. (See Wiki for full setup instructions.)</description>
14681468

14691469
<!-- Mixer main-->
14701470
<control>
1471-
<group>[Master]</group>
1472-
<key>headMix</key>
1471+
<group>[Mixer]</group>
1472+
<key>headphone_mix</key>
14731473
<status>0xB0</status>
14741474
<midino>0x22</midino>
14751475
<options>
14761476
<soft-takeover/>
14771477
</options>
14781478
</control>
14791479
<control>
1480-
<group>[Master]</group>
1481-
<key>headVolume</key>
1480+
<group>[Mixer]</group>
1481+
<key>headphone_gain</key>
14821482
<status>0xB0</status>
14831483
<midino>0x23</midino>
14841484
<options>
14851485
<soft-takeover />
14861486
</options>
14871487
</control>
14881488
<control>
1489-
<group>[Master]</group>
1490-
<key>volume</key>
1489+
<group>[Mixer]</group>
1490+
<key>main_gain</key>
14911491
<status>0xB0</status>
14921492
<midino>0x1C</midino>
14931493
<options>
14941494
<soft-takeover />
14951495
</options>
14961496
</control>
14971497
<control>
1498-
<group>[Master]</group>
1498+
<group>[Mixer]</group>
14991499
<key>balance</key>
15001500
<status>0xB0</status>
15011501
<midino>0x1D</midino>

‎res/controllers/American-Audio-VMS2-scripts.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ VMS2.init = function (id) { // called when the MIDI device is opened & set up
6868
// engine.softTakeover("[Channel1]","filterHigh",true);
6969
// engine.softTakeover("[Channel1]","filterMed",true);
7070
// engine.softTakeover("[Channel1]","filterLow",true);
71-
// engine.softTakeover("[Master]","crossfader",true);
71+
// engine.softTakeover("[Mixer]","crossfader",true);
7272
// engine.softTakeover("[Channel2]","rate",true);
7373
// engine.softTakeover("[Channel2]","volume",true);
7474
// engine.softTakeover("[Channel2]","pregain",true);

‎res/controllers/American-Audio-VMS4-scripts.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ VMS4.init = function (id) { // called when the MIDI device is opened & set up
5555
// Enable soft-takeover for all direct hardware controls
5656
// (Many of these are mapped in the XML directly so these have no effect.
5757
// Here for completeness in case any eventually move to script.)
58-
engine.softTakeover("[Master]","crossfader",true);
58+
engine.softTakeover("[Mixer]","crossfader",true);
5959
engine.softTakeover("[Channel1]","rate",true);
6060
engine.softTakeover("[Channel1]","volume",true);
6161
engine.softTakeover("[Channel1]","pregain",true);

‎res/controllers/Behringer BCD2000.midi.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@
194194
<control>
195195
<status>0xb0</status>
196196
<midino>0x1</midino>
197-
<group>[Master]</group>
197+
<group>[Mixer]</group>
198198
<key>crossfader</key>
199199
<options>
200200
<normal/>
@@ -429,8 +429,8 @@
429429
<control>
430430
<status>0xb0</status>
431431
<midino>0x10</midino>
432-
<group>[Master]</group>
433-
<key>volume</key>
432+
<group>[Mixer]</group>
433+
<key>main_gain</key>
434434
<options>
435435
<normal/>
436436
</options>
@@ -447,8 +447,8 @@
447447
<control>
448448
<status>0xb0</status>
449449
<midino>0x11</midino>
450-
<group>[Master]</group>
451-
<key>headMix</key>
450+
<group>[Mixer]</group>
451+
<key>headphone_mix</key>
452452
<options>
453453
<normal/>
454454
</options>

‎res/controllers/Behringer BCD3000 Advanced.midi.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@
404404
<control>
405405
<status>0xb0</status>
406406
<midino>0x1</midino>
407-
<group>[Master]</group>
407+
<group>[Mixer]</group>
408408
<key>crossfader</key>
409409
<description></description>
410410
<options>
@@ -414,7 +414,7 @@
414414
<control>
415415
<status>0xb0</status>
416416
<midino>0x10</midino>
417-
<group>[Master]</group>
417+
<group>[Mixer]</group>
418418
<key>balance</key>
419419
<description></description>
420420
<options>
@@ -594,7 +594,7 @@
594594
<control>
595595
<status>0x90</status>
596596
<midino>0x1c</midino>
597-
<group>[Master]</group>
597+
<group>[Mixer]</group>
598598
<key>BehringerBCD3000.keykey</key>
599599
<options>
600600
<script-binding/>

0 commit comments

Comments
 (0)