update preferences/mixer, fix Quick Effect references in mixxxcontrols

Author: ronso0

source/_static/Mixxx-200-Preferences-Equalizer.png

@@ -3844,10 +3844,11 @@ Inverse       1              Linked in an inverse relation.
 EQs and Filters
 +++++++++++++++
 
-:term:`Equalizers <EQ>` and filters are special effects units.
+:term:`Equalizers <EQ>` and :ref:`Quick Effects <interface-eq-gain>` are special effects units.
 The EQs are controlled by :mixxx:cogroupref:`[EqualizerRack1_[ChannelI]_Effect1]` and the filter knob is controlled by :mixxx:coref:`[QuickEffectRack1_[ChannelI]],super1` and :mixxx:coref:`[QuickEffectRack1_[ChannelI]],enabled`.
-Users can choose between several options for the effects loaded in these racks in the Equalizers section of the Preferences window.
-
+Users can choose between several options for the effects loaded in these racks in the
+:ref:`Mixer section <preferences-mixer>` of the Preferences window. For Quick Effects, most official skins also
+provide a effect chain preset selector in the :ref:`mixer section <interface-eq-gain>`.
 
 Controls
 ++++++++
@@ -4533,7 +4534,7 @@ In the meantime, skins and controller mappings that still use them will keep wor
 
     .. versionadded:: 2.0.0
     .. deprecated:: 2.0.0
-       Use :mixxx:coref:`[QuickEffectRack1_[ChannelN]_Effect1],enabled <[QuickEffectRack1_[ChannelI]_Effect1],enabled>` instead.
+       Use :mixxx:coref:`[QuickEffectRack1_[ChannelN]],enabled <[QuickEffectRack1_[ChannelI]],enabled>` instead.
 
 
 .. mixxx:control:: [ChannelN],filterDepth

source/_static/Mixxx-240-Preferences-Mixer.png

@@ -14,4 +14,4 @@ Mixxx has many options to customize in :menuselection:`Options --> Preferences`.
    preferences/colors
    preferences/beat_detection
    preferences/key_detection
-   preferences/equalizers
+   preferences/mixer

source/chapters/appendix/mixxx_controls.rst

@@ -1,29 +1,31 @@
 .. include:: /shortcuts.rstext
 
-.. _preferences-equalizers:
+.. _preferences-mixer:
 
-Equalizers
-==========
+Mixer
+=====
 
 .. sectionauthor::
    Daniel Schürmann <daschuer@mixxx.org>
 
-.. figure:: ../../_static/Mixxx-200-Preferences-Equalizer.png
+.. figure:: ../../_static/Mixxx-240-Preferences-Mixer.png
     :align: center
     :width: 80%
     :figwidth: 100%
-    :alt: Equalizer Preferences
+    :alt: Mixer Preferences
     :figclass: pretty-figures
 
-    Equalizer Preferences
+    Mixer Preferences
 
-:menuselection:`Preferences --> Equalizer` allows you to setup the equalizers.
+:menuselection:`Preferences --> Mixer` allows you to adjust the crossfader curve,
+setup the equalizers and Quick Effects for each deck and select and adjust the
+equalizer effect for the main output.
 
-* **Equalizer Rack**: The Equalizer Rack is a special effect rack that is
-  connected to the deck's equalizer and filter controls.
+* **Crossfader Curve**: adjust how decks assigned to the left and right side of the
+  crossafder are blended.
 
-  In this section you can select the equalizers and quick effects that are used
-  with the decks.
+* **Deck Equalizers**: In this section you can select the equalizers and
+  quick effects that are used with the decks.
 
 * **Equalizer Plugin**: Here you can select the effect that is used as the
   mixing EQ in each deck. By default only built-in equalizers are
@@ -40,7 +42,7 @@ Equalizers
   range up to 246 Hz. The mid knob controls the mid range up to 2.5 kHz.
   The remaining treble range is controlled by the high knob.
 
