From 64924daa01aa7231f0435b33ee8ea9e9f73e94ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Tue, 18 Jul 2023 07:51:08 +0200 Subject: [PATCH 1/7] Update CHANGELOG.md --- CHANGELOG.md | 25 +++++++++++----- res/linux/org.mixxx.Mixxx.metainfo.xml | 41 +++++++++++++++++++------- 2 files changed, 48 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4e925e08b18..d83d88dc01d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,19 +2,30 @@ ## [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) +* Fixed gapless repeat of 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/issues/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) +* LateNight PaleMoon: Tweak style ## [2.3.5](https://github.com/mixxxdj/mixxx/milestone/39) (2023-05-10) diff --git a/res/linux/org.mixxx.Mixxx.metainfo.xml b/res/linux/org.mixxx.Mixxx.metainfo.xml index 4495362575d..6a19920beee 100644 --- a/res/linux/org.mixxx.Mixxx.metainfo.xml +++ b/res/linux/org.mixxx.Mixxx.metainfo.xml @@ -98,12 +98,13 @@ Do not edit it manually. --> - +
  • - 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
  • No longer stop a track with an active loop at the very end. @@ -111,18 +112,36 @@ #11557
  • - Shade: Fixed VU-Meter and other minor issues - #11598 + Fixed resyncing when moving an active loop + #11152 + #11381
  • - Fixed possible crash when closing Mixxx while browsing the file system - #11593 - #11589 + Fixed gapless repeat of full tracks + #11532 + #9842 + #11704
  • - Fixed resyncing when moving an active loop - #11152 - #11381 + Rhythmbox: Fixed bulk track imports from playlists + #11661 +
    • +
  • + Console log spam reduced + #11690 + #11691 +
    • +
  • + Numark DJ2GO2 Touch: Add missing loop_out mapping for the right deck + #11595 + #11659 +
    • +
  • + Shade: Fixed VU-Meter and other minor issues + #11598 +
    • +
  • + LateNight PaleMoon: Tweak style
