Merge remote-tracking branch 'upstream/2.5' into main

.tx/config

@@ -1,4 +1,4 @@
-[main]
+[2.5]
 host = https://www.transifex.com
 
 [o:mixxx-dj-software:p:mixxx-dj-manual-26:r:404]

netlify.toml

@@ -26,7 +26,8 @@
     # also specified inline, and unsafe inline JS script blocks are allowed
     # because it's needed for RTD theme navigation and the search function:
     # https://github.com/readthedocs/sphinx_rtd_theme/issues/817
-    Content-Security-Policy = "default-src 'self'; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline'"
+    # We also allow loading MathJax, which is needed to render math formulas.
+    Content-Security-Policy = "default-src 'self'; style-src 'self' 'unsafe-inline'; script-src 'self' https://cdn.jsdelivr.net/npm/mathjax@3/ 'unsafe-inline'; font-src 'self' https://cdn.jsdelivr.net/npm/mathjax@3/"
 
     # Disable all browser features that we don't need. Unfortunately
     # there is no way to specify a default for all directives yet, so

source/chapters/appendix/commandline_dev_tools.rst

@@ -46,7 +46,7 @@ types, go to :ref:`file-format-compatibility`.
 --settings-path PATH            Top-level directory where Mixxx will look for
                                 user settings files such as the library database
                                 and preferences configuration file.
---disable-vumetergl             Do not use OpenGL vu meter
+--enable-legacy-vumeter         Do not use OpenGL vu meter
 --controller-debug              Log all controller data Mixxx sends and receives
                                 as well as scripts it loads.
 --controller-abort-on-warning   The controller mapping will issue more

source/chapters/appendix/mixxx_controls.rst

@@ -832,6 +832,45 @@ Any control listed above for :mixxx:cogroupref:`[ChannelN]` will work for a samp
    .. versionadded:: 2.0.0
 
 
+.. mixxx:control:: [ChannelN],shift_cues_earlier
+                   [PreviewDeckN],shift_cues_earlier
+                   [SamplerN],shift_cues_earlier
+
+   :range: binary
+   :feedback: All :term:`cue markers <cue marker>` move left by 10ms.
+
+   .. versionadded:: 2.3.0
+
+
+.. mixxx:control:: [ChannelN],shift_cues_later
+                   [PreviewDeckN],shift_cues_later
+                   [SamplerN],shift_cues_later
+
+   :range: binary
+   :feedback: All :term:`cue markers <cue marker>` move right by 10ms.
+
+   .. versionadded:: 2.3.0
+
+
+.. mixxx:control:: [ChannelN],shift_cues_earlier_small
+                   [PreviewDeckN],shift_cues_earlier_small
+                   [SamplerN],shift_cues_earlier_small
+
+   :range: binary
+   :feedback: All :term:`cue markers <cue marker>` move left by 1ms.
+
+   .. versionadded:: 2.3.0
+
+
+.. mixxx:control:: [ChannelN],shift_cues_later_small
+                   [PreviewDeckN],shift_cues_later_small
+                   [SamplerN],shift_cues_later_small
+
+   :range: binary
+   :feedback: All :term:`cue markers <cue marker>` move right by 1ms.
+
+   .. versionadded:: 2.3.0
+
 .. mixxx:control:: [ChannelN],beats_undo_adjustment
                    [PreviewDeckN],beats_undo_adjustment
                    [SamplerN],beats_undo_adjustment
@@ -2439,6 +2478,19 @@ Any control listed above for :mixxx:cogroupref:`[ChannelN]` will work for a samp
    .. versionadded:: 1.8.0
 
 
+.. mixxx:control:: [ChannelN],show_track_menu
+
+   Toggle the track context menu for the track currently loaded in this deck.
+   The control value is `1` if there is already a menu shown for this deck.
+   The menu can be navigated with the :mixxx:coref:`MoveUp/Down <[Library],MoveUp>` controls
+   and selected actions or submenus can be activated with :mixxx:coref:`GoToItem <[Library],GoToItem>`.
+
+   :range: Binary
+   :feedback: The deck's track context menu is shown or hidden.
+
+   .. versionadded:: 2.5.0
+
+
 .. mixxx:control:: [ChannelN],slip_enabled
                    [PreviewDeckN],slip_enabled
                    [SamplerN],slip_enabled
@@ -2914,10 +2966,13 @@ Then you can use your :term:`MIDI` controller to control its volume and some oth
 
 .. note:: Although the first auxiliary group is named :mixxx:cogroupref:`[Auxiliary1]`, the group for the first microphone is just called :mixxx:cogroupref:`[Microphone] <[MicrophoneN]>`, not :mixxx:cogroupref:`[Microphone1] <[MicrophoneN]>`.
 
