diff --git a/res/controllers/Akai MPD24.midi.xml b/res/controllers/Akai MPD24.midi.xml index 167c91964b5..71d4cb2ad26 100644 --- a/res/controllers/Akai MPD24.midi.xml +++ b/res/controllers/Akai MPD24.midi.xml @@ -10,35 +10,35 @@ - [Master] + [Main] crossfader 0xB0 17 - [Master] + [Main] balance 0xB0 32 - [Master] + [Main] volume 0xB0 3 - [Master] + [Main] headVolume 0xB0 26 - [Master] + [Main] headMix 0xB0 4 diff --git a/res/controllers/Akai-LPD8-RK-scripts.js b/res/controllers/Akai-LPD8-RK-scripts.js index efee7ca6d2f..ff404e4ef4e 100644 --- a/res/controllers/Akai-LPD8-RK-scripts.js +++ b/res/controllers/Akai-LPD8-RK-scripts.js @@ -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); diff --git a/res/controllers/Akai-LPD8-RK.midi.xml b/res/controllers/Akai-LPD8-RK.midi.xml index 34811f8babd..6a2fed5255b 100644 --- a/res/controllers/Akai-LPD8-RK.midi.xml +++ b/res/controllers/Akai-LPD8-RK.midi.xml @@ -25,7 +25,7 @@ - [Master] + [Main] LPD8RK.softXfade 0xB0 0x66 @@ -34,7 +34,7 @@ - [Master] + [Main] headVolume 0xB0 0x67 @@ -43,7 +43,7 @@ - [Master] + [Main] headMix 0xB0 0x68 @@ -343,7 +343,7 @@ - [Master] + [Main] LPD8RK.softXfade 0xB1 0x66 @@ -352,7 +352,7 @@ - [Master] + [Main] headVolume 0xB1 0x67 @@ -361,7 +361,7 @@ - [Master] + [Main] headMix 0xB1 0x68 @@ -663,7 +663,7 @@ - [Master] + [Main] LPD8RK.softXfade 0xB2 0x66 @@ -672,7 +672,7 @@ - [Master] + [Main] headVolume 0xB2 0x67 @@ -681,7 +681,7 @@ - [Master] + [Main] headMix 0xB2 0x68 @@ -983,7 +983,7 @@ - [Master] + [Main] LPD8RK.softXfade 0xb3 0x66 @@ -992,7 +992,7 @@ - [Master] + [Main] headVolume 0xb3 0x67 @@ -1001,7 +1001,7 @@ - [Master] + [Main] headMix 0xb3 0x68 diff --git a/res/controllers/Allen-and-Heath-Xone-K2-scripts.js b/res/controllers/Allen-and-Heath-Xone-K2-scripts.js index 10fe639107b..8368a1c0a5d 100644 --- a/res/controllers/Allen-and-Heath-Xone-K2-scripts.js +++ b/res/controllers/Allen-and-Heath-Xone-K2-scripts.js @@ -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) { @@ -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); } }; @@ -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); } }; @@ -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(); @@ -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; diff --git a/res/controllers/American Audio VMS2.midi.xml b/res/controllers/American Audio VMS2.midi.xml index 58d22a26cef..263cec23eba 100644 --- a/res/controllers/American Audio VMS2.midi.xml +++ b/res/controllers/American Audio VMS2.midi.xml @@ -1268,7 +1268,7 @@ - [Master] + [Main] headMix 0xB0 0x22 @@ -1277,7 +1277,7 @@ - [Master] + [Main] headVolume 0xB0 0x23 @@ -1286,7 +1286,7 @@ - [Master] + [Main] volume 0xB0 0x1C @@ -1295,7 +1295,7 @@ - [Master] + [Main] balance 0xB0 0x1D diff --git a/res/controllers/American Audio VMS4.midi.xml b/res/controllers/American Audio VMS4.midi.xml index 750b47533a9..a254da88610 100644 --- a/res/controllers/American Audio VMS4.midi.xml +++ b/res/controllers/American Audio VMS4.midi.xml @@ -1468,7 +1468,7 @@ Assumes "Post EQ" mode. (See Wiki for full setup instructions.) - [Master] + [Main] headMix 0xB0 0x22 @@ -1477,7 +1477,7 @@ Assumes "Post EQ" mode. (See Wiki for full setup instructions.) - [Master] + [Main] headVolume 0xB0 0x23 @@ -1486,7 +1486,7 @@ Assumes "Post EQ" mode. (See Wiki for full setup instructions.) - [Master] + [Main] volume 0xB0 0x1C @@ -1495,7 +1495,7 @@ Assumes "Post EQ" mode. (See Wiki for full setup instructions.) - [Master] + [Main] balance 0xB0 0x1D diff --git a/res/controllers/American-Audio-VMS2-scripts.js b/res/controllers/American-Audio-VMS2-scripts.js index cbed294a067..2d5cbe1bd80 100644 --- a/res/controllers/American-Audio-VMS2-scripts.js +++ b/res/controllers/American-Audio-VMS2-scripts.js @@ -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); diff --git a/res/controllers/American-Audio-VMS4-scripts.js b/res/controllers/American-Audio-VMS4-scripts.js index 07dbdb209d3..e9a275eceaa 100644 --- a/res/controllers/American-Audio-VMS4-scripts.js +++ b/res/controllers/American-Audio-VMS4-scripts.js @@ -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); diff --git a/res/controllers/Behringer BCD2000.midi.xml b/res/controllers/Behringer BCD2000.midi.xml index 7e06ce0171b..1117d4e4c4b 100644 --- a/res/controllers/Behringer BCD2000.midi.xml +++ b/res/controllers/Behringer BCD2000.midi.xml @@ -194,7 +194,7 @@ 0xb0 0x1 - [Master] + [Main] crossfader @@ -429,7 +429,7 @@ 0xb0 0x10 - [Master] + [Main] volume @@ -447,7 +447,7 @@ 0xb0 0x11 - [Master] + [Main] headMix diff --git a/res/controllers/Behringer BCD3000 Advanced.midi.xml b/res/controllers/Behringer BCD3000 Advanced.midi.xml index 32a22419346..ef69806ebb5 100644 --- a/res/controllers/Behringer BCD3000 Advanced.midi.xml +++ b/res/controllers/Behringer BCD3000 Advanced.midi.xml @@ -404,7 +404,7 @@ 0xb0 0x1 - [Master] + [Main] crossfader @@ -414,7 +414,7 @@ 0xb0 0x10 - [Master] + [Main] balance @@ -594,7 +594,7 @@ 0x90 0x1c - [Master] + [Main] BehringerBCD3000.keykey diff --git a/res/controllers/Behringer BCD3000.midi.xml b/res/controllers/Behringer BCD3000.midi.xml index 53b65cf920c..7b4cad8a149 100644 --- a/res/controllers/Behringer BCD3000.midi.xml +++ b/res/controllers/Behringer BCD3000.midi.xml @@ -193,7 +193,7 @@ 0xb0 0x1 - [Master] + [Main] crossfader @@ -427,7 +427,7 @@ 0xb0 0x10 - [Master] + [Main] balance @@ -445,7 +445,7 @@ 0xb0 0x11 - [Master] + [Main] headMix diff --git a/res/controllers/Behringer CMD MM1.midi.xml b/res/controllers/Behringer CMD MM1.midi.xml index 7e35c02e7a5..d9ceca40a67 100644 --- a/res/controllers/Behringer CMD MM1.midi.xml +++ b/res/controllers/Behringer CMD MM1.midi.xml @@ -81,7 +81,7 @@ - [Master] + [Main] CMDMM.shiftButton.input shiftOff ¬eOff; @@ -102,7 +102,7 @@ - [Master] + [Main] CMDMM.ctrlButton.input ctrlOn ¬eOn; @@ -132,7 +132,7 @@ - [Master] + [Main] CMDMM.crossfader.input crossfader &CC; @@ -182,7 +182,7 @@ - [Master] + [Main] CMDMM.shiftButton.input shiftOn ¬eOn; @@ -252,7 +252,7 @@ - [Master] + [Main] CMDMM.out1.input Master balance &CC; @@ -372,7 +372,7 @@ - [Master] + [Main] CMDMM.cueMix.input script pfl mix &CC; @@ -442,7 +442,7 @@ - [Master] + [Main] CMDMM.ctrlButton.input ctrl ¬eOff; @@ -452,7 +452,7 @@ - [Master] + [Main] CMDMM.cueVol.input inscript pfl volume &CC; @@ -462,7 +462,7 @@ - [Master] + [Main] CMDMM.middleButton.input Button in the Middle (shift on other mappings) ¬eOn; diff --git a/res/controllers/Behringer CMD Micro.midi.xml b/res/controllers/Behringer CMD Micro.midi.xml index d1cc0d23ad0..f332d1efada 100644 --- a/res/controllers/Behringer CMD Micro.midi.xml +++ b/res/controllers/Behringer CMD Micro.midi.xml @@ -29,7 +29,7 @@ - [Master] + [Main] gain 0xB0 0x30 @@ -83,7 +83,7 @@ - [Master] + [Main] crossfader 0xB0 0x40 @@ -416,7 +416,7 @@ - [Master] + [Main] headGain 0xB0 0x31 diff --git a/res/controllers/Behringer CMDStudio4a.midi.xml b/res/controllers/Behringer CMDStudio4a.midi.xml index e24fca97ad7..e734af8c550 100644 --- a/res/controllers/Behringer CMDStudio4a.midi.xml +++ b/res/controllers/Behringer CMDStudio4a.midi.xml @@ -2475,7 +2475,7 @@ - [Master] + [Main] gain Main knob. 0xB0 @@ -2485,7 +2485,7 @@ - [Master] + [Main] crossfader Crossfader. 0xB0 @@ -2495,7 +2495,7 @@ - [Master] + [Main] headMix PHONES MIX knob. 0xB0 @@ -2505,7 +2505,7 @@ - [Master] + [Main] headGain PHONES VOLUME knob. 0xB0 diff --git a/res/controllers/Behringer-CMD-MM1-scripts.js b/res/controllers/Behringer-CMD-MM1-scripts.js index 2d0cad4f0d6..23f67d83fa6 100644 --- a/res/controllers/Behringer-CMD-MM1-scripts.js +++ b/res/controllers/Behringer-CMD-MM1-scripts.js @@ -464,12 +464,12 @@ CMDMM.init = function () { CMDMM.crossfader = new components.Pot({ midi: [MIDI.CC,0x40], inKey: "crossfader", - group: "[Master]", + group: "[Main]", }); CMDMM.middleButton = new components.Button({ midi:[MIDI.noteOn,0x12], key: "crossfader", - group: "[Master]", + group: "[Main]", layer1: function () { this.input = function () {this.inSetParameter(0.5);}; this.output = function () {this.send(this.inGetParameter()===0.5);}; @@ -491,22 +491,22 @@ CMDMM.init = function () { }); CMDMM.out1 = new components.Pot({ midi: [MIDI.CC,0x01], - group: "[Master]", + group: "[Main]", inKey: "balance", }); CMDMM.out2 = new components.Pot({ midi: [MIDI.CC,0x02], - group: "[Master]", + group: "[Main]", inKey: "gain", }); CMDMM.cueVol = new components.Pot({ midi: [MIDI.CC,0x04], - group: "[Master]", + group: "[Main]", inKey: "headGain", }); CMDMM.cueMix = new components.Pot({ midi: [MIDI.CC,0x05], - group: "[Master]", + group: "[Main]", inKey: "headMix", }); CMDMM.libraryButton = new components.Button({ @@ -536,10 +536,10 @@ CMDMM.init = function () { this.speed=navEncoderScale; }, }); - CMDMM.VuMeterL = engine.makeUnbufferedConnection("[Master]","VuMeterL",function (value) { + CMDMM.VuMeterL = engine.makeUnbufferedConnection("[Main]","VuMeterL",function (value) { midi.sendShortMsg(MIDI.CC, 0x50, (value * 15) + 48); }); - CMDMM.VuMeterR = engine.makeUnbufferedConnection("[Master]","VuMeterR",function (value) { + CMDMM.VuMeterR = engine.makeUnbufferedConnection("[Main]","VuMeterR",function (value) { midi.sendShortMsg(MIDI.CC, 0x51, (value * 15) + 48); }); CMDMM.layer(1); @@ -549,8 +549,8 @@ CMDMM.init = function () { }; CMDMM.shutdown = function () { - engine.setParameter("[Master]","VuMeterL",0); - engine.setParameter("[Master]","VuMeterR",0); + engine.setParameter("[Main]","VuMeterL",0); + engine.setParameter("[Main]","VuMeterR",0); for (var i = 0; i<127; i++) { midi.sendShortMsg(MIDI.noteOn, i, 0); // sets the controller to orange (to match the left/right buttons which only light up in orange); diff --git a/res/controllers/Behringer-CMDStudio4a-scripts.js b/res/controllers/Behringer-CMDStudio4a-scripts.js index ab4c726e100..725e154ff43 100644 --- a/res/controllers/Behringer-CMDStudio4a-scripts.js +++ b/res/controllers/Behringer-CMDStudio4a-scripts.js @@ -65,8 +65,8 @@ BehringerCMDStudio4a.init = function () { // Initialise anything that might not be in the correct state. BehringerCMDStudio4a.initLEDs(); // Connect the VUMeters - engine.connectControl("[Master]","VuMeterL","BehringerCMDStudio4a.vuMeterUpdate"); - engine.connectControl("[Master]","VuMeterR","BehringerCMDStudio4a.vuMeterUpdate"); + engine.connectControl("[Main]","VuMeterL","BehringerCMDStudio4a.vuMeterUpdate"); + engine.connectControl("[Main]","VuMeterR","BehringerCMDStudio4a.vuMeterUpdate"); } BehringerCMDStudio4a.shutdown = function() { @@ -76,8 +76,8 @@ BehringerCMDStudio4a.shutdown = function() { // Disconnect the VUMeters. // Maybe not! It seems you don't have to do this even though the connection // in done in init(), in fact if you try it throws an error. -// engine.connectControl("[Master]","VuMeterL","BehringerCMDStudio4a.vuMeterUpdate",true); -// engine.connectControl("[Master]","VuMeterR","BehringerCMDStudio4a.vuMeterUpdate",true); +// engine.connectControl("[Main]","VuMeterL","BehringerCMDStudio4a.vuMeterUpdate",true); +// engine.connectControl("[Main]","VuMeterR","BehringerCMDStudio4a.vuMeterUpdate",true); } diff --git a/res/controllers/Behringer-DDM4000-scripts.js b/res/controllers/Behringer-DDM4000-scripts.js index bf98175b9f2..8ac7509ec90 100644 --- a/res/controllers/Behringer-DDM4000-scripts.js +++ b/res/controllers/Behringer-DDM4000-scripts.js @@ -37,7 +37,7 @@ var DDM4000 = new behringer.extension.GenericMidiController({ var CrossfaderUnit = function(options) { var unitOptions = options || {}; - unitOptions.group = unitOptions.group || "[Master]"; + unitOptions.group = unitOptions.group || "[Main]"; c.ComponentContainer.call(this, unitOptions); var Crossfader = function(options) { @@ -53,7 +53,7 @@ var DDM4000 = new behringer.extension.GenericMidiController({ }, disable: function() { this.input = this.ignoreInput; - engine.setValue("[Master]", "crossfader_set_default", 1); + engine.setValue("[Main]", "crossfader_set_default", 1); }, }); var crossfader = new Crossfader(options.crossfader); @@ -382,7 +382,7 @@ var DDM4000 = new behringer.extension.GenericMidiController({ ] }, { // Crossfader - defaultDefinition: {type: c.Button, options: {group: "[Master]"}}, + defaultDefinition: {type: c.Button, options: {group: "[Main]"}}, components: [ { // Crossfader: On type: CrossfaderUnit, options: { diff --git a/res/controllers/DJ TechTools MIDI Fighter Twister.midi.xml b/res/controllers/DJ TechTools MIDI Fighter Twister.midi.xml index 273de7096ea..b7b03923636 100644 --- a/res/controllers/DJ TechTools MIDI Fighter Twister.midi.xml +++ b/res/controllers/DJ TechTools MIDI Fighter Twister.midi.xml @@ -250,7 +250,7 @@ - [Master] + [Main] crossfader MIDI Learned from 252 messages. 0xB0 @@ -260,7 +260,7 @@ - [Master] + [Main] crossfader_set_default MIDI Learned from 2 messages. 0xB1 diff --git a/res/controllers/DJ TechTools-MIDI Fighter Twister-scripts.js b/res/controllers/DJ TechTools-MIDI Fighter Twister-scripts.js index 5b76f142409..c0ec976b6e9 100644 --- a/res/controllers/DJ TechTools-MIDI Fighter Twister-scripts.js +++ b/res/controllers/DJ TechTools-MIDI Fighter Twister-scripts.js @@ -13,7 +13,7 @@ var MidiFighterTwister = { engine.makeConnection("[Channel2]", "rate", function(value) { midi.sendShortMsg(cc, 0x07, (value + 1) / 2 * 127); }), - engine.makeConnection("[Master]", "crossfader", function(value) { + engine.makeConnection("[Main]", "crossfader", function(value) { var scaled = (value + 1) / 2 * 127; midi.sendShortMsg(cc, 0x0C, scaled); }), diff --git a/res/controllers/DJ-Tech DJM-101.midi.xml b/res/controllers/DJ-Tech DJM-101.midi.xml index c1b09a43ee6..363749eaaf2 100644 --- a/res/controllers/DJ-Tech DJM-101.midi.xml +++ b/res/controllers/DJ-Tech DJM-101.midi.xml @@ -16,7 +16,7 @@ - [Master] + [Main] headVolume 0xB0 0x45 @@ -25,7 +25,7 @@ - [Master] + [Main] headMix 0xB0 0x44 @@ -37,7 +37,7 @@ - [Master] + [Main] 0x90 0x24 DJTechDJM101.vumeter_select_master @@ -47,7 +47,7 @@ - [Master] + [Main] 0x90 0x23 DJTechDJM101.vumeter_select_pfl @@ -57,7 +57,7 @@ - [Master] + [Main] volume 0xB0 0x43 @@ -67,7 +67,7 @@ - [Master] + [Main] crossfader 0xB0 0x40 diff --git a/res/controllers/DJ-Tech Mix-101.midi.xml b/res/controllers/DJ-Tech Mix-101.midi.xml index 25d27b78227..33a0fcdbffa 100644 --- a/res/controllers/DJ-Tech Mix-101.midi.xml +++ b/res/controllers/DJ-Tech Mix-101.midi.xml @@ -12,7 +12,7 @@ 0xb0 0x10 - [Master] + [Main] headVolume @@ -32,7 +32,7 @@ 0xb0 0x12 - [Master] + [Main] volume @@ -182,7 +182,7 @@ 0xb0 0x23 - [Master] + [Main] crossfader diff --git a/res/controllers/DJ-Tech Mixer One.midi.xml b/res/controllers/DJ-Tech Mixer One.midi.xml index 8e09da443cf..91decf3b2fb 100644 --- a/res/controllers/DJ-Tech Mixer One.midi.xml +++ b/res/controllers/DJ-Tech Mixer One.midi.xml @@ -14,7 +14,7 @@ - [Master] + [Main] volume 0xB5 0x0B @@ -23,7 +23,7 @@ - [Master] + [Main] volume 0xB7 0x0B @@ -32,7 +32,7 @@ - [Master] + [Main] headVolume 0xB5 0x0C @@ -41,7 +41,7 @@ - [Master] + [Main] headVolume 0xB7 0x0C @@ -50,7 +50,7 @@ - [Master] + [Main] headMix 0xB5 0x0D @@ -59,7 +59,7 @@ - [Master] + [Main] headMix 0xB7 0x0D @@ -68,7 +68,7 @@ - [Master] + [Main] crossfader 0xB5 0x0F @@ -77,7 +77,7 @@ - [Master] + [Main] crossfader 0xB7 0x0F @@ -86,7 +86,7 @@ - [Master] + [Main] MIXER1.clearVolumeLEDs 0x97 0x0A @@ -95,7 +95,7 @@ - [Master] + [Main] MIXER1.clearVolumeLEDs 0x95 0x0A @@ -104,7 +104,7 @@ - [Master] + [Main] MIXER1.xfaderCurve 0xB5 0x0E @@ -113,7 +113,7 @@ - [Master] + [Main] MIXER1.xfaderCurve 0xB7 0x0E @@ -122,7 +122,7 @@ - [Master] + [Main] MIXER1.mute 0x97 0x05 @@ -131,7 +131,7 @@ - [Master] + [Main] MIXER1.mute 0x95 0x05 diff --git a/res/controllers/DJ-Tech i-Mix Reload.midi.xml b/res/controllers/DJ-Tech i-Mix Reload.midi.xml index 9096d9f3cc3..52d0dd24715 100644 --- a/res/controllers/DJ-Tech i-Mix Reload.midi.xml +++ b/res/controllers/DJ-Tech i-Mix Reload.midi.xml @@ -104,7 +104,7 @@ 0xb0 0x41 - [Master] + [Main] crossfader @@ -194,7 +194,7 @@ 0xb0 0x49 - [Master] + [Main] headVolume @@ -203,7 +203,7 @@ 0xb0 0x4a - [Master] + [Main] headMix diff --git a/res/controllers/DJ-Tech-DJM-101-scripts.js b/res/controllers/DJ-Tech-DJM-101-scripts.js index ddf366f06c5..6a78f62625e 100644 --- a/res/controllers/DJ-Tech-DJM-101-scripts.js +++ b/res/controllers/DJ-Tech-DJM-101-scripts.js @@ -11,8 +11,8 @@ DJTechDJM101.vumeter[2] = 0; DJTechDJM101.init = function(id) { DJTechDJM101.vumeter_select(true); - engine.connectControl("[Master]", "VuMeterL", "DJTechDJM101.VuMeterMasterL"); - engine.connectControl("[Master]", "VuMeterR", "DJTechDJM101.VuMeterMasterR"); + engine.connectControl("[Main]", "VuMeterL", "DJTechDJM101.VuMeterMasterL"); + engine.connectControl("[Main]", "VuMeterR", "DJTechDJM101.VuMeterMasterR"); engine.connectControl("[Channel1]", "VuMeter", "DJTechDJM101.VuMeterDeck1"); engine.connectControl("[Channel2]", "VuMeter", "DJTechDJM101.VuMeterDeck2"); engine.connectControl("[Channel1]", "pfl", "DJTechDJM101.pfl"); diff --git a/res/controllers/DJ-Tech-Mixer-One-scripts.js b/res/controllers/DJ-Tech-Mixer-One-scripts.js index 87f7e456cc2..80b1b61b8b9 100644 --- a/res/controllers/DJ-Tech-Mixer-One-scripts.js +++ b/res/controllers/DJ-Tech-Mixer-One-scripts.js @@ -2,8 +2,8 @@ function MIXER1() {} MIXER1.init = function init(id, debug) { // called when the device is opened & set up //connect VUmeters - engine.connectControl("[Master]", "VuMeterL", "MIXER1.volumeLEDs"); - engine.connectControl("[Master]", "VuMeterR", "MIXER1.volumeLEDs"); + engine.connectControl("[Main]", "VuMeterL", "MIXER1.volumeLEDs"); + engine.connectControl("[Main]", "VuMeterR", "MIXER1.volumeLEDs"); engine.connectControl("[Channel1]", "VuMeter", "MIXER1.volumeLEDs"); engine.connectControl("[Channel2]", "VuMeter", "MIXER1.volumeLEDs"); engine.connectControl("[Channel3]", "VuMeter", "MIXER1.volumeLEDs"); @@ -12,8 +12,8 @@ MIXER1.init = function init(id, debug) { // called when the device is opened & s MIXER1.shutdown = function shutdown() { //disconnect VUmeters - engine.connectControl("[Master]", "VuMeterL", "MIXER1.volumeLEDs", true); - engine.connectControl("[Master]", "VuMeterR", "MIXER1.volumeLEDs", true); + engine.connectControl("[Main]", "VuMeterL", "MIXER1.volumeLEDs", true); + engine.connectControl("[Main]", "VuMeterR", "MIXER1.volumeLEDs", true); engine.connectControl("[Channel1]", "VuMeter", "MIXER1.volumeLEDs", true); engine.connectControl("[Channel2]", "VuMeter", "MIXER1.volumeLEDs", true); engine.connectControl("[Channel3]", "VuMeter", "MIXER1.volumeLEDs", true); @@ -23,8 +23,8 @@ MIXER1.shutdown = function shutdown() { MIXER1.volumeLEDs = function volumeLEDs(value, group, control){ value=(value*127); - if (group=="[Master]" && control=="VuMeterL"){ch=0xB5;midino=0x1f;midi.sendShortMsg(ch, midino, value);ch=0xB7;midino=0x1f;midi.sendShortMsg(ch, midino, value);} - if (group=="[Master]" && control=="VuMeterR"){ch=0xB5;midino=0x20;midi.sendShortMsg(ch, midino, value);ch=0xB7;midino=0x20;midi.sendShortMsg(ch, midino, value);} + if (group=="[Main]" && control=="VuMeterL"){ch=0xB5;midino=0x1f;midi.sendShortMsg(ch, midino, value);ch=0xB7;midino=0x1f;midi.sendShortMsg(ch, midino, value);} + if (group=="[Main]" && control=="VuMeterR"){ch=0xB5;midino=0x20;midi.sendShortMsg(ch, midino, value);ch=0xB7;midino=0x20;midi.sendShortMsg(ch, midino, value);} if (group=="[Channel1]" && control=="VuMeter"){ch=0xB5;midino=0x22;midi.sendShortMsg(ch, midino, value);} if (group=="[Channel2]" && control=="VuMeter"){ch=0xB6;midino=0x23;midi.sendShortMsg(ch, midino, value);} if (group=="[Channel3]" && control=="VuMeter"){ch=0xB7;midino=0x22;midi.sendShortMsg(ch, midino, value);} @@ -49,13 +49,13 @@ MIXER1.mute = function mute(channel, control, value){ //mute master if (value==127){ //button was pressed - if (engine.getValue("[Master]", "volume")>0){MIXER1.mutestoredvol=engine.getValue("[Master]", "volume");} - engine.setValue("[Master]", "volume", 0); + if (engine.getValue("[Main]", "volume")>0){MIXER1.mutestoredvol=engine.getValue("[Main]", "volume");} + engine.setValue("[Main]", "volume", 0); midi.sendShortMsg(0x97, 0x05, 127);//light Inverse LED midi.sendShortMsg(0x95, 0x05, 127);//light Inverse LED }else{ //button was released - engine.setValue("[Master]", "volume", MIXER1.mutestoredvol); + engine.setValue("[Main]", "volume", MIXER1.mutestoredvol); midi.sendShortMsg(0x97, 0x05, 0);//turn off Inverse LED midi.sendShortMsg(0x95, 0x05, 0);//turn off Inverse LED } diff --git a/res/controllers/DJTechTools MIDI Fighter.midi.xml b/res/controllers/DJTechTools MIDI Fighter.midi.xml index e65e0000642..0a54b1b2d54 100644 --- a/res/controllers/DJTechTools MIDI Fighter.midi.xml +++ b/res/controllers/DJTechTools MIDI Fighter.midi.xml @@ -35,7 +35,7 @@ - [Master] + [Main] MIDIFighter.button_down 0x92 0x24 @@ -44,7 +44,7 @@ - [Master] + [Main] MIDIFighter.button_down 0x92 0x25 @@ -53,7 +53,7 @@ - [Master] + [Main] MIDIFighter.button_down 0x92 0x26 @@ -62,7 +62,7 @@ - [Master] + [Main] MIDIFighter.button_down 0x92 0x27 @@ -71,7 +71,7 @@ - [Master] + [Main] MIDIFighter.button_down 0x92 0x28 @@ -80,7 +80,7 @@ - [Master] + [Main] MIDIFighter.button_down 0x92 0x29 @@ -89,7 +89,7 @@ - [Master] + [Main] MIDIFighter.button_down 0x92 0x2A @@ -98,7 +98,7 @@ - [Master] + [Main] MIDIFighter.button_down 0x92 0x2B @@ -107,7 +107,7 @@ - [Master] + [Main] MIDIFighter.button_down 0x92 0x2C @@ -116,7 +116,7 @@ - [Master] + [Main] MIDIFighter.button_down 0x92 0x2D @@ -125,7 +125,7 @@ - [Master] + [Main] MIDIFighter.button_down 0x92 0x2E @@ -134,7 +134,7 @@ - [Master] + [Main] MIDIFighter.button_down 0x92 0x2F @@ -143,7 +143,7 @@ - [Master] + [Main] MIDIFighter.button_down 0x92 0x30 @@ -152,7 +152,7 @@ - [Master] + [Main] MIDIFighter.button_down 0x92 0x31 @@ -161,7 +161,7 @@ - [Master] + [Main] MIDIFighter.button_down 0x92 0x32 @@ -170,7 +170,7 @@ - [Master] + [Main] MIDIFighter.button_down 0x92 0x33 @@ -180,7 +180,7 @@ - [Master] + [Main] MIDIFighter.button_up 0x82 0x24 @@ -189,7 +189,7 @@ - [Master] + [Main] MIDIFighter.button_up 0x82 0x25 @@ -198,7 +198,7 @@ - [Master] + [Main] MIDIFighter.button_up 0x82 0x26 @@ -207,7 +207,7 @@ - [Master] + [Main] MIDIFighter.button_up 0x82 0x27 @@ -216,7 +216,7 @@ - [Master] + [Main] MIDIFighter.button_up 0x82 0x28 @@ -225,7 +225,7 @@ - [Master] + [Main] MIDIFighter.button_up 0x82 0x29 @@ -234,7 +234,7 @@ - [Master] + [Main] MIDIFighter.button_up 0x82 0x2A @@ -243,7 +243,7 @@ - [Master] + [Main] MIDIFighter.button_up 0x82 0x2B @@ -252,7 +252,7 @@ - [Master] + [Main] MIDIFighter.button_up 0x82 0x2C @@ -261,7 +261,7 @@ - [Master] + [Main] MIDIFighter.button_up 0x82 0x2D @@ -270,7 +270,7 @@ - [Master] + [Main] MIDIFighter.button_up 0x82 0x2E @@ -279,7 +279,7 @@ - [Master] + [Main] MIDIFighter.button_up 0x82 0x2F @@ -288,7 +288,7 @@ - [Master] + [Main] MIDIFighter.button_up 0x82 0x30 @@ -297,7 +297,7 @@ - [Master] + [Main] MIDIFighter.button_up 0x82 0x31 @@ -306,7 +306,7 @@ - [Master] + [Main] MIDIFighter.button_up 0x82 0x32 @@ -315,7 +315,7 @@ - [Master] + [Main] MIDIFighter.button_up 0x82 0x33 diff --git a/res/controllers/Denon MC3000.midi.xml b/res/controllers/Denon MC3000.midi.xml index 0276a225f3b..25c727eb268 100644 --- a/res/controllers/Denon MC3000.midi.xml +++ b/res/controllers/Denon MC3000.midi.xml @@ -16,7 +16,7 @@ 0xb0 0x16 - [Master] + [Main] crossfader @@ -753,7 +753,7 @@ 0xb2 89 - [Master] + [Main] mc3000.headMix @@ -762,7 +762,7 @@ 0xb2 90 - [Master] + [Main] mc3000.headVolume @@ -771,7 +771,7 @@ 0xb2 91 - [Master] + [Main] mc3000.masterBalance @@ -780,7 +780,7 @@ 0xb2 92 - [Master] + [Main] mc3000.masterVolume diff --git a/res/controllers/Denon MC4000.midi.xml b/res/controllers/Denon MC4000.midi.xml index 3ddd8b174a7..78079008dd0 100644 --- a/res/controllers/Denon MC4000.midi.xml +++ b/res/controllers/Denon MC4000.midi.xml @@ -716,7 +716,7 @@ - [Master] + [Main] MC4000.headphoneSplit 0x9F 0x1C @@ -1124,7 +1124,7 @@ - [Master] + [Main] MC4000.samplerLevel 0xBF 0x1A @@ -1134,7 +1134,7 @@ - [Master] + [Main] crossfader 0xBF 0x08 @@ -1144,7 +1144,7 @@ - [Master] + [Main] headGain 0xBF 0x0C @@ -1154,7 +1154,7 @@ - [Master] + [Main] headMix 0xBF 0x0D diff --git a/res/controllers/Denon-DN-SC2000.midi.js b/res/controllers/Denon-DN-SC2000.midi.js index 7114b86e23d..e789f496d0f 100644 --- a/res/controllers/Denon-DN-SC2000.midi.js +++ b/res/controllers/Denon-DN-SC2000.midi.js @@ -8,7 +8,7 @@ DenonDNSC2000.Deck = function (deckNumber, group) { } DenonDNSC2000.init = function (id) { - engine.setValue("[Master]", "num_decks", 4); + engine.setValue("[Main]", "num_decks", 4); var leds = [0x11,0x13,0x15,0x17,0x19,0x1B,0x1D,0x20,/* cues */ 0x24,0x40,0x2B,/* loops */ 0x27,0x26,/* play,cue */ diff --git a/res/controllers/Denon-MC3000-scripts.js b/res/controllers/Denon-MC3000-scripts.js index bf730418370..3e9dbc9dd79 100644 --- a/res/controllers/Denon-MC3000-scripts.js +++ b/res/controllers/Denon-MC3000-scripts.js @@ -166,16 +166,16 @@ mc3000.micVolume = function(channel, control, value, status, group) { engine.setValue("[Microphone]", "volume", value/127); } mc3000.headMix = function(channel, control, value, status, group) { - engine.setValue("[Master]", "headMix", (value-64)/64); + engine.setValue("[Main]", "headMix", (value-64)/64); } mc3000.headVolume = function(channel, control, value, status, group) { - engine.setValue("[Master]", "headVolume", value/127*5); + engine.setValue("[Main]", "headVolume", value/127*5); } mc3000.masterBalance = function(channel, control, value, status, group) { - engine.setValue("[Master]", "balance", (value-64)/64); + engine.setValue("[Main]", "balance", (value-64)/64); } mc3000.masterVolume = function(channel, control, value, status, group) { - engine.setValue("[Master]", "volume", value/127*5); + engine.setValue("[Main]", "volume", value/127*5); } // === PLAYLIST === diff --git a/res/controllers/Denon-MC4000-scripts.js b/res/controllers/Denon-MC4000-scripts.js index a42f5513654..d0b76b42b55 100644 --- a/res/controllers/Denon-MC4000-scripts.js +++ b/res/controllers/Denon-MC4000-scripts.js @@ -54,8 +54,8 @@ MC4000.init = function () { MC4000.rightDeck = new MC4000.Deck(1); // VU meters // TODO: implement VU meters for the PFL when cue button is on - engine.connectControl("[Master]", "VuMeterL", "MC4000.OnVuMeterChangeL"); - engine.connectControl("[Master]", "VuMeterR", "MC4000.OnVuMeterChangeR"); + engine.connectControl("[Main]", "VuMeterL", "MC4000.OnVuMeterChangeL"); + engine.connectControl("[Main]", "VuMeterR", "MC4000.OnVuMeterChangeR"); // Control all sampler levels simultaneously with the single knob on the mixer MC4000.samplerLevel = function (channel, control, value, status, group) { engine.setValue("[Sampler1]", "pregain", script.absoluteNonLin(value, 0, 1.0, 4.0)); diff --git a/res/controllers/Denon-MC6000MK2-scripts.js b/res/controllers/Denon-MC6000MK2-scripts.js index b98db276722..dac60244ed5 100644 --- a/res/controllers/Denon-MC6000MK2-scripts.js +++ b/res/controllers/Denon-MC6000MK2-scripts.js @@ -1291,7 +1291,7 @@ DenonMC6000MK2.OldSide.prototype.onFilterMidiValue = function(value) { DenonMC6000MK2.id = undefined; DenonMC6000MK2.debug = undefined; -DenonMC6000MK2.group = "[Master]"; +DenonMC6000MK2.group = "[Main]"; // left side DenonMC6000MK2.oldDeck1 = new DenonMC6000MK2.OldDeck(1, DenonMC6000MK2.MIDI_CH0); @@ -1533,7 +1533,7 @@ DenonMC6000MK2.recvAreaButton = function(_channel, _control, value, _status, _gr DenonMC6000MK2.recvListButton = function(_channel, _control, value, _status, _group) { if (DenonMC6000MK2.isButtonPressed(value)) { - script.toggleControl("[Master]", "maximize_library"); + script.toggleControl("[Main]", "maximize_library"); } }; diff --git a/res/controllers/Denon-MC6000MK2.midi.xml b/res/controllers/Denon-MC6000MK2.midi.xml index d7d3d6e5d99..ebad6e6586a 100644 --- a/res/controllers/Denon-MC6000MK2.midi.xml +++ b/res/controllers/Denon-MC6000MK2.midi.xml @@ -419,7 +419,7 @@ - [Master] + [Main] crossfader 0xB0 0x16 @@ -734,7 +734,7 @@ - [Master] + [Main] headMix 0xB0 0x43 @@ -1760,7 +1760,7 @@ - [Master] + [Main] crossfader 0xB0 0x17 @@ -2035,7 +2035,7 @@ - [Master] + [Main] headGain 0xB0 0x44 diff --git a/res/controllers/Denon-MC7000-scripts.js b/res/controllers/Denon-MC7000-scripts.js index 080e3cab925..24208f91a87 100644 --- a/res/controllers/Denon-MC7000-scripts.js +++ b/res/controllers/Denon-MC7000-scripts.js @@ -680,7 +680,7 @@ MC7000.loadButton = function(channel, control, value, status, group) { MC7000.wheelTouch = function(channel, control, value, status, group) { const deckNumber = script.deckFromGroup(group); const deckIndex = deckNumber - 1; - const libraryMaximized = engine.getValue("[Master]", "maximize_library") > 0; + const libraryMaximized = engine.getValue("[Main]", "maximize_library") > 0; if (MC7000.isVinylMode[deckIndex] && !libraryMaximized) { if (value === 0x7F) { engine.scratchEnable(deckNumber, MC7000.jogWheelTicksPerRevolution, @@ -711,7 +711,7 @@ MC7000.wheelTurn = function(channel, control, value, status, group) { const adjustedSpeed = numTicks * MC7000.jogSensitivity / 10; const deckNumber = script.deckFromGroup(group); const deckIndex = deckNumber - 1; - const libraryMaximized = engine.getValue("[Master]", "maximize_library"); + const libraryMaximized = engine.getValue("[Main]", "maximize_library"); if (libraryMaximized === 1 && numTicks > 0) { engine.setValue("[Library]", "MoveDown", 1); } else if (libraryMaximized === 1 && numTicks < 0) { diff --git a/res/controllers/Denon-MC7000.midi.xml b/res/controllers/Denon-MC7000.midi.xml index 35d90d09baa..2748bfb83b2 100644 --- a/res/controllers/Denon-MC7000.midi.xml +++ b/res/controllers/Denon-MC7000.midi.xml @@ -921,7 +921,7 @@ - [Master] + [Main] MC7000.samplerLevel 0xBF 0x1A @@ -1303,7 +1303,7 @@ - [Master] + [Main] crossfader Crossfader 0xBF @@ -2197,7 +2197,7 @@ - [Master] + [Main] maximize_library Full screen Library 0x9F @@ -2514,7 +2514,7 @@ [EffectRack1_EffectUnit1] - group_[Master]_enable + group_[Main]_enable FX1 on master 0x98 0x04 @@ -2524,7 +2524,7 @@ [EffectRack1_EffectUnit2] - group_[Master]_enable + group_[Main]_enable FX2 on master 0x99 0x04 @@ -4021,7 +4021,7 @@ [EffectRack1_EffectUnit1] - group_[Master]_enable + group_[Main]_enable FX1 on master 0x98 0x04 @@ -4030,7 +4030,7 @@ [EffectRack1_EffectUnit2] - group_[Master]_enable + group_[Main]_enable FX2 on master 0x99 0x04 diff --git a/res/controllers/EKS-Otus.js b/res/controllers/EKS-Otus.js index 079111e24ca..89d2f6b227d 100644 --- a/res/controllers/EKS-Otus.js +++ b/res/controllers/EKS-Otus.js @@ -355,8 +355,8 @@ EksOtus.init = function (id) { // Link controls and register callbacks EksOtus.registerCallbacks(); - engine.softTakeover("[Master]","headVolume",true); - engine.softTakeover("[Master]","headMix",true); + engine.softTakeover("[Main]","headVolume",true); + engine.softTakeover("[Main]","headMix",true); for (var deck in controller.deckOutputColors) { engine.softTakeover("[Channel"+deck+"]","pregain",true); engine.softTakeover("[Channel"+deck+"]","volume",true); @@ -397,8 +397,8 @@ EksOtus.updateLEDs = function(from_timer) { // Device cleanup function EksOtus.shutdown = function() { - engine.softTakeover("[Master]","headVolume",false); - engine.softTakeover("[Master]","headMix",false); + engine.softTakeover("[Main]","headVolume",false); + engine.softTakeover("[Main]","headMix",false); for (var deck in controller.deckOutputColors) { engine.softTakeover("[Channel"+deck+"]","pregain",false); engine.softTakeover("[Channel"+deck+"]","volume",false); @@ -443,7 +443,7 @@ EksOtus.registerCallbacks = function() { controller.linkControl("hid","jog_se_button","deck","LoadSelectedTrack"); controller.linkControl("hid","jog_se","[Playlist]","SelectTrackKnob"); - controller.linkControl("hid","crossfader","[Master]","crossfader"); + controller.linkControl("hid","crossfader","[Main]","crossfader"); controller.linkControl("hid","gain_1","deck1","pregain"); controller.linkControl("hid","gain_2","deck2","pregain"); controller.linkControl("hid","eq_high_1","deck1","filterHigh"); @@ -478,7 +478,7 @@ EksOtus.registerCallbacks = function() { controller.setCallback("control","hid","deck_switch",EksOtus.deckSwitch); - //controller.linkControl("hid","headphones","[Master]","headphones"); + //controller.linkControl("hid","headphones","[Main]","headphones"); controller.setCallback("control","hid","headphones",EksOtus.headphones); controller.setCallback("control","hid","slider_scale",EksOtus.pitchSlider); @@ -642,10 +642,10 @@ EksOtus.headphones = function (field) { var controller = EksOtus.controller; if (controller.modifiers.get("shift")) { value = script.absoluteNonLin(field.value, 0, 1, 5, 0, 65536); - engine.setValue("[Master]","headVolume",value); + engine.setValue("[Main]","headVolume",value); } else { value = EksOtus.plusMinus1Scaler(field.group,field.name,field.value); - engine.setValue("[Master]","headMix",value); + engine.setValue("[Main]","headMix",value); } } diff --git a/res/controllers/Electrix Tweaker.midi.xml b/res/controllers/Electrix Tweaker.midi.xml index d631e056555..7333d89f63f 100644 --- a/res/controllers/Electrix Tweaker.midi.xml +++ b/res/controllers/Electrix Tweaker.midi.xml @@ -418,7 +418,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - [Master] + [Main] ElectrixTweaker.bigEncoderButton 0x90 0x2C @@ -517,7 +517,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - [Master] + [Main] crossfader 0xB0 0x37 diff --git a/res/controllers/Electrix-Tweaker-scripts.js b/res/controllers/Electrix-Tweaker-scripts.js index 8f138a26b94..1a9f5f332d7 100644 --- a/res/controllers/Electrix-Tweaker-scripts.js +++ b/res/controllers/Electrix-Tweaker-scripts.js @@ -193,8 +193,8 @@ ElectrixTweaker.channelRegEx = /\[Channel(\d+)\]/; // ================================================= INITIALIZATION & SHUTDOWN ============================================ ElectrixTweaker.init = function() { - if (engine.getValue("[Master]", "num_samplers") < 8) { - engine.setValue("[Master]", "num_samplers", 8); + if (engine.getValue("[Main]", "num_samplers") < 8) { + engine.setValue("[Main]", "num_samplers", 8); } for (const group in ElectrixTweaker.encoders) { // loop over each [Channel] // engine.softTakeover('[QuickEffectRack1_'+group+']', 'super1', true) @@ -438,9 +438,9 @@ ElectrixTweaker.topShiftButton = function(channel, control, value, status, group "headSplit": "ElectrixTweaker.headSplitLED" }; for (const control in controlsToFunctions) { - engine.connectControl("[Master]", control, controlsToFunctions[control], ! value/127); + engine.connectControl("[Main]", control, controlsToFunctions[control], ! value/127); if (value) { - engine.trigger("[Master]", control); + engine.trigger("[Main]", control); } } }; @@ -506,7 +506,7 @@ ElectrixTweaker.bigEncoderButton = function(channel, control, value, _status, _g if (ElectrixTweaker.topShift) { engine.setValue("[Playlist]", "LoadSelectedIntoFirstStopped", 1); } else { - engine.setValue("[Master]", "maximize_library", ! engine.getValue("[Master]", "maximize_library")); + engine.setValue("[Main]", "maximize_library", ! engine.getValue("[Main]", "maximize_library")); } } }; @@ -632,9 +632,9 @@ ElectrixTweaker.highEncoder = function(channel, control, value, status, group) { group = ElectrixTweaker.deck[group]; if (ElectrixTweaker.topShift) { if (control === ElectrixTweaker.encoders["[Channel1]"].High.cc) { - engine.setValue("[Master]", "headVolume", script.absoluteNonLin(value, 0, 1, 5)); + engine.setValue("[Main]", "headVolume", script.absoluteNonLin(value, 0, 1, 5)); } else { - engine.setValue("[Master]", "volume", script.absoluteNonLin(value, 0, 1, 5)); + engine.setValue("[Main]", "volume", script.absoluteNonLin(value, 0, 1, 5)); } } else if (ElectrixTweaker.deckShift[group]) { engine.setValue(group, "rate", script.absoluteLin(value, -1, 1, 0, 126)); @@ -659,9 +659,9 @@ ElectrixTweaker.highEncoderPress = function(channel, control, value, status, gro if (value) { if (ElectrixTweaker.topShift) { if (control === ElectrixTweaker.encoders["[Channel1]"].High.button) { - engine.setValue("[Master]", "headVolume", 1); + engine.setValue("[Main]", "headVolume", 1); } else { - engine.setValue("[Master]", "volume", 1); + engine.setValue("[Main]", "volume", 1); } } else { switch (ElectrixTweaker.mode[group]) { @@ -683,9 +683,9 @@ ElectrixTweaker.midEncoder = function(channel, control, value, status, group) { group = ElectrixTweaker.deck[group]; if (ElectrixTweaker.topShift) { if (control === ElectrixTweaker.encoders["[Channel1]"].Mid.cc) { - engine.setValue("[Master]", "headMix", script.absoluteLin(value, -1, 1)); + engine.setValue("[Main]", "headMix", script.absoluteLin(value, -1, 1)); } else { - engine.setValue("[Master]", "balance", script.absoluteLin(value, -1, 1)); + engine.setValue("[Main]", "balance", script.absoluteLin(value, -1, 1)); } } else if (ElectrixTweaker.deckShift[group]) { engine.stopTimer(ElectrixTweaker.midEncoderLEDTimer[group]); @@ -722,9 +722,9 @@ ElectrixTweaker.midEncoderPress = function(channel, control, value, status, grou if (value) { if (ElectrixTweaker.topShift) { if (control === ElectrixTweaker.encoders["[Channel1]"].Mid.button) { - engine.setValue("[Master]", "headSplit", ! engine.getValue("[Master]", "headSplit")); + engine.setValue("[Main]", "headSplit", ! engine.getValue("[Main]", "headSplit")); } else { - engine.setValue("[Master]", "balance", 0); + engine.setValue("[Main]", "balance", 0); } } else { switch (ElectrixTweaker.mode[group]) { diff --git a/res/controllers/Evolution_Xsession.midi.xml b/res/controllers/Evolution_Xsession.midi.xml index 7a7620fc113..6727f2d710a 100644 --- a/res/controllers/Evolution_Xsession.midi.xml +++ b/res/controllers/Evolution_Xsession.midi.xml @@ -9,31 +9,31 @@ - [Master] + [Main] crossfader 0xB0 0x0a - [Master] + [Main] balance 0xB0 0x1f - [Master] + [Main] volume 0xB0 0x17 - [Master] + [Main] headVolume 0xB0 0x16 - [Master] + [Main] headMix 0xB0 0x17 diff --git a/res/controllers/FaderFoxDJ2.midi.xml b/res/controllers/FaderFoxDJ2.midi.xml index 10e57d1e9ec..273f1f42fe6 100644 --- a/res/controllers/FaderFoxDJ2.midi.xml +++ b/res/controllers/FaderFoxDJ2.midi.xml @@ -12,13 +12,13 @@ - [Master] + [Main] crossfader 0xB0 0x03 - [Master] + [Main] headMix 0xB0 0x0c diff --git a/res/controllers/Gemini FirstMix.midi.xml b/res/controllers/Gemini FirstMix.midi.xml index bafefdb95e1..bb70352b73a 100644 --- a/res/controllers/Gemini FirstMix.midi.xml +++ b/res/controllers/Gemini FirstMix.midi.xml @@ -223,7 +223,7 @@ 0xb0 0xa - [Master] + [Main] crossfader @@ -283,7 +283,7 @@ 0xb0 0x17 - [Master] + [Main] headMix diff --git a/res/controllers/Gemini-FirstMix-scripts.js b/res/controllers/Gemini-FirstMix-scripts.js index a2570cedbb8..49cb12694ad 100644 --- a/res/controllers/Gemini-FirstMix-scripts.js +++ b/res/controllers/Gemini-FirstMix-scripts.js @@ -75,8 +75,8 @@ firstmix.init = function (channel, control, value, status, group) { // midi.sendShortMsg(0xB0,0x7F,0x7F); // Enable soft-takeover for all direct hardware controls - engine.softTakeover("[Master]","crossfader",true); - engine.softTakeover("[Master]","headMix",true); + engine.softTakeover("[Main]","crossfader",true); + engine.softTakeover("[Main]","headMix",true); engine.softTakeover("[Channel1]","pregain",true); engine.softTakeover("[Channel1]","filterHigh",true); engine.softTakeover("[Channel1]","filterMed",true); diff --git a/res/controllers/Hercules DJ Console 4-Mx.midi.xml b/res/controllers/Hercules DJ Console 4-Mx.midi.xml index 683d2626cc2..03a5fafeaee 100644 --- a/res/controllers/Hercules DJ Console 4-Mx.midi.xml +++ b/res/controllers/Hercules DJ Console 4-Mx.midi.xml @@ -63,7 +63,7 @@ - [Master] + [Main] Hercules4Mx.deckDStateChange Button Deck D (State) 0x90 @@ -73,7 +73,7 @@ - [Master] + [Main] Hercules4Mx.deckCStateChange Button Deck C (State) 0x90 @@ -233,7 +233,7 @@ - [Master] + [Main] Hercules4Mx.scratchButton Button Scratch 0x90 @@ -653,7 +653,7 @@ - [Master] + [Main] Hercules4Mx.onSensitivityChange Receives information about the sensitivity setting 0xB0 @@ -1453,7 +1453,7 @@ - [Master] + [Main] headMix Heaphone Cue/Mix 0xB0 @@ -1483,7 +1483,7 @@ - [Master] + [Main] Hercules4Mx.crossfader Crossfader 0xB0 @@ -1513,7 +1513,7 @@ - [Master] + [Main] gain Vol Main 0xB0 diff --git a/res/controllers/Hercules DJ Console Mac Edition.midi.xml b/res/controllers/Hercules DJ Console Mac Edition.midi.xml index d9f3a072026..f4603678597 100644 --- a/res/controllers/Hercules DJ Console Mac Edition.midi.xml +++ b/res/controllers/Hercules DJ Console Mac Edition.midi.xml @@ -9,7 +9,7 @@ - [Master] + [Main] crossfader 0xB1 0x28 diff --git a/res/controllers/Hercules DJ Console Mk2.midi.xml b/res/controllers/Hercules DJ Console Mk2.midi.xml index 6f82444cca5..29b797245aa 100644 --- a/res/controllers/Hercules DJ Console Mk2.midi.xml +++ b/res/controllers/Hercules DJ Console Mk2.midi.xml @@ -12,7 +12,7 @@ - [Master] + [Main] crossfader 0xB0 0x31 @@ -366,7 +366,7 @@ - [Master] + [Main] HerculesMk2.pfl 0xB0 0x24 @@ -375,7 +375,7 @@ - [Master] + [Main] HerculesMk2.pfl 0xB0 0x23 diff --git a/res/controllers/Hercules DJ Console Mk4.midi.xml b/res/controllers/Hercules DJ Console Mk4.midi.xml index ee70dd1e551..864bd8c8d18 100644 --- a/res/controllers/Hercules DJ Console Mk4.midi.xml +++ b/res/controllers/Hercules DJ Console Mk4.midi.xml @@ -15,7 +15,7 @@ 0xb0 0x3D - [Master] + [Main] headMix @@ -321,7 +321,7 @@ 0xb0 0x38 - [Master] + [Main] crossfader diff --git a/res/controllers/Hercules DJ Console RMX 2.midi.xml b/res/controllers/Hercules DJ Console RMX 2.midi.xml index 90c125d55f3..b51e64cc3ad 100644 --- a/res/controllers/Hercules DJ Console RMX 2.midi.xml +++ b/res/controllers/Hercules DJ Console RMX 2.midi.xml @@ -16,7 +16,7 @@ - [Master] + [Main] volume 0xB0 0x44 @@ -26,7 +26,7 @@ - [Master] + [Main] volume 0xB0 0x45 @@ -37,7 +37,7 @@ - [Master] + [Main] headMix MIDI Learned from 462 messages. 0xB0 @@ -48,7 +48,7 @@ - [Master] + [Main] headMix MIDI Learned from 462 messages. 0xB0 @@ -60,7 +60,7 @@ - [Master] + [Main] crossfader 0xB0 0x48 @@ -70,7 +70,7 @@ - [Master] + [Main] crossfader 0xB0 0x49 diff --git a/res/controllers/Hercules DJ Console RMX Advanced.midi.xml b/res/controllers/Hercules DJ Console RMX Advanced.midi.xml index fd93d91817f..87cd42b8a90 100644 --- a/res/controllers/Hercules DJ Console RMX Advanced.midi.xml +++ b/res/controllers/Hercules DJ Console RMX Advanced.midi.xml @@ -16,7 +16,7 @@ 0xB0 0x3A - [Master] + [Main] HerculesRMX.headPhoneMix @@ -126,7 +126,7 @@ - [Master] + [Main] HerculesRMX.crossFader 0xB0 0x39 @@ -135,7 +135,7 @@ - [Master] + [Main] HerculesRMX.balance 0xB0 0x37 @@ -180,7 +180,7 @@ - [Master] + [Main] HerculesRMX.volume 0xB0 0x38 @@ -425,7 +425,7 @@ - [Master] + [Main] HerculesRMX.scratch 0xB0 0x29 diff --git a/res/controllers/Hercules DJ Console RMX.midi.xml b/res/controllers/Hercules DJ Console RMX.midi.xml index 3d34784ec8f..17215ca9d8e 100644 --- a/res/controllers/Hercules DJ Console RMX.midi.xml +++ b/res/controllers/Hercules DJ Console RMX.midi.xml @@ -16,7 +16,7 @@ 0xB0 0x3A - [Master] + [Main] HerculesRMX.headPhoneMix @@ -168,7 +168,7 @@ - [Master] + [Main] HerculesRMX.crossFader 0xB0 0x39 @@ -177,7 +177,7 @@ - [Master] + [Main] HerculesRMX.balance 0xB0 0x37 @@ -222,7 +222,7 @@ - [Master] + [Main] HerculesRMX.volume 0xB0 0x38 @@ -467,7 +467,7 @@ - [Master] + [Main] HerculesRMX.scratch 0xB0 0x29 diff --git a/res/controllers/Hercules DJ Control AIR.midi.xml b/res/controllers/Hercules DJ Control AIR.midi.xml index 01436ebc624..d858ffc308d 100644 --- a/res/controllers/Hercules DJ Control AIR.midi.xml +++ b/res/controllers/Hercules DJ Control AIR.midi.xml @@ -14,7 +14,7 @@ 0x90 0x39 - [Master] + [Main] HerculesAir.headMix Head Mix Button @@ -24,7 +24,7 @@ 0x90 0x3a - [Master] + [Main] HerculesAir.headCue Head Cue Button @@ -214,7 +214,7 @@ 0xb0 0x3a - [Master] + [Main] crossfader Crossfader @@ -634,7 +634,7 @@ 0x90 0x2e - [Master] + [Main] HerculesAir.shift Use Magic Button as Shift Button @@ -644,7 +644,7 @@ 0x90 0x2d - [Master] + [Main] HerculesAir.spinback Use Scratch Button to toggle spinback effect diff --git a/res/controllers/Hercules DJ Control Instinct.midi.xml b/res/controllers/Hercules DJ Control Instinct.midi.xml index 2e007dbf87e..d1bde7bba3d 100644 --- a/res/controllers/Hercules DJ Control Instinct.midi.xml +++ b/res/controllers/Hercules DJ Control Instinct.midi.xml @@ -332,7 +332,7 @@ 0xb0 0x3a - [Master] + [Main] crossfader @@ -982,7 +982,7 @@ 0x90 0x35 - [Master] + [Main] HCInstinct.vinylButtonHandler diff --git a/res/controllers/Hercules DJ Control MP3 e2-scripts.js b/res/controllers/Hercules DJ Control MP3 e2-scripts.js index 40c4052b30d..d1b22e936cc 100644 --- a/res/controllers/Hercules DJ Control MP3 e2-scripts.js +++ b/res/controllers/Hercules DJ Control MP3 e2-scripts.js @@ -486,12 +486,12 @@ HerculesMP3e2.pitch = function(midino, control, value, status, group) { sign = (value == 0x01) ? 1 : -1; if (group == "[Channel1]") { - newValue = HerculesMP3e2.knobIncrement("[Master]", "headVolume", 0, 5, 1, 30, sign); - engine.setValue("[Master]", "headVolume", newValue); + newValue = HerculesMP3e2.knobIncrement("[Main]", "headVolume", 0, 5, 1, 30, sign); + engine.setValue("[Main]", "headVolume", newValue); } if (group == "[Channel2]") { - newValue = HerculesMP3e2.knobIncrement("[Master]", "headMix", -1, 1, 0, 20, sign); - engine.setValue("[Master]", "headMix", newValue); + newValue = HerculesMP3e2.knobIncrement("[Main]", "headMix", -1, 1, 0, 20, sign); + engine.setValue("[Main]", "headMix", newValue); } } else { var deck = HerculesMP3e2.switchDeck(group); diff --git a/res/controllers/Hercules DJ Control MP3 e2.midi.xml b/res/controllers/Hercules DJ Control MP3 e2.midi.xml index 5559cdd43e6..ace64cb5f32 100644 --- a/res/controllers/Hercules DJ Control MP3 e2.midi.xml +++ b/res/controllers/Hercules DJ Control MP3 e2.midi.xml @@ -465,7 +465,7 @@ 0xB0 0x38 - [Master] + [Main] crossfader diff --git a/res/controllers/Hercules DJ Control MP3.midi.xml b/res/controllers/Hercules DJ Control MP3.midi.xml index 0fbdbefe818..94cea076bd5 100644 --- a/res/controllers/Hercules DJ Control MP3.midi.xml +++ b/res/controllers/Hercules DJ Control MP3.midi.xml @@ -14,7 +14,7 @@ - [Master] + [Main] crossfader 0xB0 0x31 @@ -366,7 +366,7 @@ - [Master] + [Main] HerculesMp3.joystick 0xb0 0x39 diff --git a/res/controllers/Hercules DJ Control Steel.midi.xml b/res/controllers/Hercules DJ Control Steel.midi.xml index 25a1fd67df0..efa4c966b0c 100644 --- a/res/controllers/Hercules DJ Control Steel.midi.xml +++ b/res/controllers/Hercules DJ Control Steel.midi.xml @@ -14,7 +14,7 @@ 0xB0 0x3A - [Master] + [Main] HerculesSteel.headPhoneMix @@ -371,7 +371,7 @@ - [Master] + [Main] HerculesSteel.crossFader 0xB0 0x39 @@ -380,7 +380,7 @@ - [Master] + [Main] HerculesSteel.balance 0xB0 0x37 @@ -425,7 +425,7 @@ - [Master] + [Main] HerculesSteel.volume 0xB0 0x38 @@ -652,7 +652,7 @@ - [Master] + [Main] HerculesSteel.scratch 0xB0 0x29 diff --git a/res/controllers/Hercules DJControl Compact.midi.xml b/res/controllers/Hercules DJControl Compact.midi.xml index 75cb4f7b508..018cfa278bb 100644 --- a/res/controllers/Hercules DJControl Compact.midi.xml +++ b/res/controllers/Hercules DJControl Compact.midi.xml @@ -95,7 +95,7 @@ setting. - [Master] + [Main] HercDJCompact.scratch 0x90 0x2D @@ -590,7 +590,7 @@ setting. - [Master] + [Main] crossfader MIDI Learned from 1239 messages. 0xB0 diff --git a/res/controllers/Hercules DJControl Starlight.midi.xml b/res/controllers/Hercules DJControl Starlight.midi.xml index 78b8cd0a5ca..6b85e756464 100644 --- a/res/controllers/Hercules DJControl Starlight.midi.xml +++ b/res/controllers/Hercules DJControl Starlight.midi.xml @@ -21,7 +21,7 @@ // Shift - [Master] + [Main] DJCStarlight.shiftButton Shift button 0x90 @@ -85,7 +85,7 @@ // Vinyl button - [Master] + [Main] DJCStarlight.vinylButton Vinyl 0x91 @@ -213,7 +213,7 @@ // PFL - [Master] + [Main] DJCStarlight.cueMaster CUE Master 0x94 @@ -277,7 +277,7 @@ // PFL - [Master] + [Main] DJCStarlight.cueMix Headphone CUE + MIX 0x95 @@ -830,7 +830,7 @@ // Crossfader - [Master] + [Main] crossfader Crossfader 0xB0 diff --git a/res/controllers/Hercules P32 DJ.midi.xml b/res/controllers/Hercules P32 DJ.midi.xml index 81d4debd550..a1a86725147 100644 --- a/res/controllers/Hercules P32 DJ.midi.xml +++ b/res/controllers/Hercules P32 DJ.midi.xml @@ -15,7 +15,7 @@ - [Master] + [Main] maximize_library 0x90 0x01 @@ -24,7 +24,7 @@ - [Master] + [Main] headSplit 0x93 0x01 @@ -33,7 +33,7 @@ - [Master] + [Main] P32.headMixEncoder 0xB3 0x02 @@ -889,7 +889,7 @@ - [Master] + [Main] crossfader 0xB0 0x01 @@ -1150,7 +1150,7 @@ - [Master] + [Main] crossfader 0xB0 0x01 diff --git a/res/controllers/Hercules-DJ-Console-4-Mx-scripts.js b/res/controllers/Hercules-DJ-Console-4-Mx-scripts.js index d9d540fd1e0..189b43c5db0 100644 --- a/res/controllers/Hercules-DJ-Console-4-Mx-scripts.js +++ b/res/controllers/Hercules-DJ-Console-4-Mx-scripts.js @@ -190,7 +190,7 @@ Hercules4Mx.VuMeterL = { 'vu2': 0x18, 'vu1': 0x19, // Which source to use for this vumeter. [Disabled] for no source - 'source': '[Master]', + 'source': '[Main]', // Midichan of this vumeter. This is needed when switching the Decks (A/C, B/D) 'midichan': 0x90, // Last value evaluated. This allows to quantize the value and reduce the amount of messages sent. @@ -206,7 +206,7 @@ Hercules4Mx.VuMeterR = { 'vu2': 0x38, 'vu1': 0x39, // Which source to use for this vumeter. [Disabled] for no source - 'source': '[Master]', + 'source': '[Main]', // Midichan of this vumeter. This is needed when switching the Decks (A/C, B/D) 'midichan': 0x90, // Last value evaluated. This allows to quantize the value and reduce the amount of messages sent. @@ -325,8 +325,8 @@ Hercules4Mx.init = function(id, debugging) { } } if (Hercules4Mx.userSettings.useVuMeters) { - engine.connectControl("[Master]", "VuMeterL", "Hercules4Mx.onVuMeterMasterL"); - engine.connectControl("[Master]", "VuMeterR", "Hercules4Mx.onVuMeterMasterR"); + engine.connectControl("[Main]", "VuMeterL", "Hercules4Mx.onVuMeterMasterL"); + engine.connectControl("[Main]", "VuMeterR", "Hercules4Mx.onVuMeterMasterR"); for (i = 1; i <= 4; i++) { engine.connectControl("[Channel" + i + "]", "VuMeter", "Hercules4Mx.onVuMeterDeck" + i); engine.connectControl("[Channel" + i + "]", "passthrough", "Hercules4Mx.onKillOrSourceChange" + i); @@ -358,7 +358,7 @@ Hercules4Mx.doDelayedSetup = function() { engine.softTakeover("[EqualizerRack1_[Channel" + i + "]_Effect1]", "parameter2", true); engine.softTakeover("[EqualizerRack1_[Channel" + i + "]_Effect1]", "parameter1", true); } - engine.softTakeover("[Master]", "crossfader", true); + engine.softTakeover("[Main]", "crossfader", true); }; Hercules4Mx.shutdown = function() { @@ -448,10 +448,10 @@ Hercules4Mx.onSongLoaded = function(value, group, control) { engine.setParameter("[Channel" + i + "]", "pfl", (deck === i) ? 1 : 0); } - var currentHeadMix = engine.getParameter("[Master]", "headMix"); + var currentHeadMix = engine.getParameter("[Main]", "headMix"); if (currentHeadMix == 1) { //Change the headmix if it was to full Mix. - engine.setParameter("[Master]", "headMix", Hercules4Mx.previousHeadMix); + engine.setParameter("[Main]", "headMix", Hercules4Mx.previousHeadMix); } } }; @@ -529,15 +529,15 @@ Hercules4Mx.onPreFaderListen = function(value, group, control) { var pfl2 = engine.getParameter("[Channel2]", "pfl"); var pfl3 = engine.getParameter("[Channel3]", "pfl"); var pfl4 = engine.getParameter("[Channel4]", "pfl"); - var currentHeadMix = engine.getParameter("[Master]", "headMix"); + var currentHeadMix = engine.getParameter("[Main]", "headMix"); if (pfl1 === 0 && pfl2 === 0 && pfl3 === 0 && pfl4 === 0) { // If they are all disabled after switching, move headmix to master. Hercules4Mx.previousHeadMix = currentHeadMix; - engine.setParameter("[Master]", "headMix", 1); + engine.setParameter("[Main]", "headMix", 1); } else if (currentHeadMix == 1) { // If at least one is enabled and headmix is set to master, restore previous headmix. - engine.setParameter("[Master]", "headMix", Hercules4Mx.previousHeadMix); + engine.setParameter("[Main]", "headMix", Hercules4Mx.previousHeadMix); } } if (Hercules4Mx.userSettings.useVuMeters) { @@ -639,12 +639,12 @@ Hercules4Mx.onSyncLed = function(value, group, control) { // only feed the correct levels to each channel of the vumeter Hercules4Mx.onVuMeterMasterL = function(value) { - if (Hercules4Mx.VuMeterL.source === '[Master]') { + if (Hercules4Mx.VuMeterL.source === '[Main]') { Hercules4Mx.updateVumeterEvent(Hercules4Mx.VuMeterL, value); } }; Hercules4Mx.onVuMeterMasterR = function(value) { - if (Hercules4Mx.VuMeterR.source === '[Master]') { + if (Hercules4Mx.VuMeterR.source === '[Main]') { Hercules4Mx.updateVumeterEvent(Hercules4Mx.VuMeterR, value); } }; @@ -1615,7 +1615,7 @@ Hercules4Mx.getNewDestinationChannel = function(chan) { } else if (pfl > 0) { returnarray[0] = "[Channel" + chan + "]"; } else { - returnarray[0] = "[Master]"; + returnarray[0] = "[Main]"; } return returnarray; }; diff --git a/res/controllers/Hercules-DJ-Console-Mk1-hid-scripts.js b/res/controllers/Hercules-DJ-Console-Mk1-hid-scripts.js index 6ac1d587f77..27b159bb65b 100644 --- a/res/controllers/Hercules-DJ-Console-Mk1-hid-scripts.js +++ b/res/controllers/Hercules-DJ-Console-Mk1-hid-scripts.js @@ -416,16 +416,16 @@ HerculesMk1Hid.define_hid_format = function() { // master - c.add_control(pid, "crossfader", "[Master]", "fader", 11, 0xff) - //c.add_control(pid, "joystick_x", "[Master]", "fader", 19, 0xff) - //c.add_control(pid, "joystick_y", "[Master]", "fader", 20, 0xff) + c.add_control(pid, "crossfader", "[Main]", "fader", 11, 0xff) + //c.add_control(pid, "joystick_x", "[Main]", "fader", 19, 0xff) + //c.add_control(pid, "joystick_y", "[Main]", "fader", 20, 0xff) // headphone cue - c.add_control(pid, "monitor_a", "[Master]", "button", 3, 0x10); - c.add_control(pid, "monitor_b", "[Master]", "button", 4, 0x01); - //c.add_control(pid, "monitor_both", "[Master]", "button", 5, 0x4); - c.add_control(pid, "monitor_both", "[Master]", "button", 5, 0x8); + c.add_control(pid, "monitor_a", "[Main]", "button", 3, 0x10); + c.add_control(pid, "monitor_b", "[Main]", "button", 4, 0x01); + //c.add_control(pid, "monitor_both", "[Main]", "button", 5, 0x4); + c.add_control(pid, "monitor_both", "[Main]", "button", 5, 0x8); // define led feedback diff --git a/res/controllers/Hercules-DJ-Console-Mk2-hid-scripts.js b/res/controllers/Hercules-DJ-Console-Mk2-hid-scripts.js index ed71a388c81..2eb7b0be3f8 100644 --- a/res/controllers/Hercules-DJ-Console-Mk2-hid-scripts.js +++ b/res/controllers/Hercules-DJ-Console-Mk2-hid-scripts.js @@ -398,16 +398,16 @@ HerculesMk2Hid.define_hid_format = function() { // master - c.add_control(pid, "crossfader", "[Master]", "fader", 12, 0xff) - c.add_control(pid, "joystick_x", "[Master]", "fader", 19, 0xff) - c.add_control(pid, "joystick_y", "[Master]", "fader", 20, 0xff) + c.add_control(pid, "crossfader", "[Main]", "fader", 12, 0xff) + c.add_control(pid, "joystick_x", "[Main]", "fader", 19, 0xff) + c.add_control(pid, "joystick_y", "[Main]", "fader", 20, 0xff) // headphone cue - c.add_control(pid, "monitor_a", "[Master]", "button", 5, 0x1); - c.add_control(pid, "monitor_b", "[Master]", "button", 5, 0x2); - //c.add_control(pid, "monitor_both", "[Master]", "button", 5, 0x4); - c.add_control(pid, "monitor_both", "[Master]", "button", 5, 0x8); + c.add_control(pid, "monitor_a", "[Main]", "button", 5, 0x1); + c.add_control(pid, "monitor_b", "[Main]", "button", 5, 0x2); + //c.add_control(pid, "monitor_both", "[Main]", "button", 5, 0x4); + c.add_control(pid, "monitor_both", "[Main]", "button", 5, 0x8); // define led feedback diff --git a/res/controllers/Hercules-DJ-Console-Mk4-scripts.js b/res/controllers/Hercules-DJ-Console-Mk4-scripts.js index da200f7c267..11c539d6e92 100644 --- a/res/controllers/Hercules-DJ-Console-Mk4-scripts.js +++ b/res/controllers/Hercules-DJ-Console-Mk4-scripts.js @@ -207,14 +207,14 @@ HerculesMk4.pfl = function (midino, control, value, status, group) { var pfl2=engine.getValue("[Channel2]","pfl"); - var actualMixCue=engine.getValue("[Master]","headMix"); + var actualMixCue=engine.getValue("[Main]","headMix"); if(pfl1==0 && pfl2==0){ HerculesMk4.antiguoMixCue=actualMixCue; - engine.setValue("[Master]","headMix",1); + engine.setValue("[Main]","headMix",1); }else{ if(actualMixCue==1){ - engine.setValue("[Master]","headMix",HerculesMk4.antiguoMixCue); + engine.setValue("[Main]","headMix",HerculesMk4.antiguoMixCue); } }; }; diff --git a/res/controllers/Hercules-DJ-Console-RMX-hid-scripts.js b/res/controllers/Hercules-DJ-Console-RMX-hid-scripts.js index 09d8cd53fbf..1e2e5e2cc92 100644 --- a/res/controllers/Hercules-DJ-Console-RMX-hid-scripts.js +++ b/res/controllers/Hercules-DJ-Console-RMX-hid-scripts.js @@ -366,12 +366,12 @@ RMX.define_hid_format = function() { c.add_control(pid, "filterLowKill", "[Channel2]", "button", 5, 0x80); // master buttons - c.add_control(pid, "scratch", "[Master]", "button", 6, 0x01); - c.add_control(pid, "menu_up", "[Master]", "button", 6, 0x02); - c.add_control(pid, "menu_down", "[Master]", "button", 6, 0x04); - c.add_control(pid, "menu_left", "[Master]", "button", 6, 0x08); - c.add_control(pid, "menu_right", "[Master]", "button", 6, 0x10); - c.add_control(pid, "mic_toggle", "[Master]", "button", 6, 0x20); + c.add_control(pid, "scratch", "[Main]", "button", 6, 0x01); + c.add_control(pid, "menu_up", "[Main]", "button", 6, 0x02); + c.add_control(pid, "menu_down", "[Main]", "button", 6, 0x04); + c.add_control(pid, "menu_left", "[Main]", "button", 6, 0x08); + c.add_control(pid, "menu_right", "[Main]", "button", 6, 0x10); + c.add_control(pid, "mic_toggle", "[Main]", "button", 6, 0x20); // wheels c.add_control(pid, "jog", "[Channel1]", "encoder", 7, 0xff); @@ -385,10 +385,10 @@ RMX.define_hid_format = function() { c.add_control(pid, "filterMid", "[Channel1]", "fader", 13, 0xff); c.add_control(pid, "filterLow", "[Channel1]", "fader", 14, 0xff); - c.add_control(pid, "balance", "[Master]", "fader", 15, 0xff); - c.add_control(pid, "volume", "[Master]", "fader", 16, 0xff); - c.add_control(pid, "crossfader", "[Master]", "fader", 17, 0xff); - c.add_control(pid, "headMix", "[Master]", "fader", 18, 0xff); + c.add_control(pid, "balance", "[Main]", "fader", 15, 0xff); + c.add_control(pid, "volume", "[Main]", "fader", 16, 0xff); + c.add_control(pid, "crossfader", "[Main]", "fader", 17, 0xff); + c.add_control(pid, "headMix", "[Main]", "fader", 18, 0xff); c.add_control(pid, "rate", "[Channel2]", "fader", 19, 0xff); c.add_control(pid, "volume", "[Channel2]", "fader", 20, 0xff); @@ -403,7 +403,7 @@ RMX.define_hid_format = function() { pid = 0x00; c.cache_out[pid] = [ pid, 0x0, 0x0, 0x0 ]; - c.add_control(pid, "scratch", "[Master]", "led", 1, 0x01); // blinking: 3, 0x2 + c.add_control(pid, "scratch", "[Main]", "led", 1, 0x01); // blinking: 3, 0x2 c.add_control(pid, "play", "[Channel1]", "led", 1, 0x02); // blinking: 3, 0x2 c.add_control(pid, "cue_default", "[Channel1]", "led", 1, 0x04); c.add_control(pid, "headphone_cue", "[Channel1]", "led", 1, 0x08); diff --git a/res/controllers/Hercules-DJ-Console-RMX-scripts.js b/res/controllers/Hercules-DJ-Console-RMX-scripts.js index 13d5ccbd970..f0c35f0ed17 100644 --- a/res/controllers/Hercules-DJ-Console-RMX-scripts.js +++ b/res/controllers/Hercules-DJ-Console-RMX-scripts.js @@ -835,11 +835,11 @@ HerculesRMX.init = function (id) { // called when the MIDI device is opened & engine.softTakeover("[Channel2]","filterHigh",true); engine.softTakeover("[Channel2]","filterMed",true); engine.softTakeover("[Channel2]","filterLow",true); - engine.softTakeover("[Master]","crossfader",true); - engine.softTakeover("[Master]","headVolume",true); - engine.softTakeover("[Master]","headMix",true); - engine.softTakeover("[Master]","volume",true); - engine.softTakeover("[Master]","balance",true); + engine.softTakeover("[Main]","crossfader",true); + engine.softTakeover("[Main]","headVolume",true); + engine.softTakeover("[Main]","headMix",true); + engine.softTakeover("[Main]","volume",true); + engine.softTakeover("[Main]","balance",true); // does not work, because whole Mic volume and "Talk" button of the skin // does not seem to be matched to controller // engine.softTakeover("[Microphone]","volume",true); diff --git a/res/controllers/Hercules-DJ-Control-AIR-scripts.js b/res/controllers/Hercules-DJ-Control-AIR-scripts.js index a18e84e90ae..98ea39f901d 100644 --- a/res/controllers/Hercules-DJ-Control-AIR-scripts.js +++ b/res/controllers/Hercules-DJ-Control-AIR-scripts.js @@ -25,25 +25,25 @@ HerculesAir.init = function(id) { midi.sendShortMsg(0x90, 0x3B, 0x7f) // headset volume "-" button LED (always on) midi.sendShortMsg(0x90, 0x3C, 0x7f) // headset volume "+" button LED (always on) - if(engine.getValue("[Master]", "headMix") > 0.5) { + if(engine.getValue("[Main]", "headMix") > 0.5) { midi.sendShortMsg(0x90, 0x39, 0x7f) // headset "Mix" button LED } else { midi.sendShortMsg(0x90, 0x3A, 0x7f) // headset "Cue" button LED } // Set soft-takeover for all Sampler volumes - for (var i=engine.getValue("[Master]","num_samplers"); i>=1; i--) { + for (var i=engine.getValue("[Main]","num_samplers"); i>=1; i--) { engine.softTakeover("[Sampler"+i+"]","pregain",true); } // Set soft-takeover for all applicable Deck controls - for (var i=engine.getValue("[Master]","num_decks"); i>=1; i--) { + for (var i=engine.getValue("[Main]","num_decks"); i>=1; i--) { engine.softTakeover("[Channel"+i+"]","volume",true); engine.softTakeover("[Channel"+i+"]","filterHigh",true); engine.softTakeover("[Channel"+i+"]","filterMid",true); engine.softTakeover("[Channel"+i+"]","filterLow",true); } - engine.softTakeover("[Master]","crossfader",true); + engine.softTakeover("[Main]","crossfader",true); engine.connectControl("[Channel1]", "beat_active", "HerculesAir.beatProgressDeckA") engine.connectControl("[Channel1]", "play", "HerculesAir.playDeckA") diff --git a/res/controllers/Hercules-DJ-Control-MP3-hid-scripts.js b/res/controllers/Hercules-DJ-Control-MP3-hid-scripts.js index 2184422e7d4..ca6cc9434f2 100644 --- a/res/controllers/Hercules-DJ-Control-MP3-hid-scripts.js +++ b/res/controllers/Hercules-DJ-Control-MP3-hid-scripts.js @@ -438,16 +438,16 @@ HerculesMP3Hid.define_hid_format = function() { // master - c.add_control(pid, "crossfader", "[Master]", "fader", 11, 0xff) - //c.add_control(pid, "joystick_x", "[Master]", "fader", 19, 0xff) - //c.add_control(pid, "joystick_y", "[Master]", "fader", 20, 0xff) + c.add_control(pid, "crossfader", "[Main]", "fader", 11, 0xff) + //c.add_control(pid, "joystick_x", "[Main]", "fader", 19, 0xff) + //c.add_control(pid, "joystick_y", "[Main]", "fader", 20, 0xff) // headphone cue - c.add_control(pid, "monitor_a", "[Master]", "button", 3, 0x10); - c.add_control(pid, "monitor_b", "[Master]", "button", 4, 0x01); - //c.add_control(pid, "monitor_both", "[Master]", "button", 5, 0x4); - c.add_control(pid, "monitor_both", "[Master]", "button", 5, 0x8); + c.add_control(pid, "monitor_a", "[Main]", "button", 3, 0x10); + c.add_control(pid, "monitor_b", "[Main]", "button", 4, 0x01); + //c.add_control(pid, "monitor_both", "[Main]", "button", 5, 0x4); + c.add_control(pid, "monitor_both", "[Main]", "button", 5, 0x8); // define led feedback diff --git a/res/controllers/Hercules-DJ-Control-MP3-scripts.js b/res/controllers/Hercules-DJ-Control-MP3-scripts.js index c03c319a614..1896485057c 100644 --- a/res/controllers/Hercules-DJ-Control-MP3-scripts.js +++ b/res/controllers/Hercules-DJ-Control-MP3-scripts.js @@ -506,13 +506,13 @@ HerculesMp3.pitchpot = function (group, control, value, status) { max = 4; } else if (name == "fx 2"){ - chan = "[Master]"; + chan = "[Main]"; action="headVolume"; min=0; max=5; } else if (name == "fx 3"){ - chan = "[Master]"; + chan = "[Main]"; action="headMix"; min=-1; max=1; diff --git a/res/controllers/Hercules-DJ-Control-Steel-scripts.js b/res/controllers/Hercules-DJ-Control-Steel-scripts.js index e9691f32073..7f04ea7e619 100644 --- a/res/controllers/Hercules-DJ-Control-Steel-scripts.js +++ b/res/controllers/Hercules-DJ-Control-Steel-scripts.js @@ -28,7 +28,7 @@ v0.1 10/09/2010 First public release //TODO: Cleanup, create objects from init. //Remove led timers when alsa midi is working properly. HerculesSteel = new function() { - this.group = "[Master]"; + this.group = "[Main]"; this.shiftMode = false; this.scratchMode = false; this.jogPlaylistScrollMode = false; diff --git a/res/controllers/Hercules-DJControl-Compact-scripts.js b/res/controllers/Hercules-DJControl-Compact-scripts.js index e5e57090120..24e9cc31f21 100644 --- a/res/controllers/Hercules-DJControl-Compact-scripts.js +++ b/res/controllers/Hercules-DJControl-Compact-scripts.js @@ -2,11 +2,11 @@ // controller -- no control over which mode is selected for instance. HercDJCompact = function() { - this.group = "[Master]"; + this.group = "[Main]"; }; HercDJCompact.init = function(id) { - engine.setValue("[Master]", "num_samplers", 8); + engine.setValue("[Main]", "num_samplers", 8); scratch = false; scratch_timer = []; diff --git a/res/controllers/Hercules-DJControl-Inpulse-300-script.js b/res/controllers/Hercules-DJControl-Inpulse-300-script.js index 8e5dbb35849..92313d8660b 100644 --- a/res/controllers/Hercules-DJControl-Inpulse-300-script.js +++ b/res/controllers/Hercules-DJControl-Inpulse-300-script.js @@ -88,10 +88,10 @@ DJCi300.init = function() { engine.getValue("[Channel1]", "VuMeter", "DJCi300.vuMeterUpdateDeck"); engine.connectControl("[Channel2]", "VuMeter", "DJCi300.vuMeterUpdateDeck"); engine.getValue("[Channel2]", "VuMeter", "DJCi300.vuMeterUpdateDeck"); - engine.connectControl("[Master]", "VuMeterL", "DJCi300.vuMeterUpdateMaster"); - engine.connectControl("[Master]", "VuMeterR", "DJCi300.vuMeterUpdateMaster"); - engine.getValue("[Master]", "VuMeterL", "DJCi300.vuMeterUpdateMaster"); - engine.getValue("[Master]", "VuMeterR", "DJCi300.vuMeterUpdateMaster"); + engine.connectControl("[Main]", "VuMeterL", "DJCi300.vuMeterUpdateMaster"); + engine.connectControl("[Main]", "VuMeterR", "DJCi300.vuMeterUpdateMaster"); + engine.getValue("[Main]", "VuMeterL", "DJCi300.vuMeterUpdateMaster"); + engine.getValue("[Main]", "VuMeterR", "DJCi300.vuMeterUpdateMaster"); // Ask the controller to send all current knob/slider values over MIDI, which will update // the corresponding GUI controls in MIXXX. diff --git a/res/controllers/Hercules-DJControl-Starlight-scripts.js b/res/controllers/Hercules-DJControl-Starlight-scripts.js index 7174e8d2da4..0c1d4c09eaa 100644 --- a/res/controllers/Hercules-DJControl-Starlight-scripts.js +++ b/res/controllers/Hercules-DJControl-Starlight-scripts.js @@ -221,12 +221,12 @@ DJCStarlight.cueMaster = function(channel, control, value, status, group) { return; } - var masterIsCued = engine.getValue('[Master]', 'headMix') > 0; + var masterIsCued = engine.getValue('[Main]', 'headMix') > 0; // Toggle state. masterIsCued = !masterIsCued; var headMixValue = masterIsCued ? 1 : -1; - engine.setValue('[Master]', 'headMix', headMixValue); + engine.setValue('[Main]', 'headMix', headMixValue); // Set LED (will be overwritten when [Shift] is released) var cueMasterLedValue = masterIsCued ? 0x7F : 0x00; @@ -245,11 +245,11 @@ DJCStarlight.cueMix = function(channel, control, value, status, group) { } // Toggle state. - script.toggleControl('[Master]', 'headSplit'); + script.toggleControl('[Main]', 'headSplit'); // Set LED (will be overwritten when [Shift] is released) var cueMixLedValue = - engine.getValue('[Master]', 'headSplit') ? 0x7F : 0x00; + engine.getValue('[Main]', 'headSplit') ? 0x7F : 0x00; midi.sendShortMsg(0x92, 0x0C, cueMixLedValue); }; @@ -259,10 +259,10 @@ DJCStarlight.shiftButton = function(channel, control, value, status, group) { // When Shift is held, light the LEDS to show the status of the alt // functions of the cue buttons. var cueMasterLedValue = - engine.getValue('[Master]', 'headMix') > 0 ? 0x7F : 0x00; + engine.getValue('[Main]', 'headMix') > 0 ? 0x7F : 0x00; midi.sendShortMsg(0x91, 0x0C, cueMasterLedValue); var cueMixLedValue = - engine.getValue('[Master]', 'headSplit') ? 0x7F : 0x00; + engine.getValue('[Main]', 'headSplit') ? 0x7F : 0x00; midi.sendShortMsg(0x92, 0x0C, cueMixLedValue); } else { // When Shift is released, go back to the normal LED values. diff --git a/res/controllers/Hercules-P32-scripts.js b/res/controllers/Hercules-P32-scripts.js index 203dd920e60..ac0c9a0c75c 100644 --- a/res/controllers/Hercules-P32-scripts.js +++ b/res/controllers/Hercules-P32-scripts.js @@ -47,8 +47,8 @@ P32.init = function() { components.Component.prototype.shiftChannel = true; components.Button.prototype.sendShifted = true; - if (engine.getValue("[Master]", "num_samplers") < 32) { - engine.setValue("[Master]", "num_samplers", 32); + if (engine.getValue("[Main]", "num_samplers") < 32) { + engine.setValue("[Main]", "num_samplers", 32); } P32.leftDeck = new P32.Deck([1, 3], 1); @@ -95,7 +95,7 @@ P32.browseEncoder = function(_channel, _control, value, _status, _group) { P32.headMixEncoder = function(_channel, _control, value, _status, _group) { var direction = (value > 64) ? -1 : 1; - engine.setValue("[Master]", "headMix", engine.getValue("[Master]", "headMix") + (0.1 * direction)); + engine.setValue("[Main]", "headMix", engine.getValue("[Main]", "headMix") + (0.1 * direction)); }; P32.recordButton = new components.Button({ diff --git a/res/controllers/Hercules-mp3e2-compat.js b/res/controllers/Hercules-mp3e2-compat.js index 35c6d6b9353..7a4a8f8e5be 100644 --- a/res/controllers/Hercules-mp3e2-compat.js +++ b/res/controllers/Hercules-mp3e2-compat.js @@ -117,7 +117,7 @@ MP3e2.incomingData = function(data, length) { f = HerculesMP3e2.filterLow; break; case 0xb038: - engine.setValue('[Master]', 'crossfader', script.absoluteLin(value, -1, 1)); + engine.setValue('[Main]', 'crossfader', script.absoluteLin(value, -1, 1)); break; } diff --git a/res/controllers/Hercules_DJControl_Inpulse_200.midi.xml b/res/controllers/Hercules_DJControl_Inpulse_200.midi.xml index 79ac80305f8..1cc4394461f 100644 --- a/res/controllers/Hercules_DJControl_Inpulse_200.midi.xml +++ b/res/controllers/Hercules_DJControl_Inpulse_200.midi.xml @@ -237,7 +237,7 @@ - [Master] + [Main] maximize_library Browser button - Maximize Library view 0x93 @@ -877,7 +877,7 @@ - [Master] + [Main] crossfader Crossfader 0xB0 @@ -1293,7 +1293,7 @@ 0x07 - [Master] + [Main] maximize_library Browser LED (GREEN) 0.5 diff --git a/res/controllers/Hercules_DJControl_Inpulse_300.midi.xml b/res/controllers/Hercules_DJControl_Inpulse_300.midi.xml index 8b7e204c126..9f73503e7f4 100644 --- a/res/controllers/Hercules_DJControl_Inpulse_300.midi.xml +++ b/res/controllers/Hercules_DJControl_Inpulse_300.midi.xml @@ -336,7 +336,7 @@ - [Master] + [Main] maximize_library Browser button - Maximize Library view 0x93 @@ -1662,7 +1662,7 @@ - [Master] + [Main] crossfader Crossfader 0xB0 @@ -2206,7 +2206,7 @@ 0x07 - [Master] + [Main] maximize_library Browser LED (GREEN) 0.5 diff --git a/res/controllers/Hercules_DJControl_Jogvision-scripts.js b/res/controllers/Hercules_DJControl_Jogvision-scripts.js index b91aa325618..20bc3a6fa10 100644 --- a/res/controllers/Hercules_DJControl_Jogvision-scripts.js +++ b/res/controllers/Hercules_DJControl_Jogvision-scripts.js @@ -161,7 +161,7 @@ var DJCJV = { midi.sendShortMsg(DJCJV.led.master, DJCJV.led.vinylMode, DJCJV.other.on); // Set Headphone CUE/MIX LED state - if (engine.getValue("[Master]", "headMix") > 0.5) { + if (engine.getValue("[Main]", "headMix") > 0.5) { midi.sendShortMsg(DJCJV.led.master, DJCJV.led.headCue, DJCJV.other.on); // headset "Mix" button LED midi.sendShortMsg(DJCJV.led.master, DJCJV.led.headMix, DJCJV.other.off); } else { @@ -170,7 +170,7 @@ var DJCJV = { } // Enable Soft takeover - engine.softTakeover("[Master]", "crossfader", true); + engine.softTakeover("[Main]", "crossfader", true); engine.softTakeover("[QuickEffectRack1_[Channel1]]", "super1", true); engine.softTakeover("[QuickEffectRack1_[Channel2]]", "super1", true); diff --git a/res/controllers/Hercules_DJControl_Jogvision.midi.xml b/res/controllers/Hercules_DJControl_Jogvision.midi.xml index 5f3323da926..12af208b8c0 100644 --- a/res/controllers/Hercules_DJControl_Jogvision.midi.xml +++ b/res/controllers/Hercules_DJControl_Jogvision.midi.xml @@ -130,7 +130,7 @@ - [Master] + [Main] DJCJV.headCue Headphone CUE button 0x90 @@ -140,7 +140,7 @@ - [Master] + [Main] DJCJV.headMix Headphone MIX button 0x90 @@ -1005,7 +1005,7 @@ - [Master] + [Main] DJCJV.vinylButton Vinyl Deck A 0x90 @@ -1016,7 +1016,7 @@ - [Master] + [Main] maximize_library Browser button - Maximize Library view 0x90 @@ -1049,7 +1049,7 @@ - [Master] + [Main] crossfader Crossfader 0xB0 @@ -1719,7 +1719,7 @@ - [Master] + [Main] maximize_library VIEW button LED 0.5 diff --git a/res/controllers/Ion Discover DJ.midi.xml b/res/controllers/Ion Discover DJ.midi.xml index fac10664805..2d4c556b860 100644 --- a/res/controllers/Ion Discover DJ.midi.xml +++ b/res/controllers/Ion Discover DJ.midi.xml @@ -13,7 +13,7 @@ - [Master] + [Main] maximize_library MIDI Learned from 2 messages. 0x90 @@ -232,7 +232,7 @@ - [Master] + [Main] volume 0xB0 0x17 @@ -336,7 +336,7 @@ - [Master] + [Main] maximize_library MIDI Learned from 2 messages. 0x80 @@ -375,7 +375,7 @@ - [Master] + [Main] crossfader 0xB0 0x0A diff --git a/res/controllers/Ion-Discover-DJ-Pro.midi.xml b/res/controllers/Ion-Discover-DJ-Pro.midi.xml index 58418593dc9..ab69d509d07 100644 --- a/res/controllers/Ion-Discover-DJ-Pro.midi.xml +++ b/res/controllers/Ion-Discover-DJ-Pro.midi.xml @@ -15,7 +15,7 @@ 0xb0 0xc - [Master] + [Main] headMix @@ -24,7 +24,7 @@ 0xb0 0x17 - [Master] + [Main] volume @@ -33,7 +33,7 @@ 0xb0 0xb - [Master] + [Main] headVolume @@ -42,7 +42,7 @@ 0xb0 0x0a - [Master] + [Main] crossfader diff --git a/res/controllers/KANE_QuNeo.midi.xml b/res/controllers/KANE_QuNeo.midi.xml index 46c8383fb78..f62d243d56a 100644 --- a/res/controllers/KANE_QuNeo.midi.xml +++ b/res/controllers/KANE_QuNeo.midi.xml @@ -1598,7 +1598,7 @@ 0xb5 0x00 - [Master] + [Main] volume @@ -1607,7 +1607,7 @@ 0xb5 0x01 - [Master] + [Main] headVolume @@ -1782,7 +1782,7 @@ 0xB3 0x00 - [Master] + [Main] crossfader @@ -1937,7 +1937,7 @@ 0x94 0x00 - [Master] + [Main] KANE_QuNeo.sliderCycle @@ -1946,7 +1946,7 @@ 0xb4 0x00 - [Master] + [Main] KANE_QuNeo.verticalSlider1Move @@ -1955,7 +1955,7 @@ 0x84 0x01 - [Master] + [Main] KANE_QuNeo.verticalSlider1Touch @@ -1964,7 +1964,7 @@ 0xb4 0x01 - [Master] + [Main] KANE_QuNeo.verticalSlider2Move @@ -1973,7 +1973,7 @@ 0x84 0x02 - [Master] + [Main] KANE_QuNeo.verticalSlider2Touch @@ -1982,7 +1982,7 @@ 0xb4 0x02 - [Master] + [Main] KANE_QuNeo.verticalSlider3Move @@ -1991,7 +1991,7 @@ 0x84 0x03 - [Master] + [Main] KANE_QuNeo.verticalSlider3Touch @@ -2000,7 +2000,7 @@ 0xb4 0x03 - [Master] + [Main] KANE_QuNeo.verticalSlider4Move @@ -2009,7 +2009,7 @@ 0x84 0x04 - [Master] + [Main] KANE_QuNeo.verticalSlider4Touch @@ -2246,7 +2246,7 @@ 0x97 0x00 - [Master] + [Main] KANE_QuNeo.toggleRecord @@ -2255,7 +2255,7 @@ 0x97 0x01 - [Master] + [Main] KANE_QuNeo.assert13LEDs @@ -2264,7 +2264,7 @@ 0x87 0x01 - [Master] + [Main] KANE_QuNeo.assertLEDOn @@ -2273,7 +2273,7 @@ 0x97 0x02 - [Master] + [Main] KANE_QuNeo.togglePlayScratch @@ -2282,7 +2282,7 @@ 0x97 0x0d - [Master] + [Main] KANE_QuNeo.assert5LEDs @@ -2291,7 +2291,7 @@ 0x97 0x0e - [Master] + [Main] KANE_QuNeo.assert14LEDs @@ -2300,7 +2300,7 @@ 0x97 0x0f - [Master] + [Main] KANE_QuNeo.assert15LEDs @@ -2309,7 +2309,7 @@ 0x97 0x10 - [Master] + [Main] KANE_QuNeo.assert16LEDs @@ -2318,7 +2318,7 @@ 0x87 0x0d - [Master] + [Main] KANE_QuNeo.assertLEDOn @@ -2327,7 +2327,7 @@ 0x87 0x0e - [Master] + [Main] KANE_QuNeo.assertLEDOn @@ -2336,7 +2336,7 @@ 0x87 0x0f - [Master] + [Main] KANE_QuNeo.assertLEDOn @@ -2345,7 +2345,7 @@ 0x87 0x10 - [Master] + [Main] KANE_QuNeo.assertLEDOn diff --git a/res/controllers/KANE_QuNeo_scripts.js b/res/controllers/KANE_QuNeo_scripts.js index 5f1eb17b5c4..00827ebba36 100644 --- a/res/controllers/KANE_QuNeo_scripts.js +++ b/res/controllers/KANE_QuNeo_scripts.js @@ -348,12 +348,12 @@ KANE_QuNeo.init = function (id) { // called when the device is opened & set up engine.connectControl("[Channel2]","visual_playposition","KANE_QuNeo.time2Keeper"); // led controls for the master / flanger channels - engine.connectControl("[Master]","VuMeter","KANE_QuNeo.masterVuMeter"); - //engine.softTakeover("[Master]","volume",true); - engine.connectControl("[Master]","headVolume","KANE_QuNeo.headVol"); + engine.connectControl("[Main]","VuMeter","KANE_QuNeo.masterVuMeter"); + //engine.softTakeover("[Main]","volume",true); + engine.connectControl("[Main]","headVolume","KANE_QuNeo.headVol"); engine.connectControl("[Flanger]","lfoPeriod","KANE_QuNeo.flangerPeriod"); engine.connectControl("[Flanger]","lfoDepth","KANE_QuNeo.flangerDepth"); - engine.connectControl("[Master]","crossfader","KANE_QuNeo.crossFader"); + engine.connectControl("[Main]","crossfader","KANE_QuNeo.crossFader"); for (var deck = 1; deck <= KANE_QuNeo.numDecks; deck++) { var channelName = KANE_QuNeo.getChannelName(deck) @@ -1473,7 +1473,7 @@ KANE_QuNeo.getLEDGroup = function (deck) { KANE_QuNeo.getChannelName = function (deck) { var deckType = KANE_QuNeo.getDeckType(deck); if (deckType == "master") // master deck - return "[Master]" + return "[Main]" else if (deckType == "deck") // if dealing with actual decks return "[Channel"+deck+"]" else if (deckType == "sampler") // if dealing with samplers @@ -1647,10 +1647,10 @@ KANE_QuNeo.assertLEDs = function (mode) { KANE_QuNeo.assertNudgeLEDs(); KANE_QuNeo.assertHorizArrowLEDs(1); KANE_QuNeo.assertHorizArrowLEDs(2); - engine.trigger("[Master]","headVolume"); + engine.trigger("[Main]","headVolume"); engine.trigger("[Flanger]","lfoPeriod"); engine.trigger("[Flanger]","lfoDepth"); - engine.trigger("[Master]","crossfader"); + engine.trigger("[Main]","crossfader"); // trigger all VuMeters for (var deck = 0; deck <= KANE_QuNeo.numDecks; deck++) @@ -2333,7 +2333,7 @@ KANE_QuNeo.masterVuMeter = function (value) { } } if (level == -1) // if there were no playing decks, display volume - level = KANE_QuNeo.oneToFiveKnob(engine.getValue("[Master]","volume")) + level = KANE_QuNeo.oneToFiveKnob(engine.getValue("[Main]","volume")) KANE_QuNeo.LEDs(0xb0,0x0b,level); // AssertLED Button diff --git a/res/controllers/Kontrol Dj KDJ500.midi.xml b/res/controllers/Kontrol Dj KDJ500.midi.xml index 89e5139dd0d..247f2e20dc7 100644 --- a/res/controllers/Kontrol Dj KDJ500.midi.xml +++ b/res/controllers/Kontrol Dj KDJ500.midi.xml @@ -273,7 +273,7 @@ 0xb0 0xd - [Master] + [Main] crossfader diff --git a/res/controllers/Korg nanoKONTROL.midi.xml b/res/controllers/Korg nanoKONTROL.midi.xml index 63c406ec992..aaaaee50e7e 100644 --- a/res/controllers/Korg nanoKONTROL.midi.xml +++ b/res/controllers/Korg nanoKONTROL.midi.xml @@ -39,7 +39,7 @@ 0xb0 0x11 - [Master] + [Main] headVolume @@ -48,7 +48,7 @@ 0xb0 0x12 - [Master] + [Main] headMix @@ -57,7 +57,7 @@ 0xb0 0x13 - [Master] + [Main] volume @@ -264,7 +264,7 @@ 0xb0 0x6 - [Master] + [Main] crossfader diff --git a/res/controllers/Korg-KAOSS-DJ.midi.xml b/res/controllers/Korg-KAOSS-DJ.midi.xml index ad6f66a97a5..5a5e6c37265 100644 --- a/res/controllers/Korg-KAOSS-DJ.midi.xml +++ b/res/controllers/Korg-KAOSS-DJ.midi.xml @@ -563,7 +563,7 @@ - [Master] + [Main] crossfader X-Fader 0xB6 diff --git a/res/controllers/Korg-nanoKONTROL-2-scripts.js b/res/controllers/Korg-nanoKONTROL-2-scripts.js index a14aca0e664..281f68d708c 100644 --- a/res/controllers/Korg-nanoKONTROL-2-scripts.js +++ b/res/controllers/Korg-nanoKONTROL-2-scripts.js @@ -46,7 +46,7 @@ if (NK2.numDecks==8){ NK2.deckData={};//object to store deck data, like mute vols, etc. -NK2.deckData["[Master]"]={'muteVol':-1}; +NK2.deckData["[Main]"]={'muteVol':-1}; for (i=1; i<9; i++){//initialize Deck reference objects NK2.deckData[NK2.Deck[i]]={}; NK2.deckData[NK2.Deck[i]]['deckNum']=i;//reverse lookup for deck numbers by name @@ -61,11 +61,11 @@ NK2.beatloopLengths=new Array(0.03125,0.0625, 0.125, 0.25, 0.5, 1, 2, 4, 8, 16, NK2.init = function init() { // called when the device is opened & set up if (NK2.debug>2){print("##function: "+NK2.getFunctionName())}; - engine.setValue("[Master]", "num_decks", NK2.numDecks); + engine.setValue("[Main]", "num_decks", NK2.numDecks); NK2.setup() NK2.updateLEDs(); - print("decks: "+engine.getValue("[Master]", "num_decks")) + print("decks: "+engine.getValue("[Main]", "num_decks")) }; NK2.shutdown = function shutdown() { @@ -981,7 +981,7 @@ NK2.toggleBinaryControlAll NK2.Controls[NK2.leftButton["rev"]]["N"][NK2.MODcodes["0000"]]={"isset":true, "pressEval":'NK2.toggleBinaryControlAll("quantize");', "releaseEval":false, "LEDstateType":"off"}; NK2.Controls[NK2.leftButton["ff"]]["N"][NK2.MODcodes["0000"]]={"isset":true, "pressEval":'NK2.toggleBinaryControlAll("keylock");', "releaseEval":false, "LEDstateType":"off"}; NK2.Controls[NK2.leftButton["stop"]]["N"][NK2.MODcodes["0000"]]={"isset":true, "pressEval":'NK2.toggleBinaryControlAll("slip_enabled");', "releaseEval":false, "LEDstateType":"off"}; -NK2.Controls[NK2.leftButton["play"]]["N"][0]={"isset":true, "pressEval":'NK2.mutePress("[Master]");', "releaseEval":'NK2.muteRelease("[Master]");', "LEDstateType":"hook", "LEDhookControl":'volume', "LEDhookFunction":'NK2.muteLEDs', "LEDhookGroup":"[Master]"}; +NK2.Controls[NK2.leftButton["play"]]["N"][0]={"isset":true, "pressEval":'NK2.mutePress("[Main]");', "releaseEval":'NK2.muteRelease("[Main]");', "LEDstateType":"hook", "LEDhookControl":'volume', "LEDhookFunction":'NK2.muteLEDs', "LEDhookGroup":"[Main]"}; //set common left button controls for S, M, and R modes (these controls can be overridden by resetting them later in the script) for (var j=1;j<4;j++){ @@ -1173,8 +1173,8 @@ for (var i=2;i<9;i++){ }; //master VU meter - -NK2.Controls[NK2.Sbutton[1]]["N"][NK2.MODcodes["0011"]]={"isset":true, "pressEval":false, "releaseEval":false, "LEDstateType":"hook", "LEDhookControl":'VuMeterL', "LEDhookFunction":'NK2.vuMeterL', "LEDhookGroup":"[Master]"}; -NK2.Controls[NK2.Mbutton[1]]["N"][NK2.MODcodes["0011"]]={"isset":true, "pressEval":'NK2.binControlPress("'+NK2.Deck[1]+'", "bpm_tap");', "releaseEval":false, "LEDstateType":"hook", "LEDhookControl":'VuMeterR', "LEDhookFunction":'NK2.vuMeterR', "LEDhookGroup":"[Master]"}; +NK2.Controls[NK2.Sbutton[1]]["N"][NK2.MODcodes["0011"]]={"isset":true, "pressEval":false, "releaseEval":false, "LEDstateType":"hook", "LEDhookControl":'VuMeterL', "LEDhookFunction":'NK2.vuMeterL', "LEDhookGroup":"[Main]"}; +NK2.Controls[NK2.Mbutton[1]]["N"][NK2.MODcodes["0011"]]={"isset":true, "pressEval":'NK2.binControlPress("'+NK2.Deck[1]+'", "bpm_tap");', "releaseEval":false, "LEDstateType":"hook", "LEDhookControl":'VuMeterR', "LEDhookFunction":'NK2.vuMeterR', "LEDhookGroup":"[Main]"}; for (var i=2;i<9;i++){ NK2.Controls[NK2.Sbutton[i]]["N"][NK2.MODcodes["0011"]]={"isset":true, "pressEval":false, "releaseEval":false, "LEDstateType":"off"}; @@ -1189,10 +1189,10 @@ for (var i=1;i<9;i++){ //############# KNOBS //N mode NK2.Controls[NK2.Knob[1]]["N"][NK2.MODcodes["0000"]]={"isset":true, "pressEval":'NK2.wavezoomAll(value);', "LEDstateType":"off"}; -NK2.Controls[NK2.Knob[2]]["N"][NK2.MODcodes["0000"]]={"isset":true, "pressEval":'NK2.logKnobAdjust("[Master]", "headVolume", value, 0, 5);', "LEDstateType":"off"}; -NK2.Controls[NK2.Knob[3]]["N"][NK2.MODcodes["0000"]]={"isset":true, "pressEval":'NK2.knobAdjust("[Master]", "headMix", value, -1, 1);', "LEDstateType":"off"}; -NK2.Controls[NK2.Knob[4]]["N"][NK2.MODcodes["0000"]]={"isset":true, "pressEval":'NK2.knobAdjust("[Master]", "balance", value, -1, 1);', "LEDstateType":"off"}; -NK2.Controls[NK2.Knob[5]]["N"][NK2.MODcodes["0000"]]={"isset":true, "pressEval":'NK2.logKnobAdjust("[Master]", "volume", value, 0, 5);', "LEDstateType":"off"}; +NK2.Controls[NK2.Knob[2]]["N"][NK2.MODcodes["0000"]]={"isset":true, "pressEval":'NK2.logKnobAdjust("[Main]", "headVolume", value, 0, 5);', "LEDstateType":"off"}; +NK2.Controls[NK2.Knob[3]]["N"][NK2.MODcodes["0000"]]={"isset":true, "pressEval":'NK2.knobAdjust("[Main]", "headMix", value, -1, 1);', "LEDstateType":"off"}; +NK2.Controls[NK2.Knob[4]]["N"][NK2.MODcodes["0000"]]={"isset":true, "pressEval":'NK2.knobAdjust("[Main]", "balance", value, -1, 1);', "LEDstateType":"off"}; +NK2.Controls[NK2.Knob[5]]["N"][NK2.MODcodes["0000"]]={"isset":true, "pressEval":'NK2.logKnobAdjust("[Main]", "volume", value, 0, 5);', "LEDstateType":"off"}; NK2.Controls[NK2.Knob[6]]["N"][NK2.MODcodes["0000"]]={"isset":true, "pressEval":'NK2.knobAdjust("[Flanger]", "lfoPeriod", value, 50000, 2000000);', "LEDstateType":"off"}; NK2.Controls[NK2.Knob[7]]["N"][NK2.MODcodes["0000"]]={"isset":true, "pressEval":'NK2.knobAdjust("[Flanger]", "lfoDepth", value, 0, 1);', "LEDstateType":"off"}; NK2.Controls[NK2.Knob[8]]["N"][NK2.MODcodes["0000"]]={"isset":true, "pressEval":'NK2.knobAdjust("[Flanger]", "lfoDelay", value, 50, 10000);', "LEDstateType":"off"}; diff --git a/res/controllers/M-Audio_Xsession_pro.midi.xml b/res/controllers/M-Audio_Xsession_pro.midi.xml index 2e49149efcd..56e54315b84 100644 --- a/res/controllers/M-Audio_Xsession_pro.midi.xml +++ b/res/controllers/M-Audio_Xsession_pro.midi.xml @@ -9,31 +9,31 @@ - [Master] + [Main] crossfader 0xB0 0x11 - [Master] + [Main] balance 0xB0 0x20 - [Master] + [Main] volume 0xB0 0x21 - [Master] + [Main] headVolume 0xB0 0x1a - [Master] + [Main] headMix 0xB0 0x19 diff --git a/res/controllers/Midi-Keyboard.midi.xml b/res/controllers/Midi-Keyboard.midi.xml index 8aa205c5929..a757a6d5e54 100644 --- a/res/controllers/Midi-Keyboard.midi.xml +++ b/res/controllers/Midi-Keyboard.midi.xml @@ -8,7 +8,7 @@ - [Master] + [Main] crossfader 0xB0 0x01 diff --git a/res/controllers/MidiTech-MidiControl.midi.xml b/res/controllers/MidiTech-MidiControl.midi.xml index 813b47cee56..c15b2dda39f 100644 --- a/res/controllers/MidiTech-MidiControl.midi.xml +++ b/res/controllers/MidiTech-MidiControl.midi.xml @@ -9,7 +9,7 @@ - [Master] + [Main] crossfader 0xB0 0x10 diff --git a/res/controllers/Midi_for_light-scripts.js b/res/controllers/Midi_for_light-scripts.js index dac7126cec3..8029c070ac7 100644 --- a/res/controllers/Midi_for_light-scripts.js +++ b/res/controllers/Midi_for_light-scripts.js @@ -82,7 +82,7 @@ midi_for_light.init = function(id) { // called when the MIDI device is opened & midi_for_light.vu_meter_timer = [-1, -1]; midi_for_light.volumebeat_on_delay_timer = [-1, -1]; - engine.connectControl("[Master]", "crossfader", "midi_for_light.crossfaderChange"); + engine.connectControl("[Main]", "crossfader", "midi_for_light.crossfaderChange"); if (enable_vu_meter_global === true) midi_for_light.vu_meter_timer = engine.beginTimer(40, "midi_for_light.vuMeter()"); @@ -145,9 +145,9 @@ midi_for_light.vuMeter = function() { // read, calculate and send vu-meter value var vu_out_range = vu_out_max - vu_out_min; // get current value Vu-Meter - var vu_mono_current = engine.getValue("[Master]", "VuMeter"); - var vu_left_current = engine.getValue("[Master]", "VuMeterL"); - var vu_right_current = engine.getValue("[Master]", "VuMeterR"); + var vu_mono_current = engine.getValue("[Main]", "VuMeter"); + var vu_left_current = engine.getValue("[Main]", "VuMeterL"); + var vu_right_current = engine.getValue("[Main]", "VuMeterR"); // arraycounter vu_array_fill_counter++; @@ -439,18 +439,18 @@ midi_for_light.crossfaderChange = function() { // crossfader chenge, check deck // check changing to "deck change by volume" method midi_for_light.volumebeat = false; engine.stopTimer(midi_for_light.volumebeat_on_delay_timer); - if (engine.getValue("[Master]", "crossfader") > -0.25) { // crossfader more than 25% left; - if (engine.getValue("[Master]", "crossfader") < 0.25) { // crossfader more then 25% right; + if (engine.getValue("[Main]", "crossfader") > -0.25) { // crossfader more than 25% left; + if (engine.getValue("[Main]", "crossfader") < 0.25) { // crossfader more then 25% right; midi_for_light.volumebeat_on_delay_timer = engine.beginTimer(3000, "midi_for_light.volumeBeatOnDelay()"); } } // if crossfader in middle position, go out - if (engine.getValue("[Master]", "crossfader") === 0) return; + if (engine.getValue("[Main]", "crossfader") === 0) return; // check what deck is current, crossfader exact 0 is defined as left var deck = 0; - if (engine.getValue("[Master]", "crossfader") > 0) { // crossfader is right, not middle + if (engine.getValue("[Main]", "crossfader") > 0) { // crossfader is right, not middle deck = 1; if (beat_watchdog[1] === true) deck = 3; } else { diff --git a/res/controllers/MixVibes U-Mix Control 2.midi.xml b/res/controllers/MixVibes U-Mix Control 2.midi.xml index 291507b7773..0148bf4199c 100644 --- a/res/controllers/MixVibes U-Mix Control 2.midi.xml +++ b/res/controllers/MixVibes U-Mix Control 2.midi.xml @@ -632,7 +632,7 @@ 0xb2 0x1 - [Master] + [Main] crossfader @@ -642,7 +642,7 @@ 0xb2 0x3 - [Master] + [Main] volume diff --git a/res/controllers/MixVibes U-Mix Control Pro 2.midi.xml b/res/controllers/MixVibes U-Mix Control Pro 2.midi.xml index 5da140ce37a..cd0268eafa2 100644 --- a/res/controllers/MixVibes U-Mix Control Pro 2.midi.xml +++ b/res/controllers/MixVibes U-Mix Control Pro 2.midi.xml @@ -69,7 +69,7 @@ - [Master] + [Main] crossfader 0xB2 0x01 @@ -78,7 +78,7 @@ - [Master] + [Main] volume 0xB2 0x03 @@ -87,7 +87,7 @@ - [Master] + [Main] headMix 0xB2 0x07 @@ -608,7 +608,7 @@ - [Master] + [Main] PeakIndicator 0x92 0x3 diff --git a/res/controllers/Mixman DM2 (Linux).midi.xml b/res/controllers/Mixman DM2 (Linux).midi.xml index 34b05adf006..a6d09dd43a6 100644 --- a/res/controllers/Mixman DM2 (Linux).midi.xml +++ b/res/controllers/Mixman DM2 (Linux).midi.xml @@ -36,7 +36,7 @@ 0xb0 0x2 - [Master] + [Main] crossfader @@ -45,7 +45,7 @@ 0xb0 0x79 - [Master] + [Main] volume diff --git a/res/controllers/Mixman DM2 (OS X).midi.xml b/res/controllers/Mixman DM2 (OS X).midi.xml index c843cd1fd7f..375bcfdb3b6 100644 --- a/res/controllers/Mixman DM2 (OS X).midi.xml +++ b/res/controllers/Mixman DM2 (OS X).midi.xml @@ -14,7 +14,7 @@ 0xe4 - [Master] + [Main] crossfader diff --git a/res/controllers/Mixman DM2 (Windows).midi.xml b/res/controllers/Mixman DM2 (Windows).midi.xml index 39f8082d45c..3add5a46b0f 100644 --- a/res/controllers/Mixman DM2 (Windows).midi.xml +++ b/res/controllers/Mixman DM2 (Windows).midi.xml @@ -9,7 +9,7 @@ - [Master] + [Main] crossfader 0xB0 0x02 diff --git a/res/controllers/Novation-Launchpad MK2-scripts.js b/res/controllers/Novation-Launchpad MK2-scripts.js index f1e089a7944..3c98f16dc4e 100644 --- a/res/controllers/Novation-Launchpad MK2-scripts.js +++ b/res/controllers/Novation-Launchpad MK2-scripts.js @@ -3846,12 +3846,12 @@ var NLMK2 = (function () { }; const masterControlDef = { maximize_library: { - group: '[Master]', + group: '[Main]', name: 'maximize_library', type: 'binary' }, num_samplers: { - group: '[Master]', + group: '[Main]', name: 'num_samplers', type: 'number' } diff --git a/res/controllers/Novation-Launchpad Mini MK3-scripts.js b/res/controllers/Novation-Launchpad Mini MK3-scripts.js index b2df6827873..a2765ac64da 100644 --- a/res/controllers/Novation-Launchpad Mini MK3-scripts.js +++ b/res/controllers/Novation-Launchpad Mini MK3-scripts.js @@ -3846,12 +3846,12 @@ var NLMMK3 = (function () { }; const masterControlDef = { maximize_library: { - group: '[Master]', + group: '[Main]', name: 'maximize_library', type: 'binary' }, num_samplers: { - group: '[Master]', + group: '[Main]', name: 'num_samplers', type: 'number' } diff --git a/res/controllers/Novation-Launchpad-Mini-scripts.js b/res/controllers/Novation-Launchpad-Mini-scripts.js index 640c28f5869..b7d8c613ce1 100644 --- a/res/controllers/Novation-Launchpad-Mini-scripts.js +++ b/res/controllers/Novation-Launchpad-Mini-scripts.js @@ -400,7 +400,7 @@ NLM.init = function() { NLM.page = 0; NLM.shiftstate = false; - NLM.numofdecks = engine.getValue("[Master]", "num_decks"); + NLM.numofdecks = engine.getValue("[Main]", "num_decks"); // For testing NLM.numofdecks = 4; //Init hw diff --git a/res/controllers/Novation-Launchpad-Mini.midi.xml b/res/controllers/Novation-Launchpad-Mini.midi.xml index 24e1fe74a93..4b9e3d2afb3 100644 --- a/res/controllers/Novation-Launchpad-Mini.midi.xml +++ b/res/controllers/Novation-Launchpad-Mini.midi.xml @@ -13,7 +13,7 @@ - [Master] + [Main] NLM.incomingData 0xb0 0x68 @@ -22,7 +22,7 @@ - [Master] + [Main] NLM.incomingData 0xb0 0x69 @@ -31,7 +31,7 @@ - [Master] + [Main] NLM.incomingData 0xb0 0x6A @@ -40,7 +40,7 @@ - [Master] + [Main] NLM.incomingData 0xb0 0x6B @@ -49,7 +49,7 @@ - [Master] + [Main] NLM.incomingData 0xb0 0x6C @@ -58,7 +58,7 @@ - [Master] + [Main] NLM.incomingData 0xb0 0x6D @@ -67,7 +67,7 @@ - [Master] + [Main] NLM.incomingData 0xb0 0x6E @@ -76,7 +76,7 @@ - [Master] + [Main] NLM.incomingData 0xb0 0x6F @@ -85,7 +85,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x8 @@ -94,7 +94,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x18 @@ -103,7 +103,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x28 @@ -112,7 +112,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x38 @@ -121,7 +121,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x48 @@ -130,7 +130,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x58 @@ -139,7 +139,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x68 @@ -148,7 +148,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x78 @@ -157,7 +157,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x0 @@ -166,7 +166,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x1 @@ -175,7 +175,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x2 @@ -184,7 +184,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x3 @@ -193,7 +193,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x4 @@ -202,7 +202,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x5 @@ -211,7 +211,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x6 @@ -220,7 +220,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x7 @@ -229,7 +229,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x10 @@ -238,7 +238,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x11 @@ -247,7 +247,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x12 @@ -256,7 +256,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x13 @@ -265,7 +265,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x14 @@ -274,7 +274,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x15 @@ -283,7 +283,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x16 @@ -292,7 +292,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x17 @@ -301,7 +301,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x20 @@ -310,7 +310,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x21 @@ -319,7 +319,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x22 @@ -328,7 +328,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x23 @@ -337,7 +337,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x24 @@ -346,7 +346,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x25 @@ -355,7 +355,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x26 @@ -364,7 +364,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x27 @@ -373,7 +373,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x30 @@ -382,7 +382,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x31 @@ -391,7 +391,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x32 @@ -400,7 +400,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x33 @@ -409,7 +409,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x34 @@ -418,7 +418,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x35 @@ -427,7 +427,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x36 @@ -436,7 +436,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x37 @@ -445,7 +445,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x40 @@ -454,7 +454,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x41 @@ -463,7 +463,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x42 @@ -472,7 +472,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x43 @@ -481,7 +481,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x44 @@ -490,7 +490,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x45 @@ -499,7 +499,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x46 @@ -508,7 +508,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x47 @@ -517,7 +517,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x50 @@ -526,7 +526,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x51 @@ -535,7 +535,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x52 @@ -544,7 +544,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x53 @@ -553,7 +553,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x54 @@ -562,7 +562,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x55 @@ -571,7 +571,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x56 @@ -580,7 +580,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x57 @@ -589,7 +589,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x60 @@ -598,7 +598,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x61 @@ -607,7 +607,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x62 @@ -616,7 +616,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x63 @@ -625,7 +625,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x64 @@ -634,7 +634,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x65 @@ -643,7 +643,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x66 @@ -652,7 +652,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x67 @@ -661,7 +661,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x70 @@ -670,7 +670,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x71 @@ -679,7 +679,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x72 @@ -688,7 +688,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x73 @@ -697,7 +697,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x74 @@ -706,7 +706,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x75 @@ -715,7 +715,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x76 @@ -724,7 +724,7 @@ - [Master] + [Main] NLM.incomingData 0x90 0x77 diff --git a/res/controllers/Novation-Launchpad-scripts.js b/res/controllers/Novation-Launchpad-scripts.js index 6173e376f1a..93062dac8d5 100644 --- a/res/controllers/Novation-Launchpad-scripts.js +++ b/res/controllers/Novation-Launchpad-scripts.js @@ -3846,12 +3846,12 @@ var NLMK1 = (function () { }; const masterControlDef = { maximize_library: { - group: '[Master]', + group: '[Main]', name: 'maximize_library', type: 'binary' }, num_samplers: { - group: '[Master]', + group: '[Main]', name: 'num_samplers', type: 'number' } diff --git a/res/controllers/Numark DJ2Go.midi.xml b/res/controllers/Numark DJ2Go.midi.xml index 651ad13dfab..59f4e414fbe 100644 --- a/res/controllers/Numark DJ2Go.midi.xml +++ b/res/controllers/Numark DJ2Go.midi.xml @@ -14,7 +14,7 @@ - [Master] + [Main] volume 0xB0 0x17 @@ -23,7 +23,7 @@ - [Master] + [Main] headVolume 0xB0 0x0B @@ -32,7 +32,7 @@ - [Master] + [Main] crossfader 0xB0 0x0A diff --git a/res/controllers/Numark MIXTRACK.midi.xml b/res/controllers/Numark MIXTRACK.midi.xml index e31a3334184..1e7c97f184c 100644 --- a/res/controllers/Numark MIXTRACK.midi.xml +++ b/res/controllers/Numark MIXTRACK.midi.xml @@ -14,7 +14,7 @@ 0xb0 0xc - [Master] + [Main] headMix @@ -23,7 +23,7 @@ 0xb0 0x17 - [Master] + [Main] volume @@ -32,7 +32,7 @@ 0xb0 0xb - [Master] + [Main] headVolume @@ -41,7 +41,7 @@ 0xb0 0x0a - [Master] + [Main] crossfader diff --git a/res/controllers/Numark Mixtrack 2.midi.xml b/res/controllers/Numark Mixtrack 2.midi.xml index 6363a230e78..7790a3785a6 100644 --- a/res/controllers/Numark Mixtrack 2.midi.xml +++ b/res/controllers/Numark Mixtrack 2.midi.xml @@ -237,7 +237,7 @@ - [Master] + [Main] volume 0xB0 0x17 @@ -579,7 +579,7 @@ - [Master] + [Main] headMix 0xB0 0x0C @@ -624,7 +624,7 @@ - [Master] + [Main] headVolume 0xB0 0x0B @@ -669,7 +669,7 @@ - [Master] + [Main] crossfader 0xB0 0x0A diff --git a/res/controllers/Numark Mixtrack Platinum.midi.xml b/res/controllers/Numark Mixtrack Platinum.midi.xml index 9e8d721d8a7..c4a5ea0ab27 100644 --- a/res/controllers/Numark Mixtrack Platinum.midi.xml +++ b/res/controllers/Numark Mixtrack Platinum.midi.xml @@ -1981,7 +1981,7 @@ - [Master] + [Main] headMix 0xBF 0x0D @@ -1990,7 +1990,7 @@ - [Master] + [Main] MixtrackPlatinum.head_gain.input 0xBF 0x0C @@ -1999,7 +1999,7 @@ - [Master] + [Main] volume 0xBF 0x0A @@ -2008,7 +2008,7 @@ - [Master] + [Main] crossfader 0xBF 0x08 diff --git a/res/controllers/Numark Mixtrack Pro FX.midi.xml b/res/controllers/Numark Mixtrack Pro FX.midi.xml index 3cac016a09a..c64c5cc615e 100644 --- a/res/controllers/Numark Mixtrack Pro FX.midi.xml +++ b/res/controllers/Numark Mixtrack Pro FX.midi.xml @@ -16,7 +16,7 @@ - [Master] + [Main] MixtrackProFX.gains.mainGain.input 0xBE 0x23 @@ -27,7 +27,7 @@ - [Master] + [Main] crossfader 0xBF 0x08 @@ -38,7 +38,7 @@ - [Master] + [Main] crossfader 0xB1 0x08 @@ -1968,7 +1968,7 @@ - [Master] + [Main] MixtrackProFX.gains.cueGain.input 0xBE 0x2F @@ -1978,7 +1978,7 @@ - [Master] + [Main] MixtrackProFX.gains.cueMix.input 0xBE 0x27 diff --git a/res/controllers/Numark Mixtrack Pro.midi.xml b/res/controllers/Numark Mixtrack Pro.midi.xml index f2ddff9750e..571857bb544 100644 --- a/res/controllers/Numark Mixtrack Pro.midi.xml +++ b/res/controllers/Numark Mixtrack Pro.midi.xml @@ -19,7 +19,7 @@ Modify by Darío José Freije 06/27/2012--> 0xb0 0xc - [Master] + [Main] headMix @@ -28,7 +28,7 @@ Modify by Darío José Freije 06/27/2012--> 0xb0 0x17 - [Master] + [Main] volume @@ -37,7 +37,7 @@ Modify by Darío José Freije 06/27/2012--> 0xb0 0xb - [Master] + [Main] headVolume @@ -46,7 +46,7 @@ Modify by Darío José Freije 06/27/2012--> 0xb0 0x0a - [Master] + [Main] crossfader diff --git a/res/controllers/Numark N4.midi.xml b/res/controllers/Numark N4.midi.xml index 68d1ba9a4cf..1942f9d7ff6 100644 --- a/res/controllers/Numark N4.midi.xml +++ b/res/controllers/Numark N4.midi.xml @@ -913,7 +913,7 @@ - [Master] + [Main] NumarkN4.Mixer.pflVuMeter 0xB0 0x5C @@ -1264,7 +1264,7 @@ - [Master] + [Main] NumarkN4.Mixer.deckChangeL.input 0xB0 0x50 @@ -1274,7 +1274,7 @@ handles deck assignment led feedback right - [Master] + [Main] NumarkN4.Mixer.deckChangeR.input 0xB0 0x51 @@ -1952,7 +1952,7 @@ - [Master] + [Main] crossfader 0xB0 0x07 @@ -1962,7 +1962,7 @@ - [Master] + [Main] crossfader 0xB0 0x27 diff --git a/res/controllers/Numark NS7.midi.xml b/res/controllers/Numark NS7.midi.xml index 50cc8546782..874d0726622 100644 --- a/res/controllers/Numark NS7.midi.xml +++ b/res/controllers/Numark NS7.midi.xml @@ -401,13 +401,13 @@ - [Master] + [Main] crossfader 0xB0 0x07 - [Master] + [Main] headMix 0xB0 0x12 - [Master] + [Main] headVolume 0xB0 0x42 - [Master] + [Main] volume 0xB0 0x40 @@ -560,7 +560,7 @@ 0.5 - [Master] + [Main] VuMeter 0xB0 0x36 diff --git a/res/controllers/Numark Omni Control.midi.xml b/res/controllers/Numark Omni Control.midi.xml index 3a2006e75dc..1117b98167f 100644 --- a/res/controllers/Numark Omni Control.midi.xml +++ b/res/controllers/Numark Omni Control.midi.xml @@ -413,7 +413,7 @@ 0xb0 0xa - [Master] + [Main] crossfader @@ -463,7 +463,7 @@ 0xb0 0xf - [Master] + [Main] headVolume @@ -533,7 +533,7 @@ 0xb0 0x16 - [Master] + [Main] headMix @@ -543,7 +543,7 @@ 0xb0 0x17 - [Master] + [Main] volume @@ -593,7 +593,7 @@ 0x90 0x31 - [Master] + [Main] NumarkTotalControl.toggleSimpleCue @@ -633,7 +633,7 @@ 0x90 0x35 - [Master] + [Main] NumarkTotalControl.toggleExtendedLooping diff --git a/res/controllers/Numark Total Control.midi.xml b/res/controllers/Numark Total Control.midi.xml index 55e7c3e8c7c..09415ff5798 100644 --- a/res/controllers/Numark Total Control.midi.xml +++ b/res/controllers/Numark Total Control.midi.xml @@ -14,25 +14,25 @@ - [Master] + [Main] headVolume 0xb0 0x0f - [Master] + [Main] headMix 0xb0 0x16 - [Master] + [Main] volume 0xb0 0x17 - [Master] + [Main] crossfader 0xb0 0x0a @@ -184,7 +184,7 @@ - [Master] + [Main] NumarkTotalControl.toggleSimpleCue 0x90 0x31 @@ -453,7 +453,7 @@ - [Master] + [Main] NumarkTotalControl.toggleExtendedLooping 0x90 0x35 diff --git a/res/controllers/Numark iDJ Live II.midi.xml b/res/controllers/Numark iDJ Live II.midi.xml index 11bf6d84b96..05c1f1216b3 100644 --- a/res/controllers/Numark iDJ Live II.midi.xml +++ b/res/controllers/Numark iDJ Live II.midi.xml @@ -13,7 +13,7 @@ - [Master] + [Main] Numark.toggleScratchMode 0x90 0x48 @@ -22,13 +22,13 @@ - [Master] + [Main] gain 0xB0 0x17 - [Master] + [Main] crossfader 0xB0 0x0A @@ -47,7 +47,7 @@ - [Master] + [Main] maximize_library 0x90 0x4F diff --git a/res/controllers/Numark-Mixtrack-3-scripts.js b/res/controllers/Numark-Mixtrack-3-scripts.js index 604f0578112..fe67a488d3a 100644 --- a/res/controllers/Numark-Mixtrack-3-scripts.js +++ b/res/controllers/Numark-Mixtrack-3-scripts.js @@ -117,7 +117,7 @@ var loopsize = [2, 4, 8, 16, 0.125, 0.25, 0.5, 1]; var NumarkMixtrack3 = { - group: "[Master]", + group: "[Main]", decks: [], samplers: [] }; @@ -673,7 +673,7 @@ var AutoCut = function(decknum) { AutoCut.prototype.On = function() { if (!this.enabled) { this.enabled = true; - engine.softTakeover("[Master]", "crossfader", false); + engine.softTakeover("[Main]", "crossfader", false); } }; @@ -689,15 +689,15 @@ AutoCut.prototype.FaderCut = function(jogValue, decknum) { if (decknum === 1) { direction = -direction; } // else direction is of the good sign - engine.setValue("[Master]", "crossfader", direction); + engine.setValue("[Main]", "crossfader", direction); } }; AutoCut.prototype.Off = function() { if (this.enabled) { this.enabled = false; - engine.setValue("[Master]", "crossfader", 0); - engine.softTakeover("[Master]", "crossfader", true); + engine.setValue("[Main]", "crossfader", 0); + engine.softTakeover("[Main]", "crossfader", true); } }; @@ -1091,7 +1091,7 @@ NumarkMixtrack3.BrowseButton = function(channel, control, value, status, group) } else { // Browse push : maximize/minimize library view if (value === ON) { - script.toggleControl("[Master]", "maximize_library"); + script.toggleControl("[Main]", "maximize_library"); } } } diff --git a/res/controllers/Numark-Mixtrack-3.midi.xml b/res/controllers/Numark-Mixtrack-3.midi.xml index c3ffcac8846..5dc7980a28f 100644 --- a/res/controllers/Numark-Mixtrack-3.midi.xml +++ b/res/controllers/Numark-Mixtrack-3.midi.xml @@ -14,7 +14,7 @@ - [Master] + [Main] crossfader Crossfader 0xB0 @@ -44,7 +44,7 @@ - [Master] + [Main] gain Master gain knob 0xB0 @@ -54,7 +54,7 @@ - [Master] + [Main] headMix Cue mix knob 0xB0 @@ -64,7 +64,7 @@ - [Master] + [Main] headGain Cue gain knob 0xB0 diff --git a/res/controllers/Numark-Mixtrack-Platinum-scripts.js b/res/controllers/Numark-Mixtrack-Platinum-scripts.js index e9dcba0ed98..2e55c8038ff 100644 --- a/res/controllers/Numark-Mixtrack-Platinum-scripts.js +++ b/res/controllers/Numark-Mixtrack-Platinum-scripts.js @@ -118,8 +118,8 @@ MixtrackPlatinum.init = function(id, debug) { engine.makeUnbufferedConnection("[Channel2]", "VuMeter", MixtrackPlatinum.vuCallback); engine.makeUnbufferedConnection("[Channel3]", "VuMeter", MixtrackPlatinum.vuCallback); engine.makeUnbufferedConnection("[Channel4]", "VuMeter", MixtrackPlatinum.vuCallback); - engine.makeUnbufferedConnection("[Master]", "VuMeterL", MixtrackPlatinum.vuCallback); - engine.makeUnbufferedConnection("[Master]", "VuMeterR", MixtrackPlatinum.vuCallback); + engine.makeUnbufferedConnection("[Main]", "VuMeterL", MixtrackPlatinum.vuCallback); + engine.makeUnbufferedConnection("[Main]", "VuMeterR", MixtrackPlatinum.vuCallback); }; MixtrackPlatinum.shutdown = function() { @@ -1013,7 +1013,7 @@ MixtrackPlatinum.HeadGain = function(sampler) { }); }; MixtrackPlatinum.HeadGain.prototype = new components.Pot({ - group: '[Master]', + group: '[Main]', inKey: 'headGain', input: function (channel, control, value, status, group) { // we call softTakeoverIgnoreNextValue() here on the non-targeted @@ -1410,13 +1410,13 @@ MixtrackPlatinum.vuCallback = function(value, group, control) { midi.sendShortMsg(0xBF, 0x45, level); } } - else if (group == '[Master]' && control == 'VuMeterL') { + else if (group == '[Main]' && control == 'VuMeterL') { if (engine.getValue(group, "PeakIndicatorL")) { level = 81; } midi.sendShortMsg(0xBF, 0x44, level); } - else if (group == '[Master]' && control == 'VuMeterR') { + else if (group == '[Main]' && control == 'VuMeterR') { if (engine.getValue(group, "PeakIndicatorR")) { level = 81; } diff --git a/res/controllers/Numark-Mixtrack-Pro-FX-scripts.js b/res/controllers/Numark-Mixtrack-Pro-FX-scripts.js index d534acda1a0..9e17e958eea 100644 --- a/res/controllers/Numark-Mixtrack-Pro-FX-scripts.js +++ b/res/controllers/Numark-Mixtrack-Pro-FX-scripts.js @@ -735,17 +735,17 @@ MixtrackProFX.Browse.prototype = new components.ComponentContainer(); MixtrackProFX.Gains = function() { this.mainGain = new components.Pot({ - group: "[Master]", + group: "[Main]", inKey: "gain" }); this.cueGain = new components.Pot({ - group: "[Master]", + group: "[Main]", inKey: "headGain" }); this.cueMix = new components.Pot({ - group: "[Master]", + group: "[Main]", inKey: "headMix" }); }; diff --git a/res/controllers/Numark-N4-scripts.js b/res/controllers/Numark-N4-scripts.js index a086876f202..88d500c68b6 100644 --- a/res/controllers/Numark-N4-scripts.js +++ b/res/controllers/Numark-N4-scripts.js @@ -355,7 +355,7 @@ NumarkN4.MixerTemplate = function() { this.navigationEncoderButton = new components.Button({ shift: function() { this.type=components.Button.prototype.types.toggle; - this.group="[Master]"; + this.group="[Main]"; this.inKey="maximize_library"; }, unshift: function() { diff --git a/res/controllers/Numark-Party-Mix.midi.xml b/res/controllers/Numark-Party-Mix.midi.xml index 081c04bc104..510b9bf2ce8 100644 --- a/res/controllers/Numark-Party-Mix.midi.xml +++ b/res/controllers/Numark-Party-Mix.midi.xml @@ -17,7 +17,7 @@ - [Master] + [Main] gain 0xBF 0x0A @@ -26,7 +26,7 @@ - [Master] + [Main] headMix 0xBF 0x0D @@ -35,7 +35,7 @@ - [Master] + [Main] headGain 0xBF 0x0C @@ -44,7 +44,7 @@ - [Master] + [Main] crossfader 0xBF 0x08 diff --git a/res/controllers/Numark-Party-Mix.scripts.js b/res/controllers/Numark-Party-Mix.scripts.js index c1ece5ffc3b..9f86e4ec742 100644 --- a/res/controllers/Numark-Party-Mix.scripts.js +++ b/res/controllers/Numark-Party-Mix.scripts.js @@ -378,17 +378,17 @@ NumarkPartyMix.Browse.prototype = Object.create(components.ComponentContainer.pr NumarkPartyMix.Gains = function() { this.mainGain = new components.Pot({ - group: "[Master]", + group: "[Main]", inKey: "gain" }); this.cueGain = new components.Pot({ - group: "[Master]", + group: "[Main]", inKey: "headGain" }); this.cueMix = new components.Pot({ - group: "[Master]", + group: "[Main]", inKey: "headMix" }); }; diff --git a/res/controllers/Numark_DJ2GO2_Touch.midi.xml b/res/controllers/Numark_DJ2GO2_Touch.midi.xml index 1b4d5e429f3..f06836bee2a 100644 --- a/res/controllers/Numark_DJ2GO2_Touch.midi.xml +++ b/res/controllers/Numark_DJ2GO2_Touch.midi.xml @@ -891,7 +891,7 @@ - [Master] + [Main] crossfader 0xBF 0x08 @@ -900,7 +900,7 @@ - [Master] + [Main] gain 0xBF 0x0A @@ -909,7 +909,7 @@ - [Master] + [Main] headGain 0xBF 0x0C diff --git a/res/controllers/Pioneer DDJ-200.midi.xml b/res/controllers/Pioneer DDJ-200.midi.xml index 16c86be2068..3c9f0d25dda 100644 --- a/res/controllers/Pioneer DDJ-200.midi.xml +++ b/res/controllers/Pioneer DDJ-200.midi.xml @@ -13,7 +13,7 @@ - [Master] + [Main] crossfader Master crossfader 0xB6 @@ -24,7 +24,7 @@ - [Master] + [Main] crossfader Master crossfader 0xB6 @@ -36,7 +36,7 @@ - [Master] + [Main] DDJ200.headmix Headphones master as headMix knob 0x96 @@ -46,7 +46,7 @@ - [Master] + [Main] DDJ200.toggleFourDeckMode Headphones master + shift 0x96 diff --git a/res/controllers/Pioneer DDJ-SX.midi.xml b/res/controllers/Pioneer DDJ-SX.midi.xml index 6cf030f5b11..fb1836c92cc 100644 --- a/res/controllers/Pioneer DDJ-SX.midi.xml +++ b/res/controllers/Pioneer DDJ-SX.midi.xml @@ -15,7 +15,7 @@ - [Master] + [Main] PioneerDDJSX.crossfaderCurveKnobMSB Crossfader Curve adjust (MSB), Knob: Frontpanel CROSSFADER CURVE 0xB6 @@ -25,7 +25,7 @@ - [Master] + [Main] PioneerDDJSX.crossfaderCurveKnobLSB Crossfader Curve adjust (LSB), Knob: Frontpanel CROSSFADER CURVE 0xB6 @@ -35,7 +35,7 @@ - [Master] + [Main] PioneerDDJSX.crossFaderMSB Crossfader (MSB), Slider: FADE 0xB6 @@ -45,7 +45,7 @@ - [Master] + [Main] PioneerDDJSX.crossFaderLSB Crossfader (LSB), Slider: FADE 0xB6 @@ -55,7 +55,7 @@ - [Master] + [Main] PioneerDDJSX.panelSelectButton Show/hide EffectRack/Sampler, Button: left PANEL SELECT 0x96 @@ -65,7 +65,7 @@ - [Master] + [Main] PioneerDDJSX.shiftPanelSelectButton Enable/show EffectUnit 3 and 4 assignment on FX ASSIGN buttons, Button: left SHIFT + PANEL SELECT 0x96 @@ -75,7 +75,7 @@ - [Master] + [Main] PioneerDDJSX.shiftBackButton Toggle maximized view of Library, Button: SHIFT & BACK 0x96 @@ -85,7 +85,7 @@ - [Master] + [Main] PioneerDDJSX.headphoneSplitCueButton Split headphone cueing (right = master mono and left = pfl mono), Button: SHIFT & MASTER CUE 0x96 diff --git a/res/controllers/Pioneer-DDJ-200-scripts.js b/res/controllers/Pioneer-DDJ-200-scripts.js index e1f03a234a2..cce52f01b45 100644 --- a/res/controllers/Pioneer-DDJ-200-scripts.js +++ b/res/controllers/Pioneer-DDJ-200-scripts.js @@ -179,8 +179,8 @@ DDJ200.seek = function(channel, control, value, status, group) { DDJ200.headmix = function(channel, control, value) { // toggle headMix knob between -1 to 1 if (value) { // do nothing if button is released, i.e. value === 0 - var masterMixEnabled = (engine.getValue("[Master]", "headMix") > 0); - engine.setValue("[Master]", "headMix", masterMixEnabled ? -1 : 1); + var masterMixEnabled = (engine.getValue("[Main]", "headMix") > 0); + engine.setValue("[Main]", "headMix", masterMixEnabled ? -1 : 1); midi.sendShortMsg(0x96, 0x63, masterMixEnabled ? 0 : 0x7F); // set LED } }; diff --git a/res/controllers/Pioneer-DDJ-400-script.js b/res/controllers/Pioneer-DDJ-400-script.js index c23bf12fab6..d5608d67b22 100644 --- a/res/controllers/Pioneer-DDJ-400-script.js +++ b/res/controllers/Pioneer-DDJ-400-script.js @@ -311,7 +311,7 @@ PioneerDDJ400.beatFxChannel = function(_channel, control, value, _status, group) engine.setValue(group, "group_[Channel1]_enable", enableChannel1); engine.setValue(group, "group_[Channel2]_enable", enableChannel2); - engine.setValue(group, "group_[Master]_enable", enableMaster); + engine.setValue(group, "group_[Main]_enable", enableMaster); }; // diff --git a/res/controllers/Pioneer-DDJ-400.midi.xml b/res/controllers/Pioneer-DDJ-400.midi.xml index 018d8dc682d..b2cf83c493d 100644 --- a/res/controllers/Pioneer-DDJ-400.midi.xml +++ b/res/controllers/Pioneer-DDJ-400.midi.xml @@ -623,7 +623,7 @@ CROSSFADER - slider - [Master] + [Main] crossfader 0xB6 0x1F @@ -633,7 +633,7 @@ CROSSFADER - slider - [Master] + [Main] crossfader 0xB6 0x3F @@ -912,7 +912,7 @@ HEADPHONES MIXING - rotate - Monitor Balance - [Master] + [Main] headMix 0xB6 0x2C @@ -922,7 +922,7 @@ HEADPHONES MIXING - rotate - Monitor Balance - [Master] + [Main] headMix 0xB6 0x0C @@ -933,7 +933,7 @@ HEADPHONES LEVEL - rotate - Headphone gain - [Master] + [Main] headGain 0xB6 0x2D @@ -943,7 +943,7 @@ HEADPHONES LEVEL - rotate - Headphone gain - [Master] + [Main] headGain 0xB6 0x0D diff --git a/res/controllers/Pioneer-DDJ-FLX4.midi.xml b/res/controllers/Pioneer-DDJ-FLX4.midi.xml index c022a68c7bd..a7e18fbf100 100644 --- a/res/controllers/Pioneer-DDJ-FLX4.midi.xml +++ b/res/controllers/Pioneer-DDJ-FLX4.midi.xml @@ -623,7 +623,7 @@ CROSSFADER - slider - [Master] + [Main] crossfader 0xB6 0x1F @@ -633,7 +633,7 @@ CROSSFADER - slider - [Master] + [Main] crossfader 0xB6 0x3F @@ -912,7 +912,7 @@ HEADPHONES MIXING - rotate - Monitor Balance - [Master] + [Main] headMix 0xB6 0x2C @@ -922,7 +922,7 @@ HEADPHONES MIXING - rotate - Monitor Balance - [Master] + [Main] headMix 0xB6 0x0C @@ -933,7 +933,7 @@ HEADPHONES LEVEL - rotate - Headphone gain - [Master] + [Main] headGain 0xB6 0x2D @@ -943,7 +943,7 @@ HEADPHONES LEVEL - rotate - Headphone gain - [Master] + [Main] headGain 0xB6 0x0D diff --git a/res/controllers/Pioneer-DDJ-SB.midi.xml b/res/controllers/Pioneer-DDJ-SB.midi.xml index 3d5402a5c42..7b05b4d4c77 100644 --- a/res/controllers/Pioneer-DDJ-SB.midi.xml +++ b/res/controllers/Pioneer-DDJ-SB.midi.xml @@ -273,7 +273,7 @@ - [Master] + [Main] maximize_library 0x96 0x65 @@ -1218,7 +1218,7 @@ - [Master] + [Main] crossfader 0xB6 0x3F @@ -1722,7 +1722,7 @@ - [Master] + [Main] headMix 0xB6 0x25 @@ -1821,7 +1821,7 @@ - [Master] + [Main] crossfader 0xB6 0x1F @@ -1956,7 +1956,7 @@ - [Master] + [Main] headMix 0xB6 0x05 diff --git a/res/controllers/Pioneer-DDJ-SB2-scripts.js b/res/controllers/Pioneer-DDJ-SB2-scripts.js index b75e966fee6..d9e8fedfb26 100644 --- a/res/controllers/Pioneer-DDJ-SB2-scripts.js +++ b/res/controllers/Pioneer-DDJ-SB2-scripts.js @@ -533,8 +533,8 @@ PioneerDDJSB2.bindNonDeckControlConnections = function(isUnbinding) { } if (PioneerDDJSB2.showVumeterMaster) { - engine.connectControl("[Master]", "VuMeterL", "PioneerDDJSB2.VuMeterLeds", isUnbinding); - engine.connectControl("[Master]", "VuMeterR", "PioneerDDJSB2.VuMeterLeds", isUnbinding); + engine.connectControl("[Main]", "VuMeterL", "PioneerDDJSB2.VuMeterLeds", isUnbinding); + engine.connectControl("[Main]", "VuMeterR", "PioneerDDJSB2.VuMeterLeds", isUnbinding); } else { engine.connectControl("[Channel1]", "VuMeter", "PioneerDDJSB2.VuMeterLeds", isUnbinding); engine.connectControl("[Channel2]", "VuMeter", "PioneerDDJSB2.VuMeterLeds", isUnbinding); @@ -941,7 +941,7 @@ PioneerDDJSB2.VuMeterLeds = function(value, group, control) { midi.sendShortMsg(0xB0 + midiChannel, 2, value); } } else { - if (group === "[Master]") { + if (group === "[Main]") { if (control === "VuMeterL") { PioneerDDJSB2.valueVuMeter["[Channel1]_current"] = value; PioneerDDJSB2.valueVuMeter["[Channel3]_current"] = value; diff --git a/res/controllers/Pioneer-DDJ-SB2.midi.xml b/res/controllers/Pioneer-DDJ-SB2.midi.xml index 34f9974fb0b..1980387b7f4 100644 --- a/res/controllers/Pioneer-DDJ-SB2.midi.xml +++ b/res/controllers/Pioneer-DDJ-SB2.midi.xml @@ -977,7 +977,7 @@ - [Master] + [Main] crossfader Crossfader (MSB), Slider: FADE 0xB6 @@ -987,7 +987,7 @@ - [Master] + [Main] crossfader Crossfader (LSB), Slider: FADE 0xB6 @@ -1557,7 +1557,7 @@ - [Master] + [Main] headMix Head mix (MSB), Knob: HEADPHONES MIX 0xB6 @@ -1567,7 +1567,7 @@ - [Master] + [Main] headMix Head mix (MSB), Knob: HEADPHONES MIX 0xB6 diff --git a/res/controllers/Pioneer-DDJ-SB3-scripts.js b/res/controllers/Pioneer-DDJ-SB3-scripts.js index a99be329fbd..1b8c34317ef 100755 --- a/res/controllers/Pioneer-DDJ-SB3-scripts.js +++ b/res/controllers/Pioneer-DDJ-SB3-scripts.js @@ -673,8 +673,8 @@ PioneerDDJSB3.bindNonDeckControlConnections = function(isUnbinding) { } if (PioneerDDJSB3.showVumeterMaster) { - engine.connectControl("[Master]", "VuMeterL", PioneerDDJSB3.VuMeterLeds, isUnbinding); - engine.connectControl("[Master]", "VuMeterR", PioneerDDJSB3.VuMeterLeds, isUnbinding); + engine.connectControl("[Main]", "VuMeterL", PioneerDDJSB3.VuMeterLeds, isUnbinding); + engine.connectControl("[Main]", "VuMeterR", PioneerDDJSB3.VuMeterLeds, isUnbinding); } else { engine.connectControl("[Channel1]", "VuMeter", PioneerDDJSB3.VuMeterLeds, isUnbinding); engine.connectControl("[Channel2]", "VuMeter", PioneerDDJSB3.VuMeterLeds, isUnbinding); @@ -894,16 +894,16 @@ PioneerDDJSB3.headphoneMasterUpdate = function() { if (masterCue) { if (anyDeckCue) { // 50% master 50% cue - engine.setValue("[Master]", "headMix", 0); + engine.setValue("[Main]", "headMix", 0); } else { // 100% master // Check if 1 is all master or all cue - engine.setValue("[Master]", "headMix", 1); + engine.setValue("[Main]", "headMix", 1); } } else { // 0% master // Check if 1 is all master or all cue - engine.setValue("[Master]", "headMix", -1); + engine.setValue("[Main]", "headMix", -1); } }; @@ -1118,7 +1118,7 @@ PioneerDDJSB3.VuMeterLeds = function(value, group, control) { midi.sendShortMsg(0xB0 + midiChannel, 2, value); } } else { - if (group === "[Master]") { + if (group === "[Main]") { if (control === "VuMeterL") { PioneerDDJSB3.valueVuMeter["[Channel1]_current"] = value; PioneerDDJSB3.valueVuMeter["[Channel3]_current"] = value; diff --git a/res/controllers/Pioneer-DDJ-SB3.midi.xml b/res/controllers/Pioneer-DDJ-SB3.midi.xml index ec79699afee..2385243978b 100755 --- a/res/controllers/Pioneer-DDJ-SB3.midi.xml +++ b/res/controllers/Pioneer-DDJ-SB3.midi.xml @@ -1816,7 +1816,7 @@ - [Master] + [Main] PioneerDDJSB3.masterCueButton Toggles headphone master cue, Button: Master 0x96 @@ -1826,7 +1826,7 @@ - [Master] + [Main] PioneerDDJSB3.masterCueButton Toggles headphone master cue, Button: SHIFT + Master 0x96 @@ -2156,7 +2156,7 @@ - [Master] + [Main] crossfader Crossfader (MSB), Slider: FADE 0xB6 @@ -2166,7 +2166,7 @@ - [Master] + [Main] crossfader Crossfader (LSB), Slider: FADE 0xB6 diff --git a/res/controllers/Pioneer-DDJ-SX-scripts.js b/res/controllers/Pioneer-DDJ-SX-scripts.js index 29ffe93d13f..1bc008c0906 100644 --- a/res/controllers/Pioneer-DDJ-SX-scripts.js +++ b/res/controllers/Pioneer-DDJ-SX-scripts.js @@ -392,7 +392,7 @@ PioneerDDJSX.init = function(id) { }; // set 32 Samplers as default: - engine.setValue("[Master]", "num_samplers", 32); + engine.setValue("[Main]", "num_samplers", 32); // activate vu meter timer for Auto DJ: if (PioneerDDJSX.twinkleVumeterAutodjOn) { @@ -547,7 +547,7 @@ PioneerDDJSX.autoDJControl = function() { // Only adjust key when approaching the middle of fading if (PioneerDDJSX.autoDJSyncKey) { - var diffFader = Math.abs(engine.getValue("[Master]", "crossfader") - 0.5); + var diffFader = Math.abs(engine.getValue("[Main]", "crossfader") - 0.5); if (diffFader < 0.25) { nextKey = engine.getValue("[Channel" + next + "]", "key"); engine.setValue("[Channel" + prev + "]", "key", nextKey); @@ -680,9 +680,9 @@ PioneerDDJSX.bindNonDeckControlConnections = function(bind) { } } - engine.connectControl("[Master]", "headSplit", "PioneerDDJSX.shiftMasterCueLed", !bind); + engine.connectControl("[Main]", "headSplit", "PioneerDDJSX.shiftMasterCueLed", !bind); if (bind) { - engine.trigger("[Master]", "headSplit"); + engine.trigger("[Main]", "headSplit"); } engine.connectControl("[AutoDJ]", "enabled", "PioneerDDJSX.autoDJTimer", !bind); @@ -794,7 +794,7 @@ PioneerDDJSX.highResMSB = { '[Channel2]': {}, '[Channel3]': {}, '[Channel4]': {}, - '[Master]': {}, + '[Main]': {}, '[Samplers]': {} }; @@ -2206,7 +2206,7 @@ PioneerDDJSX.backButton = function(channel, control, value, status) { PioneerDDJSX.shiftBackButton = function(channel, control, value, status) { if (value) { - script.toggleControl("[Master]", "maximize_library"); + script.toggleControl("[Main]", "maximize_library"); } }; diff --git a/res/controllers/Reloop Beatmix 2-4.midi.xml b/res/controllers/Reloop Beatmix 2-4.midi.xml index 31c55bfa635..1fe3204d082 100644 --- a/res/controllers/Reloop Beatmix 2-4.midi.xml +++ b/res/controllers/Reloop Beatmix 2-4.midi.xml @@ -2658,7 +2658,7 @@ - [Master] + [Main] crossfader CROSSFADER 0xB5 @@ -2668,7 +2668,7 @@ - [Master] + [Main] volume MASTERVOL 0xB5 @@ -2678,7 +2678,7 @@ - [Master] + [Main] headMix CUE MIX 0xB5 diff --git a/res/controllers/Reloop Beatpad.midi.xml b/res/controllers/Reloop Beatpad.midi.xml index 086f792fb93..ed0f5931304 100644 --- a/res/controllers/Reloop Beatpad.midi.xml +++ b/res/controllers/Reloop Beatpad.midi.xml @@ -1083,7 +1083,7 @@ - [Master] + [Main] crossfader CROSSFADER 0xB4 @@ -1153,7 +1153,7 @@ - [Master] + [Main] headGain CUE_MIX 0xB4 @@ -1943,7 +1943,7 @@ - [Master] + [Main] headGain SHIFT_CUE_MIX 0xB4 @@ -1981,7 +1981,7 @@ - [Master] + [Main] ReloopBeatpad.InboundSysex SYSEX 0xF0 diff --git a/res/controllers/Reloop Digital Jockey 2 Controller Edition.midi.xml b/res/controllers/Reloop Digital Jockey 2 Controller Edition.midi.xml index 7bf5399342a..33b62c4f5e7 100644 --- a/res/controllers/Reloop Digital Jockey 2 Controller Edition.midi.xml +++ b/res/controllers/Reloop Digital Jockey 2 Controller Edition.midi.xml @@ -448,7 +448,7 @@ 0xb0 0xf - [Master] + [Main] volume @@ -457,7 +457,7 @@ 0xb0 0x10 - [Master] + [Main] headVolume @@ -466,7 +466,7 @@ 0xb0 0x11 - [Master] + [Main] headMix @@ -475,7 +475,7 @@ 0xb0 0x12 - [Master] + [Main] crossfader diff --git a/res/controllers/Reloop Jockey 3 ME.midi.xml b/res/controllers/Reloop Jockey 3 ME.midi.xml index 8685839a283..fdcc9056f24 100644 --- a/res/controllers/Reloop Jockey 3 ME.midi.xml +++ b/res/controllers/Reloop Jockey 3 ME.midi.xml @@ -15,7 +15,7 @@ - [Master] + [Main] Jockey3ME.crossfaderCurve 0xB0 0x38 @@ -24,7 +24,7 @@ - [Master] + [Main] Jockey3ME.crossfader 0xB0 0x37 @@ -60,7 +60,7 @@ - [Master] + [Main] headMix 0xB0 0x36 @@ -69,7 +69,7 @@ - [Master] + [Main] balance 0xB0 0x33 @@ -78,7 +78,7 @@ - [Master] + [Main] maximize_library TraxPush to Browse 0x90 diff --git a/res/controllers/Reloop Terminal Mix 2-4.js b/res/controllers/Reloop Terminal Mix 2-4.js index 21cb2a1432d..3d7f2d3c957 100644 --- a/res/controllers/Reloop Terminal Mix 2-4.js +++ b/res/controllers/Reloop Terminal Mix 2-4.js @@ -83,14 +83,14 @@ TerminalMix.init = function (id,debug) { TerminalMix.effectUnit24.init(); // Enable four decks in v1.11.x - engine.setValue("[Master]", "num_decks", 4); + engine.setValue("[Main]", "num_decks", 4); // Set soft-takeover for all Sampler volumes - for (var i=engine.getValue("[Master]","num_samplers"); i>=1; i--) { + for (var i=engine.getValue("[Main]","num_samplers"); i>=1; i--) { engine.softTakeover("[Sampler"+i+"]","pregain",true); } // Set soft-takeover for all applicable Deck controls - for (var i=engine.getValue("[Master]","num_decks"); i>=1; i--) { + for (var i=engine.getValue("[Main]","num_decks"); i>=1; i--) { engine.softTakeover("[Channel"+i+"]","volume",true); engine.softTakeover("[Channel"+i+"]","filterHigh",true); engine.softTakeover("[Channel"+i+"]","filterMid",true); @@ -98,7 +98,7 @@ TerminalMix.init = function (id,debug) { engine.softTakeover("[Channel"+i+"]","rate",true); } - engine.softTakeover("[Master]","crossfader",true); + engine.softTakeover("[Main]","crossfader",true); engine.connectControl("[Channel1]","beat_active","TerminalMix.tapLEDL"); engine.connectControl("[Channel2]","beat_active","TerminalMix.tapLEDR"); @@ -167,7 +167,7 @@ TerminalMix.wheelTurn = function (channel, control, value, status, group) { TerminalMix.samplerVolume = function (channel, control, value) { // Link all sampler volume controls to the Sampler Volume knob - for (var i=engine.getValue("[Master]","num_samplers"); i>=1; i--) { + for (var i=engine.getValue("[Main]","num_samplers"); i>=1; i--) { engine.setValue("[Sampler"+i+"]","pregain", script.absoluteNonLin(value, 0.0, 1.0, 4.0)); } @@ -432,7 +432,7 @@ TerminalMix.channelFader = function (channel, control, value, status, group) { TerminalMix.crossFader = function (channel, control, value, status, group) { var cfValue = script.absoluteNonLin(value,-1,0,1); - engine.setValue("[Master]","crossfader",cfValue); + engine.setValue("[Main]","crossfader",cfValue); // Fader start logic if (TerminalMix.lastFader["crossfader"]==cfValue) return; @@ -441,7 +441,7 @@ TerminalMix.crossFader = function (channel, control, value, status, group) { // If CF is now full left and decks assigned to R are playing, cue them if (cfValue==-1.0) { - for (var i=engine.getValue("[Master]","num_decks"); i>=1; i--) { + for (var i=engine.getValue("[Main]","num_decks"); i>=1; i--) { group = "[Channel"+i+"]"; if (TerminalMix.faderStart[group] && engine.getValue(group,"orientation")==2 @@ -453,7 +453,7 @@ TerminalMix.crossFader = function (channel, control, value, status, group) { if (cfValue==1.0) { // If CF is now full right and decks assigned to L are playing, cue them - for (var i=engine.getValue("[Master]","num_decks"); i>=1; i--) { + for (var i=engine.getValue("[Main]","num_decks"); i>=1; i--) { group = "[Channel"+i+"]"; if (TerminalMix.faderStart[group] && engine.getValue(group,"orientation")==0 @@ -465,7 +465,7 @@ TerminalMix.crossFader = function (channel, control, value, status, group) { // If the CF is moved from full left, start any decks assigned to R if (TerminalMix.lastFader["crossfader"]==-1.0) { - for (var i=engine.getValue("[Master]","num_decks"); i>=1; i--) { + for (var i=engine.getValue("[Main]","num_decks"); i>=1; i--) { group = "[Channel"+i+"]"; if (TerminalMix.faderStart[group] && engine.getValue(group,"orientation")==2) { @@ -476,7 +476,7 @@ TerminalMix.crossFader = function (channel, control, value, status, group) { if (TerminalMix.lastFader["crossfader"]==1.0) { // If the CF is moved from full right, start any decks assigned to L - for (var i=engine.getValue("[Master]","num_decks"); i>=1; i--) { + for (var i=engine.getValue("[Main]","num_decks"); i>=1; i--) { group = "[Channel"+i+"]"; if (TerminalMix.faderStart[group] && engine.getValue(group,"orientation")==0) { diff --git a/res/controllers/Reloop Terminal Mix 2-4.midi.xml b/res/controllers/Reloop Terminal Mix 2-4.midi.xml index 3f49eddf271..fbd76206ca3 100644 --- a/res/controllers/Reloop Terminal Mix 2-4.midi.xml +++ b/res/controllers/Reloop Terminal Mix 2-4.midi.xml @@ -15,7 +15,7 @@ - [Master] + [Main] headMix Master 0xB0 @@ -25,7 +25,7 @@ - [Master] + [Main] TerminalMix.crossFader crossfader 0xB0 @@ -238,7 +238,7 @@ - [Master] + [Main] TerminalMix.crossfaderCurve crossfader 0xB0 diff --git a/res/controllers/Reloop-Beatmix-2-4-scripts.js b/res/controllers/Reloop-Beatmix-2-4-scripts.js index 96ab2e68f0e..49eaa8098a2 100644 --- a/res/controllers/Reloop-Beatmix-2-4-scripts.js +++ b/res/controllers/Reloop-Beatmix-2-4-scripts.js @@ -185,8 +185,8 @@ ReloopBeatmix24.connectControls = function() { } // Effects reset - engine.setValue("[EffectRack1_EffectUnit1]", "group_[Master]_enable", 0); - engine.setValue("[EffectRack1_EffectUnit2]", "group_[Master]_enable", 0); + engine.setValue("[EffectRack1_EffectUnit1]", "group_[Main]_enable", 0); + engine.setValue("[EffectRack1_EffectUnit2]", "group_[Main]_enable", 0); }; ReloopBeatmix24.init = function(id, _debug) { @@ -376,7 +376,7 @@ ReloopBeatmix24.ShiftSamplerPad = function(channel, control, value, status, }; ReloopBeatmix24.SamplerVol = function(channel, control, value, _status, _group) { - for (let i = 1; i <= engine.getValue("[Master]", "num_samplers"); i++) { + for (let i = 1; i <= engine.getValue("[Main]", "num_samplers"); i++) { engine.setValue("[Sampler" + i + "]", "volume", value / 127.0); } }; diff --git a/res/controllers/Reloop-Beatpad-scripts.js b/res/controllers/Reloop-Beatpad-scripts.js index 1073a1af3de..7ca66940043 100644 --- a/res/controllers/Reloop-Beatpad-scripts.js +++ b/res/controllers/Reloop-Beatpad-scripts.js @@ -805,7 +805,7 @@ var AutoCut = function (deckNum) { AutoCut.prototype.On = function() { if (!this.enabled) { this.enabled = true; - engine.softTakeover("[Master]", "crossfader", false); + engine.softTakeover("[Main]", "crossfader", false); } }; @@ -821,15 +821,15 @@ AutoCut.prototype.FaderCut = function(jogValue) { if (this.deckNum == 1) { direction = -direction; } // else direction is of the good sign - engine.setValue('[Master]', 'crossfader', direction); + engine.setValue('[Main]', 'crossfader', direction); } }; AutoCut.prototype.Off = function() { if (this.enabled) { this.enabled = false; - engine.setValue('[Master]', 'crossfader', 0); - engine.softTakeover("[Master]", "crossfader", true); + engine.setValue('[Main]', 'crossfader', 0); + engine.softTakeover("[Main]", "crossfader", true); } }; @@ -1655,18 +1655,18 @@ ReloopBeatpad.init = function(id, debug) { ReloopBeatpad.initobjects(); // Set soft-takeover for all Sampler volumes - for (i = engine.getValue("[Master]", "num_samplers"); i >= 1; i--) { + for (i = engine.getValue("[Main]", "num_samplers"); i >= 1; i--) { engine.softTakeover("[Sampler" + i + "]", "pregain", true); } // Set soft-takeover for all applicable Deck controls - for (i = engine.getValue("[Master]", "num_decks"); i >= 1; i--) { + for (i = engine.getValue("[Main]", "num_decks"); i >= 1; i--) { engine.softTakeover("[Channel" + i + "]", "volume", true); engine.softTakeover("[Channel" + i + "]", "filterHigh", true); engine.softTakeover("[Channel" + i + "]", "filterMid", true); engine.softTakeover("[Channel" + i + "]", "filterLow", true); } - engine.softTakeover("[Master]", "crossfader", true); + engine.softTakeover("[Main]", "crossfader", true); for (i = 1; i <= 4; i++) { engine.softTakeover("[EffectRack1_EffectUnit" + i + "]", "super1", true); diff --git a/res/controllers/Roland_DJ-505-scripts.js b/res/controllers/Roland_DJ-505-scripts.js index 3032b3f7171..1272c28aadf 100644 --- a/res/controllers/Roland_DJ-505-scripts.js +++ b/res/controllers/Roland_DJ-505-scripts.js @@ -163,8 +163,8 @@ DJ505.init = function() { engine.makeConnection("[Channel3]", "track_loaded", DJ505.autoShowDecks); engine.makeConnection("[Channel4]", "track_loaded", DJ505.autoShowDecks); - if (engine.getValue("[Master]", "num_samplers") < 16) { - engine.setValue("[Master]", "num_samplers", 16); + if (engine.getValue("[Main]", "num_samplers") < 16) { + engine.setValue("[Main]", "num_samplers", 16); } // Send Serato SysEx messages to request initial state and unlock pads @@ -189,7 +189,7 @@ DJ505.autoShowDecks = function(_value, _group, _control) { if (!DJ505.autoShowFourDecks) { return; } - engine.setValue("[Master]", "show_4decks", anyLoaded); + engine.setValue("[Main]", "show_4decks", anyLoaded); }; DJ505.shutdown = function() { @@ -298,7 +298,7 @@ DJ505.addPrepareButton = new components.Button({ shiftOffset: -7, sendShifted: true, shiftControl: true, - group: "[Master]", + group: "[Main]", key: "maximize_library", type: components.Button.prototype.types.toggle, }); @@ -332,7 +332,7 @@ DJ505.sortLibrary = function(channel, control, value, _status, _group) { DJ505.crossfader = new components.Pot({ midi: [0xBF, 0x08], - group: "[Master]", + group: "[Main]", inKey: "crossfader", input: function() { // We need a weird max. for the crossfader to make it cut cleanly. @@ -609,7 +609,7 @@ DJ505.Deck = function(deckNumbers, offset) { // indicator for the LED instead. if (value === 3) { if (this.connections[1] === undefined) { - this.connections[1] = engine.makeConnection("[Master]", "indicator_500millis", this.setLed.bind(this)); + this.connections[1] = engine.makeConnection("[Main]", "indicator_500millis", this.setLed.bind(this)); } return; } @@ -1638,7 +1638,7 @@ DJ505.SavedLoopMode = function(deck, offset) { output: function(value, _group, _control) { this.stopBlinking(); if (value === 2) { - this.connections[2] = engine.makeConnection("[Master]", "indicator_250millis", function(value, _group, _control) { + this.connections[2] = engine.makeConnection("[Main]", "indicator_250millis", function(value, _group, _control) { const colorValue = this.colorMapper.getValueForNearestColor( engine.getValue(this.group, this.colorKey)); if (value) { diff --git a/res/controllers/Roland_DJ-505.midi.xml b/res/controllers/Roland_DJ-505.midi.xml index c4eca0a1619..c0ab05d396d 100644 --- a/res/controllers/Roland_DJ-505.midi.xml +++ b/res/controllers/Roland_DJ-505.midi.xml @@ -2869,7 +2869,7 @@ - [Master] + [Main] DJ505.effectUnit[0].enableButtons[1].input FX 1 ON 1 0x98 @@ -2879,7 +2879,7 @@ - [Master] + [Main] DJ505.effectUnit[0].enableButtons[2].input FX 1 ON 2 0x98 @@ -2889,7 +2889,7 @@ - [Master] + [Main] DJ505.effectUnit[0].enableButtons[3].input FX 1 ON 3 0x98 @@ -2899,7 +2899,7 @@ - [Master] + [Main] DJ505.effectUnit[0].effectFocusButton.input FX 1 TAP 0x98 @@ -2909,7 +2909,7 @@ - [Master] + [Main] DJ505.effectUnit[0].enableButtons[1].input FX 1 FX SELECT 1 0x98 @@ -2919,7 +2919,7 @@ - [Master] + [Main] DJ505.effectUnit[0].enableButtons[2].input FX 1 FX SELECT 2 0x98 @@ -2929,7 +2929,7 @@ - [Master] + [Main] DJ505.effectUnit[0].enableButtons[3].input FX 1 FX SELECT 3 0x98 @@ -2939,7 +2939,7 @@ - [Master] + [Main] DJ505.effectUnit[0].effectFocusButton.input FX 1 FX MODE 0x98 @@ -2949,7 +2949,7 @@ - [Master] + [Main] DJ505.effectUnit[0].knobs[1].input FX 1 KNOB 1 0xB8 @@ -2959,7 +2959,7 @@ - [Master] + [Main] DJ505.effectUnit[0].knobs[2].input FX 1 KNOB 2 0xB8 @@ -2969,7 +2969,7 @@ - [Master] + [Main] DJ505.effectUnit[0].knobs[3].input FX 1 KNOB 3 0xB8 @@ -2980,7 +2980,7 @@ - [Master] + [Main] DJ505.effectUnit[0].knobs[1].input FX 1 KNOB 1 (shifted) 0xB8 @@ -2990,7 +2990,7 @@ - [Master] + [Main] DJ505.effectUnit[0].knobs[2].input FX 1 KNOB 2 (shifted) 0xB8 @@ -3000,7 +3000,7 @@ - [Master] + [Main] DJ505.effectUnit[0].knobs[3].input FX 1 KNOB 3 (shifted) 0xB8 @@ -3010,7 +3010,7 @@ - [Master] + [Main] DJ505.effectUnit[0].dryWetKnob.input FX 1 BEATS KNOB 0xB8 @@ -3020,7 +3020,7 @@ - [Master] + [Main] DJ505.effectUnit[0].dryWetKnob.input FX 1 BEATS KNOB PRESS 0x98 @@ -3030,7 +3030,7 @@ - [Master] + [Main] DJ505.effectUnit[0].enableOnChannelButtons.Channel1.input FX 1 CH ASSIGN 1 0x98 @@ -3040,7 +3040,7 @@ - [Master] + [Main] DJ505.effectUnit[0].enableOnChannelButtons.Channel2.input FX 1 CH ASSIGN 2 0x98 @@ -3050,7 +3050,7 @@ - [Master] + [Main] DJ505.effectUnit[0].enableOnChannelButtons.Channel3.input FX 1 CH ASSIGN 3 0x98 @@ -3060,7 +3060,7 @@ - [Master] + [Main] DJ505.effectUnit[0].enableOnChannelButtons.Channel4.input FX 1 CH ASSIGN 4 0x98 @@ -3070,7 +3070,7 @@ - [Master] + [Main] DJ505.effectUnit[0].enableOnTrsButton.input FX 2 CH ASSIGN TR/SAMPLER 0x98 @@ -3082,7 +3082,7 @@ - [Master] + [Main] DJ505.effectUnit[1].enableButtons[1].input FX 2 ON 1 0x99 @@ -3092,7 +3092,7 @@ - [Master] + [Main] DJ505.effectUnit[1].enableButtons[2].input FX 2 ON 2 0x99 @@ -3102,7 +3102,7 @@ - [Master] + [Main] DJ505.effectUnit[1].enableButtons[3].input FX 2 ON 3 0x99 @@ -3112,7 +3112,7 @@ - [Master] + [Main] DJ505.effectUnit[1].effectFocusButton.input FX 2 TAP 0x99 @@ -3122,7 +3122,7 @@ - [Master] + [Main] DJ505.effectUnit[1].enableButtons[1].input FX 2 FX SELECT 1 0x99 @@ -3132,7 +3132,7 @@ - [Master] + [Main] DJ505.effectUnit[1].enableButtons[2].input FX 2 FX SELECT 2 0x99 @@ -3142,7 +3142,7 @@ - [Master] + [Main] DJ505.effectUnit[1].enableButtons[3].input FX 2 FX SELECT 3 0x99 @@ -3152,7 +3152,7 @@ - [Master] + [Main] DJ505.effectUnit[1].effectFocusButton.input FX 2 FX MODE 0x99 @@ -3162,7 +3162,7 @@ - [Master] + [Main] DJ505.effectUnit[1].knobs[1].input FX 2 KNOB 1 0xB9 @@ -3172,7 +3172,7 @@ - [Master] + [Main] DJ505.effectUnit[1].knobs[2].input FX 2 KNOB 2 0xB9 @@ -3182,7 +3182,7 @@ - [Master] + [Main] DJ505.effectUnit[1].knobs[3].input FX 2 KNOB 3 0xB9 @@ -3193,7 +3193,7 @@ - [Master] + [Main] DJ505.effectUnit[1].knobs[1].input FX 2 KNOB 1 (shifted) 0xB9 @@ -3203,7 +3203,7 @@ - [Master] + [Main] DJ505.effectUnit[1].knobs[2].input FX 2 KNOB 2 (shifted) 0xB9 @@ -3213,7 +3213,7 @@ - [Master] + [Main] DJ505.effectUnit[1].knobs[3].input FX 2 KNOB 3 (shifted) 0xB9 @@ -3223,7 +3223,7 @@ - [Master] + [Main] DJ505.effectUnit[1].dryWetKnob.input FX 2 BEATS KNOB 0xB9 @@ -3233,7 +3233,7 @@ - [Master] + [Main] DJ505.effectUnit[1].dryWetKnob.input FX 2 BEATS KNOB PRESS 0x99 @@ -3243,7 +3243,7 @@ - [Master] + [Main] DJ505.effectUnit[1].enableOnChannelButtons.Channel1.input FX 2 CH ASSIGN 1 0x99 @@ -3253,7 +3253,7 @@ - [Master] + [Main] DJ505.effectUnit[1].enableOnChannelButtons.Channel2.input FX 2 CH ASSIGN 2 0x99 @@ -3263,7 +3263,7 @@ - [Master] + [Main] DJ505.effectUnit[1].enableOnChannelButtons.Channel3.input FX 2 CH ASSIGN 3 0x99 @@ -3273,7 +3273,7 @@ - [Master] + [Main] DJ505.effectUnit[1].enableOnChannelButtons.Channel4.input FX 2 CH ASSIGN 4 0x99 @@ -3283,7 +3283,7 @@ - [Master] + [Main] DJ505.effectUnit[1].enableOnTrsButton.input FX 2 CH ASSIGN TR/SAMPLER 0x99 @@ -3295,7 +3295,7 @@ - [Master] + [Main] DJ505.shiftButton SHIFT 0x9F @@ -3435,7 +3435,7 @@ - [Master] + [Main] DJ505.crossfader.inputMSB CROSS FADER (MSB) 0xBF @@ -3445,7 +3445,7 @@ - [Master] + [Main] DJ505.crossfader.inputLSB CROSS FADER (LSB) 0xBF @@ -3456,7 +3456,7 @@ - [Master] + [Main] DJ505.sampler.levelKnob.input TR/SAMPLER LEVEL 0xBF @@ -3494,7 +3494,7 @@ - [Master] + [Main] DJ505.sampler.cueButton.input TR/SAMPLER CUE/PFL 0x9F @@ -3526,7 +3526,7 @@ - [Master] + [Main] DJ505.setChannelInput CH 1 PC/LINE/PHONO 0xB0 @@ -3536,7 +3536,7 @@ - [Master] + [Main] DJ505.setChannelInput CH 2 PC/LINE/PHONO 0xB1 @@ -3547,7 +3547,7 @@ - [Master] + [Main] DJ505.sampler.bpmKnobTurned TR-S VALUE 0xEF @@ -3565,7 +3565,7 @@ - [Master] + [Main] DJ505.sampler.syncButtonPressed TR-S SYNC 0x9F @@ -3575,7 +3575,7 @@ - [Master] + [Main] DJ505.sampler.syncButtonPressed TR-S SYNC OFF 0x9F @@ -3585,7 +3585,7 @@ - [Master] + [Main] DJ505.sampler.startStopButtonPressed TR-S START 0xFA @@ -3594,7 +3594,7 @@ - [Master] + [Main] DJ505.sampler.startStopButtonPressed TR-S STOP 0xFC @@ -3684,7 +3684,7 @@ - [Master] + [Main] crossfader 0xB0 0x01 @@ -23,7 +23,7 @@ - [Master] + [Main] joyMIDI.fsr 0xB0 0x02 @@ -32,7 +32,7 @@ - [Master] + [Main] joyMIDI.joystick 0xB0 0x10 @@ -41,7 +41,7 @@ - [Master] + [Main] joyMIDI.joystick 0xB0 0x11 @@ -50,7 +50,7 @@ - [Master] + [Main] joyMIDI.joystick 0xB0 0x12 @@ -59,7 +59,7 @@ - [Master] + [Main] joyMIDI.joystick 0xB0 0x13 @@ -68,7 +68,7 @@ - [Master] + [Main] joyMIDI.gsensor 0xB0 0x14 @@ -77,7 +77,7 @@ - [Master] + [Main] joyMIDI.gsensor 0xB0 0x15 @@ -86,7 +86,7 @@ - [Master] + [Main] joyMIDI.gsensor 0xB0 0x16 @@ -95,7 +95,7 @@ - [Master] + [Main] joyMIDI.gsensor 0xB0 0x17 diff --git a/res/controllers/Soundless_joyMIDI_scripts.js b/res/controllers/Soundless_joyMIDI_scripts.js index 0b6f47e263c..f4fc29700dc 100644 --- a/res/controllers/Soundless_joyMIDI_scripts.js +++ b/res/controllers/Soundless_joyMIDI_scripts.js @@ -101,7 +101,7 @@ joyMIDI.shutdown = function() { //==== Callback ============================================================== joyMIDI.onBeatIndicator = function(value, group, _control) { - var fader = engine.getParameter("[Master]", "crossfader"); + var fader = engine.getParameter("[Main]", "crossfader"); if (fader < 0.5) { // Left if (group === "[Channel1]") { diff --git a/res/controllers/Stanton SCS.1d.midi.xml b/res/controllers/Stanton SCS.1d.midi.xml index ada5b9cc505..7df9d8478d4 100644 --- a/res/controllers/Stanton SCS.1d.midi.xml +++ b/res/controllers/Stanton SCS.1d.midi.xml @@ -16,7 +16,7 @@ 0xf0 - [Master] + [Main] StantonSCS1d.inboundSysex @@ -27,7 +27,7 @@ 0x90 0x04 - [Master] + [Main] StantonSCS1d.encoderBank @@ -36,7 +36,7 @@ 0x80 0x04 - [Master] + [Main] StantonSCS1d.encoderBank @@ -45,7 +45,7 @@ 0xb0 0x7c - [Master] + [Main] StantonSCS1d.encoder4 @@ -54,7 +54,7 @@ 0x90 0x03 - [Master] + [Main] StantonSCS1d.encoder4 @@ -63,7 +63,7 @@ 0x80 0x03 - [Master] + [Main] StantonSCS1d.encoder4 @@ -72,7 +72,7 @@ 0x90 0x11 - [Master] + [Main] StantonSCS1d.display4button @@ -81,7 +81,7 @@ 0x80 0x11 - [Master] + [Main] StantonSCS1d.display4button @@ -90,7 +90,7 @@ 0xb0 0x7d - [Master] + [Main] StantonSCS1d.encoder3 @@ -99,7 +99,7 @@ 0x90 0x02 - [Master] + [Main] StantonSCS1d.encoder3 @@ -108,7 +108,7 @@ 0x80 0x02 - [Master] + [Main] StantonSCS1d.encoder3 @@ -117,7 +117,7 @@ 0x90 0x10 - [Master] + [Main] StantonSCS1d.display3button @@ -126,7 +126,7 @@ 0x80 0x10 - [Master] + [Main] StantonSCS1d.display3button @@ -135,7 +135,7 @@ 0xb0 0x7e - [Master] + [Main] StantonSCS1d.encoder2 @@ -144,7 +144,7 @@ 0x90 0x1 - [Master] + [Main] StantonSCS1d.encoder2 @@ -153,7 +153,7 @@ 0x80 0x1 - [Master] + [Main] StantonSCS1d.encoder2 @@ -162,7 +162,7 @@ 0x90 0x18 - [Master] + [Main] StantonSCS1d.display2button @@ -171,7 +171,7 @@ 0x80 0x18 - [Master] + [Main] StantonSCS1d.display2button @@ -180,7 +180,7 @@ 0xb0 0x7f - [Master] + [Main] StantonSCS1d.encoder1 @@ -189,7 +189,7 @@ 0x90 0x0 - [Master] + [Main] StantonSCS1d.encoder1 @@ -198,7 +198,7 @@ 0x80 0x0 - [Master] + [Main] StantonSCS1d.encoder1 @@ -207,7 +207,7 @@ 0x90 0x19 - [Master] + [Main] StantonSCS1d.display1button @@ -216,7 +216,7 @@ 0x80 0x19 - [Master] + [Main] StantonSCS1d.display1button @@ -228,7 +228,7 @@ 0x90 0x37 - [Master] + [Main] StantonSCS1d.pfl @@ -237,7 +237,7 @@ 0x80 0x37 - [Master] + [Main] StantonSCS1d.pfl @@ -246,7 +246,7 @@ 0x90 0x29 - [Master] + [Main] StantonSCS1d.playButton @@ -255,7 +255,7 @@ 0x80 0x29 - [Master] + [Main] StantonSCS1d.playButton @@ -264,7 +264,7 @@ 0x90 0x2b - [Master] + [Main] StantonSCS1d.cueButton @@ -273,7 +273,7 @@ 0x80 0x2b - [Master] + [Main] StantonSCS1d.cueButton @@ -282,7 +282,7 @@ 0x90 0x2a - [Master] + [Main] StantonSCS1d.syncButton @@ -291,7 +291,7 @@ 0x80 0x2a - [Master] + [Main] StantonSCS1d.syncButton @@ -300,7 +300,7 @@ 0x90 0x28 - [Master] + [Main] StantonSCS1d.bpmButton @@ -309,7 +309,7 @@ 0x80 0x28 - [Master] + [Main] StantonSCS1d.bpmButton @@ -318,7 +318,7 @@ 0x90 0x2e - [Master] + [Main] StantonSCS1d.ffwd @@ -327,7 +327,7 @@ 0x80 0x2e - [Master] + [Main] StantonSCS1d.ffwd @@ -336,7 +336,7 @@ 0x90 0x2f - [Master] + [Main] StantonSCS1d.rew @@ -345,7 +345,7 @@ 0x80 0x2f - [Master] + [Main] StantonSCS1d.rew @@ -356,7 +356,7 @@ 0xf9 - [Master] + [Main] StantonSCS1d.vinylMoved @@ -368,7 +368,7 @@ 0x90 0x1E - [Master] + [Main] StantonSCS1d.EnterButton @@ -377,7 +377,7 @@ 0x80 0x1E - [Master] + [Main] StantonSCS1d.EnterButton @@ -386,7 +386,7 @@ 0x90 0x40 - [Master] + [Main] StantonSCS1d.DeckChange @@ -395,7 +395,7 @@ 0x80 0x40 - [Master] + [Main] StantonSCS1d.DeckChange @@ -404,7 +404,7 @@ 0x90 0x1A - [Master] + [Main] StantonSCS1d.setupButton @@ -413,7 +413,7 @@ 0x80 0x1A - [Master] + [Main] StantonSCS1d.setupButton @@ -422,7 +422,7 @@ 0x90 0x1B - [Master] + [Main] StantonSCS1d.controlButton @@ -431,7 +431,7 @@ 0x80 0x1B - [Master] + [Main] StantonSCS1d.controlButton @@ -440,7 +440,7 @@ 0x90 0x1C - [Master] + [Main] StantonSCS1d.browseButton @@ -449,7 +449,7 @@ 0x80 0x1C - [Master] + [Main] StantonSCS1d.browseButton @@ -458,7 +458,7 @@ 0x90 0x1D - [Master] + [Main] StantonSCS1d.vinylButton @@ -467,7 +467,7 @@ 0x80 0x1D - [Master] + [Main] StantonSCS1d.vinylButton @@ -479,7 +479,7 @@ 0x90 0x06 - [Master] + [Main] StantonSCS1d.rangeButton @@ -488,7 +488,7 @@ 0x80 0x06 - [Master] + [Main] StantonSCS1d.rangeButton @@ -497,7 +497,7 @@ 0x90 0x07 - [Master] + [Main] StantonSCS1d.pitchReset @@ -506,7 +506,7 @@ 0x80 0x07 - [Master] + [Main] StantonSCS1d.pitchReset @@ -515,7 +515,7 @@ 0xb0 0x00 - [Master] + [Main] StantonSCS1d.pitchSlider @@ -527,7 +527,7 @@ 0x90 0x20 - [Master] + [Main] StantonSCS1d.pad @@ -536,7 +536,7 @@ 0x80 0x20 - [Master] + [Main] StantonSCS1d.pad @@ -545,7 +545,7 @@ 0x90 0x21 - [Master] + [Main] StantonSCS1d.pad @@ -554,7 +554,7 @@ 0x80 0x21 - [Master] + [Main] StantonSCS1d.pad @@ -563,7 +563,7 @@ 0x90 0x22 - [Master] + [Main] StantonSCS1d.pad @@ -572,7 +572,7 @@ 0x80 0x22 - [Master] + [Main] StantonSCS1d.pad @@ -581,7 +581,7 @@ 0x90 0x23 - [Master] + [Main] StantonSCS1d.pad @@ -590,7 +590,7 @@ 0x80 0x23 - [Master] + [Main] StantonSCS1d.pad @@ -599,7 +599,7 @@ 0x90 0x30 - [Master] + [Main] StantonSCS1d.padTop1 @@ -608,7 +608,7 @@ 0x80 0x30 - [Master] + [Main] StantonSCS1d.padTop1 @@ -617,7 +617,7 @@ 0x90 0x31 - [Master] + [Main] StantonSCS1d.padTop2 @@ -626,7 +626,7 @@ 0x80 0x31 - [Master] + [Main] StantonSCS1d.padTop2 @@ -635,7 +635,7 @@ 0x90 0x32 - [Master] + [Main] StantonSCS1d.padTop3 @@ -644,7 +644,7 @@ 0x80 0x32 - [Master] + [Main] StantonSCS1d.padTop3 @@ -653,7 +653,7 @@ 0x90 0x33 - [Master] + [Main] StantonSCS1d.padTop4 @@ -662,7 +662,7 @@ 0x80 0x33 - [Master] + [Main] StantonSCS1d.padTop4 @@ -671,7 +671,7 @@ 0x90 0x34 - [Master] + [Main] StantonSCS1d.velocityButton @@ -680,7 +680,7 @@ 0x80 0x34 - [Master] + [Main] StantonSCS1d.velocityButton @@ -689,7 +689,7 @@ 0x90 0x35 - [Master] + [Main] StantonSCS1d.padBankButton @@ -698,7 +698,7 @@ 0x80 0x35 - [Master] + [Main] StantonSCS1d.padBankButton @@ -707,7 +707,7 @@ 0x90 0x36 - [Master] + [Main] StantonSCS1d.padBankButton @@ -716,7 +716,7 @@ 0x80 0x36 - [Master] + [Main] StantonSCS1d.padBankButton @@ -728,7 +728,7 @@ 0x90 0x16 - [Master] + [Main] StantonSCS1d.triggerBankSelect @@ -737,7 +737,7 @@ 0x80 0x16 - [Master] + [Main] StantonSCS1d.triggerBankSelect @@ -746,7 +746,7 @@ 0x90 0x17 - [Master] + [Main] StantonSCS1d.triggerBankSelect @@ -755,7 +755,7 @@ 0x80 0x17 - [Master] + [Main] StantonSCS1d.triggerBankSelect @@ -764,7 +764,7 @@ 0x90 0x5 - [Master] + [Main] StantonSCS1d.triggerBankSelect @@ -773,7 +773,7 @@ 0x80 0x5 - [Master] + [Main] StantonSCS1d.triggerBankSelect @@ -785,7 +785,7 @@ 0x90 8 - [Master] + [Main] StantonSCS1d.triggerButton @@ -794,7 +794,7 @@ 0x80 8 - [Master] + [Main] StantonSCS1d.triggerButton @@ -803,7 +803,7 @@ 0x90 9 - [Master] + [Main] StantonSCS1d.triggerButton @@ -812,7 +812,7 @@ 0x80 9 - [Master] + [Main] StantonSCS1d.triggerButton @@ -821,7 +821,7 @@ 0x90 10 - [Master] + [Main] StantonSCS1d.triggerButton @@ -830,7 +830,7 @@ 0x80 10 - [Master] + [Main] StantonSCS1d.triggerButton @@ -839,7 +839,7 @@ 0x90 11 - [Master] + [Main] StantonSCS1d.triggerButton @@ -848,7 +848,7 @@ 0x80 11 - [Master] + [Main] StantonSCS1d.triggerButton @@ -857,7 +857,7 @@ 0x90 12 - [Master] + [Main] StantonSCS1d.triggerButton @@ -866,7 +866,7 @@ 0x80 12 - [Master] + [Main] StantonSCS1d.triggerButton @@ -875,7 +875,7 @@ 0x90 13 - [Master] + [Main] StantonSCS1d.triggerButton @@ -884,7 +884,7 @@ 0x80 13 - [Master] + [Main] StantonSCS1d.triggerButton @@ -893,7 +893,7 @@ 0x90 14 - [Master] + [Main] StantonSCS1d.triggerButton @@ -902,7 +902,7 @@ 0x80 14 - [Master] + [Main] StantonSCS1d.triggerButton @@ -911,7 +911,7 @@ 0x90 15 - [Master] + [Main] StantonSCS1d.triggerButton @@ -920,7 +920,7 @@ 0x80 15 - [Master] + [Main] StantonSCS1d.triggerButton @@ -929,7 +929,7 @@ 0x90 18 - [Master] + [Main] StantonSCS1d.triggerButton @@ -938,7 +938,7 @@ 0x80 18 - [Master] + [Main] StantonSCS1d.triggerButton @@ -947,7 +947,7 @@ 0x90 19 - [Master] + [Main] StantonSCS1d.triggerButton @@ -956,7 +956,7 @@ 0x80 19 - [Master] + [Main] StantonSCS1d.triggerButton @@ -965,7 +965,7 @@ 0x90 20 - [Master] + [Main] StantonSCS1d.triggerButton @@ -974,7 +974,7 @@ 0x80 20 - [Master] + [Main] StantonSCS1d.triggerButton @@ -983,7 +983,7 @@ 0x90 21 - [Master] + [Main] StantonSCS1d.triggerButton @@ -992,7 +992,7 @@ 0x80 21 - [Master] + [Main] StantonSCS1d.triggerButton diff --git a/res/controllers/Stanton SCS.1m.midi.xml b/res/controllers/Stanton SCS.1m.midi.xml index 96cffe9030e..db47de0bc88 100644 --- a/res/controllers/Stanton SCS.1m.midi.xml +++ b/res/controllers/Stanton SCS.1m.midi.xml @@ -159,7 +159,7 @@ 0xB0 0x00 - [Master] + [Main] crossfader @@ -333,19 +333,19 @@ 0xB0 0x1d - [Master] + [Main] headVolume 0xB0 0x1e - [Master] + [Main] headMix 0xB0 0x1f - [Master] + [Main] volume @@ -483,13 +483,13 @@ 0xB0 0x15 - [Master] + [Main] balance 0xB0 0x70 - [Master] + [Main] StantonSCS1m.selectKnob @@ -534,7 +534,7 @@ 0x90 0x27 - [Master] + [Main] StantonSCS1m.pressSelectKnob @@ -543,7 +543,7 @@ 0x80 0x27 - [Master] + [Main] StantonSCS1m.pressSelectKnob @@ -576,7 +576,7 @@ 0x90 0x20 - [Master] + [Main] StantonSCS1m.browseButton @@ -585,7 +585,7 @@ 0x80 0x20 - [Master] + [Main] StantonSCS1m.browseButton @@ -594,7 +594,7 @@ 0x90 0x1E - [Master] + [Main] StantonSCS1m.controlButton @@ -603,7 +603,7 @@ 0x80 0x1E - [Master] + [Main] StantonSCS1m.controlButton @@ -612,7 +612,7 @@ 0x90 0x1C - [Master] + [Main] StantonSCS1m.setupButton @@ -621,7 +621,7 @@ 0x80 0x1C - [Master] + [Main] StantonSCS1m.setupButton @@ -630,7 +630,7 @@ 0xB0 0x7F - [Master] + [Main] StantonSCS1m.pitchRangeKnob1 @@ -639,7 +639,7 @@ 0xB0 0x7C - [Master] + [Main] StantonSCS1m.pitchRangeKnob2 @@ -648,7 +648,7 @@ 0x90 0x08 - [Master] + [Main] StantonSCS1m.faderStartToggle @@ -657,7 +657,7 @@ 0x90 0x22 - [Master] + [Main] StantonSCS1m.hotCueDeckChange @@ -666,14 +666,14 @@ 0x80 0x22 - [Master] + [Main] StantonSCS1m.hotCueDeckChange - [Master] + [Main] StantonSCS1m.presetButton 0x90 0x23 @@ -682,7 +682,7 @@ - [Master] + [Main] StantonSCS1m.presetButton 0x80 0x23 @@ -691,7 +691,7 @@ - [Master] + [Main] StantonSCS1m.presetButton 0x90 0x24 @@ -700,7 +700,7 @@ - [Master] + [Main] StantonSCS1m.presetButton 0x80 0x24 @@ -709,7 +709,7 @@ - [Master] + [Main] StantonSCS1m.presetButton 0x90 0x25 @@ -718,7 +718,7 @@ - [Master] + [Main] StantonSCS1m.presetButton 0x80 0x25 @@ -727,7 +727,7 @@ - [Master] + [Main] StantonSCS1m.presetButton 0x90 0x26 @@ -736,7 +736,7 @@ - [Master] + [Main] StantonSCS1m.presetButton 0x80 0x26 diff --git a/res/controllers/Stanton SCS.3d.midi.xml b/res/controllers/Stanton SCS.3d.midi.xml index f27a06c4f7f..a267d2b9320 100644 --- a/res/controllers/Stanton SCS.3d.midi.xml +++ b/res/controllers/Stanton SCS.3d.midi.xml @@ -15,7 +15,7 @@ Device status inquiry response 0xf0 - [Master] + [Main] StantonSCS3d.statusResponse @@ -23,7 +23,7 @@ Gain slider - [Master] + [Main] StantonSCS3d.gain 0xB0 7 @@ -33,7 +33,7 @@ Gain slider relative mode - [Master] + [Main] StantonSCS3d.gainRelative 0xB0 8 @@ -43,7 +43,7 @@ Pitch slider - [Master] + [Main] StantonSCS3d.pitch 0xB0 4 @@ -53,7 +53,7 @@ Pitch absolute - [Master] + [Main] StantonSCS3d.pitchAbsolute 0xB0 3 @@ -63,7 +63,7 @@ Pitch touch - [Master] + [Main] StantonSCS3d.pitchTouch 0x90 3 @@ -73,7 +73,7 @@ Pitch touch - [Master] + [Main] StantonSCS3d.pitchTouch 0x80 3 @@ -85,7 +85,7 @@ FX - [Master] + [Main] StantonSCS3d.FX 0x90 0x20 @@ -97,7 +97,7 @@ FX - [Master] + [Main] StantonSCS3d.FX 0x80 0x20 @@ -108,7 +108,7 @@ EQ - [Master] + [Main] StantonSCS3d.EQ 0x90 0x26 @@ -118,7 +118,7 @@ EQ - [Master] + [Main] StantonSCS3d.EQ 0x80 0x26 @@ -128,7 +128,7 @@ Loop - [Master] + [Main] StantonSCS3d.Loop 0x90 0x22 @@ -138,7 +138,7 @@ Loop - [Master] + [Main] StantonSCS3d.Loop 0x80 0x22 @@ -148,7 +148,7 @@ Trig - [Master] + [Main] StantonSCS3d.Trig 0x90 0x28 @@ -158,7 +158,7 @@ Trig - [Master] + [Main] StantonSCS3d.Trig 0x80 0x28 @@ -170,7 +170,7 @@ Vinyl - [Master] + [Main] StantonSCS3d.Vinyl 0x90 0x24 @@ -182,7 +182,7 @@ Vinyl - [Master] + [Main] StantonSCS3d.Vinyl 0x80 0x24 @@ -192,7 +192,7 @@ Deck - [Master] + [Main] StantonSCS3d.DeckButton 0x90 0x2A @@ -202,7 +202,7 @@ Deck - [Master] + [Main] StantonSCS3d.DeckButton 0x80 0x2A @@ -212,7 +212,7 @@ B11 headphone cue - [Master] + [Main] StantonSCS3d.B11 0x90 0x2C @@ -222,7 +222,7 @@ B11 headphone cue - [Master] + [Main] StantonSCS3d.B11 0x80 0x2C @@ -234,7 +234,7 @@ B12 - [Master] + [Main] StantonSCS3d.B12 0x90 0x2E @@ -246,7 +246,7 @@ B12 - [Master] + [Main] StantonSCS3d.B12 0x80 0x2E @@ -255,7 +255,7 @@ - [Master] + [Main] StantonSCS3d.B13 0x90 0x30 @@ -265,7 +265,7 @@ - [Master] + [Main] StantonSCS3d.B13 0x80 0x30 @@ -275,7 +275,7 @@ - [Master] + [Main] StantonSCS3d.B14 0x90 0x32 @@ -285,7 +285,7 @@ - [Master] + [Main] StantonSCS3d.B14 0x80 0x32 @@ -295,7 +295,7 @@ - [Master] + [Main] StantonSCS3d.C1relative 0xB0 0x63 @@ -305,7 +305,7 @@ - [Master] + [Main] StantonSCS3d.C1absolute 0xB0 0x62 @@ -315,7 +315,7 @@ - [Master] + [Main] StantonSCS3d.C1touch 0x90 0x62 @@ -324,7 +324,7 @@ - [Master] + [Main] StantonSCS3d.C1touch 0x80 0x62 @@ -333,7 +333,7 @@ - [Master] + [Main] StantonSCS3d.S3absolute 0xB0 0x0C @@ -342,7 +342,7 @@ - [Master] + [Main] StantonSCS3d.S3touch 0x90 0x0C @@ -351,7 +351,7 @@ - [Master] + [Main] StantonSCS3d.S3touch 0x80 0x0C @@ -360,7 +360,7 @@ - [Master] + [Main] StantonSCS3d.S4relative 0xB0 2 @@ -369,7 +369,7 @@ - [Master] + [Main] StantonSCS3d.S4absolute 0xB0 1 @@ -378,7 +378,7 @@ - [Master] + [Main] StantonSCS3d.S4touch 0x90 1 @@ -388,7 +388,7 @@ - [Master] + [Main] StantonSCS3d.S4touch 0x80 1 @@ -398,7 +398,7 @@ - [Master] + [Main] StantonSCS3d.S5absolute 0xB0 0x0E @@ -407,7 +407,7 @@ - [Master] + [Main] StantonSCS3d.S5relative 0xB0 0x0F @@ -416,7 +416,7 @@ - [Master] + [Main] StantonSCS3d.S5touch 0x90 0x0E @@ -425,7 +425,7 @@ - [Master] + [Main] StantonSCS3d.S5touch 0x80 0x0E @@ -434,7 +434,7 @@ - [Master] + [Main] StantonSCS3d.playButton 0x90 0x6D @@ -444,7 +444,7 @@ - [Master] + [Main] StantonSCS3d.playButton 0x80 0x6D @@ -454,7 +454,7 @@ - [Master] + [Main] StantonSCS3d.cueButton 0x90 0x6E @@ -464,7 +464,7 @@ - [Master] + [Main] StantonSCS3d.cueButton 0x80 0x6E @@ -474,7 +474,7 @@ - [Master] + [Main] StantonSCS3d.syncButton 0x90 0x6F @@ -484,7 +484,7 @@ - [Master] + [Main] StantonSCS3d.syncButton 0x80 0x6F @@ -494,7 +494,7 @@ - [Master] + [Main] StantonSCS3d.tapButton 0x90 0x70 @@ -504,7 +504,7 @@ - [Master] + [Main] StantonSCS3d.tapButton 0x80 0x70 @@ -514,7 +514,7 @@ - [Master] + [Main] StantonSCS3d.SurfaceButton 0x90 0x48 @@ -523,7 +523,7 @@ - [Master] + [Main] StantonSCS3d.SurfaceButton 0x80 0x48 @@ -532,7 +532,7 @@ - [Master] + [Main] StantonSCS3d.SurfaceButton 0x90 0x4A @@ -541,7 +541,7 @@ - [Master] + [Main] StantonSCS3d.SurfaceButton 0x80 0x4A @@ -550,7 +550,7 @@ - [Master] + [Main] StantonSCS3d.SurfaceButton 0x90 0x4C @@ -559,7 +559,7 @@ - [Master] + [Main] StantonSCS3d.SurfaceButton 0x80 0x4C @@ -568,7 +568,7 @@ - [Master] + [Main] StantonSCS3d.SurfaceButton 0x90 0x4E @@ -577,7 +577,7 @@ - [Master] + [Main] StantonSCS3d.SurfaceButton 0x80 0x4E @@ -586,7 +586,7 @@ - [Master] + [Main] StantonSCS3d.SurfaceButton 0x90 0x4F @@ -595,7 +595,7 @@ - [Master] + [Main] StantonSCS3d.SurfaceButton 0x80 0x4F @@ -604,7 +604,7 @@ - [Master] + [Main] StantonSCS3d.SurfaceButton 0x90 0x51 @@ -613,7 +613,7 @@ - [Master] + [Main] StantonSCS3d.SurfaceButton 0x80 0x51 @@ -622,7 +622,7 @@ - [Master] + [Main] StantonSCS3d.SurfaceButton 0x90 0x53 @@ -631,7 +631,7 @@ - [Master] + [Main] StantonSCS3d.SurfaceButton 0x80 0x53 @@ -640,7 +640,7 @@ - [Master] + [Main] StantonSCS3d.SurfaceButton 0x90 0x55 @@ -649,7 +649,7 @@ - [Master] + [Main] StantonSCS3d.SurfaceButton 0x80 0x55 diff --git a/res/controllers/Stanton-DJC-4-scripts.js b/res/controllers/Stanton-DJC-4-scripts.js index c0c2ebc70cb..0a58b3bdba6 100644 --- a/res/controllers/Stanton-DJC-4-scripts.js +++ b/res/controllers/Stanton-DJC-4-scripts.js @@ -86,8 +86,8 @@ DJC4.init = function() { engine.makeConnection("[Channel3]", "track_loaded", DJC4.autoShowDecks); engine.makeConnection("[Channel4]", "track_loaded", DJC4.autoShowDecks); - if (engine.getValue("[Master]", "num_samplers") < 8) { - engine.setValue("[Master]", "num_samplers", 8); + if (engine.getValue("[Main]", "num_samplers") < 8) { + engine.setValue("[Main]", "num_samplers", 8); } DJC4.browseEncoder = new components.Encoder({ @@ -141,7 +141,7 @@ DJC4.init = function() { if (DJC4.showMasterVu === true) { DJC4.vuMeter = new components.Component({ midi: [0xB0, 0x03], - group: "[Master]", + group: "[Main]", outKey: "VuMeterL", output: function(value, group) { // The red LEDs light up with MIDI values greater than 0x60. @@ -157,7 +157,7 @@ DJC4.init = function() { DJC4.vuMeter = new components.Component({ midi: [0xB0, 0x04], - group: "[Master]", + group: "[Main]", outKey: "VuMeterR", output: function(value, group) { // The red LEDs light up with MIDI values greater than 0x60. @@ -331,7 +331,7 @@ DJC4.autoShowDecks = function() { if (!DJC4.autoShowFourDecks) { return; } - engine.setValue("[Master]", "show_4decks", anyLoaded); + engine.setValue("[Main]", "show_4decks", anyLoaded); }; DJC4.shiftButton = function(channel, control, value) { diff --git a/res/controllers/Stanton-DJC-4.midi.xml b/res/controllers/Stanton-DJC-4.midi.xml index 7e8ea3a6f0d..6992ebc54e9 100644 --- a/res/controllers/Stanton-DJC-4.midi.xml +++ b/res/controllers/Stanton-DJC-4.midi.xml @@ -968,7 +968,7 @@ - [Master] + [Main] crossfader 0xB0 0x10 @@ -977,7 +977,7 @@ - [Master] + [Main] DJC4.crossfaderCurve 0xB0 0x12 @@ -1058,7 +1058,7 @@ - [Master] + [Main] headMix 0xB0 0x13 @@ -1103,7 +1103,7 @@ - [Master] + [Main] headGain 0xB0 0x14 @@ -1778,7 +1778,7 @@ - [Master] + [Main] DJC4.shiftButton 0x90 0x2D @@ -2615,7 +2615,7 @@ - [Master] + [Main] maximize_library 0x90 0x59 diff --git a/res/controllers/Stanton-SCS1d-scripts.js b/res/controllers/Stanton-SCS1d-scripts.js index 7b9a3c81a0c..72388229124 100644 --- a/res/controllers/Stanton-SCS1d-scripts.js +++ b/res/controllers/Stanton-SCS1d-scripts.js @@ -120,10 +120,10 @@ StantonSCS1d.knobSignals = [ [ ["CurrentChannel", "filterLow", "StantonSCS1d.en ["[Flanger]", "lfoPeriod", "StantonSCS1d.FXPeriodLEDs"], ["CurrentChannel", "pregain", "StantonSCS1d.encoder4EQLEDs"] ], - [ ["[Master]", "headMix", "StantonSCS1d.encoder1BalanceLEDs"], - ["[Master]", "headVolume", "StantonSCS1d.encoder2MVolumeLEDs"], - ["[Master]", "balance", "StantonSCS1d.encoder3BalanceLEDs"], - ["[Master]", "volume", "StantonSCS1d.encoder4MVolumeLEDs"] + [ ["[Main]", "headMix", "StantonSCS1d.encoder1BalanceLEDs"], + ["[Main]", "headVolume", "StantonSCS1d.encoder2MVolumeLEDs"], + ["[Main]", "balance", "StantonSCS1d.encoder3BalanceLEDs"], + ["[Main]", "volume", "StantonSCS1d.encoder4MVolumeLEDs"] ] ]; StantonSCS1d.padSignals = [ [], // Bank 0 (non-existent) @@ -201,7 +201,7 @@ StantonSCS1d.init2 = function () { // Force change to first deck, initializing the LEDs and connecting signals in the process StantonSCS1d.state["Oldknob"]=1; // Set active deck to last available so the below will switch to #1. - StantonSCS1d.deck = engine.getValue("[Master]","num_decks"); + StantonSCS1d.deck = engine.getValue("[Main]","num_decks"); // Set the default platter mode for this last deck if (!StantonSCS1d.platterMode["[Channel"+StantonSCS1d.deck+"]"]) StantonSCS1d.platterMode["[Channel"+StantonSCS1d.deck+"]"] = StantonSCS1d.platterMode["default"]; @@ -630,7 +630,7 @@ StantonSCS1d.rangeButton = function (channel, control, value, status) { if (StantonSCS1d.crossFader) { // Move to cross-fader position StantonSCS1d.pitchRangeLEDs(0); // darken range LEDs - var xfader = engine.getValue("[Master]","crossfader")*63+64; + var xfader = engine.getValue("[Main]","crossfader")*63+64; if (StantonSCS1d.debug) print ("Moving slider to "+xfader+" for cross-fader"); midi.sendShortMsg(0xB0+StantonSCS1d.channel,0x00,xfader); StantonSCS1d.state["crossfaderAdjusted"]=false; @@ -670,7 +670,7 @@ StantonSCS1d.pitchReset = function (channel, control, value, status) { else { midi.sendShortMsg(0x80+StantonSCS1d.channel,control,0); // Darken button LED if (StantonSCS1d.modifier["pitchRange"]==1) { - engine.setValue("[Master]","crossfader",0); + engine.setValue("[Main]","crossfader",0); StantonSCS1d.state["crossfaderAdjusted"]=true; } else engine.setValue("[Channel"+StantonSCS1d.deck+"]","rate",0); @@ -791,7 +791,7 @@ StantonSCS1d.DeckChange = function (channel, control, value, status) { StantonSCS1d.newPlatterMode = StantonSCS1d.platterMode["[Channel"+StantonSCS1d.deck+"]"]; // Supports n-decks - if (StantonSCS1d.deck == engine.getValue("[Master]","num_decks")) StantonSCS1d.deck=1; + if (StantonSCS1d.deck == engine.getValue("[Main]","num_decks")) StantonSCS1d.deck=1; else StantonSCS1d.deck++; if (StantonSCS1d.debug) print("StantonSCS1d: Switching to deck "+StantonSCS1d.deck); @@ -1288,7 +1288,7 @@ StantonSCS1d.pitchSlider = function (channel, control, value) { if (newValue>1) newValue=1.0; StantonSCS1d.state["dontMove"]=new Date(); if (StantonSCS1d.crossFader && StantonSCS1d.modifier["pitchRange"]==1) { - engine.setValue("[Master]","crossfader",newValue); + engine.setValue("[Main]","crossfader",newValue); StantonSCS1d.state["crossfaderAdjusted"]=true; } else engine.setValue("[Channel"+StantonSCS1d.deck+"]","rate",newValue); @@ -1432,8 +1432,8 @@ StantonSCS1d.EnterButton = function (channel, control, value, status) { if ((status & 0xF0) == 0x90) { // If button down // If the deck is playing and the cross-fader is not completely toward the other deck... if (engine.getValue("[Channel"+StantonSCS1d.deck+"]","play")==1 && - ((StantonSCS1d.deck==1 && engine.getValue("[Master]","crossfader")<1.0) || - (StantonSCS1d.deck==2 && engine.getValue("[Master]","crossfader")>-1.0))) { + ((StantonSCS1d.deck==1 && engine.getValue("[Main]","crossfader")<1.0) || + (StantonSCS1d.deck==2 && engine.getValue("[Main]","crossfader")>-1.0))) { // ...light the button red to show acknowledgement of the press but don't load StantonSCS1d.buttonLED(value,control,64,0); print ("StantonSCS1d: Not loading into deck "+StantonSCS1d.deck+" because it's playing to the Master output."); diff --git a/res/controllers/Stanton-SCS1m-scripts.js b/res/controllers/Stanton-SCS1m-scripts.js index e3aa8aaead7..ea8448a12ee 100644 --- a/res/controllers/Stanton-SCS1m-scripts.js +++ b/res/controllers/Stanton-SCS1m-scripts.js @@ -74,13 +74,13 @@ StantonSCS1m.init = function (id) { // called when the MIDI device is opened // Connect signals // Vu Meters - engine.connectControl("[Master]","VuMeterL","StantonSCS1m.MasterLVu"); - engine.connectControl("[Master]","VuMeterR","StantonSCS1m.MasterRVu"); + engine.connectControl("[Main]","VuMeterL","StantonSCS1m.MasterLVu"); + engine.connectControl("[Main]","VuMeterR","StantonSCS1m.MasterRVu"); engine.connectControl("[Channel1]","VuMeter","StantonSCS1m.Channel1Vu"); engine.connectControl("[Channel2]","VuMeter","StantonSCS1m.Channel2Vu"); // Clipping LED - engine.connectControl("[Master]","PeakIndicator","StantonSCS1m.MasterClip"); + engine.connectControl("[Main]","PeakIndicator","StantonSCS1m.MasterClip"); engine.connectControl("[Channel1]","PeakIndicator","StantonSCS1m.Channel1Clip"); engine.connectControl("[Channel2]","PeakIndicator","StantonSCS1m.Channel2Clip"); @@ -99,7 +99,7 @@ StantonSCS1m.init = function (id) { // called when the MIDI device is opened engine.connectControl("[Channel2]","duration","StantonSCS1m.durationChange2"); // Faders - engine.connectControl("[Master]","crossfader","StantonSCS1m.crossFaderStart"); + engine.connectControl("[Main]","crossfader","StantonSCS1m.crossFaderStart"); engine.connectControl("[Channel1]","volume","StantonSCS1m.ch1FaderStart"); engine.connectControl("[Channel2]","volume","StantonSCS1m.ch2FaderStart"); @@ -109,7 +109,7 @@ StantonSCS1m.init = function (id) { // called when the MIDI device is opened // Force change to first deck, initializing the LEDs and connecting signals in the process // Set active deck to last available so the below will switch to #1. - StantonSCS1m.hotCueDeck = engine.getValue("[Master]","num_decks"); + StantonSCS1m.hotCueDeck = engine.getValue("[Main]","num_decks"); StantonSCS1m.hotCueDeckChange(StantonSCS1m.channel, 34, 0x7F, 0x90+StantonSCS1m.channel); StantonSCS1m.hotCueDeckChange(StantonSCS1m.channel, 34, 0x00, 0x80+StantonSCS1m.channel); @@ -336,7 +336,7 @@ StantonSCS1m.cancelButton = function (channel, control, value, status) { break; case "browse": // If the deck is playing and the cross-fader is not completely toward the other deck... - if (engine.getValue("[Channel1]","play")==1 && engine.getValue("[Master]","crossfader")<1.0) { + if (engine.getValue("[Channel1]","play")==1 && engine.getValue("[Main]","crossfader")<1.0) { // ...light the button red to show acknowledgement of the press but don't load midi.sendShortMsg(0x90+channel,control,64); print ("StantonSCS1m: Not loading into deck 1 because it's playing to the Master output."); @@ -381,7 +381,7 @@ StantonSCS1m.enterButton = function (channel, control, value, status) { break; case "browse": // If the deck is playing and the cross-fader is not completely toward the other deck... - if (engine.getValue("[Channel2]","play")==1 && engine.getValue("[Master]","crossfader")>-1.0) { + if (engine.getValue("[Channel2]","play")==1 && engine.getValue("[Main]","crossfader")>-1.0) { // ...light the button red to show acknowledgement of the press but don't load midi.sendShortMsg(0x90+channel,control,64); print ("StantonSCS1m: Not loading into deck 2 because it's playing to the Master output."); @@ -464,7 +464,7 @@ StantonSCS1m.hotCueDeckChange = function (channel, control, value, status) { if (StantonSCS1m.modifier["hotCueToggleTime"] != 0.0 && ((new Date() - StantonSCS1m.modifier["hotCueToggleTime"])>300)) return; StantonSCS1m.connectPresetSignals(channel,true); // Disconnect previous ones - if (StantonSCS1m.hotCueDeck == engine.getValue("[Master]","num_decks")) StantonSCS1m.hotCueDeck=1; + if (StantonSCS1m.hotCueDeck == engine.getValue("[Main]","num_decks")) StantonSCS1m.hotCueDeck=1; else StantonSCS1m.hotCueDeck++; // Change bank button color if (StantonSCS1m.hotCueDeck % 2 == 0) midi.sendShortMsg(0x90 + channel,34,64); // On diff --git a/res/controllers/Stanton-SCS3d-scripts.js b/res/controllers/Stanton-SCS3d-scripts.js index 414d2f33ace..e0d304b2d32 100644 --- a/res/controllers/Stanton-SCS3d-scripts.js +++ b/res/controllers/Stanton-SCS3d-scripts.js @@ -199,11 +199,11 @@ StantonSCS3d.modeSignals = { ["CurrentChannel", "VuMeter", "StantonSCS3d.VUMeterLEDs"], ["CurrentChannel", "keylock", "StantonSCS3d.B12LED"] ], "vinyl3":[], - "deck":[ ["[Master]","balance","StantonSCS3d.pitchLEDs"], - ["[Master]","volume","StantonSCS3d.MasterVolumeLEDs"], - ["[Master]","headMix","StantonSCS3d.headMixLEDs"], - ["[Master]","headVolume","StantonSCS3d.headVolLEDs"], - ["[Master]","crossfader","StantonSCS3d.crossFaderLEDs"] ], + "deck":[ ["[Main]","balance","StantonSCS3d.pitchLEDs"], + ["[Main]","volume","StantonSCS3d.MasterVolumeLEDs"], + ["[Main]","headMix","StantonSCS3d.headMixLEDs"], + ["[Main]","headVolume","StantonSCS3d.headVolLEDs"], + ["[Main]","crossfader","StantonSCS3d.crossFaderLEDs"] ], "none":[] // Avoids an error on forced mode changes }; StantonSCS3d.commonSignals = [ ["CurrentChannel", "rate", "StantonSCS3d.pitchLEDs"], @@ -244,7 +244,7 @@ StantonSCS3d.init2 = function () { // Force change to first deck, initializing the control surface & LEDs and connecting signals in the process // Set active deck to the last one so the below will switch to #1. - StantonSCS3d.deck = engine.getValue("[Master]","num_decks"); + StantonSCS3d.deck = engine.getValue("[Main]","num_decks"); if (StantonSCS3d.singleDeck) // Force timer to expire so the deck change happens StantonSCS3d.modifier["deckTime"] = new Date() - StantonSCS3d.deckChangeWait; StantonSCS3d.DeckChangeP1(StantonSCS3d.channel, StantonSCS3d.buttons["deck"], "null", 0x90+StantonSCS3d.channel); @@ -475,7 +475,7 @@ StantonSCS3d.pitchAbsolute = function (channel, control, value) { // Adjust the master balance if in DECK mode if (StantonSCS3d.mode_store["[Channel"+StantonSCS3d.deck+"]"]=="deck") { var newValue = (value-64)/64; - engine.setValue("[Master]","balance",newValue); + engine.setValue("[Main]","balance",newValue); return; } @@ -535,10 +535,10 @@ StantonSCS3d.gainRelative = function (channel, control, value) { midi.sendShortMsg(byte1,0x07,0x15+add); } else if (currentMode == "deck") { // If in DECK mode, adjust Master Volume - var newValue = engine.getValue("[Master]","volume")+(value-64)/256; + var newValue = engine.getValue("[Main]","volume")+(value-64)/256; if (newValue<0.0) newValue=0.0; if (newValue>5.0) newValue=5.0; - engine.setValue("[Master]","volume",newValue); + engine.setValue("[Main]","volume",newValue); return; } } @@ -632,7 +632,7 @@ StantonSCS3d.tapButton = function (channel, control, value, status) { var byte1 = 0x90 + channel; // If in DECK mode, and not in single-deck mode if (!StantonSCS3d.singleDeck && StantonSCS3d.mode_store["[Channel"+StantonSCS3d.deck+"]"]=="deck") { - engine.setValue("[Master]","crossfader",0.0); // Reset cross-fader to center + engine.setValue("[Main]","crossfader",0.0); // Reset cross-fader to center return; } if ((status & 0xF0) == 0x90) { // If button down @@ -668,7 +668,7 @@ StantonSCS3d.B11 = function (channel, control, value, status) { break; case "deck": midi.sendShortMsg(byte1,control,0x01); // Make button red - engine.reset("[Master]","volume"); + engine.reset("[Main]","volume"); break; case "fx": case "loop": @@ -720,7 +720,7 @@ StantonSCS3d.B12 = function (channel, control, value, status, group) { switch (currentMode) { case "deck": midi.sendShortMsg(byte1,control,0x01); // Make button red - engine.reset("[Master]","balance"); // Reset master balance to center + engine.reset("[Main]","balance"); // Reset master balance to center break; case "fx": case "fx2": @@ -1100,7 +1100,7 @@ StantonSCS3d.deckChangeFlash = function (channel, value, targetSide) { // Finish the deck change StantonSCS3d.deckIndicator(byte1,true); // Deck indicator on if (!StantonSCS3d.state["logoLit"] && StantonSCS3d.deck > 0 && - StantonSCS3d.deck <= engine.getValue("[Master]","num_decks")) { + StantonSCS3d.deck <= engine.getValue("[Main]","num_decks")) { // Re-light the Stanton logo if we're within deck #1-4 and if it had // been extinguished before midi.sendShortMsg(byte1,0x7A,0x01); @@ -1188,7 +1188,7 @@ StantonSCS3d.DeckChangeP1 = function (channel, control, value, status) { StantonSCS3d.mode_store["[Channel"+StantonSCS3d.deck+"]"].substring(0,4) == "loop") for (i=0x48; i<=0x5c; i++) midi.sendShortMsg(byte1,i,0x40); // Set surface LEDs to black StantonSCS3d.deck++; - if (StantonSCS3d.deck > engine.getValue("[Master]","num_decks")) StantonSCS3d.deck = 1; // Wrap around + if (StantonSCS3d.deck > engine.getValue("[Main]","num_decks")) StantonSCS3d.deck = 1; // Wrap around if (StantonSCS3d.debug) print("StantonSCS3d: Switching to deck "+StantonSCS3d.deck); midi.sendShortMsg(byte1,0x71,0x00); // Deck A light off midi.sendShortMsg(byte1,0x72,0x00); // Deck B light off @@ -1309,14 +1309,14 @@ StantonSCS3d.S3absolute = function (channel, control, value) { engine.setParameter("[EqualizerRack1_[Channel"+StantonSCS3d.deck+"]_Effect1]", "parameter1",script.absoluteLin(value,0,1)); break; - case "deck": engine.setValue("[Master]","headMix",(value-64)/63); break; + case "deck": engine.setValue("[Main]","headMix",(value-64)/63); break; } } StantonSCS3d.S4absolute = function (channel, control, value) { // Adjust the cross-fader if in DECK mode if (StantonSCS3d.mode_store["[Channel"+StantonSCS3d.deck+"]"] == "deck") { - engine.setValue("[Master]","crossfader",(value-64)/63); + engine.setValue("[Main]","crossfader",(value-64)/63); return; } var currentMode = StantonSCS3d.mode_store["[Channel"+StantonSCS3d.deck+"]"]; @@ -1435,10 +1435,10 @@ StantonSCS3d.S5absolute = function (channel, control, value) { StantonSCS3d.S5relative = function (channel, control, value) { // Adjust the headphone volume if in DECK mode if (StantonSCS3d.mode_store["[Channel"+StantonSCS3d.deck+"]"]=="deck") { - var newValue = engine.getValue("[Master]","headVolume")+(value-64)/128; + var newValue = engine.getValue("[Main]","headVolume")+(value-64)/128; if (newValue<0.0) newValue=0.0; if (newValue>5.0) newValue=5.0; - engine.setValue("[Master]","headVolume",newValue); + engine.setValue("[Main]","headVolume",newValue); return; } } @@ -1489,7 +1489,7 @@ StantonSCS3d.S3touch = function (channel, control, value, status) { break; case "deck": // Reset only if in single-deck mode - if (StantonSCS3d.singleDeck) engine.reset("[Master]","headMix"); + if (StantonSCS3d.singleDeck) engine.reset("[Main]","headMix"); break; } } @@ -1519,7 +1519,7 @@ StantonSCS3d.S4touch = function (channel, control, value, status) { break; case "deck": // Reset cross-fader to center if in single-deck mode - if (StantonSCS3d.singleDeck) engine.reset("[Master]","crossfader"); + if (StantonSCS3d.singleDeck) engine.reset("[Main]","crossfader"); break; } } @@ -1538,8 +1538,8 @@ StantonSCS3d.S4touch = function (channel, control, value, status) { // If the deck is playing and the cross-fader is not completely toward the other deck... // TODO: Check L/C/R CF assignment or just ask Mixxx itself if this deck is playing to the master if (engine.getValue("[Channel"+StantonSCS3d.deck+"]","play")==1 && - ((StantonSCS3d.deck % 2 != 0 && engine.getValue("[Master]","crossfader")<1.0) || - (StantonSCS3d.deck % 2 == 0 && engine.getValue("[Master]","crossfader")>-1.0))) { + ((StantonSCS3d.deck % 2 != 0 && engine.getValue("[Main]","crossfader")<1.0) || + (StantonSCS3d.deck % 2 == 0 && engine.getValue("[Main]","crossfader")>-1.0))) { // ...light just the red button LEDs to show acknowledgement of the press but don't load StantonSCS3d.sliderButtonLight(channel,"S4",true,true); print ("StantonSCS3d: Not loading into deck "+StantonSCS3d.deck+" because it's playing to the Master output."); @@ -1571,8 +1571,8 @@ StantonSCS3d.S4touch = function (channel, control, value, status) { // ...only if we actually loaded a track. // TODO: Check L/C/R CF assignment or just ask Mixxx itself if this deck is playing to the master if (engine.getValue("[Channel"+StantonSCS3d.deck+"]","play")==1 && - ((StantonSCS3d.deck % 2 != 0 && engine.getValue("[Master]","crossfader")<1.0) || - (StantonSCS3d.deck % 2 == 0 && engine.getValue("[Master]","crossfader")>-1.0))) { + ((StantonSCS3d.deck % 2 != 0 && engine.getValue("[Main]","crossfader")<1.0) || + (StantonSCS3d.deck % 2 == 0 && engine.getValue("[Main]","crossfader")>-1.0))) { return; } @@ -1624,7 +1624,7 @@ StantonSCS3d.S5touch = function (channel, control, value, status) { break; case "deck": // Reset to center only if in single-deck mode - if (StantonSCS3d.singleDeck) engine.reset("[Master]","headVolume"); + if (StantonSCS3d.singleDeck) engine.reset("[Main]","headVolume"); break; } } diff --git a/res/controllers/Stanton-SCS3m-scripts.js b/res/controllers/Stanton-SCS3m-scripts.js index d8e4a573d47..56caa816aa6 100644 --- a/res/controllers/Stanton-SCS3m-scripts.js +++ b/res/controllers/Stanton-SCS3m-scripts.js @@ -756,7 +756,7 @@ SCS3M.Agent = function(device) { var softbutton = part.touches[tnr]; var fxchannel = channel; if (master.engaged()) { - fxchannel = either('[Headphone]', '[Master]'); + fxchannel = either('[Headphone]', '[Main]'); } var effectunit = '[EffectRack1_EffectUnit' + (tnr + 1) + ']'; var effectunit_enable = 'group_' + fxchannel + '_enable'; @@ -869,7 +869,7 @@ SCS3M.Agent = function(device) { } // Light the logo and let it go out to signal an overload - watch("[Master]", 'audio_latency_overload', binarylight( + watch("[Main]", 'audio_latency_overload', binarylight( device.logo.on, device.logo.off )); @@ -882,34 +882,34 @@ SCS3M.Agent = function(device) { expect(device.master.release, repatch(master.cancel)); if (master.engaged()) { modeset(device.left.pitch.mode.absolute); - watch("[Master]", "headMix", patch(device.left.pitch.meter.centerbar)); + watch("[Main]", "headMix", patch(device.left.pitch.meter.centerbar)); expect(device.left.pitch.slide, - eqheld.left.engaged() ? reset('[Master]', 'headMix') : set('[Master]', 'headMix') + eqheld.left.engaged() ? reset('[Main]', 'headMix') : set('[Main]', 'headMix') ); modeset(device.right.pitch.mode.absolute); - watch("[Master]", "balance", patch(device.right.pitch.meter.centerbar)); + watch("[Main]", "balance", patch(device.right.pitch.meter.centerbar)); expect(device.right.pitch.slide, - eqheld.right.engaged() ? reset('[Master]', 'balance') : set('[Master]', 'balance') + eqheld.right.engaged() ? reset('[Main]', 'balance') : set('[Main]', 'balance') ); modeset(device.left.gain.mode.relative); - watch("[Master]", "headVolume", patch(device.left.gain.meter.centerbar)); - expect(device.left.gain.slide, budge('[Master]', 'headVolume')); + watch("[Main]", "headVolume", patch(device.left.gain.meter.centerbar)); + expect(device.left.gain.slide, budge('[Main]', 'headVolume')); modeset(device.right.gain.mode.relative); - watch("[Master]", "volume", patch(device.right.gain.meter.centerbar)); - expect(device.right.gain.slide, budge('[Master]', 'volume')); + watch("[Main]", "volume", patch(device.right.gain.meter.centerbar)); + expect(device.right.gain.slide, budge('[Main]', 'volume')); - watch("[Master]", "VuMeterL", vupatch(device.left.meter.bar)); - watch("[Master]", "VuMeterR", vupatch(device.right.meter.bar)); + watch("[Main]", "VuMeterL", vupatch(device.left.meter.bar)); + watch("[Main]", "VuMeterR", vupatch(device.right.meter.bar)); } if (deck.left.held() || deck.right.held()) { // Needledrop handled in Side() } else { - expect(device.crossfader.slide, set("[Master]", "crossfader")); - watch("[Master]", "crossfader", patch(device.crossfader.meter.centerbar)); + expect(device.crossfader.slide, set("[Main]", "crossfader")); + watch("[Main]", "crossfader", patch(device.crossfader.meter.centerbar)); } // Communicate currently selected channel of each deck so SCS3d can read it diff --git a/res/controllers/TrakProDJ iPad.midi.xml b/res/controllers/TrakProDJ iPad.midi.xml index a381378907e..599dd1f3693 100644 --- a/res/controllers/TrakProDJ iPad.midi.xml +++ b/res/controllers/TrakProDJ iPad.midi.xml @@ -400,19 +400,19 @@ - [Master] + [Main] crossfader 0XB0 0X07 - [Master] + [Main] headMix 0XB0 0X1B - [Master] + [Main] headVolume 0XB1 0X1B diff --git a/res/controllers/Traktor-Kontrol-F1-scripts.js b/res/controllers/Traktor-Kontrol-F1-scripts.js index 303b571e8d0..ee2c00d44ef 100644 --- a/res/controllers/Traktor-Kontrol-F1-scripts.js +++ b/res/controllers/Traktor-Kontrol-F1-scripts.js @@ -754,10 +754,10 @@ KontrolF1.registerCallbacks = function() { controller.setCallback("control", "hid", "play_3", KontrolF1.play); controller.setCallback("control", "hid", "play_4", KontrolF1.play); - KontrolF1.linkKnob("decks", "knob_1", "[Master]", "headVolume", "pregain"); - KontrolF1.linkKnob("decks", "knob_2", "[Master]", "headMix", "plusminus"); - KontrolF1.linkKnob("decks", "knob_3", "[Master]", "balance", "plusminus"); - KontrolF1.linkKnob("decks", "knob_4", "[Master]", "volume", "pregain"); + KontrolF1.linkKnob("decks", "knob_1", "[Main]", "headVolume", "pregain"); + KontrolF1.linkKnob("decks", "knob_2", "[Main]", "headMix", "plusminus"); + KontrolF1.linkKnob("decks", "knob_3", "[Main]", "balance", "plusminus"); + KontrolF1.linkKnob("decks", "knob_4", "[Main]", "volume", "pregain"); KontrolF1.linkFader("decks", "fader_1", "[Channel1]", "rate", "rate"); KontrolF1.linkFader("decks", "fader_2", "[Channel1]", "volume", "volume"); KontrolF1.linkFader("decks", "fader_3", "[Channel2]", "volume", "volume"); diff --git a/res/controllers/Traktor-Kontrol-S2-MK1-hid-scripts.js b/res/controllers/Traktor-Kontrol-S2-MK1-hid-scripts.js index e209ae1b3e6..0a1d092b968 100644 --- a/res/controllers/Traktor-Kontrol-S2-MK1-hid-scripts.js +++ b/res/controllers/Traktor-Kontrol-S2-MK1-hid-scripts.js @@ -185,7 +185,7 @@ TraktorS2MK1.registerInputPackets = function() { InputReport0x01.addControl("[EffectRack1_EffectUnit2]", "group_[Channel2]_enable", 0x0A, "B", 0x04); // maximize the library on browse encoder press - InputReport0x01.addControl("[Master]", "maximize_library", 0x0E, "B", 0x08, false, this.toggleButton); + InputReport0x01.addControl("[Main]", "maximize_library", 0x0E, "B", 0x08, false, this.toggleButton); engine.makeConnection("[EffectRack1_EffectUnit1]", "show_parameters", TraktorS2MK1.onShowParametersChange); engine.makeConnection("[EffectRack1_EffectUnit2]", "show_parameters", TraktorS2MK1.onShowParametersChange); @@ -225,10 +225,10 @@ TraktorS2MK1.registerInputPackets = function() { InputReport0x02.addControl("[Channel2]", "pregain", 0x03, "B", 0x0F, false, this.gainEncoder); InputReport0x02.addControl("[Channel2]", "!jog_touch", 0x1D, "H", 0xFFFF, false, this.jogTouch); - InputReport0x02.addControl("[Master]", "crossfader", 0x2F, "H"); - InputReport0x02.addControl("[Master]", "headMix", 0x31, "H"); - InputReport0x02.addControl("[Master]", "!samplerGain", 0x13, "H"); - InputReport0x02.setCallback("[Master]", "!samplerGain", this.samplerGainKnob); + InputReport0x02.addControl("[Main]", "crossfader", 0x2F, "H"); + InputReport0x02.addControl("[Main]", "headMix", 0x31, "H"); + InputReport0x02.addControl("[Main]", "!samplerGain", 0x13, "H"); + InputReport0x02.setCallback("[Main]", "!samplerGain", this.samplerGainKnob); InputReport0x02.addControl("[Playlist]", "!browse", 0x02, "B", 0xF0, false, this.browseEncoder); // Soft takeover for knobs @@ -241,8 +241,8 @@ TraktorS2MK1.registerInputPackets = function() { engine.softTakeover("[Channel1]", "pregain", true); engine.softTakeover("[Channel2]", "pregain", true); - engine.softTakeover("[Master]", "crossfader", true); - engine.softTakeover("[Master]", "headMix", true); + engine.softTakeover("[Main]", "crossfader", true); + engine.softTakeover("[Main]", "headMix", true); for (var i = 1; i <= 8; i++) { engine.softTakeover("[Sampler" + i + "]", "pregain", true); } @@ -308,7 +308,7 @@ TraktorS2MK1.registerOutputPackets = function() { OutputReport0x80.addOutput("[Channel2]", "loop_out", 0x21, "B"); OutputReport0x80.addOutput("[Channel1]", "pfl", 0x20, "B"); - OutputReport0x80.addOutput("[Master]", "!warninglight", 0x31, "B"); + OutputReport0x80.addOutput("[Main]", "!warninglight", 0x31, "B"); OutputReport0x80.addOutput("[Channel2]", "pfl", 0x1D, "B"); OutputReport0x80.addOutput("[EffectRack1_EffectUnit1]", "!effect_focus_button", 0x1C, "B"); @@ -478,7 +478,7 @@ TraktorS2MK1.init = function() { TraktorS2MK1.registerOutputPackets(); } - TraktorS2MK1.controller.setOutput("[Master]", "!warninglight", 0x00, true); + TraktorS2MK1.controller.setOutput("[Main]", "!warninglight", 0x00, true); TraktorS2MK1.lightDeck("[Channel1]"); TraktorS2MK1.lightDeck("[Channel2]"); TraktorS2MK1.lightDeck("[EffectRack1_EffectUnit1]"); @@ -1245,7 +1245,7 @@ TraktorS2MK1.scalerParameter = function(group, name, value) { }; TraktorS2MK1.scalerVolume = function(group, name, value) { - if (group === "[Master]") { + if (group === "[Main]") { return script.absoluteNonLin(value, 0, 1, 4, 16, 4080); } else { return script.absoluteNonLin(value, 0, 0.25, 1, 16, 4080); diff --git a/res/controllers/Traktor-Kontrol-S2-MK2-hid-scripts.js b/res/controllers/Traktor-Kontrol-S2-MK2-hid-scripts.js index 186413e6f6e..f5fd72a76c7 100644 --- a/res/controllers/Traktor-Kontrol-S2-MK2-hid-scripts.js +++ b/res/controllers/Traktor-Kontrol-S2-MK2-hid-scripts.js @@ -181,7 +181,7 @@ TraktorS2MK2.registerInputPackets = function() { MessageShort.addControl("[EffectRack1_EffectUnit1]", "group_[Channel2]_enable", 0x0E, "B", 0x02); MessageShort.addControl("[EffectRack1_EffectUnit2]", "group_[Channel2]_enable", 0x0E, "B", 0x01); - MessageShort.addControl("[Master]", "maximize_library", 0x0F, "B", 0x04, false, this.toggleButton); + MessageShort.addControl("[Main]", "maximize_library", 0x0F, "B", 0x04, false, this.toggleButton); MessageShort.addControl("[Microphone]", "talkover", 0x0A, "B", 0x08, false, this.toggleButton); @@ -223,11 +223,11 @@ TraktorS2MK2.registerInputPackets = function() { // The master gain knob controls the internal sound card volume, so if this was mapped // the gain would be double-applied. - //MessageLong.addControl("[Master]", "volume", 0x11, "H"); - MessageLong.addControl("[Master]", "crossfader", 0x05, "H"); - MessageLong.addControl("[Master]", "headMix", 0x0B, "H"); - MessageLong.addControl("[Master]", "!samplerGain", 0xD, "H"); - MessageLong.setCallback("[Master]", "!samplerGain", this.samplerGainKnob); + //MessageLong.addControl("[Main]", "volume", 0x11, "H"); + MessageLong.addControl("[Main]", "crossfader", 0x05, "H"); + MessageLong.addControl("[Main]", "headMix", 0x0B, "H"); + MessageLong.addControl("[Main]", "!samplerGain", 0xD, "H"); + MessageLong.setCallback("[Main]", "!samplerGain", this.samplerGainKnob); MessageLong.addControl("[Playlist]", "!browse", 0x02, "B", 0x0F, false, this.browseEncoder); // Soft takeover for knobs @@ -240,8 +240,8 @@ TraktorS2MK2.registerInputPackets = function() { engine.softTakeover("[Channel1]", "pregain", true); engine.softTakeover("[Channel2]", "pregain", true); - engine.softTakeover("[Master]", "crossfader", true); - engine.softTakeover("[Master]", "headMix", true); + engine.softTakeover("[Main]", "crossfader", true); + engine.softTakeover("[Main]", "headMix", true); engine.softTakeover("[EqualizerRack1_[Channel1]_Effect1]", "parameter3", true); engine.softTakeover("[EqualizerRack1_[Channel1]_Effect1]", "parameter2", true); @@ -305,7 +305,7 @@ TraktorS2MK2.registerOutputPackets = function() { OutputTop.addOutput("[Channel2]", "loop_out", 0x24, "B"); OutputTop.addOutput("[Channel1]", "pfl", 0x1B, "B"); - OutputTop.addOutput("[Master]", "!usblight", 0x1D, "B"); + OutputTop.addOutput("[Main]", "!usblight", 0x1D, "B"); OutputTop.addOutput("[Channel2]", "pfl", 0x1F, "B"); OutputTop.addOutput("[EffectRack1_EffectUnit1]", "!effect_focus_button", 0xB, "B"); @@ -485,7 +485,7 @@ TraktorS2MK2.init = function() { TraktorS2MK2.registerOutputPackets(); } - TraktorS2MK2.controller.setOutput("[Master]", "!usblight", 0x7F, true); + TraktorS2MK2.controller.setOutput("[Main]", "!usblight", 0x7F, true); TraktorS2MK2.lightDeck("[Channel1]"); TraktorS2MK2.lightDeck("[Channel2]"); TraktorS2MK2.lightDeck("[EffectRack1_EffectUnit1]"); @@ -1280,7 +1280,7 @@ TraktorS2MK2.scalerParameter = function(group, name, value) { }; TraktorS2MK2.scalerVolume = function(group, name, value) { - if (group === "[Master]") { + if (group === "[Main]") { return script.absoluteNonLin(value, 0, 1, 4, 16, 4080); } else { return script.absoluteNonLin(value, 0, 0.25, 1, 16, 4080); diff --git a/res/controllers/Traktor-Kontrol-S2-MK3-hid-scripts.js b/res/controllers/Traktor-Kontrol-S2-MK3-hid-scripts.js index 704cabf2a71..a023aee72b3 100644 --- a/res/controllers/Traktor-Kontrol-S2-MK3-hid-scripts.js +++ b/res/controllers/Traktor-Kontrol-S2-MK3-hid-scripts.js @@ -179,17 +179,17 @@ TraktorS2MK3.registerInputPackets = function() { this.registerInputScaler(messageLong, "[QuickEffectRack1_[Channel1]]", "super1", 0x13, 0xFFFF, this.parameterHandler); this.registerInputScaler(messageLong, "[QuickEffectRack1_[Channel2]]", "super1", 0x25, 0xFFFF, this.parameterHandler); - this.registerInputScaler(messageLong, "[Master]", "crossfader", 0x05, 0xFFFF, this.parameterHandler); + this.registerInputScaler(messageLong, "[Main]", "crossfader", 0x05, 0xFFFF, this.parameterHandler); /* do NOT map the "master" button because it also drives the analog output gain. Disabling this mapping is the only way to have independent controls for the digital master gain and the output level - the latter usually needs to be set at 100%. */ - // this.registerInputScaler(messageLong, "[Master]", "gain", 0x15, 0xFFFF, this.parameterHandler); + // this.registerInputScaler(messageLong, "[Main]", "gain", 0x15, 0xFFFF, this.parameterHandler); this.registerInputScaler(messageLong, "[Sampler]", "pregain", 0x17, 0xFFFF, this.samplerPregainHandler); - this.registerInputScaler(messageLong, "[Master]", "headMix", 0x19, 0xFFFF, this.parameterHandler); - this.registerInputScaler(messageLong, "[Master]", "headGain", 0x1B, 0xFFFF, this.parameterHandler); + this.registerInputScaler(messageLong, "[Main]", "headMix", 0x19, 0xFFFF, this.parameterHandler); + this.registerInputScaler(messageLong, "[Main]", "headGain", 0x1B, 0xFFFF, this.parameterHandler); this.controller.registerInputPacket(messageLong); @@ -214,11 +214,11 @@ TraktorS2MK3.registerInputPackets = function() { engine.softTakeover("[QuickEffectRack1_[Channel1]]", "super1", true); engine.softTakeover("[QuickEffectRack1_[Channel2]]", "super1", true); - engine.softTakeover("[Master]", "crossfader", true); + engine.softTakeover("[Main]", "crossfader", true); // see the above comment on master gain - //engine.softTakeover("[Master]", "gain", true); - engine.softTakeover("[Master]", "headMix", true); - engine.softTakeover("[Master]", "headGain", true); + //engine.softTakeover("[Main]", "gain", true); + engine.softTakeover("[Main]", "headMix", true); + engine.softTakeover("[Main]", "headGain", true); for (let i = 1; i <= 16; ++i) { engine.softTakeover("[Sampler" + i + "]", "pregain", true); @@ -506,7 +506,7 @@ TraktorS2MK3.maximizeLibraryHandler = function(field) { return; } - script.toggleControl("[Master]", "maximize_library"); + script.toggleControl("[Main]", "maximize_library"); }; TraktorS2MK3.selectLoopHandler = function(field) { diff --git a/res/controllers/Traktor-Kontrol-S3-hid-scripts.js b/res/controllers/Traktor-Kontrol-S3-hid-scripts.js index 867e76081a3..9095a405abd 100644 --- a/res/controllers/Traktor-Kontrol-S3-hid-scripts.js +++ b/res/controllers/Traktor-Kontrol-S3-hid-scripts.js @@ -238,7 +238,7 @@ TraktorS3.Controller = class { this.registerInputButton(messageShort, "[Channel4]", "pfl", 0x08, 0x04, TraktorS3.Controller.prototype.headphoneHandler.bind(this)); // EXT Button - this.registerInputButton(messageShort, "[Master]", "!extButton", 0x07, 0x04, TraktorS3.Controller.prototype.extModeHandler.bind(this)); + this.registerInputButton(messageShort, "[Main]", "!extButton", 0x07, 0x04, TraktorS3.Controller.prototype.extModeHandler.bind(this)); this.fxController.registerInputs(messageShort, messageLong); @@ -270,10 +270,10 @@ TraktorS3.Controller = class { this.registerInputScaler(messageLong, "[EqualizerRack1_[Channel4]_Effect1]", "parameter2", 0x33, 0xFFFF, this.parameterHandler); this.registerInputScaler(messageLong, "[EqualizerRack1_[Channel4]_Effect1]", "parameter1", 0x35, 0xFFFF, this.parameterHandler); - this.registerInputScaler(messageLong, "[Master]", "crossfader", 0x0B, 0xFFFF, this.parameterHandler); - this.registerInputScaler(messageLong, "[Master]", "gain", 0x17, 0xFFFF, TraktorS3.Controller.prototype.masterGainHandler.bind(this)); - this.registerInputScaler(messageLong, "[Master]", "headMix", 0x1D, 0xFFFF, this.parameterHandler); - this.registerInputScaler(messageLong, "[Master]", "headGain", 0x1B, 0xFFFF, this.parameterHandler); + this.registerInputScaler(messageLong, "[Main]", "crossfader", 0x0B, 0xFFFF, this.parameterHandler); + this.registerInputScaler(messageLong, "[Main]", "gain", 0x17, 0xFFFF, TraktorS3.Controller.prototype.masterGainHandler.bind(this)); + this.registerInputScaler(messageLong, "[Main]", "headMix", 0x1D, 0xFFFF, this.parameterHandler); + this.registerInputScaler(messageLong, "[Main]", "headGain", 0x1B, 0xFFFF, this.parameterHandler); this.hid.registerInputPacket(messageLong); @@ -345,10 +345,10 @@ TraktorS3.Controller = class { engine.softTakeover("[EqualizerRack1_[Channel4]_Effect1]", "parameter2", true); engine.softTakeover("[EqualizerRack1_[Channel4]_Effect1]", "parameter3", true); - // engine.softTakeover("[Master]", "crossfader", true); - engine.softTakeover("[Master]", "gain", true); - // engine.softTakeover("[Master]", "headMix", true); - // engine.softTakeover("[Master]", "headGain", true); + // engine.softTakeover("[Main]", "crossfader", true); + engine.softTakeover("[Main]", "gain", true); + // engine.softTakeover("[Main]", "headMix", true); + // engine.softTakeover("[Main]", "headGain", true); for (let i = 1; i <= 16; ++i) { engine.softTakeover("[Sampler" + i + "]", "pregain", true); } @@ -484,7 +484,7 @@ TraktorS3.Controller = class { outputA.addOutput("[Channel2]", "!fxEnabled", 0x36, "B"); outputA.addOutput("[Channel4]", "!fxEnabled", 0x37, "B"); - outputA.addOutput("[Master]", "!extButton", 0x33, "B"); + outputA.addOutput("[Main]", "!extButton", 0x33, "B"); this.hid.registerOutputPacket(outputA); @@ -505,12 +505,12 @@ TraktorS3.Controller = class { "VuMeterR": 0x46 }; for (let i = 0; i < 8; i++) { - outputB.addOutput("[Master]", "!" + "VuMeterL" + i, MasterVuOffsets.VuMeterL + i, "B"); - outputB.addOutput("[Master]", "!" + "VuMeterR" + i, MasterVuOffsets.VuMeterR + i, "B"); + outputB.addOutput("[Main]", "!" + "VuMeterL" + i, MasterVuOffsets.VuMeterL + i, "B"); + outputB.addOutput("[Main]", "!" + "VuMeterR" + i, MasterVuOffsets.VuMeterR + i, "B"); } - outputB.addOutput("[Master]", "PeakIndicatorL", 0x45, "B"); - outputB.addOutput("[Master]", "PeakIndicatorR", 0x4E, "B"); + outputB.addOutput("[Main]", "PeakIndicatorL", 0x45, "B"); + outputB.addOutput("[Main]", "PeakIndicatorR", 0x4E, "B"); outputB.addOutput("[Channel3]", "PeakIndicator", 0x0F, "B"); outputB.addOutput("[Channel1]", "PeakIndicator", 0x1E, "B"); @@ -529,14 +529,14 @@ TraktorS3.Controller = class { engine.connectControl("[Microphone]", "pfl", this.pflOutput); - engine.connectControl("[Master]", "maximize_library", TraktorS3.Controller.prototype.maximizeLibraryOutput.bind(this)); + engine.connectControl("[Main]", "maximize_library", TraktorS3.Controller.prototype.maximizeLibraryOutput.bind(this)); // Master VuMeters - this.masterVuMeter.VuMeterL.connection = engine.makeConnection("[Master]", "VuMeterL", TraktorS3.Controller.prototype.masterVuMeterHandler.bind(this)); - this.masterVuMeter.VuMeterR.connection = engine.makeConnection("[Master]", "VuMeterR", TraktorS3.Controller.prototype.masterVuMeterHandler.bind(this)); - this.linkChannelOutput("[Master]", "PeakIndicatorL", TraktorS3.Controller.prototype.peakOutput.bind(this)); - this.linkChannelOutput("[Master]", "PeakIndicatorR", TraktorS3.Controller.prototype.peakOutput.bind(this)); - this.guiTickConnection = engine.makeConnection("[Master]", "guiTick50ms", TraktorS3.Controller.prototype.guiTickHandler.bind(this)); + this.masterVuMeter.VuMeterL.connection = engine.makeConnection("[Main]", "VuMeterL", TraktorS3.Controller.prototype.masterVuMeterHandler.bind(this)); + this.masterVuMeter.VuMeterR.connection = engine.makeConnection("[Main]", "VuMeterR", TraktorS3.Controller.prototype.masterVuMeterHandler.bind(this)); + this.linkChannelOutput("[Main]", "PeakIndicatorL", TraktorS3.Controller.prototype.peakOutput.bind(this)); + this.linkChannelOutput("[Main]", "PeakIndicatorR", TraktorS3.Controller.prototype.peakOutput.bind(this)); + this.guiTickConnection = engine.makeConnection("[Main]", "guiTick50ms", TraktorS3.Controller.prototype.guiTickHandler.bind(this)); // Sampler callbacks for (let i = 1; i <= 8; ++i) { @@ -727,7 +727,7 @@ TraktorS3.Controller = class { deck.colorOutput(0, "!MaximizeLibrary"); deck.colorOutput(deck.jogToggled, "!jogButton"); if (group === "[Channel4]") { - this.basicOutput(0, "[Master]", "!extButton"); + this.basicOutput(0, "[Main]", "!extButton"); } } // this.lightFx(); @@ -764,7 +764,7 @@ TraktorS3.Controller = class { for (const vu in this.masterVuMeter) { if (this.masterVuMeter[vu].updated) { - this.vuMeterOutput(this.masterVuMeter[vu].value, "[Master]", vu, 8); + this.vuMeterOutput(this.masterVuMeter[vu].value, "[Main]", vu, 8); this.masterVuMeter[vu].updated = false; gotUpdate = true; } @@ -938,7 +938,7 @@ TraktorS3.Deck = class { engine.setValue("[Controls]", "touch_shift", field.value); this.shiftPressed = field.value; if (field.value) { - engine.softTakeoverIgnoreNextValue("[Master]", "gain"); + engine.softTakeoverIgnoreNextValue("[Main]", "gain"); } this.controller.basicOutput(field.value, field.group, "!shift"); } @@ -1145,7 +1145,7 @@ TraktorS3.Deck = class { return; } - script.toggleControl("[Master]", "maximize_library"); + script.toggleControl("[Main]", "maximize_library"); } selectLoopHandler(field) { diff --git a/res/controllers/Traktor-Kontrol-S4-MK2-hid-scripts.js b/res/controllers/Traktor-Kontrol-S4-MK2-hid-scripts.js index 66f18ec0c11..ef2a45197c0 100644 --- a/res/controllers/Traktor-Kontrol-S4-MK2-hid-scripts.js +++ b/res/controllers/Traktor-Kontrol-S4-MK2-hid-scripts.js @@ -193,11 +193,11 @@ TraktorS4MK2.registerInputPackets = function() { MessageShort.addControl("[Library]", "GoToItem", 0x13, "B", 0x04); MessageShort.addControl("[PreviewDeck1]", "!previewdeck", 0x0F, "B", 0x01); MessageShort.addControl("[Recording]", "toggle_recording", 0x0F, "B", 0x04); - MessageShort.addControl("[Master]", "!play_shifter", 0x0F, "B", 0x06); + MessageShort.addControl("[Main]", "!play_shifter", 0x0F, "B", 0x06); - MessageShort.addControl("[Master]", "!quantize", 0x0A, "B", 0x08); - MessageShort.addControl("[Master]", "!snap", 0x0A, "B", 0x02); + MessageShort.addControl("[Main]", "!quantize", 0x0A, "B", 0x08); + MessageShort.addControl("[Main]", "!snap", 0x0A, "B", 0x02); MessageShort.setCallback("deck1", "!shift", this.shiftHandler); MessageShort.setCallback("deck2", "!shift", this.shiftHandler); @@ -245,9 +245,9 @@ TraktorS4MK2.registerInputPackets = function() { MessageShort.setCallback("[Channel4]", "!pregain_reset", this.pregainResetHandler); MessageShort.setCallback("[PreviewDeck1]", "!previewdeck", this.previewDeckHandler); - MessageShort.setCallback("[Master]", "!quantize", this.quantizeHandler); - MessageShort.setCallback("[Master]", "!snap", this.snapHandler); - MessageShort.setCallback("[Master]", "!play_shifter", this.playLRButtonHandler); + MessageShort.setCallback("[Main]", "!quantize", this.quantizeHandler); + MessageShort.setCallback("[Main]", "!snap", this.snapHandler); + MessageShort.setCallback("[Main]", "!play_shifter", this.playLRButtonHandler); MessageShort.setCallback("[EffectRack1_EffectUnit1_Effect1]", "!FXButton", this.FXButtonHandler); MessageShort.setCallback("[EffectRack1_EffectUnit1_Effect2]", "!FXButton", this.FXButtonHandler); @@ -331,9 +331,9 @@ TraktorS4MK2.registerInputPackets = function() { // The physical master button controls the internal sound card volume, so if we hook this // up the adjustment is double-applied. - //MessageLong.addControl("[Master]", "volume", 0x11, "H"); - MessageLong.addControl("[Master]", "crossfader", 0x07, "H"); - MessageLong.addControl("[Master]", "headMix", 0x0D, "H"); + //MessageLong.addControl("[Main]", "volume", 0x11, "H"); + MessageLong.addControl("[Main]", "crossfader", 0x07, "H"); + MessageLong.addControl("[Main]", "headMix", 0x0D, "H"); MessageLong.addControl("[Playlist]", "!browse", 0x02, "B", 0x0F, undefined, true); MessageLong.setCallback("[Playlist]", "!browse", this.callbackBrowse); @@ -378,8 +378,8 @@ TraktorS4MK2.registerOutputPackets = function() { Output1.addOutput("[Channel3]", "PeakIndicator", 0x07, "B"); Output1.addOutput("[Channel4]", "PeakIndicator", 0x1F, "B"); - Output1.addOutput("[Master]", "!usblight", 0x2A, "B"); - Output1.addOutput("[Master]", "!quantize", 0x31, "B"); + Output1.addOutput("[Main]", "!usblight", 0x2A, "B"); + Output1.addOutput("[Main]", "!quantize", 0x31, "B"); Output1.addOutput("[InternalClock]", "sync_leader", 0x30, "B"); Output1.addOutput("[Recording]", "status", 0x34, "B"); @@ -466,8 +466,8 @@ TraktorS4MK2.registerOutputPackets = function() { Output3.addOutput("[Channel2]", "pfl", 0x19, "B"); Output3.addOutput("[Channel4]", "pfl", 0x1A, "B"); - Output3.addOutput("[Master]", "PeakIndicatorL", 0x3B, "B"); - Output3.addOutput("[Master]", "PeakIndicatorR", 0x3C, "B"); + Output3.addOutput("[Main]", "PeakIndicatorL", 0x3B, "B"); + Output3.addOutput("[Main]", "PeakIndicatorR", 0x3C, "B"); Output3.addOutput("deck1", "!deckLight", 0x13, "B"); Output3.addOutput("deck1", "LoadSelectedTrack", 0x14, "B"); @@ -529,8 +529,8 @@ TraktorS4MK2.registerOutputPackets = function() { TraktorS4MK2.linkChannelOutput("[Channel2]", "PeakIndicator", TraktorS4MK2.outputChannelCallbackDark); TraktorS4MK2.linkChannelOutput("[Channel3]", "PeakIndicator", TraktorS4MK2.outputChannelCallbackDark); TraktorS4MK2.linkChannelOutput("[Channel4]", "PeakIndicator", TraktorS4MK2.outputChannelCallbackDark); - TraktorS4MK2.linkChannelOutput("[Master]", "PeakIndicatorL", TraktorS4MK2.outputChannelCallbackDark); - TraktorS4MK2.linkChannelOutput("[Master]", "PeakIndicatorR", TraktorS4MK2.outputChannelCallbackDark); + TraktorS4MK2.linkChannelOutput("[Main]", "PeakIndicatorL", TraktorS4MK2.outputChannelCallbackDark); + TraktorS4MK2.linkChannelOutput("[Main]", "PeakIndicatorR", TraktorS4MK2.outputChannelCallbackDark); TraktorS4MK2.linkChannelOutput("[EffectRack1_EffectUnit1]", "group_[Channel3]_enable", TraktorS4MK2.outputChannelCallback); TraktorS4MK2.linkChannelOutput("[EffectRack1_EffectUnit2]", "group_[Channel3]_enable", TraktorS4MK2.outputChannelCallback); TraktorS4MK2.linkChannelOutput("[EffectRack1_EffectUnit1]", "group_[Channel1]_enable", TraktorS4MK2.outputChannelCallback); @@ -719,9 +719,9 @@ TraktorS4MK2.init = function(id) { engine.setValue("[Channel2]", "quantize", TraktorS4MK2.master_quantize); engine.setValue("[Channel3]", "quantize", TraktorS4MK2.master_quantize); engine.setValue("[Channel4]", "quantize", TraktorS4MK2.master_quantize); - TraktorS4MK2.controller.setOutput("[Master]", "!quantize", 0x7F * TraktorS4MK2.master_quantize, true); + TraktorS4MK2.controller.setOutput("[Main]", "!quantize", 0x7F * TraktorS4MK2.master_quantize, true); - TraktorS4MK2.controller.setOutput("[Master]", "!usblight", 0x7F, true); + TraktorS4MK2.controller.setOutput("[Main]", "!usblight", 0x7F, true); TraktorS4MK2.outputChannelCallback(engine.getValue("[InternalClock]", "sync_leader"), "[InternalClock]", "sync_leader"); TraktorS4MK2.outputChannelCallback(engine.getValue("[Recording]", "status"), "[Recording]", "status"); @@ -1232,15 +1232,15 @@ TraktorS4MK2.quantizeHandler = function(field) { engine.setValue("[Channel2]", "quantize", TraktorS4MK2.master_quantize); engine.setValue("[Channel3]", "quantize", TraktorS4MK2.master_quantize); engine.setValue("[Channel4]", "quantize", TraktorS4MK2.master_quantize); - TraktorS4MK2.controller.setOutput("[Master]", "!quantize", 0x7F * TraktorS4MK2.master_quantize, true); + TraktorS4MK2.controller.setOutput("[Main]", "!quantize", 0x7F * TraktorS4MK2.master_quantize, true); }; TraktorS4MK2.snapHandler = function(field) { if (field.value === 0) { return; } - library_maximized = engine.getValue("[Master]", "maximize_library"); - engine.setValue("[Master]", "maximize_library", !library_maximized); + library_maximized = engine.getValue("[Main]", "maximize_library"); + engine.setValue("[Main]", "maximize_library", !library_maximized); }; TraktorS4MK2.FXButtonHandler = function(field) { @@ -1493,7 +1493,7 @@ TraktorS4MK2.scalerParameter = function(group, name, value) { TraktorS4MK2.scalerParameter.useSetParameter = true; TraktorS4MK2.scalerVolume = function(group, name, value) { - if (group === "[Master]") { + if (group === "[Main]") { return script.absoluteNonLin(value, 0, 1, 4, 16, 4080); } else { return script.absoluteNonLin(value, 0, 0.25, 1, 16, 4080); diff --git a/res/controllers/Traktor-Kontrol-S4-MK3.js b/res/controllers/Traktor-Kontrol-S4-MK3.js index 4d8046b0907..d25cd25d951 100644 --- a/res/controllers/Traktor-Kontrol-S4-MK3.js +++ b/res/controllers/Traktor-Kontrol-S4-MK3.js @@ -1104,7 +1104,7 @@ class Mixer extends ComponentContainer { }); this.crossfader = new Pot({ - group: "[Master]", + group: "[Main]", inKey: "crossfader", inByte: 0, inReport: inReports[2], @@ -1403,7 +1403,7 @@ class S4Mk3EffectUnit extends ComponentContainer { outReport: outReport, shift: function() { this.group = this.unit.group; - this.outKey = "group_[Master]_enable"; + this.outKey = "group_[Main]_enable"; this.outConnect(); this.outTrigger(); }, @@ -1424,7 +1424,7 @@ class S4Mk3EffectUnit extends ComponentContainer { if (this.unit.focusedEffect !== null) { this.unit.setFocusedEffect(null); } else { - script.toggleControl(this.unit.group, "group_[Master]_enable"); + script.toggleControl(this.unit.group, "group_[Main]_enable"); this.shift(); } } @@ -2079,7 +2079,7 @@ class S4Mk3Deck extends Deck { } }); this.libraryViewButton = new Button({ - group: "[Master]", + group: "[Main]", key: "maximize_library", libraryEncoder: this.libraryEncoder, libraryEncoderPress: this.libraryEncoderPress, @@ -2722,8 +2722,8 @@ class S4Mk3MixerColumn extends ComponentContainer { class S4MK3 { constructor() { - if (engine.getValue("[Master]", "num_samplers") < 16) { - engine.setValue("[Master]", "num_samplers", 16); + if (engine.getValue("[Main]", "num_samplers") < 16) { + engine.setValue("[Main]", "num_samplers", 16); } this.inReports = []; @@ -2885,7 +2885,7 @@ class S4MK3 { const that = this; /* eslint no-unused-vars: "off" */ - const meterConnection = engine.makeConnection("[Master]", "guiTick50ms", function(_value) { + const meterConnection = engine.makeConnection("[Main]", "guiTick50ms", function(_value) { const deckMeters = new Uint8Array(78).fill(0); // Each column has 14 segments, but treat the top one specially for the clip indicator. const deckSegments = 13; diff --git a/res/controllers/Vestax Spin.midi.xml b/res/controllers/Vestax Spin.midi.xml index 35aa0cac734..3d12e8700ee 100644 --- a/res/controllers/Vestax Spin.midi.xml +++ b/res/controllers/Vestax Spin.midi.xml @@ -409,7 +409,7 @@ - [Master] + [Main] crossfader 0xB2 0x08 diff --git a/res/controllers/Vestax Typhoon Enhanced.midi.xml b/res/controllers/Vestax Typhoon Enhanced.midi.xml index 30f3094eb77..ed84c716313 100644 --- a/res/controllers/Vestax Typhoon Enhanced.midi.xml +++ b/res/controllers/Vestax Typhoon Enhanced.midi.xml @@ -448,7 +448,7 @@ 0x5d - [Master] + [Main] crossfader 0xB2 0x08 diff --git a/res/controllers/Vestax Typhoon.midi.xml b/res/controllers/Vestax Typhoon.midi.xml index 3eb724c338a..db70356bc42 100644 --- a/res/controllers/Vestax Typhoon.midi.xml +++ b/res/controllers/Vestax Typhoon.midi.xml @@ -458,7 +458,7 @@ 0x5d - [Master] + [Main] crossfader 0xB2 0x08 diff --git a/res/controllers/Vestax VCI-100-3DEX.midi.xml b/res/controllers/Vestax VCI-100-3DEX.midi.xml index 3ec8b09fdc3..e1391429d9a 100644 --- a/res/controllers/Vestax VCI-100-3DEX.midi.xml +++ b/res/controllers/Vestax VCI-100-3DEX.midi.xml @@ -12,25 +12,25 @@ - [Master] + [Main] crossfader 0xB0 0x08 - [Master] + [Main] volume 0xB0 0x07 - [Master] + [Main] headVolume 0xB0 0x58 - [Master] + [Main] headMix 0xB0 0x59 @@ -38,7 +38,7 @@ - [Master] + [Main] VestaxVCI1003DEX.loopin 0x90 0x62 @@ -47,7 +47,7 @@ - [Master] + [Main] VestaxVCI1003DEX.loopin 0x80 0x62 @@ -56,7 +56,7 @@ - [Master] + [Main] VestaxVCI1003DEX.loopout 0x90 0x63 @@ -65,7 +65,7 @@ - [Master] + [Main] VestaxVCI1003DEX.loopout 0x80 0x63 @@ -74,7 +74,7 @@ - [Master] + [Main] VestaxVCI1003DEX.reloop_exit 0x90 0x64 @@ -83,7 +83,7 @@ - [Master] + [Main] VestaxVCI1003DEX.reloop_exit 0x80 0x64 @@ -137,7 +137,7 @@ - [Master] + [Main] VestaxVCI1003DEX.loopMinus 0x90 0x65 @@ -146,7 +146,7 @@ - [Master] + [Main] VestaxVCI1003DEX.loopMinus 0x80 0x65 @@ -155,7 +155,7 @@ - [Master] + [Main] VestaxVCI1003DEX.loopPlus 0x90 0x66 @@ -164,7 +164,7 @@ - [Master] + [Main] VestaxVCI1003DEX.loopPlus 0x80 0x66 diff --git a/res/controllers/Vestax VCI-100-hile.midi.xml b/res/controllers/Vestax VCI-100-hile.midi.xml index 59a29e063f4..8bc84ef187f 100644 --- a/res/controllers/Vestax VCI-100-hile.midi.xml +++ b/res/controllers/Vestax VCI-100-hile.midi.xml @@ -11,24 +11,24 @@ - 0xB00x07[Master]HileVci100.faders - 0xB00x08[Master]HileVci100.faders - 0xB00x0c[Master]HileVci100.faders - 0xB00x0d[Master]HileVci100.faders - 0xB00x58[Master]HileVci100.faders - 0xB00x59[Master]HileVci100.faders - 0xB00x1e[Master]HileVci100.faders - 0xB00x1f[Master]HileVci100.faders - 0xB00x1c[Master]HileVci100.faders - 0xB00x1d[Master]HileVci100.faders - 0xB00x14[Master]HileVci100.faders - 0xB00x15[Master]HileVci100.faders - 0xB00x16[Master]HileVci100.faders - 0xB00x17[Master]HileVci100.faders - 0xB00x18[Master]HileVci100.faders - 0xB00x19[Master]HileVci100.faders - 0xB00x1a[Master]HileVci100.faders - 0xB00x1b[Master]HileVci100.faders + 0xB00x07[Main]HileVci100.faders + 0xB00x08[Main]HileVci100.faders + 0xB00x0c[Main]HileVci100.faders + 0xB00x0d[Main]HileVci100.faders + 0xB00x58[Main]HileVci100.faders + 0xB00x59[Main]HileVci100.faders + 0xB00x1e[Main]HileVci100.faders + 0xB00x1f[Main]HileVci100.faders + 0xB00x1c[Main]HileVci100.faders + 0xB00x1d[Main]HileVci100.faders + 0xB00x14[Main]HileVci100.faders + 0xB00x15[Main]HileVci100.faders + 0xB00x16[Main]HileVci100.faders + 0xB00x17[Main]HileVci100.faders + 0xB00x18[Main]HileVci100.faders + 0xB00x19[Main]HileVci100.faders + 0xB00x1a[Main]HileVci100.faders + 0xB00x1b[Main]HileVci100.faders 0x900x60[Playlist]HileVci100.buttons diff --git a/res/controllers/Vestax VCI-100.midi.xml b/res/controllers/Vestax VCI-100.midi.xml index b76bc265222..896d5601892 100644 --- a/res/controllers/Vestax VCI-100.midi.xml +++ b/res/controllers/Vestax VCI-100.midi.xml @@ -12,31 +12,31 @@ - [Master] + [Main] crossfader 0xB0 0x08 - [Master] + [Main] volume 0xB0 0x07 - [Master] + [Main] headVolume 0xB0 0x58 - [Master] + [Main] headMix 0xB0 0x59 - [Master] + [Main] balance 0xB0 0x1f @@ -44,7 +44,7 @@ - [Master] + [Main] VestaxVCI100.key1 0x90 0x62 @@ -53,7 +53,7 @@ - [Master] + [Main] VestaxVCI100.key1 0x80 0x62 @@ -62,7 +62,7 @@ - [Master] + [Main] VestaxVCI100.key2 0x90 0x63 @@ -71,7 +71,7 @@ - [Master] + [Main] VestaxVCI100.key2 0x80 0x63 @@ -80,7 +80,7 @@ - [Master] + [Main] VestaxVCI100.key3 0x90 0x64 @@ -89,7 +89,7 @@ - [Master] + [Main] VestaxVCI100.key3 0x80 0x64 diff --git a/res/controllers/Vestax VCI-100MKII.midi.xml b/res/controllers/Vestax VCI-100MKII.midi.xml index 499c54e9706..faabeaf129d 100644 --- a/res/controllers/Vestax VCI-100MKII.midi.xml +++ b/res/controllers/Vestax VCI-100MKII.midi.xml @@ -12,7 +12,7 @@ - [Master] + [Main] crossfader 0xB4 0x10 @@ -21,7 +21,7 @@ - [Master] + [Main] crossfader 0xB4 0x20 @@ -30,7 +30,7 @@ - [Master] + [Main] headGain 0xB4 0x12 @@ -39,13 +39,13 @@ - [Master] + [Main] headMix 0xB4 0x13 - [Master] + [Main] gain 0xB4 0x14 diff --git a/res/controllers/Vestax VCI-300.midi.xml b/res/controllers/Vestax VCI-300.midi.xml index 491e43f3edc..b4527fa8fe6 100644 --- a/res/controllers/Vestax VCI-300.midi.xml +++ b/res/controllers/Vestax VCI-300.midi.xml @@ -13,13 +13,13 @@ - [Master] + [Main] 0x18 0xB0 crossfader - [Master] + [Main] 0x1A 0xB0 VestaxVCI300.onCrossfaderCurve @@ -28,7 +28,7 @@ - [Master] + [Main] 0x1B 0xB0 VestaxVCI300.onLinefaderCurve @@ -37,7 +37,7 @@ - [Master] + [Main] 0x19 0xB0 headMix @@ -46,7 +46,7 @@ - [Master] + [Main] 0x52 0x90 VestaxVCI300.onScrollButton @@ -56,7 +56,7 @@ - [Master] + [Main] 0x4A 0x90 VestaxVCI300.onCratesButton @@ -65,7 +65,7 @@ - [Master] + [Main] 0x4B 0x90 VestaxVCI300.onFilesButton @@ -74,7 +74,7 @@ - [Master] + [Main] 0x4C 0x90 VestaxVCI300.onBrowseButton @@ -83,7 +83,7 @@ - [Master] + [Main] 0x4D 0x90 VestaxVCI300.onNavigationUpButton @@ -92,7 +92,7 @@ - [Master] + [Main] 0x4E 0x90 VestaxVCI300.onNavigationDownButton @@ -101,7 +101,7 @@ - [Master] + [Main] 0x4F 0x90 VestaxVCI300.onNavigationBackButton @@ -110,7 +110,7 @@ - [Master] + [Main] 0x50 0x90 VestaxVCI300.onNavigationFwdButton @@ -119,7 +119,7 @@ - [Master] + [Main] 0x51 0x90 VestaxVCI300.onNavigationTabButton diff --git a/res/controllers/Vestax VCI-400.midi.xml b/res/controllers/Vestax VCI-400.midi.xml index cebe07e2895..d09f1704a37 100644 --- a/res/controllers/Vestax VCI-400.midi.xml +++ b/res/controllers/Vestax VCI-400.midi.xml @@ -12,7 +12,7 @@ - [Master] + [Main] VestaxVCI400.shiftActivate 0x90 0x01 @@ -61,7 +61,7 @@ - [Master] + [Main] VestaxVCI400.fx1ToggleButton1 0x9C 0x01 @@ -70,7 +70,7 @@ - [Master] + [Main] VestaxVCI400.fx2ToggleButton1 0x9D 0x01 @@ -157,7 +157,7 @@ - [Master] + [Main] VestaxVCI400.fx1ToggleButton2 0x9C 0x02 @@ -166,7 +166,7 @@ - [Master] + [Main] VestaxVCI400.fx2ToggleButton2 0x9D 0x02 @@ -253,7 +253,7 @@ - [Master] + [Main] VestaxVCI400.fx1ToggleButton3 0x9C 0x03 @@ -262,7 +262,7 @@ - [Master] + [Main] VestaxVCI400.fx2ToggleButton3 0x9D 0x03 @@ -331,7 +331,7 @@ - [Master] + [Main] VestaxVCI400.fx1ToggleButton4 0x9C 0x04 @@ -340,7 +340,7 @@ - [Master] + [Main] VestaxVCI400.fx2ToggleButton4 0x9D 0x04 @@ -600,7 +600,7 @@ [EffectRack1_EffectUnit1] - group_[Master]_enable + group_[Main]_enable MIDI Learned from 2 messages. 0x9C 0x08 @@ -610,7 +610,7 @@ [EffectRack1_EffectUnit2] - group_[Master]_enable + group_[Main]_enable MIDI Learned from 4 messages. 0x9D 0x08 @@ -1274,7 +1274,7 @@ - [Master] + [Main] crossfader 0xB0 0x14 @@ -1878,7 +1878,7 @@ - [Master] + [Main] headMix 0xBE 0x2A @@ -1887,7 +1887,7 @@ - [Master] + [Main] volume MIDI Learned from 928 messages. 0xBE @@ -2329,7 +2329,7 @@ [EffectRack1_EffectUnit1] - group_[Master]_enable + group_[Main]_enable 0x9C 0x08 0.5 @@ -2371,7 +2371,7 @@ [EffectRack1_EffectUnit2] - group_[Master]_enable + group_[Main]_enable 0x9D 0x08 0.5 diff --git a/res/controllers/Vestax-Spin-scripts.js b/res/controllers/Vestax-Spin-scripts.js index e8f18e4eae7..fa2c81eb282 100644 --- a/res/controllers/Vestax-Spin-scripts.js +++ b/res/controllers/Vestax-Spin-scripts.js @@ -5,7 +5,7 @@ // move vu's to script? or fix bug in midi output saving VestaxSpin = new function() { - this.group = "[Master]"; + this.group = "[Main]"; this.decks = []; this.buttons = []; this.controls = []; diff --git a/res/controllers/Vestax-VCI-100-hile.js b/res/controllers/Vestax-VCI-100-hile.js index c24493a2377..ae520f21ffd 100644 --- a/res/controllers/Vestax-VCI-100-hile.js +++ b/res/controllers/Vestax-VCI-100-hile.js @@ -196,7 +196,7 @@ HileVci100.registerScalers = function() { HileVci100.registerInputs = function() { HileVci100.modifiers = new Object(); - HileVci100.modifiers["[Master]"] = new Object(); + HileVci100.modifiers["[Main]"] = new Object(); HileVci100.modifiers["[Channel1]"] = new Object(); HileVci100.modifiers["[Channel2]"] = new Object(); @@ -260,9 +260,9 @@ HileVci100.registerInputs = function() { HileVci100.linkFader("deck2_eq2","[Channel2]","filterHigh","eq"); HileVci100.linkFader("deck2_eq3","[Channel2]","filterMid","eq"); HileVci100.linkFader("deck2_eq4","[Channel2]","filterLow","eq"); - HileVci100.linkFader("crossfader","[Master]","crossfader"); - HileVci100.linkFader("deck1_trim","[Master]","headVolume","master"); - HileVci100.linkFader("deck2_trim","[Master]","headMix","crossfader"); + HileVci100.linkFader("crossfader","[Main]","crossfader"); + HileVci100.linkFader("deck1_trim","[Main]","headVolume","master"); + HileVci100.linkFader("deck2_trim","[Main]","headMix","crossfader"); }; diff --git a/res/controllers/Vestax-VCI-100-scripts.js b/res/controllers/Vestax-VCI-100-scripts.js index 8480ff430d7..809b267444d 100644 --- a/res/controllers/Vestax-VCI-100-scripts.js +++ b/res/controllers/Vestax-VCI-100-scripts.js @@ -1,5 +1,5 @@ VestaxVCI100 = new function() { - this.group = "[Master]"; + this.group = "[Main]"; this.loopHotcueDeck = null; this.shiftMode = false; this.jogPlaylistScrollMode = false; diff --git a/res/controllers/Vestax-VCI-100MKII-scripts.js b/res/controllers/Vestax-VCI-100MKII-scripts.js index b8c44ff9b72..a4ff19ab0d7 100644 --- a/res/controllers/Vestax-VCI-100MKII-scripts.js +++ b/res/controllers/Vestax-VCI-100MKII-scripts.js @@ -405,14 +405,14 @@ VCI102.init = function(id, debug) { function headMix(value, group, key) { if (value) { - if (engine.getValue("[Master]", "headMix") == 1) { - engine.setValue("[Master]", "headMix", -1); + if (engine.getValue("[Main]", "headMix") == 1) { + engine.setValue("[Main]", "headMix", -1); } - } else if (engine.getValue("[Master]", "headMix") == -1) { + } else if (engine.getValue("[Main]", "headMix") == -1) { if (VCI102.deck.every(function(deck) { return !engine.getValue(deck, "pfl"); })) { - engine.setValue("[Master]", "headMix", 1); + engine.setValue("[Main]", "headMix", 1); } } } diff --git a/res/controllers/Vestax-VCI-300-scripts.js b/res/controllers/Vestax-VCI-300-scripts.js index 66f46da06fb..87b19a4c658 100644 --- a/res/controllers/Vestax-VCI-300-scripts.js +++ b/res/controllers/Vestax-VCI-300-scripts.js @@ -208,7 +208,7 @@ function VestaxVCI300() {} -VestaxVCI300.group = "[Master]"; +VestaxVCI300.group = "[Main]"; VestaxVCI300.JOG_RESOLUTION = 1600; // Steps per revolution: (0x0C << 7) + 0x40 = 1536 + 64 = 1600 diff --git a/res/controllers/Vestax-VCI-400-scripts.js b/res/controllers/Vestax-VCI-400-scripts.js index 11776ca975a..683377d9dd4 100644 --- a/res/controllers/Vestax-VCI-400-scripts.js +++ b/res/controllers/Vestax-VCI-400-scripts.js @@ -17,7 +17,7 @@ Owen todo: * buttons and controls affecting the MASTER output */ VestaxVCI400 = new function() { - this.group = "[Master]"; + this.group = "[Main]"; this.Controls = []; //The list of control objects, i.e., knobs this.Buttons = []; //The list of buttons objects } @@ -37,7 +37,7 @@ VestaxVCI400.ModeEnum = { * Called when the MIDI device is opened for set up */ VestaxVCI400.init = function (id) { - engine.setValue("[Master]", "num_decks", 4); + engine.setValue("[Main]", "num_decks", 4); //Initialize controls and their default values here VestaxVCI400.Decks.A.init(); VestaxVCI400.Decks.B.init(); @@ -46,8 +46,8 @@ VestaxVCI400.init = function (id) { //Connect vu meters // No need if using the sound card - engine.connectControl("[Master]","VuMeterL", "VestaxVCI400.onMasterVuMeterLChanged"); - engine.connectControl("[Master]","VuMeterR", "VestaxVCI400.onMasterVuMeterRChanged"); + engine.connectControl("[Main]","VuMeterL", "VestaxVCI400.onMasterVuMeterLChanged"); + engine.connectControl("[Main]","VuMeterR", "VestaxVCI400.onMasterVuMeterRChanged"); //Reset VU meters if (VestaxVCI400.enableMasterVu) { diff --git a/res/controllers/Wireless DJ App.midi.xml b/res/controllers/Wireless DJ App.midi.xml index a1d32ae0a52..141ffa3b534 100644 --- a/res/controllers/Wireless DJ App.midi.xml +++ b/res/controllers/Wireless DJ App.midi.xml @@ -358,7 +358,7 @@ 0xb0 0x1a - [Master] + [Main] crossfader @@ -367,7 +367,7 @@ 0xb0 0x1b - [Master] + [Main] headMix diff --git a/res/controllers/Wireless-DJ-scripts.js b/res/controllers/Wireless-DJ-scripts.js index a070378d6ba..360ef942b94 100644 --- a/res/controllers/Wireless-DJ-scripts.js +++ b/res/controllers/Wireless-DJ-scripts.js @@ -18,8 +18,8 @@ WirelessDJ.init = function(id) { // LEDs engine.connectControl("[Channel1]", "VuMeter", "WirelessDJ.meter"); engine.connectControl("[Channel2]", "VuMeter", "WirelessDJ.meter"); - engine.connectControl("[Master]", "VuMeterL", "WirelessDJ.meter"); - engine.connectControl("[Master]", "VuMeterR", "WirelessDJ.meter"); + engine.connectControl("[Main]", "VuMeterL", "WirelessDJ.meter"); + engine.connectControl("[Main]", "VuMeterR", "WirelessDJ.meter"); // sliders feedback engine.connectControl("[Channel1]", "rate", "WirelessDJ.controlFeedback"); @@ -32,8 +32,8 @@ WirelessDJ.init = function(id) { engine.connectControl("[Channel2]", "filterHigh", "WirelessDJ.controlFeedback"); engine.connectControl("[Channel2]", "filterMid", "WirelessDJ.controlFeedback"); engine.connectControl("[Channel2]", "filterLow", "WirelessDJ.controlFeedback"); - engine.connectControl("[Master]", "crossfader", "WirelessDJ.controlFeedback"); - engine.connectControl("[Master]", "headMix", "WirelessDJ.controlFeedback"); + engine.connectControl("[Main]", "crossfader", "WirelessDJ.controlFeedback"); + engine.connectControl("[Main]", "headMix", "WirelessDJ.controlFeedback"); engine.connectControl("[Flanger]", "lfoPeriod", "WirelessDJ.controlFeedback"); engine.connectControl("[Flanger]", "lfoDepth", "WirelessDJ.controlFeedback"); engine.connectControl("[Flanger]", "lfoDelay", "WirelessDJ.controlFeedback"); @@ -50,8 +50,8 @@ WirelessDJ.init = function(id) { WirelessDJ.shutdown = function(id) { engine.connectControl("[Channel1]", "VuMeter", "WirelessDJ.meter", true); engine.connectControl("[Channel2]", "VuMeter", "WirelessDJ.meter", true); - engine.connectControl("[Master]", "VuMeterL", "WirelessDJ.meter", true); - engine.connectControl("[Master]", "VuMeterR", "WirelessDJ.meter", true); + engine.connectControl("[Main]", "VuMeterL", "WirelessDJ.meter", true); + engine.connectControl("[Main]", "VuMeterR", "WirelessDJ.meter", true); engine.connectControl("[Channel1]", "rate", "WirelessDJ.controlFeedback", true); engine.connectControl("[Channel1]", "volume", "WirelessDJ.controlFeedback", true); @@ -63,8 +63,8 @@ WirelessDJ.shutdown = function(id) { engine.connectControl("[Channel2]", "filterHigh", "WirelessDJ.controlFeedback", true); engine.connectControl("[Channel2]", "filterMid", "WirelessDJ.controlFeedback", true); engine.connectControl("[Channel2]", "filterLow", "WirelessDJ.controlFeedback", true); - engine.connectControl("[Master]", "crossfader", "WirelessDJ.controlFeedback", true); - engine.connectControl("[Master]", "headMix", "WirelessDJ.controlFeedback", true); + engine.connectControl("[Main]", "crossfader", "WirelessDJ.controlFeedback", true); + engine.connectControl("[Main]", "headMix", "WirelessDJ.controlFeedback", true); engine.connectControl("[Flanger]", "lfoPeriod", "WirelessDJ.controlFeedback", true); engine.connectControl("[Flanger]", "lfoDepth", "WirelessDJ.controlFeedback", true); engine.connectControl("[Flanger]", "lfoDelay", "WirelessDJ.controlFeedback", true); diff --git a/res/controllers/Yaeltex-MiniMixxx-scripts.js b/res/controllers/Yaeltex-MiniMixxx-scripts.js index f46e5f78108..4c6d90434d0 100644 --- a/res/controllers/Yaeltex-MiniMixxx-scripts.js +++ b/res/controllers/Yaeltex-MiniMixxx-scripts.js @@ -72,16 +72,16 @@ MiniMixxx.Encoder = class { this.encoders[mode] = new MiniMixxx.EncoderModeLibraryHorizontal(this, channel, idx); break; case "MAINGAIN": - this.encoders[mode] = new MiniMixxx.EncoderModeMainGain(this, "[Master]", idx); + this.encoders[mode] = new MiniMixxx.EncoderModeMainGain(this, "[Main]", idx); break; case "BALANCE": - this.encoders[mode] = new MiniMixxx.EncoderModeBalance(this, "[Master]", idx); + this.encoders[mode] = new MiniMixxx.EncoderModeBalance(this, "[Main]", idx); break; case "HEADGAIN": - this.encoders[mode] = new MiniMixxx.EncoderModeHeadGain(this, "[Master]", idx); + this.encoders[mode] = new MiniMixxx.EncoderModeHeadGain(this, "[Main]", idx); break; case "HEADMIX": - this.encoders[mode] = new MiniMixxx.EncoderModeHeadMix(this, "[Master]", idx); + this.encoders[mode] = new MiniMixxx.EncoderModeHeadMix(this, "[Main]", idx); break; default: console.log("Ignoring unknown encoder mode: " + mode); @@ -628,14 +628,14 @@ MiniMixxx.EncoderModeMainGain = class extends MiniMixxx.Mode { super(parent, "MAINGAIN", channel, idx); this.color = MiniMixxx.MainOutColor; - engine.makeConnection("[Master]", "gain", this.gainIndicator.bind(this)); - engine.makeConnection("[Master]", "booth_gain", this.gainIndicator.bind(this)); + engine.makeConnection("[Main]", "gain", this.gainIndicator.bind(this)); + engine.makeConnection("[Main]", "booth_gain", this.gainIndicator.bind(this)); } handleSpin(velo) { if (MiniMixxx.kontrol.shiftActive()) { - engine.setValue("[Master]", "booth_gain", engine.getValue("[Master]", "booth_gain") + .02 * velo); + engine.setValue("[Main]", "booth_gain", engine.getValue("[Main]", "booth_gain") + .02 * velo); } else { - engine.setValue("[Master]", "gain", engine.getValue("[Master]", "gain") + .02 * velo); + engine.setValue("[Main]", "gain", engine.getValue("[Main]", "gain") + .02 * velo); } } handlePress(value) { @@ -643,9 +643,9 @@ MiniMixxx.EncoderModeMainGain = class extends MiniMixxx.Mode { return; } if (MiniMixxx.kontrol.shiftActive()) { - engine.setValue("[Master]", "booth_gain", 1.0); + engine.setValue("[Main]", "booth_gain", 1.0); } else { - engine.setValue("[Master]", "gain", 1.0); + engine.setValue("[Main]", "gain", 1.0); } } gainIndicator(value, _group, _control) { @@ -658,7 +658,7 @@ MiniMixxx.EncoderModeMainGain = class extends MiniMixxx.Mode { } setLights() { midi.sendShortMsg(0x90, this.idx, this.color); - this.gainIndicator(engine.getValue("[Master]", "gain")); + this.gainIndicator(engine.getValue("[Main]", "gain")); } }; @@ -672,16 +672,16 @@ MiniMixxx.EncoderModeHeadGain = class extends MiniMixxx.Mode { super(parent, "HEADGAIN", channel, idx); this.color = MiniMixxx.HeadOutColor; - engine.makeConnection("[Master]", "headGain", this.gainIndicator.bind(this)); + engine.makeConnection("[Main]", "headGain", this.gainIndicator.bind(this)); } handleSpin(velo) { - engine.setValue("[Master]", "headGain", engine.getValue("[Master]", "headGain") + .02 * velo); + engine.setValue("[Main]", "headGain", engine.getValue("[Main]", "headGain") + .02 * velo); } handlePress(value) { if (value === 0) { return; } - engine.setValue("[Master]", "headGain", 1.0); + engine.setValue("[Main]", "headGain", 1.0); } gainIndicator(value, _group, _control) { if (this !== this.parent.activeMode) { @@ -693,7 +693,7 @@ MiniMixxx.EncoderModeHeadGain = class extends MiniMixxx.Mode { } setLights() { midi.sendShortMsg(0x90, this.idx, this.color); - this.gainIndicator(engine.getValue("[Master]", "headGain")); + this.gainIndicator(engine.getValue("[Main]", "headGain")); } }; @@ -707,16 +707,16 @@ MiniMixxx.EncoderModeBalance = class extends MiniMixxx.Mode { super(parent, "BALANCE", channel, idx); this.color = MiniMixxx.MainOutColor; - engine.makeConnection("[Master]", "balance", this.balIndicator.bind(this)); + engine.makeConnection("[Main]", "balance", this.balIndicator.bind(this)); } handleSpin(velo) { - engine.setValue("[Master]", "balance", engine.getValue("[Master]", "balance") + .01 * velo); + engine.setValue("[Main]", "balance", engine.getValue("[Main]", "balance") + .01 * velo); } handlePress(value) { if (value === 0) { return; } - engine.setValue("[Master]", "balance", 0.0); + engine.setValue("[Main]", "balance", 0.0); } balIndicator(value, _group, _control) { if (this !== this.parent.activeMode) { @@ -727,7 +727,7 @@ MiniMixxx.EncoderModeBalance = class extends MiniMixxx.Mode { midi.sendShortMsg(0xB0, this.idx, (value + 1.0) * 64.0 - 1.0); } setLights() { - this.balIndicator(engine.getValue("[Master]", "balance")); + this.balIndicator(engine.getValue("[Main]", "balance")); midi.sendShortMsg(0x90, this.idx, this.color); } }; @@ -742,16 +742,16 @@ MiniMixxx.EncoderModeHeadMix = class extends MiniMixxx.Mode { super(parent, "HEADMIX", channel, idx); this.color = MiniMixxx.HeadOutColor; - engine.makeConnection("[Master]", "headMix", this.mixIndicator.bind(this)); + engine.makeConnection("[Main]", "headMix", this.mixIndicator.bind(this)); } handleSpin(velo) { - engine.setValue("[Master]", "headMix", engine.getValue("[Master]", "headMix") + .01 * velo); + engine.setValue("[Main]", "headMix", engine.getValue("[Main]", "headMix") + .01 * velo); } handlePress(value) { if (value === 0) { return; } - engine.setValue("[Master]", "headMix", 0.0); + engine.setValue("[Main]", "headMix", 0.0); } mixIndicator(value, _group, _control) { if (this !== this.parent.activeMode) { @@ -762,7 +762,7 @@ MiniMixxx.EncoderModeHeadMix = class extends MiniMixxx.Mode { midi.sendShortMsg(0xB0, this.idx, (value + 1.0) * 64.0 - 1.0); } setLights() { - this.mixIndicator(engine.getValue("[Master]", "headMix")); + this.mixIndicator(engine.getValue("[Main]", "headMix")); midi.sendShortMsg(0x90, this.idx, this.color); } }; @@ -1426,7 +1426,7 @@ MiniMixxx.Controller = class { this.buttons[name].activeMode.setLights(); } - this.guiTickConnection = engine.makeConnection("[Master]", "guiTick50ms", this.guiTickHandler.bind(this)); + this.guiTickConnection = engine.makeConnection("[Main]", "guiTick50ms", this.guiTickHandler.bind(this)); } diff --git a/res/controllers/common-controller-scripts.js b/res/controllers/common-controller-scripts.js index 68eed589541..47f41ffa7ca 100644 --- a/res/controllers/common-controller-scripts.js +++ b/res/controllers/common-controller-scripts.js @@ -577,7 +577,7 @@ var LedState = {"off": 0x00, "on": 0x7F}; // Controller var Controller = function() { - this.group = "[Master]"; + this.group = "[Main]"; this.Controls = []; this.Buttons = []; }; diff --git a/res/controllers/common-hid-packet-parser.js b/res/controllers/common-hid-packet-parser.js index ea2016c5eff..86bf6bdd3bb 100644 --- a/res/controllers/common-hid-packet-parser.js +++ b/res/controllers/common-hid-packet-parser.js @@ -1252,7 +1252,7 @@ class HIDController { "[Sampler6]", "[Sampler7]", "[Sampler8]", - "[Master]", + "[Main]", "[PreviewDeck1]", "[Effects]", "[Playlist]", @@ -2085,7 +2085,7 @@ class HIDController { deck = 1; } else { // This is unusable: num_decks has always minimum 4 decks - // var totalDecks = engine.getValue("[Master]","num_decks"); + // var totalDecks = engine.getValue("[Main]","num_decks"); // deck = (this.activeDeck+1) % totalDecks; deck = this.deckSwitchMap[this.activeDeck]; if (deck === undefined) { diff --git a/res/controllers/midi-components-0.0.js b/res/controllers/midi-components-0.0.js index e0cc0d7bcff..fc46b03ae02 100644 --- a/res/controllers/midi-components-0.0.js +++ b/res/controllers/midi-components-0.0.js @@ -975,7 +975,7 @@ 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) { if (this.MSB !== undefined) { diff --git a/res/controllers/us428.midi.xml b/res/controllers/us428.midi.xml index d20fd7d5f1b..ab42bf7f1d2 100644 --- a/res/controllers/us428.midi.xml +++ b/res/controllers/us428.midi.xml @@ -9,13 +9,13 @@ - [Master] + [Main] crossfader 0xB0 0xa4 - [Master] + [Main] headVolume 0xB0 0x4c @@ -24,7 +24,7 @@ - [Master] + [Main] headMix 0xB0 0x4d diff --git a/res/keyboard/cs_CZ.kbd.cfg b/res/keyboard/cs_CZ.kbd.cfg index e77da06915a..580982a7f6d 100644 --- a/res/keyboard/cs_CZ.kbd.cfg +++ b/res/keyboard/cs_CZ.kbd.cfg @@ -4,7 +4,7 @@ skip_next Shift+F10 fade_now Shift+F11 enabled Shift+F12 -[Master] +[Main] crossfader_up h crossfader_down g crossfader_up_small Shift+h diff --git a/res/keyboard/da_DK.kbd.cfg b/res/keyboard/da_DK.kbd.cfg index 69aa97d87c5..f67746cf288 100644 --- a/res/keyboard/da_DK.kbd.cfg +++ b/res/keyboard/da_DK.kbd.cfg @@ -4,7 +4,7 @@ skip_next Shift+F10 fade_now Shift+F11 enabled Shift+F12 -[Master] +[Main] crossfader_up h crossfader_down g crossfader_up_small Shift+h diff --git a/res/keyboard/de_CH.kbd.cfg b/res/keyboard/de_CH.kbd.cfg index 8c6577da84d..b036fb22d85 100644 --- a/res/keyboard/de_CH.kbd.cfg +++ b/res/keyboard/de_CH.kbd.cfg @@ -4,7 +4,7 @@ skip_next Shift+F10 fade_now Shift+F11 enabled Shift+F12 -[Master] +[Main] crossfader_up h crossfader_down g crossfader_up_small Shift+h diff --git a/res/keyboard/de_DE.kbd.cfg b/res/keyboard/de_DE.kbd.cfg index bb48d729a4e..c8efd1ea162 100644 --- a/res/keyboard/de_DE.kbd.cfg +++ b/res/keyboard/de_DE.kbd.cfg @@ -4,7 +4,7 @@ skip_next Shift+F10 fade_now Shift+F11 enabled Shift+F12 -[Master] +[Main] crossfader_up h crossfader_down g crossfader_up_small Shift+h diff --git a/res/keyboard/el_GR.kbd.cfg b/res/keyboard/el_GR.kbd.cfg index fe519aeef24..04574f6893c 100644 --- a/res/keyboard/el_GR.kbd.cfg +++ b/res/keyboard/el_GR.kbd.cfg @@ -4,7 +4,7 @@ skip_next Shift+F10 fade_now Shift+F11 enabled Shift+F12 -[Master] +[Main] crossfader_up η crossfader_down γ crossfader_up_small Shift+Η diff --git a/res/keyboard/en_US.kbd.cfg b/res/keyboard/en_US.kbd.cfg index 0ea286df5c8..e1c5f5a87e0 100644 --- a/res/keyboard/en_US.kbd.cfg +++ b/res/keyboard/en_US.kbd.cfg @@ -4,7 +4,7 @@ skip_next Shift+F10 fade_now Shift+F11 enabled Shift+F12 -[Master] +[Main] crossfader_up h crossfader_down g crossfader_up_small Shift+h diff --git a/res/keyboard/es_ES.kbd.cfg b/res/keyboard/es_ES.kbd.cfg index 5c62da6621a..5d32b174cd0 100644 --- a/res/keyboard/es_ES.kbd.cfg +++ b/res/keyboard/es_ES.kbd.cfg @@ -4,7 +4,7 @@ skip_next Shift+F10 fade_now Shift+F11 enabled Shift+F12 -[Master] +[Main] crossfader_up h crossfader_down g crossfader_up_small Shift+h diff --git a/res/keyboard/fi_FI.kbd.cfg b/res/keyboard/fi_FI.kbd.cfg index f0c4b5ae4a2..10cd6b056ab 100644 --- a/res/keyboard/fi_FI.kbd.cfg +++ b/res/keyboard/fi_FI.kbd.cfg @@ -4,7 +4,7 @@ skip_next Shift+F10 fade_now Shift+F11 enabled Shift+F12 -[Master] +[Main] crossfader_up h crossfader_down g crossfader_up_small Shift+h diff --git a/res/keyboard/fr_CH.kbd.cfg b/res/keyboard/fr_CH.kbd.cfg index f51a605dd52..570e26f98dc 100644 --- a/res/keyboard/fr_CH.kbd.cfg +++ b/res/keyboard/fr_CH.kbd.cfg @@ -4,7 +4,7 @@ skip_next Shift+F10 fade_now Shift+F11 enabled Shift+F12 -[Master] +[Main] crossfader_up h crossfader_down g crossfader_up_small Shift+h diff --git a/res/keyboard/fr_FR.kbd.cfg b/res/keyboard/fr_FR.kbd.cfg index 4326799906e..37130577d4d 100644 --- a/res/keyboard/fr_FR.kbd.cfg +++ b/res/keyboard/fr_FR.kbd.cfg @@ -4,7 +4,7 @@ skip_next Shift+F10 fade_now Shift+F11 enabled Shift+F12 -[Master] +[Main] crossfader_up h crossfader_down g crossfader_up_small Shift+h diff --git a/res/keyboard/it_IT.kbd.cfg b/res/keyboard/it_IT.kbd.cfg index 07a0d3732aa..4f9bb5ccc77 100644 --- a/res/keyboard/it_IT.kbd.cfg +++ b/res/keyboard/it_IT.kbd.cfg @@ -4,7 +4,7 @@ skip_next Shift+F10 fade_now Shift+F11 enabled Shift+F12 -[Master] +[Main] crossfader_up h crossfader_down g crossfader_up_small Shift+h diff --git a/res/keyboard/ru_RU.kbd.cfg b/res/keyboard/ru_RU.kbd.cfg index b3cc217e612..9f7a247d4ac 100644 --- a/res/keyboard/ru_RU.kbd.cfg +++ b/res/keyboard/ru_RU.kbd.cfg @@ -4,7 +4,7 @@ skip_next Shift+F10 fade_now Shift+F11 enabled Shift+F12 -[Master] +[Main] crossfader_up Ñ€ crossfader_down п crossfader_up_small Shift+Р diff --git a/res/qml/CrossfaderRow.qml b/res/qml/CrossfaderRow.qml index d19abd48a46..376fe1d16cc 100644 --- a/res/qml/CrossfaderRow.qml +++ b/res/qml/CrossfaderRow.qml @@ -60,7 +60,7 @@ Item { anchors.rightMargin: 5 anchors.verticalCenter: parent.verticalCenter orientation: Qt.Horizontal - group: "[Master]" + group: "[Main]" key: "crossfader" barColor: Theme.crossfaderBarColor barStart: 0.5 diff --git a/res/qml/LibraryControl.qml b/res/qml/LibraryControl.qml index 6ae38d70f5c..5598f143f68 100644 --- a/res/qml/LibraryControl.qml +++ b/res/qml/LibraryControl.qml @@ -97,7 +97,7 @@ Item { Mixxx.ControlProxy { id: numDecksControl - group: "[Master]" + group: "[Main]" key: "num_decks" } @@ -118,7 +118,7 @@ Item { Mixxx.ControlProxy { id: numPreviewDecksControl - group: "[Master]" + group: "[Main]" key: "num_preview_decks" } @@ -139,7 +139,7 @@ Item { Mixxx.ControlProxy { id: numSamplersControl - group: "[Master]" + group: "[Main]" key: "num_samplers" } diff --git a/res/qml/MicrophoneDuckingPanel.qml b/res/qml/MicrophoneDuckingPanel.qml index f73b78bf6fb..f2bc6506488 100644 --- a/res/qml/MicrophoneDuckingPanel.qml +++ b/res/qml/MicrophoneDuckingPanel.qml @@ -16,7 +16,7 @@ Column { width: 50 height: 26 orientation: Qt.Horizontal - group: "[Master]" + group: "[Main]" key: "duckStrength" barColor: Theme.crossfaderBarColor barStart: 1 @@ -53,7 +53,7 @@ Column { this.value = (this.value + 1) % MicrophoneDuckingPanel.DuckingMode.NumModes; } - group: "[Master]" + group: "[Main]" key: "talkoverDucking" } } diff --git a/res/skins/Deere (64 Samplers)/skin.xml b/res/skins/Deere (64 Samplers)/skin.xml index f81e4b36ed8..762df4f9fc6 100644 --- a/res/skins/Deere (64 Samplers)/skin.xml +++ b/res/skins/Deere (64 Samplers)/skin.xml @@ -9,9 +9,9 @@ Creative Commons Attribution, Share-Alike 3.0 Unported - 4 - 64 - 1 + 4 + 64 + 1 1 0 @@ -24,7 +24,7 @@ 1 0 - 1 + 1 1 1 1 @@ -51,26 +51,26 @@ 1 - 0 + 0 0 1 - 0 + 0 0 0 0 0 - 0 + 0 0 0 0 0 - 0 + 0 0 0 0 0 - 0 + 0 0 0 0 @@ -187,7 +187,7 @@ diff --git a/res/skins/LateNight/mixer.xml b/res/skins/LateNight/mixer.xml index a8e47aec42f..21e01f6406b 100644 --- a/res/skins/LateNight/mixer.xml +++ b/res/skins/LateNight/mixer.xml @@ -33,7 +33,7 @@ - [Master],show_mixer + [Main],show_mixer visible @@ -64,7 +64,7 @@ - [Master],show_mixer + [Main],show_mixer visible diff --git a/res/skins/LateNight/mixer/mixer_2decks.xml b/res/skins/LateNight/mixer/mixer_2decks.xml index 81dc15cf7a0..f5993ce011a 100644 --- a/res/skins/LateNight/mixer/mixer_2decks.xml +++ b/res/skins/LateNight/mixer/mixer_2decks.xml @@ -198,7 +198,7 @@ 19.0 false - [Master],crossfader + [Main],crossfader [Skin],show_eq_knobs diff --git a/res/skins/LateNight/mixer/mixer_main_headphone.xml b/res/skins/LateNight/mixer/mixer_main_headphone.xml index 46818480019..5d512fd6153 100644 --- a/res/skins/LateNight/mixer/mixer_main_headphone.xml +++ b/res/skins/LateNight/mixer/mixer_main_headphone.xml @@ -1,6 +1,6 @@ diff --git a/res/skins/Tango/mixer/mixer_headphone.xml b/res/skins/Tango/mixer/mixer_headphone.xml index 6efbc241a1c..c9f453757dc 100644 --- a/res/skins/Tango/mixer/mixer_headphone.xml +++ b/res/skins/Tango/mixer/mixer_headphone.xml @@ -35,7 +35,7 @@ Description: - [Master],headEnabled + [Main],headEnabled visible @@ -60,7 +60,7 @@ Description: 2.000 - [Master],headGain + [Main],headGain @@ -73,7 +73,7 @@ Description: skin:../Tango/knobs_sliders/headMix_scale.svg true - [Master],headMix + [Main],headMix 1f,1min @@ -83,7 +83,7 @@ Description: 30f,22f headSplit_off.svg headSplit_on.svg - [Master],headSplit + [Main],headSplit 2f,1min diff --git a/res/skins/Tango/mixer/mixer_master.xml b/res/skins/Tango/mixer/mixer_master.xml index c14fff83ec3..7070ea4ac94 100644 --- a/res/skins/Tango/mixer/mixer_master.xml +++ b/res/skins/Tango/mixer/mixer_master.xml @@ -27,7 +27,7 @@ Description: 2.000 - [Master],gain + [Main],gain @@ -47,12 +47,12 @@ Description: 2.000 - [Master],booth_gain + [Main],booth_gain - [Master],booth_enabled + [Main],booth_enabled visible @@ -65,7 +65,7 @@ Description: skin:../Tango/knobs_sliders/balance_scale.svg true - [Master],balance + [Main],balance diff --git a/res/skins/Tango/mixer/vumeter_master.xml b/res/skins/Tango/mixer/vumeter_master.xml index bfb1422d37a..6056d9f399a 100644 --- a/res/skins/Tango/mixer/vumeter_master.xml +++ b/res/skins/Tango/mixer/vumeter_master.xml @@ -32,7 +32,7 @@ Refer to https://github.com/mixxxdj/mixxx/issues/9201 - [Master],show_mixer + [Main],show_mixer visible @@ -48,7 +48,7 @@ Refer to https://github.com/mixxxdj/mixxx/issues/9201 - [Master],show_mixer + [Main],show_mixer visible diff --git a/res/skins/Tango/skin.xml b/res/skins/Tango/skin.xml index fbdf04e53f0..e14d6a4b95f 100644 --- a/res/skins/Tango/skin.xml +++ b/res/skins/Tango/skin.xml @@ -37,8 +37,8 @@ --> - 4 - 16 + 4 + 16 1 0 0 @@ -72,7 +72,7 @@ 1 0 - 0 + 0 1 1 1 @@ -92,26 +92,26 @@ 0 - 0 + 0 0 1 - 0 + 0 0 0 0 0 - 0 + 0 0 0 0 0 - 0 + 0 0 0 0 0 - 0 + 0 0 0 0 @@ -328,7 +328,7 @@ min,me 0f,5f @@ -401,7 +401,7 @@ 3f,1min @@ -239,7 +239,7 @@ Description: - [Master],maximize_library + [Main],maximize_library visible @@ -343,7 +343,7 @@ Description: 100 1 - [Master],audio_latency_usage + [Main],audio_latency_usage @@ -369,13 +369,13 @@ Description: 1 - [Master],skin_settings + [Main],skin_settings LeftButton - [Master],skin_settings + [Main],skin_settings visible diff --git a/src/control/control.cpp b/src/control/control.cpp index ce902b34b69..b528f40c7e0 100644 --- a/src/control/control.cpp +++ b/src/control/control.cpp @@ -25,6 +25,11 @@ QHash> s_qCOHash QHash s_qCOAliasHash GUARDED_BY(s_qCOHashMutex); +/// Hash of aliases between group names. Solely used for looking up the first +/// alias associated with a name when adding a new control. +QHash s_qCOGroupAliasHash + GUARDED_BY(s_qCOHashMutex); + /// is used instead of a nullptr, helps to omit null checks everywhere QWeakPointer s_pDefaultCO; } // namespace @@ -125,6 +130,32 @@ void ControlDoublePrivate::insertAlias(const ConfigKey& alias, const ConfigKey& s_qCOHash.insert(alias, pControl); } +// static +void ControlDoublePrivate::insertGroupAlias( + const QString& aliasGroup, const QString& originalGroup) { + MMutexLocker locker(&s_qCOHashMutex); + + // Check if there are any pre-existing control with the group that we want + // to add an alias for and control aliases for them. + for (auto it = s_qCOHash.cbegin(), end = s_qCOHash.cend(); it != end; ++it) { + const auto originalKey = it.key(); + if (originalKey.group != originalGroup) { + continue; + } + + QSharedPointer pControl = it.value(); + if (pControl.isNull()) { + continue; + } + + const auto aliasKey = ConfigKey(aliasGroup, originalKey.item); + s_qCOAliasHash.insert(originalKey, aliasKey); + s_qCOHash.insert(aliasKey, pControl); + } + + s_qCOGroupAliasHash.insert(originalGroup, aliasGroup); +} + // static QSharedPointer ControlDoublePrivate::getControl( const ConfigKey& key, @@ -175,9 +206,22 @@ QSharedPointer ControlDoublePrivate::getControl( bTrack, bPersist, defaultValue)); - const MMutexLocker locker(&s_qCOHashMutex); + s_qCOHashMutex.lock(); //qDebug() << "ControlDoublePrivate::s_qCOHash.insert(" << key.group << "," << key.item << ")"; s_qCOHash.insert(key, pControl); + + // Check if the control's group is aliased. If so, add a corresponding + // alias for this control. + auto it = s_qCOGroupAliasHash.constFind(key.group); + if (it != s_qCOGroupAliasHash.constEnd()) { + QString aliasGroup = it.value(); + auto aliasKey = ConfigKey(aliasGroup, key.item); + s_qCOHashMutex.unlock(); + insertAlias(aliasKey, key); + } else { + s_qCOHashMutex.unlock(); + } + return pControl; } @@ -245,6 +289,18 @@ QHash ControlDoublePrivate::getControlAliases() { return s_qCOAliasHash; } +// static +QString ControlDoublePrivate::getGroupAlias(const QString& group) { + MMutexLocker locker(&s_qCOHashMutex); + + auto it = s_qCOGroupAliasHash.constFind(group); + if (it != s_qCOGroupAliasHash.constEnd()) { + return it.value(); + } + + return QString(); +} + void ControlDoublePrivate::deleteCreatorCO() { delete m_pCreatorCO.fetchAndStoreOrdered(nullptr); } diff --git a/src/control/control.h b/src/control/control.h index 69c6b6e10de..33c2bb18c17 100644 --- a/src/control/control.h +++ b/src/control/control.h @@ -39,6 +39,13 @@ class ControlDoublePrivate : public QObject { // using this UserSettings. static void setUserConfig(const UserSettingsPointer& pConfig); + /// Adds a group alias for the control group `originalGroup`. Can be used + /// for supporting legacy / deprecated controls. Aliases for existing + /// controls with group `originalGroup` are added immediately. For new + /// controls, an alias for new controls with group `originalGroup` is added + /// when they are created. + static void insertGroupAlias(const QString& aliasGroup, const QString& originalGroup); + // Adds a ConfigKey for 'alias' to the control for 'key'. Can be used for // supporting a legacy / deprecated control. The 'key' control must exist // for this to work. @@ -63,6 +70,9 @@ class ControlDoublePrivate : public QObject { static QList> takeAllInstances(); static QHash getControlAliases(); + /// Get the group alias for `group`, or an empty string if there is no + /// alias for `group`. + static QString getGroupAlias(const QString& group); const QString& name() const { return m_name; diff --git a/src/control/controlindicator.cpp b/src/control/controlindicator.cpp index c4734d74f49..97e256d7967 100644 --- a/src/control/controlindicator.cpp +++ b/src/control/controlindicator.cpp @@ -8,9 +8,9 @@ ControlIndicator::ControlIndicator(const ConfigKey& key) : ControlObject(key, false), m_blinkValue(OFF), m_pCOIndicator250millis(make_parented( - "[Master]", "indicator_250millis", this)), + "[Main]", "indicator_250millis", this)), m_pCOIndicator500millis(make_parented( - "[Master]", "indicator_500millis", this)) { + "[Main]", "indicator_500millis", this)) { connect(this, &ControlIndicator::blinkValueChanged, this, diff --git a/src/control/controlindicatortimer.cpp b/src/control/controlindicatortimer.cpp index 989a8e3c07e..5ff1731865a 100644 --- a/src/control/controlindicatortimer.cpp +++ b/src/control/controlindicatortimer.cpp @@ -9,9 +9,9 @@ namespace mixxx { ControlIndicatorTimer::ControlIndicatorTimer(QObject* pParent) : QObject(pParent), m_pCOIndicator250millis(std::make_unique( - ConfigKey("[Master]", "indicator_250millis"))), + ConfigKey("[Main]", "indicator_250millis"))), m_pCOIndicator500millis(std::make_unique( - ConfigKey("[Master]", "indicator_500millis"))), + ConfigKey("[Main]", "indicator_500millis"))), m_nextSwitchTime(0.0), m_pCPGuiTick50ms(nullptr) { m_pCOIndicator250millis->setReadOnly(); @@ -43,7 +43,7 @@ void ControlIndicatorTimer::setLegacyVsyncEnabled(bool enabled) { if (enabled) { m_timer.stop(); - m_pCPGuiTick50ms = std::make_unique(ConfigKey("[Master]", "guiTick50ms")); + m_pCPGuiTick50ms = std::make_unique(ConfigKey("[Main]", "guiTick50ms")); m_pCPGuiTick50ms->connectValueChanged(this, &ControlIndicatorTimer::slotGuiTick50ms); } else { m_pCPGuiTick50ms->disconnect(this); @@ -58,7 +58,7 @@ void ControlIndicatorTimer::slotGuiTick50ms(double cpuTime) { } constexpr double duration = 0.25; - const double tickTime = ControlObject::get(ConfigKey("[Master]", "guiTickTime")); + const double tickTime = ControlObject::get(ConfigKey("[Main]", "guiTickTime")); const double toggles = floor(tickTime / duration); m_nextSwitchTime = (toggles + 1) * duration; slotTimeout(); diff --git a/src/controllers/controlpickermenu.cpp b/src/controllers/controlpickermenu.cpp index 8a49e42b49e..5f56e3cce13 100644 --- a/src/controllers/controlpickermenu.cpp +++ b/src/controllers/controlpickermenu.cpp @@ -45,7 +45,7 @@ ControlPickerMenu::ControlPickerMenu(QWidget* pParent) QMenu* mixerMenu = addSubmenu(tr("Mixer")); // Crossfader / Orientation QMenu* crossfaderMenu = addSubmenu(tr("Crossfader / Orientation"), mixerMenu); - addControl("[Master]", + addControl("[Main]", "crossfader", tr("Crossfader"), tr("Crossfader"), @@ -69,19 +69,19 @@ ControlPickerMenu::ControlPickerMenu(QWidget* pParent) crossfaderMenu); // Main Output QMenu* mainOutputMenu = addSubmenu(tr("Main Output"), mixerMenu); - addControl("[Master]", + addControl("[Main]", "gain", tr("Main Output Gain"), tr("Main Output gain"), mainOutputMenu, true); - addControl("[Master]", + addControl("[Main]", "balance", tr("Main Output Balance"), tr("Main Output balance"), mainOutputMenu, true); - addControl("[Master]", + addControl("[Main]", "delay", tr("Main Output Delay"), tr("Main Output delay"), @@ -89,24 +89,24 @@ ControlPickerMenu::ControlPickerMenu(QWidget* pParent) true); // Headphone QMenu* headphoneMenu = addSubmenu(tr("Headphone"), mixerMenu); - addControl("[Master]", + addControl("[Main]", "headGain", tr("Headphone Gain"), tr("Headphone gain"), headphoneMenu, true); - addControl("[Master]", + addControl("[Main]", "headMix", tr("Headphone Mix"), tr("Headphone mix (pre/main)"), headphoneMenu, true); - addControl("[Master]", + addControl("[Main]", "headSplit", tr("Headphone Split Cue"), tr("Toggle headphone split cueing"), headphoneMenu); - addControl("[Master]", + addControl("[Main]", "headDelay", tr("Headphone Delay"), tr("Headphone delay"), @@ -116,7 +116,7 @@ ControlPickerMenu::ControlPickerMenu(QWidget* pParent) // EQs QMenu* eqMenu = addSubmenu(tr("Equalizers"), mixerMenu); constexpr int kNumEqRacks = 1; - const int iNumDecks = static_cast(ControlObject::get(ConfigKey("[Master]", "num_decks"))); + const int iNumDecks = static_cast(ControlObject::get(ConfigKey("[Main]", "num_decks"))); for (int iRackNumber = 0; iRackNumber < kNumEqRacks; ++iRackNumber) { // TODO: Although there is a mode with 4-band EQs, it's not feasible // right now to add support for learning both it and regular 3-band eqs. @@ -893,7 +893,7 @@ ControlPickerMenu::ControlPickerMenu(QWidget* pParent) QString groupDescriptionPrefix = QString("%1").arg( m_effectUnitStr.arg(iEffectUnitNumber)); - addControl(effectUnitGroup, "group_[Master]_enable", + addControl(effectUnitGroup, "group_[Main]_enable", assignString + m_effectMainOutputStr, // in ComboBox assignString + m_effectMainOutputStr, // description below effectUnitGroups, @@ -921,7 +921,7 @@ ControlPickerMenu::ControlPickerMenu(QWidget* pParent) } const int iNumSamplers = static_cast(ControlObject::get( - ConfigKey("[Master]", "num_samplers"))); + ConfigKey("[Main]", "num_samplers"))); for (int iSamplerNumber = 1; iSamplerNumber <= iNumSamplers; ++iSamplerNumber) { // PlayerManager::groupForSampler is 0-indexed. @@ -937,7 +937,7 @@ ControlPickerMenu::ControlPickerMenu(QWidget* pParent) } const int iNumMicrophones = static_cast(ControlObject::get( - ConfigKey("[Master]", "num_microphones"))); + ConfigKey("[Main]", "num_microphones"))); for (int iMicrophoneNumber = 1; iMicrophoneNumber <= iNumMicrophones; ++iMicrophoneNumber) { QString micGroup = PlayerManager::groupForMicrophone(iMicrophoneNumber - 1); @@ -952,7 +952,7 @@ ControlPickerMenu::ControlPickerMenu(QWidget* pParent) } const int iNumAuxiliaries = static_cast(ControlObject::get( - ConfigKey("[Master]", "num_auxiliaries"))); + ConfigKey("[Main]", "num_auxiliaries"))); for (int iAuxiliaryNumber = 1; iAuxiliaryNumber <= iNumAuxiliaries; ++iAuxiliaryNumber) { QString auxGroup = PlayerManager::groupForAuxiliary(iAuxiliaryNumber - 1); @@ -1112,13 +1112,13 @@ ControlPickerMenu::ControlPickerMenu(QWidget* pParent) microphoneMenu, true, false); - addControl("[Master]", + addControl("[Main]", "duckStrength", tr("Microphone Ducking Strength"), tr("Microphone Ducking Strength"), microphoneMenu, true); - addControl("[Master]", + addControl("[Main]", "talkoverDucking", tr("Microphone Ducking Mode"), tr("Toggle microphone ducking mode (OFF, AUTO, MANUAL)"), @@ -1249,7 +1249,7 @@ ControlPickerMenu::ControlPickerMenu(QWidget* pParent) tr("4 Effect Units Show/Hide"), tr("Switches between showing 2 and 4 effect units"), guiMenu); - addControl("[Master]", + addControl("[Main]", "show_mixer", tr("Mixer Show/Hide"), tr("Show or hide the mixer."), @@ -1259,7 +1259,7 @@ ControlPickerMenu::ControlPickerMenu(QWidget* pParent) tr("Cover Art Show/Hide (Library)"), tr("Show/hide cover art in the library"), guiMenu); - addControl("[Master]", + addControl("[Main]", "maximize_library", tr("Library Maximize/Restore"), tr("Maximize the track library to take up all the available screen " @@ -1392,10 +1392,10 @@ void ControlPickerMenu::addPlayerControl(const QString& control, bool previewdeckControls, bool addReset) { const int iNumSamplers = static_cast( - ControlObject::get(ConfigKey("[Master]", "num_samplers"))); - const int iNumDecks = static_cast(ControlObject::get(ConfigKey("[Master]", "num_decks"))); + ControlObject::get(ConfigKey("[Main]", "num_samplers"))); + const int iNumDecks = static_cast(ControlObject::get(ConfigKey("[Main]", "num_decks"))); const int iNumPreviewDecks = static_cast( - ControlObject::get(ConfigKey("[Master]", "num_preview_decks"))); + ControlObject::get(ConfigKey("[Main]", "num_preview_decks"))); parented_ptr controlMenu = make_parented(controlTitle, pMenu); pMenu->addMenu(controlMenu); @@ -1518,7 +1518,7 @@ void ControlPickerMenu::addMicrophoneAndAuxControl(const QString& control, if (microphoneControls) { const int kNumMicrophones = static_cast( - ControlObject::get(ConfigKey("[Master]", "num_microphones"))); + ControlObject::get(ConfigKey("[Main]", "num_microphones"))); for (int i = 1; i <= kNumMicrophones; ++i) { QString prefix = m_microphoneStr.arg(i); QString group = PlayerManager::groupForMicrophone(i - 1); @@ -1545,7 +1545,7 @@ void ControlPickerMenu::addMicrophoneAndAuxControl(const QString& control, } const int kNumAuxiliaries = static_cast( - ControlObject::get(ConfigKey("[Master]", "num_auxiliaries"))); + ControlObject::get(ConfigKey("[Main]", "num_auxiliaries"))); if (auxControls) { for (int i = 1; i <= kNumAuxiliaries; ++i) { QString prefix = m_auxStr.arg(i); diff --git a/src/coreservices.cpp b/src/coreservices.cpp index f78d702a56c..e2a869ff068 100644 --- a/src/coreservices.cpp +++ b/src/coreservices.cpp @@ -258,9 +258,10 @@ void CoreServices::initialize(QApplication* pApp) { emit initializationProgressUpdate(20, tr("effects")); m_pEffectsManager = std::make_shared(pConfig, pChannelHandleFactory); + ControlDoublePrivate::insertGroupAlias(QStringLiteral("[Master]"), QStringLiteral("[Main]")); m_pEngine = std::make_shared( pConfig, - "[Master]", + "[Main]", m_pEffectsManager.get(), pChannelHandleFactory, true); @@ -440,16 +441,16 @@ void CoreServices::initialize(QApplication* pApp) { bool defaultValue; }; const std::vector uiControls = { - {ConfigKey("[Master]", "skin_settings"), false, false}, + {ConfigKey("[Main]", "skin_settings"), false, false}, {ConfigKey("[Microphone]", "show_microphone"), true, true}, {ConfigKey(VINYL_PREF_KEY, "show_vinylcontrol"), true, false}, {ConfigKey("[PreviewDeck]", "show_previewdeck"), true, true}, {ConfigKey("[Library]", "show_coverart"), true, true}, - {ConfigKey("[Master]", "maximize_library"), true, false}, + {ConfigKey("[Main]", "maximize_library"), true, false}, {ConfigKey("[Samplers]", "show_samplers"), true, true}, {ConfigKey("[EffectRack1]", "show"), true, true}, {ConfigKey("[Skin]", "show_4effectunits"), true, false}, - {ConfigKey("[Master]", "show_mixer"), true, true}, + {ConfigKey("[Main]", "show_mixer"), true, true}, {ConfigKey("[Skin]", "show_spinnies"), true, true}, {ConfigKey("[Skin]", "show_coverart"), true, true}, }; diff --git a/src/effects/backends/effectsbackendmanager.cpp b/src/effects/backends/effectsbackendmanager.cpp index 1762a17d468..78b7a9a3397 100644 --- a/src/effects/backends/effectsbackendmanager.cpp +++ b/src/effects/backends/effectsbackendmanager.cpp @@ -10,7 +10,7 @@ EffectsBackendManager::EffectsBackendManager() { m_pNumEffectsAvailable = std::make_unique( - ConfigKey("[Master]", "num_effectsavailable")); + ConfigKey("[Main]", "num_effectsavailable")); m_pNumEffectsAvailable->setReadOnly(); addBackend(EffectsBackendPointer(new BuiltInBackend())); diff --git a/src/effects/chains/equalizereffectchain.cpp b/src/effects/chains/equalizereffectchain.cpp index 03b8e498318..a60795a5d68 100644 --- a/src/effects/chains/equalizereffectchain.cpp +++ b/src/effects/chains/equalizereffectchain.cpp @@ -51,6 +51,13 @@ void EqualizerEffectChain::setupLegacyAliasesForGroup(const QString& group) { EffectSlotPointer pEffectSlot = getEffectSlot(0); if (pEffectSlot) { const QString& effectSlotGroup = pEffectSlot->getGroup(); + const QString groupAlias = ControlDoublePrivate::getGroupAlias(group); + if (!groupAlias.isEmpty()) { + ControlDoublePrivate::insertGroupAlias(formatEffectChainGroup(groupAlias), getGroup()); + ControlDoublePrivate::insertGroupAlias( + formatEffectSlotGroup(groupAlias), effectSlotGroup); + } + ControlDoublePrivate::insertAlias(ConfigKey(group, "filterLow"), ConfigKey(effectSlotGroup, "parameter1")); diff --git a/src/effects/chains/outputeffectchain.cpp b/src/effects/chains/outputeffectchain.cpp index ffbe26dc52c..1d523146caf 100644 --- a/src/effects/chains/outputeffectchain.cpp +++ b/src/effects/chains/outputeffectchain.cpp @@ -1,15 +1,21 @@ #include "effects/chains/outputeffectchain.h" +#include "control/control.h" #include "effects/effectslot.h" #include "moc_outputeffectchain.cpp" OutputEffectChain::OutputEffectChain(EffectsManager* pEffectsManager, EffectsMessengerPointer pEffectsMessenger) - : EffectChain(formatEffectChainGroup("[Master]"), + : EffectChain(formatEffectChainGroup("[Main]"), pEffectsManager, pEffectsMessenger, SignalProcessingStage::Postfader) { - addEffectSlot("[OutputEffectRack_[Master]_Effect1]"); + addEffectSlot("[OutputEffectRack_[Main]_Effect1]"); + ControlDoublePrivate::insertGroupAlias(formatEffectChainGroup("[Master]"), getGroup()); + ControlDoublePrivate::insertGroupAlias( + QStringLiteral("[OutputEffectRack_[Master]_Effect1]"), + QStringLiteral("[OutputEffectRack_[Main]_Effect1]")); + m_effectSlots[0]->setEnabled(true); // Register the main channel @@ -19,7 +25,7 @@ OutputEffectChain::OutputEffectChain(EffectsManager* pEffectsManager, const QSet& registeredChannels = m_pEffectsManager->registeredInputChannels(); for (const ChannelHandleAndGroup& handle_group : registeredChannels) { - if (handle_group.name() == "[MasterOutput]") { + if (handle_group.name() == "[MainOutput]") { mainHandleAndGroup = &handle_group; break; } diff --git a/src/effects/effectchain.cpp b/src/effects/effectchain.cpp index a6008c3f902..033bafe1ca6 100644 --- a/src/effects/effectchain.cpp +++ b/src/effects/effectchain.cpp @@ -291,10 +291,20 @@ void EffectChain::registerInputChannel(const ChannelHandleAndGroup& handleGroup, return; } + auto enableControlKey = ConfigKey(m_group, QString("group_%1_enable").arg(handleGroup.name())); auto pEnableControl = std::make_shared( - ConfigKey(m_group, QString("group_%1_enable").arg(handleGroup.name())), + enableControlKey, true, initialValue); + + const QString groupAlias = ControlDoublePrivate::getGroupAlias(handleGroup.name()); + if (!groupAlias.isEmpty()) { + ControlDoublePrivate::insertAlias( + ConfigKey(enableControlKey.group, + QString("group_%1_enable").arg(groupAlias)), + enableControlKey); + } + m_channelEnableButtons.insert(handleGroup, pEnableControl); pEnableControl->setButtonMode(ControlPushButton::POWERWINDOW); if (pEnableControl->toBool()) { diff --git a/src/effects/effectsmanager.h b/src/effects/effectsmanager.h index d61fd251edb..e80c5d27d2d 100644 --- a/src/effects/effectsmanager.h +++ b/src/effects/effectsmanager.h @@ -43,7 +43,7 @@ class EffectsManager { } const ChannelHandle getMainHandle() const { - return m_pChannelHandleFactory->getOrCreateHandle("[Master]"); + return m_pChannelHandleFactory->getOrCreateHandle("[Main]"); } const EffectChainPresetManagerPointer getChainPresetManager() const { diff --git a/src/engine/channels/enginechannel.cpp b/src/engine/channels/enginechannel.cpp index de0b5b3c1cd..d5302ac7d92 100644 --- a/src/engine/channels/enginechannel.cpp +++ b/src/engine/channels/enginechannel.cpp @@ -12,7 +12,7 @@ EngineChannel::EngineChannel(const ChannelHandleAndGroup& handleGroup, : m_group(handleGroup), m_pEffectsManager(pEffectsManager), m_vuMeter(getGroup()), - m_sampleRate("[Master]", "samplerate"), + m_sampleRate("[Main]", "samplerate"), m_sampleBuffer(nullptr), m_bIsPrimaryDeck(isPrimaryDeck), m_active(false), diff --git a/src/engine/controls/ratecontrol.cpp b/src/engine/controls/ratecontrol.cpp index dc0c3babd9d..41d410d0719 100644 --- a/src/engine/controls/ratecontrol.cpp +++ b/src/engine/controls/ratecontrol.cpp @@ -135,7 +135,7 @@ RateControl::RateControl(const QString& group, // We need the sample rate so we can guesstimate something close // what latency is. - m_pSampleRate = ControlObject::getControl(ConfigKey("[Master]","samplerate")); + m_pSampleRate = ControlObject::getControl(ConfigKey("[Main]", "samplerate")); // Wheel to control playback position/speed m_pWheel = new ControlTTRotary(ConfigKey(group, "wheel")); diff --git a/src/engine/enginebuffer.cpp b/src/engine/enginebuffer.cpp index afa88b60df5..83ddc463b48 100644 --- a/src/engine/enginebuffer.cpp +++ b/src/engine/enginebuffer.cpp @@ -174,7 +174,7 @@ EngineBuffer::EngineBuffer(const QString& group, m_pRepeat = new ControlPushButton(ConfigKey(m_group, "repeat")); m_pRepeat->setButtonMode(ControlPushButton::TOGGLE); - m_pSampleRate = new ControlProxy("[Master]", "samplerate", this); + m_pSampleRate = new ControlProxy("[Main]", "samplerate", this); m_pTrackSamples = new ControlObject(ConfigKey(m_group, "track_samples")); m_pTrackSampleRate = new ControlObject(ConfigKey(m_group, "track_samplerate")); @@ -258,7 +258,7 @@ EngineBuffer::EngineBuffer(const QString& group, m_pLoopingControl); m_pReadAheadManager->addRateControl(m_pRateControl); - m_pKeylockEngine = new ControlProxy("[Master]", "keylock_engine", this); + m_pKeylockEngine = new ControlProxy("[Main]", "keylock_engine", this); m_pKeylockEngine->connectValueChanged(this, &EngineBuffer::slotKeylockEngineChanged, Qt::DirectConnection); diff --git a/src/engine/enginemixer.cpp b/src/engine/enginemixer.cpp index 4ceac15ce8b..abe3162b9d5 100644 --- a/src/engine/enginemixer.cpp +++ b/src/engine/enginemixer.cpp @@ -44,11 +44,13 @@ EngineMixer::EngineMixer( m_balrightOld(1.0), m_mainHandle(registerChannelGroup(group)), m_headphoneHandle(registerChannelGroup("[Headphone]")), - m_mainOutputHandle(registerChannelGroup("[MasterOutput]")), + m_mainOutputHandle(registerChannelGroup("[MainOutput]")), m_busTalkoverHandle(registerChannelGroup("[BusTalkover]")), m_busCrossfaderLeftHandle(registerChannelGroup("[BusLeft]")), m_busCrossfaderCenterHandle(registerChannelGroup("[BusCenter]")), m_busCrossfaderRightHandle(registerChannelGroup("[BusRight]")) { + ControlDoublePrivate::insertGroupAlias( + QStringLiteral("[MasterOutput]"), QStringLiteral("[MainOutput]")); pEffectsManager->registerInputChannel(m_mainHandle); pEffectsManager->registerInputChannel(m_headphoneHandle); pEffectsManager->registerOutputChannel(m_mainHandle); diff --git a/src/engine/enginevumeter.cpp b/src/engine/enginevumeter.cpp index bb8ced9fa43..02bbee2c7ec 100644 --- a/src/engine/enginevumeter.cpp +++ b/src/engine/enginevumeter.cpp @@ -19,7 +19,7 @@ constexpr CSAMPLE kDecaySmoothing = 0.1f; //.16//.4 } // namespace EngineVuMeter::EngineVuMeter(const QString& group) - : m_sampleRate("[Master]", "samplerate") { + : m_sampleRate("[Main]", "samplerate") { // The VUmeter widget is controlled via a controlpotmeter, which means // that it should react on the setValue(int) signal. m_ctrlVuMeter = new ControlPotmeter(ConfigKey(group, "VuMeter"), 0., 1.); diff --git a/src/engine/positionscratchcontroller.cpp b/src/engine/positionscratchcontroller.cpp index c3b5ff048be..fdfdd4f773a 100644 --- a/src/engine/positionscratchcontroller.cpp +++ b/src/engine/positionscratchcontroller.cpp @@ -77,7 +77,7 @@ PositionScratchController::PositionScratchController(const QString& group) m_dMouseSampeTime(0) { m_pScratchEnable = new ControlObject(ConfigKey(group, "scratch_position_enable")); m_pScratchPosition = new ControlObject(ConfigKey(group, "scratch_position")); - m_pMainSampleRate = ControlObject::getControl(ConfigKey("[Master]", "samplerate")); + m_pMainSampleRate = ControlObject::getControl(ConfigKey("[Main]", "samplerate")); m_pVelocityController = new VelocityController(); m_pRateIIFilter = new RateIIFilter; } diff --git a/src/engine/sidechain/enginerecord.cpp b/src/engine/sidechain/enginerecord.cpp index 6d44b006753..b79e63814b6 100644 --- a/src/engine/sidechain/enginerecord.cpp +++ b/src/engine/sidechain/enginerecord.cpp @@ -21,7 +21,7 @@ EngineRecord::EngineRecord(UserSettingsPointer pConfig) m_bCueIsEnabled(false) { m_pRecReady = new ControlProxy(RECORDING_PREF_KEY, "status", this); - m_pSamplerate = new ControlProxy("[Master]", "samplerate", this); + m_pSamplerate = new ControlProxy("[Main]", "samplerate", this); m_sampleRate = static_cast(m_pSamplerate->get()); } diff --git a/src/engine/sidechain/shoutconnection.cpp b/src/engine/sidechain/shoutconnection.cpp index 8e0eb01e730..340aa2ddb5a 100644 --- a/src/engine/sidechain/shoutconnection.cpp +++ b/src/engine/sidechain/shoutconnection.cpp @@ -58,7 +58,7 @@ ShoutConnection::ShoutConnection(BroadcastProfilePtr profile, m_pConfig(pConfig), m_pProfile(profile), m_encoder(nullptr), - m_mainSamplerate("[Master]", "samplerate"), + m_mainSamplerate("[Main]", "samplerate"), m_broadcastEnabled(BROADCAST_PREF_KEY, "enabled"), m_custom_metadata(false), m_firstCall(false), diff --git a/src/library/autodj/autodjprocessor.cpp b/src/library/autodj/autodjprocessor.cpp index 38051d0d11d..508f103cfe3 100644 --- a/src/library/autodj/autodjprocessor.cpp +++ b/src/library/autodj/autodjprocessor.cpp @@ -167,7 +167,7 @@ AutoDJProcessor::AutoDJProcessor( // Auto-DJ needs at least two decks DEBUG_ASSERT(m_decks.length() > 1); - m_pCOCrossfader = new ControlProxy("[Master]", "crossfader"); + m_pCOCrossfader = new ControlProxy("[Main]", "crossfader"); m_pCOCrossfaderReverse = new ControlProxy("[Mixer Profile]", "xFaderReverse"); QString str_autoDjTransition = m_pConfig->getValueString( diff --git a/src/library/librarycontrol.cpp b/src/library/librarycontrol.cpp index 4110c5d70a7..7fd8a32f299 100644 --- a/src/library/librarycontrol.cpp +++ b/src/library/librarycontrol.cpp @@ -62,9 +62,9 @@ LibraryControl::LibraryControl(Library* pLibrary) m_pLibraryWidget(nullptr), m_pSidebarWidget(nullptr), m_pSearchbox(nullptr), - m_numDecks("[Master]", "num_decks", this), - m_numSamplers("[Master]", "num_samplers", this), - m_numPreviewDecks("[Master]", "num_preview_decks", this) { + m_numDecks("[Main]", "num_decks", this), + m_numSamplers("[Main]", "num_samplers", this), + m_numPreviewDecks("[Main]", "num_preview_decks", this) { qRegisterMetaType("FocusWidget"); slotNumDecksChanged(m_numDecks.get()); diff --git a/src/mixer/playerinfo.cpp b/src/mixer/playerinfo.cpp index 670a7fa39df..8a685ff64e8 100644 --- a/src/mixer/playerinfo.cpp +++ b/src/mixer/playerinfo.cpp @@ -18,7 +18,7 @@ PlayerInfo* s_pPlayerInfo = nullptr; } // namespace PlayerInfo::PlayerInfo() - : m_pCOxfader(new ControlProxy("[Master]","crossfader", this)), + : m_pCOxfader(new ControlProxy("[Main]", "crossfader", this)), m_currentlyPlayingDeck(-1) { startTimer(kPlayingDeckUpdateIntervalMillis); } diff --git a/src/mixer/playermanager.cpp b/src/mixer/playermanager.cpp index 06e8ed209ac..bae26fa1a34 100644 --- a/src/mixer/playermanager.cpp +++ b/src/mixer/playermanager.cpp @@ -103,15 +103,15 @@ PlayerManager::PlayerManager(UserSettingsPointer pConfig, // NOTE(XXX) LegacySkinParser relies on these controls being Controls // and not ControlProxies. m_pCONumDecks(new ControlObject( - ConfigKey("[Master]", "num_decks"), true, true)), + ConfigKey("[Main]", "num_decks"), true, true)), m_pCONumSamplers(new ControlObject( - ConfigKey("[Master]", "num_samplers"), true, true)), + ConfigKey("[Main]", "num_samplers"), true, true)), m_pCONumPreviewDecks(new ControlObject( - ConfigKey("[Master]", "num_preview_decks"), true, true)), + ConfigKey("[Main]", "num_preview_decks"), true, true)), m_pCONumMicrophones(new ControlObject( - ConfigKey("[Master]", "num_microphones"), true, true)), + ConfigKey("[Main]", "num_microphones"), true, true)), m_pCONumAuxiliaries(new ControlObject( - ConfigKey("[Master]", "num_auxiliaries"), true, true)), + ConfigKey("[Main]", "num_auxiliaries"), true, true)), m_pTrackAnalysisScheduler(TrackAnalysisScheduler::NullPointer()) { m_pCONumDecks->connectValueChangeRequest(this, &PlayerManager::slotChangeNumDecks, Qt::DirectConnection); @@ -241,7 +241,7 @@ unsigned int PlayerManager::numDecks() { // a hashtable lookup every time they call this. ControlProxy* pCOPNumDecks = atomicLoadRelaxed(m_pCOPNumDecks); if (pCOPNumDecks == nullptr) { - pCOPNumDecks = new ControlProxy(ConfigKey("[Master]", "num_decks")); + pCOPNumDecks = new ControlProxy(ConfigKey("[Main]", "num_decks")); if (!pCOPNumDecks->valid()) { delete pCOPNumDecks; pCOPNumDecks = nullptr; @@ -259,7 +259,7 @@ unsigned int PlayerManager::numSamplers() { // a hashtable lookup every time they call this. ControlProxy* pCOPNumSamplers = atomicLoadRelaxed(m_pCOPNumSamplers); if (pCOPNumSamplers == nullptr) { - pCOPNumSamplers = new ControlProxy(ConfigKey("[Master]", "num_samplers")); + pCOPNumSamplers = new ControlProxy(ConfigKey("[Main]", "num_samplers")); if (!pCOPNumSamplers->valid()) { delete pCOPNumSamplers; pCOPNumSamplers = nullptr; @@ -278,7 +278,7 @@ unsigned int PlayerManager::numPreviewDecks() { ControlProxy* pCOPNumPreviewDecks = atomicLoadRelaxed(m_pCOPNumPreviewDecks); if (pCOPNumPreviewDecks == nullptr) { pCOPNumPreviewDecks = new ControlProxy( - ConfigKey("[Master]", "num_preview_decks")); + ConfigKey("[Main]", "num_preview_decks")); if (!pCOPNumPreviewDecks->valid()) { delete pCOPNumPreviewDecks; pCOPNumPreviewDecks = nullptr; diff --git a/src/mixer/samplerbank.cpp b/src/mixer/samplerbank.cpp index 047a9a171c4..0dbf0697671 100644 --- a/src/mixer/samplerbank.cpp +++ b/src/mixer/samplerbank.cpp @@ -41,7 +41,7 @@ SamplerBank::SamplerBank(UserSettingsPointer pConfig, this, &SamplerBank::slotSaveSamplerBank); - m_pCONumSamplers = new ControlProxy(ConfigKey("[Master]", "num_samplers"), this); + m_pCONumSamplers = new ControlProxy(ConfigKey("[Main]", "num_samplers"), this); } SamplerBank::~SamplerBank() { diff --git a/src/preferences/dialog/dlgprefdeck.cpp b/src/preferences/dialog/dlgprefdeck.cpp index f94174115a9..d15f7a6be67 100644 --- a/src/preferences/dialog/dlgprefdeck.cpp +++ b/src/preferences/dialog/dlgprefdeck.cpp @@ -42,9 +42,9 @@ DlgPrefDeck::DlgPrefDeck(QWidget* parent, m_pControlTrackTimeFormat(std::make_unique( ConfigKey("[Controls]", "TimeFormat"))), m_pNumDecks( - make_parented("[Master]", "num_decks", this)), + make_parented("[Main]", "num_decks", this)), m_pNumSamplers(make_parented( - "[Master]", "num_samplers", this)), + "[Main]", "num_samplers", this)), m_iNumConfiguredDecks(0), m_iNumConfiguredSamplers(0) { setupUi(this); diff --git a/src/preferences/dialog/dlgprefmixer.cpp b/src/preferences/dialog/dlgprefmixer.cpp index 46f0a94c109..d3b2d3deee1 100644 --- a/src/preferences/dialog/dlgprefmixer.cpp +++ b/src/preferences/dialog/dlgprefmixer.cpp @@ -24,7 +24,7 @@ const QString kEffectForGroupPrefix = QStringLiteral("EffectForGroup_"); const QString kEnableEqs = QStringLiteral("EnableEQs"); const QString kEqsOnly = QStringLiteral("EQsOnly"); const QString kSingleEq = QStringLiteral("SingleEQEffect"); -const QString kMainEQParameterKey = QStringLiteral("EffectForGroup_[Master]_parameter"); +const QString kMainEQParameterKey = QStringLiteral("EffectForGroup_[Main]_parameter"); const QString kDefaultEqId = BiquadFullKillEQEffect::getId() + " " + EffectsBackend::backendTypeToString(EffectBackendType::BuiltIn); const QString kDefaultQuickEffectChainName = QStringLiteral("Filter"); @@ -56,7 +56,7 @@ DlgPrefMixer::DlgPrefMixer( m_curve(EngineXfader::kXfaderConfigKey, "xFaderCurve"), m_calibration(EngineXfader::kXfaderConfigKey, "xFaderCalibration"), m_reverse(EngineXfader::kXfaderConfigKey, "xFaderReverse"), - m_crossfader("[Master]", "crossfader"), + m_crossfader("[Main]", "crossfader"), m_xFaderReverse(false), m_COLoFreq(kConfigGroup, QStringLiteral("LoEQFrequency")), m_COHiFreq(kConfigGroup, QStringLiteral("HiEQFrequency")), @@ -137,7 +137,7 @@ DlgPrefMixer::DlgPrefMixer( // Add drop down lists for current decks and connect num_decks control // to slotNumDecksChanged - m_pNumDecks = new ControlProxy("[Master]", "num_decks", this); + m_pNumDecks = new ControlProxy("[Main]", "num_decks", this); m_pNumDecks->connectValueChanged(this, &DlgPrefMixer::slotNumDecksChanged); slotNumDecksChanged(m_pNumDecks->get()); @@ -855,7 +855,7 @@ void DlgPrefMixer::setUpMainEQ() { &DlgPrefMixer::slotMainEqEffectChanged); const QString configuredEffectId = m_pConfig->getValue(ConfigKey(kConfigGroup, - "EffectForGroup_[Master]"), + "EffectForGroup_[Main]"), kDefaultMainEqId); const EffectManifestPointer configuredEffectManifest = m_pBackendManager->getManifestFromUniqueId(configuredEffectId); @@ -983,7 +983,7 @@ void DlgPrefMixer::slotMainEqEffectChanged(int effectIndex) { // Update the configured effect for the current QComboBox if (pManifest) { - m_pConfig->set(ConfigKey(kConfigGroup, "EffectForGroup_[Master]"), + m_pConfig->set(ConfigKey(kConfigGroup, "EffectForGroup_[Main]"), ConfigValue(pManifest->uniqueId())); } } diff --git a/src/preferences/dialog/dlgprefsound.cpp b/src/preferences/dialog/dlgprefsound.cpp index d496e29ab7e..50e366cc986 100644 --- a/src/preferences/dialog/dlgprefsound.cpp +++ b/src/preferences/dialog/dlgprefsound.cpp @@ -109,10 +109,10 @@ DlgPrefSound::DlgPrefSound(QWidget* pParent, } } - m_pLatencyCompensation = new ControlProxy("[Master]", "microphoneLatencyCompensation", this); - m_pMainDelay = new ControlProxy("[Master]", "delay", this); - m_pHeadDelay = new ControlProxy("[Master]", "headDelay", this); - m_pBoothDelay = new ControlProxy("[Master]", "boothDelay", this); + m_pLatencyCompensation = new ControlProxy("[Main]", "microphoneLatencyCompensation", this); + m_pMainDelay = new ControlProxy("[Main]", "delay", this); + m_pHeadDelay = new ControlProxy("[Main]", "headDelay", this); + m_pBoothDelay = new ControlProxy("[Main]", "boothDelay", this); latencyCompensationSpinBox->setValue(m_pLatencyCompensation->get()); latencyCompensationWarningLabel->setWordWrap(true); @@ -137,7 +137,7 @@ DlgPrefSound::DlgPrefSound(QWidget* pParent, this, &DlgPrefSound::boothDelaySpinboxChanged); - m_pMicMonitorMode = new ControlProxy("[Master]", "talkover_mix", this); + m_pMicMonitorMode = new ControlProxy("[Main]", "talkover_mix", this); micMonitorModeComboBox->addItem(tr("Main output only"), QVariant(static_cast(EngineMixer::MicMonitorMode::Main))); micMonitorModeComboBox->addItem(tr("Main and booth outputs"), @@ -202,15 +202,15 @@ DlgPrefSound::DlgPrefSound(QWidget* pParent, }); m_pMainAudioLatencyOverloadCount = - new ControlProxy("[Master]", "audio_latency_overload_count", this); + new ControlProxy("[Main]", "audio_latency_overload_count", this); m_pMainAudioLatencyOverloadCount->connectValueChanged(this, &DlgPrefSound::bufferUnderflow); - m_pMainLatency = new ControlProxy("[Master]", "latency", this); + m_pMainLatency = new ControlProxy("[Main]", "latency", this); m_pMainLatency->connectValueChanged(this, &DlgPrefSound::mainLatencyChanged); // TODO: remove this option by automatically disabling/enabling the main mix // when recording, broadcasting, headphone, and main outputs are enabled/disabled - m_pMainEnabled = new ControlProxy("[Master]", "enabled", this); + m_pMainEnabled = new ControlProxy("[Main]", "enabled", this); mainMixComboBox->addItem(tr("Disabled")); mainMixComboBox->addItem(tr("Enabled")); mainMixComboBox->setCurrentIndex(m_pMainEnabled->toBool() ? 1 : 0); @@ -220,7 +220,7 @@ DlgPrefSound::DlgPrefSound(QWidget* pParent, &DlgPrefSound::mainMixChanged); m_pMainEnabled->connectValueChanged(this, &DlgPrefSound::mainEnabledChanged); - m_pMainMonoMixdown = new ControlProxy("[Master]", "mono_mixdown", this); + m_pMainMonoMixdown = new ControlProxy("[Main]", "mono_mixdown", this); mainOutputModeComboBox->addItem(tr("Stereo")); mainOutputModeComboBox->addItem(tr("Mono")); mainOutputModeComboBox->setCurrentIndex(m_pMainMonoMixdown->toBool() ? 1 : 0); @@ -231,7 +231,7 @@ DlgPrefSound::DlgPrefSound(QWidget* pParent, m_pMainMonoMixdown->connectValueChanged(this, &DlgPrefSound::mainMonoMixdownChanged); m_pKeylockEngine = - new ControlProxy("[Master]", "keylock_engine", this); + new ControlProxy("[Main]", "keylock_engine", this); #ifdef __LINUX__ qDebug() << "RLimit Cur " << RLimit::getCurRtPrio(); @@ -297,7 +297,7 @@ void DlgPrefSound::slotApply() { const auto keylockEngine = keylockComboBox->currentData().value(); m_pKeylockEngine->set(static_cast(keylockEngine)); - m_pSettings->set(ConfigKey("[Master]", "keylock_engine"), + m_pSettings->set(ConfigKey("[Main]", "keylock_engine"), ConfigValue(static_cast(keylockEngine))); status = m_pSoundManager->setConfig(m_config); @@ -477,7 +477,7 @@ void DlgPrefSound::loadSettings(const SoundManagerConfig &config) { // Default keylock engine is Rubberband Faster (v2) const auto keylockEngine = static_cast( - m_pSettings->getValue(ConfigKey("[Master]", "keylock_engine"), + m_pSettings->getValue(ConfigKey("[Main]", "keylock_engine"), static_cast(EngineBuffer::defaultKeylockEngine()))); const auto keylockEngineVariant = QVariant::fromValue(keylockEngine); const int index = keylockComboBox->findData(keylockEngineVariant); diff --git a/src/preferences/dialog/dlgprefvinyl.cpp b/src/preferences/dialog/dlgprefvinyl.cpp index cebb1f4dbcc..5ca5e345f0a 100644 --- a/src/preferences/dialog/dlgprefvinyl.cpp +++ b/src/preferences/dialog/dlgprefvinyl.cpp @@ -19,7 +19,7 @@ DlgPrefVinyl::DlgPrefVinyl( : DlgPreferencePage(parent), m_pVCManager(pVCMan), config(config) { - m_pNumDecks = new ControlProxy("[Master]", "num_decks", this); + m_pNumDecks = new ControlProxy("[Main]", "num_decks", this); m_pNumDecks->connectValueChanged(this, &DlgPrefVinyl::slotNumDecksChanged); setupUi(this); diff --git a/src/skin/skinloader.cpp b/src/skin/skinloader.cpp index 4676da6282b..6f3737e740f 100644 --- a/src/skin/skinloader.cpp +++ b/src/skin/skinloader.cpp @@ -294,7 +294,7 @@ void SkinLoader::setupMicDuckingControls() { m_pShowDuckingControls->setButtonMode(ControlPushButton::TOGGLE); m_pShowDuckingControls->setReadOnly(); - m_pNumMics = make_parented("[Master]", "num_microphones", this); + m_pNumMics = make_parented("[Main]", "num_microphones", this); m_pNumMics->connectValueChanged(this, &SkinLoader::slotNumMicsChanged); m_micDuckingControlsCreated = true; diff --git a/src/soundio/sounddevicenetwork.cpp b/src/soundio/sounddevicenetwork.cpp index b481e5a0ba1..3c03b5b6928 100644 --- a/src/soundio/sounddevicenetwork.cpp +++ b/src/soundio/sounddevicenetwork.cpp @@ -37,7 +37,7 @@ SoundDeviceNetwork::SoundDeviceNetwork( : SoundDevice(config, sm), m_pNetworkStream(pNetworkStream), m_inputDrift(false), - m_mainAudioLatencyUsage("[Master]", "audio_latency_usage"), + m_mainAudioLatencyUsage("[Main]", "audio_latency_usage"), m_framesSinceAudioLatencyUsageUpdate(0), m_denormals(false), m_targetTime(0) { @@ -87,9 +87,9 @@ SoundDeviceStatus SoundDeviceNetwork::open(bool isClkRefDevice, int syncBuffers) // Update the samplerate and latency ControlObjects, which allow the // waveform view to properly correct for the latency. - ControlObject::set(ConfigKey("[Master]", "latency"), + ControlObject::set(ConfigKey("[Main]", "latency"), requestedBufferTime.toDoubleMillis()); - ControlObject::set(ConfigKey("[Master]", "samplerate"), m_dSampleRate); + ControlObject::set(ConfigKey("[Main]", "samplerate"), m_dSampleRate); // Network stream was just started above so we have to wait until // we can pass one chunk. diff --git a/src/soundio/sounddeviceportaudio.cpp b/src/soundio/sounddeviceportaudio.cpp index 1167764f4e2..3e8f7fd2e59 100644 --- a/src/soundio/sounddeviceportaudio.cpp +++ b/src/soundio/sounddeviceportaudio.cpp @@ -90,7 +90,7 @@ SoundDevicePortAudio::SoundDevicePortAudio(UserSettingsPointer config, m_outputDrift(false), m_inputDrift(false), m_bSetThreadPriority(false), - m_mainAudioLatencyUsage("[Master]", "audio_latency_usage"), + m_mainAudioLatencyUsage("[Main]", "audio_latency_usage"), m_framesSinceAudioLatencyUsageUpdate(0), m_syncBuffers(2), m_invalidTimeInfoCount(0), @@ -384,8 +384,8 @@ SoundDeviceStatus SoundDevicePortAudio::open(bool isClkRefDevice, int syncBuffer if (isClkRefDevice) { // Update the samplerate and latency ControlObjects, which allow the // waveform view to properly correct for the latency. - ControlObject::set(ConfigKey("[Master]", "latency"), currentLatencyMSec); - ControlObject::set(ConfigKey("[Master]", "samplerate"), m_dSampleRate); + ControlObject::set(ConfigKey("[Main]", "latency"), currentLatencyMSec); + ControlObject::set(ConfigKey("[Main]", "samplerate"), m_dSampleRate); m_invalidTimeInfoCount = 0; m_clkRefTimer.start(); } diff --git a/src/soundio/soundmanager.cpp b/src/soundio/soundmanager.cpp index 439b78aaeeb..fe6c1f896d7 100644 --- a/src/soundio/soundmanager.cpp +++ b/src/soundio/soundmanager.cpp @@ -52,9 +52,9 @@ SoundManager::SoundManager(UserSettingsPointer pConfig, m_pErrorDevice(nullptr), m_underflowHappened(0), m_underflowUpdateCount(0), - m_mainAudioLatencyOverloadCount("[Master]", + m_mainAudioLatencyOverloadCount("[Main]", "audio_latency_overload_count"), - m_mainAudioLatencyOverload("[Master]", "audio_latency_overload") { + m_mainAudioLatencyOverload("[Main]", "audio_latency_overload") { // TODO(xxx) some of these ControlObject are not needed by soundmanager, or are unused here. // It is possible to take them out? m_pControlObjectSoundStatusCO = new ControlObject( diff --git a/src/test/autodjprocessor_test.cpp b/src/test/autodjprocessor_test.cpp index f52db03fc03..3552f98d417 100644 --- a/src/test/autodjprocessor_test.cpp +++ b/src/test/autodjprocessor_test.cpp @@ -27,7 +27,7 @@ const QString kTrackLocationTest = QStringLiteral("id3-test-data/cover-test-png. class FakeMixer { public: FakeMixer() - : crossfader(ConfigKey("[Master]", "crossfader"), -1.0, 1.0), + : crossfader(ConfigKey("[Main]", "crossfader"), -1.0, 1.0), crossfaderReverse(ConfigKey("[Mixer Profile]", "xFaderReverse")) { crossfaderReverse.setButtonMode(ControlPushButton::TOGGLE); } @@ -124,10 +124,10 @@ class FakeDeck : public BaseTrackPlayer { class MockPlayerManager : public PlayerManagerInterface { public: MockPlayerManager() - : numDecks(ConfigKey("[Master]", "num_decks"), true), - numSamplers(ConfigKey("[Master]", "num_samplers"), true), - numPreviewDecks(ConfigKey("[Master]", "num_preview_decks"), - true) { + : numDecks(ConfigKey("[Main]", "num_decks"), true), + numSamplers(ConfigKey("[Main]", "num_samplers"), true), + numPreviewDecks(ConfigKey("[Main]", "num_preview_decks"), + true) { } virtual ~MockPlayerManager() { diff --git a/src/test/channelhandle_test.cpp b/src/test/channelhandle_test.cpp index 69977a7238f..a79adea5537 100644 --- a/src/test/channelhandle_test.cpp +++ b/src/test/channelhandle_test.cpp @@ -16,7 +16,7 @@ TEST(ChannelHandleTest, BasicUsage) { EXPECT_FALSE(nullHandle.valid()); EXPECT_FALSE(factory.handleForGroup(group).valid()); - // The ChannelHandleFactory constructor creates handles for [Master] and [Headphone] + // The ChannelHandleFactory constructor creates handles for [Main] and [Headphone] EXPECT_EQ(0, factory.getOrCreateHandle(group)); EXPECT_EQ(0, factory.getOrCreateHandle(group)); ChannelHandle testHandle = factory.handleForGroup(group); diff --git a/src/test/co_dumps/co_dump_inital.csv b/src/test/co_dumps/co_dump_inital.csv index 2da1357d29a..731e09a2897 100644 --- a/src/test/co_dumps/co_dump_inital.csv +++ b/src/test/co_dumps/co_dump_inital.csv @@ -2,7 +2,7 @@ [Channel4],hotcue_6_activate,0 [EffectRack1_EffectUnit3_Effect4],parameter5_minus_toggle,0 [Channel1],visual_key_distance_up_small,0 -[EqualizerRack1_[Master]],mix_minus_toggle,0 +[EqualizerRack1_[Main]],mix_minus_toggle,0 [EqualizerRack1_[Channel4]_Effect1],parameter2_set_one,0 [EffectRack1_EffectUnit4_Effect4],parameter3_type,0 [EffectRack1_EffectUnit1_Effect2],parameter3_minus_toggle,0 @@ -11,7 +11,7 @@ [Playlist],SelectPrevTrack,0 [EffectRack1_EffectUnit3_Effect1],parameter3_minus_toggle,0 [Channel2],visual_key_distance_up_small,0 -[EqualizerRack1_[Master]_Effect1],button_parameter14_loaded,0 +[EqualizerRack1_[Main]_Effect1],button_parameter14_loaded,0 [Microphone2],VuMeter_down,0 [QuickEffectRack1_[Channel3]_Effect1],parameter3_set_zero,0 [EffectRack1_EffectUnit1_Effect3],parameter4_minus_toggle,0 @@ -31,12 +31,12 @@ [EffectRack1_EffectUnit4_Effect4],parameter4_set_default,0 [EffectRack1_EffectUnit2_Effect2],parameter2_link_type,0 [QuickEffectRack1_[Channel3]_Effect1],parameter5_set_zero,0 -[Master],latency,5.80499 +[Main],latency,5.80499 [Channel4],hotcue_15_enabled,0 [Channel4],hotcue_2_activate,0 [EffectRack1_EffectUnit3_Effect3],parameter4_minus_toggle,0 [EqualizerRack1_[Channel3]_Effect1],parameter2_set_minus_one,0 -[EqualizerRack1_[Master]_Effect1],button_parameter13_loaded,0 +[EqualizerRack1_[Main]_Effect1],button_parameter13_loaded,0 [Channel4],visual_key_distance_up_small,0 [Sampler4],hotcue_26_gotoandstop,0 [EffectRack1_EffectUnit2_Effect3],parameter1_link_type,0 @@ -47,7 +47,7 @@ [EffectRack1_EffectUnit4_Effect3],parameter4_set_default,0 [Sampler1],VuMeterL_up,0 [Auxiliary1],VuMeter_toggle,0 -[Master],headDelay_set_one,0 +[Main],headDelay_set_one,0 [EffectRack1_EffectUnit2_Effect2],parameter4_set_default,0 [Channel3],hotcue_15_enabled,0 [EffectRack1_EffectUnit3_Effect4],parameter4_minus_toggle,0 @@ -64,9 +64,9 @@ [Auxiliary2],VuMeter_toggle,0 [EffectRack1_EffectUnit2_Effect1],parameter4_set_default,0 [EffectRack1_EffectUnit3_Effect1],parameter4_minus_toggle,0 -[Master],duckStrength_up,0 +[Main],duckStrength_up,0 [EffectRack1_EffectUnit2_Effect4],parameter3_type,0 -[EqualizerRack1_[Master]_Effect1],button_parameter16_loaded,0 +[EqualizerRack1_[Main]_Effect1],button_parameter16_loaded,0 [Sampler2],hotcue_16_gotoandstop,0 [Channel3],hotcue_35_enabled,0 [EqualizerRack1_[Channel3]_Effect1],parameter3_down,0 @@ -74,11 +74,11 @@ [QuickEffectRack1_[Channel2]_Effect1],parameter5_toggle,0 [Channel3],hotcue_6_set,0 [Channel4],beatloop_16_enabled,0 -[Master],audio_latency_overload_set_minus_one,0 +[Main],audio_latency_overload_set_minus_one,0 [QuickEffectRack1_[Channel3]_Effect1],parameter1_set_zero,0 [QuickEffectRack1_[Channel3]_Effect1],parameter7_toggle,0 [EffectRack1_EffectUnit3_Effect2],parameter4_minus_toggle,0 -[Master],balance_minus_toggle,0 +[Main],balance_minus_toggle,0 [EffectRack1_EffectUnit1_Effect4],parameter3_minus_toggle,0 [EffectRack1_EffectUnit4_Effect1],parameter2_link_type,0 [Channel3],beatloop_16_enabled,0 @@ -86,9 +86,9 @@ [PreviewDeck1],playposition_down,0 [QuickEffectRack1_[Channel3]_Effect1],parameter7_up_small,0 [Microphone],VuMeterL_down_small,0 -[Master],num_preview_decks,1 +[Main],num_preview_decks,1 [EffectRack1_EffectUnit3_Effect3],parameter3_minus_toggle,0 -[EqualizerRack1_[Master]_Effect1],button_parameter15_loaded,0 +[EqualizerRack1_[Main]_Effect1],button_parameter15_loaded,0 [EffectRack1_EffectUnit1_Effect1],parameter5_minus_toggle,0 [EffectRack1_EffectUnit4_Effect2],parameter2_link_type,0 [QuickEffectRack1_[Channel2]_Effect1],parameter4_toggle,0 @@ -112,7 +112,7 @@ [Channel2],sync_leader,0 [EffectRack1_EffectUnit4_Effect4],parameter1_link_type,0 [EffectRack1_EffectUnit3_Effect1],parameter5_minus_toggle,0 -[EqualizerRack1_[Master]_Effect1],button_parameter10_loaded,0 +[EqualizerRack1_[Main]_Effect1],button_parameter10_loaded,0 [Sampler1],beatjump_0.5_forward,0 [QuickEffectRack1_[Channel2]],super1_set_one,0 [QuickEffectRack1_[Channel3]_Effect1],parameter9_set_one,0 @@ -126,7 +126,7 @@ [QuickEffectRack1_[Channel3]_Effect1],parameter3_up_small,0 [Sampler3],hotcue_37_gotoandplay,0 [EffectRack1_EffectUnit3_Effect4],parameter14_set_minus_one,0 -[EqualizerRack1_[Master]_Effect1],parameter8_set_default,0 +[EqualizerRack1_[Main]_Effect1],parameter8_set_default,0 [QuickEffectRack1_[Channel3]_Effect1],parameter9_toggle,0 [EffectRack1_EffectUnit3_Effect2],parameter5_minus_toggle,0 [Channel3],hotcue_16_set,0 @@ -152,7 +152,7 @@ [Sampler4],visual_key_distance,0 [Sampler1],hotcue_27_gotoandplay,0 [EqualizerRack1_[Channel1]],super1_set_one,0 -[Master],PeakIndicator_up,0 +[Main],PeakIndicator_up,0 [QuickEffectRack1_[Channel3]_Effect1],parameter8_toggle,0 [EffectRack1_EffectUnit3_Effect4],parameter2_minus_toggle,0 [QuickEffectRack1_[Channel4]_Effect1],parameter9_set_zero,0 @@ -176,7 +176,7 @@ [EqualizerRack1_[Channel3]_Effect1],parameter14_down,0 [EffectRack1_EffectUnit2_Effect1],parameter3_type,0 [Sampler3],hotcue_16_gotoandstop,0 -[Master],balance_up_small,0 +[Main],balance_up_small,0 [EffectRack1_EffectUnit2_Effect1],parameter3_link_type,0 [EffectRack1_EffectUnit1_Effect4],parameter9_minus_toggle,0 [QuickEffectRack1_[Channel1]_Effect1],parameter9_type,0 @@ -184,7 +184,7 @@ [EqualizerRack1_[Channel1]_Effect1],button_parameter4_type,0 [Channel3],volume_minus_toggle,0 [QuickEffectRack1_[Channel4]_Effect1],parameter8_set_one,0 -[Master],headGain_set_one,0 +[Main],headGain_set_one,0 [Sampler4],hotcue_27_gotoandplay,0 [EffectRack1_EffectUnit4_Effect2],num_parameters,0 [Channel4],sync_leader,0 @@ -196,7 +196,7 @@ [Sampler1],playposition_up,0 [Sampler1],rate_dir,1 [EffectRack1_EffectUnit1_Effect1],parameter7_minus_toggle,0 -[Master],delay_set_default,0 +[Main],delay_set_default,0 [EffectRack1_EffectUnit2_Effect3],parameter2_link_type,0 [Channel4],volume_minus_toggle,0 [Sampler1],hotcue_37_gotoandplay,0 @@ -229,7 +229,7 @@ [QuickEffectRack1_[Channel4]],num_effects,1 [Channel4],hotcue_8_goto,0 [EffectRack1_EffectUnit1_Effect4],parameter14_set_minus_one,0 -[EqualizerRack1_[Master]],mix_set_default,0 +[EqualizerRack1_[Main]],mix_set_default,0 [PreviewDeck1],local_bpm,0 [Sampler3],hotcue_17_gotoandplay,0 [QuickEffectRack1_[Channel3]_Effect1],parameter5_toggle,0 @@ -243,7 +243,7 @@ [EqualizerRack1_[Channel3]],loaded,1 [QuickEffectRack1_[Channel1]_Effect1],button_parameter3_type,0 [QuickEffectRack1_[Channel1]],super1_toggle,0 -[EqualizerRack1_[Master]_Effect1],parameter8_up,0 +[EqualizerRack1_[Main]_Effect1],parameter8_up,0 [Auxiliary1],VuMeter_set_one,0 [Sampler4],hotcue_17_gotoandplay,0 [EffectRack1_EffectUnit3_Effect1],parameter14_set_minus_one,0 @@ -251,7 +251,7 @@ [EffectRack1_EffectUnit3_Effect3],parameter8_minus_toggle,0 [EffectRack1_EffectUnit2_Effect2],parameter6_set_minus_one,0 [EffectRack1_EffectUnit2_Effect4],button_parameter11_type,0 -[Master],headGain_up,0 +[Main],headGain_up,0 [PreviewDeck1],hotcue_26_goto,0 [EffectRack1_EffectUnit1_Effect1],parameter8_minus_toggle,0 [EqualizerRack1_[Channel1]_Effect1],parameter5_set_one,0 @@ -263,7 +263,7 @@ [EqualizerRack1_[Channel3]_Effect1],parameter13_up_small,0 [EffectRack1_EffectUnit2_Effect3],parameter6_set_minus_one,0 [QuickEffectRack1_[Channel2]_Effect1],parameter6_down_small,0 -[EqualizerRack1_[Master]_Effect1],parameter4_up,0 +[EqualizerRack1_[Main]_Effect1],parameter4_up,0 [EffectRack1_EffectUnit1_Effect2],parameter8_minus_toggle,0 [EffectRack1_EffectUnit4_Effect3],parameter2_link_type,0 [EqualizerRack1_[Channel2]],super1_up,0 @@ -365,13 +365,13 @@ [EffectRack1_EffectUnit2_Effect4],parameter3_link_type,0 [EqualizerRack1_[Channel1]],num_effects,1 [Sampler3],playposition_up,0 -[EqualizerRack1_[Master]],mix_down,0 +[EqualizerRack1_[Main]],mix_down,0 [EffectRack1_EffectUnit2_Effect3],parameter1_type,0 [Channel2],loop_move_8_backward,0 [Channel2],volume_minus_toggle,0 [PreviewDeck1],hotcue_34_gotoandplay,0 [EffectRack1_EffectUnit4_Effect3],num_parameters,0 -[Master],rate_set_one,0 +[Main],rate_set_one,0 [Sampler4],playposition_up,0 [EffectRack1_EffectUnit1_Effect1],parameter11_set_one,0 [Channel3],hotcue_2_set,0 @@ -402,7 +402,7 @@ [EffectRack1_EffectUnit4_Effect4],parameter15_link_type,0 [EffectRack1_EffectUnit4_Effect4],button_parameter3,0 [EffectRack1_EffectUnit4_Effect4],button_parameter2,0 -[EffectRack1_EffectUnit1],group_[Master]_enable,0 +[EffectRack1_EffectUnit1],group_[Main]_enable,0 [Channel2],loop_move_4_backward,0 [EffectRack1_EffectUnit1_Effect3],parameter11_type,0 [Sampler2],loop_end_position,-1 @@ -421,7 +421,7 @@ [EffectRack1_EffectUnit4_Effect3],button_parameter3,0 [EffectRack1_EffectUnit4_Effect3],button_parameter2,0 [Channel3],beatlooproll_64_activate,0 -[EffectRack1_EffectUnit2],group_[Master]_enable,0 +[EffectRack1_EffectUnit2],group_[Main]_enable,0 [EffectRack1_EffectUnit1_Effect4],parameter11_type,0 [Sampler1],loop_end_position,-1 [EffectRack1_EffectUnit4_Effect4],parameter3_link_type,0 @@ -457,10 +457,10 @@ [EffectRack1_EffectUnit4_Effect1],button_parameter2,0 [Channel2],waveform_zoom_minus_toggle,0 [EffectRack1_EffectUnit4_Effect2],parameter1_type,0 -[EqualizerRack1_[Master]_Effect1],parameter1_set_one,0 +[EqualizerRack1_[Main]_Effect1],parameter1_set_one,0 [QuickEffectRack1_[Channel3]_Effect1],parameter10_down_small,0 [Sampler3],vinylcontrol_enabled,0 -[Master],balance_set_default,0 +[Main],balance_set_default,0 [EffectRack1_EffectUnit1_Effect3],parameter14_loaded,0 [Channel2],loop_move_0.03125_backward,0 [Sampler3],hotcue_21_enabled,0 @@ -550,7 +550,7 @@ [EffectRack1_EffectUnit2_Effect2],button_parameter3,0 [EffectRack1_EffectUnit2_Effect2],button_parameter2,0 [Channel2],rate,0 -[EffectRack1_EffectUnit3],group_[Master]_enable,0 +[EffectRack1_EffectUnit3],group_[Main]_enable,0 [EffectRack1_EffectUnit2_Effect1],button_parameter9,0 [Channel4],loop_move_4_backward,0 [EffectRack1_EffectUnit2_Effect1],button_parameter8,0 @@ -563,10 +563,10 @@ [EffectRack1_EffectUnit2_Effect1],button_parameter1,0 [EffectRack1_EffectUnit2_Effect1],button_parameter3,0 [EffectRack1_EffectUnit2_Effect1],button_parameter2,0 -[EqualizerRack1_[Master]],clear,0 +[EqualizerRack1_[Main]],clear,0 [Channel1],beatlooproll_64_activate,0 [QuickEffectRack1_[Channel3]_Effect1],button_parameter3_type,0 -[EffectRack1_EffectUnit4],group_[Master]_enable,0 +[EffectRack1_EffectUnit4],group_[Main]_enable,0 [EffectRack1_EffectUnit3],super1_set_zero,0 [EffectRack1_EffectUnit4_Effect1],parameter5_link_type,0 [EffectRack1_EffectUnit4_Effect3],parameter16_link_type,0 @@ -603,7 +603,7 @@ [Channel3],hotcue_8_gotoandstop,0 [Channel1],waveform_zoom_set_minus_one,0 [QuickEffectRack1_[Channel4]_Effect1],parameter9_set_one,0 -[Master],delay_up,0 +[Main],delay_up,0 [EffectRack1_EffectUnit1_Effect1],parameter11_type,0 [Sampler3],beatjump_0.0625_backward,0 [EffectRack1_EffectUnit1_Effect2],parameter15_loaded,0 @@ -632,7 +632,7 @@ [EffectRack1_EffectUnit3_Effect2],parameter13_loaded,0 [Channel3],loop_move_2_backward,0 [EffectRack1_EffectUnit2_Effect4],parameter16_link_type,0 -[EqualizerRack1_[Master]_Effect1],parameter12_set_default,0 +[EqualizerRack1_[Main]_Effect1],parameter12_set_default,0 [QuickEffectRack1_[Channel3]_Effect1],button_parameter16_type,0 [PreviewDeck1],pitch_set_minus_one,0 [EffectRack1_EffectUnit4_Effect1],parameter16_link_type,0 @@ -803,7 +803,7 @@ [Sampler3],volume_set_zero,0 [QuickEffectRack1_[Channel1]_Effect1],parameter5_up,0 [Sampler2],hotcue_21_position,-1 -[Master],VuMeterL_set_minus_one,0 +[Main],VuMeterL_set_minus_one,0 [EffectRack1_EffectUnit1_Effect1],parameter7_up_small,0 [EffectRack1_EffectUnit2_Effect1],parameter8_up_small,0 [EqualizerRack1_[Channel2]_Effect1],parameter6_loaded,0 @@ -824,7 +824,7 @@ [Sampler2],hotcue_13_position,-1 [EffectRack1_EffectUnit1_Effect1],parameter5_up_small,0 [EffectRack1_EffectUnit2_Effect1],parameter2_up_small,0 -[EqualizerRack1_[Master]_Effect1],parameter1_down,0 +[EqualizerRack1_[Main]_Effect1],parameter1_down,0 [QuickEffectRack1_[Channel1]_Effect1],num_button_parameterslots,16 [EffectRack1_EffectUnit1_Effect3],parameter15_loaded,0 [EffectRack1_EffectUnit2_Effect4],parameter13_link_type,0 @@ -854,8 +854,8 @@ [EffectRack1_EffectUnit1_Effect4],parameter1_up_small,0 [EffectRack1_EffectUnit3_Effect4],parameter3_up_small,0 [EffectRack1_EffectUnit4_Effect4],parameter8_up_small,0 -[EqualizerRack1_[Master]_Effect1],parameter11_down_small,0 -[Master],headGain_toggle,0 +[EqualizerRack1_[Main]_Effect1],parameter11_down_small,0 +[Main],headGain_toggle,0 [EffectRack1_EffectUnit4_Effect2],parameter13_link_type,0 [EffectRack1_EffectUnit3_Effect2],parameter10_loaded,0 [Channel4],VuMeterR_up_small,0 @@ -954,7 +954,7 @@ [PreviewDeck1],hotcue_25_goto,0 [EffectRack1_EffectUnit2_Effect2],parameter13_link_type,0 [EffectRack1_EffectUnit1_Effect2],parameter7_down_small,0 -[EqualizerRack1_[Master]_Effect1],parameter1_down_small,0 +[EqualizerRack1_[Main]_Effect1],parameter1_down_small,0 [Channel2],hotcue_24_activate_preview,0 [Channel4],hotcue_33_enabled,0 [EffectRack1_EffectUnit3],group_[Sampler2]_enable,0 @@ -1035,7 +1035,7 @@ [Sampler3],visual_key_distance_set_zero,0 [Channel2],beatloop_2_enabled,0 [EffectRack1_EffectUnit1_Effect1],parameter11_loaded,0 -[EqualizerRack1_[Master]_Effect1],parameter1_minus_toggle,0 +[EqualizerRack1_[Main]_Effect1],parameter1_minus_toggle,0 [Sampler1],volume_down_small,0 [PreviewDeck1],rateSearch_toggle,0 [Channel2],hotcue_9_gotoandplay,0 @@ -1088,7 +1088,7 @@ [Sampler4],hotcue_8_gotoandplay,0 [EffectRack1_EffectUnit4_Effect1],parameter14_link_type,0 [Channel4],pitch_set_default,0 -[Master],audio_latency_overload_up_small,0 +[Main],audio_latency_overload_up_small,0 [EffectRack1_EffectUnit1_Effect4],parameter10_loaded,0 [Channel4],hotcue_37_goto,0 [Sampler3],hotcue_21_position,-1 @@ -1127,7 +1127,7 @@ [EqualizerRack1_[Channel4]_Effect1],parameter2_loaded,1 [EffectRack1_EffectUnit4_Effect4],parameter9_down,0 [Sampler3],VuMeterR_minus_toggle,0 -[EqualizerRack1_[Master]],insertion_type,0 +[EqualizerRack1_[Main]],insertion_type,0 [QuickEffectRack1_[Channel1]_Effect1],parameter5_set_zero,0 [EffectRack1_EffectUnit2_Effect2],parameter8_link_type,0 [EffectRack1_EffectUnit1_Effect1],parameter16_down_small,0 @@ -1152,7 +1152,7 @@ [QuickEffectRack1_[Channel4]_Effect1],parameter6_set_one,0 [Sampler4],hotcue_17_position,-1 [EffectRack1_EffectUnit1_Effect2],parameter16_down_small,0 -[Master],duckStrength_toggle,0 +[Main],duckStrength_toggle,0 [Sampler2],visual_key_distance_set_zero,0 [Channel3],beatloop_2_enabled,0 [EffectRack1_EffectUnit2_Effect4],parameter7_link_type,0 @@ -1166,7 +1166,7 @@ [Channel1],hotcue_9_clear,0 [EffectRack1_EffectUnit2_Effect1],parameter14_link_type,0 [EffectRack1_EffectUnit3],mix_up_small,0 -[EqualizerRack1_[Master]_Effect1],parameter15_up,0 +[EqualizerRack1_[Main]_Effect1],parameter15_up,0 [Sampler3],hotcue_17_position,-1 [Channel4],beatsync_phase,0 [QuickEffectRack1_[Channel1]_Effect1],parameter8_set_minus_one,0 @@ -1232,7 +1232,7 @@ [EffectRack1_EffectUnit1_Effect3],parameter5_set_one,0 [QuickEffectRack1_[Channel2]_Effect1],parameter15_toggle,0 [Sampler2],VuMeterL_minus_toggle,0 -[EqualizerRack1_[Master]_Effect1],parameter11_up,0 +[EqualizerRack1_[Main]_Effect1],parameter11_up,0 [QuickEffectRack1_[Channel2]],num_effectslots,1 [Channel2],vinylcontrol_mode,1 [Channel2],hotcue_18_enabled,0 @@ -1272,9 +1272,9 @@ [Channel1],beatlooproll_8_activate,0 [Channel4],hotcue_15_gotoandplay,0 [Sampler1],hotcue_31_activate_preview,0 -[Master],balance_set_minus_one,0 +[Main],balance_set_minus_one,0 [PreviewDeck1],playposition,0.5 -[EqualizerRack1_[Master]_Effect1],parameter7_down,0 +[EqualizerRack1_[Main]_Effect1],parameter7_down,0 [Sampler3],hotcue_11_position,-1 [EqualizerRack1_[Channel3]_Effect1],parameter10_set_default,0 [Sampler1],hotcue_33_position,-1 @@ -1327,14 +1327,14 @@ [PreviewDeck1],pitch_minus_toggle,0 [Channel1],hotcue_35_gotoandplay,0 [Sampler4],pitch_adjust_down_small,0 -[EqualizerRack1_[Master]_Effect1],button_parameter3_type,0 +[EqualizerRack1_[Main]_Effect1],button_parameter3_type,0 [PreviewDeck1],sync_key,0 [PreviewDeck1],hotcue_33_activate_preview,0 [PreviewDeck1],pregain_toggle,0 [EffectRack1_EffectUnit3_Effect3],parameter5_link_inverse,0 -[Master],headMix_set_one,0 +[Main],headMix_set_one,0 [EffectRack1_EffectUnit3_Effect4],parameter1_set_minus_one,0 -[EqualizerRack1_[Master]],num_effects,0 +[EqualizerRack1_[Main]],num_effects,0 [Sampler4],rateSearch_down,0 [Channel3],duration,0 [Channel2],hotcue_35_gotoandplay,0 @@ -1345,11 +1345,11 @@ [Sampler1],hotcue_35_goto,0 [EffectRack1_EffectUnit1],mix_up_small,0 [EffectRack1_EffectUnit1_Effect1],parameter13_set_minus_one,0 -[EqualizerRack1_[Master]_Effect1],parameter2_down_small,0 +[EqualizerRack1_[Main]_Effect1],parameter2_down_small,0 [EffectRack1_EffectUnit3_Effect2],parameter2_link_inverse,0 [EqualizerRack1_[Channel1]_Effect1],parameter8_loaded,0 [EffectRack1_EffectUnit4_Effect1],parameter9_link_type,0 -[Master],keylock_engine,0 +[Main],keylock_engine,0 [Sampler3],rateSearch_down,0 [Channel3],beatloop_0.125_toggle,0 [Channel2],duration,0 @@ -1375,7 +1375,7 @@ [Channel2],replaygain,0 [EffectRack1_EffectUnit3_Effect2],parameter15_down,0 [Sampler3],hotcue_26_clear,0 -[Master],headMix_minus_toggle,0 +[Main],headMix_minus_toggle,0 [Sampler3],beatloop_64_enabled,0 [EffectRack1_EffectUnit3_Effect4],parameter13_set_minus_one,0 [Microphone3],volume_up,0 @@ -1423,11 +1423,11 @@ [QuickEffectRack1_[Channel2]_Effect1],parameter9_up,0 [Sampler2],beatlooproll_64_activate,0 [EffectRack1_EffectUnit4_Effect3],parameter2_type,0 -[Master],audio_latency_usage_down_small,0 +[Main],audio_latency_usage_down_small,0 [Auxiliary2],VuMeterL_set_default,0 [Channel1],hotcue_18_goto,0 [Sampler1],hotcue_36_clear,0 -[Master],rate,0 +[Main],rate,0 [Sampler3],hotcue_35_goto,0 [Channel3],hotcue_18_enabled,0 [EffectRack1_EffectUnit3_Effect4],parameter3_link_inverse,0 @@ -1450,7 +1450,7 @@ [Microphone3],main_mix,0 [PreviewDeck1],hotcue_32_position,-1 [Channel2],hotcue_15_gotoandplay,0 -[EqualizerRack1_[Master]_Effect1],parameter14_link_type,0 +[EqualizerRack1_[Main]_Effect1],parameter14_link_type,0 [EffectRack1_EffectUnit3_Effect4],parameter15_down,0 [Sampler3],hotcue_36_clear,0 [Sampler1],beatloop_64_enabled,0 @@ -1478,7 +1478,7 @@ [Auxiliary4],orientation_center,0 [EffectRack1_EffectUnit2_Effect3],parameter9_link_type,0 [EffectRack1_EffectUnit1_Effect2],parameter1_set_default,0 -[Master],rate_set_minus_one,0 +[Main],rate_set_minus_one,0 [EffectRack1_EffectUnit1_Effect2],parameter15_down,0 [Sampler3],hotcue_35_position,-1 [Sampler4],eject,0 @@ -1561,7 +1561,7 @@ [EffectRack1_EffectUnit3_Effect1],parameter1_set_zero,0 [EffectRack1_EffectUnit1_Effect1],parameter3_link_inverse,0 [EffectRack1_EffectUnit3_Effect2],parameter6_link_inverse,0 -[Master],crossfader_set_minus_one,0 +[Main],crossfader_set_minus_one,0 [EffectRack1_EffectUnit2_Effect1],parameter10_set_default,0 [Channel4],beatloop_1_enabled,0 [EffectRack1_EffectUnit3_Effect4],parameter9_set_default,0 @@ -1583,7 +1583,7 @@ [EffectRack1_EffectUnit1_Effect2],parameter2_set_one,0 [Microphone],talkover,0 [Sampler4],hotcue_31_position,-1 -[Master],samplerate,44100 +[Main],samplerate,44100 [EffectRack1_EffectUnit4_Effect4],parameter10_set_default,0 [EffectRack1_EffectUnit1_Effect3],parameter3_link_inverse,0 [EffectRack1_EffectUnit3_Effect4],parameter8_link_inverse,0 @@ -1644,7 +1644,7 @@ [QuickEffectRack1_[Channel2]_Effect1],parameter12_toggle,0 [EffectRack1_EffectUnit3_Effect2],button_parameter12,0 [QuickEffectRack1_[Channel1]_Effect1],parameter8_type,0 -[EqualizerRack1_[Master]_Effect1],parameter13_down_small,0 +[EqualizerRack1_[Main]_Effect1],parameter13_down_small,0 [EqualizerRack1_[Channel1]_Effect1],button_parameter5_type,0 [PreviewDeck1],bpm_set_one,0 [EffectRack1_EffectUnit4_Effect1],parameter10_set_default,0 @@ -1672,7 +1672,7 @@ [EffectRack1_EffectUnit2_Effect4],parameter6_set_zero,0 [EffectRack1_EffectUnit3_Effect4],parameter7_link_inverse,0 [QuickEffectRack1_[Channel3]_Effect1],parameter13_set_default,0 -[Master],VuMeter_up_small,0 +[Main],VuMeter_up_small,0 [EffectRack1_EffectUnit1_Effect4],parameter10_down_small,0 [Auxiliary1],orientation_center,0 [EffectRack1_EffectUnit3_Effect2],parameter9_set_default,0 @@ -1717,7 +1717,7 @@ [PreviewDeck1],hotcue_14_position,-1 [PreviewDeck1],hotcue_19_enabled,0 [Channel1],hotcue_21_activate_preview,0 -[Master],balance_set_zero,0 +[Main],balance_set_zero,0 [QuickEffectRack1_[Channel4]_Effect1],parameter7_set_one,0 [Sampler1],visual_key_distance_up_small,0 [EffectRack1_EffectUnit4_Effect4],enabled,1 @@ -1729,7 +1729,7 @@ [EffectRack1_EffectUnit1_Effect3],parameter7_type,0 [EffectRack1_EffectUnit3_Effect2],parameter7_type,0 [PreviewDeck1],hotcue_11_goto,0 -[EqualizerRack1_[Master]_Effect1],parameter7_down_small,0 +[EqualizerRack1_[Main]_Effect1],parameter7_down_small,0 [Channel4],hotcue_36_gotoandstop,0 [Channel2],hotcue_21_activate_preview,0 [EffectRack1_EffectUnit1_Effect3],parameter3_set_zero,0 @@ -1742,7 +1742,7 @@ [QuickEffectRack1_[Channel2]_Effect1],enabled,1 [Channel4],playposition,0.5 [EffectRack1_EffectUnit1_Effect4],parameter7_type,0 -[EqualizerRack1_[Master]_Effect1],parameter15_type,0 +[EqualizerRack1_[Main]_Effect1],parameter15_type,0 [EffectRack1_EffectUnit1_Effect4],parameter3_set_zero,0 [EffectRack1_EffectUnit2_Effect4],parameter4_set_zero,0 [EffectRack1_EffectUnit3_Effect4],parameter1_set_zero,0 @@ -1756,7 +1756,7 @@ [EffectRack1_EffectUnit3_Effect3],parameter3_set_zero,0 [EffectRack1_EffectUnit4_Effect3],parameter8_set_zero,0 [Channel3],playposition,0.5 -[Master],headGain_set_default,0 +[Main],headGain_set_default,0 [EffectRack1_EffectUnit3_Effect1],parameter2_set_one,0 [EffectRack1_EffectUnit2_Effect2],enabled,1 [PreviewDeck1],hotcue_10_position,-1 @@ -1787,7 +1787,7 @@ [EffectRack1_EffectUnit1_Effect4],parameter8_link_inverse,0 [EffectRack1_EffectUnit3_Effect1],parameter9_link_inverse,0 [EffectRack1_EffectUnit3_Effect3],parameter10_down_small,0 -[Master],headDelay_set_default,0 +[Main],headDelay_set_default,0 [PreviewDeck1],hotcue_26_position,-1 [Channel2],hotcue_31_set,0 [EffectRack1_EffectUnit2_Effect4],enabled,1 @@ -1922,14 +1922,14 @@ [Sampler4],hotcue_21_gotoandstop,0 [Sampler2],hotcue_15_activate_preview,0 [Channel2],hotcue_35_clear,0 -[Master],headGain_set_zero,0 +[Main],headGain_set_zero,0 [EffectRack1_EffectUnit4_Effect1],button_parameter8_type,0 [EffectRack1_EffectUnit1_Effect4],parameter6_link_inverse,0 [Channel4],hotcue_19_enabled,0 [EqualizerRack1_[Channel2]_Effect1],parameter2_loaded,1 [Sampler4],PeakIndicator_up_small,0 [Sampler3],beatsync_phase,0 -[EqualizerRack1_[Master]_Effect1],parameter1_set_default,0 +[EqualizerRack1_[Main]_Effect1],parameter1_set_default,0 [Sampler1],VuMeterR_set_one,0 [Sampler1],hotcue_31_gotoandstop,0 [Sampler3],hotcue_29_gotoandstop,0 @@ -1942,7 +1942,7 @@ [EqualizerRack1_[Channel3]],super1_down_small,0 [EqualizerRack1_[Channel1]_Effect1],parameter2_loaded,1 [Sampler2],VuMeterR_set_one,0 -[Master],enabled,1 +[Main],enabled,1 [Sampler2],hotcue_31_gotoandstop,0 [Sampler4],hotcue_29_gotoandstop,0 [QuickEffectRack1_[Channel1]_Effect1],parameter9_down_small,0 @@ -1953,7 +1953,7 @@ [EffectRack1_EffectUnit1_Effect2],parameter9_link_inverse,0 [QuickEffectRack1_[Channel1]_Effect1],parameter9_up_small,0 [Sampler1],hotcue_22_gotoandplay,0 -[EqualizerRack1_[Master]_Effect1],parameter9_set_default,0 +[EqualizerRack1_[Main]_Effect1],parameter9_set_default,0 [EqualizerRack1_[Channel3]_Effect1],parameter6_type,0 [Sampler1],hotcue_29_gotoandstop,0 [Sampler3],hotcue_31_gotoandstop,0 @@ -1975,7 +1975,7 @@ [ReplayGain],DefaultBoost,0.501187 [Channel3],hotcue_32_set,0 [Sampler3],hotcue_32_gotoandplay,0 -[Master],headGain,1 +[Main],headGain,1 [Sampler1],hotcue_21_gotoandstop,0 [EffectRack1_EffectUnit3_Effect3],parameter8_set_minus_one,0 [EqualizerRack1_[Channel1]_Effect1],parameter9_up,0 @@ -2017,7 +2017,7 @@ [EqualizerRack1_[Channel4]],mix_set_default,0 [PreviewDeck1],back,0 [Microphone3],VuMeterR,0 -[Master],headDelay_toggle,0 +[Main],headDelay_toggle,0 [Mixer Profile],HiEQFrequency_set_default,0 [EffectRack1_EffectUnit3_Effect2],parameter10_down_small,0 [EffectRack1_EffectUnit1_Effect3],button_parameter15,0 @@ -2073,7 +2073,7 @@ [EqualizerRack1_[Channel4]_Effect1],parameter2_loaded,1 [Channel1],hotcue_32_set,0 [EffectRack1_EffectUnit2_Effect4],button_parameter8_type,0 -[EqualizerRack1_[Master]_Effect1],button_parameter3_loaded,0 +[EqualizerRack1_[Main]_Effect1],button_parameter3_loaded,0 [EffectRack1_EffectUnit4_Effect1],parameter13_type,0 [EffectRack1_EffectUnit3_Effect1],button_parameter5_type,0 [Sampler3],loop_move_2_forward,0 @@ -2134,7 +2134,7 @@ [PreviewDeck1],beatloop_2_toggle,0 [Sampler1],file_key,0 [Channel1],playposition_down_small,0 -[EqualizerRack1_[Master]],super1_up_small,0 +[EqualizerRack1_[Main]],super1_up_small,0 [Channel4],hotcue_23_goto,0 [PreviewDeck1],beatjump_1_backward,0 [EffectRack1_EffectUnit4_Effect1],parameter8_down_small,0 @@ -2163,10 +2163,10 @@ [InternalClock],bpm_up,0 [EffectRack1_EffectUnit3_Effect4],parameter11_down_small,0 [EqualizerRack1_[Channel4]_Effect1],parameter5_up,0 -[Master],headMix_set_minus_one,0 +[Main],headMix_set_minus_one,0 [Sampler2],beat_next,-1 [QuickEffectRack1_[Channel3]_Effect1],button_parameter13_type,0 -[Master],gain_minus_toggle,0 +[Main],gain_minus_toggle,0 [Channel1],rateSearch_set_default,0 [PreviewDeck1],hotcue_9_gotoandplay,0 [Channel4],playposition_down_small,0 @@ -2309,11 +2309,11 @@ [EffectRack1_EffectUnit1_Effect1],num_parameterslots,16 [Sampler1],VuMeterL_down,0 [Sampler4],hotcue_6_position,-1 -[EqualizerRack1_[Master]_Effect1],parameter5_set_one,0 +[EqualizerRack1_[Main]_Effect1],parameter5_set_one,0 [EqualizerRack1_[Channel1]_Effect1],parameter7_down_small,0 [Channel3],rateSearch_set_default,0 [QuickEffectRack1_[Channel1]_Effect1],parameter16_set_default,0 -[EqualizerRack1_[Master]_Effect1],parameter2_loaded,0 +[EqualizerRack1_[Main]_Effect1],parameter2_loaded,0 [EffectRack1_EffectUnit4_Effect3],loaded,0 [EffectRack1_EffectUnit1_Effect4],num_parameterslots,16 [EffectRack1_EffectUnit1_Effect2],parameter1_link_inverse,0 @@ -2330,7 +2330,7 @@ [EffectRack1_EffectUnit1_Effect1],parameter1_link_inverse,0 [Channel4],loop_move_8_forward,0 [Sampler1],hotcue_21_goto,0 -[Master],audio_latency_usage_set_default,0 +[Main],audio_latency_usage_set_default,0 [Sampler3],waveform_zoom_minus_toggle,0 [EffectRack1_EffectUnit2_Effect4],parameter8_down_small,0 [Channel2],loop_move_64_backward,0 @@ -2417,7 +2417,7 @@ [Channel2],waveform_zoom_set_zero,0 [Sampler3],hotcue_8_position,-1 [Sampler3],VuMeterR_down_small,0 -[Master],headMix,-1 +[Main],headMix,-1 [Sampler4],hotcue_21_goto,0 [EffectRack1_EffectUnit4_Effect1],parameter5_down_small,0 [EqualizerRack1_[Channel2]_Effect1],parameter9_up,0 @@ -2527,7 +2527,7 @@ [Sampler3],hotcue_8_gotoandstop,0 [Channel1],pitch_adjust,0 [Sampler3],beatloop_4_enabled,0 -[Master],duckStrength_up_small,0 +[Main],duckStrength_up_small,0 [Channel2],hotcue_37_enabled,0 [Sampler3],beats_adjust_faster,0 [EffectRack1_EffectUnit4_Effect4],parameter13_link_inverse,0 @@ -2569,7 +2569,7 @@ [Channel2],reverseroll,0 [Channel2],hotcue_33_set,0 [Channel4],reverse,0 -[Master],crossfader_set_one,0 +[Main],crossfader_set_one,0 [EqualizerRack1_[Channel4]_Effect1],parameter4_set_zero,0 [ReplayGain],DefaultBoost_toggle,0 [Microphone],VuMeterR_set_default,0 @@ -2592,7 +2592,7 @@ [Channel3],visual_key_distance_set_one,0 [EqualizerRack1_[Channel4]_Effect1],parameter2_set_zero,0 [EffectRack1_EffectUnit4_Effect3],parameter16_link_inverse,0 -[EqualizerRack1_[Master]_Effect1],parameter8_down,0 +[EqualizerRack1_[Main]_Effect1],parameter8_down,0 [Sampler1],beatloop_32_toggle,0 [Sampler2],hotcue_17_clear,0 [Sampler3],hotcue_20_activate_preview,0 @@ -2602,7 +2602,7 @@ [QuickEffectRack1_[Channel2]_Effect1],num_button_parameters,0 [Sampler1],hotcue_8_gotoandstop,0 [Channel2],orientation_center,0 -[Master],VuMeter_set_zero,0 +[Main],VuMeter_set_zero,0 [Channel4],visual_key_distance_set_one,0 [EffectRack1_EffectUnit4_Effect2],parameter15_link_inverse,0 [EqualizerRack1_[Channel2]_Effect1],parameter1_set_minus_one,0 @@ -2659,14 +2659,14 @@ [Channel2],pitch_set_one,0 [QuickEffectRack1_[Channel3]_Effect1],effect_selector,0 [Microphone4],pregain_down_small,0 -[Master],rate_up,0 +[Main],rate_up,0 [Sampler1],beatloop_64_activate,0 [EffectRack1_EffectUnit1_Effect2],parameter11_up,0 [Channel4],hotcue_35_set,0 [EffectRack1_EffectUnit3_Effect4],parameter4_set_one,0 -[EqualizerRack1_[Master]_Effect1],button_parameter4_type,0 +[EqualizerRack1_[Main]_Effect1],button_parameter4_type,0 [Sampler2],hotcue_27_goto,0 -[EqualizerRack1_[Master]],chain_selector,0 +[EqualizerRack1_[Main]],chain_selector,0 [EffectRack1_EffectUnit3_Effect1],parameter11_up,0 [EffectRack1_EffectUnit4_Effect1],parameter13_up,0 [EffectRack1_EffectUnit4_Effect2],parameter16_link_inverse,0 @@ -2676,10 +2676,10 @@ [QuickEffectRack1_[Channel2]_Effect1],parameter14_down_small,0 [Sampler3],rate_down,0 [Sampler2],beatloop_64_activate,0 -[Master],rate_down,0 +[Main],rate_down,0 [Mixer Profile],LoEQFrequency_down,0 [Sampler3],beatloop_0.5_toggle,0 -[Master],crossfader_up,0 +[Main],crossfader_up,0 [EffectRack1_EffectUnit3_Effect2],parameter11_up,0 [EffectRack1_EffectUnit4_Effect2],parameter13_up,0 [EffectRack1_EffectUnit4_Effect1],parameter16_link_inverse,0 @@ -2691,7 +2691,7 @@ [ReplayGain],DefaultBoost_down_small,0 [Microphone2],pregain_down_small,0 [EffectRack1_EffectUnit2_Effect4],parameter16_link_inverse,0 -[EqualizerRack1_[Master]_Effect1],parameter14_link_inverse,0 +[EqualizerRack1_[Main]_Effect1],parameter14_link_inverse,0 [Sampler4],beatloop_0.5_toggle,0 [QuickEffectRack1_[Channel2]],super1_down_small,0 [EqualizerRack1_[Channel3]_Effect1],button_parameter13_type,0 @@ -2709,7 +2709,7 @@ [Sampler1],VuMeterL_set_one,0 [EffectRack1_EffectUnit2_Effect3],parameter16_link_inverse,0 [EqualizerRack1_[Channel2]_Effect1],parameter13_up,0 -[Master],delay_up_small,0 +[Main],delay_up_small,0 [Channel1],VuMeter_set_zero,0 [Sampler4],PeakIndicator_down,0 [Channel2],hotcue_8_gotoandplay,0 @@ -2718,14 +2718,14 @@ [EqualizerRack1_[Channel2]_Effect1],parameter8_type,0 [Channel3],hotcue_17_enabled,0 [PreviewDeck1],play_indicator,0 -[EqualizerRack1_[Master]_Effect1],parameter2_set_one,0 +[EqualizerRack1_[Main]_Effect1],parameter2_set_one,0 [QuickEffectRack1_[Channel1]_Effect1],parameter11_toggle,0 [Channel1],beatloop_32_activate,0 [Channel2],beatlooproll_0.125_activate,0 [QuickEffectRack1_[Channel4]_Effect1],parameter12_set_one,0 [PreviewDeck1],hotcue_28_activate,0 [PreviewDeck1],hotcue_33_goto,0 -[EqualizerRack1_[Master]],mix_up_small,0 +[EqualizerRack1_[Main]],mix_up_small,0 [Sampler2],VuMeterL_set_one,0 [EffectRack1_EffectUnit1_Effect3],parameter15_up,0 [Sampler3],hotcue_2_activate_preview,0 @@ -2756,7 +2756,7 @@ [Channel3],hotcue_34_set,0 [EffectRack1_EffectUnit4_Effect1],parameter13_link_inverse,0 [Sampler3],beatloop_32_toggle,0 -[EqualizerRack1_[Master]_Effect1],button_parameter11_type,0 +[EqualizerRack1_[Main]_Effect1],button_parameter11_type,0 [Channel4],hotcue_7_clear,0 [Sampler2],rate_down,0 [EffectRack1_EffectUnit2_Effect3],parameter13_up,0 @@ -2810,7 +2810,7 @@ [EqualizerRack1_[Channel1]_Effect1],parameter1_set_minus_one,0 [QuickEffectRack1_[Channel4]_Effect1],parameter15,0 [QuickEffectRack1_[Channel4]_Effect1],parameter14,0 -[EqualizerRack1_[Master]],mix_set_minus_one,0 +[EqualizerRack1_[Main]],mix_set_minus_one,0 [EffectRack1_EffectUnit2_Effect1],parameter16_link_inverse,0 [QuickEffectRack1_[Channel4]_Effect1],parameter16,0 [QuickEffectRack1_[Channel4]_Effect1],parameter11,0 @@ -2818,7 +2818,7 @@ [EffectRack1_EffectUnit4_Effect4],button_parameter15_type,0 [EffectRack1_EffectUnit4_Effect3],parameter14_type,0 [QuickEffectRack1_[Channel4]_Effect1],parameter13,0 -[Master],crossfader_minus_toggle,0 +[Main],crossfader_minus_toggle,0 [QuickEffectRack1_[Channel4]_Effect1],parameter12,0 [Sampler1],hotcue_20_activate_preview,0 [Channel4],beatlooproll_16_activate,0 @@ -2847,7 +2847,7 @@ [EffectRack1_EffectUnit2_Effect4],parameter5_up,0 [Channel2],hotcue_7_clear,0 [PreviewDeck1],hotcue_22_activate,0 -[Master],crossfader_set_zero,0 +[Main],crossfader_set_zero,0 [PreviewDeck1],VuMeterL_set_one,0 [EffectRack1_EffectUnit2_Effect3],parameter5_type,0 [EffectRack1_EffectUnit1_Effect3],parameter3_up,0 @@ -2871,7 +2871,7 @@ [EffectRack1_EffectUnit4_Effect3],parameter16_toggle,0 [Channel1],beat_distance,0 [EffectRack1_EffectUnit4_Effect1],parameter11_link_inverse,0 -[Master],rate_up_small,0 +[Main],rate_up_small,0 [Channel4],waveform_zoom_up_small,0 [PreviewDeck1],pregain,1 [EffectRack1_EffectUnit1_Effect2],parameter7_up,0 @@ -2881,13 +2881,13 @@ [EffectRack1_EffectUnit1_Effect1],parameter3_up,0 [EffectRack1_EffectUnit2_Effect1],parameter9_up,0 [Sampler1],hotcue_2_activate_preview,0 -[EqualizerRack1_[Master]_Effect1],parameter15_link_inverse,0 +[EqualizerRack1_[Main]_Effect1],parameter15_link_inverse,0 [EffectRack1_EffectUnit1_Effect1],parameter9_set_one,0 [EffectRack1_EffectUnit4_Effect4],parameter16_toggle,0 [EffectRack1_EffectUnit4_Effect4],parameter11_link_inverse,0 [Channel1],waveform_zoom_up_small,0 [QuickEffectRack1_[Channel4]_Effect1],parameter14_type,0 -[Master],headGain_minus_toggle,0 +[Main],headGain_minus_toggle,0 [Channel1],hotcue_12_clear,0 [PreviewDeck1],hotcue_24_activate_preview,0 [Channel4],beatloop_32_activate,0 @@ -2920,7 +2920,7 @@ [Sampler1],loop_move_0.03125_backward,0 [EqualizerRack1_[Channel2]_Effect1],parameter3,1 [EqualizerRack1_[Channel2]_Effect1],parameter2,1 -[Master],PeakIndicator_down,0 +[Main],PeakIndicator_down,0 [EffectRack1_EffectUnit3_Effect4],parameter15_up,0 [EffectRack1_EffectUnit3_Effect3],parameter6_type,0 [EqualizerRack1_[Channel1]_Effect1],parameter8_type,0 @@ -3035,7 +3035,7 @@ [Channel2],beatloop_0.0625,0 [EffectRack1_EffectUnit1_Effect4],parameter11_set_minus_one,0 [EffectRack1_EffectUnit2_Effect4],parameter11_link_inverse,0 -[EqualizerRack1_[Master]_Effect1],parameter13_link_inverse,0 +[EqualizerRack1_[Main]_Effect1],parameter13_link_inverse,0 [Channel3],rateSearch_toggle,0 [Sampler1],loop_move_0.0625_backward,0 [QuickEffectRack1_[Channel1]_Effect1],parameter3_type,2 @@ -3072,7 +3072,7 @@ [EffectRack1_EffectUnit3_Effect2],button_parameter6_type,0 [EffectRack1_EffectUnit3_Effect2],parameter7_up,0 [Channel2],hotcue_34_gotoandplay,0 -[EqualizerRack1_[Master]],super1_toggle,0 +[EqualizerRack1_[Main]],super1_toggle,0 [EffectRack1_EffectUnit4_Effect3],parameter3_set_minus_one,0 [QuickEffectRack1_[Channel3]_Effect1],num_parameters,3 [EffectRack1_EffectUnit2_Effect2],parameter11_down,0 @@ -3096,7 +3096,7 @@ [PreviewDeck1],playposition_set_one,0 [EffectRack1_EffectUnit3_Effect1],parameter6_type,0 [EffectRack1_EffectUnit3_Effect2],parameter9_set_one,0 -[EqualizerRack1_[Master]_Effect1],parameter16_link_inverse,0 +[EqualizerRack1_[Main]_Effect1],parameter16_link_inverse,0 [EffectRack1_EffectUnit4_Effect2],parameter13_toggle,0 [Channel4],loop_move_16_backward,0 [Sampler1],beat_closest,-1 @@ -3124,7 +3124,7 @@ [QuickEffectRack1_[Channel2]_Effect1],parameter9_down_small,0 [EffectRack1_EffectUnit1_Effect4],parameter6_type,0 [Sampler1],loop_move_0.125_forward,0 -[EqualizerRack1_[Master]_Effect1],parameter16_type,0 +[EqualizerRack1_[Main]_Effect1],parameter16_type,0 [EffectRack1_EffectUnit2_Effect4],parameter15_toggle,0 [Channel4],beatloop_0.0625,0 [EffectRack1_EffectUnit4_Effect2],parameter16_toggle,0 @@ -3145,7 +3145,7 @@ [Channel3],beatloop_0.0625,0 [EffectRack1_EffectUnit4_Effect1],parameter11_toggle,0 [Sampler4],beat_closest,-1 -[Master],VuMeterL_down,0 +[Main],VuMeterL_down,0 [Sampler4],bpm_toggle,0 [Channel4],hotcue_12_clear,0 [EqualizerRack1_[Channel2]],super1_down,0 @@ -3176,7 +3176,7 @@ [EffectRack1_EffectUnit2_Effect3],parameter11_down,0 [Sampler4],hotcue_15_goto,0 [Sampler3],beatjump_0.25_forward,0 -[EqualizerRack1_[Master]_Effect1],parameter7_minus_toggle,0 +[EqualizerRack1_[Main]_Effect1],parameter7_minus_toggle,0 [EffectRack1_EffectUnit1_Effect2],parameter11_set_minus_one,0 [EffectRack1_EffectUnit2_Effect2],parameter10_link_inverse,0 [EffectRack1_EffectUnit3_Effect4],parameter9_set_one,0 @@ -3236,7 +3236,7 @@ [Sampler1],hotcue_27_activate,0 [EffectRack1_EffectUnit1_Effect1],parameter3_toggle,0 [EffectRack1_EffectUnit1_Effect3],parameter8_toggle,0 -[EqualizerRack1_[Master]_Effect1],parameter6_minus_toggle,0 +[EqualizerRack1_[Main]_Effect1],parameter6_minus_toggle,0 [EffectRack1_EffectUnit2_Effect2],parameter16_toggle,0 [Channel2],scratch2,0 [EffectRack1_EffectUnit2_Effect4],parameter15_set_default,0 @@ -3277,7 +3277,7 @@ [EffectRack1_EffectUnit3_Effect4],button_parameter6_type,0 [Channel3],visual_key_distance,0 [Sampler1],end_of_track,0 -[Master],duckStrength,0.9 +[Main],duckStrength,0.9 [Channel2],pitch_adjust_down_small,0 [EffectRack1_EffectUnit3_Effect1],parameter11_set_minus_one,0 [EffectRack1_EffectUnit1_Effect2],parameter2_toggle,0 @@ -3297,7 +3297,7 @@ [Channel3],VuMeter_up,0 [EffectRack1_EffectUnit1_Effect1],parameter5_toggle,0 [EffectRack1_EffectUnit1_Effect3],parameter6_toggle,0 -[EqualizerRack1_[Master]_Effect1],parameter9_minus_toggle,0 +[EqualizerRack1_[Main]_Effect1],parameter9_minus_toggle,0 [Sampler4],hotcue_11_activate,0 [Playlist],SelectTrackKnob,0 [EqualizerRack1_[Channel4]_Effect1],parameter9,0 @@ -3313,7 +3313,7 @@ [Channel1],hotcue_30_activate_preview,0 [EqualizerRack1_[Channel4]_Effect1],parameter6,0 [Sampler1],hotcue_21_activate,0 -[EqualizerRack1_[Master]_Effect1],parameter16_set_minus_one,0 +[EqualizerRack1_[Main]_Effect1],parameter16_set_minus_one,0 [EqualizerRack1_[Channel4]_Effect1],parameter1,1 [Sampler1],beatloop_0.25_enabled,0 [EffectRack1_EffectUnit3_Effect1],parameter3_toggle,0 @@ -3358,7 +3358,7 @@ [Channel1],beatloop_0.25_toggle,0 [EffectRack1_EffectUnit4_Effect3],parameter11_toggle,0 [Channel1],loop_move_32_backward,0 -[EqualizerRack1_[Master]_Effect1],parameter6_type,0 +[EqualizerRack1_[Main]_Effect1],parameter6_type,0 [Microphone],volume_down,0 [Sampler4],end_of_track,0 [Channel1],VuMeterL_set_minus_one,0 @@ -3375,7 +3375,7 @@ [Sampler3],pitch_adjust_set_default,0 [EffectRack1_EffectUnit1_Effect1],parameter7_toggle,0 [EffectRack1_EffectUnit1_Effect3],parameter4_toggle,0 -[EqualizerRack1_[Master]_Effect1],parameter8_minus_toggle,0 +[EqualizerRack1_[Main]_Effect1],parameter8_minus_toggle,0 [EffectRack1_EffectUnit2_Effect2],parameter12_toggle,0 [Channel2],beatloop_0.25_toggle,0 [EffectRack1_EffectUnit2_Effect1],parameter16_type,0 @@ -3430,7 +3430,7 @@ [QuickEffectRack1_[Channel3]_Effect1],parameter14_set_zero,0 [EffectRack1_EffectUnit3_Effect2],parameter4_toggle,0 [EffectRack1_EffectUnit3_Effect4],parameter7_toggle,0 -[Master],VuMeterR_set_default,0 +[Main],VuMeterR_set_default,0 [EffectRack1_EffectUnit4_Effect1],parameter15_set_default,0 [Sampler2],hotcue_19_activate,0 [Sampler3],visual_key_distance_toggle,0 @@ -3438,7 +3438,7 @@ [Channel3],pitch_adjust_down_small,0 [EffectRack1_EffectUnit1_Effect1],parameter9_toggle,0 [EffectRack1_EffectUnit1_Effect3],parameter2_toggle,0 -[EqualizerRack1_[Master]_Effect1],parameter3_minus_toggle,0 +[EqualizerRack1_[Main]_Effect1],parameter3_minus_toggle,0 [EffectRack1_EffectUnit2_Effect2],parameter10_toggle,0 [Channel3],beatloop_16_activate,0 [EffectRack1_EffectUnit2_Effect4],parameter13_set_one,0 @@ -3473,7 +3473,7 @@ [EffectRack1_EffectUnit3_Effect2],button_parameter4_type,0 [EffectRack1_EffectUnit1_Effect1],parameter8_toggle,0 [EffectRack1_EffectUnit1_Effect3],parameter3_toggle,0 -[EqualizerRack1_[Master]_Effect1],parameter10_link_inverse,0 +[EqualizerRack1_[Main]_Effect1],parameter10_link_inverse,0 [Channel1],PeakIndicator_minus_toggle,0 [EqualizerRack1_[Channel1]_Effect1],button_parameter1,0 [Channel2],hotcue_29_activate_preview,0 @@ -3499,20 +3499,20 @@ [EffectRack1_EffectUnit3_Effect2],parameter6_toggle,0 [EffectRack1_EffectUnit3_Effect4],parameter5_toggle,0 [EqualizerRack1_[Channel3]_Effect1],parameter4_set_default,0 -[EqualizerRack1_[Master]_Effect1],button_parameter15,0 -[EqualizerRack1_[Master]_Effect1],button_parameter14,0 +[EqualizerRack1_[Main]_Effect1],button_parameter15,0 +[EqualizerRack1_[Main]_Effect1],button_parameter14,0 [QuickEffectRack1_[Channel3]_Effect1],parameter14_type,0 -[EqualizerRack1_[Master]_Effect1],button_parameter16,0 -[EqualizerRack1_[Master]_Effect1],parameter2_minus_toggle,0 +[EqualizerRack1_[Main]_Effect1],button_parameter16,0 +[EqualizerRack1_[Main]_Effect1],parameter2_minus_toggle,0 [EffectRack1_EffectUnit4_Effect3],parameter13_set_one,0 -[EqualizerRack1_[Master]_Effect1],button_parameter11,0 +[EqualizerRack1_[Main]_Effect1],button_parameter11,0 [EffectRack1_EffectUnit2_Effect4],parameter11_toggle,0 [Channel2],pitch_down_small,0 -[EqualizerRack1_[Master]_Effect1],button_parameter10,0 -[EqualizerRack1_[Master]_Effect1],button_parameter13,0 +[EqualizerRack1_[Main]_Effect1],button_parameter10,0 +[EqualizerRack1_[Main]_Effect1],button_parameter13,0 [EffectRack1_EffectUnit2_Effect4],parameter6_set_default,0 [EffectRack1_EffectUnit1_Effect3],parameter6_set_one,0 -[EqualizerRack1_[Master]_Effect1],button_parameter12,0 +[EqualizerRack1_[Main]_Effect1],button_parameter12,0 [Channel3],PeakIndicator_minus_toggle,0 [QuickEffectRack1_[Channel3]_Effect1],parameter16_set_zero,0 [Microphone2],PeakIndicator_down_small,0 @@ -3576,7 +3576,7 @@ [Channel3],hotcue_29_position,-1 [Sampler4],hotcue_35_activate,0 [EffectRack1_EffectUnit2_Effect3],parameter10_type,0 -[EqualizerRack1_[Master]_Effect1],parameter5_minus_toggle,0 +[EqualizerRack1_[Main]_Effect1],parameter5_minus_toggle,0 [Sampler2],beatjump_32_forward,0 [Sampler2],loop_move_1_forward,0 [Sampler4],hotcue_7_activate_preview,0 @@ -3639,7 +3639,7 @@ [EffectRack1_EffectUnit3_Effect4],parameter1_toggle,0 [Channel2],hotcue_23_clear,0 [EffectRack1_EffectUnit1_Effect1],parameter11_set_default,0 -[EqualizerRack1_[Master]_Effect1],parameter4_minus_toggle,0 +[EqualizerRack1_[Main]_Effect1],parameter4_minus_toggle,0 [EffectRack1_EffectUnit1_Effect1],parameter6_loaded,0 [EffectRack1_EffectUnit1_Effect3],parameter5_loaded,0 [QuickEffectRack1_[Channel2]_Effect1],parameter14_set_zero,0 @@ -3670,7 +3670,7 @@ [Channel2],hotcue_33_clear,0 [Channel1],rate_set_minus_one,0 [Channel3],hotcue_11_position,-1 -[EqualizerRack1_[Master]_Effect1],parameter11_link_inverse,0 +[EqualizerRack1_[Main]_Effect1],parameter11_link_inverse,0 [EffectRack1_EffectUnit1_Effect1],parameter9_loaded,0 [EffectRack1_EffectUnit1_Effect3],parameter2_loaded,0 [EqualizerRack1_[Channel1]_Effect1],parameter16_down_small,0 @@ -3717,7 +3717,7 @@ [Sampler2],PeakIndicator_toggle,0 [EffectRack1_EffectUnit3_Effect3],parameter14_up_small,0 [Sampler3],hotcue_35_gotoandplay,0 -[EqualizerRack1_[Master]_Effect1],parameter2_set_default,0 +[EqualizerRack1_[Main]_Effect1],parameter2_set_default,0 [Channel2],hotcue_21_gotoandstop,0 [EffectRack1_EffectUnit3_Effect1],parameter11_set_default,0 [Channel2],hotcue_29_position,-1 @@ -3731,7 +3731,7 @@ [EffectRack1_EffectUnit1_Effect2],parameter3_loaded,0 [EffectRack1_EffectUnit1_Effect4],parameter8_loaded,0 [EffectRack1_EffectUnit3_Effect4],parameter14_up_small,0 -[EqualizerRack1_[Master]_Effect1],parameter13_up_small,0 +[EqualizerRack1_[Main]_Effect1],parameter13_up_small,0 [Sampler1],hotcue_7_activate_preview,0 [Sampler4],hotcue_35_gotoandplay,0 [Auxiliary4],VuMeterR_down,0 @@ -3751,7 +3751,7 @@ [EqualizerRack1_[Channel3]],super1_set_zero,0 [Channel3],hotcue_17_position,-1 [PreviewDeck1],hotcue_27_gotoandstop,0 -[EqualizerRack1_[Master]_Effect1],parameter15_up_small,0 +[EqualizerRack1_[Main]_Effect1],parameter15_up_small,0 [Channel3],hotcue_33_clear,0 [Sampler4],hotcue_22_enabled,0 [Sampler1],beatlooproll_16_activate,0 @@ -3768,7 +3768,7 @@ [Channel3],hotcue_29_gotoandstop,0 [Channel1],hotcue_27_set,0 [EqualizerRack1_[Channel3]_Effect1],parameter13_minus_toggle,0 -[EqualizerRack1_[Master]_Effect1],parameter4_set_one,0 +[EqualizerRack1_[Main]_Effect1],parameter4_set_one,0 [Channel4],hotcue_33_clear,0 [Channel2],hotcue_25_position,-1 [Sampler3],hotcue_22_enabled,0 @@ -3877,7 +3877,7 @@ [PreviewDeck1],VuMeterL,0 [Sampler4],hotcue_15_gotoandplay,0 [Sampler2],visual_key_distance_set_one,0 -[EqualizerRack1_[Master]_Effect1],num_parameters,0 +[EqualizerRack1_[Main]_Effect1],num_parameters,0 [Channel4],pitch_adjust_toggle,0 [Sampler1],beatlooproll_0.125_activate,0 [EffectRack1_EffectUnit2_Effect3],button_parameter1_type,0 @@ -3890,7 +3890,7 @@ [Channel3],hotcue_29_set,0 [EffectRack1_EffectUnit3_Effect2],parameter8_loaded,0 [EffectRack1_EffectUnit3_Effect4],parameter3_loaded,0 -[EqualizerRack1_[Master]_Effect1],parameter12_link_inverse,0 +[EqualizerRack1_[Main]_Effect1],parameter12_link_inverse,0 [Sampler4],PeakIndicator_toggle,0 [QuickEffectRack1_[Channel4]_Effect1],parameter12_set_zero,0 [Sampler2],beatlooproll_0.125_activate,0 @@ -3926,7 +3926,7 @@ [EffectRack1_EffectUnit3_Effect2],parameter3_loaded,0 [EffectRack1_EffectUnit3_Effect4],parameter8_loaded,0 [EffectRack1_EffectUnit3_Effect4],parameter16_up_small,0 -[EqualizerRack1_[Master]_Effect1],parameter11_up_small,0 +[EqualizerRack1_[Main]_Effect1],parameter11_up_small,0 [Sampler1],PeakIndicator,0 [EffectRack1_EffectUnit1_Effect1],parameter2_set_default,0 [EffectRack1_EffectUnit4_Effect1],parameter13_up_small,0 @@ -3999,7 +3999,7 @@ [Channel3],hotcue_28_set,0 [Channel2],hotcue_15_position,-1 [EffectRack1_EffectUnit3_Effect4],parameter2_set_default,0 -[Master],gain_down,0 +[Main],gain_down,0 [EffectRack1_EffectUnit1_Effect2],parameter12_up_small,0 [EffectRack1_EffectUnit2_Effect2],parameter11_up_small,0 [Channel1],rateRange,0.1 @@ -4040,7 +4040,7 @@ [Channel2],filterWaveformEnable,1 [EqualizerRack1_[Channel1]_Effect1],parameter14_set_one,0 [EffectRack1_EffectUnit4_Effect4],parameter11_up_small,0 -[EqualizerRack1_[Master]_Effect1],parameter9_up,0 +[EqualizerRack1_[Main]_Effect1],parameter9_up,0 [Channel3],rateRange,0.1 [EffectRack1_EffectUnit1_Effect1],parameter16_up_small,0 [EffectRack1_EffectUnit2_Effect1],parameter15_up_small,0 @@ -4067,7 +4067,7 @@ [Channel1],hotcue_35_goto,0 [Channel4],playposition_down,0 [EffectRack1_EffectUnit1_Effect3],parameter1_loaded,0 -[EqualizerRack1_[Master]_Effect1],parameter5_up,0 +[EqualizerRack1_[Main]_Effect1],parameter5_up,0 [EffectRack1_EffectUnit1_Effect3],parameter3_set_one,0 [EffectRack1_EffectUnit4_Effect1],parameter3_down,0 [EffectRack1_EffectUnit2_Effect1],parameter13_up_small,0 @@ -4089,7 +4089,7 @@ [EffectRack1_EffectUnit2_Effect2],parameter13_up_small,0 [EffectRack1_EffectUnit3_Effect2],parameter12_up_small,0 [Channel1],hotcue_12_enabled,0 -[EqualizerRack1_[Master]_Effect1],parameter1_up,0 +[EqualizerRack1_[Main]_Effect1],parameter1_up,0 [QuickEffectRack1_[Channel1]],loaded,1 [Channel3],hotcue_4_clear,0 [EffectRack1_EffectUnit3_Effect1],parameter10_up_small,0 @@ -4108,7 +4108,7 @@ [EffectRack1_EffectUnit3_Effect2],parameter2_set_default,0 [Channel3],hotcue_23_set,0 [Channel1],loop_move_4_forward,0 -[EqualizerRack1_[Master]_Effect1],parameter15_down,0 +[EqualizerRack1_[Main]_Effect1],parameter15_down,0 [EffectRack1_EffectUnit4_Effect1],parameter2_set_minus_one,0 [InternalClock],bpm_set_minus_one,0 [Channel4],hotcue_4_clear,0 @@ -4125,7 +4125,7 @@ [EffectRack1_EffectUnit3_Effect1],parameter2_set_default,0 [EffectRack1_EffectUnit4_Effect1],parameter11_up_small,0 [Auxiliary3],pregain_set_zero,0 -[Master],audio_latency_usage,0.013661 +[Main],audio_latency_usage,0.013661 [Channel4],hotcue_23_set,0 [Channel2],loop_move_4_forward,0 [EffectRack1_EffectUnit4_Effect2],parameter2_set_minus_one,0 @@ -4211,7 +4211,7 @@ [QuickEffectRack1_[Channel1]_Effect1],parameter15_set_default,0 [Channel4],hotcue_35_position,-1 [Sampler3],waveform_zoom_up,0 -[EqualizerRack1_[Master]_Effect1],parameter9_down,0 +[EqualizerRack1_[Main]_Effect1],parameter9_down,0 [QuickEffectRack1_[Channel2]],mix_down_small,0 [EqualizerRack1_[Channel1]_Effect1],parameter13_set_default,0 [Sampler3],beatlooproll_0.25_activate,0 @@ -4249,7 +4249,7 @@ [Sampler1],loop_move_0.5_forward,0 [EffectRack1_EffectUnit4_Effect2],parameter15,0 [Channel2],hotcue_2_gotoandstop,0 -[EqualizerRack1_[Master]_Effect1],button_parameter2_loaded,0 +[EqualizerRack1_[Main]_Effect1],button_parameter2_loaded,0 [EffectRack1_EffectUnit4_Effect2],parameter14,0 [EffectRack1_EffectUnit4_Effect2],parameter16,0 [EffectRack1_EffectUnit4_Effect2],parameter11,0 @@ -4274,7 +4274,7 @@ [Sampler1],hotcue_34_gotoandstop,0 [Channel3],hotcue_12_enabled,0 [EqualizerRack1_[Channel2]_Effect1],parameter16_down_small,0 -[EqualizerRack1_[Master]_Effect1],parameter9_set_one,0 +[EqualizerRack1_[Main]_Effect1],parameter9_set_one,0 [Channel2],hotcue_36_activate_preview,0 [Sampler3],hotcue_6_clear,0 [QuickEffectRack1_[Channel4]_Effect1],parameter11_set_one,0 @@ -4283,7 +4283,7 @@ [EffectRack1_EffectUnit3_Effect2],parameter3_down_small,0 [Channel4],hotcue_25_set,0 [Channel4],hotcue_32_enabled,0 -[EqualizerRack1_[Master]_Effect1],button_parameter5_type,0 +[EqualizerRack1_[Main]_Effect1],button_parameter5_type,0 [QuickEffectRack1_[Channel1]],num_effectslots,1 [EqualizerRack1_[Channel4]_Effect1],parameter4_up_small,0 [EffectRack1_EffectUnit2_Effect3],button_parameter10_type,0 @@ -4301,7 +4301,7 @@ [Channel1],rate_perm_down,0 [Sampler3],hotcue_24_gotoandstop,0 [EffectRack1_EffectUnit1_Effect2],parameter3_down_small,0 -[EqualizerRack1_[Master]_Effect1],parameter5_down_small,0 +[EqualizerRack1_[Main]_Effect1],parameter5_down_small,0 [Channel4],loop_move_4_forward,0 [PreviewDeck1],VuMeterL_toggle,0 [Channel1],hotcue_37_position,-1 @@ -4312,7 +4312,7 @@ [PreviewDeck1],hotcue_3_gotoandstop,0 [EqualizerRack1_[Channel3]_Effect1],button_parameter16_type,0 [Sampler3],pitch_set_zero,0 -[EqualizerRack1_[Master]_Effect1],parameter11_type,0 +[EqualizerRack1_[Main]_Effect1],parameter11_type,0 [Sampler4],hotcue_24_gotoandstop,0 [Sampler4],loop_move_32_backward,0 [Auxiliary3],VuMeterR_set_minus_one,0 @@ -4349,7 +4349,7 @@ [Channel2],visual_key_distance_up,0 [Channel4],hotcue_2_gotoandstop,0 [EffectRack1_EffectUnit4_Effect4],parameter14,0 -[EqualizerRack1_[Master]_Effect1],parameter6_link_type,0 +[EqualizerRack1_[Main]_Effect1],parameter6_link_type,0 [EffectRack1_EffectUnit4_Effect4],parameter16,0 [Sampler1],pitch_adjust_down,0 [EffectRack1_EffectUnit4_Effect4],parameter11,0 @@ -4358,7 +4358,7 @@ [EffectRack1_EffectUnit4_Effect4],parameter13,0 [EffectRack1_EffectUnit4_Effect4],parameter12,0 [Sampler2],hotcue_24_gotoandstop,0 -[EqualizerRack1_[Master]_Effect1],parameter15_set_minus_one,0 +[EqualizerRack1_[Main]_Effect1],parameter15_set_minus_one,0 [EffectRack1_EffectUnit1_Effect2],parameter11_minus_toggle,0 [Channel4],beatjump_0.25_forward,0 [Channel4],playposition_minus_toggle,0 @@ -4376,7 +4376,7 @@ [EffectRack1_EffectUnit2_Effect1],parameter12,0 [Channel3],hotcue_24_set,0 [Channel2],hotcue_35_position,-1 -[EqualizerRack1_[Master]_Effect1],button_parameter12_type,0 +[EqualizerRack1_[Main]_Effect1],button_parameter12_type,0 [Sampler3],hotcue_34_gotoandstop,0 [PreviewDeck1],VuMeterR_toggle,0 [EffectRack1_EffectUnit1_Effect3],parameter12_minus_toggle,0 @@ -4506,7 +4506,7 @@ [EqualizerRack1_[Channel3]_Effect1],parameter4_down,0 [Sampler2],rateSearch_up_small,0 [EffectRack1_EffectUnit3_Effect2],parameter12_minus_toggle,0 -[Master],audio_latency_usage_up,0 +[Main],audio_latency_usage_up,0 [Channel1],beatjump_0.25_forward,0 [Channel4],hotcue_36_activate_preview,0 [Sampler1],hotcue_35_clear,0 @@ -4533,7 +4533,7 @@ [Sampler1],hotcue_4_activate_preview,0 [EffectRack1_EffectUnit2_Effect2],parameter1_down,0 [EffectRack1_EffectUnit1_Effect2],parameter10_minus_toggle,0 -[EqualizerRack1_[Master]_Effect1],parameter7_link_type,0 +[EqualizerRack1_[Main]_Effect1],parameter7_link_type,0 [Sampler2],loop_move_32_backward,0 [Auxiliary1],VuMeterR_set_minus_one,0 [EqualizerRack1_[Channel3]],super1_toggle,0 @@ -4553,7 +4553,7 @@ [Channel3],hotcue_26_set,0 [Sampler1],hotcue_15_clear,0 [Channel3],hotcue_3_gotoandplay,0 -[EqualizerRack1_[Master]_Effect1],parameter1_type,0 +[EqualizerRack1_[Main]_Effect1],parameter1_type,0 [Sampler2],beatjump_64_backward,0 [EffectRack1_EffectUnit1_Effect3],parameter13_down,0 [Channel1],visual_key_distance_minus_toggle,0 @@ -4562,7 +4562,7 @@ [Channel2],track_samples,0 [PreviewDeck1],beatloop_4_toggle,0 [EffectRack1_EffectUnit2_Effect4],parameter1_down,0 -[EqualizerRack1_[Master]_Effect1],parameter3,0 +[EqualizerRack1_[Main]_Effect1],parameter3,0 [Channel2],playposition_minus_toggle,0 [Channel4],hotcue_26_set,0 [Sampler2],hotcue_15_clear,0 @@ -4571,7 +4571,7 @@ [Sampler4],orientation_left,0 [PreviewDeck1],hotcue_2_clear,0 [Channel2],visual_key_distance_minus_toggle,0 -[EqualizerRack1_[Master]_Effect1],num_parameterslots,16 +[EqualizerRack1_[Main]_Effect1],num_parameterslots,16 [EqualizerRack1_[Channel2]],group_[Channel2]_enable,1 [Mixer Profile],xFaderCalibration_down_small,0 [Controls],touch_shift,0 @@ -4613,7 +4613,7 @@ [QuickEffectRack1_[Channel4]_Effect1],parameter11_up_small,0 [Sampler2],hotcue_3_gotoandstop,0 [QuickEffectRack1_[Channel1]_Effect1],parameter2_type,2 -[EqualizerRack1_[Master]_Effect1],parameter16_down_small,0 +[EqualizerRack1_[Main]_Effect1],parameter16_down_small,0 [EffectRack1_EffectUnit2],group_[Channel3]_enable,0 [QuickEffectRack1_[Channel1]_Effect1],parameter14_set_zero,0 [Channel2],hotcue_14_activate_preview,0 @@ -4656,7 +4656,7 @@ [EffectRack1_EffectUnit3_Effect1],parameter9_type,0 [EffectRack1_EffectUnit2_Effect3],button_parameter12_type,0 [Channel4],pitch_adjust_set_default,0 -[Master],VuMeterR_down_small,0 +[Main],VuMeterR_down_small,0 [Sampler3],hotcue_36_goto,0 [Channel2],pregain_minus_toggle,0 [Sampler3],hotcue_6_gotoandplay,0 @@ -4668,7 +4668,7 @@ [Channel3],pitch_adjust_set_default,0 [PreviewDeck1],hotcue_13_goto,0 [EffectRack1_EffectUnit3_Effect3],parameter8_set_one,0 -[EqualizerRack1_[Master]_Effect1],parameter6_down_small,0 +[EqualizerRack1_[Main]_Effect1],parameter6_down_small,0 [Channel2],slip_enabled,0 [Sampler4],hotcue_36_goto,0 [QuickEffectRack1_[Channel1]_Effect1],parameter16_set_zero,0 @@ -4678,8 +4678,8 @@ [Sampler2],visual_key_distance_set_default,0 [PreviewDeck1],hotcue_6_activate_preview,0 [EffectRack1_EffectUnit1_Effect4],parameter9_type,0 -[Master],headDelay_up,0 -[EqualizerRack1_[Master]_Effect1],parameter13_type,0 +[Main],headDelay_up,0 +[EqualizerRack1_[Main]_Effect1],parameter13_type,0 [Channel3],visual_key_distance_minus_toggle,0 [EffectRack1_EffectUnit3_Effect4],parameter8_set_one,0 [Channel1],slip_enabled,0 @@ -4691,7 +4691,7 @@ [Channel3],file_key,0 [Sampler2],orientation_left,0 [Channel4],visual_key_distance_minus_toggle,0 -[EqualizerRack1_[Master]_Effect1],parameter8_link_type,0 +[EqualizerRack1_[Main]_Effect1],parameter8_link_type,0 [EffectRack1_EffectUnit2_Effect1],parameter16_set_one,0 [Channel1],rate_perm_up,0 [EffectRack1_EffectUnit1_Effect3],parameter10_minus_toggle,0 @@ -4709,11 +4709,11 @@ [Microphone4],enabled,0 [Sampler4],hotcue_28_enabled,0 [Channel2],hotcue_11_set,0 -[EqualizerRack1_[Master]_Effect1],button_parameter14_type,0 +[EqualizerRack1_[Main]_Effect1],button_parameter14_type,0 [Channel4],hotcue_10_set,0 [EffectRack1_EffectUnit1_Effect4],button_parameter16_loaded,0 [EffectRack1_EffectUnit3],group_[Channel3]_enable,0 -[EqualizerRack1_[Master]_Effect1],parameter6_set_one,0 +[EqualizerRack1_[Main]_Effect1],parameter6_set_one,0 [Channel3],hotcue_14_activate_preview,0 [Sampler4],hotcue_14_goto,0 [Microphone3],enabled,0 @@ -4740,7 +4740,7 @@ [QuickEffectRack1_[Channel4]_Effect1],parameter5_link_type,0 [Sampler1],beatloop_0.0625_toggle,0 [EqualizerRack1_[Channel2]_Effect1],parameter1_down_small,0 -[Master],audio_latency_overload_set_default,0 +[Main],audio_latency_overload_set_default,0 [Sampler2],hotcue_28_activate_preview,0 [EffectRack1_EffectUnit4_Effect3],button_parameter12_type,0 [EqualizerRack1_[Channel3]_Effect1],parameter1_set_minus_one,0 @@ -4825,7 +4825,7 @@ [EffectRack1_EffectUnit1_Effect2],button_parameter10_loaded,0 [Sampler4],visual_key_distance_set_default,0 [EffectRack1_EffectUnit1_Effect4],parameter12_type,0 -[EqualizerRack1_[Master]_Effect1],parameter9_link_type,0 +[EqualizerRack1_[Main]_Effect1],parameter9_link_type,0 [PreviewDeck1],bpm_set_zero,0 [Channel4],hotcue_17_gotoandplay,0 [Sampler3],hotcue_7_clear,0 @@ -4846,17 +4846,17 @@ [PreviewDeck1],hotcue_3_enabled,0 [EffectRack1_EffectUnit3_Effect3],button_parameter15_loaded,0 [QuickEffectRack1_[Channel3]_Effect1],prev_effect,0 -[EqualizerRack1_[Master]_Effect1],parameter10_set_default,0 +[EqualizerRack1_[Main]_Effect1],parameter10_set_default,0 [EffectRack1_EffectUnit2_Effect3],parameter16_set_one,0 [Sampler1],beatloop_16_enabled,0 -[EqualizerRack1_[Master]_Effect1],parameter7_type,0 +[EqualizerRack1_[Main]_Effect1],parameter7_type,0 [EffectRack1_EffectUnit1_Effect2],button_parameter13_loaded,0 [EffectRack1_EffectUnit1_Effect4],button_parameter14_loaded,0 [Microphone3],VuMeter_minus_toggle,0 -[EqualizerRack1_[Master]_Effect1],parameter16_up,0 -[EqualizerRack1_[Master]],mix_set_one,0 +[EqualizerRack1_[Main]_Effect1],parameter16_up,0 +[EqualizerRack1_[Main]],mix_set_one,0 [EffectRack1_EffectUnit3],super1_up,0 -[EqualizerRack1_[Master]_Effect1],button_parameter2,0 +[EqualizerRack1_[Main]_Effect1],button_parameter2,0 [Channel4],hotcue_12_set,0 [Channel2],volume_set_one,0 [PreviewDeck1],hotcue_1_position,-1 @@ -4898,14 +4898,14 @@ [EffectRack1_EffectUnit3_Effect4],parameter12_type,0 [EffectRack1_EffectUnit1_Effect1],button_parameter16_loaded,0 [Channel1],hotcue_37_gotoandplay,0 -[Master],gain,1 +[Main],gain,1 [EffectRack1_EffectUnit2_Effect2],parameter5_set_minus_one,0 [Channel4],eject,0 [Channel1],cue_default,0 [PreviewDeck1],cue_goto,0 [Channel4],rate_temp_up_small,0 [EffectRack1_EffectUnit3_Effect1],button_parameter10_loaded,0 -[Master],duckStrength_down_small,0 +[Main],duckStrength_down_small,0 [QuickEffectRack1_[Channel2]_Effect1],parameter11_up_small,0 [EqualizerRack1_[Channel3]_Effect1],parameter9_toggle,0 [Channel4],hotcue_7_activate_preview,0 @@ -4921,8 +4921,8 @@ [Channel1],beatloop_1_activate,0 [EffectRack1_EffectUnit3_Effect2],button_parameter13_loaded,0 [EffectRack1_EffectUnit3_Effect4],button_parameter14_loaded,0 -[EqualizerRack1_[Master]_Effect1],parameter10_minus_toggle,0 -[EqualizerRack1_[Master]_Effect1],parameter12_up,0 +[EqualizerRack1_[Main]_Effect1],parameter10_minus_toggle,0 +[EqualizerRack1_[Main]_Effect1],parameter12_up,0 [EqualizerRack1_[Channel2]_Effect1],parameter4_link_inverse,0 [QuickEffectRack1_[Channel2]_Effect1],button_parameter15,0 [EqualizerRack1_[Channel3]_Effect1],button_parameter5_loaded,0 @@ -4943,12 +4943,12 @@ [EffectRack1_EffectUnit3_Effect1],button_parameter7_type,0 [QuickEffectRack1_[Channel3]_Effect1],parameter2_up,0 [Channel4],hotcue_30_clear,0 -[Master],duckStrength_set_one,0 +[Main],duckStrength_set_one,0 [EffectRack1_EffectUnit4_Effect4],parameter16_set_one,0 [Channel2],beatloop_1_activate,0 [EffectRack1_EffectUnit3_Effect1],button_parameter13_loaded,0 [EffectRack1_EffectUnit3_Effect3],button_parameter14_loaded,0 -[Master],rate_minus_toggle,0 +[Main],rate_minus_toggle,0 [EqualizerRack1_[Channel3]_Effect1],parameter8_toggle,0 [QuickEffectRack1_[Channel2]_Effect1],next_effect,0 [QuickEffectRack1_[Channel4]],super1_down,0 @@ -4998,7 +4998,7 @@ [EffectRack1_EffectUnit4_Effect3],parameter5_set_minus_one,0 [Auxiliary4],volume_minus_toggle,0 [Channel4],hotcue_10_clear,0 -[EqualizerRack1_[Master]_Effect1],parameter14_set_minus_one,0 +[EqualizerRack1_[Main]_Effect1],parameter14_set_minus_one,0 [Channel2],rate_temp_up_small,0 [EffectRack1_EffectUnit3_Effect1],button_parameter11_loaded,0 [EqualizerRack1_[Channel3]_Effect1],parameter6_toggle,0 @@ -5013,13 +5013,13 @@ [Auxiliary2],VuMeterR_set_default,0 [Channel3],loop_move_0.03125_forward,0 [Sampler3],hotcue_32_clear,0 -[EqualizerRack1_[Master]_Effect1],parameter2_link_type,0 +[EqualizerRack1_[Main]_Effect1],parameter2_link_type,0 [Channel3],hotcue_21_goto,0 [Sampler2],beatjump,0 [InternalClock],bpm_set_one,0 [EffectRack1_EffectUnit1_Effect1],button_parameter12_loaded,0 [EffectRack1_EffectUnit2],group_[Channel4]_enable,0 -[Master],crossfader_down,0 +[Main],crossfader_down,0 [Sampler3],volume_up,0 [EffectRack1_EffectUnit1_Effect1],parameter12_type,0 [Channel1],hotcue_17_gotoandplay,0 @@ -5067,7 +5067,7 @@ [EqualizerRack1_[Channel2]_Effect1],parameter13_down,0 [EqualizerRack1_[Channel4]_Effect1],parameter1_down_small,0 [Sampler1],hotcue_7_goto,0 -[Master],audio_latency_overload_up,0 +[Main],audio_latency_overload_up,0 [EqualizerRack1_[Channel3]_Effect1],effect_selector,0 [EffectRack1_EffectUnit3_Effect1],button_parameter12_loaded,0 [Channel4],beatloop_1_activate,0 @@ -5085,7 +5085,7 @@ [Sampler1],hotcue_12_clear,0 [EffectRack1_EffectUnit1],group_[Auxiliary1]_enable,0 [EffectRack1_EffectUnit3_Effect4],button_parameter12_loaded,0 -[EqualizerRack1_[Master]_Effect1],parameter11_minus_toggle,0 +[EqualizerRack1_[Main]_Effect1],parameter11_minus_toggle,0 [Sampler2],beatjump_2_forward,0 [EqualizerRack1_[Channel2]_Effect1],parameter9_link_inverse,0 [EffectRack1_EffectUnit3_Effect2],parameter12_type,0 @@ -5124,7 +5124,7 @@ [EffectRack1_EffectUnit3],group_[Channel4]_enable,0 [Channel3],hotcue_10_enabled,0 [EffectRack1_EffectUnit1_Effect1],parameter14_minus_toggle,0 -[EqualizerRack1_[Master]_Effect1],parameter3_set_one,0 +[EqualizerRack1_[Main]_Effect1],parameter3_set_one,0 [Channel2],pregain_set_default,0 [Channel1],loop_move_0.03125_forward,0 [Sampler3],hotcue_27_enabled,0 @@ -5140,7 +5140,7 @@ [EffectRack1_EffectUnit4],group_[Channel4]_enable,0 [Channel1],beatloop_0.0625_activate,0 [EffectRack1_EffectUnit1_Effect2],parameter14_minus_toggle,0 -[Master],PeakIndicator_toggle,0 +[Main],PeakIndicator_toggle,0 [EqualizerRack1_[Channel2]_Effect1],button_parameter13_type,0 [Channel3],playposition_up,0 [Channel1],pregain_set_default,0 @@ -5164,7 +5164,7 @@ [EffectRack1_EffectUnit2_Effect1],parameter16_set_default,0 [Channel4],loop_move_64_forward,0 [Channel3],beatloop_0.0625_activate,0 -[EqualizerRack1_[Master]_Effect1],parameter3_link_type,0 +[EqualizerRack1_[Main]_Effect1],parameter3_link_type,0 [Sampler4],hotcue_2_activate,0 [PreviewDeck1],rateSearch_set_minus_one,0 [Auxiliary1],volume_set_one,0 @@ -5202,7 +5202,7 @@ [Sampler4],beatjump_2_forward,0 [EqualizerRack1_[Channel3]_Effect1],button_parameter2_loaded,1 [QuickEffectRack1_[Channel3]_Effect1],parameter15_set_default,0 -[Master],balance,0 +[Main],balance,0 [Sampler3],hotcue_4_activate,0 [Channel3],visual_key_distance_set_default,0 [Sampler1],hotcue_6_activate,0 @@ -5233,7 +5233,7 @@ [EqualizerRack1_[Channel4]_Effect1],parameter11_set_zero,0 [Channel2],pitch_adjust_down,0 [Microphone],pregain_toggle,0 -[EqualizerRack1_[Master]_Effect1],parameter12_minus_toggle,0 +[EqualizerRack1_[Main]_Effect1],parameter12_minus_toggle,0 [QuickEffectRack1_[Channel1]_Effect1],parameter5_set_default,0 [EqualizerRack1_[Channel2]_Effect1],parameter6_link_inverse,0 [Sampler1],hotcue_4_activate,0 @@ -5313,7 +5313,7 @@ [EqualizerRack1_[Channel2]_Effect1],parameter16_up_small,0 [PreviewDeck1],hotcue_9_activate_preview,0 [PreviewDeck1],beatloop_0.25_enabled,0 -[EqualizerRack1_[Master]_Effect1],parameter4_link_type,0 +[EqualizerRack1_[Main]_Effect1],parameter4_link_type,0 [Channel1],pregain_down,0 [Channel2],visual_key_distance_set_default,0 [PreviewDeck1],beatjump_0.25_forward,0 @@ -5360,7 +5360,7 @@ [Sampler1],VuMeter_set_one,0 [Channel3],hotcue_11_activate_preview,0 [Channel4],hotcue_34_goto,0 -[Master],gain_set_minus_one,0 +[Main],gain_set_minus_one,0 [Channel2],hotcue_29_clear,0 [Channel1],hotcue_31_enabled,0 [EffectRack1_EffectUnit2_Effect1],parameter1_minus_toggle,0 @@ -5413,7 +5413,7 @@ [Channel2],hotcue_34_goto,0 [Microphone2],PeakIndicator_up_small,0 [EqualizerRack1_[Channel4]_Effect1],num_button_parameters,3 -[Master],VuMeter_set_one,0 +[Main],VuMeter_set_one,0 [Sampler4],rate_set_minus_one,0 [EffectRack1_EffectUnit4_Effect4],parameter2_down,0 [EqualizerRack1_[Channel4]_Effect1],parameter9_link_inverse,0 @@ -5439,7 +5439,7 @@ [EffectRack1_EffectUnit1_Effect1],parameter14_down,0 [Channel3],hotcue_13_set,0 [Sampler2],hotcue_18_gotoandplay,0 -[EqualizerRack1_[Master]_Effect1],parameter16_down,0 +[EqualizerRack1_[Main]_Effect1],parameter16_down,0 [EqualizerRack1_[Channel2]_Effect1],parameter10_up_small,0 [Channel1],hotcue_20_gotoandstop,0 [Microphone3],PeakIndicator_down,0 @@ -5452,7 +5452,7 @@ [Sampler1],hotcue_20_gotoandplay,0 [EqualizerRack1_[Channel3]_Effect1],parameter1_down,0 [EqualizerRack1_[Channel1]_Effect1],parameter15_set_zero,0 -[EqualizerRack1_[Master]_Effect1],parameter3_set_default,0 +[EqualizerRack1_[Main]_Effect1],parameter3_set_default,0 [Channel2],hotcue_20_gotoandstop,0 [EffectRack1_EffectUnit3_Effect1],parameter12_set_default,0 [Sampler3],VuMeterL_toggle,0 @@ -5505,9 +5505,9 @@ [EffectRack1_EffectUnit1_Effect4],parameter14_down,0 [Sampler1],hotcue_30_gotoandplay,0 [Sampler3],hotcue_28_gotoandplay,0 -[Master],delay_down,0 +[Main],delay_down,0 [EffectRack1_EffectUnit4_Effect3],parameter13_down_small,0 -[EqualizerRack1_[Master]_Effect1],parameter5_link_type,0 +[EqualizerRack1_[Main]_Effect1],parameter5_link_type,0 [Microphone],volume_up,0 [Mixer Profile],xFaderCalibration_set_one,0 [EffectRack1_EffectUnit3_Effect1],parameter14_set_one,0 @@ -5515,7 +5515,7 @@ [Channel2],hotcue_30_gotoandstop,0 [Channel4],hotcue_28_gotoandstop,0 [Microphone2],PeakIndicator_down,0 -[Master],headDelay_down_small,0 +[Main],headDelay_down_small,0 [Sampler3],hotcue_7_set,0 [EffectRack1_EffectUnit4_Effect2],parameter1_minus_toggle,0 [EffectRack1_EffectUnit2_Effect1],parameter2_down,0 @@ -5565,7 +5565,7 @@ [Channel1],beatloop_32_enabled,0 [Channel3],hotcue_18_gotoandstop,0 [Channel1],PeakIndicator_up_small,0 -[Master],balance_toggle,0 +[Main],balance_toggle,0 [Sampler1],beatlooproll_0.5_activate,0 [Sampler2],VuMeterR_toggle,0 [ReplayGain],DefaultBoost_minus_toggle,0 @@ -5573,12 +5573,12 @@ [Microphone4],VuMeterR_set_zero,0 [Sampler1],loop_move_32_forward,0 [EffectRack1_EffectUnit3],group_[PreviewDeck1]_enable,0 -[EqualizerRack1_[Master]_Effect1],parameter2_down,0 +[EqualizerRack1_[Main]_Effect1],parameter2_down,0 [Sampler3],hotcue_18_gotoandplay,0 [Channel3],hotcue_11_enabled,0 [Channel4],beatloop_32_enabled,0 [EffectRack1_EffectUnit1_Effect2],num_button_parameterslots,16 -[EqualizerRack1_[Master]_Effect1],parameter8_set_one,0 +[EqualizerRack1_[Main]_Effect1],parameter8_set_one,0 [Channel4],hotcue_18_gotoandstop,0 [QuickEffectRack1_[Channel4]_Effect1],parameter10_set_one,0 [Channel2],PeakIndicator_up_small,0 @@ -5698,7 +5698,7 @@ [QuickEffectRack1_[Channel1]_Effect1],button_parameter10_loaded,0 [Channel1],pitch_toggle,0 [EffectRack1_EffectUnit1_Effect1],parameter7_down,0 -[EqualizerRack1_[Master]_Effect1],parameter12_type,0 +[EqualizerRack1_[Main]_Effect1],parameter12_type,0 [EffectRack1_EffectUnit1_Effect1],parameter14_set_one,0 [EffectRack1_EffectUnit1_Effect3],num_button_parameterslots,16 [Sampler4],playposition_down_small,0 @@ -5717,7 +5717,7 @@ [EffectRack1_EffectUnit3_Effect4],parameter3_set_default,0 [Channel2],hotcue_6_position,-1 [EffectRack1_EffectUnit1_Effect2],parameter14_set_one,0 -[Master],VuMeterR_minus_toggle,0 +[Main],VuMeterR_minus_toggle,0 [PreviewDeck1],hotcue_35_goto,0 [EqualizerRack1_[Channel4]_Effect1],parameter16_up_small,0 [Channel3],loop_out,0 @@ -5841,10 +5841,10 @@ [EffectRack1_EffectUnit1_Effect2],parameter16_down,0 [Channel2],hotcue_24_activate,0 [Channel1],hotcue_14_set,0 -[Master],audio_latency_overload_count,1 -[EqualizerRack1_[Master]_Effect1],parameter10_set_zero,0 +[Main],audio_latency_overload_count,1 +[EqualizerRack1_[Main]_Effect1],parameter10_set_zero,0 [Auxiliary4],volume_up,0 -[Master],VuMeterL_minus_toggle,0 +[Main],VuMeterL_minus_toggle,0 [Channel1],cue_preview,0 [EffectRack1_EffectUnit3_Effect4],parameter12_link_type,0 [EqualizerRack1_[Channel4]_Effect1],parameter10_up_small,0 @@ -5860,7 +5860,7 @@ [EffectRack1_EffectUnit1_Effect4],parameter4_set_minus_one,0 [Channel1],reloop_exit,0 [EffectRack1_EffectUnit1_Effect2],button_parameter14_type,0 -[EqualizerRack1_[Master]_Effect1],parameter12_set_zero,0 +[EqualizerRack1_[Main]_Effect1],parameter12_set_zero,0 [EffectRack1_EffectUnit1_Effect3],parameter16_set_minus_one,0 [EqualizerRack1_[Channel3]_Effect1],parameter7_down,0 [EqualizerRack1_[Channel4]_Effect1],parameter12_up_small,0 @@ -5868,13 +5868,13 @@ [EqualizerRack1_[Channel4]_Effect1],parameter4_up,0 [Channel1],hotcue_26_enabled,0 [EffectRack1_EffectUnit3_Effect1],button_parameter14_type,0 -[Master],audio_latency_usage_minus_toggle,0 +[Main],audio_latency_usage_minus_toggle,0 [Channel2],reloop_exit,0 [EffectRack1_EffectUnit1_Effect3],button_parameter14_type,0 [EffectRack1_EffectUnit1_Effect4],parameter16_set_minus_one,0 [EffectRack1_EffectUnit2_Effect1],parameter1_down_small,0 [EqualizerRack1_[Channel3]_Effect1],parameter7_set_default,0 -[EqualizerRack1_[Master]_Effect1],num_button_parameterslots,16 +[EqualizerRack1_[Main]_Effect1],num_button_parameterslots,16 [Channel2],hotcue_10_activate,0 [Microphone],VuMeterR_down_small,0 [Sampler1],hotcue_9_set,0 @@ -5907,7 +5907,7 @@ [Channel4],reloop_exit,0 [EffectRack1_EffectUnit1_Effect2],parameter11_link_type,0 [Channel4],PeakIndicator,0 -[EqualizerRack1_[Master]_Effect1],parameter16_set_zero,0 +[EqualizerRack1_[Main]_Effect1],parameter16_set_zero,0 [Channel4],beatloop_64_activate,0 [EffectRack1_EffectUnit4_Effect3],parameter1_down_small,0 [Sampler3],volume_down,0 @@ -6015,7 +6015,7 @@ [Channel3],VuMeter_down_small,0 [EffectRack1_EffectUnit3_Effect2],parameter5,0 [EqualizerRack1_[Channel1]],mix_up,0 -[Master],gain_set_default,0 +[Main],gain_set_default,0 [EffectRack1_EffectUnit3_Effect2],parameter4,0 [EffectRack1_EffectUnit3_Effect2],parameter7,0 [EffectRack1_EffectUnit1_Effect1],parameter16_set_minus_one,0 @@ -6091,17 +6091,17 @@ [Sampler4],hotcue_27_gotoandstop,0 [QuickEffectRack1_[Channel3]_Effect1],button_parameter1_type,0 [Channel4],hotcue_26_activate,0 -[EqualizerRack1_[Master]_Effect1],parameter1_loaded,0 +[EqualizerRack1_[Main]_Effect1],parameter1_loaded,0 [EffectRack1_EffectUnit3_Effect1],parameter8_type,0 [Channel4],hotcue_35_activate_preview,0 [Sampler3],scratch2,0 [PreviewDeck1],pfl,1 -[Master],VuMeter_down_small,0 +[Main],VuMeter_down_small,0 [PreviewDeck1],talkover,0 [QuickEffectRack1_[Channel1]_Effect1],button_parameter7_type,0 [EqualizerRack1_[Channel1]_Effect1],parameter12_up,0 [Channel1],rateSearch_set_one,0 -[EqualizerRack1_[Master]_Effect1],parameter1_set_minus_one,0 +[EqualizerRack1_[Main]_Effect1],parameter1_set_minus_one,0 [Channel1],beatjump_0.125_backward,0 [Channel4],hotcue_26_enabled,0 [QuickEffectRack1_[Channel4]],mix_toggle,0 @@ -6111,7 +6111,7 @@ [EffectRack1_EffectUnit1_Effect3],parameter8_type,0 [Sampler1],hotcue_3_set,0 [EffectRack1_EffectUnit3_Effect2],parameter8_type,0 -[EqualizerRack1_[Master]_Effect1],parameter14_set_zero,0 +[EqualizerRack1_[Main]_Effect1],parameter14_set_zero,0 [EqualizerRack1_[Channel2]_Effect1],parameter14_up_small,0 [Mixer Profile],xFaderCurve_up_small,0 [Channel1],hotcue_16_activate,0 @@ -6121,7 +6121,7 @@ [EffectRack1_EffectUnit1_Effect1],parameter12_link_type,0 [Sampler1],rateRange,0.1 [Sampler2],hotcue_27_gotoandstop,0 -[Master],PeakIndicator,0 +[Main],PeakIndicator,0 [QuickEffectRack1_[Channel2]_Effect1],parameter8_down_small,0 [Sampler3],hotcue_25_enabled,0 [EffectRack1_EffectUnit1_Effect4],parameter8_type,0 @@ -6132,7 +6132,7 @@ [EqualizerRack1_[Channel4]_Effect1],num_parameters,3 [QuickEffectRack1_[Channel1]_Effect1],parameter10_type,0 [Channel3],hotcue_12_activate,0 -[EqualizerRack1_[Master]_Effect1],parameter14_minus_toggle,0 +[EqualizerRack1_[Main]_Effect1],parameter14_minus_toggle,0 [Channel2],hotcue_16_activate,0 [Channel3],rateSearch_set_one,0 [Channel3],beatjump_0.125_backward,0 @@ -6149,7 +6149,7 @@ [EffectRack1_EffectUnit3_Effect4],parameter6,0 [EffectRack1_EffectUnit3_Effect4],parameter1,0 [EffectRack1_EffectUnit3_Effect4],parameter3,0 -[Master],VuMeterR_down,0 +[Main],VuMeterR_down,0 [EffectRack1_EffectUnit3_Effect4],parameter2,0 [Sampler3],hotcue_5_set,0 [Channel4],rateSearch_set_one,0 @@ -6174,7 +6174,7 @@ [EffectRack1_EffectUnit3_Effect3],parameter2,0 [Sampler4],hotcue_5_set,0 [Channel4],hotcue_1_enabled,0 -[EqualizerRack1_[Master]_Effect1],parameter9_up_small,0 +[EqualizerRack1_[Main]_Effect1],parameter9_up_small,0 [QuickEffectRack1_[Channel2]_Effect1],parameter15_down_small,0 [Channel4],hotcue_18_activate,0 [Auxiliary3],VuMeterL_set_minus_one,0 @@ -6193,10 +6193,10 @@ [Sampler2],pregain_up,0 [Sampler4],hotcue_13_clear,0 [Sampler1],rate_set_one,0 -[EqualizerRack1_[Master]_Effect1],parameter7_up_small,0 +[EqualizerRack1_[Main]_Effect1],parameter7_up_small,0 [Recording],status,0 [Sampler2],loop_move_1_backward,0 -[EqualizerRack1_[Master]_Effect1],parameter13_set_minus_one,0 +[EqualizerRack1_[Main]_Effect1],parameter13_set_minus_one,0 [Channel3],hotcue_14_activate,0 [PreviewDeck1],rateSearch_down_small,0 [Channel1],VuMeter_down_small,0 @@ -6206,7 +6206,7 @@ [QuickEffectRack1_[Channel3]_Effect1],parameter10_set_one,0 [QuickEffectRack1_[Channel1]_Effect1],parameter8_link_type,0 [Channel1],pitch_set_zero,0 -[EqualizerRack1_[Master]_Effect1],parameter5_up_small,0 +[EqualizerRack1_[Main]_Effect1],parameter5_up_small,0 [Channel4],hotcue_14_activate,0 [Channel2],VuMeter_down_small,0 [EffectRack1_EffectUnit3_Effect1],parameter16_set_minus_one,0 @@ -6225,7 +6225,7 @@ [Sampler3],hotcue_33_clear,0 [Sampler2],bpm_set_one,0 [Channel1],pitch_adjust_set_minus_one,0 -[EqualizerRack1_[Master]_Effect1],parameter3_up_small,0 +[EqualizerRack1_[Main]_Effect1],parameter3_up_small,0 [EqualizerRack1_[Channel2]_Effect1],parameter15_type,0 [Channel2],hotcue_4_goto,0 [EffectRack1_EffectUnit3_Effect3],parameter10_link_type,0 @@ -6242,7 +6242,7 @@ [EffectRack1_EffectUnit1_Effect2],parameter10_down,0 [EffectRack1_EffectUnit3_Effect4],parameter10_link_type,0 [Sampler4],hotcue_6_set,0 -[EqualizerRack1_[Master]_Effect1],parameter1_up_small,0 +[EqualizerRack1_[Main]_Effect1],parameter1_up_small,0 [EqualizerRack1_[Channel2]_Effect1],parameter8_up,0 [Sampler2],hotcue_25_enabled,0 [EffectRack1_EffectUnit1_Effect1],parameter8_type,0 @@ -6296,12 +6296,12 @@ [Sampler1],hotcue_13_clear,0 [Channel4],rateSearch_down_small,0 [Sampler2],hotcue_6_gotoandstop,0 -[EqualizerRack1_[Master]_Effect1],parameter1_link_type,0 +[EqualizerRack1_[Main]_Effect1],parameter1_link_type,0 [EffectRack1_EffectUnit1_Effect4],parameter15_type,0 [EffectRack1_EffectUnit3_Effect1],parameter10_link_type,0 [InternalClock],bpm_toggle,0 [QuickEffectRack1_[Channel4]_Effect1],button_parameter13_loaded,0 -[EqualizerRack1_[Master]_Effect1],parameter9_loaded,0 +[EqualizerRack1_[Main]_Effect1],parameter9_loaded,0 [Sampler2],hotcue_13_clear,0 [Sampler2],beats_translate_match_alignment,0 [PreviewDeck1],hotcue_8_clear,0 @@ -6313,18 +6313,18 @@ [Channel1],hotcue_32_activate,0 [Sampler1],hotcue_23_clear,0 [Sampler1],beats_translate_match_alignment,0 -[EqualizerRack1_[Master]_Effect1],parameter8_type,0 +[EqualizerRack1_[Main]_Effect1],parameter8_type,0 [PreviewDeck1],hotcue_36_set,0 [PreviewDeck1],hotcue_7_gotoandplay,0 [EffectRack1_EffectUnit1_Effect3],parameter10_down,0 [QuickEffectRack1_[Channel3]_Effect1],parameter3_set_default,0 [QuickEffectRack1_[Channel4]_Effect1],button_parameter16_loaded,0 -[EqualizerRack1_[Master]_Effect1],parameter8_loaded,0 +[EqualizerRack1_[Main]_Effect1],parameter8_loaded,0 [Sampler1],hotcue_33_activate_preview,0 [PreviewDeck1],rateSearch_down,0 [Channel2],hotcue_32_activate,0 [Sampler2],hotcue_23_clear,0 -[EqualizerRack1_[Master]_Effect1],parameter14_loaded,0 +[EqualizerRack1_[Main]_Effect1],parameter14_loaded,0 [QuickEffectRack1_[Channel3]_Effect1],parameter14_up,0 [Auxiliary1],VuMeterL_set_minus_one,0 [Channel1],beatjump_2_backward,0 @@ -6340,7 +6340,7 @@ [Channel1],PeakIndicator_up,0 [Auxiliary2],VuMeterL_set_minus_one,0 [Channel2],beatjump_2_backward,0 -[EqualizerRack1_[Master]_Effect1],parameter7_loaded,0 +[EqualizerRack1_[Main]_Effect1],parameter7_loaded,0 [QuickEffectRack1_[Channel1]_Effect1],parameter7_link_type,0 [Channel1],rateSearch_down_small,0 [Channel4],hotcue_2_gotoandplay,0 @@ -6360,7 +6360,7 @@ [PreviewDeck1],hotcue_23_enabled,0 [QuickEffectRack1_[Channel4]_Effect1],button_parameter14_loaded,0 [Channel4],beatjump_2_backward,0 -[EqualizerRack1_[Master]_Effect1],parameter6_loaded,0 +[EqualizerRack1_[Main]_Effect1],parameter6_loaded,0 [PreviewDeck1],volume_toggle,0 [PreviewDeck1],bpm,100.5 [Channel3],hotcue_30_activate,0 @@ -6369,14 +6369,14 @@ [EffectRack1_EffectUnit1_Effect3],parameter15_set_one,0 [Sampler2],hotcue_1_gotoandplay,0 [Channel2],hotcue_34_activate,0 -[Master],duckStrength_set_default,0 +[Main],duckStrength_set_default,0 [Channel3],pitch_adjust_set_minus_one,0 [Channel4],hotcue_30_activate,0 [EffectRack1_EffectUnit1_Effect4],parameter15_set_one,0 [Sampler3],hotcue_1_gotoandplay,0 [Channel3],beatjump_0.0625_backward,0 [Channel3],hotcue_6_goto,0 -[EqualizerRack1_[Master]_Effect1],parameter5_loaded,0 +[EqualizerRack1_[Main]_Effect1],parameter5_loaded,0 [EffectRack1_EffectUnit1],insertion_type,0 [EffectRack1_EffectUnit3_Effect1],parameter14_up,0 [EqualizerRack1_[Channel2]_Effect1],parameter12_minus_toggle,0 @@ -6399,7 +6399,7 @@ [EqualizerRack1_[Channel1]_Effect1],button_parameter12_type,0 [Sampler3],hotcue_9_gotoandplay,0 [Channel3],PeakIndicator_up,0 -[EqualizerRack1_[Master]_Effect1],parameter4_loaded,0 +[EqualizerRack1_[Main]_Effect1],parameter4_loaded,0 [Channel1],beat_active,0 [Channel2],hotcue_2_gotoandplay,0 [Channel1],hotcue_36_activate,0 @@ -6423,7 +6423,7 @@ [Channel2],hotcue_36_activate,0 [Channel1],hotcue_6_enabled,0 [EffectRack1_EffectUnit1_Effect2],parameter10_link_type,0 -[EqualizerRack1_[Master]_Effect1],parameter3_loaded,0 +[EqualizerRack1_[Main]_Effect1],parameter3_loaded,0 [EqualizerRack1_[Channel2]_Effect1],parameter11_minus_toggle,0 [Channel4],hotcue_32_activate,0 [Channel3],hotcue_20_goto,0 @@ -6433,7 +6433,7 @@ [Auxiliary1],pregain_set_minus_one,0 [Sampler3],hotcue_1_set,0 [EffectRack1_EffectUnit4_Effect1],effect_selector,0 -[Master],PeakIndicator_minus_toggle,0 +[Main],PeakIndicator_minus_toggle,0 [EffectRack1_EffectUnit1_Effect1],parameter15_type,0 [EqualizerRack1_[Channel4]_Effect1],button_parameter8_loaded,0 [QuickEffectRack1_[Channel4]_Effect1],parameter6_down,0 @@ -6449,7 +6449,7 @@ [QuickEffectRack1_[Channel4]_Effect1],parameter15_down_small,0 [Channel1],beatjump_0.0625_backward,0 [Channel1],beatjump_8_backward,0 -[EqualizerRack1_[Master]_Effect1],parameter2_loaded,0 +[EqualizerRack1_[Main]_Effect1],parameter2_loaded,0 [Channel1],hotcue_20_goto,0 [Microphone],pregain,1 [EffectRack1_EffectUnit4_Effect1],parameter16_up,0 @@ -6458,7 +6458,7 @@ [EffectRack1_EffectUnit4_Effect3],effect_selector,0 [Channel2],beatjump_0.0625_backward,0 [EqualizerRack1_[Channel4]_Effect1],button_parameter7_loaded,0 -[Master],headMix_up,0 +[Main],headMix_up,0 [Channel2],beatjump_8_backward,0 [Mixer Profile],LoEQFrequency_down_small,0 [Channel2],hotcue_20_goto,0 @@ -6498,7 +6498,7 @@ [Channel1],hotcue_6_goto,0 [EffectRack1_EffectUnit3_Effect3],parameter14_up,0 [Channel3],rate_perm_up_small,0 -[Master],VuMeterL_set_zero,0 +[Main],VuMeterL_set_zero,0 [Auxiliary3],pregain_set_minus_one,0 [Channel3],rate_set_zero,0 [EffectRack1_EffectUnit3_Effect2],parameter15_type,0 @@ -6512,7 +6512,7 @@ [Channel2],hotcue_6_goto,0 [EffectRack1_EffectUnit1_Effect1],parameter14_up,0 [EffectRack1_EffectUnit4_Effect1],parameter12_up,0 -[EqualizerRack1_[Master]_Effect1],parameter11_down,0 +[EqualizerRack1_[Main]_Effect1],parameter11_down,0 [EffectRack1_EffectUnit3_Effect4],parameter14_up,0 [EqualizerRack1_[Channel3]_Effect1],parameter13_set_zero,0 [Channel4],rate_perm_up_small,0 @@ -6527,7 +6527,7 @@ [Channel1],beatjump_64_forward,0 [EffectRack1_EffectUnit2_Effect3],parameter16_up,0 [Sampler4],hotcue_2_set,0 -[Master],VuMeterR_set_zero,0 +[Main],VuMeterR_set_zero,0 [QuickEffectRack1_[Channel4]_Effect1],button_parameter11_loaded,0 [EffectRack1_EffectUnit4_Effect1],parameter12_set_one,0 [EffectRack1_EffectUnit1_Effect2],parameter14_up,0 @@ -6631,15 +6631,15 @@ [Channel2],hotcue_16_clear,0 [Sampler1],bpm_up_small,0 [EqualizerRack1_[Channel1]],num_effectslots,1 -[Master],maximize_library,0 +[Main],maximize_library,0 [Auxiliary4],PeakIndicator_toggle,0 [EffectRack1_EffectUnit1_Effect1],parameter15_set_zero,0 [EffectRack1_EffectUnit2_Effect1],parameter16_set_zero,0 [EffectRack1_EffectUnit4_Effect1],parameter10_set_zero,0 -[EqualizerRack1_[Master]_Effect1],parameter10_loaded,0 +[EqualizerRack1_[Main]_Effect1],parameter10_loaded,0 [EffectRack1_EffectUnit1_Effect1],parameter6_up,0 [EffectRack1_EffectUnit2_Effect1],parameter4_up,0 -[EqualizerRack1_[Master]_Effect1],parameter15_set_default,0 +[EqualizerRack1_[Main]_Effect1],parameter15_set_default,0 [QuickEffectRack1_[Channel1]_Effect1],button_parameter6_loaded,0 [Channel1],rate_temp_down_small,0 [EqualizerRack1_[Channel4]_Effect1],button_parameter1_loaded,1 @@ -6700,12 +6700,12 @@ [Channel2],hotcue_36_clear,0 [EffectRack1_EffectUnit2_Effect4],parameter12_set_one,0 [Sampler3],visual_key_distance_set_minus_one,0 -[EqualizerRack1_[Master]_Effect1],parameter12_loaded,0 +[EqualizerRack1_[Main]_Effect1],parameter12_loaded,0 [Channel1],end,0 [Sampler1],pregain_minus_toggle,0 [Sampler4],total_gain,0 [EffectRack1_EffectUnit4_Effect3],parameter8_up,0 -[Master],balance_set_one,0 +[Main],balance_set_one,0 [PreviewDeck1],beatloop_64_enabled,0 [EqualizerRack1_[Channel1]_Effect1],parameter15_type,0 [EffectRack1_EffectUnit1_Effect3],parameter13_set_zero,0 @@ -6737,13 +6737,13 @@ [EffectRack1_EffectUnit4_Effect3],parameter4_up,0 [Channel1],rate_set_zero,0 [Channel3],beatjump_0.03125_forward,0 -[EqualizerRack1_[Master]_Effect1],parameter11_loaded,0 +[EqualizerRack1_[Main]_Effect1],parameter11_loaded,0 [EffectRack1_EffectUnit2_Effect4],button_parameter3_type,0 [EffectRack1_EffectUnit1_Effect3],parameter15_set_zero,0 [EffectRack1_EffectUnit2_Effect3],parameter16_set_zero,0 [EffectRack1_EffectUnit4_Effect3],parameter10_set_zero,0 [EffectRack1_EffectUnit3_Effect2],parameter9_down_small,0 -[EqualizerRack1_[Master]_Effect1],button_parameter1_type,0 +[EqualizerRack1_[Main]_Effect1],button_parameter1_type,0 [Channel2],beatjump_4_forward,0 [QuickEffectRack1_[Channel3]],mix_toggle,0 [EqualizerRack1_[Channel4]_Effect1],parameter15_down_small,0 @@ -6784,7 +6784,7 @@ [EffectRack1_EffectUnit3_Effect2],button_parameter3_loaded,0 [EffectRack1_EffectUnit3_Effect4],button_parameter8_loaded,0 [Channel4],hotcue_26_clear,0 -[Master],VuMeterL_set_one,0 +[Main],VuMeterL_set_one,0 [Channel3],vinylcontrol_scratching,0 [Channel4],vinylcontrol_wantenabled,0 [EqualizerRack1_[Channel3]_Effect1],button_parameter12_type,0 @@ -6828,7 +6828,7 @@ [Sampler4],vinylcontrol_seek,0 [PreviewDeck1],hotcue_16_goto,0 [EffectRack1_EffectUnit3_Effect4],button_parameter9_loaded,0 -[EqualizerRack1_[Master]_Effect1],parameter13_loaded,0 +[EqualizerRack1_[Main]_Effect1],parameter13_loaded,0 [EffectRack1_EffectUnit3_Effect4],parameter6_up,0 [Channel4],bpm_up_small,0 [Microphone],pregain_set_one,0 @@ -6871,7 +6871,7 @@ [EffectRack1_EffectUnit4_Effect4],parameter16_set_zero,0 [EqualizerRack1_[Channel3]_Effect1],button_parameter10_loaded,0 [EffectRack1_EffectUnit3_Effect2],button_parameter5_loaded,0 -[EqualizerRack1_[Master]_Effect1],parameter16_loaded,0 +[EqualizerRack1_[Main]_Effect1],parameter16_loaded,0 [EffectRack1_EffectUnit3_Effect2],parameter6_up,0 [Channel2],fwd,0 [EffectRack1_EffectUnit3],prev_chain,0 @@ -6906,7 +6906,7 @@ [EffectRack1_EffectUnit3_Effect4],button_parameter7_loaded,0 [EffectRack1_EffectUnit3_Effect3],parameter13_minus_toggle,0 [Sampler1],visual_key_distance_set_minus_one,0 -[EqualizerRack1_[Master]_Effect1],parameter15_loaded,0 +[EqualizerRack1_[Main]_Effect1],parameter15_loaded,0 [Channel1],vinylcontrol_scratching,0 [Channel4],fwd,0 [EffectRack1_EffectUnit1_Effect4],parameter16_minus_toggle,0 @@ -6921,7 +6921,7 @@ [QuickEffectRack1_[Channel1]_Effect1],parameter12_link_type,0 [QuickEffectRack1_[Channel2]_Effect1],parameter15_link_type,0 [QuickEffectRack1_[Channel4]_Effect1],parameter13_link_type,0 -[Master],headDelay_minus_toggle,0 +[Main],headDelay_minus_toggle,0 [Channel4],hotcue_33_goto,0 [QuickEffectRack1_[Channel4]_Effect1],clear,0 [EffectRack1_EffectUnit3_Effect4],parameter15_set_zero,0 @@ -6955,8 +6955,8 @@ [EffectRack1_EffectUnit3_Effect1],parameter15_minus_toggle,0 [EqualizerRack1_[Channel4]],num_effectslots,1 [EffectRack1_EffectUnit3_Effect4],parameter9_down_small,0 -[EqualizerRack1_[Master]_Effect1],parameter1_set_zero,0 -[Master],guiTick50ms,18.5993 +[EqualizerRack1_[Main]_Effect1],parameter1_set_zero,0 +[Main],guiTick50ms,18.5993 [EffectRack1_EffectUnit1_Effect2],parameter16_minus_toggle,0 [QuickEffectRack1_[Channel1]_Effect1],parameter11_up_small,0 [EqualizerRack1_[Channel2]_Effect1],parameter9_toggle,0 @@ -6965,7 +6965,7 @@ [EffectRack1_EffectUnit3_Effect4],parameter13_set_zero,0 [QuickEffectRack1_[Channel4]_Effect1],parameter5_type,0 [EffectRack1_EffectUnit3_Effect1],parameter7_set_minus_one,0 -[EqualizerRack1_[Master]],next_chain,0 +[EqualizerRack1_[Main]],next_chain,0 [Channel2],hotcue_33_goto,0 [EffectRack1_EffectUnit4_Effect2],parameter14_set_zero,0 [EffectRack1_EffectUnit1_Effect3],parameter9_down_small,0 @@ -6989,7 +6989,7 @@ [EffectRack1_EffectUnit3_Effect4],button_parameter5_loaded,0 [EffectRack1_EffectUnit3_Effect3],parameter16_minus_toggle,0 [EqualizerRack1_[Channel1]_Effect1],parameter10_minus_toggle,0 -[EqualizerRack1_[Master]_Effect1],parameter13_down,0 +[EqualizerRack1_[Main]_Effect1],parameter13_down,0 [EffectRack1_EffectUnit1_Effect4],parameter15_minus_toggle,0 [QuickEffectRack1_[Channel1]_Effect1],button_parameter9_loaded,0 [EqualizerRack1_[Channel2]_Effect1],parameter8_toggle,0 @@ -7012,8 +7012,8 @@ [QuickEffectRack1_[Channel1]_Effect1],parameter15_up_small,0 [EffectRack1_EffectUnit3_Effect4],parameter7_set_minus_one,0 [Sampler1],rate_up_small,0 -[Master],num_auxiliaries,4 -[Master],audio_latency_overload_down_small,0 +[Main],num_auxiliaries,4 +[Main],audio_latency_overload_down_small,0 [EffectRack1_EffectUnit3_Effect3],parameter15_set_minus_one,0 [EqualizerRack1_[Channel1]_Effect1],parameter7_down,0 [EffectRack1_EffectUnit3_Effect4],parameter1_set_one,0 @@ -7056,7 +7056,7 @@ [Channel1],beatjump_0.5_backward,0 [QuickEffectRack1_[Channel1]_Effect1],button_parameter3_loaded,0 [EqualizerRack1_[Channel2]_Effect1],parameter6_toggle,0 -[EqualizerRack1_[Master]_Effect1],parameter9_set_zero,0 +[EqualizerRack1_[Main]_Effect1],parameter9_set_zero,0 [Sampler1],hotcue_9_activate_preview,0 [Sampler2],VuMeterR_set_default,0 [Auxiliary1],VuMeter_down_small,0 @@ -7073,7 +7073,7 @@ [QuickEffectRack1_[Channel3]_Effect1],parameter10_set_default,0 [EffectRack1_EffectUnit3_Effect4],next_effect,0 [Channel2],beatjump_0.5_backward,0 -[EqualizerRack1_[Master]_Effect1],parameter7_set_one,0 +[EqualizerRack1_[Main]_Effect1],parameter7_set_one,0 [Sampler1],VuMeterR_set_default,0 [Sampler2],hotcue_9_activate_preview,0 [QuickEffectRack1_[Channel1]_Effect1],parameter1_down,0 @@ -7084,7 +7084,7 @@ [Channel4],hotcue_24_enabled,0 [EffectRack1_EffectUnit1_Effect1],button_parameter5_loaded,0 [Sampler2],vinylcontrol_seek,0 -[EqualizerRack1_[Master]_Effect1],parameter7_set_zero,0 +[EqualizerRack1_[Main]_Effect1],parameter7_set_zero,0 [EffectRack1_EffectUnit3_Effect1],parameter13_minus_toggle,0 [QuickEffectRack1_[Channel3]_Effect1],parameter6_down,0 [Channel3],beatjump_0.5_backward,0 @@ -7104,8 +7104,8 @@ [Channel4],beatjump_0.5_backward,0 [EqualizerRack1_[Channel2]_Effect1],button_parameter1_loaded,1 [PreviewDeck1],PeakIndicator_set_zero,0 -[EqualizerRack1_[Master]_Effect1],parameter5_set_zero,0 -[Master],VuMeterL_up,0 +[EqualizerRack1_[Main]_Effect1],parameter5_set_zero,0 +[Main],VuMeterL_up,0 [EffectRack1_EffectUnit2_Effect3],parameter5_down,0 [Auxiliary1],PeakIndicator_set_minus_one,0 [EffectRack1_EffectUnit1_Effect1],button_parameter4_loaded,0 @@ -7129,19 +7129,19 @@ [EffectRack1_EffectUnit3_Effect3],button_parameter1_loaded,0 [EqualizerRack1_[Channel1]_Effect1],button_parameter2_loaded,1 [Channel3],beatsync_tempo,0 -[EqualizerRack1_[Master]_Effect1],parameter3_down,0 +[EqualizerRack1_[Main]_Effect1],parameter3_down,0 [QuickEffectRack1_[Channel1]_Effect1],parameter11_link_type,0 [QuickEffectRack1_[Channel2]_Effect1],parameter16_link_type,0 [QuickEffectRack1_[Channel3]_Effect1],parameter13_link_type,0 -[EqualizerRack1_[Master]_Effect1],parameter3_set_zero,0 -[EqualizerRack1_[Master]_Effect1],clear,0 +[EqualizerRack1_[Main]_Effect1],parameter3_set_zero,0 +[EqualizerRack1_[Main]_Effect1],clear,0 [Channel4],bpm_set_minus_one,0 [QuickEffectRack1_[Channel1]_Effect1],parameter4_set_default,0 [EffectRack1_EffectUnit1],group_[Microphone2]_enable,0 [EffectRack1_EffectUnit2_Effect4],parameter14_set_zero,0 [Channel2],beatloop_0.0625_enabled,0 [QuickEffectRack1_[Channel2]_Effect1],button_parameter14_type,0 -[Master],audio_latency_overload_down,0 +[Main],audio_latency_overload_down,0 [Sampler2],beatloop_0.03125_enabled,0 [Sampler2],loop_move_0.03125_forward,0 [QuickEffectRack1_[Channel1]_Effect1],parameter3_link_type,3 @@ -7159,7 +7159,7 @@ [Channel1],beatloop_0.0625_enabled,0 [EqualizerRack1_[Channel2]_Effect1],parameter3_toggle,0 [EqualizerRack1_[Channel3]_Effect1],parameter5_down_small,0 -[EqualizerRack1_[Master]_Effect1],parameter10_down_small,0 +[EqualizerRack1_[Main]_Effect1],parameter10_down_small,0 [Sampler1],beatloop_0.03125_enabled,0 [Channel2],hotcue_19_activate_preview,0 [EffectRack1_EffectUnit1_Effect4],button_parameter5_loaded,0 @@ -7168,7 +7168,7 @@ [EqualizerRack1_[Channel3]_Effect1],button_parameter1_type,4 [Sampler3],rate_up_small,0 [EffectRack1_EffectUnit3_Effect1],parameter15_set_minus_one,0 -[EqualizerRack1_[Master]_Effect1],parameter12_set_minus_one,0 +[EqualizerRack1_[Main]_Effect1],parameter12_set_minus_one,0 [EffectRack1_EffectUnit1_Effect3],button_parameter5_loaded,0 [EqualizerRack1_[Channel2]_Effect1],parameter9_set_default,0 [EffectRack1_EffectUnit1_Effect4],parameter15_down_small,0 @@ -7189,13 +7189,13 @@ [EffectRack1_EffectUnit1_Effect4],next_effect,0 [EffectRack1_EffectUnit2_Effect2],button_parameter16_type,0 [EqualizerRack1_[Channel2]_Effect1],parameter15_down_small,0 -[Master],PeakIndicator_set_zero,0 +[Main],PeakIndicator_set_zero,0 [EffectRack1],show,1 [EffectRack1_EffectUnit2_Effect3],parameter8_set_default,0 [EffectRack1_EffectUnit3_Effect2],parameter6_down,0 [EffectRack1_EffectUnit3_Effect2],parameter2_down_small,0 [EqualizerRack1_[Channel3]_Effect1],button_parameter12_loaded,0 -[EqualizerRack1_[Master]_Effect1],button_parameter7_type,0 +[EqualizerRack1_[Main]_Effect1],button_parameter7_type,0 [Auxiliary3],PeakIndicator_set_minus_one,0 [Microphone3],pfl,0 [EffectRack1_EffectUnit1_Effect1],button_parameter9_loaded,0 @@ -7214,7 +7214,7 @@ [Sampler1],hotcue_31_goto,0 [EffectRack1_EffectUnit2_Effect4],button_parameter16_type,0 [EffectRack1_EffectUnit1_Effect2],parameter2_down_small,0 -[EqualizerRack1_[Master]_Effect1],parameter4_down_small,0 +[EqualizerRack1_[Main]_Effect1],parameter4_down_small,0 [QuickEffectRack1_[Channel3]_Effect1],parameter16_set_minus_one,0 [EffectRack1_EffectUnit3_Effect4],parameter6_down,0 [Sampler1],hotcue_23_enabled,0 @@ -7244,7 +7244,7 @@ [EffectRack1_EffectUnit2_Effect3],clear,0 [QuickEffectRack1_[Channel2]_Effect1],parameter10_set_default,0 [Channel2],hotcue_16_gotoandplay,0 -[EqualizerRack1_[Master]_Effect1],parameter15_minus_toggle,0 +[EqualizerRack1_[Main]_Effect1],parameter15_minus_toggle,0 [EffectRack1_EffectUnit3_Effect2],button_parameter1_loaded,0 [EffectRack1_EffectUnit3_Effect4],button_parameter2_loaded,0 [Channel2],hotcue_17_clear,0 @@ -7256,7 +7256,7 @@ [EffectRack1_EffectUnit2_Effect2],parameter8_set_default,0 [Auxiliary3],VuMeter_down_small,0 [EffectRack1_EffectUnit2_Effect4],clear,0 -[EqualizerRack1_[Master]],mix_down_small,0 +[EqualizerRack1_[Main]],mix_down_small,0 [EffectRack1_EffectUnit3_Effect3],parameter15_down_small,0 [Channel3],hotcue_26_gotoandplay,0 [EffectRack1_EffectUnit1_Effect2],button_parameter2_loaded,0 @@ -7289,7 +7289,7 @@ [EffectRack1_EffectUnit4_Effect1],button_parameter16_type,0 [Channel1],hotcue_9_activate,0 [Microphone2],VuMeter_set_zero,0 -[EqualizerRack1_[Master]_Effect1],effect_selector,0 +[EqualizerRack1_[Main]_Effect1],effect_selector,0 [Channel2],hotcue_27_clear,0 [PreviewDeck1],loop_move,0 [QuickEffectRack1_[Channel1]],mix_toggle,0 @@ -7359,11 +7359,11 @@ [EffectRack1_EffectUnit4_Effect1],parameter8_set_default,0 [EffectRack1_EffectUnit1_Effect3],parameter2_down_small,0 [EffectRack1_EffectUnit4],group_[Microphone2]_enable,0 -[Master],headGain_down,0 +[Main],headGain_down,0 [Sampler1],loop_enabled,0 [Sampler1],hotcue_23_gotoandplay,0 [EqualizerRack1_[Channel3]_Effect1],parameter10_link_inverse,0 -[EqualizerRack1_[Master]_Effect1],parameter4_set_default,0 +[EqualizerRack1_[Main]_Effect1],parameter4_set_default,0 [Sampler3],rate,0 [Channel1],hotcue_3_activate,0 [Channel2],hotcue_23_gotoandstop,0 @@ -7374,7 +7374,7 @@ [EffectRack1_EffectUnit1_Effect1],parameter15_down_small,0 [Sampler2],loop_halve,0 [EffectRack1_EffectUnit1_Effect4],parameter2_down_small,0 -[EqualizerRack1_[Master]_Effect1],parameter12_set_one,0 +[EqualizerRack1_[Main]_Effect1],parameter12_set_one,0 [EqualizerRack1_[Channel2]_Effect1],button_parameter13_loaded,0 [EqualizerRack1_[Channel4]_Effect1],parameter8_toggle,0 [Sampler3],pfl,0 @@ -7386,7 +7386,7 @@ [PreviewDeck1],PeakIndicator_up_small,0 [Channel2],hotcue_3_activate,0 [Channel3],hotcue_23_gotoandstop,0 -[EqualizerRack1_[Master]_Effect1],parameter13_minus_toggle,0 +[EqualizerRack1_[Main]_Effect1],parameter13_minus_toggle,0 [Auxiliary2],main_mix,1 [Sampler3],hotcue_18_clear,0 [EffectRack1_EffectUnit1_Effect2],parameter15_down_small,0 @@ -7428,10 +7428,10 @@ [EffectRack1_EffectUnit2],group_[Channel1]_enable,0 [Channel4],play_indicator,0 [EffectRack1_EffectUnit3_Effect2],parameter1_link_type,0 -[EqualizerRack1_[Master]],mix,1 +[EqualizerRack1_[Main]],mix,1 [EffectRack1_EffectUnit4_Effect2],clear,0 [Sampler1],hotcue_33_gotoandplay,0 -[Master],delay_minus_toggle,0 +[Main],delay_minus_toggle,0 [Channel4],hotcue_7_activate,0 [Channel2],hotcue_33_gotoandstop,0 [Channel1],hotcue_26_gotoandplay,0 @@ -7455,7 +7455,7 @@ [Sampler3],rateSearch_set_one,0 [Channel3],hotcue_13_gotoandstop,0 [Channel2],hotcue_26_gotoandplay,0 -[EqualizerRack1_[Master]_Effect1],parameter16_minus_toggle,0 +[EqualizerRack1_[Main]_Effect1],parameter16_minus_toggle,0 [EffectRack1_EffectUnit2_Effect2],parameter2_minus_toggle,0 [EffectRack1_EffectUnit1_Effect1],button_parameter1_loaded,0 [EffectRack1_EffectUnit1_Effect3],button_parameter2_loaded,0 @@ -7469,7 +7469,7 @@ [Sampler4],pregain_up_small,0 [EffectRack1_EffectUnit4_Effect2],parameter12_down,0 [Sampler3],hotcue_23_gotoandplay,0 -[EqualizerRack1_[Master]],super1_set_zero,0 +[EqualizerRack1_[Main]],super1_set_zero,0 [QuickEffectRack1_[Channel3]_Effect1],parameter5_set_minus_one,0 [QuickEffectRack1_[Channel2]_Effect1],parameter8_up_small,0 [EffectRack1_EffectUnit3_Effect4],parameter3_type,0 @@ -7495,7 +7495,7 @@ [Channel4],hotcue_3_activate,0 [Channel4],hotcue_16_gotoandplay,0 [EffectRack1_EffectUnit2_Effect4],parameter5_minus_toggle,0 -[Master],delay,0 +[Main],delay,0 [Channel4],hotcue_17_clear,0 [EqualizerRack1_[Channel4]_Effect1],parameter14_link_inverse,0 [QuickEffectRack1_[Channel2]_Effect1],parameter2_up_small,0 @@ -7561,7 +7561,7 @@ [Sampler3],hotcue_14_activate_preview,0 [PreviewDeck1],hotcue_1_clear,0 [EffectRack1_EffectUnit3],group_[Channel1]_enable,0 -[Master],duckStrength_down,0 +[Main],duckStrength_down,0 [Channel3],loop_move_0.5_forward,0 [EqualizerRack1_[Channel4]_Effect1],parameter2_toggle,0 [EffectRack1_EffectUnit4_Effect3],parameter12_down,0 @@ -7585,7 +7585,7 @@ [Sampler1],loop_move_16_forward,0 [Sampler1],VuMeterR_up,0 [EffectRack1_EffectUnit4_Effect3],parameter5_minus_toggle,0 -[Master],audio_latency_usage_set_zero,0 +[Main],audio_latency_usage_set_zero,0 [Channel3],hotcue_25_enabled,0 [Channel3],hotcue_36_gotoandplay,0 [EffectRack1_EffectUnit2_Effect3],parameter3_minus_toggle,0 @@ -7593,7 +7593,7 @@ [Channel1],vinylcontrol_cueing,0 [PreviewDeck1],hotcue_35_gotoandstop,0 [Channel4],hotcue_3_goto,0 -[EqualizerRack1_[Master]_Effect1],button_parameter6_loaded,0 +[EqualizerRack1_[Main]_Effect1],button_parameter6_loaded,0 [EffectRack1_EffectUnit2_Effect1],parameter12_down,0 [EqualizerRack1_[Channel2]_Effect1],button_parameter14_loaded,0 [Sampler1],pregain_up_small,0 @@ -7628,7 +7628,7 @@ [Sampler1],hotcue_37_goto,0 [PreviewDeck1],hotcue_15_goto,0 [Channel1],hotcue_36_gotoandplay,0 -[EqualizerRack1_[Master]_Effect1],parameter9_down_small,0 +[EqualizerRack1_[Main]_Effect1],parameter9_down_small,0 [EffectRack1_EffectUnit2_Effect1],parameter5_minus_toggle,0 [EffectRack1_EffectUnit3_Effect2],parameter2_link_type,0 [Channel2],hotcue_20_activate_preview,0 @@ -7809,17 +7809,17 @@ [EqualizerRack1_[Channel2]_Effect1],button_parameter11_loaded,0 [EffectRack1_EffectUnit3_Effect2],parameter3_link_type,0 [Sampler2],track_samples,0 -[Master],duckStrength_set_zero,0 +[Main],duckStrength_set_zero,0 [EffectRack1_EffectUnit1_Effect3],parameter6_set_minus_one,0 [Channel3],bpm,0 [EffectRack1_EffectUnit4_Effect3],parameter10_set_one,0 [EffectRack1_EffectUnit4_Effect2],parameter6_minus_toggle,0 [Microphone4],PeakIndicator_set_one,0 -[EqualizerRack1_[Master]_Effect1],parameter6_up,0 +[EqualizerRack1_[Main]_Effect1],parameter6_up,0 [EffectRack1_EffectUnit3_Effect2],button_parameter11_type,0 [EffectRack1_EffectUnit2_Effect2],parameter8_minus_toggle,0 [EffectRack1_EffectUnit3_Effect3],parameter2_link_type,0 -[Master],VuMeterR_set_one,0 +[Main],VuMeterR_set_one,0 [QuickEffectRack1_[Channel1]_Effect1],parameter3_down_small,0 [QuickEffectRack1_[Channel3]_Effect1],parameter14_down,0 [Channel1],VuMeterR_minus_toggle,0 @@ -7846,9 +7846,9 @@ [Channel1],loop_double,0 [EqualizerRack1_[Channel3]_Effect1],parameter16_up_small,0 [Channel2],VuMeterR_minus_toggle,0 -[Master],talkover_mix,0 +[Main],talkover_mix,0 [EffectRack1_EffectUnit3_Effect3],parameter1_type,0 -[EqualizerRack1_[Master]_Effect1],parameter2_up,0 +[EqualizerRack1_[Main]_Effect1],parameter2_up,0 [Channel4],loop_move_0.125_forward,0 [EffectRack1_EffectUnit4_Effect1],parameter14_set_minus_one,0 [Channel1],visual_key_distance_toggle,0 @@ -7875,7 +7875,7 @@ [EffectRack1_EffectUnit2_Effect1],parameter9_minus_toggle,0 [PreviewDeck1],hotcue_14_clear,0 [EffectRack1_EffectUnit1_Effect3],num_parameters,0 -[EqualizerRack1_[Master]_Effect1],parameter9_type,0 +[EqualizerRack1_[Main]_Effect1],parameter9_type,0 [Channel4],VuMeterL_minus_toggle,0 [Sampler3],VuMeterL,0 [Sampler1],pitch_adjust_toggle,0 @@ -7936,7 +7936,7 @@ [Channel3],beatloop_64_enabled,0 [Sampler1],hotcue_32_gotoandstop,0 [EffectRack1_EffectUnit3_Effect3],parameter15_link_type,0 -[Master],PeakIndicator_set_minus_one,0 +[Main],PeakIndicator_set_minus_one,0 [Channel2],hotcue_26_activate_preview,0 [Channel4],loop_double,0 [Channel2],hotcue_5_enabled,0 @@ -7953,9 +7953,9 @@ [EqualizerRack1_[Channel2]_Effect1],parameter12_link_inverse,0 [Channel1],hotcue_5_enabled,0 [EffectRack1_EffectUnit2_Effect1],parameter14_set_minus_one,0 -[EqualizerRack1_[Master]_Effect1],button_parameter2_loaded,0 +[EqualizerRack1_[Main]_Effect1],button_parameter2_loaded,0 [Sampler1],VuMeterL,0 -[Master],headMix_down_small,0 +[Main],headMix_down_small,0 [Channel2],waveform_zoom_down,0 [EffectRack1_EffectUnit3_Effect2],parameter6_set_minus_one,0 [Channel1],bpm,0 @@ -7983,11 +7983,11 @@ [EffectRack1_EffectUnit4_Effect3],parameter14_loaded,0 [EffectRack1_EffectUnit3_Effect1],parameter4_link_type,0 [Sampler1],beatjump_8_forward,0 -[EqualizerRack1_[Master]],loaded,1 +[EqualizerRack1_[Main]],loaded,1 [QuickEffectRack1_[Channel3]_Effect1],button_parameter8_type,0 [EffectRack1_EffectUnit3_Effect1],parameter1_type,0 [Sampler1],VuMeterR,0 -[EqualizerRack1_[Master]_Effect1],button_parameter1_loaded,0 +[EqualizerRack1_[Main]_Effect1],button_parameter1_loaded,0 [Auxiliary4],pregain_up_small,0 [EffectRack1_EffectUnit3_Effect4],button_parameter9,0 [EffectRack1_EffectUnit3_Effect4],button_parameter8,0 @@ -8051,7 +8051,7 @@ [QuickEffectRack1_[Channel2]_Effect1],parameter1_down,0 [Sampler3],hotcue_11_clear,0 [EffectRack1_EffectUnit3_Effect2],button_parameter2,0 -[EqualizerRack1_[Master]_Effect1],parameter3_set_minus_one,0 +[EqualizerRack1_[Main]_Effect1],parameter3_set_minus_one,0 [Channel3],bpm_down_small,0 [QuickEffectRack1_[Channel2]_Effect1],parameter2_set_default,0 [EffectRack1_EffectUnit3_Effect1],button_parameter9,0 @@ -8082,7 +8082,7 @@ [Channel3],waveform_zoom_down,0 [EqualizerRack1_[Channel1]],prev_chain,0 [EqualizerRack1_[Channel4]],super1_set_default,0 -[Master],balance_down_small,0 +[Main],balance_down_small,0 [Sampler2],hotcue_12_gotoandstop,0 [EffectRack1_EffectUnit4_Effect1],parameter14_loaded,0 [Channel3],PeakIndicator_set_default,0 @@ -8110,7 +8110,7 @@ [EffectRack1_EffectUnit4_Effect2],parameter11_set_one,0 [EffectRack1_EffectUnit2_Effect3],parameter14_loaded,0 [EffectRack1_EffectUnit1_Effect1],parameter5_link_type,0 -[Master],rate_set_default,0 +[Main],rate_set_default,0 [Microphone2],VuMeterR_down_small,0 [EffectRack1_EffectUnit1_Effect3],parameter15_link_type,0 [Channel1],PeakIndicator_set_default,0 @@ -8121,7 +8121,7 @@ [Channel3],hotcue_5_enabled,0 [EffectRack1_EffectUnit1_Effect4],button_parameter9,0 [Mixer Profile],xFaderCurve_up,0 -[EqualizerRack1_[Master]_Effect1],button_parameter5_loaded,0 +[EqualizerRack1_[Main]_Effect1],button_parameter5_loaded,0 [EffectRack1_EffectUnit1_Effect4],button_parameter8,0 [Sampler2],hotcue_9_goto,0 [EffectRack1_EffectUnit1_Effect4],button_parameter5,0 @@ -8150,7 +8150,7 @@ [Sampler4],hotcue_9_gotoandstop,0 [EffectRack1_EffectUnit1_Effect3],button_parameter4,0 [EffectRack1_EffectUnit1_Effect3],button_parameter7,0 -[EqualizerRack1_[Master]_Effect1],parameter12_down,0 +[EqualizerRack1_[Main]_Effect1],parameter12_down,0 [EffectRack1_EffectUnit1_Effect3],button_parameter6,0 [EffectRack1_EffectUnit1_Effect3],button_parameter1,0 [Channel3],beatlooproll_0.25_activate,0 @@ -8161,7 +8161,7 @@ [EffectRack1_EffectUnit4_Effect4],parameter11_type,0 [EffectRack1_EffectUnit1_Effect4],parameter4_link_type,0 [EffectRack1_EffectUnit1_Effect2],button_parameter9,0 -[EqualizerRack1_[Master]_Effect1],button_parameter4_loaded,0 +[EqualizerRack1_[Main]_Effect1],button_parameter4_loaded,0 [Auxiliary2],pregain_up_small,0 [EffectRack1_EffectUnit1_Effect2],button_parameter8,0 [EffectRack1_EffectUnit3_Effect4],parameter16_link_type,0 @@ -8174,7 +8174,7 @@ [EffectRack1_EffectUnit1_Effect2],button_parameter1,0 [Channel4],beatlooproll_0.25_activate,0 [EffectRack1_EffectUnit4_Effect2],parameter15_loaded,0 -[EqualizerRack1_[Master]_Effect1],parameter11_set_minus_one,0 +[EqualizerRack1_[Main]_Effect1],parameter11_set_minus_one,0 [EffectRack1_EffectUnit1_Effect2],button_parameter3,0 [Sampler4],beatjump_8_forward,0 [EffectRack1_EffectUnit1_Effect2],button_parameter2,0 @@ -8199,7 +8199,7 @@ [Sampler1],pitch_set_one,0 [Sampler1],beatloop_0.125_toggle,0 [EffectRack1_EffectUnit1_Effect2],parameter1_type,0 -[EqualizerRack1_[Master]_Effect1],button_parameter3_loaded,0 +[EqualizerRack1_[Main]_Effect1],button_parameter3_loaded,0 [EffectRack1_EffectUnit3_Effect1],parameter5_link_type,0 [Sampler1],hotcue_1_gotoandstop,0 [EffectRack1_EffectUnit3_Effect4],button_parameter9_type,0 @@ -8254,7 +8254,7 @@ [Sampler2],hotcue_21_clear,0 [Sampler1],hotcue_31_enabled,0 [Channel4],orientation,2 -[EqualizerRack1_[Master]_Effect1],button_parameter9_loaded,0 +[EqualizerRack1_[Main]_Effect1],button_parameter9_loaded,0 [EffectRack1_EffectUnit3_Effect2],parameter16_link_type,0 [Sampler4],VuMeterR_set_minus_one,0 [EffectRack1_EffectUnit4_Effect2],parameter16_loaded,0 @@ -8267,7 +8267,7 @@ [EffectRack1_EffectUnit4_Effect1],parameter16_loaded,0 [Auxiliary3],volume_up_small,0 [Channel2],volume_down_small,0 -[EqualizerRack1_[Master]_Effect1],button_parameter8_loaded,0 +[EqualizerRack1_[Main]_Effect1],button_parameter8_loaded,0 [EffectRack1_EffectUnit2_Effect1],parameter11_type,0 [EqualizerRack1_[Channel1]_Effect1],button_parameter2,0 [Sampler2],play_stutter,0 @@ -8290,7 +8290,7 @@ [EffectRack1_EffectUnit1_Effect1],parameter6_link_type,0 [EffectRack1_EffectUnit1_Effect3],parameter16_link_type,0 [QuickEffectRack1_[Channel1]_Effect1],parameter4_link_inverse,0 -[EqualizerRack1_[Master]_Effect1],button_parameter7_loaded,0 +[EqualizerRack1_[Main]_Effect1],button_parameter7_loaded,0 [EqualizerRack1_[Channel1]_Effect1],parameter5_down_small,0 [Channel3],hotcue_9_activate_preview,0 [Sampler2],waveform_zoom_set_zero,0 @@ -8350,7 +8350,7 @@ [EffectRack1_EffectUnit4_Effect2],parameter11_type,0 [Channel4],volume_down_small,0 [Channel4],hotcue_1_clear,0 -[EqualizerRack1_[Master]_Effect1],parameter10_set_one,0 +[EqualizerRack1_[Main]_Effect1],parameter10_set_one,0 [QuickEffectRack1_[Channel1]_Effect1],parameter5_link_inverse,0 [EqualizerRack1_[Channel4]_Effect1],parameter8_down,0 [Auxiliary2],orientation_left,0 @@ -8427,7 +8427,7 @@ [EffectRack1_EffectUnit2_Effect2],parameter9_up_small,0 [EffectRack1_EffectUnit4_Effect1],parameter10_loaded,0 [QuickEffectRack1_[Channel2]_Effect1],button_parameter6_loaded,0 -[Master],audio_latency_overload_set_zero,0 +[Main],audio_latency_overload_set_zero,0 [Sampler2],beatloop_0.5_activate,0 [Channel2],hotcue_1_clear,0 [QuickEffectRack1_[Channel1]_Effect1],parameter7_up,0 @@ -8489,7 +8489,7 @@ [Channel2],hotcue_14_clear,0 [Sampler1],hotcue_14_position,-1 [EffectRack1_EffectUnit3_Effect3],parameter14_link_type,0 -[Master],VuMeter,0 +[Main],VuMeter,0 [EqualizerRack1_[Channel1]_Effect1],parameter10_link_inverse,0 [EffectRack1_EffectUnit2_Effect4],parameter12_loaded,0 [Sampler4],hotcue_24_position,-1 @@ -8568,7 +8568,7 @@ [EffectRack1_EffectUnit1_Effect3],parameter6_up_small,0 [EffectRack1_EffectUnit2_Effect3],parameter9_up_small,0 [Channel2],loop_scale,0 -[Master],num_decks,4 +[Main],num_decks,4 [EffectRack1_EffectUnit1_Effect1],parameter13_link_type,0 [EffectRack1_EffectUnit4_Effect4],parameter10_loaded,0 [EffectRack1_EffectUnit3_Effect3],parameter6_link_type,0 @@ -8599,9 +8599,9 @@ [EffectRack1_EffectUnit3_Effect1],parameter14_link_type,0 [Sampler4],LoadSelectedTrack,0 [EffectRack1_EffectUnit4_Effect4],parameter7_down_small,0 -[EqualizerRack1_[Master]],mix_toggle,0 +[EqualizerRack1_[Main]],mix_toggle,0 [Sampler3],hotcue_22_position,-1 -[EqualizerRack1_[Master]_Effect1],parameter16_set_default,0 +[EqualizerRack1_[Main]_Effect1],parameter16_set_default,0 [EffectRack1_EffectUnit2_Effect1],parameter4_down,0 [EffectRack1_EffectUnit2_Effect4],parameter11_loaded,0 [Channel3],beats_translate_earlier,0 @@ -8614,7 +8614,7 @@ [EffectRack1_EffectUnit4_Effect4],parameter16_down_small,0 [EffectRack1_EffectUnit1_Effect4],parameter4_up_small,0 [EffectRack1_EffectUnit2_Effect4],parameter3_up_small,0 -[EqualizerRack1_[Master]],mix_up,0 +[EqualizerRack1_[Main]],mix_up,0 [EffectRack1_EffectUnit3_Effect2],parameter14_link_type,0 [Sampler3],LoadSelectedTrack,0 [QuickEffectRack1_[Channel1]_Effect1],parameter6_set_zero,0 @@ -8651,7 +8651,7 @@ [QuickEffectRack1_[Channel2]_Effect1],button_parameter7_loaded,0 [Channel2],VuMeterR_set_default,0 [Sampler2],pitch_set_default,0 -[EqualizerRack1_[Master]_Effect1],parameter4_down,0 +[EqualizerRack1_[Main]_Effect1],parameter4_down,0 [QuickEffectRack1_[Channel4]_Effect1],parameter10_link_type,0 [EqualizerRack1_[Channel4]_Effect1],loaded,1 [Sampler4],hotcue_20_position,-1 @@ -8706,7 +8706,7 @@ [PreviewDeck1],beatloop_32_enabled,0 [Sampler1],hotcue_30_enabled,0 [Sampler4],beat_distance,0 -[EqualizerRack1_[Master]_Effect1],parameter13_up,0 +[EqualizerRack1_[Main]_Effect1],parameter13_up,0 [EffectRack1_EffectUnit2_Effect4],parameter7_down_small,0 [Channel4],hotcue_14_clear,0 [QuickEffectRack1_[Channel1]_Effect1],parameter7_link_inverse,0 @@ -8715,7 +8715,7 @@ [Channel3],beatloop_0.03125_toggle,0 [EffectRack1_EffectUnit3_Effect2],parameter9_down,0 [EffectRack1_EffectUnit2_Effect2],parameter12_loaded,0 -[EqualizerRack1_[Master]_Effect1],button_parameter8_type,0 +[EqualizerRack1_[Main]_Effect1],button_parameter8_type,0 [Sampler2],hotcue_23_goto,0 [Channel3],beatloop_0.125_activate,0 [Sampler3],beat_distance,0 @@ -8792,7 +8792,7 @@ [EffectRack1_EffectUnit3_Effect2],prev_effect,0 [Channel3],hotcue_13_goto,0 [Channel4],VuMeterR_set_default,0 -[Master],PeakIndicator_up_small,0 +[Main],PeakIndicator_up_small,0 [Sampler2],loop_move,0 [EffectRack1_EffectUnit4_Effect1],parameter16_down_small,0 [Channel1],beatloop_0.03125_toggle,0 @@ -8830,7 +8830,7 @@ [Sampler3],hotcue_30_goto,0 [Sampler4],loop_move,0 [PreviewDeck1],rate_down,0 -[EqualizerRack1_[Master]_Effect1],parameter11_set_one,0 +[EqualizerRack1_[Main]_Effect1],parameter11_set_one,0 [EffectRack1_EffectUnit2_Effect4],parameter13_set_minus_one,0 [QuickEffectRack1_[Channel3]_Effect1],button_parameter7_loaded,0 [Auxiliary3],VuMeter_set_zero,0 @@ -8889,12 +8889,12 @@ [PreviewDeck1],orientation,1 [EffectRack1_EffectUnit4_Effect4],parameter13_set_minus_one,0 [Sampler2],pitch_adjust_up_small,0 -[Master],headMix_down,0 +[Main],headMix_down,0 [Channel2],hotcue_3_enabled,0 [EqualizerRack1_[Channel1]_Effect1],button_parameter3_loaded,1 [Channel2],playposition_set_default,0 [EffectRack1_EffectUnit4_Effect4],parameter1_set_minus_one,0 -[Master],headDelay_set_minus_one,0 +[Main],headDelay_set_minus_one,0 [QuickEffectRack1_[Channel2]_Effect1],parameter16_set_one,0 [Channel4],stop,0 [Channel4],volume_up_small,0 @@ -8974,7 +8974,7 @@ [Sampler2],play,0 [EqualizerRack1_[Channel4]_Effect1],parameter13_link_inverse,0 [Sampler4],pitch_adjust_up_small,0 -[EqualizerRack1_[Master]_Effect1],parameter2_set_minus_one,0 +[EqualizerRack1_[Main]_Effect1],parameter2_set_minus_one,0 [Channel4],hotcue_36_set,0 [Sampler1],pitch_adjust,0 [QuickEffectRack1_[Channel1]_Effect1],parameter3_set_default,0 @@ -9007,7 +9007,7 @@ [QuickEffectRack1_[Channel3]_Effect1],button_parameter4_loaded,0 [EqualizerRack1_[Channel4]_Effect1],button_parameter3_loaded,1 [Channel1],stop,0 -[Master],guiTickTime,18.6325 +[Main],guiTickTime,18.6325 [Sampler2],beatlooproll_2_activate,0 [EffectRack1_EffectUnit4_Effect4],parameter4_link_inverse,0 [EffectRack1_EffectUnit2_Effect4],parameter9_set_default,0 @@ -9043,7 +9043,7 @@ [PreviewDeck1],hotcue_27_position,-1 [QuickEffectRack1_[Channel4]_Effect1],button_parameter9_loaded,0 [EqualizerRack1_[Channel2]],super1_minus_toggle,0 -[EqualizerRack1_[Master]_Effect1],next_effect,0 +[EqualizerRack1_[Main]_Effect1],next_effect,0 [EffectRack1_EffectUnit2_Effect2],parameter2_link_inverse,0 [EffectRack1_EffectUnit2_Effect2],parameter15_down,0 [Sampler3],hotcue_34_position,-1 @@ -9060,7 +9060,7 @@ [EffectRack1_EffectUnit2_Effect1],parameter2_link_inverse,0 [EffectRack1_EffectUnit2_Effect1],parameter15_down,0 [PreviewDeck1],hotcue_25_position,-1 -[EqualizerRack1_[Master]_Effect1],button_parameter6_type,0 +[EqualizerRack1_[Main]_Effect1],button_parameter6_type,0 [Sampler2],hotcue_11_goto,0 [EffectRack1_EffectUnit4_Effect4],parameter3_link_inverse,0 [EffectRack1_EffectUnit3_Effect1],parameter2_type,0 @@ -9069,7 +9069,7 @@ [EffectRack1_EffectUnit1_Effect1],parameter8_set_zero,0 [EffectRack1_EffectUnit2_Effect1],parameter7_set_zero,0 [EffectRack1_EffectUnit4_Effect1],parameter1_set_zero,0 -[EqualizerRack1_[Master]_Effect1],parameter10_set_minus_one,0 +[EqualizerRack1_[Main]_Effect1],parameter10_set_minus_one,0 [QuickEffectRack1_[Channel4]_Effect1],button_parameter8_loaded,0 [Sampler4],beatloop_16_activate,0 [EqualizerRack1_[Channel4]_Effect1],parameter15_link_inverse,0 @@ -9121,7 +9121,7 @@ [EffectRack1_EffectUnit2_Effect2],parameter3_link_inverse,0 [QuickEffectRack1_[Channel3]_Effect1],parameter15_type,0 [EffectRack1_EffectUnit3_Effect4],parameter9_link_type,0 -[EqualizerRack1_[Master]_Effect1],parameter1_loaded,0 +[EqualizerRack1_[Main]_Effect1],parameter1_loaded,0 [EqualizerRack1_[Channel1]_Effect1],parameter11_toggle,0 [Channel3],beatloop_4,0 [EffectRack1_EffectUnit1_Effect2],parameter6_set_zero,0 @@ -9188,7 +9188,7 @@ [PreviewDeck1],rate_perm_up_small,0 [EffectRack1_EffectUnit2_Effect3],parameter3_link_inverse,0 [EffectRack1_EffectUnit2_Effect3],parameter15_down,0 -[Master],mono_mixdown,0 +[Main],mono_mixdown,0 [Channel2],beatloop_4,0 [Channel3],rate_up,0 [Sampler4],hotcue_11_goto,0 @@ -9246,7 +9246,7 @@ [Sampler3],hotcue_30_position,-1 [Sampler1],beatjump_0.5_backward,0 [QuickEffectRack1_[Channel4]_Effect1],button_parameter4_loaded,0 -[EqualizerRack1_[Master]_Effect1],parameter5_set_default,0 +[EqualizerRack1_[Main]_Effect1],parameter5_set_default,0 [EffectRack1_EffectUnit2_Effect2],parameter2_set_one,0 [Channel2],hotcue_22_gotoandstop,0 [Channel1],hotcue_21_gotoandplay,0 @@ -9305,7 +9305,7 @@ [EffectRack1_EffectUnit2_Effect1],parameter5_link_inverse,0 [EffectRack1_EffectUnit1_Effect3],parameter6_set_zero,0 [EffectRack1_EffectUnit2_Effect3],parameter9_set_zero,0 -[Master],duckStrength_minus_toggle,0 +[Main],duckStrength_minus_toggle,0 [EffectRack1_EffectUnit4_Effect4],parameter8_link_inverse,0 [EffectRack1_EffectUnit1_Effect2],parameter2_type,0 [PreviewDeck1],pregain_set_default,0 @@ -9347,8 +9347,8 @@ [Microphone2],pregain_set_minus_one,0 [PreviewDeck1],hotcue_13_position,-1 [PreviewDeck1],hotcue_29_enabled,0 -[Master],rate_toggle,0 -[Master],VuMeter_up,0 +[Main],rate_toggle,0 +[Main],VuMeter_up,0 [EffectRack1_EffectUnit4_Effect2],parameter7_link_inverse,0 [Channel2],PeakIndicator_down,0 [Channel4],loop_halve,0 @@ -9383,7 +9383,7 @@ [EqualizerRack1_[Channel2]_Effect1],parameter11_toggle,0 [PreviewDeck1],hotcue_11_position,-1 [Channel2],hotcue_19_gotoandplay,0 -[EqualizerRack1_[Master]_Effect1],enabled,1 +[EqualizerRack1_[Main]_Effect1],enabled,1 [EffectRack1_EffectUnit2_Effect1],parameter6_link_inverse,0 [EffectRack1_EffectUnit3_Effect4],enabled,1 [EffectRack1_EffectUnit1_Effect4],parameter13_type,0 @@ -9418,7 +9418,7 @@ [Sampler2],hotcue_16_gotoandplay,0 [EffectRack1_EffectUnit3_Effect4],parameter2_set_zero,0 [EffectRack1_EffectUnit4_Effect4],parameter9_set_zero,0 -[EqualizerRack1_[Master]_Effect1],parameter2_type,0 +[EqualizerRack1_[Main]_Effect1],parameter2_type,0 [EffectRack1_EffectUnit2_Effect3],parameter8_link_inverse,0 [Channel4],scratch_position,0 [EffectRack1_EffectUnit4_Effect4],parameter10_down_small,0 @@ -9486,7 +9486,7 @@ [Channel2],loop_halve,0 [EffectRack1_EffectUnit4_Effect4],parameter6_link_inverse,0 [Channel4],bpm_toggle,0 -[Master],crossfader_up_small,0 +[Main],crossfader_up_small,0 [EqualizerRack1_[Channel1]_Effect1],button_parameter2_loaded,1 [Channel4],start_play,0 [QuickEffectRack1_[Channel4]_Effect1],button_parameter2_loaded,0 @@ -9582,7 +9582,7 @@ [EffectRack1_EffectUnit4_Effect3],button_parameter12,0 [EffectRack1_EffectUnit2_Effect1],parameter9_link_inverse,0 [QuickEffectRack1_[Channel2]_Effect1],loaded,1 -[EqualizerRack1_[Master]_Effect1],parameter14_type,0 +[EqualizerRack1_[Main]_Effect1],parameter14_type,0 [PreviewDeck1],beats_translate_match_alignment,0 [Microphone4],pregain_set_minus_one,0 [QuickEffectRack1_[Channel4]_Effect1],parameter1_down_small,0 @@ -9605,7 +9605,7 @@ [Microphone2],pregain_up_small,0 [Channel2],rate_down,0 [QuickEffectRack1_[Channel4]_Effect1],parameter8_down,0 -[Master],talkoverDucking,0 +[Main],talkoverDucking,0 [EqualizerRack1_[Channel1]_Effect1],parameter6_set_minus_one,0 [Sampler2],hotcue_22_set,0 [EqualizerRack1_[Channel1]_Effect1],parameter7_up,0 @@ -9671,7 +9671,7 @@ [EffectRack1_EffectUnit2_Effect4],button_parameter12,0 [EffectRack1_EffectUnit1_Effect4],button_parameter8_type,0 [EffectRack1_EffectUnit3_Effect1],parameter13_type,0 -[Master],delay_toggle,0 +[Main],delay_toggle,0 [EffectRack1_EffectUnit2_Effect1],button_parameter5_type,0 [EffectRack1_EffectUnit4_Effect4],parameter8_set_minus_one,0 [Microphone3],orientation_right,0 @@ -9680,27 +9680,27 @@ [EqualizerRack1_[Channel1]_Effect1],parameter14_set_default,0 [Channel4],loop_move_0.25_forward,0 [Channel2],bpm_toggle,0 -[EqualizerRack1_[Master]_Effect1],parameter9,0 +[EqualizerRack1_[Main]_Effect1],parameter9,0 [EqualizerRack1_[Channel2]_Effect1],button_parameter2_type,4 -[EqualizerRack1_[Master]_Effect1],parameter8,0 +[EqualizerRack1_[Main]_Effect1],parameter8,0 [Mixer Profile],xFaderCalibration_up_small,0 [Channel1],beatloop_4_enabled,0 [Microphone],VuMeterL_up,0 [PreviewDeck1],hotcue_13_gotoandplay,0 -[EqualizerRack1_[Master]_Effect1],parameter5,0 -[EqualizerRack1_[Master]_Effect1],parameter4,0 -[EqualizerRack1_[Master]_Effect1],parameter7,0 +[EqualizerRack1_[Main]_Effect1],parameter5,0 +[EqualizerRack1_[Main]_Effect1],parameter4,0 +[EqualizerRack1_[Main]_Effect1],parameter7,0 [EffectRack1_EffectUnit3_Effect2],parameter13_type,0 -[EqualizerRack1_[Master]_Effect1],parameter6,0 +[EqualizerRack1_[Main]_Effect1],parameter6,0 [EqualizerRack1_[Channel4]_Effect1],parameter13_type,0 -[EqualizerRack1_[Master]_Effect1],parameter1,0 +[EqualizerRack1_[Main]_Effect1],parameter1,0 [EffectRack1_EffectUnit2_Effect2],button_parameter5_type,0 [EffectRack1_EffectUnit2_Effect3],parameter11_down_small,0 [EqualizerRack1_[Channel4]_Effect1],button_parameter8_type,0 -[EqualizerRack1_[Master]_Effect1],parameter3,0 -[EqualizerRack1_[Master]_Effect1],parameter2,0 +[EqualizerRack1_[Main]_Effect1],parameter3,0 +[EqualizerRack1_[Main]_Effect1],parameter2,0 [Channel4],hotcue_28_activate_preview,0 -[Master],gain,1 +[Main],gain,1 [EqualizerRack1_[Channel3]_Effect1],parameter9_set_default,0 [Sampler2],hotcue_26_enabled,0 [EffectRack1_EffectUnit2_Effect4],parameter11_down_small,0 @@ -9712,13 +9712,13 @@ [EffectRack1_EffectUnit1_Effect2],parameter14_link_inverse,0 [EffectRack1_EffectUnit3_Effect3],button_parameter8_type,0 [Sampler3],sync_leader,0 -[EqualizerRack1_[Master]_Effect1],button_parameter1,0 +[EqualizerRack1_[Main]_Effect1],button_parameter1,0 [QuickEffectRack1_[Channel1]_Effect1],parameter12_set_default,0 [Sampler1],rate_temp_down,0 [Microphone3],PeakIndicator_toggle,0 [EffectRack1_EffectUnit1_Effect1],parameter14_link_inverse,0 [Sampler3],talkover,0 -[EqualizerRack1_[Master]],super1_down_small,0 +[EqualizerRack1_[Main]],super1_down_small,0 [EffectRack1_EffectUnit3_Effect4],button_parameter8_type,0 [QuickEffectRack1_[Channel2]_Effect1],button_parameter9_type,0 [EqualizerRack1_[Channel3]],super1_set_minus_one,0 @@ -9775,7 +9775,7 @@ [EqualizerRack1_[Channel4]_Effect1],parameter7_up,0 [Microphone],pregain_set_zero,0 [EffectRack1_EffectUnit4_Effect3],parameter11_down_small,0 -[Master],audio_latency_usage_set_minus_one,0 +[Main],audio_latency_usage_set_minus_one,0 [Sampler4],hotcue_15_gotoandstop,0 [QuickEffectRack1_[Channel4]],next_chain,0 [Sampler2],hotcue_8_clear,0 @@ -9801,7 +9801,7 @@ [Channel3],hotcue_7_gotoandstop,0 [Auxiliary2],VuMeterR_down_small,0 [EqualizerRack1_[Channel1]_Effect1],parameter12_down,0 -[EqualizerRack1_[Master]_Effect1],parameter12_down_small,0 +[EqualizerRack1_[Main]_Effect1],parameter12_down_small,0 [Sampler3],rateSearch_minus_toggle,0 [Sampler3],beatjump_8_backward,0 [Sampler3],hotcue_25_gotoandstop,0 @@ -9828,8 +9828,8 @@ [EffectRack1_EffectUnit1_Effect3],parameter14_link_inverse,0 [EqualizerRack1_[Channel3]_Effect1],parameter14_toggle,0 [Sampler4],hotcue_8_goto,0 -[Master],VuMeterL_up_small,0 -[Master],gain_down_small,0 +[Main],VuMeterL_up_small,0 +[Main],gain_down_small,0 [Sampler2],rateSearch_minus_toggle,0 [EffectRack1_EffectUnit2_Effect4],button_parameter5_type,0 [EffectRack1_EffectUnit3_Effect2],parameter8_down_small,0 @@ -9843,7 +9843,7 @@ [EffectRack1_EffectUnit1_Effect1],parameter8_down_small,0 [EffectRack1_EffectUnit2_Effect2],parameter11_down_small,0 [Sampler3],hotcue_35_gotoandstop,0 -[Master],VuMeterR_up_small,0 +[Main],VuMeterR_up_small,0 [Channel4],loop_move_32_forward,0 [EqualizerRack1_[Channel4]_Effect1],parameter9_down,0 [EqualizerRack1_[Channel3]_Effect1],parameter13_toggle,0 @@ -9858,7 +9858,7 @@ [Channel3],rate_up_small,0 [EffectRack1_EffectUnit4_Effect3],parameter12_set_minus_one,0 [Channel2],pitch_adjust_up,0 -[Master],headDelay_up_small,0 +[Main],headDelay_up_small,0 [Sampler3],rate_temp_down,0 [EffectRack1_EffectUnit1],super1_set_minus_one,0 [Sampler1],beatjump_8_backward,0 @@ -9885,7 +9885,7 @@ [EffectRack1_EffectUnit2_Effect1],parameter12_set_minus_one,0 [Sampler3],beatjump_2_backward,0 [Sampler2],rateSearch_set_zero,0 -[EqualizerRack1_[Master]],group_[Master]_enable,1 +[EqualizerRack1_[Main]],group_[Main]_enable,1 [Auxiliary2],VuMeterR_up,0 [Channel3],hotcue_28_goto,0 [EqualizerRack1_[Channel3]_Effect1],parameter15_toggle,0 @@ -9898,7 +9898,7 @@ [Channel4],hotcue_28_goto,0 [EffectRack1_EffectUnit2_Effect2],num_parameterslots,16 [EffectRack1_EffectUnit4_Effect1],parameter1_link_inverse,0 -[EqualizerRack1_[Master]_Effect1],parameter7_link_inverse,0 +[EqualizerRack1_[Main]_Effect1],parameter7_link_inverse,0 [Channel1],hotcue_1_activate_preview,0 [QuickEffectRack1_[Channel4]_Effect1],parameter11_down_small,0 [Sampler2],PeakIndicator_down_small,0 @@ -9914,7 +9914,7 @@ [Sampler3],rateSearch_set_minus_one,0 [EqualizerRack1_[Channel1]_Effect1],parameter11_up,0 [PreviewDeck1],volume_down_small,0 -[EqualizerRack1_[Master]_Effect1],parameter5_set_minus_one,0 +[EqualizerRack1_[Main]_Effect1],parameter5_set_minus_one,0 [Sampler4],beatloop_0.03125,0 [Channel2],hotcue_28_goto,0 [EffectRack1_EffectUnit3_Effect3],loaded,0 @@ -9940,7 +9940,7 @@ [PreviewDeck1],file_key,0 [Channel2],hotcue_31_goto,0 [EffectRack1_EffectUnit1_Effect3],parameter8_down_small,0 -[EqualizerRack1_[Master]_Effect1],parameter6_link_inverse,0 +[EqualizerRack1_[Main]_Effect1],parameter6_link_inverse,0 [Sampler4],hotcue_1_position,-1 [Sampler1],beatjump_2_backward,0 [Sampler2],hotcue_6_goto,0 @@ -9988,7 +9988,7 @@ [PreviewDeck1],hotcue_4_clear,0 [Channel4],beatsync,0 [QuickEffectRack1_[Channel4]_Effect1],button_parameter9_type,0 -[EqualizerRack1_[Master]_Effect1],parameter9_link_inverse,0 +[EqualizerRack1_[Main]_Effect1],parameter9_link_inverse,0 [EqualizerRack1_[Channel2]_Effect1],button_parameter15,0 [Channel3],waveform_zoom,1 [EqualizerRack1_[Channel2]_Effect1],button_parameter14,0 @@ -10001,7 +10001,7 @@ [Sampler2],hotcue_9_position,-1 [EffectRack1_EffectUnit3],super1_set_default,0 [EqualizerRack1_[Channel2]_Effect1],button_parameter13,0 -[EqualizerRack1_[Master]],super1_set_one,0 +[EqualizerRack1_[Main]],super1_set_one,0 [EqualizerRack1_[Channel2]_Effect1],button_parameter12,0 [EffectRack1_EffectUnit1_Effect4],loaded,0 [EffectRack1_EffectUnit4_Effect1],num_parameterslots,16 @@ -10012,7 +10012,7 @@ [Sampler3],PeakIndicator_down_small,0 [Sampler2],orientation,1 [Sampler1],hotcue_9_position,-1 -[EqualizerRack1_[Master]_Effect1],parameter12_toggle,0 +[EqualizerRack1_[Main]_Effect1],parameter12_toggle,0 [EqualizerRack1_[Channel2]_Effect1],parameter14_link_type,0 [EffectRack1_EffectUnit1_Effect3],loaded,0 [QuickEffectRack1_[Channel3]],super1_up_small,0 @@ -10032,17 +10032,17 @@ [Mixer Profile],LoEQFrequency_set_default,0 [EqualizerRack1_[Channel3]],num_effectslots,1 [Sampler3],hotcue_9_position,-1 -[EqualizerRack1_[Master]_Effect1],parameter11_toggle,0 +[EqualizerRack1_[Main]_Effect1],parameter11_toggle,0 [QuickEffectRack1_[Channel3]_Effect1],parameter8_down,0 [Sampler2],hotcue_28_set,0 [EqualizerRack1_[Channel2]_Effect1],parameter7_up,0 [QuickEffectRack1_[Channel3]_Effect1],parameter15_up,0 -[EqualizerRack1_[Master]_Effect1],parameter8_link_inverse,0 +[EqualizerRack1_[Main]_Effect1],parameter8_link_inverse,0 [QuickEffectRack1_[Channel3]_Effect1],parameter11_set_minus_one,0 [Microphone2],VuMeterR_set_default,0 [Channel3],hotcue_4_gotoandplay,0 [Sampler3],hotcue_28_set,0 -[Master],audio_latency_usage_down,0 +[Main],audio_latency_usage_down,0 [EffectRack1_EffectUnit2],super1_set_default,0 [EqualizerRack1_[Channel2]_Effect1],parameter3_up,0 [QuickEffectRack1_[Channel3]_Effect1],parameter11_up,0 @@ -10052,7 +10052,7 @@ [EqualizerRack1_[Channel4]_Effect1],parameter11_up,0 [PreviewDeck1],hotcue_6_enabled,0 [Channel3],hotcue_1_activate_preview,0 -[EqualizerRack1_[Master]_Effect1],parameter5_down,0 +[EqualizerRack1_[Main]_Effect1],parameter5_down,0 [EffectRack1_EffectUnit1],super1_set_default,0 [EffectRack1_EffectUnit1_Effect2],loaded,0 [EqualizerRack1_[Channel2]],insertion_type,0 @@ -10064,7 +10064,7 @@ [EffectRack1_EffectUnit1_Effect1],loaded,0 [Channel2],hotcue_4_gotoandplay,0 [EqualizerRack1_[Channel3]_Effect1],parameter4_down_small,0 -[EqualizerRack1_[Master]_Effect1],parameter3_link_inverse,0 +[EqualizerRack1_[Main]_Effect1],parameter3_link_inverse,0 [EffectRack1_EffectUnit2_Effect1],parameter4_set_one,0 [EffectRack1_EffectUnit3],super1_down_small,0 [EqualizerRack1_[Channel3]_Effect1],parameter10_toggle,0 @@ -10089,7 +10089,7 @@ [Sampler2],slip_enabled,0 [EffectRack1_EffectUnit3_Effect2],parameter5_down_small,0 [Sampler3],hotcue_29_set,0 -[EqualizerRack1_[Master]_Effect1],button_parameter9_type,0 +[EqualizerRack1_[Main]_Effect1],button_parameter9_type,0 [Sampler1],beats_translate_curpos,0 [QuickEffectRack1_[Channel3]_Effect1],button_parameter6_type,0 [EffectRack1_EffectUnit1_Effect1],parameter5_down_small,0 @@ -10100,7 +10100,7 @@ [Sampler1],slip_enabled,0 [Sampler1],loop_move_0.5_backward,0 [PreviewDeck1],track_samples,0 -[EqualizerRack1_[Master]_Effect1],parameter2_link_inverse,0 +[EqualizerRack1_[Main]_Effect1],parameter2_link_inverse,0 [Sampler4],hotcue_29_set,0 [Sampler2],beats_translate_curpos,0 [EqualizerRack1_[Channel3]_Effect1],button_parameter3,0 @@ -10118,7 +10118,7 @@ [EffectRack1_EffectUnit4_Effect1],parameter4_set_one,0 [Channel2],hotcue_27_enabled,0 [EqualizerRack1_[Channel4]_Effect1],button_parameter3,0 -[EqualizerRack1_[Master]_Effect1],parameter10_toggle,0 +[EqualizerRack1_[Main]_Effect1],parameter10_toggle,0 [EffectRack1_EffectUnit1_Effect1],parameter8_down,0 [Sampler2],reverse,0 [QuickEffectRack1_[Channel4]_Effect1],parameter9,0 @@ -10153,7 +10153,7 @@ [PreviewDeck1],rate_up,0 [EffectRack1_EffectUnit3_Effect4],parameter16_link_inverse,0 [Auxiliary2],VuMeterR_minus_toggle,0 -[EqualizerRack1_[Master]_Effect1],parameter5_link_inverse,0 +[EqualizerRack1_[Main]_Effect1],parameter5_link_inverse,0 [Sampler4],rate_down_small,0 [QuickEffectRack1_[Channel2]_Effect1],parameter15_up,0 [Sampler2],keylock,0 @@ -10192,7 +10192,7 @@ [Sampler1],PeakIndicator_set_default,0 [Sampler1],VuMeterL_set_minus_one,0 [QuickEffectRack1_[Channel3]_Effect1],parameter4_set_minus_one,0 -[EqualizerRack1_[Master]_Effect1],parameter4_link_inverse,0 +[EqualizerRack1_[Main]_Effect1],parameter4_link_inverse,0 [EffectRack1_EffectUnit4_Effect4],parameter4_set_one,0 [EffectRack1_EffectUnit3_Effect3],parameter5_down_small,0 [QuickEffectRack1_[Channel4]_Effect1],parameter4_link_inverse,0 @@ -10238,7 +10238,7 @@ [Sampler4],rateSearch_set_default,0 [Sampler2],beatloop_64_toggle,0 [PreviewDeck1],hotcue_2_set,0 -[EqualizerRack1_[Master]_Effect1],parameter13_toggle,0 +[EqualizerRack1_[Main]_Effect1],parameter13_toggle,0 [PreviewDeck1],loop_move_0.125_forward,0 [EffectRack1_EffectUnit1_Effect4],parameter16_link_inverse,0 [Sampler3],hotcue_23_set,0 @@ -10260,7 +10260,7 @@ [Sampler4],PeakIndicator_set_default,0 [EffectRack1_EffectUnit1_Effect3],button_parameter15_type,0 [Sampler4],beatloop_64_toggle,0 -[EqualizerRack1_[Master]_Effect1],parameter16_toggle,0 +[EqualizerRack1_[Main]_Effect1],parameter16_toggle,0 [EffectRack1_EffectUnit1_Effect2],parameter15_link_inverse,0 [EffectRack1_EffectUnit3_Effect2],button_parameter15_type,0 [EffectRack1_EffectUnit3_Effect2],parameter13_link_inverse,0 @@ -10270,7 +10270,7 @@ [EffectRack1_EffectUnit1_Effect4],button_parameter15_type,0 [EffectRack1_EffectUnit1_Effect3],parameter14_type,0 [QuickEffectRack1_[Channel2]_Effect1],parameter1_set_default,0 -[EqualizerRack1_[Master]_Effect1],parameter13_set_default,0 +[EqualizerRack1_[Main]_Effect1],parameter13_set_default,0 [EqualizerRack1_[Channel2]_Effect1],parameter15_up,0 [EffectRack1_EffectUnit1_Effect1],parameter15_link_inverse,0 [EffectRack1_EffectUnit3_Effect3],button_parameter15_type,0 @@ -10284,7 +10284,7 @@ [QuickEffectRack1_[Channel2]_Effect1],parameter16_type,0 [Channel4],hotcue_27_enabled,0 [Sampler1],hotcue_3_activate_preview,0 -[EqualizerRack1_[Master]_Effect1],parameter15_toggle,0 +[EqualizerRack1_[Main]_Effect1],parameter15_toggle,0 [QuickEffectRack1_[Channel1]_Effect1],parameter10_down,0 [EffectRack1_EffectUnit1_Effect4],parameter15_link_inverse,0 [EqualizerRack1_[Channel1]_Effect1],parameter9_set_zero,0 @@ -10303,7 +10303,7 @@ [Channel3],hotcue_27_enabled,0 [QuickEffectRack1_[Channel4]_Effect1],parameter2_link_inverse,0 [PreviewDeck1],visual_key_distance_down,0 -[Master],balance_up,0 +[Main],balance_up,0 [Sampler2],hotcue_3_activate_preview,0 [PreviewDeck1],hotcue_29_activate,0 [QuickEffectRack1_[Channel1]_Effect1],parameter9_down,0 @@ -10319,8 +10319,8 @@ [EffectRack1_EffectUnit4_Effect2],parameter11_up,0 [Channel4],volume_down,0 [EqualizerRack1_[Channel1]_Effect1],parameter7_set_zero,0 -[Master],headMix_toggle,0 -[Master],gain_up,0 +[Main],headMix_toggle,0 +[Main],gain_up,0 [Sampler3],beatjump_4_backward,0 [Sampler3],vinylcontrol_rate,0 [EffectRack1_EffectUnit1_Effect2],parameter16_link_inverse,0 @@ -10364,7 +10364,7 @@ [Sampler1],hotcue_32_activate_preview,0 [EffectRack1_EffectUnit3_Effect4],parameter12_link_inverse,0 [EffectRack1_EffectUnit3_Effect4],parameter14_type,0 -[EqualizerRack1_[Master]_Effect1],parameter1_link_inverse,0 +[EqualizerRack1_[Main]_Effect1],parameter1_link_inverse,0 [Sampler3],wheel,0 [QuickEffectRack1_[Channel4]_Effect1],parameter3_link_inverse,0 [Auxiliary1],pregain,1 @@ -10442,7 +10442,7 @@ [PreviewDeck1],beatloop_16_enabled,0 [EffectRack1_EffectUnit3_Effect3],parameter11_link_inverse,0 [Sampler2],hotcue_10_goto,0 -[EqualizerRack1_[Master]_Effect1],prev_effect,0 +[EqualizerRack1_[Main]_Effect1],prev_effect,0 [EqualizerRack1_[Channel1]_Effect1],parameter11_set_minus_one,0 [EffectRack1_EffectUnit3_Effect1],parameter5_type,0 [EffectRack1_EffectUnit1_Effect1],parameter5_up,0 @@ -10451,7 +10451,7 @@ [Channel4],beatjump_0.125_forward,0 [Sampler4],beatloop_0.125_enabled,0 [Sampler4],hotcue_25_set,0 -[Master],VuMeterL_down_small,0 +[Main],VuMeterL_down_small,0 [EffectRack1_EffectUnit3_Effect4],parameter16_toggle,0 [QuickEffectRack1_[Channel1]_Effect1],button_parameter8_type,0 [Sampler4],loop_out,0 @@ -10473,7 +10473,7 @@ [Auxiliary4],VuMeterL_up_small,0 [Sampler3],beatloop_0.125_enabled,0 [PreviewDeck1],hotcue_17_goto,0 -[EqualizerRack1_[Master]_Effect1],parameter8_down_small,0 +[EqualizerRack1_[Main]_Effect1],parameter8_down_small,0 [EffectRack1_EffectUnit3_Effect3],parameter13_toggle,0 [EffectRack1_EffectUnit1_Effect1],parameter1_up,0 [QuickEffectRack1_[Channel3]_Effect1],parameter1_set_default,0 @@ -10512,23 +10512,23 @@ [EffectRack1_EffectUnit4_Effect3],parameter7_up,0 [Sampler1],beatloop_0.25_toggle,0 [EffectRack1_EffectUnit3_Effect2],parameter11_down,0 -[EqualizerRack1_[Master]_Effect1],parameter15,0 +[EqualizerRack1_[Main]_Effect1],parameter15,0 [Channel3],loop_start_position,-1 -[EqualizerRack1_[Master]_Effect1],parameter14,0 +[EqualizerRack1_[Main]_Effect1],parameter14,0 [Microphone],VuMeter_set_zero,0 -[EqualizerRack1_[Master]_Effect1],parameter16,0 +[EqualizerRack1_[Main]_Effect1],parameter16,0 [EffectRack1_EffectUnit1_Effect1],parameter14_type,0 [EqualizerRack1_[Channel2]_Effect1],parameter9_set_zero,0 [QuickEffectRack1_[Channel3]_Effect1],parameter15_set_one,0 -[EqualizerRack1_[Master]_Effect1],parameter11,0 +[EqualizerRack1_[Main]_Effect1],parameter11,0 [EqualizerRack1_[Channel2]_Effect1],parameter3_type,2 [QuickEffectRack1_[Channel4]_Effect1],parameter9_link_inverse,0 [Sampler1],loop_exit,0 -[EqualizerRack1_[Master]_Effect1],parameter10,0 +[EqualizerRack1_[Main]_Effect1],parameter10,0 [Sampler2],hotcue_4_gotoandstop,0 [Sampler3],hotcue_24_activate,0 -[EqualizerRack1_[Master]_Effect1],parameter13,0 -[EqualizerRack1_[Master]_Effect1],parameter12,0 +[EqualizerRack1_[Main]_Effect1],parameter13,0 +[EqualizerRack1_[Main]_Effect1],parameter12,0 [EffectRack1_EffectUnit2_Effect1],parameter9_set_one,0 [QuickEffectRack1_[Channel3]],mix_down,0 [Sampler1],hotcue_26_set,0 @@ -10557,7 +10557,7 @@ [Sampler3],PeakIndicator_set_one,0 [EffectRack1_EffectUnit1_Effect2],parameter3_set_minus_one,0 [Sampler1],wheel,0 -[EqualizerRack1_[Master]_Effect1],button_parameter10_type,0 +[EqualizerRack1_[Main]_Effect1],button_parameter10_type,0 [QuickEffectRack1_[Channel4]_Effect1],parameter11_set_minus_one,0 [EffectRack1_EffectUnit3_Effect3],parameter15_toggle,0 [EffectRack1_EffectUnit3_Effect4],parameter1_up,0 @@ -10621,7 +10621,7 @@ [EffectRack1_EffectUnit1_Effect4],parameter16_toggle,0 [EffectRack1_EffectUnit2_Effect4],parameter11_set_minus_one,0 [QuickEffectRack1_[Channel2]_Effect1],parameter4_link_inverse,0 -[Master],num_microphones,4 +[Main],num_microphones,4 [EffectRack1_EffectUnit3_Effect2],parameter15_toggle,0 [Sampler3],loop_double,0 [Channel4],LoadSelectedTrackAndPlay,0 @@ -10764,9 +10764,9 @@ [Sampler1],hotcue_24_activate,0 [QuickEffectRack1_[Channel3]],mix_set_minus_one,0 [Auxiliary3],pfl,0 -[EqualizerRack1_[Master]_Effect1],parameter3_type,0 +[EqualizerRack1_[Main]_Effect1],parameter3_type,0 [EffectRack1_EffectUnit1_Effect1],parameter10_link_inverse,0 -[EqualizerRack1_[Master]_Effect1],parameter3_loaded,0 +[EqualizerRack1_[Main]_Effect1],parameter3_loaded,0 [EffectRack1_EffectUnit1_Effect3],parameter11_down,0 [EffectRack1_EffectUnit4_Effect2],parameter6_type,0 [EffectRack1_EffectUnit1_Effect1],parameter13_set_one,0 @@ -10799,7 +10799,7 @@ [EffectRack1_EffectUnit3_Effect4],parameter16_type,0 [Sampler1],hotcue_28_activate,0 [QuickEffectRack1_[Channel1]_Effect1],parameter16_minus_toggle,0 -[EqualizerRack1_[Master]_Effect1],parameter4_set_minus_one,0 +[EqualizerRack1_[Main]_Effect1],parameter4_set_minus_one,0 [Microphone2],VuMeterL_up,0 [Microphone],VuMeter_down_small,0 [QuickEffectRack1_[Channel3]_Effect1],parameter4_link_inverse,0 @@ -10815,7 +10815,7 @@ [Microphone4],orientation,1 [Mixer Profile],LoEQFrequency_set_minus_one,0 [EffectRack1_EffectUnit2_Effect3],button_parameter6_type,0 -[EqualizerRack1_[Master]_Effect1],parameter15_down_small,0 +[EqualizerRack1_[Main]_Effect1],parameter15_down_small,0 [EqualizerRack1_[Channel1]_Effect1],button_parameter9_type,0 [Auxiliary1],VuMeterL_set_zero,0 [EffectRack1_EffectUnit1_Effect2],parameter16_toggle,0 @@ -10864,12 +10864,12 @@ [QuickEffectRack1_[Channel3]_Effect1],parameter5_link_inverse,0 [Channel1],hotcue_15_gotoandstop,0 [QuickEffectRack1_[Channel2]_Effect1],parameter12_set_default,0 -[Master],headDelay_set_zero,0 +[Main],headDelay_set_zero,0 [Channel4],hotcue_18_gotoandplay,0 [Sampler1],beatloop_8,0 [Sampler3],hotcue_1_clear,0 [EffectRack1_EffectUnit4_Effect1],parameter11_set_minus_one,0 -[Master],audio_latency_overload_toggle,0 +[Main],audio_latency_overload_toggle,0 [Sampler1],beatloop_4,0 [Sampler1],hotcue_22_activate,0 [Sampler3],hotcue_10_activate,0 @@ -11073,7 +11073,7 @@ [QuickEffectRack1_[Channel2]_Effect1],parameter11_set_zero,0 [EffectRack1_EffectUnit2_Effect1],parameter6_set_one,0 [Channel1],pregain,1 -[Master],audio_latency_overload,0 +[Main],audio_latency_overload,0 [Sampler1],hotcue_31_gotoandplay,0 [Sampler3],hotcue_29_gotoandplay,0 [Channel1],volume_toggle,0 @@ -11159,7 +11159,7 @@ [Microphone4],pregain_set_one,0 [EqualizerRack1_[Channel1]_Effect1],parameter11_set_one,0 [Sampler3],hotcue_19_gotoandplay,0 -[EqualizerRack1_[Master]_Effect1],button_parameter3,0 +[EqualizerRack1_[Main]_Effect1],button_parameter3,0 [QuickEffectRack1_[Channel4]_Effect1],parameter11_type,0 [Channel4],hotcue_15_gotoandstop,0 [EffectRack1_EffectUnit4_Effect1],parameter6_toggle,0 @@ -11174,7 +11174,7 @@ [EffectRack1_EffectUnit2_Effect4],parameter3_toggle,0 [Sampler4],hotcue_16_activate,0 [EffectRack1_EffectUnit1_Effect3],parameter10_type,0 -[Master],delay_down_small,0 +[Main],delay_down_small,0 [Channel1],vinylcontrol_signal_enabled,1 [Sampler4],hotcue_19_gotoandplay,0 [QuickEffectRack1_[Channel1]_Effect1],parameter15_link_inverse,0 @@ -11206,7 +11206,7 @@ [QuickEffectRack1_[Channel1]_Effect1],parameter11_set_minus_one,0 [EffectRack1_EffectUnit1_Effect2],parameter6_set_default,0 [PreviewDeck1],hotcue_3_set,0 -[Master],duckStrength_set_minus_one,0 +[Main],duckStrength_set_minus_one,0 [EffectRack1_EffectUnit3_Effect3],parameter13_set_one,0 [Channel2],loop_enabled,0 [EffectRack1_EffectUnit4_Effect2],parameter9_toggle,0 @@ -11329,7 +11329,7 @@ [Channel3],volume_toggle,0 [Sampler4],hotcue_32_activate,0 [EffectRack1_EffectUnit2_Effect4],parameter14_up_small,0 -[EqualizerRack1_[Master]_Effect1],parameter14_up_small,0 +[EqualizerRack1_[Main]_Effect1],parameter14_up_small,0 [EffectRack1_EffectUnit2_Effect1],parameter9_loaded,0 [EffectRack1_EffectUnit2_Effect3],parameter2_loaded,0 [Channel1],PeakIndicator_down_small,0 @@ -11343,7 +11343,7 @@ [EffectRack1_EffectUnit4_Effect1],parameter7_loaded,0 [EffectRack1_EffectUnit4_Effect3],parameter4_loaded,0 [Channel4],volume_toggle,0 -[Master],delay_set_zero,0 +[Main],delay_set_zero,0 [EffectRack1_EffectUnit2_Effect2],parameter8_loaded,0 [EffectRack1_EffectUnit2_Effect4],parameter3_loaded,0 [QuickEffectRack1_[Channel4]_Effect1],parameter15_set_zero,0 @@ -11355,7 +11355,7 @@ [Sampler4],bpm_down_small,0 [Sampler4],hotcue_30_activate,0 [EffectRack1_EffectUnit4_Effect2],parameter11_set_default,0 -[EqualizerRack1_[Master]_Effect1],parameter16_up_small,0 +[EqualizerRack1_[Main]_Effect1],parameter16_up_small,0 [QuickEffectRack1_[Channel2]_Effect1],parameter13_loaded,0 [Channel4],beatjump_16_forward,0 [QuickEffectRack1_[Channel4]],mix_down,0 @@ -11367,7 +11367,7 @@ [EffectRack1_EffectUnit2_Effect3],parameter3_loaded,0 [Auxiliary3],pregain_set_default,0 [Channel1],loop_move_0.0625_backward,0 -[Master],headDelay,0 +[Main],headDelay,0 [EffectRack1_EffectUnit4_Effect3],button_parameter4_type,0 [EqualizerRack1_[Channel1]],mix_minus_toggle,0 [EffectRack1_EffectUnit4_Effect1],parameter11_set_default,0 @@ -11382,7 +11382,7 @@ [Microphone4],pregain_set_default,0 [Sampler4],hotcue_12_enabled,0 [PreviewDeck1],hotcue_2_activate_preview,0 -[EqualizerRack1_[Master]],super1_up,0 +[EqualizerRack1_[Main]],super1_up,0 [Channel2],loop_move_0.0625_backward,0 [EffectRack1_EffectUnit4_Effect4],button_parameter4_type,0 [EffectRack1_EffectUnit2_Effect1],parameter1_toggle,0 @@ -11422,7 +11422,7 @@ [Channel4],loop_move_0.0625_backward,0 [PreviewDeck1],hotcue_24_set,0 [Channel1],VuMeterR_set_one,0 -[Master],PeakIndicator_set_default,0 +[Main],PeakIndicator_set_default,0 [PreviewDeck1],hotcue_5_set,0 [EffectRack1_EffectUnit1_Effect2],parameter10_type,0 [QuickEffectRack1_[Channel2]_Effect1],parameter11_loaded,0 @@ -11445,7 +11445,7 @@ [Channel2],VuMeterR_set_one,0 [Channel3],playposition_set_one,0 [Channel4],beat_next,-1 -[Master],VuMeter_down,0 +[Main],VuMeter_down,0 [QuickEffectRack1_[Channel1]_Effect1],parameter13_set_one,0 [EffectRack1_EffectUnit4_Effect1],parameter8_loaded,0 [EffectRack1_EffectUnit4_Effect3],parameter3_loaded,0 @@ -11515,7 +11515,7 @@ [EffectRack1_EffectUnit2_Effect1],button_parameter2_type,0 [EffectRack1_EffectUnit2_Effect4],parameter10_up_small,0 [EffectRack1_EffectUnit4_Effect4],parameter16_up_small,0 -[EqualizerRack1_[Master]_Effect1],parameter10_up_small,0 +[EqualizerRack1_[Main]_Effect1],parameter10_up_small,0 [EqualizerRack1_[Channel4]_Effect1],parameter14_set_minus_one,0 [Sampler2],hotcue_1_goto,0 [EqualizerRack1_[Channel3]_Effect1],parameter1_set_zero,0 @@ -11552,7 +11552,7 @@ [Channel1],beatloop_8_enabled,0 [Channel3],hotcue_16_position,-1 [QuickEffectRack1_[Channel1]_Effect1],parameter11_set_default,0 -[EqualizerRack1_[Master]_Effect1],parameter12_up_small,0 +[EqualizerRack1_[Main]_Effect1],parameter12_up_small,0 [QuickEffectRack1_[Channel3]_Effect1],parameter1_set_one,0 [Sampler2],hotcue_17_set,0 [Channel2],vinylcontrol_enabled,0 @@ -11624,7 +11624,7 @@ [QuickEffectRack1_[Channel3]_Effect1],parameter13_loaded,0 [Sampler4],hotcue_10_gotoandstop,0 [PreviewDeck1],hotcue_10_clear,0 -[Master],PeakIndicator_set_one,0 +[Main],PeakIndicator_set_one,0 [Sampler1],hotcue_12_enabled,0 [EffectRack1_EffectUnit2_Effect1],parameter10_up_small,0 [EffectRack1_EffectUnit4_Effect1],parameter16_up_small,0 @@ -11726,7 +11726,7 @@ [Sampler2],LoadSelectedTrackAndPlay,0 [QuickEffectRack1_[Channel4]_Effect1],parameter12_set_minus_one,0 [EffectRack1_EffectUnit4_Effect2],parameter2_set_default,0 -[EqualizerRack1_[Master]],super1,0 +[EqualizerRack1_[Main]],super1,0 [EffectRack1_EffectUnit4_Effect2],parameter1_loaded,0 [Auxiliary2],volume_down,0 [Channel2],hotcue_16_position,-1 @@ -11734,25 +11734,25 @@ [EffectRack1_EffectUnit1_Effect2],parameter11_up_small,0 [EffectRack1_EffectUnit2_Effect2],parameter12_up_small,0 [EffectRack1_EffectUnit3_Effect2],parameter13_up_small,0 -[Master],num_samplers,4 +[Main],num_samplers,4 [Sampler2],hotcue_30_gotoandstop,0 [Sampler4],hotcue_28_gotoandstop,0 [EqualizerRack1_[Channel4]_Effect1],parameter4_set_minus_one,0 [EffectRack1_EffectUnit1_Effect3],parameter2_set_minus_one,0 [Sampler3],visual_key_distance_minus_toggle,0 [Sampler3],LoadSelectedTrackAndPlay,0 -[EqualizerRack1_[Master]_Effect1],parameter7_up,0 +[EqualizerRack1_[Main]_Effect1],parameter7_up,0 [EffectRack1_EffectUnit4_Effect1],parameter2_set_default,0 [EqualizerRack1_[Channel3]_Effect1],parameter12_down,0 [EffectRack1_EffectUnit1_Effect1],parameter13_up_small,0 [EffectRack1_EffectUnit3_Effect1],parameter11_up_small,0 [EqualizerRack1_[Channel3]_Effect1],parameter3_set_zero,0 [EffectRack1_EffectUnit4_Effect1],parameter1_loaded,0 -[EqualizerRack1_[Master]],super1_set_default,0 +[EqualizerRack1_[Main]],super1_set_default,0 [Auxiliary1],volume_down,0 [Channel1],hotcue_16_position,-1 [Sampler2],waveform_zoom_down_small,0 -[EqualizerRack1_[Master]_Effect1],parameter6_set_default,0 +[EqualizerRack1_[Main]_Effect1],parameter6_set_default,0 [EffectRack1_EffectUnit2_Effect4],parameter1_loaded,0 [Sampler1],loop_move_0.0625_forward,0 [Sampler1],hotcue_28_gotoandstop,0 @@ -11763,7 +11763,7 @@ [EqualizerRack1_[Channel3]],mix_set_zero,0 [Sampler3],pregain_down_small,0 [Sampler4],LoadSelectedTrackAndPlay,0 -[EqualizerRack1_[Master]_Effect1],parameter15_link_type,0 +[EqualizerRack1_[Main]_Effect1],parameter15_link_type,0 [EffectRack1_EffectUnit1_Effect2],parameter13_up_small,0 [EffectRack1_EffectUnit3_Effect2],parameter11_up_small,0 [EqualizerRack1_[Channel1]_Effect1],parameter9_down_small,0 @@ -11772,7 +11772,7 @@ [Sampler3],waveform_zoom_down_small,0 [QuickEffectRack1_[Channel3]],clear,0 [EffectRack1_EffectUnit2_Effect3],parameter1_loaded,0 -[EqualizerRack1_[Master]_Effect1],parameter3_up,0 +[EqualizerRack1_[Main]_Effect1],parameter3_up,0 [Sampler2],loop_move_0.0625_forward,0 [EqualizerRack1_[Channel1]_Effect1],parameter14_set_minus_one,0 [Sampler1],VuMeter_up,0 @@ -11807,30 +11807,30 @@ [EffectRack1_EffectUnit4_Effect2],parameter10_up_small,0 [Sampler3],waveform_zoom,1 [Sampler4],beatloop_2_activate,0 -[EqualizerRack1_[Master]_Effect1],button_parameter9,0 +[EqualizerRack1_[Main]_Effect1],button_parameter9,0 [EffectRack1_EffectUnit2_Effect3],button_parameter2_type,0 -[EqualizerRack1_[Master]_Effect1],button_parameter8,0 +[EqualizerRack1_[Main]_Effect1],button_parameter8,0 [EffectRack1_EffectUnit4_Effect2],parameter3_set_one,0 [Auxiliary1],volume,1 [Channel4],quantize,0 [QuickEffectRack1_[Channel2]_Effect1],parameter1_set_one,0 [Sampler2],hotcue_19_set,0 [Channel1],hotcue_22_enabled,0 -[EqualizerRack1_[Master]_Effect1],button_parameter5,0 -[EqualizerRack1_[Master]_Effect1],button_parameter4,0 +[EqualizerRack1_[Main]_Effect1],button_parameter5,0 +[EqualizerRack1_[Main]_Effect1],button_parameter4,0 [Sampler1],hotcue_25_goto,0 -[EqualizerRack1_[Master]_Effect1],button_parameter7,0 +[EqualizerRack1_[Main]_Effect1],button_parameter7,0 [Sampler4],hotcue_1_goto,0 [EffectRack1_EffectUnit2_Effect3],parameter3_set_one,0 -[EqualizerRack1_[Master]_Effect1],button_parameter6,0 +[EqualizerRack1_[Main]_Effect1],button_parameter6,0 [EffectRack1_EffectUnit4_Effect1],parameter12_up_small,0 -[EqualizerRack1_[Master]_Effect1],button_parameter1,0 -[EqualizerRack1_[Master]_Effect1],button_parameter3,0 +[EqualizerRack1_[Main]_Effect1],button_parameter1,0 +[EqualizerRack1_[Main]_Effect1],button_parameter3,0 [Channel4],hotcue_30_position,-1 [EffectRack1_EffectUnit2_Effect4],parameter6_down_small,0 -[EqualizerRack1_[Master]_Effect1],button_parameter2,0 +[EqualizerRack1_[Main]_Effect1],button_parameter2,0 [PreviewDeck1],cue_indicator,0 -[EqualizerRack1_[Master]_Effect1],parameter13_set_one,0 +[EqualizerRack1_[Main]_Effect1],parameter13_set_one,0 [EffectRack1_EffectUnit1_Effect4],parameter10_set_minus_one,0 [PreviewDeck1],hotcue_27_set,0 [QuickEffectRack1_[Channel3]_Effect1],parameter12_loaded,0 @@ -11843,7 +11843,7 @@ [EffectRack1_EffectUnit2_Effect4],button_parameter2_type,0 [Sampler3],hotcue_19_set,0 [EqualizerRack1_[Channel1]],super1,0 -[EqualizerRack1_[Master]_Effect1],button_parameter2_type,0 +[EqualizerRack1_[Main]_Effect1],button_parameter2_type,0 [EqualizerRack1_[Channel4]_Effect1],button_parameter9,0 [Sampler2],hotcue_25_goto,0 [EqualizerRack1_[Channel4]_Effect1],button_parameter8,0 @@ -11963,7 +11963,7 @@ [Channel2],hotcue_30_position,-1 [EffectRack1_EffectUnit2],group_[BusCenter]_enable,0 [EffectRack1_EffectUnit1_Effect2],parameter10_set_minus_one,0 -[EqualizerRack1_[Master]_Effect1],parameter16_link_type,0 +[EqualizerRack1_[Main]_Effect1],parameter16_link_type,0 [EqualizerRack1_[Channel4]_Effect1],parameter9_down_small,0 [Channel3],hotcue_34_position,-1 [Sampler1],visual_key_distance_minus_toggle,0 @@ -11972,7 +11972,7 @@ [QuickEffectRack1_[Channel4]_Effect1],parameter6_type,0 [Channel4],hotcue_36_position,-1 [Channel1],hotcue_30_position,-1 -[EqualizerRack1_[Master]_Effect1],parameter7_set_minus_one,0 +[EqualizerRack1_[Main]_Effect1],parameter7_set_minus_one,0 [Sampler1],hotcue_13_set,0 [EqualizerRack1_[Channel4]_Effect1],parameter7_up_small,0 [Sampler2],visual_key_distance_minus_toggle,0 @@ -11996,7 +11996,7 @@ [EffectRack1_EffectUnit1_Effect1],button_parameter10_type,0 [Channel1],hotcue_32_position,-1 [QuickEffectRack1_[Channel2]],super1_toggle,0 -[EqualizerRack1_[Master]_Effect1],parameter14_down,0 +[EqualizerRack1_[Main]_Effect1],parameter14_down,0 [Channel4],hotcue_22_enabled,0 [Sampler2],pitch_adjust_set_zero,0 [PreviewDeck1],hotcue_29_set,0 @@ -12067,9 +12067,9 @@ [QuickEffectRack1_[Channel4]_Effect1],parameter10_loaded,0 [EffectRack1_EffectUnit3_Effect2],parameter14,0 [EffectRack1_EffectUnit4_Effect3],parameter3_down_small,0 -[Master],gain_toggle,0 +[Main],gain_toggle,0 [EqualizerRack1_[Channel1]_Effect1],num_button_parameterslots,16 -[Master],headMix_set_zero,0 +[Main],headMix_set_zero,0 [EqualizerRack1_[Channel3]_Effect1],parameter2_minus_toggle,0 [EffectRack1_EffectUnit3_Effect2],parameter16,0 [EffectRack1_EffectUnit3_Effect2],parameter11,0 @@ -12077,7 +12077,7 @@ [EffectRack1_EffectUnit3_Effect2],parameter10,0 [Spinny1],show_spinny,1 [EffectRack1_EffectUnit3_Effect4],button_parameter10_type,0 -[EqualizerRack1_[Master]_Effect1],loaded,0 +[EqualizerRack1_[Main]_Effect1],loaded,0 [EffectRack1_EffectUnit3_Effect2],parameter13,0 [EffectRack1_EffectUnit3_Effect2],parameter12,0 [EffectRack1_EffectUnit1_Effect1],parameter15,0 @@ -12159,7 +12159,7 @@ [Sampler1],hotcue_19_enabled,0 [Sampler4],hotcue_21_activate_preview,0 [Sampler3],beatloop_0.125,0 -[EqualizerRack1_[Master]_Effect1],parameter13_link_type,0 +[EqualizerRack1_[Main]_Effect1],parameter13_link_type,0 [EffectRack1_EffectUnit3_Effect4],parameter15,0 [QuickEffectRack1_[Channel1]_Effect1],parameter1_type,2 [EffectRack1_EffectUnit3_Effect4],parameter14,0 @@ -12233,9 +12233,9 @@ [EqualizerRack1_[Channel2]_Effect1],button_parameter3,0 [EqualizerRack1_[Channel2]_Effect1],button_parameter2,0 [Sampler1],beatloop_4_activate,0 -[Master],delay_set_minus_one,0 +[Main],delay_set_minus_one,0 [EffectRack1_EffectUnit3_Effect1],parameter4_type,0 -[EqualizerRack1_[Master]],num_effectslots,1 +[EqualizerRack1_[Main]],num_effectslots,1 [Channel4],hotcue_34_activate_preview,0 [EqualizerRack1_[Channel2]],mix_minus_toggle,0 [Sampler4],hotcue_15_set,0 @@ -12261,7 +12261,7 @@ [EffectRack1_EffectUnit1_Effect4],parameter4_type,0 [EffectRack1_EffectUnit1_Effect1],parameter1_down,0 [EqualizerRack1_[Channel1]_Effect1],parameter1_up_small,0 -[EqualizerRack1_[Master]_Effect1],parameter10_type,0 +[EqualizerRack1_[Main]_Effect1],parameter10_type,0 [QuickEffectRack1_[Channel3]],super1_toggle,0 [Auxiliary1],VuMeter_up_small,0 [EqualizerRack1_[Channel3]_Effect1],parameter7_minus_toggle,0 @@ -12291,10 +12291,10 @@ [EffectRack1_EffectUnit2_Effect4],parameter13_down,0 [QuickEffectRack1_[Channel2]_Effect1],parameter13_down_small,0 [EffectRack1_EffectUnit2_Effect1],parameter10_minus_toggle,0 -[Master],audio_latency_usage_set_one,0 +[Main],audio_latency_usage_set_one,0 [Sampler4],playposition_set_minus_one,0 [EffectRack1_EffectUnit4_Effect2],parameter8_set_one,0 -[EqualizerRack1_[Master]_Effect1],button_parameter15_type,0 +[EqualizerRack1_[Main]_Effect1],button_parameter15_type,0 [Sampler2],beatloop_0.125,0 [Channel1],hotcue_18_clear,0 [Sampler1],beatloop,0 @@ -12311,7 +12311,7 @@ [EffectRack1_EffectUnit2_Effect4],parameter8_set_one,0 [Sampler4],hotcue_16_set,0 [EqualizerRack1_[Channel3]_Effect1],parameter6_minus_toggle,0 -[EqualizerRack1_[Master]_Effect1],parameter14_set_default,0 +[EqualizerRack1_[Main]_Effect1],parameter14_set_default,0 [PreviewDeck1],hotcue_7_gotoandstop,0 [PreviewDeck1],pitch_adjust_down_small,0 [QuickEffectRack1_[Channel1]_Effect1],parameter12_set_minus_one,0 @@ -12420,8 +12420,8 @@ [Sampler4],hotcue_18_enabled,0 [Channel3],hotcue_28_clear,0 [EqualizerRack1_[Channel4]_Effect1],parameter2_set_default,0 -[EqualizerRack1_[Master]_Effect1],parameter4_type,0 -[Master],rate_set_zero,0 +[EqualizerRack1_[Main]_Effect1],parameter4_type,0 +[Main],rate_set_zero,0 [EffectRack1_EffectUnit4_Effect2],parameter9_type,0 [Channel4],bpm_down,0 [Sampler3],hotcue_18_enabled,0 @@ -12473,7 +12473,7 @@ [Channel3],cue_cdj,0 [QuickEffectRack1_[Channel1]_Effect1],parameter11_set_zero,0 [EqualizerRack1_[Channel4]_Effect1],parameter12_set_one,0 -[Master],VuMeter_set_default,0 +[Main],VuMeter_set_default,0 [QuickEffectRack1_[Channel4]_Effect1],parameter11_set_default,0 [QuickEffectRack1_[Channel2]_Effect1],parameter6_set_minus_one,0 [EffectRack1_EffectUnit4_Effect3],parameter10_minus_toggle,0 @@ -12535,7 +12535,7 @@ [Sampler4],local_bpm,0 [EffectRack1_EffectUnit4_Effect1],button_parameter14_loaded,0 [EffectRack1_EffectUnit4_Effect3],button_parameter13_loaded,0 -[EqualizerRack1_[Master]_Effect1],parameter14_toggle,0 +[EqualizerRack1_[Main]_Effect1],parameter14_toggle,0 [EffectRack1_EffectUnit2_Effect2],button_parameter15_loaded,0 [Sampler3],loop_move_4_forward,0 [EqualizerRack1_[Channel1]_Effect1],parameter15,0 @@ -12554,7 +12554,7 @@ [Channel4],rate_temp_down,0 [Channel1],hotcue_6_activate_preview,0 [EffectRack1_EffectUnit2_Effect1],button_parameter15_loaded,0 -[EqualizerRack1_[Master]_Effect1],parameter14_up,0 +[EqualizerRack1_[Main]_Effect1],parameter14_up,0 [QuickEffectRack1_[Channel4]_Effect1],parameter13_down_small,0 [Sampler4],loop_move_4_forward,0 [EqualizerRack1_[Channel1]_Effect1],parameter2_set_default,0 @@ -12614,7 +12614,7 @@ [Sampler2],local_bpm,0 [Channel3],hotcue_5_clear,0 [EffectRack1_EffectUnit4_Effect1],button_parameter15_loaded,0 -[EqualizerRack1_[Master]_Effect1],parameter10_up,0 +[EqualizerRack1_[Main]_Effect1],parameter10_up,0 [Microphone2],VuMeterL_down,0 [Channel1],rateSearch_minus_toggle,0 [EqualizerRack1_[Channel4]_Effect1],parameter11_type,0 @@ -12622,7 +12622,7 @@ [EffectRack1_EffectUnit2_Effect2],button_parameter7_type,0 [EffectRack1_EffectUnit4_Effect3],parameter12_type,0 [EffectRack1_EffectUnit2_Effect2],button_parameter16_loaded,0 -[Master],VuMeter_minus_toggle,0 +[Main],VuMeter_minus_toggle,0 [QuickEffectRack1_[Channel1]_Effect1],parameter15_loaded,0 [EffectRack1_EffectUnit1_Effect4],parameter5_set_minus_one,0 [QuickEffectRack1_[Channel4]_Effect1],parameter12_minus_toggle,0 @@ -12637,7 +12637,7 @@ [EqualizerRack1_[Channel1]_Effect1],parameter12_set_one,0 [QuickEffectRack1_[Channel3]_Effect1],parameter11_set_default,0 [EffectRack1_EffectUnit2_Effect1],button_parameter16_loaded,0 -[Master],crossfader_down_small,0 +[Main],crossfader_down_small,0 [EqualizerRack1_[Channel2]_Effect1],parameter8_minus_toggle,0 [Sampler4],main_mix,1 [Channel2],hotcue_20_enabled,0 @@ -12649,7 +12649,7 @@ [QuickEffectRack1_[Channel3]_Effect1],parameter4_up,0 [EffectRack1_EffectUnit2_Effect2],button_parameter11_loaded,0 [PreviewDeck1],visual_key_distance_set_one,0 -[EqualizerRack1_[Master]_Effect1],parameter1_toggle,0 +[EqualizerRack1_[Main]_Effect1],parameter1_toggle,0 [Channel1],hotcue_20_enabled,0 [EffectRack1_EffectUnit4_Effect2],button_parameter13_loaded,0 [EffectRack1_EffectUnit4_Effect4],button_parameter14_loaded,0 @@ -12688,7 +12688,7 @@ [EffectRack1_EffectUnit2],mix_set_one,0 [EqualizerRack1_[Channel2]_Effect1],parameter7_minus_toggle,0 [QuickEffectRack1_[Channel1]_Effect1],parameter1_loaded,1 -[EqualizerRack1_[Master]_Effect1],button_parameter1_loaded,0 +[EqualizerRack1_[Main]_Effect1],button_parameter1_loaded,0 [Channel1],hotcue_31_activate_preview,0 [Channel1],hotcue_5_clear,0 [QuickEffectRack1_[Channel1]_Effect1],parameter6_toggle,0 @@ -12733,7 +12733,7 @@ [Channel1],beats_adjust_slower,0 [Sampler4],playposition_set_one,0 [Auxiliary3],PeakIndicator_down_small,0 -[Master],audio_latency_overload_minus_toggle,0 +[Main],audio_latency_overload_minus_toggle,0 [Sampler1],waveform_zoom_set_one,0 [Auxiliary4],VuMeterR_toggle,0 [Sampler3],hotcue_4_enabled,0 @@ -12763,7 +12763,7 @@ [Auxiliary1],volume_set_minus_one,0 [EffectRack1_EffectUnit2],super1_set_one,0 [EqualizerRack1_[Channel4]_Effect1],parameter4_minus_toggle,0 -[EqualizerRack1_[Master]_Effect1],parameter5_toggle,0 +[EqualizerRack1_[Main]_Effect1],parameter5_toggle,0 [PreviewDeck1],hotcue_19_clear,0 [Channel1],beatloop_8_activate,0 [Channel4],beatloop_2_activate,0 @@ -12786,7 +12786,7 @@ [EqualizerRack1_[Channel1]_Effect1],parameter11_type,0 [EffectRack1_EffectUnit4],super1_set_one,0 [QuickEffectRack1_[Channel4]_Effect1],parameter11_minus_toggle,0 -[EqualizerRack1_[Master]_Effect1],parameter4_toggle,0 +[EqualizerRack1_[Main]_Effect1],parameter4_toggle,0 [Sampler3],playposition,0.5 [PreviewDeck1],hotcue_29_clear,0 [Auxiliary4],VuMeterL_toggle,0 @@ -12814,8 +12814,8 @@ [EffectRack1_EffectUnit2_Effect4],button_parameter7_type,0 [Playlist],ToggleSelectedSidebarItem,0 [EffectRack1_EffectUnit4_Effect1],parameter12_type,0 -[Master],gain_set_one,0 -[EqualizerRack1_[Master]_Effect1],parameter6_set_minus_one,0 +[Main],gain_set_one,0 +[EqualizerRack1_[Main]_Effect1],parameter6_set_minus_one,0 [Auxiliary2],VuMeter,0 [Auxiliary2],pregain_up,0 [PreviewDeck1],hotcue_13_set,0 @@ -12826,7 +12826,7 @@ [EqualizerRack1_[Channel4]_Effect1],parameter3_minus_toggle,0 [Sampler4],hotcue_17_enabled,0 [Channel2],hotcue_14_gotoandstop,0 -[EqualizerRack1_[Master]_Effect1],parameter3_toggle,0 +[EqualizerRack1_[Main]_Effect1],parameter3_toggle,0 [QuickEffectRack1_[Channel2]_Effect1],parameter4_up,0 [Channel3],hotcue_13_gotoandplay,0 [Sampler3],waveform_zoom_set_one,0 @@ -12839,7 +12839,7 @@ [QuickEffectRack1_[Channel1]_Effect1],button_parameter6_type,0 [Auxiliary3],VuMeter_down,0 [EffectRack1_EffectUnit4_Effect2],parameter12_type,0 -[Master],crossfader_set_default,0 +[Main],crossfader_set_default,0 [PreviewDeck1],beatloop_1_enabled,0 [Sampler1],beatloop_2_toggle,0 [EffectRack1_EffectUnit1_Effect3],num_button_parameters,0 @@ -12857,10 +12857,10 @@ [Sampler2],beatloop_2_toggle,0 [EffectRack1_EffectUnit2_Effect4],button_parameter11_loaded,0 [QuickEffectRack1_[Channel2]_Effect1],parameter8_up,0 -[Master],audio_latency_usage_up_small,0 +[Main],audio_latency_usage_up_small,0 [PreviewDeck1],PeakIndicator_up,0 [QuickEffectRack1_[Channel4]],mix_up,0 -[EqualizerRack1_[Master]_Effect1],parameter2_toggle,0 +[EqualizerRack1_[Main]_Effect1],parameter2_toggle,0 [QuickEffectRack1_[Channel1]_Effect1],parameter1_minus_toggle,0 [Channel1],hotcue_33_gotoandplay,0 [EffectRack1_EffectUnit3_Effect3],parameter16_set_default,0 @@ -12887,7 +12887,7 @@ [Channel3],beats_adjust_slower,0 [EqualizerRack1_[Channel4]_Effect1],parameter2_minus_toggle,0 [Channel2],hotcue_24_gotoandstop,0 -[EqualizerRack1_[Master]_Effect1],parameter9_toggle,0 +[EqualizerRack1_[Main]_Effect1],parameter9_toggle,0 [EffectRack1_EffectUnit4_Effect4],button_parameter7_type,0 [Channel3],hotcue_23_gotoandplay,0 [Sampler2],beatloop_0.125_activate,0 @@ -12900,14 +12900,14 @@ [Sampler3],cue_mode,0 [Channel4],beats_adjust_slower,0 [Channel1],pfl,0 -[Master],delay_set_one,0 +[Main],delay_set_one,0 [QuickEffectRack1_[Channel2]_Effect1],parameter2_down,0 [Channel3],hotcue_34_gotoandstop,0 [Channel4],hotcue_23_gotoandplay,0 [Sampler3],beatloop_0.125_activate,0 [Sampler3],pregain,1 [Auxiliary1],pregain_toggle,0 -[Master],VuMeter_toggle,0 +[Main],VuMeter_toggle,0 [Channel3],bpm_up,0 [Sampler3],hotcue_8_activate_preview,0 [Sampler4],cue_mode,0 @@ -12916,7 +12916,7 @@ [EqualizerRack1_[Channel4]_Effect1],parameter10_set_zero,0 [Channel2],pfl,0 [PreviewDeck1],hotcue_14_set,0 -[EqualizerRack1_[Master]_Effect1],parameter8_toggle,0 +[EqualizerRack1_[Main]_Effect1],parameter8_toggle,0 [Channel4],hotcue_34_gotoandstop,0 [Channel1],hotcue_23_gotoandplay,0 [Channel3],beatloop_8_activate,0 @@ -12951,7 +12951,7 @@ [EqualizerRack1_[Channel4]_Effect1],parameter9_minus_toggle,0 [Channel4],pfl,0 [Channel2],hotcue_34_gotoandstop,0 -[EqualizerRack1_[Master]_Effect1],parameter7_toggle,0 +[EqualizerRack1_[Main]_Effect1],parameter7_toggle,0 [Sampler1],playposition,0.5 [Channel3],hotcue_33_gotoandplay,0 [EffectRack1_EffectUnit3_Effect1],parameter16_set_default,0 @@ -12976,12 +12976,12 @@ [Sampler3],beatloop_0.0625,0 [Sampler4],beatloop_1_toggle,0 [EffectRack1_EffectUnit3_Effect1],num_button_parameters,0 -[EqualizerRack1_[Master]_Effect1],parameter10_link_type,0 +[EqualizerRack1_[Main]_Effect1],parameter10_link_type,0 [QuickEffectRack1_[Channel4]_Effect1],parameter1_type,2 [QuickEffectRack1_[Channel4]_Effect1],parameter10_minus_toggle,0 [Sampler2],hotcue_17_enabled,0 [Sampler4],hotcue_5_activate,0 -[EqualizerRack1_[Master]_Effect1],parameter6_toggle,0 +[EqualizerRack1_[Main]_Effect1],parameter6_toggle,0 [Channel4],hotcue_24_gotoandstop,0 [Channel1],hotcue_13_gotoandplay,0 [Channel4],VuMeterL_toggle,0 @@ -13113,13 +13113,13 @@ [EqualizerRack1_[Channel1]_Effect1],parameter9_minus_toggle,0 [EqualizerRack1_[Channel2]_Effect1],parameter7_set_one,0 [Mixer Profile],HiEQFrequency_down,0 -[EqualizerRack1_[Master]_Effect1],parameter16_set_one,0 +[EqualizerRack1_[Main]_Effect1],parameter16_set_one,0 [QuickEffectRack1_[Channel2]_Effect1],button_parameter10_type,0 [EffectRack1_EffectUnit2_Effect2],parameter12_set_default,0 [Channel3],play_stutter,0 [PreviewDeck1],hotcue_11_enabled,0 -[Master],headGain_down_small,0 -[Master],VuMeter_set_minus_one,0 +[Main],headGain_down_small,0 +[Main],VuMeter_set_minus_one,0 [Channel1],loop_move_1_forward,0 [EqualizerRack1_[Channel3]],super1,0 [Channel1],hotcue_18_activate_preview,0 @@ -13324,11 +13324,11 @@ [EqualizerRack1_[Channel1]_Effect1],parameter2_set_minus_one,0 [EffectRack1_EffectUnit1_Effect1],parameter13_down_small,0 [EqualizerRack1_[Channel1]_Effect1],parameter6_up,0 -[EqualizerRack1_[Master]],super1_minus_toggle,0 +[EqualizerRack1_[Main]],super1_minus_toggle,0 [Sampler1],vinylcontrol_mode,0 [EffectRack1_EffectUnit1_Effect4],parameter4_down_small,0 [EffectRack1_EffectUnit4_Effect3],parameter7_down,0 -[Master],headSplit,0 +[Main],headSplit,0 [Sampler1],rate_temp_down_small,0 [Sampler2],beats_translate_later,0 [Channel1],hotcue_9_position,-1 @@ -13413,7 +13413,7 @@ [EffectRack1_EffectUnit2_Effect2],parameter7_down,0 [EffectRack1_EffectUnit3_Effect4],button_parameter13_type,0 [EffectRack1_EffectUnit4_Effect2],parameter16_down,0 -[Master],balance_down,0 +[Main],balance_down,0 [Channel1],beatjump_2_forward,0 [Channel3],beatloop,0 [Auxiliary4],VuMeter_up,0 @@ -13455,7 +13455,7 @@ [Channel2],VuMeter_set_minus_one,0 [PreviewDeck1],loop_move_4_forward,0 [EffectRack1_EffectUnit4_Effect4],num_button_parameterslots,16 -[EqualizerRack1_[Master]_Effect1],parameter7_set_default,0 +[EqualizerRack1_[Main]_Effect1],parameter7_set_default,0 [Channel1],VuMeter_set_one,0 [Channel1],local_bpm,0 [QuickEffectRack1_[Channel4]_Effect1],parameter4_set_one,0 @@ -13572,12 +13572,12 @@ [EffectRack1_EffectUnit2_Effect2],parameter11_link_type,0 [QuickEffectRack1_[Channel4]_Effect1],parameter4_minus_toggle,0 [Sampler1],vinylcontrol_cueing,0 -[EqualizerRack1_[Master]_Effect1],parameter11_set_zero,0 +[EqualizerRack1_[Main]_Effect1],parameter11_set_zero,0 [EffectRack1_EffectUnit2_Effect3],parameter16_set_minus_one,0 [EffectRack1_EffectUnit3_Effect4],parameter7_set_one,0 [EqualizerRack1_[Channel4]_Effect1],parameter11_up_small,0 [Sampler2],hotcue_34_gotoandplay,0 -[EqualizerRack1_[Master]_Effect1],parameter14_down_small,0 +[EqualizerRack1_[Main]_Effect1],parameter14_down_small,0 [Channel1],beatloop,0 [Channel1],hotcue_11_activate,0 [Channel3],VuMeter_toggle,0 @@ -13589,7 +13589,7 @@ [PreviewDeck1],hotcue_19_goto,0 [EffectRack1_EffectUnit2_Effect3],parameter14_set_one,0 [EffectRack1_EffectUnit1_Effect2],parameter1_down_small,0 -[EqualizerRack1_[Master]_Effect1],parameter3_down_small,0 +[EqualizerRack1_[Main]_Effect1],parameter3_down_small,0 [Sampler2],end,0 [EqualizerRack1_[Channel1]_Effect1],parameter1_minus_toggle,0 [EffectRack1_EffectUnit4_Effect3],parameter12_link_type,0 @@ -13608,7 +13608,7 @@ [EffectRack1_EffectUnit2_Effect4],parameter14_set_one,0 [EffectRack1_EffectUnit4_Effect1],parameter4_set_minus_one,0 [Sampler1],rateSearch_down_small,0 -[EqualizerRack1_[Master]_Effect1],parameter13_set_zero,0 +[EqualizerRack1_[Main]_Effect1],parameter13_set_zero,0 [EqualizerRack1_[Channel1]_Effect1],parameter13_up_small,0 [Channel1],rate_dir,1 [EffectRack1_EffectUnit4_Effect4],parameter12_link_type,0 @@ -13629,7 +13629,7 @@ [Sampler3],volume_minus_toggle,0 [QuickEffectRack1_[Channel2]_Effect1],parameter15_down,0 [Channel2],beat_closest,-1 -[EqualizerRack1_[Master]_Effect1],parameter15_set_zero,0 +[EqualizerRack1_[Main]_Effect1],parameter15_set_zero,0 [Channel2],volume_up,0 [EqualizerRack1_[Channel1]_Effect1],parameter15_up_small,0 [QuickEffectRack1_[Channel2]_Effect1],parameter14_link_inverse,0 @@ -13645,7 +13645,7 @@ [EffectRack1_EffectUnit1_Effect1],parameter7_set_one,0 [Channel3],hotcue_29_activate,0 [Sampler3],hotcue_12_goto,0 -[EqualizerRack1_[Master]_Effect1],button_parameter16_type,0 +[EqualizerRack1_[Main]_Effect1],button_parameter16_type,0 [EffectRack1_EffectUnit4_Effect4],parameter4_set_minus_one,0 [Channel4],key,0 [Sampler4],rateSearch_down_small,0 @@ -13766,7 +13766,7 @@ [EffectRack1_EffectUnit4_Effect2],parameter1,0 [EffectRack1_EffectUnit2_Effect4],parameter8_type,0 [EffectRack1_EffectUnit4_Effect2],parameter3,0 -[EqualizerRack1_[Master]_Effect1],parameter9_set_minus_one,0 +[EqualizerRack1_[Main]_Effect1],parameter9_set_minus_one,0 [EffectRack1_EffectUnit4_Effect2],parameter2,0 [Microphone],volume_set_default,0 [QuickEffectRack1_[Channel4]_Effect1],parameter3_minus_toggle,0 @@ -13816,7 +13816,7 @@ [Sampler3],loop_move_0.125_backward,0 [EffectRack1_EffectUnit2_Effect3],parameter3,0 [EffectRack1_EffectUnit2_Effect3],parameter2,0 -[EqualizerRack1_[Master]_Effect1],parameter1,0 +[EqualizerRack1_[Main]_Effect1],parameter1,0 [EffectRack1_EffectUnit4_Effect1],parameter16_set_minus_one,0 [EffectRack1_EffectUnit4_Effect2],parameter15_set_one,0 [Sampler3],hotcue_35_enabled,0 @@ -13836,7 +13836,7 @@ [PreviewDeck1],hotcue_19_activate_preview,0 [Sampler2],beats_translate_earlier,0 [QuickEffectRack1_[Channel4]_Effect1],parameter8_minus_toggle,0 -[EqualizerRack1_[Master]_Effect1],parameter8_up_small,0 +[EqualizerRack1_[Main]_Effect1],parameter8_up_small,0 [EffectRack1_EffectUnit4_Effect1],parameter8_type,0 [Channel3],hotcue_16_enabled,0 [EffectRack1_EffectUnit4],group_[Sampler3]_enable,0 @@ -13847,7 +13847,7 @@ [Channel3],hotcue_19_activate,0 [Channel4],hotcue_36_enabled,0 [EffectRack1_EffectUnit4_Effect1],parameter10_down,0 -[EqualizerRack1_[Master]_Effect1],parameter5_type,0 +[EqualizerRack1_[Main]_Effect1],parameter5_type,0 [Sampler4],beatsync,0 [PreviewDeck1],hotcue_26_set,0 [Channel2],beatloop_64,0 @@ -13857,7 +13857,7 @@ [EffectRack1_EffectUnit4_Effect4],parameter8,0 [Channel3],beatloop_32,0 [EffectRack1_EffectUnit4_Effect4],parameter5,0 -[EqualizerRack1_[Master]_Effect1],parameter6_up_small,0 +[EqualizerRack1_[Main]_Effect1],parameter6_up_small,0 [EffectRack1_EffectUnit4_Effect4],parameter4,0 [EqualizerRack1_[Channel3]_Effect1],parameter4_loaded,0 [Channel4],hotcue_19_activate,0 @@ -13896,7 +13896,7 @@ [Microphone3],volume_set_zero,0 [Channel3],beatloop_16,0 [PreviewDeck1],volume_set_default,0 -[EqualizerRack1_[Master]_Effect1],parameter4_up_small,0 +[EqualizerRack1_[Main]_Effect1],parameter4_up_small,0 [Channel4],hotcue_17_activate,0 [QuickEffectRack1_[Channel2]_Effect1],parameter15_minus_toggle,0 [EffectRack1_EffectUnit2_Effect2],parameter15_set_one,0 @@ -13915,9 +13915,9 @@ [EqualizerRack1_[Channel3]_Effect1],parameter9_up_small,0 [ReplayGain],DefaultBoost_up,0 [Channel2],beatloop_2_toggle,0 -[EqualizerRack1_[Master]_Effect1],parameter11_link_type,0 +[EqualizerRack1_[Main]_Effect1],parameter11_link_type,0 [Channel1],hotcue_15_activate_preview,0 -[EqualizerRack1_[Master]_Effect1],parameter2_up_small,0 +[EqualizerRack1_[Main]_Effect1],parameter2_up_small,0 [Channel4],hotcue_15_activate,0 [Channel2],sync_key,0 [EffectRack1_EffectUnit2_Effect1],parameter8_type,0 @@ -13928,8 +13928,8 @@ [QuickEffectRack1_[Channel1]_Effect1],parameter6_type,0 [Channel3],hotcue_13_activate,0 [EqualizerRack1_[Channel1]_Effect1],button_parameter3_type,4 -[EqualizerRack1_[Master]_Effect1],parameter2,0 -[Master],headGain_set_minus_one,0 +[EqualizerRack1_[Main]_Effect1],parameter2,0 +[Main],headGain_set_minus_one,0 [Channel2],wheel,0 [Sampler1],hotcue_31_set,0 [EqualizerRack1_[Channel3]_Effect1],parameter2_loaded,1 @@ -14027,7 +14027,7 @@ [Auxiliary4],pregain_minus_toggle,0 [QuickEffectRack1_[Channel4]_Effect1],parameter7_minus_toggle,0 [Channel1],hotcue_9_gotoandstop,0 -[Master],crossfader,0 +[Main],crossfader,0 [Sampler2],pitch_adjust_minus_toggle,0 [QuickEffectRack1_[Channel4]_Effect1],parameter3_down,0 [Channel2],repeat,0 @@ -14076,7 +14076,7 @@ [PreviewDeck1],beat_distance,0 [EffectRack1_EffectUnit2_Effect3],parameter15_set_one,0 [EffectRack1_EffectUnit4],super1,0 -[EqualizerRack1_[Master]],enabled,1 +[EqualizerRack1_[Main]],enabled,1 [EqualizerRack1_[Channel2]_Effect1],parameter3_down_small,0 [Sampler4],vinylcontrol_speed_type,33.3 [Sampler2],hotcue_29_activate_preview,0 @@ -14085,17 +14085,17 @@ [Auxiliary1],volume_toggle,0 [Auxiliary1],pregain_minus_toggle,0 [QuickEffectRack1_[Channel2]_Effect1],parameter2_minus_toggle,0 -[EqualizerRack1_[Master]_Effect1],parameter14_set_one,0 +[EqualizerRack1_[Main]_Effect1],parameter14_set_one,0 [Channel4],hotcue_1_gotoandstop,0 [Channel4],volume_set_zero,0 [Sampler2],pregain_set_one,0 [QuickEffectRack1_[Channel1]_Effect1],button_parameter9,0 [Sampler2],hotcue_5_goto,0 -[EqualizerRack1_[Master]_Effect1],parameter12_link_type,0 +[EqualizerRack1_[Main]_Effect1],parameter12_link_type,0 [Channel1],hotcue_37_activate,0 [QuickEffectRack1_[Channel1]_Effect1],button_parameter8,0 [PreviewDeck1],hotcue_13_enabled,0 -[EqualizerRack1_[Master]_Effect1],parameter11_set_default,0 +[EqualizerRack1_[Main]_Effect1],parameter11_set_default,0 [Channel1],hotcue_9_goto,0 [QuickEffectRack1_[Channel1]_Effect1],button_parameter5,0 [Channel3],rateSearch_set_zero,0 @@ -14114,7 +14114,7 @@ [Channel3],beatjump_1_backward,0 [Auxiliary2],volume_toggle,0 [Auxiliary2],pregain_minus_toggle,0 -[EqualizerRack1_[Master]],mix_set_zero,0 +[EqualizerRack1_[Main]],mix_set_zero,0 [QuickEffectRack1_[Channel1]_Effect1],parameter10_set_minus_one,0 [Channel1],volume_set_zero,0 [Channel2],hotcue_37_activate,0 @@ -14161,7 +14161,7 @@ [EqualizerRack1_[Channel4]_Effect1],button_parameter1_loaded,1 [Sampler2],waveform_zoom_toggle,0 [Sampler3],PeakIndicator_set_zero,0 -[Master],headDelay_down,0 +[Main],headDelay_down,0 [Sampler1],beatloop_16,0 [Library],font_size_knob,0 [Channel4],repeat,0 @@ -14169,9 +14169,9 @@ [Channel2],beatloop_0.03125_activate,0 [Channel4],beatloop_8_toggle,0 [Sampler3],hotcue_1_enabled,0 -[Master],crossfader_toggle,0 +[Main],crossfader_toggle,0 [EqualizerRack1_[Channel3]_Effect1],button_parameter1_loaded,1 -[Master],VuMeterR_set_minus_one,0 +[Main],VuMeterR_set_minus_one,0 [Sampler1],pregain_set_minus_one,0 [Sampler4],PeakIndicator_set_zero,0 [QuickEffectRack1_[Channel1]_Effect1],parameter6_down_small,0 @@ -14189,7 +14189,7 @@ [EffectRack1_EffectUnit4_Effect1],parameter14_up,0 [Sampler2],pregain_set_minus_one,0 [Sampler4],beatloop_64,0 -[Master],headGain_up_small,0 +[Main],headGain_up_small,0 [EqualizerRack1_[Channel1]_Effect1],parameter2,1 [Mixer Profile],HiEQFrequency_set_minus_one,0 [Sampler1],beatloop_32,0 @@ -14214,7 +14214,7 @@ [Channel1],hotcue_7_set,0 [EffectRack1_EffectUnit3_Effect3],effect_selector,0 [EffectRack1_EffectUnit1_Effect2],parameter12_set_one,0 -[Master],VuMeterL_toggle,0 +[Main],VuMeterL_toggle,0 [Sampler2],beatloop_64,0 [Sampler4],pitch_adjust_minus_toggle,0 [Sampler3],beatloop_32,0 @@ -14274,7 +14274,7 @@ [Sampler3],bpm_set_zero,0 [QuickEffectRack1_[Channel2]_Effect1],button_parameter1,0 [Sampler3],hotcue_5_goto,0 -[Master],VuMeterR_toggle,0 +[Main],VuMeterR_toggle,0 [Sampler4],pregain_set_minus_one,0 [EqualizerRack1_[Channel1]_Effect1],parameter12_type,0 [QuickEffectRack1_[Channel2]_Effect1],button_parameter3,0 @@ -14298,12 +14298,12 @@ [EqualizerRack1_[Channel1]_Effect1],parameter1,1 [Sampler3],pregain_toggle,0 [EffectRack1_EffectUnit1_Effect1],effect_selector,0 -[Master],headMix_up_small,0 +[Main],headMix_up_small,0 [EqualizerRack1_[Channel2]_Effect1],parameter10_up,0 [Sampler3],hotcue_10_activate_preview,0 [EffectRack1_EffectUnit4_Effect1],parameter15_type,0 [EffectRack1_EffectUnit3_Effect1],button_parameter3_type,0 -[Master],audio_latency_overload_set_one,0 +[Main],audio_latency_overload_set_one,0 [Channel3],VuMeter_set_default,0 [Playlist],AutoDjAddBottom,0 [Microphone3],VuMeterL_set_minus_one,0 @@ -14446,7 +14446,7 @@ [QuickEffectRack1_[Channel3]_Effect1],button_parameter15_type,0 [Channel4],VuMeterL,0 [Microphone2],PeakIndicator_set_zero,0 -[Master],headGain,1 +[Main],headGain,1 [Sampler1],beatloop_32_enabled,0 [Sampler2],beatjump_0.03125_backward,0 [Channel1],hotcue_6_gotoandplay,0 @@ -14472,7 +14472,7 @@ [QuickEffectRack1_[Channel3]_Effect1],parameter9_minus_toggle,0 [QuickEffectRack1_[Channel4]_Effect1],parameter2_set_one,0 [PreviewDeck1],hotcue_8_activate,0 -[Master],gain_up_small,0 +[Main],gain_up_small,0 [EqualizerRack1_[Channel4]_Effect1],parameter3_down_small,0 [Channel2],hotcue_6_gotoandplay,0 [Microphone4],volume_set_minus_one,0 @@ -14509,13 +14509,13 @@ [EffectRack1_EffectUnit1_Effect3],parameter16_set_zero,0 [EffectRack1_EffectUnit2_Effect3],parameter15_set_zero,0 [EqualizerRack1_[Channel3]_Effect1],parameter12_set_one,0 -[EqualizerRack1_[Master]_Effect1],parameter10_down,0 +[EqualizerRack1_[Main]_Effect1],parameter10_down,0 [Channel3],beatloop_0.5,0 [Sampler2],hotcue_37_set,0 [EffectRack1_EffectUnit2_Effect3],button_parameter6_loaded,0 [EffectRack1_EffectUnit4_Effect1],parameter13_set_zero,0 [EffectRack1_EffectUnit4_Effect1],parameter6_up,0 -[EqualizerRack1_[Master]_Effect1],parameter8_set_minus_one,0 +[EqualizerRack1_[Main]_Effect1],parameter8_set_minus_one,0 [EffectRack1_EffectUnit4_Effect2],button_parameter6_loaded,0 [PreviewDeck1],hotcue_4_activate,0 [EffectRack1_EffectUnit4_Effect4],parameter2_up,0 @@ -14606,7 +14606,7 @@ [EqualizerRack1_[Channel2]_Effect1],parameter5_set_default,0 [Microphone4],volume_toggle,0 [EffectRack1_EffectUnit2_Effect2],button_parameter6_loaded,0 -[EqualizerRack1_[Master]_Effect1],parameter15_set_one,0 +[EqualizerRack1_[Main]_Effect1],parameter15_set_one,0 [Channel2],hotcue_34_enabled,0 [EffectRack1_EffectUnit2_Effect4],parameter15_set_minus_one,0 [EffectRack1_EffectUnit4_Effect4],parameter9_down_small,0 @@ -14671,7 +14671,7 @@ [EffectRack1_EffectUnit2_Effect3],parameter11_set_zero,0 [EffectRack1_EffectUnit1_Effect3],parameter13_set_default,0 [EffectRack1_EffectUnit2_Effect2],parameter15_minus_toggle,0 -[Master],headEnabled,0 +[Main],headEnabled,0 [EffectRack1_EffectUnit4_Effect3],button_parameter9_loaded,0 [EffectRack1_EffectUnit4_Effect3],parameter1_set_one,0 [EqualizerRack1_[Channel3]_Effect1],parameter2_set_one,0 @@ -14696,7 +14696,7 @@ [EffectRack1_EffectUnit3_Effect3],parameter16_set_zero,0 [EqualizerRack1_[Channel1]_Effect1],parameter8_down_small,0 [Channel1],hotcue_17_gotoandstop,0 -[Master],rate_down_small,0 +[Main],rate_down_small,0 [EffectRack1_EffectUnit4_Effect3],parameter13_minus_toggle,0 [QuickEffectRack1_[Channel4]_Effect1],button_parameter5,0 [Sampler3],hotcue_36_activate_preview,0 @@ -14713,7 +14713,7 @@ [Channel3],reset_key,0 [QuickEffectRack1_[Channel4]_Effect1],button_parameter2,0 [EffectRack1_EffectUnit4_Effect1],button_parameter5_loaded,0 -[EqualizerRack1_[Master]],prev_chain,0 +[EqualizerRack1_[Main]],prev_chain,0 [Sampler2],bpm_up,0 [EffectRack1_EffectUnit3_Effect4],parameter16_set_zero,0 [Channel2],hotcue_17_gotoandstop,0 @@ -14722,7 +14722,7 @@ [EffectRack1_EffectUnit4_Effect4],parameter13_minus_toggle,0 [Sampler4],hotcue_36_activate_preview,0 [Channel1],cue_mode,0 -[EqualizerRack1_[Master]],super1_set_minus_one,0 +[EqualizerRack1_[Main]],super1_set_minus_one,0 [EffectRack1_EffectUnit2_Effect3],parameter9_down_small,0 [EffectRack1_EffectUnit2_Effect1],button_parameter3_loaded,0 [EffectRack1_EffectUnit2_Effect3],button_parameter8_loaded,0 @@ -14772,10 +14772,10 @@ [Sampler1],bpm_set_default,0 [EffectRack1_EffectUnit2_Effect2],parameter15_set_minus_one,0 [EffectRack1_EffectUnit1_Effect1],parameter13_set_default,0 -[Master],VuMeterR,0 +[Main],VuMeterR,0 [EffectRack1_EffectUnit2_Effect4],parameter15_minus_toggle,0 [QuickEffectRack1_[Channel4]_Effect1],parameter7_toggle,0 -[Master],VuMeterL,0 +[Main],VuMeterL,0 [EffectRack1_EffectUnit3_Effect4],parameter5_down,0 [EffectRack1_EffectUnit4_Effect1],button_parameter7_loaded,0 [EffectRack1_EffectUnit4_Effect3],button_parameter4_loaded,0 @@ -14819,7 +14819,7 @@ [EffectRack1_EffectUnit1_Effect3],parameter14_down_small,0 [Channel4],hotcue_14_enabled,0 [EffectRack1_EffectUnit4_Effect3],next_effect,0 -[EqualizerRack1_[Master]_Effect1],parameter8_set_zero,0 +[EqualizerRack1_[Main]_Effect1],parameter8_set_zero,0 [Auxiliary1],enabled,0 [Channel4],hotcue_37_gotoandstop,0 [Channel1],hotcue_22_gotoandplay,0 @@ -14865,9 +14865,9 @@ [Channel4],hotcue_34_enabled,0 [EffectRack1_EffectUnit3],group_[Sampler1]_enable,0 [QuickEffectRack1_[Channel4]_Effect1],parameter9_toggle,0 -[EqualizerRack1_[Master]_Effect1],parameter6_set_zero,0 +[EqualizerRack1_[Main]_Effect1],parameter6_set_zero,0 [EqualizerRack1_[Channel3]],super1_up,0 -[Master],VuMeterR_up,0 +[Main],VuMeterR_up,0 [EffectRack1_EffectUnit4_Effect1],button_parameter9_loaded,0 [Channel1],hotcue_5_set,0 [Channel4],rateSearch,0 @@ -14879,7 +14879,7 @@ [Channel3],hotcue_32_gotoandplay,0 [EffectRack1_EffectUnit3_Effect1],parameter13_set_default,0 [EffectRack1_EffectUnit4_Effect4],parameter15_minus_toggle,0 -[Master],audio_latency_usage_toggle,0 +[Main],audio_latency_usage_toggle,0 [QuickEffectRack1_[Channel2]_Effect1],parameter4_loaded,0 [Sampler4],hotcue_10_clear,0 [PreviewDeck1],hotcue_29_gotoandstop,0 @@ -14898,7 +14898,7 @@ [EffectRack1_EffectUnit4_Effect2],parameter2_down_small,0 [Channel3],hotcue_27_gotoandstop,0 [Channel4],hotcue_32_gotoandplay,0 -[EqualizerRack1_[Master]_Effect1],parameter4_set_zero,0 +[EqualizerRack1_[Main]_Effect1],parameter4_set_zero,0 [EffectRack1_EffectUnit4_Effect1],parameter13_minus_toggle,0 [Sampler1],hotcue_36_activate_preview,0 [Channel3],hotcue_3_set,0 @@ -14920,7 +14920,7 @@ [EffectRack1_EffectUnit2_Effect3],button_parameter5_loaded,0 [EffectRack1_EffectUnit4_Effect2],parameter6_down,0 [Channel1],hotcue_5_activate_preview,0 -[EqualizerRack1_[Master]_Effect1],parameter2_set_zero,0 +[EqualizerRack1_[Main]_Effect1],parameter2_set_zero,0 [EffectRack1_EffectUnit1_Effect4],parameter8_set_default,0 [EffectRack1_EffectUnit2_Effect3],parameter15_down_small,0 [Channel2],hotcue_12_gotoandplay,0 @@ -14934,7 +14934,7 @@ [EffectRack1_EffectUnit1_Effect3],parameter14_set_zero,0 [Channel4],keylock,0 [EqualizerRack1_[Channel4]_Effect1],parameter8_down_small,0 -[Master],headMix_set_default,0 +[Main],headMix_set_default,0 [Channel2],hotcue_5_activate_preview,0 [EffectRack1_EffectUnit1_Effect3],parameter8_set_default,0 [EffectRack1_EffectUnit2_Effect4],parameter15_down_small,0 @@ -15005,7 +15005,7 @@ [Channel2],beatjump_1_forward,0 [EffectRack1_EffectUnit1_Effect3],button_parameter16_type,0 [EffectRack1_EffectUnit2_Effect1],parameter2_down_small,0 -[EqualizerRack1_[Master]_Effect1],button_parameter12_loaded,0 +[EqualizerRack1_[Main]_Effect1],button_parameter12_loaded,0 [Sampler2],hotcue_33_enabled,0 [QuickEffectRack1_[Channel2]_Effect1],parameter8_loaded,0 [Sampler2],rate_toggle,0 @@ -15019,7 +15019,7 @@ [EffectRack1_EffectUnit1_Effect2],parameter8_set_default,0 [QuickEffectRack1_[Channel3]_Effect1],parameter5_down_small,0 [Sampler1],beatloop_0.0625_activate,0 -[EqualizerRack1_[Master]],super1_down,0 +[EqualizerRack1_[Main]],super1_down,0 [Sampler1],hotcue_33_enabled,0 [Sampler1],hotcue_10_clear,0 [Sampler2],playposition_down,0 @@ -15034,7 +15034,7 @@ [QuickEffectRack1_[Channel4]_Effect1],parameter3_set_one,0 [EffectRack1_EffectUnit1_Effect1],parameter8_set_default,0 [EffectRack1_EffectUnit4_Effect3],parameter2_down_small,0 -[EqualizerRack1_[Master]_Effect1],button_parameter11_loaded,0 +[EqualizerRack1_[Main]_Effect1],button_parameter11_loaded,0 [Sampler2],beatloop_0.0625_activate,0 [QuickEffectRack1_[Channel1]_Effect1],parameter11_down,0 [Sampler1],playposition_down,0 @@ -15054,7 +15054,7 @@ [EffectRack1_EffectUnit4_Effect4],parameter2_down_small,0 [QuickEffectRack1_[Channel1]_Effect1],parameter2_down,0 [Sampler1],hotcue_20_clear,0 -[Master],PeakIndicator_down_small,0 +[Main],PeakIndicator_down_small,0 [EffectRack1_EffectUnit2_Effect1],parameter6_down,0 [QuickEffectRack1_[Channel1]_Effect1],parameter9_set_one,0 [Microphone3],VuMeterL_toggle,0 @@ -15108,7 +15108,7 @@ [Channel1],keylock,0 [EffectRack1_EffectUnit4_Effect2],button_parameter1_loaded,0 [EffectRack1_EffectUnit4_Effect4],button_parameter2_loaded,0 -[EqualizerRack1_[Master]_Effect1],parameter6_down,0 +[EqualizerRack1_[Main]_Effect1],parameter6_down,0 [EqualizerRack1_[Channel1]_Effect1],parameter2_set_one,0 [QuickEffectRack1_[Channel3]_Effect1],parameter7_loaded,0 [Channel4],hotcue_5_set,0 @@ -15150,7 +15150,7 @@ [Channel4],hotcue_5_activate_preview,0 [Channel2],beatloop_0.125_enabled,0 [Sampler2],hotcue_35_set,0 -[Master],gain_set_zero,0 +[Main],gain_set_zero,0 [EffectRack1_EffectUnit2_Effect3],parameter2_down_small,0 [EffectRack1_EffectUnit2_Effect2],parameter15_down_small,0 [Channel3],hotcue_8_activate,0 @@ -15184,7 +15184,7 @@ [Channel4],rateSearch_down,0 [EqualizerRack1_[Channel2]_Effect1],parameter3_set_one,0 [QuickEffectRack1_[Channel3]],super1_set_one,0 -[Master],VuMeterL_set_default,0 +[Main],VuMeterL_set_default,0 [EffectRack1_EffectUnit2_Effect1],button_parameter1_loaded,0 [EffectRack1_EffectUnit2_Effect3],button_parameter2_loaded,0 [QuickEffectRack1_[Channel2]_Effect1],parameter1_set_zero,0 @@ -15243,7 +15243,7 @@ [EqualizerRack1_[Channel3]_Effect1],parameter12,0 [Channel2],hotcue_2_activate,0 [EffectRack1_EffectUnit3_Effect1],parameter2_minus_toggle,0 -[EqualizerRack1_[Master]_Effect1],num_button_parameters,0 +[EqualizerRack1_[Main]_Effect1],num_button_parameters,0 [Sampler2],hotcue_36_set,0 [Channel1],rateEngine,0 [Sampler2],hotcue_36_gotoandstop,0 @@ -15258,7 +15258,7 @@ [Channel3],hotcue_19_goto,0 [Channel1],hotcue_1_set,0 [Sampler2],visual_key_distance,0 -[EqualizerRack1_[Master]_Effect1],button_parameter13_type,0 +[EqualizerRack1_[Main]_Effect1],button_parameter13_type,0 [Auxiliary3],VuMeter_toggle,0 [EffectRack1_EffectUnit4_Effect1],parameter15_down_small,0 [EffectRack1_EffectUnit2_Effect4],parameter4_set_default,0 diff --git a/src/test/enginebuffertest.cpp b/src/test/enginebuffertest.cpp index 3e2a90b173a..3db58e64583 100644 --- a/src/test/enginebuffertest.cpp +++ b/src/test/enginebuffertest.cpp @@ -102,7 +102,7 @@ TEST_F(EngineBufferTest, SlowRubberBand) { ControlObject::set(ConfigKey(m_sGroup1, "rateSearch"), 0.0072); // With Soundtouch, it should switch the scaler as well - ControlObject::set(ConfigKey("[Master]", "keylock_engine"), + ControlObject::set(ConfigKey("[Main]", "keylock_engine"), static_cast(EngineBuffer::KeylockEngine::SoundTouch)); ProcessBuffer(); EXPECT_EQ(m_pMockScaleVinyl1, m_pChannel1->getEngineBuffer()->m_pScale); @@ -112,7 +112,7 @@ TEST_F(EngineBufferTest, SlowRubberBand) { ProcessBuffer(); // With Rubberband, and transport stopped it should be still keylock - ControlObject::set(ConfigKey("[Master]", "keylock_engine"), + ControlObject::set(ConfigKey("[Main]", "keylock_engine"), static_cast(EngineBuffer::KeylockEngine::RubberBandFaster)); ControlObject::set(ConfigKey(m_sGroup1, "rateSearch"), 0.0); ProcessBuffer(); @@ -204,7 +204,7 @@ TEST_F(EngineBufferTest, ResetPitchAdjustUsesLinear) { TEST_F(EngineBufferE2ETest, SoundTouchCrashTest) { // Soundtouch has a bug where a pitch value of zero causes an infinite loop // and crash. - ControlObject::set(ConfigKey("[Master]", "keylock_engine"), + ControlObject::set(ConfigKey("[Main]", "keylock_engine"), static_cast(EngineBuffer::KeylockEngine::SoundTouch)); ControlObject::set(ConfigKey(m_sGroup1, "pitch"), 1.2); ControlObject::set(ConfigKey(m_sGroup1, "rate"), 0.05); @@ -284,59 +284,59 @@ TEST_F(EngineBufferE2ETest, ReverseTest) { // DISABLED: This test is too dependent on the sound touch library version. TEST_F(EngineBufferE2ETest, DISABLED_SoundTouchToggleTest) { // Test various cases where SoundTouch toggles on and off. - ControlObject::set(ConfigKey("[Master]", "keylock_engine"), - static_cast(EngineBuffer::KeylockEngine::SoundTouch)); - ControlObject::set(ConfigKey(m_sGroup1, "rate"), 0.5); - ControlObject::set(ConfigKey(m_sGroup1, "play"), 1.0); - ProcessBuffer(); - // Test transition from vinyl to keylock - ControlObject::set(ConfigKey(m_sGroup1, "keylock"), 1.0); - ProcessBuffer(); - assertBufferMatchesReference(m_pEngineMixer->getMainBuffer(), - kProcessBufferSize, - "SoundTouchTest"); - // Test transition from keylock to vinyl due to slow speed. - ControlObject::set(ConfigKey(m_sGroup1, "play"), 0.0); - ControlObject::set(ConfigKey(m_sGroup1, "rateSearch"), 0.0072); - ProcessBuffer(); - assertBufferMatchesReference(m_pEngineMixer->getMainBuffer(), - kProcessBufferSize, - "SoundTouchTestSlow"); - // Test transition back to keylock due to regular speed. - ControlObject::set(ConfigKey(m_sGroup1, "rateSearch"), 1.0); - ProcessBuffer(); - assertBufferMatchesReference(m_pEngineMixer->getMainBuffer(), - kProcessBufferSize, - "SoundTouchTestRegular"); + ControlObject::set(ConfigKey("[Main]", "keylock_engine"), + static_cast(EngineBuffer::KeylockEngine::SoundTouch)); + ControlObject::set(ConfigKey(m_sGroup1, "rate"), 0.5); + ControlObject::set(ConfigKey(m_sGroup1, "play"), 1.0); + ProcessBuffer(); + // Test transition from vinyl to keylock + ControlObject::set(ConfigKey(m_sGroup1, "keylock"), 1.0); + ProcessBuffer(); + assertBufferMatchesReference(m_pEngineMixer->getMainBuffer(), + kProcessBufferSize, + "SoundTouchTest"); + // Test transition from keylock to vinyl due to slow speed. + ControlObject::set(ConfigKey(m_sGroup1, "play"), 0.0); + ControlObject::set(ConfigKey(m_sGroup1, "rateSearch"), 0.0072); + ProcessBuffer(); + assertBufferMatchesReference(m_pEngineMixer->getMainBuffer(), + kProcessBufferSize, + "SoundTouchTestSlow"); + // Test transition back to keylock due to regular speed. + ControlObject::set(ConfigKey(m_sGroup1, "rateSearch"), 1.0); + ProcessBuffer(); + assertBufferMatchesReference(m_pEngineMixer->getMainBuffer(), + kProcessBufferSize, + "SoundTouchTestRegular"); } // DISABLED: This test is too dependent on the rubber band library version. TEST_F(EngineBufferE2ETest, DISABLED_RubberbandToggleTest) { // Test various cases where Rubberband toggles on and off. - ControlObject::set(ConfigKey("[Master]", "keylock_engine"), - static_cast(EngineBuffer::KeylockEngine::RubberBandFaster)); - ControlObject::set(ConfigKey(m_sGroup1, "rate"), 0.5); - ControlObject::set(ConfigKey(m_sGroup1, "play"), 1.0); - ProcessBuffer(); - // Test transition from vinyl to keylock - ControlObject::set(ConfigKey(m_sGroup1, "keylock"), 1.0); - ProcessBuffer(); - assertBufferMatchesReference(m_pEngineMixer->getMainBuffer(), - kProcessBufferSize, - "RubberbandTest"); - // Test transition from keylock to vinyl due to slow speed. - ControlObject::set(ConfigKey(m_sGroup1, "play"), 0.0); - ControlObject::set(ConfigKey(m_sGroup1, "rateSearch"), 0.0072); - ProcessBuffer(); - assertBufferMatchesReference(m_pEngineMixer->getMainBuffer(), - kProcessBufferSize, - "RubberbandTestSlow"); - // Test transition back to keylock due to regular speed. - ControlObject::set(ConfigKey(m_sGroup1, "rateSearch"), 1.0); - ProcessBuffer(); - assertBufferMatchesReference(m_pEngineMixer->getMainBuffer(), - kProcessBufferSize, - "RubberbandTestRegular"); + ControlObject::set(ConfigKey("[Main]", "keylock_engine"), + static_cast(EngineBuffer::KeylockEngine::RubberBandFaster)); + ControlObject::set(ConfigKey(m_sGroup1, "rate"), 0.5); + ControlObject::set(ConfigKey(m_sGroup1, "play"), 1.0); + ProcessBuffer(); + // Test transition from vinyl to keylock + ControlObject::set(ConfigKey(m_sGroup1, "keylock"), 1.0); + ProcessBuffer(); + assertBufferMatchesReference(m_pEngineMixer->getMainBuffer(), + kProcessBufferSize, + "RubberbandTest"); + // Test transition from keylock to vinyl due to slow speed. + ControlObject::set(ConfigKey(m_sGroup1, "play"), 0.0); + ControlObject::set(ConfigKey(m_sGroup1, "rateSearch"), 0.0072); + ProcessBuffer(); + assertBufferMatchesReference(m_pEngineMixer->getMainBuffer(), + kProcessBufferSize, + "RubberbandTestSlow"); + // Test transition back to keylock due to regular speed. + ControlObject::set(ConfigKey(m_sGroup1, "rateSearch"), 1.0); + ProcessBuffer(); + assertBufferMatchesReference(m_pEngineMixer->getMainBuffer(), + kProcessBufferSize, + "RubberbandTestRegular"); } // DISABLED: This test is too dependent on the sound touch library version. @@ -347,7 +347,7 @@ TEST_F(EngineBufferE2ETest, DISABLED_RubberbandToggleTest) { TEST_F(EngineBufferE2ETest, DISABLED_KeylockReverseTest) { // Confirm that when toggling reverse while keylock is on, interpolation // is smooth. - ControlObject::set(ConfigKey("[Master]", "keylock_engine"), + ControlObject::set(ConfigKey("[Main]", "keylock_engine"), static_cast(EngineBuffer::KeylockEngine::SoundTouch)); ControlObject::set(ConfigKey(m_sGroup1, "keylockMode"), 0.0); @@ -378,7 +378,7 @@ TEST_F(EngineBufferE2ETest, SeekTest) { TEST_F(EngineBufferE2ETest, SoundTouchReverseTest) { // This test must not crash when changing to reverse while pitch is tweaked // Testing issue #8061 - ControlObject::set(ConfigKey("[Master]", "keylock_engine"), + ControlObject::set(ConfigKey("[Main]", "keylock_engine"), static_cast(EngineBuffer::KeylockEngine::SoundTouch)); ControlObject::set(ConfigKey(m_sGroup1, "pitch"), -1); ControlObject::set(ConfigKey(m_sGroup1, "play"), 1.0); @@ -392,7 +392,7 @@ TEST_F(EngineBufferE2ETest, SoundTouchReverseTest) { TEST_F(EngineBufferE2ETest, RubberbandReverseTest) { // This test must not crash when changing to reverse while pitch is tweaked // Testing issue #8061 - ControlObject::set(ConfigKey("[Master]", "keylock_engine"), + ControlObject::set(ConfigKey("[Main]", "keylock_engine"), static_cast(EngineBuffer::KeylockEngine::RubberBandFaster)); ControlObject::set(ConfigKey(m_sGroup1, "pitch"), -1); ControlObject::set(ConfigKey(m_sGroup1, "play"), 1.0); diff --git a/src/test/metaknob_link_test.cpp b/src/test/metaknob_link_test.cpp index 0e589624e8f..e962022de76 100644 --- a/src/test/metaknob_link_test.cpp +++ b/src/test/metaknob_link_test.cpp @@ -16,7 +16,7 @@ class MetaLinkTest : public BaseEffectTest { protected: MetaLinkTest() - : m_main(m_factory.getOrCreateHandle("[Master]"), "[Master]"), + : m_main(m_factory.getOrCreateHandle("[Main]"), "[Main]"), m_headphone(m_factory.getOrCreateHandle("[Headphone]"), "[Headphone]") { mixxx::Time::setTestMode(true); mixxx::Time::setTestElapsedTime(mixxx::Duration::fromNanos(0)); diff --git a/src/test/playermanagertest.cpp b/src/test/playermanagertest.cpp index ef474ce01bc..8b6b018a649 100644 --- a/src/test/playermanagertest.cpp +++ b/src/test/playermanagertest.cpp @@ -50,7 +50,7 @@ class PlayerManagerTest : public MixxxDbTest, SoundSourceProviderRegistration { m_pEffectsManager = std::make_shared(m_pConfig, pChannelHandleFactory); m_pEngine = std::make_shared( m_pConfig, - "[Master]", + "[Main]", m_pEffectsManager.get(), pChannelHandleFactory, true); diff --git a/src/test/signalpathtest.cpp b/src/test/signalpathtest.cpp index 8cb335cc510..f8201988b63 100644 --- a/src/test/signalpathtest.cpp +++ b/src/test/signalpathtest.cpp @@ -1,6 +1,6 @@ #include "test/signalpathtest.h" -const QString BaseSignalPathTest::m_sMainGroup = QStringLiteral("[Master]"); +const QString BaseSignalPathTest::m_sMainGroup = QStringLiteral("[Main]"); const QString BaseSignalPathTest::m_sInternalClockGroup = QStringLiteral("[InternalClock]"); // these names need to match PlayerManager::groupForDeck and friends const QString BaseSignalPathTest::m_sGroup1 = QStringLiteral("[Channel1]"); diff --git a/src/util/timer.cpp b/src/util/timer.cpp index 335c9996764..f8584826a17 100644 --- a/src/util/timer.cpp +++ b/src/util/timer.cpp @@ -84,7 +84,7 @@ mixxx::Duration SuspendableTimer::elapsed(bool report) { GuiTickTimer::GuiTickTimer(QObject* pParent) : QObject(pParent), m_pGuiTick(make_parented( - "[Master]", "guiTickTime", this)), + "[Main]", "guiTickTime", this)), m_bActive(false) { } diff --git a/src/vinylcontrol/vinylcontrolmanager.cpp b/src/vinylcontrol/vinylcontrolmanager.cpp index 06c7b6deb9b..702de6db2e4 100644 --- a/src/vinylcontrol/vinylcontrolmanager.cpp +++ b/src/vinylcontrol/vinylcontrolmanager.cpp @@ -52,7 +52,7 @@ VinylControlManager::~VinylControlManager() { } void VinylControlManager::init() { - m_pNumDecks = new ControlProxy("[Master]", "num_decks", this); + m_pNumDecks = new ControlProxy("[Main]", "num_decks", this); m_pNumDecks->connectValueChanged(this, &VinylControlManager::slotNumDecksChanged); slotNumDecksChanged(m_pNumDecks->get()); } diff --git a/src/vinylcontrol/vinylcontrolxwax.cpp b/src/vinylcontrol/vinylcontrolxwax.cpp index 80dea92cd0e..b837f14c5f0 100644 --- a/src/vinylcontrol/vinylcontrolxwax.cpp +++ b/src/vinylcontrol/vinylcontrolxwax.cpp @@ -128,7 +128,7 @@ VinylControlXwax::VinylControlXwax(UserSettingsPointer pConfig, const QString& g } double latency = ControlObject::get( - ConfigKey("[Master]", "latency")); + ConfigKey("[Main]", "latency")); if (latency <= 0 || latency > 200) { qDebug() << "Failed to get sane latency, assuming 20 as a reasonable value"; latency = 20; diff --git a/src/waveform/guitick.cpp b/src/waveform/guitick.cpp index 8ac94ef16dd..bd25dceea75 100644 --- a/src/waveform/guitick.cpp +++ b/src/waveform/guitick.cpp @@ -4,8 +4,8 @@ #include "control/controlobject.h" GuiTick::GuiTick() { - m_pCOGuiTickTime = std::make_unique(ConfigKey("[Master]", "guiTickTime")); - m_pCOGuiTick50ms = std::make_unique(ConfigKey("[Master]", "guiTick50ms")); + m_pCOGuiTickTime = std::make_unique(ConfigKey("[Main]", "guiTickTime")); + m_pCOGuiTick50ms = std::make_unique(ConfigKey("[Main]", "guiTick50ms")); m_cpuTimer.start(); } diff --git a/src/widget/wmainmenubar.cpp b/src/widget/wmainmenubar.cpp index b0ff900c1c3..ff1d7ac1615 100644 --- a/src/widget/wmainmenubar.cpp +++ b/src/widget/wmainmenubar.cpp @@ -209,7 +209,7 @@ void WMainMenuBar::initialize() { tr("Ctrl+1", "Menubar|View|Show Skin Settings")))); pViewShowSkinSettings->setStatusTip(showSkinSettingsText); pViewShowSkinSettings->setWhatsThis(buildWhatsThis(showSkinSettingsTitle, showSkinSettingsText)); - createVisibilityControl(pViewShowSkinSettings, ConfigKey("[Master]", "skin_settings")); + createVisibilityControl(pViewShowSkinSettings, ConfigKey("[Main]", "skin_settings")); pViewMenu->addAction(pViewShowSkinSettings); // Microphone Section @@ -284,7 +284,7 @@ void WMainMenuBar::initialize() { tr("Space", "Menubar|View|Maximize Library")))); pViewMaximizeLibrary->setStatusTip(maximizeLibraryText); pViewMaximizeLibrary->setWhatsThis(buildWhatsThis(maximizeLibraryTitle, maximizeLibraryText)); - createVisibilityControl(pViewMaximizeLibrary, ConfigKey("[Master]", "maximize_library")); + createVisibilityControl(pViewMaximizeLibrary, ConfigKey("[Main]", "maximize_library")); pViewMenu->addAction(pViewMaximizeLibrary); pViewMenu->addSeparator(); diff --git a/src/widget/wtrackmenu.cpp b/src/widget/wtrackmenu.cpp index d6b86185539..eb9f0fcff87 100644 --- a/src/widget/wtrackmenu.cpp +++ b/src/widget/wtrackmenu.cpp @@ -66,11 +66,11 @@ WTrackMenu::WTrackMenu( m_eActiveFeatures(flags), m_eTrackModelFeatures(Feature::TrackModelFeatures) { m_pNumSamplers = new ControlProxy( - "[Master]", "num_samplers", this); + "[Main]", "num_samplers", this); m_pNumDecks = new ControlProxy( - "[Master]", "num_decks", this); + "[Main]", "num_decks", this); m_pNumPreviewDecks = new ControlProxy( - "[Master]", "num_preview_decks", this); + "[Main]", "num_preview_decks", this); // Warn if any of the chosen features depend on a TrackModel VERIFY_OR_DEBUG_ASSERT(trackModel || (m_eTrackModelFeatures & flags) == 0) { diff --git a/src/widget/wtracktableview.cpp b/src/widget/wtracktableview.cpp index 3fe112c55e8..fd849523fc4 100644 --- a/src/widget/wtracktableview.cpp +++ b/src/widget/wtracktableview.cpp @@ -59,7 +59,7 @@ WTrackTableView::WTrackTableView(QWidget* parent, // Connect slots and signals to make the world go 'round. connect(this, &WTrackTableView::doubleClicked, this, &WTrackTableView::slotMouseDoubleClicked); - m_pCOTGuiTick = new ControlProxy("[Master]", "guiTick50ms", this); + m_pCOTGuiTick = new ControlProxy("[Main]", "guiTick50ms", this); m_pCOTGuiTick->connectValueChanged(this, &WTrackTableView::slotGuiTick50ms); m_pKeyNotation = new ControlProxy(mixxx::library::prefs::kKeyNotationConfigKey, this); diff --git a/src/widget/wwidgetstack.cpp b/src/widget/wwidgetstack.cpp index 532078c903f..4092b1eb191 100644 --- a/src/widget/wwidgetstack.cpp +++ b/src/widget/wwidgetstack.cpp @@ -169,7 +169,7 @@ void WWidgetStack::slotSetIndex(int index) { // index widget re-focus that widget. // For now, its only purpose is to keep the keyboard focus on // library widgets in the Library singleton when toggling - // [Master],maximize_library + // [Main],maximize_library QWidget* prevFocusWidget = QApplication::focusWidget(); setCurrentIndex(index); if (currentWidget()->isAncestorOf(prevFocusWidget)) { diff --git a/tools/make_xone.py b/tools/make_xone.py index 6e82dc71fd5..8fd53ba9029 100755 --- a/tools/make_xone.py +++ b/tools/make_xone.py @@ -303,7 +303,7 @@ def help(): - [Master] + [Main] XoneK2.leftBottomKnob 0xBF 0x14 @@ -312,7 +312,7 @@ def help(): - [Master] + [Main] XoneK2.shift_on 0x9F 0xF @@ -321,7 +321,7 @@ def help(): - [Master] + [Main] XoneK2.shift_on 0x8F 0xF @@ -350,7 +350,7 @@ def help(): - [Master] + [Main] XoneK2.leftBottomKnob 0xBF 0x14 @@ -359,7 +359,7 @@ def help(): - [Master] + [Main] XoneK2.shift_on 0x9F 0xF @@ -368,7 +368,7 @@ def help(): - [Master] + [Main] XoneK2.shift_on 0x8F 0xF