Numark Mixtrack Pro mapping fix and upgrade v.2.5 - 2.6

.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/workflows/download_cleanup.yml

@@ -27,71 +27,21 @@ jobs:
           mkdir empty_folder
           echo 2.5.1 >> include_file.txt
           echo 2.5.1/manifest.json >> include_file.txt
-          echo 2.5.1/mixxx-2.6-alpha-174-g2c2dda9781-win64* >> include_file.txt
-          echo AzureCodeSigning >> include_file.txt
-          echo AzureCodeSigning/manifest.json >> include_file.txt
-          echo AzureCodeSigning/mixxx-2.6-alpha-* >> include_file.txt
-          echo CAStreamBasicDescription >> include_file.txt
-          echo CAStreamBasicDescription/manifest.json >> include_file.txt
-          echo CAStreamBasicDescription/mixxx-2.4.1-46-* >> include_file.txt
-          echo PR_13709 >> include_file.txt
-          echo PR_13709/manifest.json >> include_file.txt
-          echo PR_13709/mixxx-2.4.1-81-* >> include_file.txt
-          echo azure_signing_update >> include_file.txt
-          echo azure_signing_update/manifest.json >> include_file.txt
-          echo azure_signing_update/mixxx-2.4.1-61-* >> include_file.txt
-          echo chore >> include_file.txt
-          echo chore/upgrade-macos13-xcode15.2 >> include_file.txt
-          echo chore/upgrade-macos13-xcode15.2/manifest.json >> include_file.txt
-          echo chore/upgrade-macos13-xcode15.2/mixxx-2.6-alpha-76-* >> include_file.txt
-          echo daschuer-patch-1 >> include_file.txt
-          echo daschuer-patch-1/manifest.json >> include_file.txt
-          echo daschuer-patch-1/mixxx-2.6-alpha-284-* >> include_file.txt
-          echo dependabot >> include_file.txt
-          echo dependabot/github_actions >> include_file.txt
-          echo dependabot/github_actions/actions >> include_file.txt
-          echo dependabot/github_actions/actions/stale-6 >> include_file.txt
-          echo dependabot/github_actions/actions/stale-6/manifest.json >> include_file.txt
-          echo dependabot/github_actions/actions/stale-6/mixxx-2.4-alpha-1318-* >> include_file.txt
-          echo dependabot/github_actions/actions/upload-artifact-3.1.2 >> include_file.txt
-          echo dependabot/github_actions/actions/upload-artifact-3.1.2/manifest.json >> include_file.txt
-          echo dependabot/github_actions/actions/upload-artifact-3.1.2/mixxx-2.3.3-117-* >> include_file.txt
-          echo fix-14326 >> include_file.txt
-          echo fix-14326/manifest.json >> include_file.txt
-          echo fix-14326/mixxx-2.5.0-68-* >> include_file.txt
-          echo inpulse >> include_file.txt
-          echo inpulse/manifest.json >> include_file.txt
-          echo inpulse/mixxx-2.* >> include_file.txt
-          echo pr >> include_file.txt
-          echo pr/13709 >> include_file.txt
-          echo pr/13709/manifest.json >> include_file.txt
-          echo pr/13709/mixxx-2.4.1-81-* >> include_file.txt
-          echo resolve-from-urls-2.5 >> include_file.txt
-          echo resolve-from-urls-2.5/manifest.json >> include_file.txt
-          echo resolve-from-urls-2.5/mixxx-2.5-beta-100-* >> include_file.txt
-          echo revert-13208-gh13206 >> include_file.txt
-          echo revert-13208-gh13206/mixxx-2.4.1-5-gc71a48b76e-* >> include_file.txt
-          echo revert-13271-revert-13208-gh13206 >> include_file.txt
-          echo revert-13271-revert-13208-gh13206/mixxx-2.4.1-6-* >> include_file.txt
-          echo rg-use-opengl-node-and-add-shaders >> include_file.txt
-          echo rg-use-opengl-node-and-add-shaders/manifest.json >> include_file.txt
-          echo rg-use-opengl-node-and-add-shaders/mixxx-2.6-alpha-* >> include_file.txt
-          echo traktor-s3-updates >> include_file.txt
-          echo traktor-s3-updates/manifest.json >> include_file.txt
-          echo traktor-s3-updates/mixxx-2.6-alpha-* >> include_file.txt
-          echo ts_source_copy_check >> include_file.txt
-          echo ts_source_copy_check/manifest.json >> include_file.txt
-          echo ts_source_copy_check/mixxx-2.4.1-42-* >> include_file.txt
-          echo tsan-fix-13893 >> include_file.txt
-          echo tsan-fix-13893/manifest.json >> include_file.txt
-          echo tsan-fix-13893/mixxx-2.5-beta-83-* >> include_file.txt
-          echo tsan-fix-13895 >> include_file.txt
-          echo tsan-fix-13895/manifest.json >> include_file.txt
-          echo tsan-fix-13895/mixxx-2.5-beta-83-* >> include_file.txt
-          echo waveformwidgetinfo >> include_file.txt
-          echo waveformwidgetinfo/mixxx-2.5-alpha-3* >> include_file.txt
           rsync --verbose --archive --times --recursive --delete --include-from=include_file.txt --exclude=* "empty_folder/" "${SSH_USER}@${SSH_HOST}:${DESTDIR}/snapshots/"
         env:
           DESTDIR: public_html/downloads
           SSH_HOST: downloads-hostgator.mixxx.org
           SSH_USER: mixxx