-* **Master EQ**: This section allows you to setup an EQ that affects the
+* **Main EQ**: This section allows you to setup an EQ that affects the
   term:`main output`.
 
 

source/chapters/preferences.rst

@@ -835,8 +835,8 @@ Channel Faders and Level Meters
 
 .. _interface-eq-gain:
 
-Equalizers and Gain Knobs
--------------------------
+Equalizers, Gain Knobs and Quick Effects
+----------------------------------------
 
 .. figure:: ../_static/2.3/equalizers-and-gain-knob.png
    :align: center
@@ -885,14 +885,15 @@ Equalizers and Gain Knobs
   EQ settings in the preferences.
 
 **Quick Effect Super knob**
-  This knob lets you control the Meta knob of the deck's Quick Effect. 'Filter' is the default.
-  Right-click this knob to center it. This is equivalent to 'no audible effect' for the built-in
+  This knob lets you control the Meta knob of the deck's Quick Effect chain. 'Filter' is the default.
+  Right-click or double-click this knob to reset it to the default position defined by the loaded
+  chain preset. This is equivalent to 'no audible effect' for the built-in
   filter effects only (Filter, Moog Ladder 4 Filter).
   The button next to the knob toggles the effect. It provides the same latching capabilities
   like the EQ Kill switches.
 
 .. seealso:: You can customize the EQ settings in
-             :menuselection:`Preferences --> Equalizer`.
+             :menuselection:`Preferences --> Mixer`.
 
 .. _interface-pfl:
 

…urce/chapters/preferences/equalizers.rst source/chapters/preferences/mixer.rstsource/chapters/preferences/equalizers.rst renamed to source/chapters/preferences/mixer.rst source/chapters/preferences/equalizers.rst renamed to source/chapters/preferences/mixer.rst

@@ -265,7 +265,7 @@ No.   Control                                                  Function
 4     EQs (:hwlabel:`LOW` :hwlabel:`MID` :hwlabel:`HIGH`)      Boosts or cuts channel frequencies
 5     Channel level indicators                                 Displays channel levels (before being sent through channel faders)
 6     :hwlabel:`HEADPHONES` :hwlabel:`MIXING`                  Adjusts between headphone :hwlabel:`CUE` and :hwlabel:`MASTER` levels sent to headphones
-7     :hwlabel:`FILTER`                                        QuickEffect superknob (by default controls a Filter, but this can be changed in the :ref:`preferences <preferences-equalizers>`)
+7     :hwlabel:`FILTER`                                        QuickEffect superknob (by default controls a Filter, but this can be changed in the :ref:`preferences <preferences-mixer>`)
 8     :hwlabel:`HEADPHONES` :hwlabel:`LEVEL`                   Adjusts output level from :hwlabel:`PHONES` jack
 9     Headphone :hwlabel:`CUE` (Channel)                       Turn on to output channel to headphones
 9     :hwlabel:`SHIFT` + Headphone :hwlabel:`CUE`              Toggles quantize for the current channel

source/chapters/user_interface.rst

@@ -258,7 +258,7 @@ No.   Control                                                  Function
 5     :hwlabel:`MASTER`                                        Microphone level. Works for microphones connected on the controller and
                                                                through the controller's line out.
 6     Channel level indicators                                 Displays channel levels (before being sent through channel faders)
-7     :hwlabel:`CFX`                                           QuickEffect superknob (by default controls a Filter, but this can be changed in the :ref:`preferences <preferences-equalizers>`)
+7     :hwlabel:`CFX`                                           QuickEffect superknob (by default controls a Filter, but this can be changed in the :ref:`preferences <preferences-mixer>`)
 8     :hwlabel:`Smart CFX`                                     Not implemented
 9     Headphone :hwlabel:`CUE` (Channel)                       Turn on to output channel to headphones
 9     :hwlabel:`SHIFT` + Headphone :hwlabel:`CUE`              Toggles quantize for the current channel