Merge pull request #589 from daschuer/sync_leader

Describe Sync Lock with Dynamic Tempo

source/chapters/djing_with_mixxx.rst

@@ -159,6 +159,62 @@ properly.
           sync, turn on the :guilabel:`QUANTIZE` button.  When activated,
           Quantize will ensure that the beats are perfectly lined up as well.
 
+Sync Lock with Dynamic Tempo
+============================
+
+If you're working with dynamic tempo tracks that have a variable BPM beat grid, you have
+precise control over the sync lock behavior via the following Sync Leader
+buttons (available in the LateNight Skin only).
+
+.. |nbsp| unicode:: 0xA0
+   :trim:
+
+|follower| Follower |nbsp| |nbsp| |nbsp| |nbsp| |nbsp| |softleader| Soft Leader |nbsp| |nbsp| |nbsp| |nbsp| |nbsp| |explicitleader| Explicit Leader
+
+.. |follower| image:: ../_static/2.4/follower.png
+   :width: 124px
+   :alt: Sync Leader button as follower
+
+.. |softleader| image:: ../_static/2.4/soft-leader.png
+   :width: 124px
+   :alt: Sync Leader button as soft leader
+
+.. |explicitleader| image:: ../_static/2.4/explicit-leader.png
+   :width: 124px
+   :alt: Sync Leader button as explicit leader
+
+You can create a variable BPM beat grids for single tracks by using the :guilabel:`Analyze`
+library context menu and :guilabel:`Reanalyze (variable BPM)` command. Alternatively you may
+create variable BPM beat grids for all tracks to be (re)analyzed later on by unchecking :guilabel:`Assume constant tempo`
+in the :guilabel:`Beat Detection` preferences.
+
+When such a track is playing in a Leader deck, the follower decks closely follow the tempo.
+It's important to note that the track follows the "detected" leader tempo unconditionally,
+even if there are sections with unstable tempos during bridges or in the outro regions where
+the actual played tempo wasn't detected correctly.
+
+If a soft leader deck stops or is silenced, Mixxx automatically selects the next best
+deck as Leader. By clicking the Leader button, you can toggle between Explicit Leader
+and Soft Leader mode. An Explicit leader is sticky, does not automatically move.
+
+By default the "Sync Lock with Dynamic Tempo" feature is enabled and Mixxx picks the
+first Sync Lock enabled track as Soft Leader, using the tempo from its outro during
+the following transition. If you'd like to use the the tempo from the intro of the next
+track instead, click the Leader (Crown) button of its deck.
+The deck then becomes the explicit leader. Click again on the Leader button and the
+deck becomes Soft-follower and Mixxx is again in charge to move the leader to
+the best deck.
+
+If you'd prefer a steady tempo during transitions like in Mixxx before Version 2.4,
+you may select :guilabel:`Use steady Tempo` for :guilabel:`Sync mode` in the
+:guilabel:`Decks` preferences. In this mode all decks become a follower during a
+transition and you may pick a dynamic track as a leader by clicking the
+Leader (Crown) button if desired.
+
+A leader plays always the original recorded tempo changes. A follower changes its
+tempo matching the leader which may result in a notable pitch change.
+Engaging keylock helps mitigate this pitch issue.
+
 .. _harmonic-mixing:
 
 Harmonic Mixing

source/chapters/user_interface.rst

@@ -565,11 +565,12 @@ Sync and Rate Controls
 .. sectionauthor::
    RJ Ryan <[email protected]>
    S.Brandt <[email protected]>
+   Daniel Schürmann <[email protected]>
 
-.. figure:: ../_static/2.3/sync-and-rate.png
+.. figure:: ../_static/2.4/sync-and-rate.png
    :align: right
-   :width: 76px
-   :figwidth: 100px
+   :width: 81px
+   :figwidth: 120px
    :alt: The rate control section of the deck
    :figclass: pretty-figures
 
@@ -590,6 +591,7 @@ control rate changes also from your computer's keyboard, see the chapter
   sync to samplers and samplers can only sync to decks. The sync target for
   samplers is:
 
+  * The sync leader, identified by the lit sync-lock button and the crown symbol.
   * The first deck (in numerical order) that is playing a track with a detected
     beatgrid, and has a rate different than zero.
   * The first deck (in numerical order) that has a track loaded with a detected

source/hardware/controllers/electrix_tweaker.rst

@@ -8,9 +8,9 @@ push encoders with LED rings into a relatively small package. It does
 not have a built in sound card, so it requires a separate sound card or
 splitter cable (although it does include 5-pin MIDI in and out ports).
 
--  `Manufacturer’s website <http://electrixpro.com/>`__
+-  `Manufacturer’s website <https://electrixpro.com/>`__
 -  `Forum topic <https://mixxx.discourse.group/t/electrix-tweaker-mapping/15071>`__
--  `Manufacturer’s manual <http://electrixpro.com/wp-content/uploads/2014/10/Tweaker_User_Manual.pdf>`__
+-  `Manufacturer’s manual <https://electrixpro.com/wp-content/uploads/2014/10/Tweaker_User_Manual.pdf>`__
 
 .. versionadded:: 2.0