Merge 2.5

CHANGELOG.md

@@ -197,6 +197,20 @@
 * ci(dependabot): Open PRs against 2.5 branch instead of main [#14060](https://github.com/mixxxdj/mixxx/pull/14060)
 * Happy New Year 2025! [#14098](https://github.com/mixxxdj/mixxx/pull/14098)
 
+## [2.5.1](https://github.com/mixxxdj/mixxx/milestone/45) (unreleased)
+
+### Controller Mappings
+
+* Numark NS6II: Add new controller mapping [#11075](https://github.com/mixxxdj/mixxx/pull/11075)
+* Hercules Inpulse 300: Updated mapping [#14051](https://github.com/mixxxdj/mixxx/pull/14051)
+
+### Fixes
+
+* Deere (64 samplers): Bring back library in regular view
+  [#14101](https://github.com/mixxxdj/mixxx/pull/14101)
+  [#14097](https://github.com/mixxxdj/mixxx/issues/14097)
+* Enable R3 time-stretching with Rubberband 4.0.0 API version numbers [#14100](https://github.com/mixxxdj/mixxx/pull/14100)
+
 ## [2.5.0](https://github.com/mixxxdj/mixxx/issues?q=milestone%3A2.5.0) (2024-12-24)
 
 ### Modernized Platform: Update to Qt6

CMakeLists.txt

@@ -103,12 +103,12 @@ endif()
 
 if(DEFINED MIXXX_VCPKG_ROOT)
   if(
-    EXISTS "$ENV{MIXXX_VCPKG_ROOT}/overlay/ports"
-    OR NOT EXISTS "$ENV{MIXXX_VCPKG_ROOT}/ports"
+    EXISTS "{MIXXX_VCPKG_ROOT}/overlay/ports"
+    OR NOT EXISTS "{MIXXX_VCPKG_ROOT}/ports"
   )
     # MIXXX_VCPKG_ROOT points to our vcpkg environment
     # and we configure the CMAKE_TOOLCHAIN_FILE and overlays accordingly
-    message(STATUS "Using MIXXX_VCPKG_ROOT: $ENV{MIXXX_VCPKG_ROOT}")
+    message(STATUS "Using MIXXX_VCPKG_ROOT: ${MIXXX_VCPKG_ROOT}")
   else()
     message(
       STATUS
@@ -4705,7 +4705,7 @@ if(NOT CPACK_DEBIAN_PACKAGE_RELEASE)
   set(CPACK_DEBIAN_PACKAGE_RELEASE 1)
 endif()
 
-set(CPACK_DEBIAN_DISTRIBUTION_RELEASES jammy mantic noble oracular)
+set(CPACK_DEBIAN_DISTRIBUTION_RELEASES jammy noble oracular plucky)
 set(CPACK_DEBIAN_SOURCE_DIR ${CMAKE_SOURCE_DIR})
 set(
   CPACK_DEBIAN_UPLOAD_PPA_SCRIPT

cmake/modules/GitInfo.cmake

@@ -62,7 +62,7 @@ endif()
 # Get the current commit date
 if(NOT GIT_COMMIT_DATE)
   execute_process(
-    COMMAND git show --quiet --format=%cI --date=short
+    COMMAND git show --quiet --format=%cI --date=short --no-show-signature
     WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
     OUTPUT_VARIABLE GIT_COMMIT_DATE
     OUTPUT_STRIP_TRAILING_WHITESPACE

res/linux/org.mixxx.Mixxx.metainfo.xml

@@ -96,7 +96,7 @@
   Do not edit it manually.
   -->
   <releases>
-    <release version="2.6.0" type="development" date="2025-01-03" timestamp="1735896888">
+    <release version="2.6.0" type="development" date="2025-01-03" timestamp="1735859957">
       <description>
  <p>
   Engine
@@ -689,6 +689,37 @@
    #14098
   </li>
  </ul>
+</description>
+    </release>
+    <release version="2.5.1" type="development" date="2025-01-03" timestamp="1735859957">
+      <description>
+ <p>
+  Controller Mappings
+ </p>
+ <ul>
+  <li>
+   Numark NS6II: Add new controller mapping
+   #11075
+  </li>
+  <li>
+   Hercules Inpulse 300: Updated mapping
+   #14051
+  </li>
+ </ul>
+ <p>
+  Fixes
+ </p>
+ <ul>
+  <li>
+   Deere (64 samplers): Bring back library in regular view
+   #14101
+   #14097
+  </li>
+  <li>
+   Enable R3 time-stretching with Rubberband 4.0.0 API version numbers
+   #14100
+  </li>
+ </ul>
 </description>
     </release>
     <release version="2.5.0" type="stable" date="2024-12-24" timestamp="1734998400">

src/engine/controls/bpmcontrol.cpp

@@ -1134,7 +1134,6 @@ void BpmControl::trackBeatsUpdated(mixxx::BeatsPointer pBeats) {
                                              frameInfo().trackEndPosition)
                                    : mixxx::Bpm());
     }
-    qWarning() << "BpmControl::trackBeatsUpdated";
     m_pBeats = pBeats;
     updateLocalBpm();
     resetSyncAdjustment();

src/engine/sidechain/enginerecord.cpp

@@ -224,9 +224,9 @@ void EngineRecord::process(const CSAMPLE* pBuffer, const std::size_t bufferSize)
 }
 
 QString EngineRecord::getRecordedDurationStr() {
-    return QString("%1:%2")
-                 .arg(m_recordedDuration / 60, 2, 'f', 0, '0')   // minutes
-                 .arg(m_recordedDuration % 60, 2, 'f', 0, '0');  // seconds
+    return QStringLiteral("%1:%2")
+            .arg(m_recordedDuration / 60, 2, 10, QChar('0'))  // minutes
+            .arg(m_recordedDuration % 60, 2, 10, QChar('0')); // seconds
 }
 
 void EngineRecord::writeCueLine() {

src/recording/recordingmanager.cpp

@@ -209,9 +209,9 @@ void RecordingManager::slotDurationRecorded(quint64 duration) {
 
 // Copy from the implementation in enginerecord.cpp
 QString RecordingManager::getRecordedDurationStr(unsigned int duration) {
-    return QString("%1:%2")
-                 .arg(duration / 60, 2, 'f', 0, '0')   // minutes
-                 .arg(duration % 60, 2, 'f', 0, '0');  // seconds
+    return QStringLiteral("%1:%2")
+            .arg(duration / 60, 2, 10, QChar('0'))  // minutes
+            .arg(duration % 60, 2, 10, QChar('0')); // seconds
 }
 
 // Only called when recording is active.

src/widget/wtracktableview.cpp

@@ -1116,23 +1116,30 @@ void WTrackTableView::keyPressEvent(QKeyEvent* event) {
         break;
     }
     TrackModel* pTrackModel = getTrackModel();
-    if (pTrackModel && !pTrackModel->isLocked()) {
-        if (event->matches(QKeySequence::Delete) || event->key() == Qt::Key_Backspace) {
-            removeSelectedTracks();
-            return;
-        }
-        if (event->matches(QKeySequence::Cut)) {
-            cutSelectedTracks();
-            return;
+    if (pTrackModel) {
+        if (!pTrackModel->isLocked()) {
+            if (event->matches(QKeySequence::Delete) || event->key() == Qt::Key_Backspace) {
+                removeSelectedTracks();
+                return;
+            }
+            if (event->matches(QKeySequence::Cut)) {
+                cutSelectedTracks();
+                return;
+            }
+            if (event->matches(QKeySequence::Paste)) {
+                pasteTracks(currentIndex());
+                return;
+            }
+            if (event->key() == Qt::Key_Escape) {
+                clearSelection();
+                setCurrentIndex(QModelIndex());
+            }
         }
+
         if (event->matches(QKeySequence::Copy)) {
             copySelectedTracks();
             return;
         }
-        if (event->matches(QKeySequence::Paste)) {
-            pasteTracks(currentIndex());
-            return;
-        }
         if (event->modifiers().testFlag(Qt::AltModifier) &&
                 (event->key() == Qt::Key_Up ||
                         event->key() == Qt::Key_Down ||
@@ -1144,9 +1151,14 @@ void WTrackTableView::keyPressEvent(QKeyEvent* event) {
             moveSelectedTracks(event);
             return;
         }
-        if (event->key() == Qt::Key_Escape) {
-            clearSelection();
-            setCurrentIndex(QModelIndex());
+        if (event->modifiers().testFlag(Qt::ControlModifier) &&
+                event->modifiers().testFlag(Qt::ShiftModifier) &&
+                event->key() == Qt::Key_C) {
+            // copy the cell content as native QKeySequence::Copy would
+            QKeyEvent ke =
+                    QKeyEvent{QEvent::KeyPress, Qt::Key_C, Qt::ControlModifier};
+            QTableView::keyPressEvent(&ke);
+            return;
         }
     }
     QTableView::keyPressEvent(event);