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

Jump to bottom

Remove offensive language (Pt. 3) #11960

Draft
wants to merge 10 commits into
base: 2.4
Choose a base branch
from
Draft

Remove offensive language (Pt. 3) #11960

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d2f2eb8
refactor: Rename `[Master]` to `[Main]` and add group alias
Holzhaus Sep 10, 2023
0e97149
refactor: Add group alias support for effect chains/slots
Holzhaus Sep 10, 2023
8a48f12
refactor: Use `[Main]` group in entire C++ code
Holzhaus Sep 10, 2023
c68577a
chore(keyboard): Use `[Main]` group in keyboard mappings
Holzhaus Sep 10, 2023
09dbc8f
chore(qml): Use `[Main]` group in QML skin
Holzhaus Sep 10, 2023
40bdb8b
refactor(skins): Use `[Main]` group in all skins
Holzhaus Sep 10, 2023
5ad20c2
refactor(tools): Use `[Main]` group in `make_xone.py` script
Holzhaus Sep 10, 2023
87763ce
refactor(controllers): Use `[Main]` group in built-in mappings
Holzhaus Sep 10, 2023
7722a5a
refactor: Rename `[MasterOutput]` to `[MainOutput]` and add group alias
Holzhaus Sep 10, 2023
beb9ba1
refactor(skins): Use `[MainOutput]` group in all skins
Holzhaus Sep 11, 2023
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
10 changes: 5 additions & 5 deletions res/controllers/Akai MPD24.midi.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,35 +10,35 @@
<controller id="Akai MPD24 MIDI 1">
<controls>
<control>
<group>[Master]</group>
<group>[Main]</group>
<key>crossfader</key>
<status>0xB0</status>
<midino>17</midino>
</control>

<control>
<group>[Master]</group>
<group>[Main]</group>
<key>balance</key>
<status>0xB0</status>
<midino>32</midino>
</control>

<control>
<group>[Master]</group>
<group>[Main]</group>
<key>volume</key>
<status>0xB0</status>
<midino>3</midino>
</control>

<control>
<group>[Master]</group>
<group>[Main]</group>
<key>headVolume</key>
<status>0xB0</status>
<midino>26</midino>
</control>

