Merge remote-tracking branch 'mixxx/2.3' into main

4 files changed, 49 insertions, 55 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 114b250eeb..a3e3212a27 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -646,11 +646,17 @@
 ## [2.3.2](https://launchpad.net/mixxx/+milestone/2.3.2) (Unreleased)
 
 * Improve robustness of file type detection by considering the actual MIME type of the content. [lp:1445885](https://bugs.launchpad.net/mixxx/+bug/1445885) [#4356](https://github.com/mixxxdj/mixxx/pull/4356) [#4357](https://github.com/mixxxdj/mixxx/pull/4357)
+* Playlist: Enable sorting by color [#4352](https://github.com/mixxxdj/mixxx/pull/4352) [lp:1945976](https://bugs.launchpad.net/mixxx/+bug/1945976)
 
 ### Packaging
 
 * Downloads of external dependencies are placed in build/downloads
 * The sources for libkeyfinder are now expected in build/downloads/libkeyfinder-2.2.5.zip instead of build/download/libkeyfinder/v2.2.5.zip
+* CMake: Adjust the download directory and name of external dependencies [#4511](https://github.com/mixxxdj/mixxx/pull/4511)
+* Fix/Improve Appstream metainfo
+  [#4344](https://github.com/mixxxdj/mixxx/pull/4344)
+  [#4346](https://github.com/mixxxdj/mixxx/pull/4346)
+  [#4349](https://github.com/mixxxdj/mixxx/pull/4349)
 
 ## [2.3.1](https://launchpad.net/mixxx/+milestone/2.3.1) (2021-09-29)
 
@@ -688,6 +694,7 @@
 * Fix Auto DJ skipping tracks randomly [#4319](https://github.com/mixxxdj/mixxx/pull/4319) [lp1941989](https://bugs.launchpad.net/mixxx/+bug/1941989)
 * Fix high CPU load due to extremely high internal sync clock values [#4312](https://github.com/mixxxdj/mixxx/pull/4312) [lp1943320](https://bugs.launchpad.net/mixxx/+bug/1943320)
 * Fix preference option for re-analyzing beatgrids imported from other software [#4288](https://github.com/mixxxdj/mixxx/pull/4288)
+* Fix wrong base tag used for deployment and displayed in About dialog [#4070](https://github.com/mixxxdj/mixxx/pull/4070)
 
 ### Packaging
 
@@ -696,7 +703,7 @@
 * .desktop file has be renamed to org.mixxx.Mixxx.desktop according to Freedesktop standards [#4206](https://github.com/mixxxdj/mixxx/pull/4206)
 * Uses system provided hidapi library if version >= 0.10.1 [#4215](https://github.com/mixxxdj/mixxx/pull/4215)
 * Please update PortAudio to [19.7](https://github.com/PortAudio/portaudio/releases/tag/v19.7.0) if you have not done so already. This is required for Mixxx to work with PipeWire via the JACK API for many devices.
-* Install multiple sizes of rasterized icons [#4204](https://github.com/mixxxdj/mixxx/pull/4204) [#4315](https://github.com/mixxxdj/mixxx/pull/4315)
+* Install multiple sizes of rasterized icons [#4204](https://github.com/mixxxdj/mixxx/pull/4204) [#4315](https://github.com/mixxxdj/mixxx/pull/4315) [#4254](https://github.com/mixxxdj/mixxx/pull/4254)
 * CMake: Fixed detection of SoundTouch pkgconfig file and version [#4209](https://github.com/mixxxdj/mixxx/pull/4209)
 * Fix AppStream metainfo [#4205](https://github.com/mixxxdj/mixxx/pull/4205) [#4317](https://github.com/mixxxdj/mixxx/pull/4317)
 
diff --git a/res/linux/org.mixxx.Mixxx.metainfo.xml b/res/linux/org.mixxx.Mixxx.metainfo.xml
index 47c171b418..ce9368bd88 100644
--- a/res/linux/org.mixxx.Mixxx.metainfo.xml
+++ b/res/linux/org.mixxx.Mixxx.metainfo.xml
@@ -1109,6 +1109,11 @@
    #4356
    #4357
   </li>
+  <li>
+   Playlist: Enable sorting by color
+   #4352
+   lp:1945976
+  </li>
  </ul>
  <p>
   Packaging
@@ -1120,6 +1125,16 @@
   <li>
    The sources for libkeyfinder are now expected in build/downloads/libkeyfinder-2.2.5.zip instead of build/download/libkeyfinder/v2.2.5.zip
   </li>
+  <li>
+   CMake: Adjust the download directory and name of external dependencies
+   #4511
+  </li>
+  <li>
+   Fix/Improve Appstream metainfo
+   #4344
+   #4346
+   #4349
+  </li>
  </ul>
 </description>
     </release>
@@ -1278,6 +1293,10 @@
    Fix preference option for re-analyzing beatgrids imported from other software
    #4288
   </li>
+  <li>
+   Fix wrong base tag used for deployment and displayed in About dialog
+   #4070
+  </li>
  </ul>
  <p>
   Packaging
@@ -1314,6 +1333,7 @@
    Install multiple sizes of rasterized icons
    #4204
    #4315
+   #4254
   </li>
   <li>
    CMake: Fixed detection of SoundTouch pkgconfig file and version
diff --git a/src/library/dlgtrackinfo.cpp b/src/library/dlgtrackinfo.cpp
index 56b08fba83..e3ffef061d 100644
--- a/src/library/dlgtrackinfo.cpp
+++ b/src/library/dlgtrackinfo.cpp
@@ -94,30 +94,24 @@ void DlgTrackInfo::init() {
             &DlgTrackInfo::slotCancel);
 
     // BPM edit buttons
-    connect(bpmDouble,
-            &QPushButton::clicked,
-            this,
-            &DlgTrackInfo::slotBpmDouble);
-    connect(bpmHalve,
-            &QPushButton::clicked,
-            this,
-            &DlgTrackInfo::slotBpmHalve);
-    connect(bpmTwoThirds,
-            &QPushButton::clicked,
-            this,
-            &DlgTrackInfo::slotBpmTwoThirds);
-    connect(bpmThreeFourth,
-            &QPushButton::clicked,
-            this,
-            &DlgTrackInfo::slotBpmThreeFourth);
-    connect(bpmFourThirds,
-            &QPushButton::clicked,
-            this,
-            &DlgTrackInfo::slotBpmFourThirds);
-    connect(bpmThreeHalves,
-            &QPushButton::clicked,
-            this,
-            &DlgTrackInfo::slotBpmThreeHalves);
+    connect(bpmDouble, &QPushButton::clicked, this, [this] {
+        slotBpmScale(mixxx::Beats::BpmScale::Double);
+    });
+    connect(bpmHalve, &QPushButton::clicked, this, [this] {
+        slotBpmScale(mixxx::Beats::BpmScale::Halve);
+    });
+    connect(bpmTwoThirds, &QPushButton::clicked, this, [this] {
+        slotBpmScale(mixxx::Beats::BpmScale::TwoThirds);
+    });
+    connect(bpmThreeFourth, &QPushButton::clicked, this, [this] {
+        slotBpmScale(mixxx::Beats::BpmScale::ThreeFourths);
+    });
+    connect(bpmFourThirds, &QPushButton::clicked, this, [this] {
+        slotBpmScale(mixxx::Beats::BpmScale::FourThirds);
+    });
+    connect(bpmThreeHalves, &QPushButton::clicked, this, [this] {
+        slotBpmScale(mixxx::Beats::BpmScale::ThreeHalves);
+    });
     connect(bpmClear,
             &QPushButton::clicked,
             this,
@@ -548,31 +542,10 @@ void DlgTrackInfo::clear() {
     txtLocation->setText("");
 }
 
-void DlgTrackInfo::slotBpmDouble() {
-    slotBpmScale(mixxx::Beats::BpmScale::Double);
-}
-
-void DlgTrackInfo::slotBpmHalve() {
-    slotBpmScale(mixxx::Beats::BpmScale::Halve);
-}
-
-void DlgTrackInfo::slotBpmTwoThirds() {
-    slotBpmScale(mixxx::Beats::BpmScale::TwoThirds);
-}
-
-void DlgTrackInfo::slotBpmThreeFourth() {
-    slotBpmScale(mixxx::Beats::BpmScale::ThreeFourths);
-}
-
-void DlgTrackInfo::slotBpmFourThirds() {
-    slotBpmScale(mixxx::Beats::BpmScale::FourThirds);
-}
-
-void DlgTrackInfo::slotBpmThreeHalves() {
-    slotBpmScale(mixxx::Beats::BpmScale::ThreeHalves);
-}
-
 void DlgTrackInfo::slotBpmScale(mixxx::Beats::BpmScale bpmScale) {
+    if (!m_pBeatsClone) {
+        return;
+    }
     const auto scaledBeats = m_pBeatsClone->tryScale(bpmScale);
     if (scaledBeats) {
         m_pBeatsClone = *scaledBeats;
diff --git a/src/library/dlgtrackinfo.h b/src/library/dlgtrackinfo.h
index b1a6be573e..9930ac9f0a 100644
--- a/src/library/dlgtrackinfo.h
+++ b/src/library/dlgtrackinfo.h
@@ -51,12 +51,6 @@ class DlgTrackInfo : public QDialog, public Ui::DlgTrackInfo {
 
     void trackUpdated();
 
-    void slotBpmDouble();
-    void slotBpmHalve();
-    void slotBpmTwoThirds();
-    void slotBpmThreeFourth();
-    void slotBpmFourThirds();
-    void slotBpmThreeHalves();
     void slotBpmScale(mixxx::Beats::BpmScale bpmScale);
     void slotBpmClear();
     void slotBpmConstChanged(int state);