Skip to content

Commit

Permalink
appendix/mixxx_controls: Rename mic/aux master CO to main_mix
Browse files Browse the repository at this point in the history
The CO was renamed in mixxxdj/mixxx#11942.
  • Loading branch information
Holzhaus committed Sep 8, 2023
1 parent 92d97a9 commit 27d9621
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions source/chapters/appendix/mixxx_controls.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3070,8 +3070,8 @@ Then you can use your :term:`MIDI` controller to control its volume and some oth
:feedback: Configured channel in the sound preferences.


.. mixxx:control:: [MicrophoneN],master
[AuxiliaryN],master
.. mixxx:control:: [MicrophoneN],main_mix
[AuxiliaryN],main_mix
Hold value at 1 to mix channel input into the main output.
For :mixxx:cogroupref:`[MicrophoneN]` use :mixxx:coref:`[MicrophoneN],talkover` instead.
Expand All @@ -3081,6 +3081,11 @@ Then you can use your :term:`MIDI` controller to control its volume and some oth
:feedback: Auxiliary: Play button
Microphone: N/A

.. mixxx:control:: [MicrophoneN],master
[AuxiliaryN],master
.. deprecated:: 2.4.0
Use :mixxx:coref:`[MicrophoneN],main_mix` instead.

.. mixxx:control:: [AuxiliaryN],orientation
Expand Down Expand Up @@ -3157,7 +3162,7 @@ Then you can use your :term:`MIDI` controller to control its volume and some oth
[AuxiliaryN],talkover
Hold value at 1 to mix channel input into the main output.
For :mixxx:cogroupref:`[AuxiliaryN]` use :mixxx:coref:`[AuxiliaryN],master` instead.
For :mixxx:cogroupref:`[AuxiliaryN]` use :mixxx:coref:`[AuxiliaryN],main_mix` instead.
Note that :mixxx:cogroupref:`[AuxiliaryN]` also take :mixxx:coref:`[AuxiliaryN],orientation` into account.

:range: binary
Expand Down

0 comments on commit 27d9621

Please sign in to comment.