+
+      - name: Move manifest
+        if: env.SSH_AUTH_SOCK != null
+        run: |
+          ssh "${SSH_USER}@${SSH_HOST}" "
+            set -euo pipefail
+            mv ${DESTDIR}/releases/2.5.3-3-g7a940a8588/manifest.json ${DESTDIR}/releases/2.5.3/manifest.json
+            rm -rf ${DESTDIR}/releases/2.5.3-3-g7a940a8588
+          "
+        env:
+          DESTDIR: public_html/downloads
+          SSH_HOST: downloads-hostgator.mixxx.org
+          SSH_USER: mixxx

.pre-commit-config.yaml

@@ -126,7 +126,7 @@ repos:
       - id: prettier
         types: [yaml]
   - repo: https://github.com/qarmin/qml_formatter.git
-    rev: 37c2513b1b8275a475a160ed2f5b044910335d5f # No release tag yet including #6 fix
+    rev: 706250038bb565f4c630ca3aab09f764faabae67 # No release tag yet including #9 fix
     hooks:
       - id: qml_formatter
   - repo: https://github.com/BlankSpruce/gersemi
@@ -168,6 +168,8 @@ repos:
         language: system
         types: [text]
         files: ^.*\.qml$
+        stages:
+          - manual
       - id: metainfo
         name: metainfo
         description: Update AppStream metainfo releases from CHANGELOG.md.

.tx/config

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

CHANGELOG.md

@@ -1,5 +1,7 @@
 # Changelog
 
+## [2.7.0](https://github.com/mixxxdj/mixxx/milestone/47) (Unreleased)
+
 ## [2.6.0](https://github.com/mixxxdj/mixxx/milestone/44) (Unreleased)
 
 ### STEM file support

CMakeLists.txt

@@ -319,14 +319,13 @@ endif()
 include(CMakeDependentOption)
 
 option(QT6 "Build with Qt6" ON)
-
-# Because of multiple concurrent definition of symbols caused by the rendergraph
-# compile definition we need to disable QML by default. This avoids the risk of
-# undefined behaviour in a stable build.
-# See: https://github.com/mixxxdj/mixxx/issues/14766
-# Once this is fixed we can revert the commit introducing this.
-option(QML "Build with QML" OFF)
-
+cmake_dependent_option(
+  QML
+  "Build with QML"
+  ON
+  "QT6"
+  OFF
+)
 option(QOPENGL "Use QOpenGLWindow based widget instead of QGLWidget" ON)
 
 if(QOPENGL)
@@ -431,9 +430,9 @@ elseif(APPLE)
   endif()
 endif()
 
-project(mixxx VERSION 2.6.0 LANGUAGES C CXX)
+project(mixxx VERSION 2.7.0 LANGUAGES C CXX)
 # Work around missing version suffixes support https://gitlab.kitware.com/cmake/cmake/-/issues/16716
