From a78ba7286011786da3177f2fb0444d4154c7278c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Thu, 3 Aug 2023 08:19:27 +0200 Subject: [PATCH 1/6] Update changelog for Mixxx 2.3.6 --- CHANGELOG.md | 9 +++++++++ res/linux/org.mixxx.Mixxx.metainfo.xml | 17 ++++++++++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1092caae07d..64c94f90127 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,6 +30,15 @@ [#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) +* Broadcast: Improved error message in case of timeout + [#11775](https://github.com/mixxxdj/mixxx/pull/11775) +* Handle setting loop_in and loop_out at the same position + [#11771](https://github.com/mixxxdj/mixxx/pull/11771) + [#10600](https://github.com/mixxxdj/mixxx/issues/10600) +* Fixed build issues with Protobuf v23.4 and with clang 32 + [#11751](https://github.com/mixxxdj/mixxx/pull/11751) + [#11765](https://github.com/mixxxdj/mixxx/pull/11765) + [#11762](https://github.com/mixxxdj/mixxx/issues/11762) ## [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 d92b33a712f..560948f21d2 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. --> - +
  • @@ -149,6 +149,21 @@ Controller Preferences: Avoid scrollbars in I/O tabs if Info tab exceeds page height #11756
    • +
  • + Broadcast: Improved error message in case of timeout + #11775 +
    • +
  • + Handle setting loop_in and loop_out at the same position + #11771 + #10600 +
    • +
  • + Fixed build issues with Protobuf v23.4 and with clang 32 + #11751 + #11765 + #11762 +
From bd728f8b292fb6cae499d96e822998a8f0016d44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Sun, 6 Aug 2023 07:09:22 +0200 Subject: [PATCH 2/6] Improve text in CHANGELOG.md Co-authored-by: Jan Holthuis --- CHANGELOG.md | 2 +- res/linux/org.mixxx.Mixxx.metainfo.xml | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 64c94f90127..27a9425c584 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,7 +32,7 @@ [#11756](https://github.com/mixxxdj/mixxx/pull/11756) * Broadcast: Improved error message in case of timeout [#11775](https://github.com/mixxxdj/mixxx/pull/11775) -* Handle setting loop_in and loop_out at the same position +* Handle setting `loop_in` and `loop_out` to the same position [#11771](https://github.com/mixxxdj/mixxx/pull/11771) [#10600](https://github.com/mixxxdj/mixxx/issues/10600) * Fixed build issues with Protobuf v23.4 and with clang 32 diff --git a/res/linux/org.mixxx.Mixxx.metainfo.xml b/res/linux/org.mixxx.Mixxx.metainfo.xml index 560948f21d2..f3ebc20dcf6 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. --> - +
  • @@ -154,7 +154,11 @@ #11775
  • - Handle setting loop_in and loop_out at the same position + Handle setting + loop_in + and + loop_out + to the same position #11771 #10600
    • From 04a9107501bd9cb739754c3f785b2337bef4855d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Sun, 6 Aug 2023 07:15:02 +0200 Subject: [PATCH 3/6] Use present tense Co-authored-by: Jan Holthuis --- CHANGELOG.md | 2 +- res/linux/org.mixxx.Mixxx.metainfo.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 27a9425c584..7a56290ae9d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,7 +35,7 @@ * Handle setting `loop_in` and `loop_out` to the same position [#11771](https://github.com/mixxxdj/mixxx/pull/11771) [#10600](https://github.com/mixxxdj/mixxx/issues/10600) -* Fixed build issues with Protobuf v23.4 and with clang 32 +* Fix build issues with Protobuf v23.4 and with clang 32 [#11751](https://github.com/mixxxdj/mixxx/pull/11751) [#11765](https://github.com/mixxxdj/mixxx/pull/11765) [#11762](https://github.com/mixxxdj/mixxx/issues/11762) diff --git a/res/linux/org.mixxx.Mixxx.metainfo.xml b/res/linux/org.mixxx.Mixxx.metainfo.xml index f3ebc20dcf6..f735fc6b6e9 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. --> - +
    • @@ -163,7 +163,7 @@ #10600
    • - Fixed build issues with Protobuf v23.4 and with clang 32 + Fix build issues with Protobuf v23.4 and with clang 32 #11751 #11765 #11762 From af0d5a5eb154fa10b40c64760e229471c4d96cc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Sun, 6 Aug 2023 07:25:59 +0200 Subject: [PATCH 4/6] Added latest 2.3 changes --- CHANGELOG.md | 9 +++++++++ res/linux/org.mixxx.Mixxx.metainfo.xml | 19 ++++++++++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7a56290ae9d..2d1a5843c1e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -39,6 +39,15 @@ [#11751](https://github.com/mixxxdj/mixxx/pull/11751) [#11765](https://github.com/mixxxdj/mixxx/pull/11765) [#11762](https://github.com/mixxxdj/mixxx/issues/11762) +* Disable GL VU-Meters on windows by default. They can be re-enabled via the command line option: `--enableVuMeterGL`. + [#11787](https://github.com/mixxxdj/mixxx/pull/11787) + [#11785](https://github.com/mixxxdj/mixxx/issues/11785) + [#11789](https://github.com/mixxxdj/mixxx/issues/11789) +* Library preferences: Uncheck serato metadata export when file metadata export is unchecked + [#11782](https://github.com/mixxxdj/mixxx/pull/11782) + [#11226](https://github.com/mixxxdj/mixxx/issues/11226) +* Denon MC6000MK2: Delete mapping for master gain + [#11792](https://github.com/mixxxdj/mixxx/pull/11792) ## [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 f735fc6b6e9..2fffa9f2fa8 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. --> - +
      • @@ -168,6 +168,23 @@ #11765 #11762
        • +
      • + Disable GL VU-Meters on windows by default. They can be re-enabled via the command line option: + --enableVuMeterGL + . + #11787 + #11785 + #11789 +
        • +
      • + Library preferences: Uncheck serato metadata export when file metadata export is unchecked + #11782 + #11226 +
        • +
      • + Denon MC6000MK2: Delete mapping for master gain + #11792 +
      From 56b07360bb2bdaf39077e8483f1044f965b5247d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Sun, 6 Aug 2023 23:47:13 +0200 Subject: [PATCH 5/6] Start names with a capital letter Co-authored-by: Jan Holthuis --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2d1a5843c1e..7c4475985f7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -39,11 +39,11 @@ [#11751](https://github.com/mixxxdj/mixxx/pull/11751) [#11765](https://github.com/mixxxdj/mixxx/pull/11765) [#11762](https://github.com/mixxxdj/mixxx/issues/11762) -* Disable GL VU-Meters on windows by default. They can be re-enabled via the command line option: `--enableVuMeterGL`. +* Disable GL VU-Meters on Windows by default. They can be re-enabled via the command line option `--enableVuMeterGL`. [#11787](https://github.com/mixxxdj/mixxx/pull/11787) [#11785](https://github.com/mixxxdj/mixxx/issues/11785) [#11789](https://github.com/mixxxdj/mixxx/issues/11789) -* Library preferences: Uncheck serato metadata export when file metadata export is unchecked +* Library preferences: Uncheck Serato metadata export when file metadata export is unchecked [#11782](https://github.com/mixxxdj/mixxx/pull/11782) [#11226](https://github.com/mixxxdj/mixxx/issues/11226) * Denon MC6000MK2: Delete mapping for master gain From c678b74cc25a02fa53e64dfb65a7d42e8036087a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Sun, 6 Aug 2023 23:56:29 +0200 Subject: [PATCH 6/6] Add latest 2.3 changes --- CHANGELOG.md | 2 ++ res/linux/org.mixxx.Mixxx.metainfo.xml | 10 +++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7c4475985f7..cca0d8e80dc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -48,6 +48,8 @@ [#11226](https://github.com/mixxxdj/mixxx/issues/11226) * Denon MC6000MK2: Delete mapping for master gain [#11792](https://github.com/mixxxdj/mixxx/pull/11792) +* Improve output in case of some failed file system operations + [#11783](https://github.com/mixxxdj/mixxx/pull/11783) ## [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 2fffa9f2fa8..c4c55e9120f 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. --> - +
      • @@ -169,7 +169,7 @@ #11762
      • - Disable GL VU-Meters on windows by default. They can be re-enabled via the command line option: + Disable GL VU-Meters on Windows by default. They can be re-enabled via the command line option --enableVuMeterGL . #11787 @@ -177,7 +177,7 @@ #11789
      • - Library preferences: Uncheck serato metadata export when file metadata export is unchecked + Library preferences: Uncheck Serato metadata export when file metadata export is unchecked #11782 #11226
        • @@ -185,6 +185,10 @@ Denon MC6000MK2: Delete mapping for master gain #11792 +
      • + Improve output in case of some failed file system operations + #11783 +