Merge remote-tracking branch 'upstream/2.4'

mixxxdj · Mar 23, 2023 · b3599bf · b3599bf
2 parents 060b0e9 + 0e7601c
commit b3599bf
Show file tree

Hide file tree

Showing 43 changed files with 1,528 additions and 1,277 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -36,11 +36,8 @@ jobs:
             artifacts_path: build/*.deb
             artifacts_slug: ubuntu-jammy
             qt_qpa_platform: offscreen
-          - name: Arch Linux (Qt 6.3, gcc)
+          - name: Ubuntu 22.04 (Qt 6.2, gcc)
             os: ubuntu-22.04
-            # The Dockerfile for this container can be found at:
-            # https://github.com/Holzhaus/mixxx-ci-docker
-            container: holzhaus/mixxx-ci:20220612-qt6
             cmake_args: >-
               -DWARNINGS_FATAL=ON
               -DQT6=ON
@@ -54,6 +51,12 @@ jobs:
             ctest_args: []
             compiler_cache: ccache
             compiler_cache_path: ~/.ccache
+            cpack_generator: DEB
+            buildenv_basepath: /home/runner/buildenv
+            buildenv_script: tools/debian_buildenv_qt6.sh
+            artifacts_name: Ubuntu 22.04 Qt6 DEB
+            artifacts_path: build/*.deb
+            artifacts_slug: ubuntu-jammy
             qt_qpa_platform: offscreen
           - name: macOS 11
             os: macos-11

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -118,10 +118,11 @@ repos:
     hooks:
       - id: prettier
         types: [yaml]
-  - repo: https://github.com/qarmin/qml_formatter.git
-    rev: 0.2.0
-    hooks:
-      - id: qml_formatter
+  # disabled until  https://github.com/mixxxdj/mixxx/issues/11386 is fixed
+  #- repo: https://github.com/qarmin/qml_formatter.git
+  #  rev: 0.2.0
+  #  hooks:
+  #    - id: qml_formatter
   - repo: local
     hooks:
       - id: qsscheck

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -205,7 +205,7 @@
 * Fix an issue when pressing multiple cue buttons at the same time [#3382](https://github.com/mixxxdj/mixxx/pull/3382)
 * Fix synchronization of main cue point/position
   [#4137](https://github.com/mixxxdj/mixxx/pull/4137)
-  [lp1937074](https://github.com/mixxxdj/mixxx/issues/10478)
+  [#10478](https://github.com/mixxxdj/mixxx/issues/10478)
   [#4153](https://github.com/mixxxdj/mixxx/pull/4153)
 * Add halve/double controls for beatjump size [#4269](https://github.com/mixxxdj/mixxx/pull/4269)
 * Fix possible segfault when ejecting track [#4362](https://github.com/mixxxdj/mixxx/pull/4362) [#10497](https://github.com/mixxxdj/mixxx/issues/10497)
@@ -476,7 +476,7 @@
   [#4704](https://github.com/mixxxdj/mixxx/pull/4704)
   [#4748](https://github.com/mixxxdj/mixxx/pull/4748)
   [#4833](https://github.com/mixxxdj/mixxx/pull/4833) [#10762](https://github.com/mixxxdj/mixxx/issues/10762)
-  [#4884](https://github.com/mixxxdj/mixxx/pull/4884) [#10802](https://github.com/mixxxdj/mixxx/issues/10802) [lp1983764](https://github.com/mixxxdj/mixxx/issues/10801)
+  [#4884](https://github.com/mixxxdj/mixxx/pull/4884) [#10802](https://github.com/mixxxdj/mixxx/issues/10802)   [#10801](https://github.com/mixxxdj/mixxx/issues/10801)
   [#4899](https://github.com/mixxxdj/mixxx/pull/4899)
   [#8817](https://github.com/mixxxdj/mixxx/pull/8817)
   [#10868](https://github.com/mixxxdj/mixxx/pull/10868)
@@ -904,7 +904,7 @@
 ### Controller Fixes
 
 * Traktor S3: Fix issues with sampler and hotcue buttons [#4676](https://github.com/mixxxdj/mixxx/pull/4676)
-* Numark DJ2GO2: Fix sliders and knobs [#4835](https://github.com/mixxxdj/mixxx/pull/4835) [lp:1948596](https://bugs.launchpad.net/mixxx/+bug/1948596)
+* Numark DJ2GO2: Fix sliders and knobs [#4835](https://github.com/mixxxdj/mixxx/pull/4835) [#10586](https://github.com/mixxxdj/mixxx/issues/10586)
 * Numark DJ2Go2: Support HotCue clear with pad [#10841](https://github.com/mixxxdj/mixxx/pull/10841)
 * Numark DJ2Go2: Fix inverted tempo fader [#10852](https://github.com/mixxxdj/mixxx/pull/10852) [#10586](https://github.com/mixxxdj/mixxx/issues/10586)
 * Numark N4: Inverted pitch slider, to match the GUI orientation [#11057](https://github.com/mixxxdj/mixxx/pull/11046)
@@ -954,7 +954,7 @@
 * Playlist: Enable sorting by color [#4352](https://github.com/mixxxdj/mixxx/pull/4352) [#10546](https://github.com/mixxxdj/mixxx/issues/10546)
 * Fix crash when using Doubling/Halving/etc. BPM from track's Properties window on tracks without BPM [#4587](https://github.com/mixxxdj/mixxx/pull/4587) [#10625](https://github.com/mixxxdj/mixxx/issues/10625)
 * Fix writing metadata on Windows for files that have never been played [#4586](https://github.com/mixxxdj/mixxx/pull/4586) [#10620](https://github.com/mixxxdj/mixxx/issues/10620)
-* Preserve file creation time when writing metadata on Windows [#4586](https://github.com/mixxxdj/mixxx/pull/4586) [lp1955314](https://github.com/mixxxdj/mixxx/issues/10619)
+* Preserve file creation time when writing metadata on Windows [#4586](https://github.com/mixxxdj/mixxx/pull/4586) [#10619](https://github.com/mixxxdj/mixxx/issues/10619)
 * Fix handling of file extension when importing and exporting sampler settings [#4539](https://github.com/mixxxdj/mixxx/pull/4539)
 * Fix crash when using an empty directory as resource path using the `--resource-path` command line option [#4575](https://github.com/mixxxdj/mixxx/pull/4575) [#10461](https://github.com/mixxxdj/mixxx/issues/10461)
 * Pioneer DDJ-SB3: Add controller mapping [#3821](https://github.com/mixxxdj/mixxx/pull/3821)
@@ -983,14 +983,14 @@
 * Denon MC7000: Improve slip mode and jog wheel handling [#4021](https://github.com/mixxxdj/mixxx/pull/4021) [#4324](https://github.com/mixxxdj/mixxx/pull/4324)
 * Disabled detection of keyboards and mice as HID controllers [#4243](https://github.com/mixxxdj/mixxx/pull/4243)
 * Disabled detection of all HID controllers with Apple's vendor ID. Apple doesn't build actual controllers. [#4260](https://github.com/mixxxdj/mixxx/pull/4260) [#4273](https://github.com/mixxxdj/mixxx/pull/4273)
-* Add support for HiDPI scale factors of 125% and 175% (only with Qt 5.14+) [lp1938102](https://github.com/mixxxdj/mixxx/issues/10485) [#4161](https://github.com/mixxxdj/mixxx/pull/4161)
-* Fix unhandled exception when parsing corrupt Rekordbox PDB files [lp1933853](https://github.com/mixxxdj/mixxx/issues/10452) [#4040](https://github.com/mixxxdj/mixxx/pull/4040)
+* Add support for HiDPI scale factors of 125% and 175% (only with Qt 5.14+) [#10485](https://github.com/mixxxdj/mixxx/issues/10485) [#4161](https://github.com/mixxxdj/mixxx/pull/4161)
+* Fix unhandled exception when parsing corrupt Rekordbox PDB files [#10452](https://github.com/mixxxdj/mixxx/issues/10452) [#4040](https://github.com/mixxxdj/mixxx/pull/4040)
 * Fix Echo effect adding left channel samples to right channel [#4141](https://github.com/mixxxdj/mixxx/pull/4141)
-* Fix bad phase seek when starting from preroll [lp1930143](https://github.com/mixxxdj/mixxx/issues/10423) [#4093](https://github.com/mixxxdj/mixxx/pull/4093)
+* Fix bad phase seek when starting from preroll [#10423](https://github.com/mixxxdj/mixxx/issues/10423) [#4093](https://github.com/mixxxdj/mixxx/pull/4093)
 * Fix bad phase seek when a channel's audible status changes [#4156](https://github.com/mixxxdj/mixxx/pull/4156)
 * Tango skin: Show crossfader assign buttons by default [#4046](https://github.com/mixxxdj/mixxx/pull/4046)
 * Fix keyfinder library in arm64 builds [#4047](https://github.com/mixxxdj/mixxx/pull/4047)
-* Fix wrong track being recorded in History [lp1933991](https://github.com/mixxxdj/mixxx/issues/10454) [#4041](https://github.com/mixxxdj/mixxx/pull/4041) [#4059](https://github.com/mixxxdj/mixxx/pull/4059) [#4107](https://github.com/mixxxdj/mixxx/pull/4107) [#4296](https://github.com/mixxxdj/mixxx/pull/4296)
+* Fix wrong track being recorded in History [#10454](https://github.com/mixxxdj/mixxx/issues/10454) [#4041](https://github.com/mixxxdj/mixxx/pull/4041) [#4059](https://github.com/mixxxdj/mixxx/pull/4059) [#4107](https://github.com/mixxxdj/mixxx/pull/4107) [#4296](https://github.com/mixxxdj/mixxx/pull/4296)
 * Fix support for relative paths in the skin system which caused missing images in third-party skins [#4151](https://github.com/mixxxdj/mixxx/pull/4151)
 * Fix relocation of directories with special/reserved characters in path name [#4146](https://github.com/mixxxdj/mixxx/pull/4146)
 * Update keyboard shortcuts sheet [#4042](https://github.com/mixxxdj/mixxx/pull/4042)
@@ -1006,8 +1006,8 @@
 * Library sidebar: Also activate items on PageUp/Down events. [#4237](https://github.com/mixxxdj/mixxx/pull/4237)
 * Fix handling of preview button cell events in developer mode. [#4264](https://github.com/mixxxdj/mixxx/pull/4264) [#10418](https://github.com/mixxxdj/mixxx/issues/10418)
 * Auto DJ: Fix bug which could make an empty track stop Auto DJ. [#4267](https://github.com/mixxxdj/mixxx/pull/4267) [#10504](https://github.com/mixxxdj/mixxx/issues/10504)
-* Fix Auto DJ skipping tracks randomly [#4319](https://github.com/mixxxdj/mixxx/pull/4319) [lp1941989](https://github.com/mixxxdj/mixxx/issues/10505)
-* Fix high CPU load due to extremely high internal sync clock values [#4312](https://github.com/mixxxdj/mixxx/pull/4312) [lp1943320](https://github.com/mixxxdj/mixxx/issues/10520)
+* Fix Auto DJ skipping tracks randomly [#4319](https://github.com/mixxxdj/mixxx/pull/4319) [#10505](https://github.com/mixxxdj/mixxx/issues/10505)
+* Fix high CPU load due to extremely high internal sync clock values [#4312](https://github.com/mixxxdj/mixxx/pull/4312) [#10520](https://github.com/mixxxdj/mixxx/issues/10520)
 * Fix preference option for re-analyzing beatgrids imported from other software [#4288](https://github.com/mixxxdj/mixxx/pull/4288)
 * Fix wrong base tag used for deployment and displayed in About dialog [#4070](https://github.com/mixxxdj/mixxx/pull/4070)
 
@@ -1138,7 +1138,7 @@
 * Update controller mapping for Allen & Heath Xone K2 to add intro/outro cues [#2236](https://github.com/mixxxdj/mixxx/pull/2236)
 * Update controller mapping for Hercules P32 for more accurate headmix control [#3537](https://github.com/mixxxdj/mixxx/pull/3537)
 * Update controller mapping for Native Instruments Traktor Kontrol S4MK2 to add auto-slip mode and pitch fader range [#3331](https://github.com/mixxxdj/mixxx/pull/3331)
-* Fix Pioneer DDJ-SB2 controller mapping auto tempo going to infinity bug [#2559](https://github.com/mixxxdj/mixxx/pull/2559) [lp:1846403](https://bugs.launchpad.net/mixxx/+bug/1846403)
+* Fix Pioneer DDJ-SB2 controller mapping auto tempo going to infinity bug [#2559](https://github.com/mixxxdj/mixxx/pull/2559) [#9838](https://github.com/mixxxdj/mixxx/issues/9838)
 * Fix Numark Mixtrack Pro 3 controller mapping inverted FX on/off control [#3758](https://github.com/mixxxdj/mixxx/pull/3758)
 * Gracefully handle MIDI overflow [#825](https://github.com/mixxxdj/mixxx/pull/825)
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2767,9 +2767,9 @@ if(BROADCAST)
   # https://github.com/mixxxdj/mixxx/issues/9681
   # https://github.com/mixxxdj/mixxx/issues/10305
   if(Shoutidjc_FOUND AND Shoutidjc_VERSION VERSION_LESS 2.4.4)
-      message(STATUS "Installed libshout-idjc version: ${Shoutidjc_VERSION} is suffering from bug lp1833225")
+      message(STATUS "Installed libshout-idjc version: ${Shoutidjc_VERSION} is suffering from issue #9681")
   elseif(Shoutidjc_FOUND AND Shoutidjc_VERSION VERSION_LESS 2.4.6)
-      message(STATUS "Installed libshout version: ${Shout_VERSION} is suffering from bug lp1913579")
+      message(STATUS "Installed libshout version: ${Shout_VERSION} is suffering from issue #10305")
   endif()
   if(NOT Shoutidjc_FOUND OR Shoutidjc_VERSION VERSION_LESS 2.4.6)
     # Fall back to internal library in the lib tree

diff --git a/lib/fidlib/fidlib.c b/lib/fidlib/fidlib.c
@@ -255,7 +255,7 @@ extern FidFilter *mkfilter(char *, ...);
 //
 
 // Macro for local inline routines that shouldn't be visible externally
-// See Mixxx Bug #1179683
+// See Mixxx Issue #7030
 #if defined(T_MINGW) || defined(T_MSVC)
  #define STATIC_INLINE static __inline
 #else