Merge remote-tracking branch 'origin/main' into LateNightQML/Deck-week6

Author: xARSENICx

.github/workflows/labeler.yml

@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-slim
 
     steps:
-      - uses: actions/labeler@v6.1.0
+      - uses: actions/labeler@v6.2.0
         with:
           repo-token: "${{ secrets.GITHUB_TOKEN }}"
           sync-labels: false

.github/workflows/pr-command.yml

@@ -7,7 +7,7 @@ jobs:
   softfix:
     name: Softfix action
     if: github.event.issue.pull_request != '' && startsWith(github.event.comment.body, '/softfix')
-    runs-on: ubuntu-slim
+    runs-on: ubuntu-latest
     steps:
       - name: Check if commenter is maintainer
         id: check-maintainer

.pre-commit-config.yaml

@@ -51,7 +51,7 @@ repos:
         # protect main and any branch that has a semver-like name
         args: [-b, main, -p, '^\d+\.\d+(?:\.\d+)?$']
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.4.2
+    rev: v2.4.3
     hooks:
       - id: codespell
         args:
@@ -66,7 +66,7 @@ repos:
           ]
         exclude: ^(packaging/wix/LICENSE.rtf.in|src/dialog/dlgabout\.cpp|res/linux/org\.mixxx\.Mixxx\.desktop|.*\.(?:pot?|(?<!\.d\.)ts|wxl|svg))$
   - repo: https://github.com/pre-commit/mirrors-eslint
-    rev: v10.6.0
+    rev: v10.7.0
     hooks:
       - id: eslint
         args: [--fix, --report-unused-disable-directives]
@@ -77,7 +77,7 @@ repos:
           - pre-commit
           - manual
         additional_dependencies:
-          - eslint@^10.6.0
+          - eslint@^10.7.0
           - "@eslint/js"
           - typescript-eslint
           - eslint-plugin-jsdoc@^v50.4.3

CMakeLists.txt

@@ -3742,7 +3742,7 @@ target_include_directories(mixxx-lib SYSTEM PUBLIC lib/portaudio)
 target_link_libraries(mixxx-lib PRIVATE PortAudioRingBuffer)
 
 # PipeWire
-default_option(PIPEWIRE "Enable the PipeWire backend" "UNIX AND NOT APPLE AND NOT ANDROID")
+option(PIPEWIRE "Enable the PipeWire backend" OFF)
 if(PIPEWIRE)
   find_package(PipeWire REQUIRED)
   target_link_libraries(mixxx-lib PUBLIC PipeWire::PipeWire)

packaging/flatpak/modules/soundtouch.yaml

@@ -5,8 +5,8 @@ config-opts:
   - -DSOUNDSTRETCH=OFF
 sources:
   - type: archive
-    url: https://codeberg.org/soundtouch/soundtouch/archive/2.4.0.tar.gz
-    sha256: 3dda3c9ab1e287f15028c010a66ab7145fa855dfa62763538f341e70b4d10abd
+    url: https://codeberg.org/soundtouch/soundtouch/archive/2.4.1.tar.gz
+    sha256: 35d404e6e8c2ebd12fb4000da6fadd75c99e37eed2126a04721828c11c0377ec
     x-checker-data:
       type: anitya
       project-id: 115722

res/controllers/Numark-Mixtrack-3-scripts.js

@@ -4,25 +4,25 @@
  **********************************************************************/
 // TrackEndWarning: "true": when you reach the end of the track,
 // the jog wheel Button will flash. "false": No flash of Jog Wheel Button
-const TrackEndWarning = engine.getSetting("TrackEndWarning") === "true";
+const TrackEndWarning = engine.getSetting("TrackEndWarning") === true;
 
 //iCutEnabled: iCut mode will automatically cut your track with the cross fader
 // when SHIFT enabled and scratching with the jog wheel
-const iCutEnabled = engine.getSetting("iCutEnabled") === "true";
+const iCutEnabled = engine.getSetting("iCutEnabled") === true;
 
 //activate PFL of deck on track load
