Pioneer DDJ-ERGO: added mappings

.codespellignorelines

@@ -6,7 +6,6 @@
     CSAMPLE* pInOut,
 void EnginePregain::process(CSAMPLE* pInOut, const int iBufferSize) {
 void EngineDelay::process(CSAMPLE* pInOut, const int iBufferSize) {
-void EngineFilter::process(CSAMPLE* pInOut, const int iBufferSize)
         pInOut[i] = (CSAMPLE) processSample(fbuf1, (double) pInOut[i]);
         pInOut[i + 1] = (CSAMPLE) processSample(fbuf2, (double) pInOut[i + 1]);
             m_pDelayBuffer[m_iDelayPos] = pInOut[i];
@@ -72,3 +71,4 @@ 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)

.github/labeler.yml

@@ -102,6 +102,12 @@ preferences:
       - any-glob-to-any-file:
           - src/preferences/**
 
+qml:
+  - changed-files:
+      - any-glob-to-any-file:
+          - res/qml/**
+          - src/qml/**
+
 skins:
   - changed-files:
       - any-glob-to-any-file:

.github/workflows/build-checks.yml

@@ -25,7 +25,7 @@ jobs:
     name: ${{ matrix.name }}
     steps:
       - name: Check out repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v4.1.1
       - name: Install build dependencies
         run: tools/debian_buildenv.sh setup
       - name: Create build directory
@@ -37,6 +37,7 @@ jobs:
           cmake \
             -DCMAKE_BUILD_TYPE=Debug \
             -DWARNINGS_FATAL=ON \
+            -DQT6=ON \
             -DOPTIMIZE=off \
             -DBATTERY=ON \
             -DBROADCAST=ON \
@@ -65,6 +66,7 @@ jobs:
             -DCMAKE_BUILD_TYPE=Debug \
             -DCLANG_TIDY=clang-tidy \
             -DWARNINGS_FATAL=ON \
+            -DQT6=ON \
             -DBATTERY=ON \
             -DBROADCAST=ON \
             -DBULK=ON \
@@ -91,6 +93,7 @@ jobs:
           cmake \
             -DCMAKE_BUILD_TYPE=Debug \
             -DOPTIMIZE=off \
+            -DQT6=ON \
             -DCOVERAGE=ON \
             -DWARNINGS_FATAL=OFF \
             -DDEBUG_ASSERTIONS_FATAL=OFF \
@@ -111,7 +114,7 @@ jobs:
             ..
         working-directory: build
       - name: Set up problem matcher
-        uses: ammaraskar/gcc-problem-matcher@0.2.0
+        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

.github/workflows/build.yml

@@ -15,33 +15,11 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - name: Ubuntu 22.04 (gcc)
+          - name: Ubuntu 22.04
             os: ubuntu-22.04
             cmake_args: >-
-              -DWARNINGS_FATAL=ON
-              -DBULK=ON
-              -DFFMPEG=ON
-              -DLOCALECOMPARE=ON
-              -DMAD=ON
-              -DMODPLUG=ON
-              -DWAVPACK=ON
-              -DINSTALL_USER_UDEV_RULES=OFF
-            ctest_args: []
-            compiler_cache: ccache
-            compiler_cache_path: /home/runner/.cache/ccache
-            compiler_cache_id: qt5
-            cpack_generator: DEB
-            buildenv_basepath: /home/runner/buildenv
-            buildenv_script: tools/debian_buildenv.sh
-            artifacts_name: Ubuntu 22.04 DEB
-            artifacts_path: build/*.deb
-            artifacts_slug: ubuntu-jammy
-            qt_qpa_platform: offscreen
-          - name: Ubuntu 22.04 (Qt 6.2, gcc)
-            os: ubuntu-22.04
-            cmake_args: >-
-              -DWARNINGS_FATAL=ON
               -DQT6=ON
+              -DQML=ON
               -DBULK=ON
               -DFFMPEG=ON
               -DLOCALECOMPARE=ON
@@ -55,7 +33,7 @@ jobs:
             compiler_cache_id: qt6
             cpack_generator: DEB
             buildenv_basepath: /home/runner/buildenv
-            buildenv_script: tools/debian_buildenv_qt6.sh
+            buildenv_script: tools/debian_buildenv.sh
             artifacts_name: Ubuntu 22.04 Qt6 DEB
             artifacts_path: build/*.deb
             artifacts_slug: ubuntu-jammy
@@ -68,9 +46,10 @@ jobs:
               -DHSS1394=ON
               -DMACOS_BUNDLE=ON
               -DMODPLUG=ON
+              -DQT6=ON
               -DWAVPACK=ON
-              -DVCPKG_TARGET_TRIPLET=x64-osx-min1012-release
-              -DVCPKG_DEFAULT_HOST_TRIPLET=x64-osx-min1012-release
+              -DVCPKG_TARGET_TRIPLET=x64-osx-min1015-release
+              -DVCPKG_DEFAULT_HOST_TRIPLET=x64-osx-min1015-release
             # TODO: Fix this broken test on macOS
             ctest_args: --exclude-regex DirectoryDAOTest.relocateDirectory
             cpack_generator: DragNDrop
@@ -91,9 +70,10 @@ jobs:
               -DHSS1394=ON
               -DMACOS_BUNDLE=ON
               -DMODPLUG=ON
+              -DQT6=ON
               -DWAVPACK=ON
               -DVCPKG_TARGET_TRIPLET=arm64-osx-min1100-release
-              -DVCPKG_DEFAULT_HOST_TRIPLET=x64-osx-min1012-release
+              -DVCPKG_DEFAULT_HOST_TRIPLET=x64-osx-min1015-release
             # TODO: Fix this broken test on macOS
             crosscompile: true
             cpack_generator: DragNDrop
@@ -113,14 +93,14 @@ jobs:
             #            also adjust the for the local Windows build setup in
             #            ./tools/windows_buildenv.bat
             cmake_args: >-
-              -DWARNINGS_FATAL=ON
               -DBULK=OFF
               -DFFMPEG=OFF
               -DHSS1394=ON
               -DLOCALECOMPARE=ON
               -DMAD=ON
               -DMEDIAFOUNDATION=ON
               -DMODPLUG=ON
+              -DQT6=ON
               -DWAVPACK=ON
               -DVCPKG_TARGET_TRIPLET=x64-windows-release
               -DVCPKG_DEFAULT_HOST_TRIPLET=x64-windows-release
@@ -151,7 +131,7 @@ jobs:
       artifact-windows-win64: ${{ steps.prepare_deploy.outputs.artifact-windows-win64 }}
     steps:
       - name: "Check out repository"
-        uses: actions/checkout@v4
+        uses: actions/checkout@v4.1.1
         with:
           # This is necessary for making `git describe` work.
           fetch-depth: 0
@@ -168,16 +148,16 @@ jobs:
         run: git fetch origin --force --tags
 
       - name: "[macOS] Set up cmake"
-        uses: jwlawson/actions-setup-cmake@v1.13
+        uses: jwlawson/actions-setup-cmake@v2.0
         # Ubuntu 22.04 should use the CMake version from the repos.
         if: runner.os == 'macOS'
         with:
           # This should always match the minimum required version in
           # our CMakeLists.txt
-          cmake-version: "3.19.x"
+          cmake-version: "3.21.x"
 
       - name: "[Windows] Set up cmake"
-        uses: jwlawson/actions-setup-cmake@v1.13
+        uses: jwlawson/actions-setup-cmake@v2.0
         # Ubuntu 22.04 should use the CMake version from the repos.
         if: runner.os == 'Windows'
         with:
@@ -201,7 +181,7 @@ jobs:
 
       - name: "[macOS/Windows] Set up build environment cache"
         if: runner.os != 'Linux'
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ matrix.buildenv_basepath }}
           key: ${{ runner.os }}-buildenv-${{ env.BUILDENV_NAME }}
@@ -242,7 +222,7 @@ jobs:
 
       - name: "[Ubuntu/macOS] Set up GitHub cache for ccache"
         if: runner.os != 'windows'
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ matrix.compiler_cache_path }}
           key: ${{ matrix.os }}-${{ matrix.compiler_cache_id }}-${{ github.head_ref }}-${{ github.run_number }}
@@ -266,6 +246,7 @@ jobs:
           cmake ${{ matrix.cmake_args }} ${{ env.CMAKE_ARGS_EXTRA }}
           -DCMAKE_BUILD_TYPE=RelWithDebInfo
           -DCMAKE_PREFIX_PATH="${{ env.CMAKE_PREFIX_PATH }}"
+          -DWARNINGS_FATAL=ON
           -DDEBUG_ASSERTIONS_FATAL=OFF
           -DBATTERY=ON
           -DBROADCAST=ON
@@ -286,11 +267,11 @@ jobs:
 
       - name: "[Ubuntu/macOS] Set up gcc/clang problem matcher"
         if: runner.os != 'Windows'
-        uses: ammaraskar/gcc-problem-matcher@0.2.0
+        uses: ammaraskar/gcc-problem-matcher@0.3.0
 
       - name: "[Windows] Set up MSVC problem matcher"
         if: runner.os == 'Windows'
-        uses: ammaraskar/msvc-problem-matcher@0.2.0
+        uses: ammaraskar/msvc-problem-matcher@0.3.0
 
       - name: "Build"
         run: cmake --build . --config RelWithDebInfo
@@ -332,7 +313,7 @@ jobs:
         env:
           AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
         if: runner.os == 'Windows' && env.AZURE_TENANT_ID
-        uses: azure/azure-code-signing-action@v0.2.22
+        uses: azure/azure-code-signing-action@v0.3.0
         with:
           azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }}
           azure-client-id: ${{ secrets.AZURE_CLIENT_ID }}
@@ -360,7 +341,7 @@ jobs:
 
       - name: "Package for PPA"
         # No need to do the PPA build for both Ubuntu versions
-        if: matrix.os == 'ubuntu-22.04' && matrix.container == null
+        if: matrix.name == 'Ubuntu 22.04'
         run: |
           if [[ "${{ github.ref }}" == "refs/heads/main" ]] && [[ "${{ github.repository }}" == "mixxxdj/mixxx" ]]; then
             CPACK_ARGS="-D DEB_UPLOAD_PPA=ppa:mixxx/nightlies"
@@ -387,7 +368,7 @@ jobs:
         env:
           AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
         if: runner.os == 'Windows' && env.AZURE_TENANT_ID
-        uses: azure/azure-code-signing-action@v0.2.22
+        uses: azure/azure-code-signing-action@v0.3.0
         with:
           azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }}
           azure-client-id: ${{ secrets.AZURE_CLIENT_ID }}
@@ -489,7 +470,7 @@ jobs:
 
       - name: "Upload GitHub Actions artifacts"
         if: matrix.artifacts_path != null
-        uses: actions/upload-artifact@v3.1.2
+        uses: actions/upload-artifact@v4.3.1
         with:
           name: ${{ matrix.artifacts_name }}
           path: ${{ matrix.artifacts_path }}
@@ -503,7 +484,7 @@ jobs:
     if: always()
     steps:
       - name: "Check out repository"
-        uses: actions/checkout@v4
+        uses: actions/checkout@v4.1.1
         with:
           fetch-depth: 0
 

.github/workflows/changelog.yml

@@ -19,7 +19,7 @@ jobs:
       - name: Get current branch name
         uses: nelonoel/[email protected]
       - name: Start workflow run on manual repository
-        uses: peter-evans/repository-dispatch@v2
+        uses: peter-evans/repository-dispatch@v3
         if: env.MIXXXBOT_TOKEN != null
         with:
           token: ${{ env.MIXXXBOT_TOKEN }}

.github/workflows/download_cleanup.yml

@@ -0,0 +1,34 @@
+name: Clean up downloads
+
+on:
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-22.04
+
+    steps:
+      - name: "Set up SSH Agent"
+        if: env.SSH_PRIVATE_KEY != null
+        env:
+          SSH_AUTH_SOCK: /tmp/ssh_agent.sock
+          SSH_PRIVATE_KEY: ${{ secrets.DOWNLOADS_HOSTGATOR_DOT_MIXXX_DOT_ORG_KEY }}
+          SSH_HOST: downloads-hostgator.mixxx.org
+        run: |
+          ssh-agent -a $SSH_AUTH_SOCK > /dev/null
+          ssh-add - <<< "${SSH_PRIVATE_KEY}"
+          mkdir -p "${HOME}/.ssh"
+          ssh-keyscan "${SSH_HOST}" >> "${HOME}/.ssh/known_hosts"
+          echo "SSH_AUTH_SOCK=${SSH_AUTH_SOCK}" >> "${GITHUB_ENV}"
+
+      - name: Delete obsolete files
+        if: env.SSH_AUTH_SOCK != null
+        run: |
+          mkdir empty_folder
+          echo build-checks-fix/ >> include_file.txt
+          echo build-checks-fix/* >> include_file.txt
+          rsync --verbose --archive --times --recursive --delete --include-from=include_file.txt --exclude=* "empty_folder/" "${SSH_USER}@${SSH_HOST}:${DESTDIR}/"
+        env:
+          DESTDIR: public_html/downloads/snapshots
+          SSH_HOST: downloads-hostgator.mixxx.org
+          SSH_USER: mixxx

.github/workflows/git.yaml

@@ -7,6 +7,6 @@ jobs:
     runs-on: ubuntu-22.04
 
     steps:
-      - uses: actions/checkout@v2.0.0
+      - uses: actions/checkout@v4.1.1
       - name: Block Fixup Commit Merge
         uses: 13rac1/[email protected]

.github/workflows/pre-commit.yml

@@ -18,7 +18,7 @@ jobs:
     container: holzhaus/mixxx-ci:20220930
     steps:
       - name: "Check out repository"
-        uses: actions/checkout@v4
+        uses: actions/checkout@v4.1.1
         with:
           # Unfortunately we need the whole history and can't use a shallow clone
           # because the Appstream Metadata hook parses the history to find the
@@ -38,7 +38,7 @@ jobs:
           git config --global --list
 
       - name: "Detect code style issues (push)"
-        uses: pre-commit/[email protected].0
+        uses: pre-commit/[email protected].1
         if: github.event_name == 'push'
         # 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
@@ -47,7 +47,7 @@ jobs:
           SKIP: clang-format,eslint,no-commit-to-branch
 
       - name: "Detect code style issues (pull_request)"
-        uses: pre-commit/[email protected].0
+        uses: pre-commit/[email protected].1
         if: github.event_name == 'pull_request'
         env:
           SKIP: no-commit-to-branch
@@ -67,14 +67,14 @@ jobs:
 
       - name: "Upload patch artifact"
         if: failure() && env.UPLOAD_PATCH_FILE != null
-        uses: actions/upload-artifact@v3.1.2
+        uses: actions/upload-artifact@v4.3.1
         with:
           name: ${{ env.UPLOAD_PATCH_FILE }}
           path: ${{ env.UPLOAD_PATCH_FILE }}
 
       - name: "Upload pre-commit.log"
         if: failure() && env.UPLOAD_PATCH_FILE == null
-        uses: actions/upload-artifact@v3.1.2
+        uses: actions/upload-artifact@v4.3.1
         with:
           name: pre-commit.log
           path: /github/home/.cache/pre-commit/pre-commit.log

.github/workflows/stale.yml

@@ -15,7 +15,7 @@ jobs:
       pull-requests: write # for actions/stale to close stale PRs
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v7
+      - uses: actions/stale@v9
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           stale-pr-message: "This PR is marked as stale because it has been open 90 days with no activity."

.tx/config

@@ -1,7 +1,7 @@
 [main]
 host = https://www.transifex.com
 
-[o:mixxx-dj-software:p:mixxxdj:r:mixxx2-4]
+[o:mixxx-dj-software:p:mixxxdj:r:mixxx2-5]
 file_filter  = res/translations/mixxx_<lang>.ts
 source_file  = res/translations/mixxx.ts
 source_lang  = en