Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update preferences/mixer, fix Quick Effect references in mixxxcontrols #646

Open
wants to merge 1 commit into
base: 2.4
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file not shown.
Binary file added source/_static/Mixxx-240-Preferences-Mixer.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 8 additions & 4 deletions source/chapters/appendix/mixxx_controls.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3676,9 +3676,13 @@ Inverse 1 Linked in an inverse relation.
EQs and Filters
+++++++++++++++

:term:`Equalizers <EQ>` and filters 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]_Effect1],enabled`.
Users can choose between several options for the effects loaded in these racks in the Equalizers section of the Preferences window.
:term:`Equalizers <EQ>` and Quick Effects are special effects units.
The EQs are controlled by :mixxx:cogroupref:`[EqualizerRack1_[ChannelI]_Effect1]`.
The Quick Effect 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
: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
Expand Down Expand Up @@ -4365,7 +4369,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
Expand Down
2 changes: 1 addition & 1 deletion source/chapters/preferences.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
@@ -1,29 +1,31 @@
.. include:: /shortcuts.rstext

.. _preferences-equalizers:
.. _preferences-mixer:

Equalizers
==========
Mixer
=====

.. sectionauthor::
Daniel Schürmann <[email protected]>

.. 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
Expand All @@ -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`.


Expand Down
11 changes: 6 additions & 5 deletions source/chapters/user_interface.rst
Original file line number Diff line number Diff line change
Expand Up @@ -834,8 +834,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
Expand Down Expand Up @@ -884,14 +884,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:

Expand Down
2 changes: 1 addition & 1 deletion source/hardware/controllers/pioneer_ddj_400.rst
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,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
Expand Down
2 changes: 1 addition & 1 deletion source/hardware/controllers/pioneer_ddj_flx4.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading