Merge remote-tracking branch 'upstream/2.4' into 2.5

mixxxdj · Aug 1, 2024 · 22be583 · 22be583
2 parents cd959a6 + b1b9a2e
commit 22be583
Show file tree

Hide file tree

Showing 10 changed files with 66 additions and 28 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -131,7 +131,7 @@ jobs:
       artifact-windows-win64: ${{ steps.prepare_deploy.outputs.artifact-windows-win64 }}
     steps:
       - name: "Check out repository"
-        uses: actions/[email protected].6
+        uses: actions/[email protected].7
         with:
           # This is necessary for making `git describe` work.
           fetch-depth: 0
@@ -470,7 +470,7 @@ jobs:
 
       - name: "Upload GitHub Actions artifacts"
         if: matrix.artifacts_path != null
-        uses: actions/[email protected].3
+        uses: actions/[email protected].4
         with:
           name: ${{ matrix.artifacts_name }}
           path: ${{ matrix.artifacts_path }}
@@ -486,7 +486,7 @@ jobs:
     if: always() && github.repository == 'mixxxdj/mixxx'
     steps:
       - name: "Check out repository"
-        uses: actions/[email protected].6
+        uses: actions/[email protected].7
         with:
           fetch-depth: 0
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -388,7 +388,9 @@
   [#13196](https://github.com/mixxxdj/mixxx/pull/13196)
   [#13134](https://github.com/mixxxdj/mixxx/issues/13134)
 * Numark PartyMix: Fix EQ (script binding) display name [#13255](https://github.com/mixxxdj/mixxx/pull/13255)
-* Numark Scratch: Add initial mapping [#4834](https://github.com/mixxxdj/mixxx/pull/4834)
+* Numark Scratch: Add initial mapping
+  [#4834](https://github.com/mixxxdj/mixxx/pull/4834)
+  [#13375](https://github.com/mixxxdj/mixxx/pull/13375)
 * Sony SIXAXIS: Fix mapping [#13319](https://github.com/mixxxdj/mixxx/pull/13319)
 
 ### Fixes
@@ -422,6 +424,10 @@
 * Hardware preferences: Fix UX when applying config with missing/busy devices
   [#13312](https://github.com/mixxxdj/mixxx/pull/13312)
 * Fix minor 64 bit CPU performance issue [#13355](https://github.com/mixxxdj/mixxx/pull/13355)
+* Fix clicks at loop-out when looping into lead-in [#13294](https://github.com/mixxxdj/mixxx/pull/13294)
+* Fix wrong pitch value on startup, caused by `components.Pot`
+  [#11814](https://github.com/mixxxdj/mixxx/issues/11814)
+  [#13463](https://github.com/mixxxdj/mixxx/pull/13463)
 
 ## [2.4.1](https://github.com/mixxxdj/mixxx/milestone/41?closed=1) (2024-05-08)
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2587,6 +2587,13 @@ add_library(rekordbox_metadata STATIC EXCLUDE_FROM_ALL
 target_include_directories(rekordbox_metadata SYSTEM PUBLIC lib/rekordbox-metadata)
 target_link_libraries(mixxx-lib PRIVATE rekordbox_metadata)
 
+#silence "enumeration values not handled in switch" in generated code
+if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
+    target_compile_options(rekordbox_metadata PRIVATE -Wno-switch)
+elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+    target_compile_options(rekordbox_metadata PRIVATE /w44063)
+endif()
+
 # Kaitai for reading Rekordbox libraries
 add_library(Kaitai STATIC EXCLUDE_FROM_ALL
   lib/kaitai/kaitai/kaitaistream.cpp

diff --git a/res/linux/org.mixxx.Mixxx.metainfo.xml b/res/linux/org.mixxx.Mixxx.metainfo.xml
@@ -1119,6 +1119,7 @@
   <li>
    Numark Scratch: Add initial mapping
    #4834
+   #13375
   </li>
   <li>
    Sony SIXAXIS: Fix mapping
@@ -1188,6 +1189,16 @@
    Fix minor 64 bit CPU performance issue
    #13355
   </li>
+  <li>
+   Fix clicks at loop-out when looping into lead-in
+   #13294
+  </li>
+  <li>
+   Fix wrong pitch value on startup, caused by
+   components.Pot
+   #11814
+   #13463
+  </li>
  </ul>
 </description>
     </release>

diff --git a/res/skins/Deere/tool_bar.xml b/res/skins/Deere/tool_bar.xml
@@ -34,8 +34,7 @@
               <Time>
                 <TooltipId>time</TooltipId>
                 <ObjectName>Time</ObjectName>
-                <Size>52f,20f</Size>
-                <CustomFormat>hh:mm</CustomFormat>
+                <Size>56f,20f</Size>
               </Time>
 
               <Template src="skin:vumeter_latency.xml">

diff --git a/res/skins/LateNight/toolbar.xml b/res/skins/LateNight/toolbar.xml
@@ -144,7 +144,6 @@
         <Children>
           <Time>
             <TooltipId>time</TooltipId>
-            <CustomFormat>hh:mm</CustomFormat>
           </Time>
         </Children>
       </WidgetGroup>

diff --git a/res/skins/Shade/mixer_panel.xml b/res/skins/Shade/mixer_panel.xml
@@ -496,21 +496,30 @@
               Text- Clock display
               **********************************************
               -->
-              <Time>
-                <TooltipId>time</TooltipId>
+              <WidgetGroup>
+                <Pos>101,14</Pos>
+                <Size>50f,14f</Size>
+                <Layout>horizontal</Layout>
                 <Style>
-                  QLabel {
-                    font-size: 10px;
-                    font-weight: bold;
-                    background-color: transparent;
-                    color: #191F24;
-                    text-align:center;
+                  WWidgetGroup {
+                    align: center;
                   }
                 </Style>
-                <Pos>113,14</Pos>
-                <CustomFormat>hh:mm</CustomFormat>
-                <ShowSeconds>false</ShowSeconds>
-              </Time>
+                <Children>
+                  <Time>
+                    <TooltipId>time</TooltipId>
+                    <Style>
+                      QLabel {
+                        font-size: 10px;
+                        font-weight: bold;
+                        background-color: transparent;
+                        color: #191F24;
+                        text-align:center;
+                      }
+                    </Style>
+                  </Time>
+                </Children>
+              </WidgetGroup>
 
               <StatusLight>
                 <Pos>113,27</Pos>

diff --git a/res/skins/Tango/topbar.xml b/res/skins/Tango/topbar.xml
@@ -281,7 +281,9 @@ Description:
 
           <WidgetGroup><!-- Clock + latency display -->
             <ObjectName>ClockBox</ObjectName>
-            <Size>52f,28f</Size>
+            <MinimumSize>52,28</MinimumSize>
+            <MaximumSize>64,28</MaximumSize>
+            <SizePolicy>max</SizePolicy>
             <Layout>vertical</Layout>
             <Children>
 
@@ -292,9 +294,6 @@ Description:
                   <Time>
                     <TooltipId>time</TooltipId>
                     <ObjectName>Clock</ObjectName>
-                    <!-- <ShowSeconds>false</ShowSeconds>
-                    <ClockFormat>12AP</ClockFormat>
-                    This has no effect, neither has 'text-align' in qss.   -->
                     <Align>center</Align>
                   </Time>
                 </Children>

diff --git a/src/util/sample.h b/src/util/sample.h
@@ -36,16 +36,22 @@ class SampleUtil {
     inline
     static void clear(CSAMPLE* pBuffer, SINT numSamples) {
         DEBUG_ASSERT(numSamples >= 0);
-        // Special case: This works, because the binary representation
-        // of 0.0f is 0!
-        memset(pBuffer, 0, sizeof(*pBuffer) * numSamples);
-        //fill(pBuffer, CSAMPLE_ZERO, iNumSamples);
+        // We need to cast `numSamples` to an unsigned type to fix a
+        // `-Wstringop-overflow` warning on GCC 14.1.1. Casting to unsigned is
+        // okay, because the `DEBUG_ASSERT` above catches negative values
+        // anyway.
+        const auto sampleCount = static_cast<std::size_t>(numSamples);
+        // Special case: We can use memset here, because the binary representation
+        // of 0.0f is 0! This is much faster without optimizations than using
+        // `fill()`.
+        memset(pBuffer, 0, sizeof(*pBuffer) * sampleCount);
     }
 
     // Sets every sample in pBuffer to value
     inline
     static void fill(CSAMPLE* pBuffer, CSAMPLE value,
             SINT numSamples) {
+        DEBUG_ASSERT(numSamples >= 0);
         std::fill_n(pBuffer, numSamples, value);
     }
 

diff --git a/src/waveform/waveformwidgetfactory.h b/src/waveform/waveformwidgetfactory.h
@@ -143,7 +143,9 @@ class WaveformWidgetFactory : public QObject, public Singleton<WaveformWidgetFac
     void setOverviewNormalized(bool normalize);
     int isOverviewNormalized() const { return m_overviewNormalized;}
 
-    const QVector<WaveformWidgetAbstractHandle> getAvailableTypes() const { return m_waveformWidgetHandles;}
+    const QVector<WaveformWidgetAbstractHandle>& getAvailableTypes() const {
+        return m_waveformWidgetHandles;
+    }
     void getAvailableVSyncTypes(QList<QPair<int, QString>>* list);
     void destroyWidgets();