Merge pull request mixxxdj#11942 from Holzhaus/remove-offensive-language

Remove offensive language (Pt. 1)

res/controllers/Traktor-Kontrol-S4-MK3.js

@@ -2603,7 +2603,7 @@ class S4Mk3MixerColumn extends ComponentContainer {
             mixer: this,
             input: MixerControlsMixAuxOnShift ? function(value) {
                 if (this.mixer.shifted && this.group !== `[Channel${idx}]`) { // FIXME only if group != [ChannelX]
-                    const controlKey = (this.group === `[Microphone${idx}]` || this.group === "[Microphone]") ? "talkover" : "master";
+                    const controlKey = (this.group === `[Microphone${idx}]` || this.group === "[Microphone]") ? "talkover" : "main_mix";
                     const isPlaying = engine.getValue(this.group, controlKey);
                     if ((value !== 0) !== isPlaying) {
                         engine.setValue(this.group, controlKey, value !== 0);

res/qml/SyncButton.qml

@@ -64,6 +64,6 @@ Skin.Button {
         id: leaderControl
 
         group: root.group
-        key: "sync_master"
+        key: "sync_leader"
     }
 }

res/schema.xml

@@ -457,7 +457,7 @@ reapplying those migrations.
     <description>
       This was used in the development of 2.3 to track whether cues were placed
       manually or automatically. However, this turned out to be unnecessary.
-      This version is left as a placeholder so users who were using the master
+      This version is left as a placeholder so users who were using the main
       branch will have their database updated correctly for the subsequent
       schema change.
     </description>

res/skins/Deere/auxiliary.xml

@@ -108,7 +108,7 @@
                     <SetVariable name="SizePolicy">me,f</SetVariable>
                     <SetVariable name="state_0_text">Play</SetVariable>
                     <SetVariable name="state_1_text">Play</SetVariable>
-                    <SetVariable name="left_connection_control"><Variable name="group"/>,master</SetVariable>
+                    <SetVariable name="left_connection_control"><Variable name="group"/>,main_mix</SetVariable>
                   </Template>
 
                   <Template src="skin:left_2state_button.xml">

res/skins/Deere/auxiliary_unconfigured.xml

@@ -44,7 +44,7 @@
                 <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
                 <SetVariable name="state_0_pressed">icon/ic_add_48px.svg</SetVariable>
                 <SetVariable name="state_0_unpressed">icon/ic_add_48px.svg</SetVariable>
-                <SetVariable name="left_connection_control"><Variable name="group"/>,master</SetVariable>
+                <SetVariable name="left_connection_control"><Variable name="group"/>,main_mix</SetVariable>
                 <SetVariable name="TooltipId">configure_input</SetVariable>
               </Template>
             </Children>

res/skins/LateNight/mic_aux/aux_unit.xml

@@ -39,7 +39,7 @@
                     <SetVariable name="ObjectName">AuxPlay</SetVariable>
                     <SetVariable name="Size">42f,26f</SetVariable>
                     <SetVariable name="BtnSize">medium</SetVariable>
-                    <SetVariable name="ConfigKey"><Variable name="Group"/>,master</SetVariable>
+                    <SetVariable name="ConfigKey"><Variable name="Group"/>,main_mix</SetVariable>
                   </Template>
                 </Children>
               </WidgetGroup>

res/skins/LateNight/mic_aux/aux_unit_unconfigured.xml

@@ -36,7 +36,7 @@
                   <Pressed scalemode="STRETCH">skin:../LateNight/<Variable name="BtnScheme"/>/buttons/btn_flat_square.svg</Pressed>
                 </State>
                 <Connection>
-                  <ConfigKey><Variable name="Group"/>,master</ConfigKey>
+                  <ConfigKey><Variable name="Group"/>,main_mix</ConfigKey>
                 </Connection>
               </PushButton>
             </Children>

res/skins/Shade/deck_transport.xml

@@ -62,7 +62,7 @@
         </State>
         <Pos>5,35</Pos>
         <Connection>
-          <ConfigKey>[Auxiliary<Variable name="auxnum"/>],master</ConfigKey>
+          <ConfigKey>[Auxiliary<Variable name="auxnum"/>],main_mix</ConfigKey>
           <ButtonState>LeftButton</ButtonState>
         </Connection>
       </PushButton>

res/skins/Tango/mic_aux_sampler/aux_unit.xml

@@ -38,7 +38,7 @@ Variables:
             <SetVariable name="TooltipId">master_enable</SetVariable>
             <SetVariable name="ObjectName">AuxEnable</SetVariable>
             <SetVariable name="Size">20f,29f</SetVariable>
-            <SetVariable name="ConfigKey"><Variable name="group"/>,master</SetVariable>
+            <SetVariable name="ConfigKey"><Variable name="group"/>,main_mix</SetVariable>
           </Template>
 
           <WidgetGroup><Size>3f,1min</Size></WidgetGroup>

res/skins/Tango/mic_aux_sampler/aux_unit_unconfigured.xml

@@ -42,7 +42,7 @@ Variables:
                 <SetVariable name="ObjectName">MicAuxAdd</SetVariable>
                 <SetVariable name="Size">20f,20f</SetVariable>
                 <SetVariable name="state_0_text">+</SetVariable>
-                <SetVariable name="ConfigKey"><Variable name="group"/>,master</SetVariable>
+                <SetVariable name="ConfigKey"><Variable name="group"/>,main_mix</SetVariable>
               </Template>
             </Children>
           </WidgetGroup>

src/control/controlobjectscript.h

@@ -36,7 +36,7 @@ class ControlObjectScript : public ControlProxy {
     void trigger(double, QObject*);
 
   protected slots:
-    // Receives the value from the master control by a unique queued connection
+    // Receives the value from the primary control by a unique queued connection
     // This is specified virtual, to allow gmock to replace it in the test case
     virtual void slotValueChanged(double v, QObject*);
 

src/control/controlproxy.h

@@ -159,23 +159,23 @@ class ControlProxy : public QObject {
     void valueChanged(double);
 
   protected slots:
-    /// Receives the value from the master control by a unique direct connection
+    /// Receives the value from the primary control by a unique direct connection
     void slotValueChangedDirect(double v, QObject* pSetter) {
         if (pSetter != this) {
             // This is base implementation of this function without scaling
             emit valueChanged(v);
         }
     }
 
-    /// Receives the value from the master control by a unique auto connection
+    /// Receives the value from the primary control by a unique auto connection
     void slotValueChangedAuto(double v, QObject* pSetter) {
         if (pSetter != this) {
             // This is base implementation of this function without scaling
             emit valueChanged(v);
         }
     }
 
-    /// Receives the value from the master control by a unique Queued connection
+    /// Receives the value from the primary control by a unique Queued connection
     void slotValueChangedQueued(double v, QObject* pSetter) {
         if (pSetter != this) {
             // This is base implementation of this function without scaling

src/engine/channels/engineaux.cpp

@@ -22,9 +22,9 @@ EngineAux::EngineAux(const ChannelHandleAndGroup& handleGroup, EffectsManager* p
                                       ConfigKey(getGroup(), "input_configured"));
 
     // by default Aux is disabled on the master and disabled on PFL. User
-    // can over-ride by setting the "pfl" or "master" controls.
+    // can over-ride by setting the "pfl" or "main_mix" controls.
     // Skins can change that during initialisation, if the master control is not provided.
-    setMaster(false);
+    setMainMix(false);
 }
 
 EngineAux::~EngineAux() {
@@ -46,7 +46,7 @@ EngineChannel::ActiveState EngineAux::updateActiveState() {
 }
 
 void EngineAux::onInputConfigured(const AudioInput& input) {
-    if (input.getType() != AudioPath::AUXILIARY) {
+    if (input.getType() != AudioPathType::Auxiliary) {
         // This is an error!
         qDebug() << "WARNING: EngineAux connected to AudioInput for a non-auxiliary type!";
         return;
@@ -56,7 +56,7 @@ void EngineAux::onInputConfigured(const AudioInput& input) {
 }
 
 void EngineAux::onInputUnconfigured(const AudioInput& input) {
-    if (input.getType() != AudioPath::AUXILIARY) {
+    if (input.getType() != AudioPathType::Auxiliary) {
         // This is an error!
         qDebug() << "WARNING: EngineAux connected to AudioInput for a non-auxiliary type!";
         return;

src/engine/channels/enginechannel.cpp

@@ -20,8 +20,10 @@ EngineChannel::EngineChannel(const ChannelHandleAndGroup& handleGroup,
           m_channelIndex(-1) {
     m_pPFL = new ControlPushButton(ConfigKey(getGroup(), "pfl"));
     m_pPFL->setButtonMode(ControlPushButton::TOGGLE);
-    m_pMaster = new ControlPushButton(ConfigKey(getGroup(), "master"));
-    m_pMaster->setButtonMode(ControlPushButton::POWERWINDOW);
+    m_pMainMix = new ControlPushButton(ConfigKey(getGroup(), "main_mix"));
+    m_pMainMix->setButtonMode(ControlPushButton::POWERWINDOW);
+    ControlDoublePrivate::insertAlias(
+            ConfigKey(getGroup(), "master"), ConfigKey(getGroup(), "main_mix"));
     m_pOrientation = new ControlPushButton(ConfigKey(getGroup(), "orientation"));
     m_pOrientation->setButtonMode(ControlPushButton::TOGGLE);
     m_pOrientation->setStates(3);
@@ -44,7 +46,7 @@ EngineChannel::EngineChannel(const ChannelHandleAndGroup& handleGroup,
 }
 
 EngineChannel::~EngineChannel() {
-    delete m_pMaster;
+    delete m_pMainMix;
     delete m_pPFL;
     delete m_pOrientation;
     delete m_pOrientationLeft;
@@ -61,12 +63,12 @@ bool EngineChannel::isPflEnabled() const {
     return m_pPFL->toBool();
 }
 
-void EngineChannel::setMaster(bool enabled) {
-    m_pMaster->set(enabled ? 1.0 : 0.0);
+void EngineChannel::setMainMix(bool enabled) {
+    m_pMainMix->set(enabled ? 1.0 : 0.0);
 }
 
-bool EngineChannel::isMasterEnabled() const {
-    return m_pMaster->toBool();
+bool EngineChannel::isMainMixEnabled() const {
+    return m_pMainMix->toBool();
 }
 
 void EngineChannel::setTalkover(bool enabled) {

src/engine/channels/enginechannel.h

@@ -51,8 +51,8 @@ class EngineChannel : public EngineObject {
 
     void setPfl(bool enabled);
     virtual bool isPflEnabled() const;
-    void setMaster(bool enabled);
-    virtual bool isMasterEnabled() const;
+    void setMainMix(bool enabled);
+    virtual bool isMainMixEnabled() const;
     void setTalkover(bool enabled);
     virtual bool isTalkoverEnabled() const;
     inline bool isTalkoverChannel() { return m_bIsTalkoverChannel; };
@@ -92,7 +92,7 @@ class EngineChannel : public EngineObject {
     void slotOrientationCenter(double v);
 
   private:
-    ControlPushButton* m_pMaster;
+    ControlPushButton* m_pMainMix;
     ControlPushButton* m_pPFL;
     ControlPushButton* m_pOrientation;
     ControlPushButton* m_pOrientationLeft;

src/engine/channels/enginedeck.cpp

@@ -132,7 +132,7 @@ void EngineDeck::receiveBuffer(
 }
 
 void EngineDeck::onInputConfigured(const AudioInput& input) {
-    if (input.getType() != AudioPath::VINYLCONTROL) {
+    if (input.getType() != AudioPathType::VinylControl) {
         // This is an error!
         qDebug() << "WARNING: EngineDeck connected to AudioInput for a non-vinylcontrol type!";
         return;
@@ -142,7 +142,7 @@ void EngineDeck::onInputConfigured(const AudioInput& input) {
 }
 
 void EngineDeck::onInputUnconfigured(const AudioInput& input) {
-    if (input.getType() != AudioPath::VINYLCONTROL) {
+    if (input.getType() != AudioPathType::VinylControl) {
         // This is an error!
         qDebug() << "WARNING: EngineDeck connected to AudioInput for a non-vinylcontrol type!";
         return;

src/engine/channels/enginemicrophone.cpp

@@ -22,7 +22,7 @@ EngineMicrophone::EngineMicrophone(const ChannelHandleAndGroup& handleGroup,
     ControlDoublePrivate::insertAlias(ConfigKey(getGroup(), "enabled"),
                                       ConfigKey(getGroup(), "input_configured"));
 
-    setMaster(false); // Use "talkover" button to enable microphones
+    setMainMix(false); // Use "talkover" button to enable microphones
 }
 
 EngineMicrophone::~EngineMicrophone() {
@@ -44,7 +44,7 @@ EngineChannel::ActiveState EngineMicrophone::updateActiveState() {
 }
 
 void EngineMicrophone::onInputConfigured(const AudioInput& input) {
-    if (input.getType() != AudioPath::MICROPHONE) {
+    if (input.getType() != AudioPathType::Microphone) {
         // This is an error!
         qWarning() << "EngineMicrophone connected to AudioInput for a non-Microphone type!";
         return;
@@ -54,7 +54,7 @@ void EngineMicrophone::onInputConfigured(const AudioInput& input) {
 }
 
 void EngineMicrophone::onInputUnconfigured(const AudioInput& input) {
-    if (input.getType() != AudioPath::MICROPHONE) {
+    if (input.getType() != AudioPathType::Microphone) {
         // This is an error!
         qWarning() << "EngineMicrophone connected to AudioInput for a non-Microphone type!";
         return;