Merge remote-tracking branch 'upstream/2.6'

Author: daschuer

source/chapters/preferences/sound_hardware.rst

@@ -188,42 +188,43 @@ Output and Input Devices
 ------------------------
 
 In the usual, basic 'Digital DJ' setup (:ref:`setup-controller-and-external-card`
-or :ref:`setup-laptop-and-external-card`) all that needs to be configured are
-the Master and Headphones outputs. Though, there are many more output and
-input channels available for more complex setups, for example with external
-mixers, vinyl control or for broadcasting.
+or :ref:`setup-laptop-and-external-card`), all that needs to be configured are
+the Main and Headphones outputs.
 
-All outputs are usually sent to a channel pair (stereo), though they can
-also be sent to one channel only (mono mixdown), for example if you're short
-on output channels, like when you need to use one stereo output for both master
-and headphones (see :ref:`setup-laptop-with-splitter`).
+Deck and Bus outputs are intended for use with external hardware mixers.
+They are taken *post-fader*, which means they include channel volume and
+crossfader adjustments and applied effects. When mixing manually, all
+Mixxx-internal mixer controls (Volume fader, EQs and crossfader) need to be
+reset so that the internal mixer doesn’t affect the sound.
+When using Auto DJ, the external mixer's crossfader needs to centered since Auto DJ
+will use the internal crossfader.
 
-Inputs can be mono or stereo (matching plugged sources, of course), except vinyl
-control inputs which require stereo to capture the entire control signal.
+All outputs are usually sent to a channel pair (stereo), though they can also
+be sent to a single channel (mono mixdown), for example if you need to use one
+stereo output for both Master and Headphones (see :ref:`setup-laptop-with-splitter`).
+
+Inputs can be mono or stereo, depending on the connected sources. Vinyl control
+inputs always require stereo to capture the full control signal.
 
 Outputs
 ^^^^^^^
 
-* **Master** (Main): The mix of all audible channels, e.g. main decks, all
+* **Main** (Master): The mix of all audible channels, e.g. main decks, all
   samplers, enabled microphones and auxiliary inputs.
 
-* **Headphones**: All channels for which :term:`pfl` is enabled, as well as the
-  preview deck.
+* **Headphones**: All channels for which :term:`pfl` is enabled, including
+  the preview deck.
 
 * **Booth**: Basically the same output as Main to be routed to a separate output,
   for example for the speakers in the DJ booth, external recording device,
   loopback device for video recordings etc.
 
-* **Left Bus**: All decks, samplers and auxiliaries that are assigned to the left
-  side of the :term:`crossfader`.
-
-* **Center Bus**: All decks, samplers and auxiliaries that are assigned to the
-  center of the :term:`crossfader`.
-
-* **Right Bus**: All decks, samplers and auxiliaries that are assigned to the right
-  side of the :term:`crossfader`.
+* **Left Bus / Center Bus / Right Bus**: All decks, samplers, and auxiliaries
+  routed to the respective side of the :term:`crossfader`. The buses are picked
+  post-fader and post-effects and can be used with an external two channel mixer.
 
-* **Deck 1-4**: Separate outputs for each of the main decks.
+* **Deck 1-4**: Separate outputs for each of the main decks. They are picked
+  post-fader and include effects and crossfader (for Auto DJ).
 
 Inputs
 ^^^^^^

source/chapters/vinyl_control.rst

@@ -11,17 +11,16 @@ Vinyl Control / DVS
    S.Brandt <s.brandt@mixxx.org>
    Jörg Wartenberg <joerg.wartenberg@mixxx.org>
 
-The Vinyl Control functionality allows users to tweak the playback speed of a track
-in Mixxx using a traditional turntable or a DJ player with a platter to spin.
-This allows DJs to retain the tactile feel of vinyl, while retaining the benefits of digital audio features.
+Digital Vinyl Control functionality allows users to control the playback speed of a track
+in Mixxx using traditional turntables or DJ controllers that play back recorded media.
+This allows DJs to retain the tactile feel of turntable DJing while leveraging the benefits of digital audio features.
 
 Such a :term:`Digital Vinyl System (DVS) <DVS>` can consist of:
 
  - **Traditional turntables** with control vinyls, where the time position is encoded in the groove
  - **CD-based DJ players** with timecode signal stored on CDs (e.g., *Pioneer DJ CDJ-1000*)
  - **USB-based DJ players** with timecode signal stored on USB sticks (e.g., *Pioneer DJ CDJ-3000*)
- - DJ players with internally generated timecode signal (e.g., *RANE TWELVE MKII* or *Phase*)
-
+ - DJ devices with internally-generated timecode signal (e.g., *RANE TWELVE MKII* or *Phase*)
 
 How does it work?
 =================
@@ -135,21 +134,21 @@ Supported Timecode media
 
 You can use any of the timecode media supported by Mixxx:
 
-+----------------------------------------+---------------------+
-| Type                                   | Responsiveness      |
-+========================================+=====================+
-| Serato CV02/2.5 Vinyl                  | Very high           |
-+----------------------------------------+---------------------+
-| Serato Control CD 1.0                  | Very high           |
-+----------------------------------------+---------------------+
-| Traktor Scratch MK1 Vinyl              | Very high           |
-+----------------------------------------+---------------------+
-| Traktor Scratch MK2 Vinyl              | Not supported       |
-+----------------------------------------+---------------------+
-| MixVibes DVS V2 Vinyl                  | Very high           |
-+----------------------------------------+---------------------+
-| Pioneer RekordBox DVS                  | Unknown             |
-+----------------------------------------+---------------------+
++----------------------------------------+------------------------------------------------+------------------------+----------------------------------------------------------------+
+| Type                                   | Responsiveness / Signal Quality                | Sizes                  | Media availability                                             |
++========================================+================================================+========================+================================================================+
+| Serato CV02/2.5 Vinyl                  | Very high / Strong Signal                      | 7", 10" and 12" vinyls | All Serato Control Vinyls produced since 2012 are of this type |
++----------------------------------------+------------------------------------------------+------------------------+----------------------------------------------------------------+
+| Serato Control CD 1.0                  | Very high                                      | CD, file to download   | Available                                                      |
++----------------------------------------+------------------------------------------------+------------------------+----------------------------------------------------------------+
+| Traktor Scratch MK1                    | Limitations at high spinning velocities        | 12" vinyls, CD         | Legacy, produced from 2006 to 2011                             |
++----------------------------------------+------------------------------------------------+------------------------+----------------------------------------------------------------+
+| Traktor Scratch MK2                    | **Not supported yet**  (planned for Mixxx 2.7) | 12" vinyls, CD         | Available since October 2011                                   |
++----------------------------------------+------------------------------------------------+------------------------+----------------------------------------------------------------+
+| MixVibes DVS V2 Vinyl                  | Very high                                      | 7" and 12" vinyls      | Legacy, no longer available                                    |
++----------------------------------------+------------------------------------------------+------------------------+----------------------------------------------------------------+
+| Pioneer RekordBox DVS                  | Unknown                                        | 12" vinyls             | Available                                                      |
++----------------------------------------+------------------------------------------------+------------------------+----------------------------------------------------------------+
 
 At the present time, Serato records are recommended if you are looking to buy
 vinyl. If you want to use CDs, you can download a free copy for personal use