Merge remote-tracking branch 'upstream/2.3' into 2.4

# Conflicts: # source/chapters/appendix/changelog.rst # source/hardware/controllers/allen_heath_xone_k2_k1.rst # source/hardware/controllers/denon_mc6000mk2.rst
mixxxdj · Oct 11, 2023 · 0ad0d2b · 0ad0d2b
2 parents b118a11 + 5d1179c
commit 0ad0d2b
Show file tree

Hide file tree

Showing 12 changed files with 31 additions and 24 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event_name == 'push' || github.event_name == 'repository_dispatch'
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         ref: main
         fetch-depth: 0
@@ -41,7 +41,7 @@ jobs:
     name: PDF
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Setup PDF Build Dependencies
       run: >
         sudo apt-get update && sudo apt-get install -y

diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
@@ -21,7 +21,7 @@ jobs:
     - name: Event Information
       run: echo "Event '${{ github.event.action }}' received from '${{ github.event.client_payload.repository }}'"
     - name: Check out repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         ref: ${{ github.event.client_payload.branch }}
     - name: Set up Python

diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
@@ -8,7 +8,7 @@ jobs:
   pre-commit:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: actions/setup-python@v4
     - uses: pre-commit/[email protected]
       env:

diff --git a/.github/workflows/sphinx.yml b/.github/workflows/sphinx.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Clone repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Set up Python
       uses: actions/setup-python@v4
       with:
@@ -27,7 +27,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Clone repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Set up Graphviz
       run: sudo apt update && sudo apt install -y graphviz
     - name: Set up Python

diff --git a/source/chapters/appendix/mixxx_controls.rst b/source/chapters/appendix/mixxx_controls.rst
@@ -2388,17 +2388,17 @@ Any control listed above for :mixxx:cogroupref:`[ChannelN]` will work for a samp
                    [PreviewDeckN],scratch2
                    [SamplerN],scratch2
 
-   Affects absolute play speed & direction whether currently playing or not when :mixxx:coref:`[ChannelN],scratch2_enabled` is active. (multiplicative). Use JavaScript ``engine.scratch`` functions to manipulate in controller mappings.
+   Affects absolute play speed & direction whether currently playing or not when :mixxx:coref:`[ChannelN],scratch2_enable` is active. (multiplicative). Use JavaScript ``engine.scratch`` functions to manipulate in controller mappings.
 
    :range: -3.0..3.0
    :feedback: Waveform
 
    .. versionadded:: 1.8.0
 
 
-.. mixxx:control:: [ChannelN],scratch2_enabled
-                   [PreviewDeckN],scratch2_enabled
-                   [SamplerN],scratch2_enabled
+.. mixxx:control:: [ChannelN],scratch2_enable
+                   [PreviewDeckN],scratch2_enable
+                   [SamplerN],scratch2_enable
 
    Takes over play speed & direction for :mixxx:coref:`[ChannelN],scratch2`.
 

diff --git a/source/chapters/library.rst b/source/chapters/library.rst
@@ -545,6 +545,8 @@ Manual Edit
 
      Mixxx library - Inline editing
 
+.. _library-properties-editor:
+
 **Properties editor**:
   To open the editor right-click on a **single track** in the library or any track
   label in decks or samplers, then select :guilabel:`Properties` in the track menu.

diff --git a/source/chapters/user_interface.rst b/source/chapters/user_interface.rst
@@ -115,6 +115,9 @@ Track Information Display
   The artist of the track is listed below. It is the same as listed under the
   :guilabel:`Artist` column heading in the :ref:`Mixxx library <library-tracks>`.
 
+.. hint:: Double-click any track text label to open the :ref:`Properties editor <library-properties-editor>`
+          where you can edit all track metadata.
+
 **Time Elapsed/Remaining/Both**
   By default it displays the total elapsed time in the track up to the
   millisecond. Clicking on the display switches to the *Time Remaining* view,

diff --git a/source/hardware/controllers/akai_lpd8.rst b/source/hardware/controllers/akai_lpd8.rst
@@ -1,7 +1,7 @@
 Akai LPD8
 =========
 
--  `Manufacturer’s product page <https://www.akaipro.com/lpd8-lpd8>`__
+-  `Manufacturer’s product page <https://www.akaipro.com/lpd8>`__
 -  `Forum thread <https://mixxx.discourse.group/t/akai-lpd8-mapping-4-decks-30-hotcues-loops-etc-v2/13064>`__
 
 .. versionadded:: 1.10.1

diff --git a/source/hardware/controllers/allen_heath_xone_k2_k1.rst b/source/hardware/controllers/allen_heath_xone_k2_k1.rst
@@ -80,16 +80,18 @@ These are available on any configuration with decks, but not the 4
 effect unit layout.
 
 -  Bottom left encoder:
--  adjust tempo of all decks with sync enabled
--  press and turn: PFL/main mix in headphones
--  shift: headphone gain
--  press with shift: toggle split cue mode
--  Bottom right encoder
--  scroll through tracks in library
--  press and release: load selected track into first stopped deck
--  press and hold: load selected track into a deck by pressing the play
-   button of the deck
--  shift: main gain
+
+   -  adjust tempo of all decks with sync enabled
+   -  press and turn: PFL/main mix in headphones
+   -  shift: headphone gain
+   -  press with shift: toggle split cue mode
+
+-  Bottom right encoder:
+
+   -  scroll through tracks in library
+   -  press and release: load selected track into first stopped deck
+   -  press and hold: load selected track into a deck by pressing the play button of the deck
+   -  shift: main gain
 
 Decks
 -----

diff --git a/source/hardware/controllers/denon_mc4000.rst b/source/hardware/controllers/denon_mc4000.rst
@@ -7,7 +7,7 @@ for rugged durability. In addition to precision touch-activated jog
 wheels, performers get access to dedicated hot cue and sample pads for
 on-the-fly remixes.
 
--  `Manufacturer’s product page <http://denondj.com/products/view/mc4000>`__
+-  `Manufacturer’s product page <https://www.denondj.com/mc4000-mc4000xus>`__
 -  `Manual / Midi commands <http://b06ba727c886717f9577-fff53f927840131da4fecbedd819996a.r74.cf2.rackcdn.com//1444/documents/MC4000%20-%20User%20Guide%20-%20v1.2_00.pdf>`__
 -  `Forum thread <https://mixxx.discourse.group/t/denon-mc4000-mapping/15311>`__
 

diff --git a/source/hardware/controllers/numark_party_mix.rst b/source/hardware/controllers/numark_party_mix.rst
@@ -1,7 +1,7 @@
 Numark Party Mix
 ================
 
-`Manufacturer's product page <https://www.numark.com/product/party-mix>`_ · `Manufacturer's user manual <https://www.numark.com/images/product_downloads/Party_Mix_-_User_Guide_-_v1.1.pdf>`_ · `Forum thread <https://mixxx.discourse.group/t/numark-party-mix-midi-mapping/16712>`_
+`Manufacturer's product page <https://www.numark.com/product/party-mix>`_ · `Manufacturer's user manual <http://www.numark.com/images/product_downloads/Party_Mix_-_User_Guide_-_v1.1.pdf>`_ · `Forum thread <https://mixxx.discourse.group/t/numark-party-mix-midi-mapping/16712>`_
 
 .. versionadded:: 2.3.4
 

diff --git a/source/hardware/controllers/pioneer_ddj_200.rst b/source/hardware/controllers/pioneer_ddj_200.rst
@@ -19,7 +19,7 @@ Pioneer DDJ-200
 The Pioneer DDJ-200 is a 2 deck USB and Bluetooth DJ controller designed for WeDJ, djay, edjing Mix and Rekordbox.
 
 -  `Manufacturer's Product Page <https://www.pioneerdj.com/en-gb/product/controller/ddj-200/black/overview/>`__
--  `Manufacturer's User Manual <http://docs.pioneerdj.com/Manuals/DDJ_200_DRI1596B_manual/>`__
+-  `Manufacturer's User Manual <https://docs.pioneerdj.com/Manuals/DDJ_200_DRI1596C_manual/>`__
 -  `Manufacturer's Firmware Update <https://www.pioneerdj.com/en/support/software/controller/ddj-200/>`__
 -  `Mixxx User Forum <https://mixxx.discourse.group/t/pioneer-ddj-200-mapping/18259>`__