<control>
<group>[Master]</group>
<group>[Main]</group>
<key>headMix</key>
<status>0xB0</status>
<midino>4</midino>
Expand Down
2 changes: 1 addition & 1 deletion res/controllers/Akai-LPD8-RK-scripts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ LPD8RK.loops["b33"] = new Array("[Sampler2]", "8", 0xB3, 0x03);
LPD8RK.init = function (id, debug) { // called when the device is opened & set up
if (LPD8RK.debug){print("###init##############")};
//soft takeovers
engine.softTakeover("[Master]","crossfader",true);
engine.softTakeover("[Main]","crossfader",true);
engine.softTakeover("[Channel1]","volume",true);
engine.softTakeover("[Channel1]","rate",true);
engine.softTakeover("[Channel2]","volume",true);
Expand Down
24 changes: 12 additions & 12 deletions res/controllers/Akai-LPD8-RK.midi.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
</options>
</control>
<control>
<group>[Master]</group>
<group>[Main]</group>
<key>LPD8RK.softXfade</key>
<status>0xB0</status>
<midino>0x66</midino>
Expand All @@ -34,7 +34,7 @@
</options>
</control>
<control>
<group>[Master]</group>
<group>[Main]</group>
<key>headVolume</key>
<status>0xB0</status>
<midino>0x67</midino>
Expand All @@ -43,7 +43,7 @@
</options>
</control>
<control>
<group>[Master]</group>
<group>[Main]</group>
<key>headMix</key>
<status>0xB0</status>
<midino>0x68</midino>
Expand Down Expand Up @@ -343,7 +343,7 @@
</options>
</control>
<control>
<group>[Master]</group>
<group>[Main]</group>
<key>LPD8RK.softXfade</key>
<status>0xB1</status>
<midino>0x66</midino>
Expand All @@ -352,7 +352,7 @@
</options>
</control>
<control>
<group>[Master]</group>
<group>[Main]</group>
<key>headVolume</key>
<status>0xB1</status>
<midino>0x67</midino>
Expand All @@ -361,7 +361,7 @@
</options>
</control>
<control>
<group>[Master]</group>
<group>[Main]</group>
<key>headMix</key>
<status>0xB1</status>
<midino>0x68</midino>
Expand Down Expand Up @@ -663,7 +663,7 @@
</options>
</control>
<control>
<group>[Master]</group>
<group>[Main]</group>
<key>LPD8RK.softXfade</key>
<status>0xB2</status>
<midino>0x66</midino>
Expand All @@ -672,7 +672,7 @@
</options>
</control>
<control>
<group>[Master]</group>
<group>[Main]</group>
<key>headVolume</key>
<status>0xB2</status>
<midino>0x67</midino>
Expand All @@ -681,7 +681,7 @@
</options>
</control>
<control>
<group>[Master]</group>
<group>[Main]</group>
<key>headMix</key>
<status>0xB2</status>
<midino>0x68</midino>
Expand Down Expand Up @@ -983,7 +983,7 @@
</options>
</control>
<control>
<group>[Master]</group>
<group>[Main]</group>
<key>LPD8RK.softXfade</key>
<status>0xb3</status>
<midino>0x66</midino>
Expand All @@ -992,7 +992,7 @@
</options>
</control>
<control>
<group>[Master]</group>
<group>[Main]</group>
<key>headVolume</key>
<status>0xb3</status>
<midino>0x67</midino>
Expand All @@ -1001,7 +1001,7 @@
</options>
</control>
<control>
<group>[Master]</group>
<group>[Main]</group>
<key>headMix</key>
<status>0xb3</status>
<midino>0x68</midino>
Expand Down
20 changes: 10 additions & 10 deletions res/controllers/Allen-and-Heath-Xone-K2-scripts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ XoneK2.shutdown = function(id) {
XoneK2.decksBottomLeftEncoderPress = function (channel, control, value, status) {
XoneK2.controllers[channel].leftEncoderIsPressed = (status & 0xF0) === 0x90;
if (XoneK2.controllers[channel].isShifted && XoneK2.controllers[channel].leftEncoderIsPressed) {
script.toggleControl('[Master]', 'headSplit');
script.toggleControl('[Main]', 'headSplit');
}
};
XoneK2.decksBottomLeftEncoder = function (channel, control, value, status) {
Expand All @@ -128,22 +128,22 @@ XoneK2.decksBottomLeftEncoder = function (channel, control, value, status) {
}
engine.setValue("[InternalClock]", "bpm", bpm);
} else {
var mix = engine.getValue("[Master]", "headMix");
var mix = engine.getValue("[Main]", "headMix");
if (value === 1) {
mix += 1;
} else {
mix -= 1;
}
engine.setValue("[Master]", "headMix", mix);
engine.setValue("[Main]", "headMix", mix);
}
} else {
var gain = engine.getValue("[Master]", "headGain");
var gain = engine.getValue("[Main]", "headGain");
if (value === 1) {
gain += 0.025;
} else {
gain -= 0.025;
}
engine.setValue("[Master]", "headGain", gain);
engine.setValue("[Main]", "headGain", gain);
}
};

Expand Down Expand Up @@ -183,13 +183,13 @@ XoneK2.decksBottomRightEncoder = function (channel, control, value, status) {
}
engine.setValue("[InternalClock]", "bpm", bpm);
} else {
var gain = engine.getValue("[Master]", "gain");
var gain = engine.getValue("[Main]", "gain");
if (value === 1) {
gain += 0.025;
} else {
gain -= 0.025;
}
engine.setValue("[Master]", "gain", gain);
engine.setValue("[Main]", "gain", gain);
}
};

