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

CHANGELOG.md

@@ -1028,19 +1028,34 @@
 
 ## [2.3.6](https://github.com/mixxxdj/mixxx/milestone/40) (unreleased)
 
-* Numark DJ2GO2 Touch: Add missing loop_out mapping for the right deck
-  [#11595](https://github.com/mixxxdj/mixxx/pull/11595)
-* No longer stop a track with an active loop at the very end.
-  [#11558](https://github.com/mixxxdj/mixxx/pull/11558)
-  [#11557](https://github.com/mixxxdj/mixxx/issues/11557)
-* Shade: Fixed VU-Meter and other minor issues
-  [#11598](https://github.com/mixxxdj/mixxx/pull/11598)
 * Fixed possible crash when closing Mixxx while browsing the file system
   [#11593](https://github.com/mixxxdj/mixxx/pull/11593)
   [#11589](https://github.com/mixxxdj/mixxx/issues/11589)
+* No longer stop a track with an active loop at the very end
+  [#11558](https://github.com/mixxxdj/mixxx/pull/11558)
+  [#11557](https://github.com/mixxxdj/mixxx/issues/11557)
 * Fixed resyncing when moving an active loop
   [#11152](https://github.com/mixxxdj/mixxx/pull/11152)
   [#11381](https://github.com/mixxxdj/mixxx/issues/11381)
+* Allow true gapless playback when repeating full tracks
+  [#11532](https://github.com/mixxxdj/mixxx/pull/11532)
+  [#9842](https://github.com/mixxxdj/mixxx/issues/9842)
+  [#11704](https://github.com/mixxxdj/mixxx/pull/11704)
+* Rhythmbox: Fixed bulk track imports from playlists
+  [#11661](https://github.com/mixxxdj/mixxx/pull/11661)
+* Console log spam reduced
+  [#11690](https://github.com/mixxxdj/mixxx/pull/11690)
+  [#11691](https://github.com/mixxxdj/mixxx/issues/11691)
+* Numark DJ2GO2 Touch: Add missing loop_out mapping for the right deck
+  [#11595](https://github.com/mixxxdj/mixxx/pull/11595)
+  [#11659](https://github.com/mixxxdj/mixxx/pull/11659)
+* Shade: Fixed VU-Meter and other minor issues
+  [#11598](https://github.com/mixxxdj/mixxx/pull/11598)
+* Fixed a rare crash when disabling quantize form a controller
+  [#11744](https://github.com/mixxxdj/mixxx/pull/11744)
+  [#11709](https://github.com/mixxxdj/mixxx/issues/11709)
+* Controller Preferences: Avoid scrollbars in I/O tabs if Info tab exceeds page height
+  [#11756](https://github.com/mixxxdj/mixxx/pull/11756)
 
 ## [2.3.5](https://github.com/mixxxdj/mixxx/milestone/39) (2023-05-10)
 

CMakeLists.txt

@@ -2325,7 +2325,7 @@ target_link_libraries(mixxx-lib PRIVATE ${PortMidi_LIBRARIES})
 
 # Protobuf
 add_subdirectory(src/proto)
-target_link_libraries(mixxx-lib PRIVATE mixxx-proto)
+target_link_libraries(mixxx-lib PUBLIC mixxx-proto)
 
 # Rigtorp SPSC Queue
 # https://github.com/rigtorp/SPSCQueue

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

@@ -96,7 +96,7 @@
   Do not edit it manually.
   -->
   <releases>
-    <release version="2.4.0" type="development" date="2023-06-17" timestamp="1687005677">
+    <release version="2.4.0" type="development" date="2023-07-28" timestamp="1690529288">
       <description>
  <p>
   Cover Art
@@ -1921,31 +1921,56 @@
  </ul>
 </description>
     </release>
-    <release version="2.3.6" type="development" date="2023-06-17" timestamp="1687005677">
+    <release version="2.3.6" type="development" date="2023-07-28" timestamp="1690529288">
       <description>
  <ul>
   <li>
-   Numark DJ2GO2 Touch: Add missing loop_out mapping for the right deck
-   #11595
+   Fixed possible crash when closing Mixxx while browsing the file system
+   #11593
+   #11589
   </li>
   <li>
-   No longer stop a track with an active loop at the very end.
+   No longer stop a track with an active loop at the very end
    #11558
    #11557
   </li>
+  <li>
+   Fixed resyncing when moving an active loop
+   #11152
+   #11381
+  </li>
+  <li>
+   Allow true gapless playback when repeating full tracks
+   #11532
+   #9842
+   #11704
+  </li>
+  <li>
+   Rhythmbox: Fixed bulk track imports from playlists
+   #11661
+  </li>
+  <li>
+   Console log spam reduced
+   #11690
+   #11691
+  </li>
+  <li>
+   Numark DJ2GO2 Touch: Add missing loop_out mapping for the right deck
+   #11595
+   #11659
+  </li>
   <li>
    Shade: Fixed VU-Meter and other minor issues
    #11598
   </li>
   <li>
-   Fixed possible crash when closing Mixxx while browsing the file system
-   #11593
-   #11589
+   Fixed a rare crash when disabling quantize form a controller
+   #11744
+   #11709
   </li>
   <li>
-   Fixed resyncing when moving an active loop
-   #11152
-   #11381
+   Controller Preferences: Avoid scrollbars in I/O tabs if Info tab exceeds page height
+   #11756
   </li>
  </ul>
 </description>

src/engine/sidechain/shoutconnection.cpp

@@ -611,6 +611,12 @@ bool ShoutConnection::processConnect() {
             kLogger.warning()
                     << "processConnect() socket error."
                     << "Is socket already in use?";
+        } else if (timeout >= kConnectRetries) {
+            // Not translated, because shout_get_error() returns also English only
+            m_lastErrorStr = QStringLiteral("Connection establishment time-out");
+            kLogger.warning()
+                    << "processConnect() error:"
+                    << m_iShoutStatus << m_lastErrorStr;
         } else if (m_pProfile->getEnabled()) {
             m_lastErrorStr = shout_get_error(m_pShout);
             kLogger.warning()

src/proto/CMakeLists.txt

@@ -1,13 +1,18 @@
 # Protobuf
-find_package(Protobuf REQUIRED)
+
+# first try the package provided config
+find_package(Protobuf CONFIG)
+if(NOT Protobuf_FOUND)
+  # Fall back to the CMake provide module
+  find_package(Protobuf MODULE REQUIRED)
+endif()
 
 add_library(mixxx-proto OBJECT)
 
-include(IsStaticLibrary)
 if(TARGET protobuf::libprotobuf-lite)
-    target_link_libraries(mixxx-proto PRIVATE protobuf::libprotobuf-lite)
+    target_link_libraries(mixxx-proto PUBLIC protobuf::libprotobuf-lite)
 elseif(TARGET protobuf::libprotobuf)
-    target_link_libraries(mixxx-proto PRIVATE protobuf::libprotobuf)
+    target_link_libraries(mixxx-proto PUBLIC protobuf::libprotobuf)
 else()
     message(FATAL_ERROR "Protobuf or Protobuf-lite libraries are required to compile Mixxx.")
 endif()