-const smartPFL = engine.getSetting("smartPFL") === "true";
+const smartPFL = engine.getSetting("smartPFL") === true;
 
 //Disable Play on Sync button Double Press
-const noPlayOnSyncDoublePress = engine.getSetting("noPlayOnSyncDoublePress") === "true";
+const noPlayOnSyncDoublePress = engine.getSetting("noPlayOnSyncDoublePress") === true;
 
 // Shift+Filter control behavior
 // true (default) - FX parameter 4 (when the FX is focused)
 // false - Channel Gain
-const ShiftFilterFX4 = engine.getSetting("ShiftFilterFX4") === "true";
+const ShiftFilterFX4 = engine.getSetting("ShiftFilterFX4") === true;
 
 // allow pitch bend with wheel when wheel is not active
-const PitchBendOnWheelOff = engine.getSetting("PitchBendOnWheelOff") === "true";
+const PitchBendOnWheelOff = engine.getSetting("PitchBendOnWheelOff") === true;
 
 /**************************
  *  scriptpause

res/qml/Mixxx/Controls/Slider.qml

@@ -13,7 +13,9 @@ Item {
     readonly property real availableHeight: Math.max(0, height - topPadding - bottomPadding)
     readonly property real availableWidth: Math.max(0, width - leftPadding - rightPadding)
     property alias background: backgroundItem.data
-    property alias bar: barPath
+    // A typed property is required so inherited controls accept grouped bindings such as bar.margin.
+    property BarSettings bar: BarSettings {
+    }
     property real bottomPadding: 0
     readonly property real displayValue: dragHandler.active ? dragHandler.value : value
     property real from: 0
@@ -115,17 +117,11 @@ Item {
         ShapePath {
             id: barPath
 
-            property color color: "transparent"
-            property bool enabled: false
-            property real margin: 0
-            property real start: 0
-            property real width: 2
-
             fillColor: "transparent"
             startX: barShape.width * (root.horizontal ? (1 - root.bar.start) : 0.5)
             startY: barShape.height * (root.vertical ? (1 - root.bar.start) : 0.5)
-            strokeColor: color
-            strokeWidth: width
+            strokeColor: root.bar.color
+            strokeWidth: root.bar.width
 
             PathLine {
                 x: root.horizontal ? (barShape.width * root.position) : barPath.startX
@@ -181,4 +177,12 @@ Item {
             event.accepted = true;
         }
     }
+
+    component BarSettings: QtObject {
+        property color color: "transparent"
+        property bool enabled: false
+        property real margin: 0
+        property real start: 0
+        property real width: 2
+    }
 }

src/controllers/hid/hiddevice.cpp

@@ -5,6 +5,7 @@
 #include <QDebugStateSaver>
 
 #include "controllers/controllermappinginfo.h"
+#include "util/path.h"
 #include "util/string.h"
 
 #ifndef Q_OS_ANDROID

src/controllers/rendering/controllerrenderingengine.h

@@ -73,7 +73,7 @@ class ControllerRenderingEngine : public QObject {
 
   signals:
     void frameRendered(const LegacyControllerMapping::ScreenInfo& screeninfo,
-            QImage frame,
+            const QImage& frame,
             const QDateTime& timestamp);
     void stopping();
     /// @brief Request the screen thread to send a frame to the device.

src/controllers/scripting/legacy/controllerscriptenginelegacy.h

@@ -73,7 +73,9 @@ class ControllerScriptEngineLegacy : public ControllerScriptEngineBase {
     /// Emitted when a screen has been rendered.
     // TODO (XXX) Move this signal in ControllerScriptEngineBase when ScreenInfo
     // isn't tight to LegacyControllerMapping anymore.
-    void previewRenderedScreen(const LegacyControllerMapping::ScreenInfo& screen, QImage frame);
+    void previewRenderedScreen(
+            const LegacyControllerMapping::ScreenInfo& screen,
+            const QImage& frame);
 #endif
 
   private: