Merge remote-tracking branch 'upstream/2.6'

Author: daschuer

.github/workflows/build.yml

@@ -283,7 +283,6 @@ jobs:
         env:
           CC: ${{ matrix.cc }}
           CXX: ${{ matrix.cxx }}
-          CMAKE_BUILD_PARALLEL_LEVEL: 2
           # GitHub Actions automatically zstd compresses caches
           CCACHE_NOCOMPRESS: true
 
@@ -366,7 +365,7 @@ jobs:
         run: |
           if [[ "${{ github.ref }}" == "refs/heads/main" ]] && [[ "${{ github.repository }}" == "mixxxdj/mixxx" ]]; then
             CPACK_ARGS="-D DEB_UPLOAD_PPA=ppa:mixxx/nightlies"
-          elif [[ "${{ github.ref }}" == "refs/heads/2.5" ]] && [[ "${{ github.repository }}" == "mixxxdj/mixxx" ]]; then
+          elif [[ "${{ github.ref }}" == "refs/heads/2.6" ]] && [[ "${{ github.repository }}" == "mixxxdj/mixxx" ]]; then
             CPACK_ARGS="-D DEB_UPLOAD_PPA=ppa:mixxx/mixxxbetas"
           elif [[ "${{ github.ref }}" =~ ^refs/tags/[0-9]+\.[0-9]+\.[0-9]+$ ]] && [[ "${{ github.repository }}" == "mixxxdj/mixxx" ]]; then
             CPACK_ARGS="-D DEB_UPLOAD_PPA=ppa:mixxx/mixxx"

.github/workflows/softfix.yml

@@ -31,6 +31,6 @@ jobs:
         uses: actions/checkout@v4
       - name: Softfix
         if: steps.check-maintainer.outputs.result == 'true'
-        uses: daschuer/softfix@v3
+        uses: daschuer/softfix@v4
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

CHANGELOG.md

@@ -340,7 +340,7 @@ endif()
 
 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 "alpha") # set to "alpha" "beta" or ""
+set(MIXXX_VERSION_PRERELEASE "beta") # set to "alpha" "beta" or ""
 
 set(CMAKE_PROJECT_HOMEPAGE_URL "https://www.mixxx.org")
 set(
@@ -1571,6 +1571,7 @@ add_library(
   src/widget/wcoverartlabel.cpp
   src/widget/wcoverartmenu.cpp
   src/widget/wcuemenupopup.cpp
+  src/widget/wcuebutton.cpp
   src/widget/wdisplay.cpp
   src/widget/weffectbuttonparametername.cpp
   src/widget/weffectchain.cpp
@@ -4951,14 +4952,7 @@ if(NOT CPACK_DEBIAN_PACKAGE_RELEASE)
   set(CPACK_DEBIAN_PACKAGE_RELEASE 1)
 endif()
 
-set(
-  CPACK_DEBIAN_DISTRIBUTION_RELEASES
-  jammy
-  noble
-  oracular
-  plucky
-  questing
-)
+set(CPACK_DEBIAN_DISTRIBUTION_RELEASES noble oracular plucky questing)
 set(CPACK_DEBIAN_SOURCE_DIR ${CMAKE_SOURCE_DIR})
 set(
   CPACK_DEBIAN_UPLOAD_PPA_SCRIPT

CMakeLists.txt

@@ -58,6 +58,8 @@ To build Mixxx, run
 There should now be a `mixxx` executable in the current directory that you can
 run. Alternatively, can generate a package using `cpack`.
 
+Detailed build instructions for each target OS can be found [on the wiki](https://github.com/mixxxdj/mixxx/wiki#compile-mixxx-from-source-code)
+
 ## Documentation
 
 For help using Mixxx, there are a variety of options:

README.md

@@ -1140,7 +1140,7 @@ MC7000.TrackPositionLEDs = function(value, group) {
     if (!MC7000.experimental) {
         return;
     }
-    if (MC7000.PADModeSlicer[deckIndex]) {
+    if (MC7000.PADMode[deckIndex] === "Slicer") {
         // only send new LED status when beatCountLED really changes
         if (MC7000.prevPadLED[deckIndex] !== beatCountLED) {
             // first set all LEDs to default color incl shifted

res/controllers/Denon-MC7000-scripts.js

@@ -1548,10 +1548,10 @@ MixtrackPlatinumFX.Browse = function() {
                     engine.stopTimer(this.speedTimer);
                     this.speedTimer = 0;
                 }
-                this.speedTimer = engine.beginTimer(100, function() {
+                this.speedTimer = engine.beginTimer(100, (function() {
                     this.speed=0;
                     this.speedTimer = 0;
-                }, true);
+                }).bind(this), true);
                 this.speed++;
                 direction = (value > 0x40) ? value - 0x80 : value;
                 if (MixtrackPlatinumFX.shifted) {

res/controllers/Numark-Mixtrack-Platinum-FX-scripts.js

@@ -15,4 +15,16 @@
             <file filename="Traktor-Kontrol-S4-MK2-hid-scripts.js" functionprefix="TraktorS4MK2"/>
         </scriptfiles>
     </controller>
+    <settings>
+      <option variable="remixSlotButtonAction" type="enum"
+              label="Action to trigger with remix slot buttons">
+        <value label="Samplers" default="true">SAMPLES</value>
+        <value label="Loop Rolls">LOOPROLLS</value>
+      </option>
+      <option variable="shiftCueButtonAction" type="enum"
+              label="The action to trigger when Shift+Cue is pressed">
+        <value label="Rewind to start of track" default="true">REWIND</value>
+        <value label="Reverse playback direction">REVERSEROLL</value>
+      </option>
+    </settings>
 </MixxxControllerPreset>

res/controllers/Traktor Kontrol S4 MK2.hid.xml

@@ -13,28 +13,13 @@
 // * Find a use for snap / master / other unused buttons?
 
 
-// ==== Friendly User Configuration ====
-// The Remix Slot buttons can have two possible functions:
-// 1. Sample launchers: pressing the buttons activates sample players in Mixxx
-// 2. Loop Roll: Holding the buttons activates a short loop, and when the button is
-//    released playback will resume where the track would have been without the loop.
-// To choose sample launching, set the word in quotes below to SAMPLES, all caps.  For
-// rolls, change the word to LOOPROLLS (no space).
-RemixSlotButtonAction = "SAMPLES";
-// The Cue button, when Shift is also held, can have two possible functions:
-// 1. "REWIND": seeks to the very start of the track.
-// 2. "REVERSEROLL": performs a temporary reverse or "censor" effect, where the track
-//    is momentarily played in reverse until the button is released.
-ShiftCueButtonAction = "REWIND";
-
-
 TraktorS4MK2 = new function() {
     this.controller = new HIDController();
     // TODO: Decide if these should be part of this.controller instead.
     this.partial_packet = Object();
     this.divisor_map = Object();
-    this.RemixSlotButtonAction = RemixSlotButtonAction;
-    this.ShiftCueButtonAction = ShiftCueButtonAction;
+    this.RemixSlotButtonAction = engine.getSetting("remixSlotButtonAction");
+    this.ShiftCueButtonAction = engine.getSetting("shiftCueButtonAction");
 
     // When true, packets will not be sent to the controller.  Good for doing mass updates.
     this.controller.freeze_lights = false;