From 5a86a1375e89f30dd8320a748c0d19ec305b1929 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Wed, 19 Jul 2023 07:19:44 +0200 Subject: [PATCH 2/7] Remove directly pushed Palemoon entry --- CHANGELOG.md | 3 +-- res/linux/org.mixxx.Mixxx.metainfo.xml | 7 ++----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d83d88dc01d..d2e97389d42 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ * 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. +* 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 @@ -25,7 +25,6 @@ [#11659](https://github.com/mixxxdj/mixxx/pull/11659) * Shade: Fixed VU-Meter and other minor issues [#11598](https://github.com/mixxxdj/mixxx/pull/11598) -* LateNight PaleMoon: Tweak style ## [2.3.5](https://github.com/mixxxdj/mixxx/milestone/39) (2023-05-10) diff --git a/res/linux/org.mixxx.Mixxx.metainfo.xml b/res/linux/org.mixxx.Mixxx.metainfo.xml index 6a19920beee..b9cedc3c3b9 100644 --- a/res/linux/org.mixxx.Mixxx.metainfo.xml +++ b/res/linux/org.mixxx.Mixxx.metainfo.xml @@ -98,7 +98,7 @@ Do not edit it manually. --> - +
  • @@ -107,7 +107,7 @@ #11589
  • - 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
    • @@ -140,9 +140,6 @@ Shade: Fixed VU-Meter and other minor issues #11598 -
  • - LateNight PaleMoon: Tweak style -
From 4a1200fc33340f149bf605354e5bc9167f885343 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Mon, 17 Jul 2023 20:52:43 +0200 Subject: [PATCH 3/7] Protobuf: Use package provided config and fall back to the CMake provided module --- src/proto/CMakeLists.txt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/proto/CMakeLists.txt b/src/proto/CMakeLists.txt index 44daf92062f..ac306bf5867 100644 --- a/src/proto/CMakeLists.txt +++ b/src/proto/CMakeLists.txt @@ -1,5 +1,12 @@ # Protobuf -find_package(Protobuf) + +# 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) protobuf_generate( LANGUAGE cpp From b48611f1705c0bd6bbe0c80d43df8a47f6e58dd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Tue, 25 Jul 2023 22:29:45 +0200 Subject: [PATCH 4/7] Make CMake build work with Protobuff v23.4 config mode --- CMakeLists.txt | 2 +- src/proto/CMakeLists.txt | 17 +++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index afad2158044..8611ba90cc3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2059,7 +2059,7 @@ if(STATIC_DEPS) mark_as_advanced(Protobuf_USE_STATIC_LIBS) endif() 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 diff --git a/src/proto/CMakeLists.txt b/src/proto/CMakeLists.txt index ac306bf5867..4c365331ecf 100644 --- a/src/proto/CMakeLists.txt +++ b/src/proto/CMakeLists.txt @@ -8,6 +8,15 @@ if(NOT Protobuf_FOUND) endif() add_library(mixxx-proto OBJECT) + +if(TARGET protobuf::libprotobuf-lite) + target_link_libraries(mixxx-proto PUBLIC protobuf::libprotobuf-lite) +elseif(TARGET 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() + protobuf_generate( LANGUAGE cpp TARGET mixxx-proto @@ -18,11 +27,3 @@ protobuf_generate( skin.proto waveform.proto ) - -if(TARGET protobuf::libprotobuf-lite) - target_link_libraries(mixxx-proto PRIVATE protobuf::libprotobuf-lite) -elseif(TARGET protobuf::libprotobuf) - target_link_libraries(mixxx-proto PRIVATE protobuf::libprotobuf) -else() - message(FATAL_ERROR "Protobuf or Protobuf-lite libraries are required to compile Mixxx.") -endif() From 2ce83cc78004b4664914ff6b0277e082fbb44ac8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Fri, 28 Jul 2023 09:28:08 +0200 Subject: [PATCH 5/7] Added recent 2.3 PRs to CHANGELOG --- CHANGELOG.md | 5 +++++ res/linux/org.mixxx.Mixxx.metainfo.xml | 11 ++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d2e97389d42..755632c44cd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,11 @@ [#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: Avoided a scrollbars in I/O tabs if Info tab exceeds page height + [#11756](https://github.com/mixxxdj/mixxx/issues/11756) ## [2.3.5](https://github.com/mixxxdj/mixxx/milestone/39) (2023-05-10) diff --git a/res/linux/org.mixxx.Mixxx.metainfo.xml b/res/linux/org.mixxx.Mixxx.metainfo.xml index b9cedc3c3b9..43bf8ada161 100644 --- a/res/linux/org.mixxx.Mixxx.metainfo.xml +++ b/res/linux/org.mixxx.Mixxx.metainfo.xml @@ -98,7 +98,7 @@ Do not edit it manually. --> - +
  • @@ -140,6 +140,15 @@ Shade: Fixed VU-Meter and other minor issues #11598
    • +
  • + Fixed a rare crash when disabling quantize form a controller + #11744 + #11709 +
    • +
  • + Controller Preferences: Avoided a scrollbars in I/O tabs if Info tab exceeds page height + #11756 +
From 2eaa5624233b5d0ee8abb33529d9d7a4a55482b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Sat, 29 Jul 2023 01:06:28 +0200 Subject: [PATCH 6/7] Broadcast: Improve error message in case of timeout during connection esteblishment --- src/engine/sidechain/shoutconnection.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/engine/sidechain/shoutconnection.cpp b/src/engine/sidechain/shoutconnection.cpp index 5116235f8df..d5cacdff477 100644 --- a/src/engine/sidechain/shoutconnection.cpp +++ b/src/engine/sidechain/shoutconnection.cpp @@ -609,6 +609,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() From 4ceb29e4db6139afd3f2fcf482f1c1aad2100077 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Fri, 28 Jul 2023 23:43:57 +0200 Subject: [PATCH 7/7] Improve CHANGELOG entries Co-authored-by: ronso0 --- CHANGELOG.md | 8 ++++---- res/linux/org.mixxx.Mixxx.metainfo.xml | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 755632c44cd..1092caae07d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,14 +11,14 @@ * Fixed resyncing when moving an active loop [#11152](https://github.com/mixxxdj/mixxx/pull/11152) [#11381](https://github.com/mixxxdj/mixxx/issues/11381) -* Fixed gapless repeat of full tracks +* 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/issues/11690) + [#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) @@ -28,8 +28,8 @@ * 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: Avoided a scrollbars in I/O tabs if Info tab exceeds page height - [#11756](https://github.com/mixxxdj/mixxx/issues/11756) +* 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) diff --git a/res/linux/org.mixxx.Mixxx.metainfo.xml b/res/linux/org.mixxx.Mixxx.metainfo.xml index 43bf8ada161..d92b33a712f 100644 --- a/res/linux/org.mixxx.Mixxx.metainfo.xml +++ b/res/linux/org.mixxx.Mixxx.metainfo.xml @@ -98,7 +98,7 @@ Do not edit it manually. --> - +
  • @@ -117,7 +117,7 @@ #11381
  • - Fixed gapless repeat of full tracks + Allow true gapless playback when repeating full tracks #11532 #9842 #11704 @@ -146,7 +146,7 @@ #11709
  • - Controller Preferences: Avoided a scrollbars in I/O tabs if Info tab exceeds page height + Controller Preferences: Avoid scrollbars in I/O tabs if Info tab exceeds page height #11756