Expand Down Expand Up @@ -734,8 +734,8 @@ XoneK2.EffectUnit = function (column, unitNumber, midiChannel, twoDeck) {
},
shift: function () {
this.disconnect();
this.inKey = 'group_[Master]_enable';
this.outKey = 'group_[Master]_enable';
this.inKey = 'group_[Main]_enable';
this.outKey = 'group_[Main]_enable';
this.color = XoneK2.color.amber;
this.connect();
this.trigger();
Expand Down Expand Up @@ -895,7 +895,7 @@ XoneK2.EffectUnit = function (column, unitNumber, midiChannel, twoDeck) {
this.valueAtLastEffectSwitch = this.previousValueReceived;
// Floor the threshold to ensure that every effect can be selected
this.changeThreshold = Math.floor(this.max /
engine.getValue('[Master]', 'num_effectsavailable'));
engine.getValue('[Main]', 'num_effectsavailable'));

this.input = function (channel, control, value, status, group) {
var change = value - this.valueAtLastEffectSwitch;
Expand Down
8 changes: 4 additions & 4 deletions res/controllers/American Audio VMS2.midi.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1268,7 +1268,7 @@
</control>
<!-- Mixer main-->
<control>
<group>[Master]</group>
<group>[Main]</group>
<key>headMix</key>
<status>0xB0</status>
<midino>0x22</midino>
Expand All @@ -1277,7 +1277,7 @@
</options>
</control>
<control>
<group>[Master]</group>
<group>[Main]</group>
<key>headVolume</key>
<status>0xB0</status>
<midino>0x23</midino>
Expand All @@ -1286,7 +1286,7 @@
</options>
</control>
<control>
<group>[Master]</group>
<group>[Main]</group>
<key>volume</key>
<status>0xB0</status>
<midino>0x1C</midino>
Expand All @@ -1295,7 +1295,7 @@
</options>
</control>
<control>
<group>[Master]</group>
<group>[Main]</group>
<key>balance</key>
<status>0xB0</status>
<midino>0x1D</midino>
Expand Down
8 changes: 4 additions & 4 deletions res/controllers/American Audio VMS4.midi.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1468,7 +1468,7 @@ Assumes "Post EQ" mode. (See Wiki for full setup instructions.)</description>

<!-- Mixer main-->
<control>
<group>[Master]</group>
<group>[Main]</group>
<key>headMix</key>
<status>0xB0</status>
<midino>0x22</midino>
Expand All @@ -1477,7 +1477,7 @@ Assumes "Post EQ" mode. (See Wiki for full setup instructions.)</description>
</options>
</control>
<control>
<group>[Master]</group>
<group>[Main]</group>
<key>headVolume</key>
<status>0xB0</status>
<midino>0x23</midino>
Expand All @@ -1486,7 +1486,7 @@ Assumes "Post EQ" mode. (See Wiki for full setup instructions.)</description>
</options>
</control>
<control>
<group>[Master]</group>
<group>[Main]</group>
<key>volume</key>
<status>0xB0</status>
<midino>0x1C</midino>
Expand All @@ -1495,7 +1495,7 @@ Assumes "Post EQ" mode. (See Wiki for full setup instructions.)</description>
</options>
</control>
<control>
<group>[Master]</group>
<group>[Main]</group>
<key>balance</key>
<status>0xB0</status>
<midino>0x1D</midino>
Expand Down
2 changes: 1 addition & 1 deletion res/controllers/American-Audio-VMS2-scripts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ VMS2.init = function (id) { // called when the MIDI device is opened & set up
// engine.softTakeover("[Channel1]","filterHigh",true);
// engine.softTakeover("[Channel1]","filterMed",true);
// engine.softTakeover("[Channel1]","filterLow",true);
// engine.softTakeover("[Master]","crossfader",true);
// engine.softTakeover("[Main]","crossfader",true);
// engine.softTakeover("[Channel2]","rate",true);
// engine.softTakeover("[Channel2]","volume",true);
// engine.softTakeover("[Channel2]","pregain",true);
Expand Down
2 changes: 1 addition & 1 deletion res/controllers/American-Audio-VMS4-scripts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ VMS4.init = function (id) { // called when the MIDI device is opened & set up
// Enable soft-takeover for all direct hardware controls
// (Many of these are mapped in the XML directly so these have no effect.
// Here for completeness in case any eventually move to script.)
engine.softTakeover("[Master]","crossfader",true);
engine.softTakeover("[Main]","crossfader",true);
engine.softTakeover("[Channel1]","rate",true);
engine.softTakeover("[Channel1]","volume",true);
engine.softTakeover("[Channel1]","pregain",true);
Expand Down
6 changes: 3 additions & 3 deletions res/controllers/Behringer BCD2000.midi.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@
<control>
<status>0xb0</status>
<midino>0x1</midino>
<group>[Master]</group>
<group>[Main]</group>
<key>crossfader</key>
<options>
<normal/>
Expand Down Expand Up @@ -429,7 +429,7 @@
<control>
<status>0xb0</status>
<midino>0x10</midino>
<group>[Master]</group>
<group>[Main]</group>
<key>volume</key>
<options>
<normal/>
Expand All @@ -447,7 +447,7 @@
<control>
<status>0xb0</status>
<midino>0x11</midino>
<group>[Master]</group>
<group>[Main]</group>
<key>headMix</key>
<options>
<normal/>
Expand Down
6 changes: 3 additions & 3 deletions res/controllers/Behringer BCD3000 Advanced.midi.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@
<control>
<status>0xb0</status>
<midino>0x1</midino>
<group>[Master]</group>
<group>[Main]</group>
<key>crossfader</key>
<description></description>
<options>
Expand All @@ -414,7 +414,7 @@
<control>
<status>0xb0</status>
<midino>0x10</midino>
<group>[Master]</group>
<group>[Main]</group>
<key>balance</key>
<description></description>
<options>
Expand Down Expand Up @@ -594,7 +594,7 @@
<control>
<status>0x90</status>
<midino>0x1c</midino>
<group>[Master]</group>
<group>[Main]</group>
<key>BehringerBCD3000.keykey</key>
<options>
<script-binding/>
Expand Down
Loading
Loading