-set(MIXXX_VERSION_PRERELEASE "beta") # set to "alpha" "beta" or ""
+set(MIXXX_VERSION_PRERELEASE "alpha") # set to "alpha" "beta" or ""
 
 set(CMAKE_PROJECT_HOMEPAGE_URL "https://www.mixxx.org")
 set(
@@ -1193,6 +1192,7 @@ add_library(
   src/effects/backends/builtin/metronomeclick.cpp
   src/effects/backends/builtin/moogladder4filtereffect.cpp
   src/effects/backends/builtin/compressoreffect.cpp
+  src/effects/backends/builtin/autogaincontroleffect.cpp
   src/effects/backends/builtin/parametriceqeffect.cpp
   src/effects/backends/builtin/phasereffect.cpp
   src/effects/backends/builtin/reverbeffect.cpp
@@ -1657,6 +1657,7 @@ add_library(
   src/widget/wbasewidget.cpp
   src/widget/wbattery.cpp
   src/widget/wbeatspinbox.cpp
+  src/widget/wbpmeditor.cpp
   src/widget/wcollapsiblegroupbox.cpp
   src/widget/wcolorpicker.cpp
   src/widget/wcolorpickeraction.cpp
@@ -1729,6 +1730,8 @@ add_library(
   src/widget/wwidget.cpp
   src/widget/wwidgetgroup.cpp
   src/widget/wwidgetstack.cpp
+  src/controllers/scripting/javascriptplayerproxy.cpp
+  src/controllers/scripting/javascriptplayerproxy.h
 )
 set(MIXXX_COMMON_PRECOMPILED_HEADER src/util/assert.h)
 set(
@@ -2800,6 +2803,13 @@ if(BUILD_TESTING)
 
   add_executable(mixxx-test ${src-mixxx-test})
 
+  if(HID)
+    target_sources(
+      mixxx-test
+      PRIVATE src/test/controller_hid_reportdescriptor_test.cpp
+    )
+  endif()
+
   if(QML)
     target_sources(
       mixxx-test
@@ -3411,8 +3421,8 @@ else()
     set(CMAKE_FIND_FRAMEWORK FIRST)
   endif()
   set(OpenGL_GL_PREFERENCE "GLVND")
-  find_package(OpenGL REQUIRED)
   if(EMSCRIPTEN)
+    find_package(OpenGL REQUIRED)
     # Emscripten's FindOpenGL.cmake does not create OpenGL::GL
     target_link_libraries(mixxx-lib PRIVATE ${OPENGL_gl_LIBRARY})
     target_compile_definitions(mixxx-lib PUBLIC QT_OPENGL_ES_2)
@@ -3424,7 +3434,12 @@ else()
       PUBLIC -sMIN_WEBGL_VERSION=2 -sMAX_WEBGL_VERSION=2 -sFULL_ES2=1
     )
   else()
-    target_link_libraries(mixxx-lib PRIVATE OpenGL::GL)
+    find_package(WrapOpenGL REQUIRED)
+    if(OPENGL_opengl_LIBRARY)
+      target_link_libraries(mixxx-lib PRIVATE OpenGL::OpenGL)
+    else()
+      target_link_libraries(mixxx-lib PRIVATE OpenGL::GL)
+    endif()
   endif()
   if(UNIX AND QGLES2)
     target_compile_definitions(mixxx-lib PUBLIC QT_OPENGL_ES_2)
@@ -3567,6 +3582,15 @@ if(QML)
 
   set(QT_QML_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/qml)
   qt_add_library(mixxx-qml-lib STATIC)
+
+  if(WIN32)
+    target_compile_definitions(mixxx-qml-lib PUBLIC __WINDOWS__)
+  endif()
+
+  if(ENGINEPRIME)
+    target_compile_definitions(mixxx-qml-lib PUBLIC __ENGINEPRIME__)
+  endif()
+
   foreach(component ${QT_COMPONENTS})
     target_link_libraries(
       mixxx-qml-lib
@@ -3639,23 +3663,31 @@ if(QML)
       src/qml/qmlapplication.cpp
       src/qml/qmlautoreload.cpp
       src/qml/qmlbeatsmodel.cpp
-      src/qml/qmlcuesmodel.cpp
-      src/qml/qmlcontrolproxy.cpp
+      src/qml/qmlchainpresetmodel.cpp
       src/qml/qmlconfigproxy.cpp
+      src/qml/qmlcontrolproxy.cpp
+      src/qml/qmlcuesmodel.cpp
       src/qml/qmldlgpreferencesproxy.cpp
       src/qml/qmleffectmanifestparametersmodel.cpp
-      src/qml/qmleffectsmanagerproxy.cpp
       src/qml/qmleffectslotproxy.cpp
+      src/qml/qmleffectsmanagerproxy.cpp
       src/qml/qmllibraryproxy.cpp
+      src/qml/qmllibrarysource.cpp
+      src/qml/qmllibrarysourcetree.cpp
       src/qml/qmllibrarytracklistmodel.cpp
+      src/qml/qmlmixxxcontrollerscreen.cpp
       src/qml/qmlplayermanagerproxy.cpp
       src/qml/qmlplayerproxy.cpp
+      src/qml/qmlsidebarmodelproxy.cpp
+      src/qml/qmllibrarytracklistcolumn.cpp
+      src/qml/qmltrackproxy.cpp
       src/qml/qmlvisibleeffectsmodel.cpp
-      src/qml/qmlchainpresetmodel.cpp
-      src/qml/qmlwaveformoverview.cpp
-      src/qml/qmlmixxxcontrollerscreen.cpp
       src/qml/qmlwaveformdisplay.cpp
+      src/qml/qmlwaveformoverview.cpp
       src/qml/qmlwaveformrenderer.cpp
+      src/qml/qmlsettingparameter.cpp
+      src/qml/qmltrackproxy.cpp
+      src/qml/qmlsoundmanagerproxy.cpp
       src/waveform/renderers/allshader/digitsrenderer.cpp
       src/waveform/renderers/allshader/waveformrenderbeat.cpp
       src/waveform/renderers/allshader/waveformrenderer.cpp
@@ -4117,6 +4149,7 @@ elseif(UNIX AND NOT APPLE AND NOT EMSCRIPTEN)
   if(${X11_FOUND})
     target_include_directories(mixxx-lib SYSTEM PUBLIC "${X11_INCLUDE_DIR}")
     target_link_libraries(mixxx-lib PRIVATE "${X11_LIBRARIES}")
+    target_compile_definitions(mixxx-lib PUBLIC __X11__)
   endif()
   find_package(Qt${QT_VERSION_MAJOR} COMPONENTS DBus REQUIRED)
   target_link_libraries(mixxx-lib PUBLIC Qt${QT_VERSION_MAJOR}::DBus)
@@ -4331,6 +4364,9 @@ if(RUBBERBAND)
   find_package(rubberband REQUIRED)
   target_link_libraries(mixxx-lib PRIVATE rubberband::rubberband)
   target_compile_definitions(mixxx-lib PUBLIC __RUBBERBAND__)
+  if(QML)
+    target_compile_definitions(mixxx-qml-lib PUBLIC __RUBBERBAND__)
+  endif()
   target_sources(
     mixxx-lib
     PRIVATE
@@ -4825,12 +4861,14 @@ if(HID)
   target_sources(
     mixxx-lib
     PRIVATE
+      src/controllers/controllerhidreporttabsmanager.cpp
       src/controllers/hid/hidcontroller.cpp
       src/controllers/hid/hidiothread.cpp
       src/controllers/hid/hidioglobaloutputreportfifo.cpp
       src/controllers/hid/hidiooutputreport.cpp
       src/controllers/hid/hiddevice.cpp
       src/controllers/hid/hidenumerator.cpp
+      src/controllers/hid/hidreportdescriptor.cpp
       src/controllers/hid/hidusagetables.cpp
       src/controllers/hid/legacyhidcontrollermapping.cpp
       src/controllers/hid/legacyhidcontrollermappingfilehandler.cpp
@@ -4893,7 +4931,14 @@ if(VINYLCONTROL)
   add_library(mixxx-xwax STATIC EXCLUDE_FROM_ALL)
   target_sources(
     mixxx-xwax
-    PRIVATE lib/xwax/timecoder.c lib/xwax/lut.c lib/xwax/pitch_kalman.c
+    PRIVATE
+      lib/xwax/timecoder.c
+      lib/xwax/timecoder_mk2.c
+      lib/xwax/lut.c
+      lib/xwax/lut_mk2.c
+      lib/xwax/filters.c
+      lib/xwax/delayline.c
+      lib/xwax/pitch_kalman.c
   )
   target_include_directories(mixxx-xwax SYSTEM PUBLIC lib/xwax)
   target_link_libraries(mixxx-lib PRIVATE mixxx-xwax)

LICENSE

@@ -1,4 +1,4 @@
-Mixxx 2.6-beta, Digital DJ'ing software.
+Mixxx 2.7-alpha, Digital DJ'ing software.
 Copyright (C) 2001-2025 Mixxx Development Team
 
 Mixxx is free software; you can redistribute it and/or modify