Merge branch '2.3' into controls-fx-parameter-buttons

.github/labeler.yml

@@ -0,0 +1,29 @@
+build:
+- default.nix
+- CMakeLists.txt
+- build/**
+- cmake/**
+
+code quality:
+- src/test/**
+- .clang-format
+- .codespell
+- .eslint*
+- .flake8
+- .pre-commit-config.yaml
+- pyproject.toml
+
+controllers:
+- res/controllers/**
+
+library:
+- src/library/**
+
+skins:
+- res/skins/**
+
+ui:
+- src/**.ui
+- src/dialog/**
+- src/preferences/**
+- src/widget/**

.github/workflows/labeler.yml

@@ -0,0 +1,19 @@
+# This workflow will triage pull requests and apply a label based on the
+# paths that are modified in the pull request.
+#
+# To use this workflow, you will need to set up a .github/labeler.yml
+# file with configuration.  For more information, see:
+# https://github.com/actions/labeler
+
+name: "Pull Request Labeler"
+on:
+- pull_request_target
+
+jobs:
+  triage:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/labeler@main
+      with:
+        repo-token: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/pre-commit.yml

@@ -0,0 +1,40 @@
+name: pre-commit
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  pre-commit:
+    name: Detecting code style issues
+    runs-on: ubuntu-latest
+    if: github.event_name == 'push'
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-python@v2
+    - name: Install clang-format
+      run: sudo apt-get update && sudo apt-get install -y --no-install-recommends clang-format-10
+    - uses: pre-commit/action@v2.0.0
+      # There are too many files in the repo that have formatting issues. We'll
+      # disable these checks for now when pushing directly (but still run these
+      # on Pull Requests!).
+      env:
+        SKIP: end-of-file-fixer,trailing-whitespace,clang-format,eslint,no-commit-to-branch
+  pre-commit-pr:
+    name: Detecting code style issues
+    runs-on: ubuntu-latest
+    if: github.event_name == 'pull_request'
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        fetch-depth: 2
+    - uses: actions/setup-python@v2
+    - name: Install clang-format
+      run: sudo apt-get update && sudo apt-get install -y --no-install-recommends clang-format-10
+    - uses: pre-commit/action@v2.0.0
+      env:
+        SKIP: no-commit-to-branch
+      with:
+        # HEAD is the not yet integrated PR merge commit +refs/pull/xxxx/merge
+        # HEAD^1 is the PR target branch and HEAD^2 is the HEAD of the source branch
+        extra_args: --from-ref HEAD^1 --to-ref HEAD

.github/workflows/stale.yml

@@ -0,0 +1,18 @@
+name: "Detect stale issues"
+on:
+  schedule:
+  - cron: "0 0 * * *"
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/stale@v3
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        stale-issue-message: "This issue is marked as stale because it has been open 90 days with no activity."
+        stale-issue-label: "stale"
+        stale-pr-message: "This PR is marked as stale because it has been open 90 days with no activity."
+        stale-pr-label: "stale"
+        days-before-stale: 90
+        days-before-close: -1

.pre-commit-config.yaml

@@ -45,7 +45,7 @@ default_language_version:
   python: python3
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v3.1.0
+  rev: v3.2.0
   hooks:
   - id: check-byte-order-marker
     exclude: ^.*(\.cbproj|\.groupproj|\.props|\.sln|\.vcxproj|\.vcxproj.filters)$
@@ -73,7 +73,7 @@ repos:
     entry: tools/codespell.py --ignore-file .codespellignore --ignore-regex "\\W(?:m_p*(?=[A-Z])|m_(?=\\w)|pp*(?=[A-Z])|k(?=[A-Z])|s_(?=\\w))" --files
     exclude: ^(\.codespellignore|src/dialog/dlgabout\.cpp|.*\.(?:pot?|ts|wxl))$
 - repo: https://github.com/pre-commit/mirrors-eslint
-  rev: v7.2.0
+  rev: v7.11.0
   hooks:
   - id: eslint
     args: [--fix, --report-unused-disable-directives]
@@ -92,15 +92,13 @@ repos:
     - manual
     language: python
     files: \.(c|cc|cxx|cpp|frag|glsl|h|hpp|hxx|ih|ispc|ipp|java|m|mm|proto|vert)$
-    additional_dependencies:
-    - clang-format
 - repo: https://github.com/psf/black
   rev: stable
   hooks:
   - id: black
     files: ^tools/.*$
 - repo: https://gitlab.com/pycqa/flake8
-  rev: '3.8.3'
+  rev: '3.8.4'
   hooks:
   - id: flake8
     files: ^tools/.*$

.travis.yml

@@ -25,38 +25,6 @@ env:
 
 jobs:
   include:
-    - name: pre-commit
-      if: type != pull_request
-      language: python
-      python: 3.7
-      # There are too many files in the repo that have formatting issues. We'll
-      # disable these checks for now when pushing directly (but still run these
-      # on Pull Requests!).
-      env: SKIP=end-of-file-fixer,trailing-whitespace,clang-format,eslint
-      cache:
-        directories:
-          - $HOME/.cache/pre-commit
-      before_install:
-        - pip install pre-commit==2.5.1
-      script:
-        - pre-commit run --all-files
-      addons: []
-
-    - name: pre-commit-pr
-      if: type == pull_request
-      language: python
-      python: 3.7
-      cache:
-        directories:
-          - $HOME/.cache/pre-commit
-      before_install:
-        - pip install pre-commit==2.5.1
-      script:
-        # HEAD is the not yet integrated PR merge commit +refs/pull/xxxx/merge
-        # HEAD^1 is the PR target branch and HEAD^2 is the HEAD of the source branch
-        - pre-commit run --from-ref HEAD^1 --to-ref HEAD --show-diff-on-failure
-      addons: []
-
     - name: Ubuntu/gcc/SCons build
       compiler: gcc
       # Ubuntu Bionic build prerequisites

CHANGELOG.md

@@ -77,6 +77,8 @@
 * Add controller mapping for Hercules DJControl Jogvision [#2370](https://github.com/mixxxdj/mixxx/pull/2370)
 * Fix missing manual in deb package [lp:1889776] (https://bugs.launchpad.net/mixxx/+bug/1889776)
 * Fix caching of duplicate tracks that reference the same file #3027
+* Fix loss of precision when dealing with floating-point sample positions while setting loop out position and seeking using vinyl control #3126 #3127
+* Prevent moving a loop beyond track end #3117 https://bugs.launchpad.net/mixxx/+bug/1799574
 
 ## [2.2.4](https://launchpad.net/mixxx/+milestone/2.2.4) (2020-06-27)
 

CMakeLists.txt

@@ -942,7 +942,7 @@ if(MSVC)
     target_compile_options(mixxx-lib PUBLIC /W3)
   endif()
 else()
-  target_compile_options(mixxx-lib PUBLIC -Wall -Wextra)
+  target_compile_options(mixxx-lib PUBLIC -Wall -Wextra -Wfloat-conversion)
   if(WARNINGS_PEDANTIC)
     target_compile_options(mixxx-lib PUBLIC -pedantic)
   endif()

README.md

@@ -75,7 +75,7 @@ development and community news:
 - Follow us on [Twitter] and [Facebook].
 - Subscribe to the [Mixxx Development Blog][blog].
 - Join the developer [mailing list].
-- Post on the [Mixxx forums][forums].
+- Post on the [Mixxx forums][discourse].
 
 ## License
 
@@ -109,3 +109,4 @@ license.
 [Mixxx glossary]: https://www.transifex.com/projects/p/mixxxdj/glossary/l/en/
 [hardware compatibility]: https://mixxx.org/wiki/doku.php/hardware_compatibility
 [zulip]: https://mixxx.zulipchat.com/
+[discourse]: https://mixxx.discourse.group/

res/controllers/Akai MPD24.midi.xml

@@ -4,7 +4,8 @@
     <name>Akai MPD24</name>
     <author>klico</author>
     <description>MIDI mapping for Akai MPD24</description>
-    <forums>http://mixxx.org/forums/viewtopic.php?f=7&amp;t=39</forums>
+    <forums>https://mixxx.discourse.group/t/akai-mpd24-midi-setup/9020</forums>
+    <manual>akai_mpd24</manual>
   </info>
 <controller id="Akai MPD24 MIDI 1">
   <controls>

res/controllers/Akai-LPD8-RK.midi.xml

@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <MixxxMIDIPreset mixxxVersion="1.10.1+" schemaVersion="1">
     <info>
-        <name>Akai LPD8 - RK</name>
+        <name>Akai LPD8</name>
         <author>Rob K</author>
         <description>This is a mapping for an Akai LPD8.  Provides access to transport controls, 30 hotcues, loop controls, basic beat jumping, for two decks and two samplers.  Prog 1 = Deck 1; Prog 2 = Deck 2; Prog 3 = Sampler 1; Prog 4 = Sampler 4.  PAD controls hotcues, CC controls Loops, PROG CHNG provides transport controls.  Intended for use as a supplementary controller on top of a standard DJ controller to give access to more hotcues, etc. but could be used as a standalone controller in a pinch.  Created Jan 1, 2013</description>
-        <forums>http://mixxx.org/forums/viewtopic.php?f=7&amp;t=4477</forums>
+        <forums>https://mixxx.discourse.group/t/akai-lpd8-mapping-4-decks-30-hotcues-loops-etc-v2/13064</forums>
+        <manual>akai_lpd8</manual>
     </info>
     <controller id="LPD8">
         <scriptfiles>

res/controllers/Allen and Heath Xone K2.midi.xml

@@ -3,7 +3,7 @@
     <info>
         <name>Allen&amp;Heath Xone K2/K1</name>
         <author>Be</author>
-        <wiki>https://mixxx.org/wiki/doku.php/allen_heath_xone_k2</wiki>
+        <manual>allen_heath_xone_k2_k1</manual>
         <description>This mapping can used with one or multiple Xone K2s/K1s. Multiple Xone K2s/K1s can be connected to each other via X-Link with one of them connected to the computer via USB. Alternatively, when using 2 K2s/K1s, they can both be connected with their own USB cable and this same mapping can be loaded for each.
 
 The layout of the mapping depends on the configured MIDI channel of the controller. Change the MIDI channel of the controller by pressing the bottom right encoder (labeled "Power On Setup/Scroll/Set") while plugging in the controller. Scroll with the encoder to select a MIDI channel. The letter in parentheses corresponds to the last lit button when selecting the channel:

res/controllers/American Audio RADIUS 2000 CH1.midi.xml

@@ -3,6 +3,7 @@
         <name>American Audio Radius 2000 CH1</name>
         <author>Markus Steinbauer</author>
         <description>American Audio Radius 2000 mapping for Deck 1</description>
+        <manual>american_audio_radius_2000</manual>
     </info>
     <controller id="Radius 2000 MIDI 1">
         <scriptfiles>

res/controllers/American Audio RADIUS 2000 CH2.midi.xml

@@ -3,6 +3,7 @@
         <name>American Audio Radius 2000 CH2</name>
         <author>Markus Steinbauer</author>
         <description>American Audio Radius 2000 mapping for Deck 2</description>
+        <manual>american_audio_radius_2000</manual>
     </info>
     <controller id="Radius 2000 MIDI 1">
         <scriptfiles>

res/controllers/American Audio VMS2.midi.xml

@@ -4,8 +4,8 @@
     <name>American Audio VMS2</name>
     <author>Stefan Nuernberger</author>
     <description>MIDI mapping for the American Audio VMS2 controller.</description>
-    <wiki>https://www.mixxx.org/wiki/doku.php/american_audio_vms2</wiki>
     <forums>http://www.mixxx.org/forums/viewtopic.php?f=7&amp;t=3202</forums>
+    <manual>american_audio_vms2</manual>
   </info>
   <controller id="American Audio VMS2">
     <scriptfiles>

res/controllers/American Audio VMS4.midi.xml

@@ -3,9 +3,9 @@
    <info>
       <name>American Audio VMS4/4.1</name>
       <author>Anders Gunnarsson &amp; Sean M. Pappalardo</author>
-      <wiki>http://mixxx.org/wiki/doku.php/american_audio_vms4</wiki>
       <description>2-deck control/4-deck mixer preset for Mixxx 2.1. 
 Assumes "Post EQ" mode. (See Wiki for full setup instructions.)</description>
+      <manual>american_audio_vms4</manual>
    </info>
    <controller id="American Audio VMS4">
       <scriptfiles>

res/controllers/Behringer BCD2000.midi.xml

@@ -4,6 +4,7 @@
       <author>Golzo</author>
       <description>MIDI mapping for Behringer BCD2000 mixer</description>
       <forums>http://www.mixxx.org/forums/viewtopic.php?f=7&amp;t=3563</forums>
+      <manual>behringer_b_control_deejay_bcd2000</manual>
     </info>
     <controller id="BCD2000 MIDI 1">
         <scriptfiles>

res/controllers/Behringer BCD3000 Advanced.midi.xml

@@ -4,6 +4,7 @@
       <author>Joachim</author>
       <description>Advanced preset for BCD3000. See forums for more information.</description>
       <forums>http://www.mixxx.org/forums/viewtopic.php?f=7&amp;t=4013</forums>
+      <manual>behringer_b_control_deejay_bcd3000</manual>
     </info>
     <controller id="BCD3000 MIDI 1">
         <scriptfiles>

res/controllers/Behringer BCD3000.midi.xml

@@ -3,7 +3,7 @@
         <name>Behringer BCD3000</name>
         <author>Aposto</author>
         <description>MIDI Mapping for Behringer BCD3000</description>
-        <forums>http://mixxx.org/forums/viewtopic.php?f=3&amp;t=845</forums>
+        <forums>https://mixxx.discourse.group/t/behringer-bcd3000/10194</forums>
     </info>
     <controller id="BCD3000 MIDI 1">
         <scriptfiles>

res/controllers/Behringer CMD MM1.midi.xml

@@ -10,7 +10,7 @@
         <author>Swiftb0y</author>
         <description>4 deck mapping with options for controlling effect units. Refer to the Mixxx wiki page for how to configure it to control effect units.</description>
         <forums>https://www.mixxx.org/forums/viewtopic.php?f=7&amp;t=9276</forums>
-        <wiki>https://mixxx.org/wiki/doku.php/behringer_cmd_mm-1</wiki>
+        <manual>behringer_cmd_mm_1</manual>
     </info>
     <controller id="CMD">
         <scriptfiles>

res/controllers/Behringer CMD Micro.midi.xml

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <MixxxControllerPreset mixxxVersion="" schemaVersion="1">
     <info>
-        <name>Behringer CMD Micro (tecywiz121)</name>
+        <name>Behringer CMD Micro</name>
         <author>tecywiz121</author>
+        <manual>behringer_cmd_micro</manual>
     </info>
     <controller id="CMD">
         <scriptfiles>

res/controllers/Behringer CMDStudio4a.midi.xml

@@ -4,8 +4,8 @@
         <name>Behringer CMD STUDIO 4a</name>
         <author>Craig Easton</author>
         <description>Controller mapping for the Behringer CMD STUDIO 4a. V 1.4 Created Jan 2016 for Mixxx 2.0.0</description>
-        <wiki>http://www.mixxx.org/wiki/doku.php/behringer_cmd_studio_4a</wiki>
         <forums>http://www.mixxx.org/forums/viewtopic.php?f=7&amp;t=7868</forums>
+        <manual>behringer_cmd_studio_4a</manual>
     </info>
     <controller id="Behringer CMD STUDIO 4a">
         <scriptfiles>

res/controllers/DJ TechTools MIDI Fighter Twister.midi.xml

@@ -4,7 +4,7 @@
     <name>DJ TechTools MIDI Fighter Twister</name>
     <author>tock203</author>
     <description>for 2 deck use</description>
-    <wiki>https://www.mixxx.org/wiki/doku.php/dj_tech_tools_midi_fighter_twister</wiki>
+    <manual>dj_techtools_midi_figher_twister</manual>
   </info>
   <controller id="DJ TechTools MIDI Fighter Twister">
     <scriptfiles>

res/controllers/DJ-Tech CDJ-101.midi.xml

@@ -5,6 +5,7 @@
         <author>zestoi</author>
         <description>Select midi channel 1 or 2 on the CDJ-101 to select which deck to control in Mixxx. Hold down the push encoder for additional controls.</description>
         <forums>http://www.mixxx.org/forums/viewtopic.php?f=7&amp;t=3693</forums>
+        <manual>dj_tech_cdj_101</manual>
     </info>
     <controller id="DJ-Tech CDJ-101">
         <scriptfiles>

res/controllers/DJ-Tech DJM-101.midi.xml

@@ -5,6 +5,7 @@
         <author>zestoi</author>
         <description>Mapping with full led feedback for the DJ-Tech DJM-101</description>
         <forums>http://www.mixxx.org/forums/viewtopic.php?f=7&amp;t=3693</forums>
+        <manual>dj_tech_djm_101</manual>
     </info>
     <controller id="DJM-101">
         <scriptfiles>

res/controllers/DJ-Tech Kontrol One.midi.xml

@@ -4,7 +4,8 @@
         <name>DJ-Tech Kontrol One</name>
         <author>Rob K</author>
         <description>Mapping for the DJ Tech Kontrol One modular scratch controller.  Provides controls for Channel1 through Channel4.  March 2013.</description>
-        <forums>http://mixxx.org/forums/viewtopic.php?f=7&amp;t=4863</forums>
+        <forums>https://mixxx.discourse.group/t/dj-tech-kontrol-one-mapping-hotcue-loops-saves-loops-etc/13299</forums>
+        <manual>dj_tech_kontrol_one</manual>
     </info>
     <controller id="KONTROL1">
         <scriptfiles>

res/controllers/DJ-Tech Mix-101.midi.xml

@@ -1,9 +1,10 @@
 <MixxxMIDIPreset mixxxVersion="1.10.1+" schemaVersion="1">
     <info>
-      <name>DJ-Tech Mix-101</name>
+      <name>DJ-Tech MIX-101</name>
       <author>rasda</author>
-      <description>Midi mapping for DJ-Tech Mix-101</description>
-      <forums>http://mixxx.org/forums/viewtopic.php?f=7&amp;t=3981</forums>
+      <description>MIDI mapping for DJ-Tech MIX-101</description>
+      <forums>https://mixxx.discourse.group/t/dj-tech-mix-101-mapping/12679</forums>
+      <manual>dj_tech_mix_101</manual>
     </info>
     <controller id="Mix-101 MIDI 1">
     <scriptfiles/>

res/controllers/DJ-Tech Mixer One.midi.xml

@@ -5,6 +5,7 @@
         <author>Rob K</author>
         <description>DJ-Tech Mixer One preset. Pretty straightforward - all controls do what they're labelled to do on the controller, except (1) the Xfader slope knob controls master balance; and (2) the Inverse button mutes the master output momentarily.</description>
         <forums>http://www.mixxx.org/forums/viewtopic.php?f=7&amp;t=4693</forums>
+        <manual>dj_tech_mixer_one</manual>
     </info>
     <controller id="MIXER1">
         <scriptfiles>