Merge branch 'mixxxdj:main' into silence_sord

Author: daschuer

.clang-format

@@ -28,6 +28,7 @@ IndentCaseLabels: false
 DerivePointerAlignment: false
 SpaceAfterTemplateKeyword: false
 SpacesBeforeTrailingComments: 1
+PackConstructorInitializers: Never
 # StatementMacros don't require a trailing semicolon.
 # Trailing semicolons should be omitted after these macros
 # when compiling with -Wpedantic to avoid warnings.

.cmakelintrc

@@ -0,0 +1 @@
+filter=-linelength,-convention/filename,-package/stdargs

.codespellignorelines

@@ -4,24 +4,24 @@
                  pInOut, pInOut,
         CSAMPLE* pInOut,
     CSAMPLE* pInOut,
-void EnginePregain::process(CSAMPLE* pInOut, const int iBufferSize) {
-void EngineDelay::process(CSAMPLE* pInOut, const int iBufferSize) {
+void EnginePregain::process(CSAMPLE* pInOut, const std::size_t bufferSize) {
+void EngineDelay::process(CSAMPLE* pInOut, const std::size_t bufferSize) {
         pInOut[i] = (CSAMPLE) processSample(fbuf1, (double) pInOut[i]);
         pInOut[i + 1] = (CSAMPLE) processSample(fbuf2, (double) pInOut[i + 1]);
             m_pDelayBuffer[m_iDelayPos] = pInOut[i];
             pInOut[i] = m_pDelayBuffer[iDelaySourcePos];
-        SampleUtil::applyRampingGain(&pInOut[0], m_fPrevGain, 0, iBufferSize / 2);
-        SampleUtil::applyRampingGain(&pInOut[iBufferSize / 2], 0, totalGain, iBufferSize / 2);
-        SampleUtil::applyRampingGain(pInOut, m_fPrevGain, totalGain, iBufferSize);
-        SampleUtil::applyGain(pInOut, totalGain, iBufferSize);
-    void process(CSAMPLE* pInOut, const int iBufferSize) override;
-    void process(CSAMPLE* pInOut, const int iBufferSize);
-    virtual void process(CSAMPLE* pInOut, const int iBufferSize);
+        SampleUtil::applyRampingGain(&pInOut[0], m_fPrevGain, 0, bufferSize / 2);
+        SampleUtil::applyRampingGain(&pInOut[bufferSize / 2], 0, totalGain, bufferSize / 2);
+        SampleUtil::applyRampingGain(pInOut, m_fPrevGain, totalGain, bufferSize);
+        SampleUtil::applyGain(pInOut, totalGain, bufferSize);
+    void process(CSAMPLE* pInOut, const std::size_t bufferSize) override;
+    void process(CSAMPLE* pInOut, const std::size_t bufferSize);
+    virtual void process(CSAMPLE* pInOut, const std::size_t bufferSize);
                 "CSAMPLE_GAIN gain%(i)din, CSAMPLE_GAIN gain%(i)dout"
                 "gain%(i)dout == CSAMPLE_GAIN_ZERO) {"
                     "pSrc%(i)d, gain%(i)din, gain%(i)dout" % {"i": j}
                 "(gain%(i)dout - gain%(i)din) / (iNumSamples / 2);"
-    MOCK_METHOD2(process, void(CSAMPLE* pInOut, const int iBufferSize));
+    MOCK_METHOD(void, process, (CSAMPLE * pInOut, const std::size_t bufferSize), (override));
     const QString kName3 = QStringLiteral("I'm blue, da ba dee");
     float m_k2vg; // IIF factor
     float m_k2vgNew; // IIF factor
@@ -71,6 +71,6 @@ void EngineEffectsDelay::process(CSAMPLE* pInOut,
     // Source: FIPS 180-4 Secure Hash Standard (SHS)
         // ALAC/CAF has been added in version 1.0.26
         QStringLiteral("caf"),
-void EngineFilter::process(CSAMPLE* pInOut, const int iBufferSize)
+void EngineFilter::process(CSAMPLE* pInOut, const size_t bufferSize)
     // Note(RRyan/Max Linke):
     // https://github.com/codders/libshout/blob/a17fb84671d3732317b0353d7281cc47e2df6cf6/src/timing/timing.c

.gersemirc

@@ -0,0 +1 @@
+indent: 2

.github/ISSUE_TEMPLATE/bug.yaml

@@ -1,7 +1,7 @@
 name: 🐛 Bug Report
 description: |
   Describe your problem here.
-labels: [bug]
+type: "bug"
 body:
   - type: markdown
     attributes:

.github/ISSUE_TEMPLATE/feature_request.yaml

@@ -1,7 +1,7 @@
 name: 🚀 Feature Request
 description: |
   What feature would you like to see added to Mixxx?
-labels: [feature]
+type: "feature"
 body:
   - type: markdown
     attributes:

.github/dependabot.yml

@@ -4,3 +4,4 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"
+    target-branch: "2.5"

.github/labeler.yml

@@ -32,6 +32,18 @@ controller mappings:
       - any-glob-to-any-file:
           - res/controllers/**
 
+developer experience:
+  - changed-files:
+      - any-glob-to-any-file:
+          - .github/ISSUE_TEMPLATE/**
+          - .github/labeler.yml
+          - tools/**
+          - .pre-commit-config.yaml
+          - CODE_OF_CONDUCT.md
+          - CONTRIBUTING.md
+          - README.md
+          - src/dialog/dlgdevelopertools*
+
 analyzer:
   - changed-files:
       - any-glob-to-any-file:

.github/workflows/build.yml

@@ -39,8 +39,8 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - name: Ubuntu 22.04
-            os: ubuntu-22.04
+          - name: Ubuntu 24.04
+            os: ubuntu-24.04
             cmake_args: >-
               -DQT6=ON
               -DQML=ON
@@ -58,7 +58,7 @@ jobs:
             cpack_generator: DEB
             buildenv_basepath: /home/runner/buildenv
             buildenv_script: tools/debian_buildenv.sh
-            artifacts_name: Ubuntu 22.04 Qt6 DEB
+            artifacts_name: Ubuntu 24.04 Qt6 DEB
             artifacts_path: build/*.deb
             artifacts_slug: ubuntu-jammy
             qt_qpa_platform: offscreen
@@ -71,6 +71,7 @@ jobs:
               -DMACOS_BUNDLE=ON
               -DMODPLUG=ON
               -DQT6=ON
+              -DQML=OFF
               -DWAVPACK=ON
               -DVCPKG_TARGET_TRIPLET=x64-osx-min1100-release
             # TODO: Fix this broken test on macOS
@@ -94,6 +95,7 @@ jobs:
               -DMACOS_BUNDLE=ON
               -DMODPLUG=ON
               -DQT6=ON
+              -DQML=ON
               -DWAVPACK=ON
               -DVCPKG_TARGET_TRIPLET=arm64-osx-min1100-release
             # TODO: Fix this broken test on macOS
@@ -108,21 +110,20 @@ jobs:
             artifacts_path: build/*.dmg
             artifacts_slug: macos-macosarm
             qt_qpa_platform: offscreen
-          - name: Windows 2022 (MSVC)
+          - name: Windows 2022 x64
             os: windows-2022
-            # TODO: Re-enable FFmpeg after licensing issues have been clarified
             # Attention: If you change the cmake_args for the Windows CI build,
             #            also adjust the for the local Windows build setup in
             #            ./tools/windows_buildenv.bat
             cmake_args: >-
               -DBULK=ON
-              -DFFMPEG=OFF
               -DHSS1394=ON
               -DLOCALECOMPARE=ON
               -DMAD=ON
               -DMEDIAFOUNDATION=ON
               -DMODPLUG=ON
               -DQT6=ON
+              -DQML=ON
               -DWAVPACK=ON
               -DVCPKG_TARGET_TRIPLET=x64-windows-release
             cc: cl
@@ -132,10 +133,40 @@ jobs:
             cpack_generator: WIX
             buildenv_basepath: C:\buildenv
             buildenv_script: tools/windows_buildenv.bat
-            artifacts_name: Windows Installer
+            artifacts_name: Windows x64 Installer
             artifacts_path: build/*.msi
             artifacts_slug: windows-win64
             qt_qpa_platform: windows
+            arch: x64
+          - name: Windows 11 ARM64
+            os: windows-11-arm
+            # Attention: If you change the cmake_args for the Windows CI build,
+            #            also adjust the for the local Windows build setup in
+            #            ./tools/windows_buildenv.bat
+            cmake_args: >-
+              -DBULK=ON
+              -DHSS1394=ON
+              -DLOCALECOMPARE=ON
+              -DMAD=ON
+              -DMEDIAFOUNDATION=ON
+              -DMODPLUG=ON
+              -DQT6=ON
+              -DQML=ON
+              -DWAVPACK=ON
+              -DVCPKG_TARGET_TRIPLET=arm64-windows-release
+              -DVCPKG_DEFAULT_HOST_TRIPLET=arm64-windows-release
+            cc: cl
+            cxx: cl
+            # TODO: Fix these broken tests on Windows
+            ctest_args: --exclude-regex '^AutoDJProcessorTest.*$'
+            cpack_generator: WIX
+            buildenv_basepath: C:\buildenv
+            buildenv_script: tools/windows_buildenv.bat
+            artifacts_name: Windows ARM64 Installer
+            artifacts_path: build/*.msi
+            artifacts_slug: windows-winarm
+            qt_qpa_platform: windows
+            arch: arm64
 
     env:
       # macOS codesigning
@@ -149,6 +180,7 @@ jobs:
       artifact-macos-macosintel: ${{ steps.prepare_deploy.outputs.artifact-macos-macosintel }}
       artifact-macos-macosarm: ${{ steps.prepare_deploy.outputs.artifact-macos-macosarm }}
       artifact-windows-win64: ${{ steps.prepare_deploy.outputs.artifact-windows-win64 }}
+      artifact-windows-winarm: ${{ steps.prepare_deploy.outputs.artifact-windows-winarm }}
     steps:
       - name: "Check out repository"
         uses: actions/checkout@v4.2.2
@@ -169,7 +201,7 @@ jobs:
 
       - name: "[macOS] Set up cmake"
         uses: jwlawson/actions-setup-cmake@v2.0
-        # Ubuntu 22.04 should use the CMake version from the repos.
+        # Ubuntu 24.04 should use the CMake version from the repos.
         if: runner.os == 'macOS'
         with:
           # This should always match the minimum required version in
@@ -178,8 +210,9 @@ jobs:
 
       - name: "[Windows] Set up cmake"
         uses: jwlawson/actions-setup-cmake@v2.0
-        # Ubuntu 22.04 should use the CMake version from the repos.
-        if: runner.os == 'Windows'
+        # Ubuntu 24.04 should use the CMake version from the repos.
+        # On windows-11-arm this action installs the x64 version which has unwanted side effects
+        if: matrix.os == 'windows-2022'
         with:
           # This is a workaround for a SSL false positive in cmake 3.26.4
           # When downloading the manual. 3.21 is required for installing the
@@ -189,6 +222,18 @@ jobs:
       - name: "[Windows] Set up MSVC Developer Command Prompt"
         if: runner.os == 'Windows'
         uses: ilammy/msvc-dev-cmd@v1
+        with:
+          arch: ${{ matrix.arch }}
+
+      - name: "[Windows 11 ARM64] Install ARM64 CMake"
+        if: matrix.os == 'windows-11-arm'
+        run: |
+          Invoke-WebRequest -Uri https://github.com/Kitware/CMake/releases/download/v3.30.1/cmake-3.30.1-windows-arm64.zip -OutFile cmake-arm64.zip
+          Expand-Archive cmake-arm64.zip -DestinationPath $env:USERPROFILE\cmake
+          $cmakePath = "$env:USERPROFILE\cmake\cmake-3.30.1-windows-arm64\bin"
+          $cmakePath | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+          $env:Path += ";$cmakePath"
+          cmake --version
 
       - name: "[macOS] install ccache and make"
         if: runner.os == 'macOS'
@@ -350,20 +395,36 @@ jobs:
           timestamp-digest: SHA256
           timeout: 600
 
+      - name: "[Windows 11 ARM64] Install WiX Toolset3"
+        if: matrix.os == 'windows-11-arm'
+        run: |
+          choco install wixtoolset
+          Import-Module $env:ChocolateyInstall\helpers\chocolateyProfile.psm1
+          refreshenv
+          echo "WIX=$env:WIX" >> $env:GITHUB_ENV
+
       - name: "Package"
+        id: package
         if: matrix.cpack_generator != null
         # Use retry loop to work around a race condition on macOS causing
         # 'Resource busy' errors with 'hdiutil'. See
         # https://github.com/actions/runner-images/issues/7522
         uses: nick-fields/retry@v3
         with:
           timeout_minutes: 30
-          max_attempts: 12
+          max_attempts: ${{ runner.os == 'macOS' && 12 || 1 }}
           retry_wait_seconds: 1
           command: |
             cd build
             cpack -G ${{ matrix.cpack_generator }} -V
 
+      - name: Upload failed packaging logs
+        if: always() && steps.package.outcome == 'failure' && runner.os == 'windows'
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.os }}-logs-packages-wix
+          path: ${{ github.workspace }}/build/_CPack_Packages/win64/WIX/wix.log
+
       - name: "[Ubuntu] Import PPA GPG key"
         if: startsWith(matrix.os, 'ubuntu') && env.RRYAN_AT_MIXXX_DOT_ORG_GPG_PRIVATE_KEY != null
         run: gpg --import <(echo "${{ secrets.RRYAN_AT_MIXXX_DOT_ORG_GPG_PRIVATE_KEY }}")
@@ -372,7 +433,7 @@ jobs:
 
       - name: "Package for PPA"
         # No need to do the PPA build for both Ubuntu versions
-        if: matrix.name == 'Ubuntu 22.04'
+        if: matrix.name == 'Ubuntu 24.04'
         run: |
           if [[ "${{ github.ref }}" == "refs/heads/main" ]] && [[ "${{ github.repository }}" == "mixxxdj/mixxx" ]]; then
             CPACK_ARGS="-D DEB_UPLOAD_PPA=ppa:mixxx/nightlies"
@@ -442,7 +503,13 @@ jobs:
           SSH_PRIVATE_KEY: ${{ secrets.DOWNLOADS_HOSTGATOR_DOT_MIXXX_DOT_ORG_KEY }}
         if: runner.os == 'Windows' && inputs.publish && env.SSH_PRIVATE_KEY != null
         run: |
-          $Env:PATH="c:\msys64\usr\bin;$Env:PATH"
+          if (Test-Path "C:\msys64\usr\bin") {
+            $msysPath="C:\msys64"
+          } else {
+            choco install msys2 -y
+            $msysPath="C:\tools\msys64"
+          }
+          $Env:PATH="$msysPath\usr\bin;$Env:PATH"
           pacman -S --noconfirm coreutils bash rsync openssh
           # Unfortunately, mixing executables from msys64 and mingw (i.e. Git
           # Bash) does not work properly and leads to errors like these:
@@ -457,14 +524,14 @@ jobs:
           #
           # Also see related issue:
           # https://github.com/actions/virtual-environments/issues/594
-          Copy-Item -Path "C:\msys64\usr\bin\bash.exe" -Destination "C:\Program Files\Git\bin\bash.exe" -Force
+          Copy-Item -Path "$msysPath\usr\bin\bash.exe" -Destination "C:\Program Files\Git\bin\bash.exe" -Force
           # By default, MSYS2 uses an
           # /etc/profile file that changes
           # the current working directory
           # when bash is started. We don't
           # want this behavior,so we just
           # delete it.
-          Remove-Item -Path "C:\msys64\etc\profile"
+          Remove-Item -Path "$msysPath\etc\profile"
           # Add MSYS2's tools to %PATH%.
           Add-Content -Path "$Env:GITHUB_ENV" -Value "PATH=$Env:PATH"
 

.github/workflows/checks.yml

@@ -20,11 +20,17 @@ jobs:
           - name: clazy
           - name: clang-tidy
           - name: coverage
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     name: ${{ matrix.name }}
     steps:
       - name: Check out repository
         uses: actions/checkout@v4.2.2
+      - name: Add clazy PPA
+        if: matrix.name == 'clazy'
+        # Ubuntu2404 comes with v1.11, which is too old for the Qt6.4 shipped with Ubuntu 24.04
+        run: |
+          sudo add-apt-repository ppa:daschuer/clazy
+          sudo apt update
       - name: Install build dependencies
         run: tools/debian_buildenv.sh setup
       - name: Create build directory
@@ -33,6 +39,7 @@ jobs:
         if: matrix.name == 'clazy'
         # Disable optimizations as workaround for Clang 9 bug: https://bugs.llvm.org/show_bug.cgi?id=45034
         run: |
+          clazy --version
           cmake \
             -DCMAKE_BUILD_TYPE=Debug \
             -DWARNINGS_FATAL=ON \
@@ -60,6 +67,8 @@ jobs:
           CXX: clazy
       - name: Configure (clang-tidy)
         if: matrix.name == 'clang-tidy'
+        # Our code contains the use of infinity(), which Clang >= 18 reports
+        # as error, if you compile with -fast-math
         run: |
           cmake \
             -DCMAKE_BUILD_TYPE=Debug \
@@ -80,6 +89,7 @@ jobs:
             -DMAD=ON \
             -DMODPLUG=ON \
             -DWAVPACK=ON \
+            -DCMAKE_CXX_FLAGS="-Wno-nan-infinity-disabled" \
             ..
         working-directory: build
         env:
@@ -93,6 +103,7 @@ jobs:
             -DCMAKE_BUILD_TYPE=Debug \
             -DOPTIMIZE=off \
             -DQT6=ON \
+            -DQML=ON \
             -DCOVERAGE=ON \
             -DWARNINGS_FATAL=OFF \
             -DDEBUG_ASSERTIONS_FATAL=OFF \
@@ -114,13 +125,6 @@ jobs:
         working-directory: build
       - name: Set up problem matcher
         uses: ammaraskar/gcc-problem-matcher@0.3.0
-      # Work around https://github.com/actions/runner-images/issues/8659
-      - name: "Remove GCC 13 from runner image (workaround)"
-        shell: bash
-        run: |
-          sudo rm -f /etc/apt/sources.list.d/ubuntu-toolchain-r-ubuntu-test-jammy.list
-          sudo apt-get update
-          sudo apt-get install -y --allow-downgrades libc6=2.35* libc6-dev=2.35* libstdc++6=12.3.0-1ubuntu1~22.04 libgcc-s1=12.3.0-1ubuntu1~22.04
       - name: Build
         # Do not abort on errors and build/check the whole project
         run: cmake --build . -j $(nproc) -- --keep-going
@@ -157,6 +161,6 @@ jobs:
         continue-on-error: true
         uses: coverallsapp/github-action@v2.3.6
         with:
-          flag-name: ubuntu-22.04
+          flag-name: ubuntu-24.04
           path-to-lcov: build/lcov.info
           github-token: ${{ secrets.GITHUB_TOKEN }}