-.. mixxx:control:: [MicrophoneN],input_configured
+.. mixxx:control:: [ChannelN],input_configured
+                   [MicrophoneN],input_configured
                    [AuxiliaryN],input_configured
 
    1 if there is input is configured for this channel, 0 if not.
+   In the case of :mixxx:cogroupref:`[ChannelN]` it corresponds to
+   Vinyl Control. A configured input is required to enable :mixxx:coref:`[ChannelN],passthrough`
 
    :range: binary, read-only
    :feedback: Configured channel in the sound preferences.
@@ -3393,7 +3448,8 @@ Note that :mixxx:coref:`[Library],MoveUp` and other Move and Scroll controls emu
    The control value is `1` if there is already a menu shown for the current view.
    Note that the control is not aware of other track menus, for example those opened
    by right-clicking track text labels in decks. Only the most recent menu can be
-   navigated with the :mixxx:coref:`MoveUp/Down <[Library],MoveUp>` controls.
+   navigated with the :mixxx:coref:`MoveUp/Down <[Library],MoveUp>` controls and
+   selected actions or submenus can be activated with :mixxx:coref:`GoToItem <[Library],GoToItem>`.
 
    :range: Binary
    :feedback: Tracks table context menu is shown or hidden.
@@ -4574,7 +4630,8 @@ In the meantime, skins and controller mappings that still use them will keep wor
     :range: binary
     :feedback: Waveform view
 
-    Loads the currently highlighted song into the first stopped deck
+    Performs the same action action like :mixxx:coref:`[Library],GoToItem` does when the tracks table has focus,
+    just regardless of the focus.
 
     .. deprecated:: 2.1.0
        Use :mixxx:coref:`[Library],GoToItem` instead.

source/chapters/djing_with_mixxx.rst

@@ -392,7 +392,7 @@ Auto DJ
 .. sectionauthor::
    S.Brandt <[email protected]>
 
-.. figure:: ../_static/Mixxx-111-Library-Auto-DJ.png
+.. figure:: ../_static/Mixxx-241-Library-Auto-DJ.png
    :align: center
    :width: 100%
    :figwidth: 100%
@@ -401,19 +401,31 @@ Auto DJ
 
    Mixxx library - Auto DJ view
 
-Auto DJ allows you to automatically load tracks from the Auto DJ playlist when
-the current track is nearly finished, and crossfade into it.  See
-:ref:`library-auto-dj`.
+Auto DJ automatically loads tracks in the decks and mixes them.
+Tracks can be manually added to the Auto DJ playlist, or automatically from assigned source crates or from the entire library.
 
 Auto DJ does not take into account the volume of each track, nor the frequency content, nor the rhythms, so it's not intended to be a replacement for a human DJ. However, it is good enough to give a human DJ a break without a major disruption to the mix.
 
+For mixing, Auto DJ takes control of the :ref:`crossfader <interface-crossfader>`.
+Auto DJ requires at least one deck to be assigned to the left and right side of the crossfader. This can be done with the deck orientation switches next to the crossfader. If a deck's orientation is centered, the crossfader can't affect it. Note that in the official Tango skin, these switches are in the decks' transport controls row, and in Shade skin they don't exist because decks are statically assigned to the left and right side (bus).
+
+When Auto DJ is toggled on, it will use the first two opposing decks it finds. With default settings these would be decks 1 and 2, but depending on how the orientation switches are set, this could be any configuration, for example deck 4 on the left and deck 1 on the right. If no opposing decks are found Auto DJ won't start.
+
+.. note:: Note that Auto DJ is currently not aware which decks are currently visible,
+          i.e. it might pick currently hidden decks 3 and/or 4. Refer to the
+          :ref:`skin settings <interface-skin-settings>` for how to toggle 4 decks.
+
+When you toggle Auto DJ off, the crossfader will stay on its last position.
+
+Each official Mixxx skin has an Auto DJ indicator icon, located either in the top toolbar or in the mixer. In some skins the crossfader is highlighted, too.
+
 Loading tracks into Auto DJ
 ---------------------------
 
 To play tracks automatically, they must first be loaded into the Auto DJ
 playlist. The Auto DJ playlist is empty by default.
 
-.. figure:: ../_static/Mixxx-200-Library-Add-to-Auto-DJ.png
+.. figure:: ../_static/Mixxx-241-Library-Add-to-Auto-DJ.png
    :align: center
    :width: 50%
    :figwidth: 100%

source/chapters/library.rst

@@ -375,8 +375,7 @@ a crate, or even the whole library) for tracks that match your search query.
 * Type your search term(s). Mixxx filters the tracks as you type and shows only
   those matching the search term(s). Search terms can include an artist's name,
   a song title, BPM, etc.
-* To clear the search string hit :kbd:`ESC` or click the clear button right next
-  to the input field.
+* To clear the search string click the clear button right next to the input field.
 * Hit :kbd:`TAB` to cycle between the search and the list of results in the
   library. Use the :kbd:`↑` and :kbd:`↓` keys to scroll in the
   list of results.
@@ -426,25 +425,35 @@ Mixxx supports the following filters:
       title:= "Track 1"
       artist:="DJ Flop"
 
-* **Numeric filtering**: bitrate, bpm, played, rating, track, year
+* **Numeric filtering**: bpm, bitrate, played, rating, track, year
 
   Examples
     ::
 
-      bpm:140
-      bpm: >140
       year: <2010
-      bpm: >=140
+      rating:<4
       rating: <=4
-      bpm: 140-150
+      rating:3-5
       played: >10
 
   .. note::
      You can put a space after the colon but currently there must be no space
      between the operator and the number.
 
+  * By default, `bpm:` finds tracks with the exact BPM but also half and double
+    values. If the half or double values are not integers, ranges are used. The
+    following example lists tracks with 125.2, [250-251] or [52-53] BPM
 
-* **Special filtering**: key, duration, added, dateadded, datetime_added, date_added
+    ::
+
+      bpm:125.2
+
+  * Use `bpm:=` to find exact matches only, i.e. exclude half/double values.
+
+  * `bpm` also supports fuzzy searches, see Special Filtering below.
+
+
+* **Special filtering**: bpm, key, duration, added, dateadded, datetime_added, date_added
 
   * Supports fuzzy matching of key searches. The following example lists tracks
     with harmonically compatible keys to C# minor.
@@ -453,6 +462,16 @@ Mixxx supports the following filters:
 
        ~key:c#m
 
+  * Fuzzy BPM searches find tracks in the range of +/- N % of the current pitch
+    slider range. N can be set in :menuselection:`Preferences --> Library --> Track Search`.
+    With the default pitch slider range of 8% and the default BPM search range
+    of 75%, the following example lists tracks with BPM between 94 and 106.
+
+    ::
+
+       ~bpm:100
+
+
     The following example lists all tracks by “Danger” over 3 minutes long that
     are rated 4 or 5.
 
@@ -547,9 +566,6 @@ library columns. You are free to edit most metadata, and Mixxx offers a number
 of different ways to do so. Note that some information can not be edited, such
 as bitrate, size, length, type, filename, and location.
 
-.. note:: Mixxx does not support editing the metadata of many tracks at a time
-          (bulk editing).
-
 .. warning:: Mixxx won't touch your audio files by default. Changes to a track's
              metadata will be saved to the Mixxx library, but **not** to the
              track itself.
@@ -563,7 +579,7 @@ Manual Edit
 
 **Track Inline editing**:
   To enable inline editing in the :ref:`library <library-tracks>` go to
-  :menuselection:`Preferences --> Library --> Miscellaneous` and check the box
+  :menuselection:`Preferences --> Library --> Track Table View` and check the box
   "Edit metadata after clicking selected track".
 
   Select any track in the :ref:`library <library-tracks>` and click on the
@@ -582,7 +598,7 @@ Manual Edit
 .. _library-properties-editor:
 
 **Properties editor**:
-  To open the editor right-click on a **single track** in the library or any track
+  To open the editor right-click on selected tracks in the library or any track
   label in decks or samplers, then select :guilabel:`Properties` in the track menu.
   You can also double-click any track label in the decks or samplers to open the
   editor directly.
@@ -682,24 +698,26 @@ mixing or for using Mixxx as media player.
 
 The Auto DJ features in detail:
 
-* **Shuffle button**: Randomizes the order of tracks in the Auto DJ playlist.
-* **Add Random button**: Adds a random track from track sources (crates) to the
+* **Enable** toggle: Toggles the Auto DJ mode on or off.
+* **Fade now** button: Triggers the transition to the next track.
+* **Skip track** button: Skips the next track in the Auto DJ playlist.
+* **Transition mode** selector: Choose a transition mode.
+* **Transition time** spin-box: Determines the duration of the transition. A
+  negative value will add a pause between tracks.
+* **Shuffle** button: Randomizes the order of tracks in the Auto DJ playlist.
+* **Add Random track** button: Adds a random track from track sources (crates) to the
   Auto DJ queue. If no track sources are configured, the track is added from the
   library instead.
-* **Skip track button**: Skips the next track in the Auto DJ playlist.
-* **Fade now button**: Triggers the transition to the next track.
-* **Transition time spin-box**: Determines the duration of the transition. A
-  negative value will add a pause between tracks.
-* **Selection Info label**: Displays the duration and number of selected tracks.
+* **Repeat the playlist** toggle: Re-queue played tracks.
+* **Selection Info** label: Displays the duration and number of selected tracks.
   Press :kbd:`Ctrl` + :kbd:`A` to get the total duration of the AutoDJ queue.
-* **Enable Auto DJ button**: Toggles the Auto DJ mode on or off.
 
 The :guilabel:`Skip track`, :guilabel:`Add Random` and :guilabel:`Fade now`
 buttons are only accessible if the Auto DJ mode is enabled. The Search field in
-the upper left corner is disabled in Auto DJ. By default, Auto DJ removes tracks
-after playing them but if you want it to play the same tracks over and over
-again, you can activate the :guilabel:`Auto DJ Requeue` option in
-:menuselection:`Preferences --> Auto DJ --> Re-queue tracks after playback`.
+the upper left corner is disabled in Auto DJ.
+
+By default, Auto DJ removes tracks after playing them but if you want it to play the same
+tracks over and over again, you can activate the :guilabel:`Repeat the playlist` toggle.
 
 .. _library-auto-dj-crates:
 

source/chapters/livebroadcasting.rst

@@ -50,7 +50,7 @@ Streaming Servers
   server for stability and reliability reasons. Keep in mind that if want to
   stream audio to a significant number of listeners, you'll need enough
   bandwidth. Read the
-  `Shoutcast documentation <http://wiki.winamp.com/wiki/SHOUTcast_Getting_Started_Guide>`_
+  `Shoutcast documentation <https://web.archive.org/web/20240118132730/http://wiki.winamp.com/wiki/SHOUTcast_Getting_Started_Guide>`_
   or
   `Icecast documentation <http://www.icecast.org/docs/>`_ for server setup
   instructions.

source/conf.py

@@ -444,6 +444,8 @@
     # Ignore Twitter links because for some reason valid links sometimes fail
     # with "400 Bad Request"
     r"^https://twitter.com/\w+$",
+    # Ignore NI links entirely because they trip 403 in general.
+    r"^https://(?:www.)?native-instruments.com",
     # Ignore support links because we get 403 Client Errors (bad User Agent?)
     r"^https://support.native-instruments.com/",
     r"^https://support.serato.com/",
@@ -456,6 +458,9 @@
     "https://support.pioneerdj.com/hc/sections/*",
     "https://www.roland.com/global/products/dj-505/*",
     "https://web.archive.org/web/*",
+    "https://www.allen-heath.com/ahproducts/*",
+    "https://www.allen-heath.com/content/uploads/*",
+    "https://www.allen-heath.com/support/",
 ]
 
 # Avoid freezing during linkcheck

source/glossary.rst

@@ -386,6 +386,10 @@ Glossary of Terms
      track. DJs usually place hotcues at distinctive positions within a track
      such as drops, breaks or kicks and snares. Mixxx supports up to 36 hotcues.
 
+   cue marker
+     A catch-all term used in mixxx to refer to the :term:`cue point`,
+     :term:`hotcues <hotcue>` and :ref:`intro and outro cues<djing-intro-outro-cues>`.
+
    bar
      In musical notation, a bar (or measure) is a segment of time defined by a
      given number of beats. Typically, a piece consists of several bars of the

source/hardware/controllers/allen_heath_xone_k2_k1.rst

@@ -10,10 +10,10 @@ Xone K1 is the same as the Xone K2 but without the built in audio
 interface and does not come with the EVA travel case that the K2 comes
 with.
 
--  `Manufacturer’s product page <http://www.allen-heath.com/ahproducts/xonek2/>`__
+-  `Manufacturer’s product page <https://www.allen-heath.com/ahproducts/xonek2/>`__
 -  `Forum thread <https://mixxx.discourse.group/t/allen-heath-xone-k2/12506>`__
 -  `Manufacturer’s User Guide <https://www.allen-heath.com/content/uploads/2023/06/XoneK2_UG_AP8509_3.pdf>`__
--  `Blank template diagrams <http://www.allen-heath.com/media/Xone+K2+Blank+Overlays.zip>`__
+-  `Blank template diagrams <https://www.allen-heath.com/content/uploads/2023/06/XoneK2BlankOverlays.zip>`__
 
 .. versionadded:: 1.11