Add visualizations

Fixes #1679

.github/workflows/build.yml

@@ -62,6 +62,7 @@ jobs:
             libchromaprint-devel
             fftw3-devel
             libebur128-devel
+            projectM-devel
             desktop-file-utils
             update-desktop-files
             appstream-glib
@@ -78,6 +79,7 @@ jobs:
             qt6-base-common-devel
             qt6-sql-sqlite
             qt6-linguist-devel
+            qt6-openglwidgets-devel
             gtest
             gmock
             sparsehash-devel
@@ -200,6 +202,7 @@ jobs:
             libchromaprint-devel
             libebur128-devel
             fftw-devel
+            libprojectM-devel
             desktop-file-utils
             libappstream-glib
             hicolor-icon-theme
@@ -290,6 +293,7 @@ jobs:
           lib64Qt6DBus-devel
           lib64Qt6Gui-devel
           lib64Qt6Widgets-devel
+          lib64Qt6OpenGLWidgets-devel
           lib64Qt6Test-devel
           lib64kdsingleapplication-devel
           lib64xkbcommon-devel
@@ -384,6 +388,7 @@ jobs:
           lib64fftw-devel
           lib64dbus-devel
           lib64appstream-devel
+          lib64projectm-devel
           lib64qt6core-devel
           lib64qt6gui-devel
           lib64qt6widgets-devel
@@ -393,6 +398,7 @@ jobs:
           lib64qt6dbus-devel
           lib64qt6help-devel
           lib64qt6test-devel
+          lib64qt6openglwidgets-devel
           lib64sparsehash-devel
           lib64kdsingleapplication-devel
           desktop-file-utils
@@ -499,6 +505,7 @@ jobs:
             qt6-tools-dev-tools
             qt6-l10n-tools
             rapidjson-dev
+            libprojectm-dev
       - name: Install KDSingleApplication
         if: matrix.debian_version != 'bookworm'
         run: apt install -y libkdsingleapplication-qt6-dev
@@ -595,6 +602,7 @@ jobs:
             qt6-tools-dev-tools
             qt6-l10n-tools
             rapidjson-dev
+            libprojectm-dev
       - name: Install KDSingleApplication
         if: matrix.ubuntu_version != 'noble' && matrix.ubuntu_version != 'plucky'
         run: apt install -y libkdsingleapplication-qt6-dev
@@ -693,6 +701,7 @@ jobs:
             gstreamer1.0-pulseaudio
             libkdsingleapplication-qt6-dev
             rapidjson-dev
+            libprojectm-dev
       - name: Install keyboxd
         if: matrix.ubuntu_version == 'noble'
         env:
@@ -739,12 +748,18 @@ jobs:
       with:
         fetch-depth: 0
         submodules: recursive
+    - name: Free disk space
+      run: |
+        df -h
+        sudo rm -rf /usr/share/dotnet /usr/local/lib/android /opt/ghc
+        sudo apt-get clean
+        df -h
     - name: Build FreeBSD
       id: build-freebsd
-      uses: vmactions/freebsd-vm@v1.3.0
+      uses: vmactions/freebsd-vm@v1.3.2
       with:
         usesh: true
-        mem: 4096
+        mem: 8192
         prepare: pkg install -y git cmake pkgconf boost-libs alsa-lib glib qt6-base qt6-tools sqlite gstreamer1 gstreamer1-plugins chromaprint libebur128 taglib libcdio libmtp gdk-pixbuf2 libgpod fftw3 icu kdsingleapplication googletest pulseaudio sparsehash rapidjson
         run: |
           set -e
@@ -766,7 +781,7 @@ jobs:
         submodules: recursive
     - name: Build OpenBSD
       id: build-openbsd
-      uses: vmactions/openbsd-vm@v1.2.5
+      uses: vmactions/openbsd-vm@v1.2.9
       with:
         usesh: true
         mem: 4096

CMakeLists.txt

@@ -208,6 +208,15 @@ else()
   pkg_check_modules(TAGLIB REQUIRED IMPORTED_TARGET taglib>=1.12)
 endif()
 
+find_package(projectM4 COMPONENTS Playlist)
+if(projectM4_FOUND)
+  set(LIBPROJECTM_FOUND ON)
+  set(HAVE_PROJECTM4 ON)
+  set(LIBPROJECTM_LIBRARIES libprojectM::projectM libprojectM::playlist)
+else()
+  pkg_check_modules(LIBPROJECTM libprojectM)
+endif()
+
 find_package(GTest)
 
 pkg_check_modules(LIBSPARSEHASH IMPORTED_TARGET libsparsehash)
@@ -218,7 +227,7 @@ set(QT_VERSION_MAJOR 6)
 set(QT_MIN_VERSION 6.4.0)
 set(QT_DEFAULT_MAJOR_VERSION ${QT_VERSION_MAJOR})
 set(QT_COMPONENTS Core Concurrent Gui Widgets Network Sql)
-set(QT_OPTIONAL_COMPONENTS GuiPrivate LinguistTools Test)
+set(QT_OPTIONAL_COMPONENTS GuiPrivate OpenGLWidgets LinguistTools Test)
 if(UNIX AND NOT APPLE)
   list(APPEND QT_OPTIONAL_COMPONENTS DBus)
 endif()
@@ -389,6 +398,11 @@ if(HAVE_X11_GLOBALSHORTCUTS OR HAVE_KGLOBALACCEL_GLOBALSHORTCUTS OR APPLE OR WIN
   set(HAVE_GLOBALSHORTCUTS ON)
 endif()
 
+optional_component(VISUALIZATIONS ON "Visualizations"
+  DEPENDS "libprojectm" LIBPROJECTM_FOUND
+  DEPENDS "QtOpenGLWidgets" Qt${QT_VERSION_MAJOR}OpenGLWidgets_FOUND
+)
+
 if(NOT CMAKE_CROSSCOMPILING)
   # Check that we have Qt with sqlite driver
   set(CMAKE_REQUIRED_FLAGS "-std=c++17")
@@ -1480,6 +1494,26 @@ optional_source(HAVE_QOBUZ
     src/settings/qobuzsettingspage.ui
 )
 
+optional_source(HAVE_VISUALIZATIONS
+  SOURCES
+    src/visualizations/projectmpresetmodel.cpp
+    src/visualizations/projectmvisualization.cpp
+    src/visualizations/visualizationcontainer.cpp
+    src/visualizations/visualizationoverlay.cpp
+    src/visualizations/visualizationselector.cpp
+    src/visualizations/visualizationopenglwidget.cpp
+  HEADERS
+    src/visualizations/projectmpresetmodel.h
+    src/visualizations/projectmvisualization.h
+    src/visualizations/visualizationcontainer.h
+    src/visualizations/visualizationoverlay.h
+    src/visualizations/visualizationselector.h
+    src/visualizations/visualizationopenglwidget.h
+  UI
+    src/visualizations/visualizationoverlay.ui
+    src/visualizations/visualizationselector.ui
+)
+
 qt_wrap_cpp(SOURCES ${HEADERS})
 qt_wrap_ui(SOURCES ${UI})
 qt_add_resources(SOURCES data/data.qrc data/icons.qrc)
@@ -1550,6 +1584,7 @@ target_link_libraries(strawberry_lib PUBLIC
   Qt${QT_VERSION_MAJOR}::Sql
   $<$<BOOL:${HAVE_DBUS}>:Qt${QT_VERSION_MAJOR}::DBus>
   $<$<BOOL:${HAVE_QPA_QPLATFORMNATIVEINTERFACE}>:Qt${QT_VERSION_MAJOR}::GuiPrivate>
+  $<$<BOOL:${HAVE_VISUALIZATIONS}>:Qt${QT_VERSION_MAJOR}::OpenGLWidgets>
   ICU::uc
   ICU::i18n
   $<$<BOOL:${HAVE_STREAMTAGREADER}>:PkgConfig::LIBSPARSEHASH>
@@ -1565,6 +1600,7 @@ target_link_libraries(strawberry_lib PUBLIC
   $<$<BOOL:${HAVE_MTP}>:PkgConfig::LIBMTP>
   $<$<BOOL:${HAVE_GPOD}>:PkgConfig::LIBGPOD PkgConfig::GDK_PIXBUF>
   $<$<BOOL:${HAVE_QTSPARKLE}>:qtsparkle-qt${QT_VERSION_MAJOR}::qtsparkle>
+  $<$<BOOL:${HAVE_VISUALIZATIONS}>:${LIBPROJECTM_LIBRARIES}>
   $<$<BOOL:${WIN32}>:dsound dwmapi ${GETOPT_LIBRARIES}>
   $<$<BOOL:${MSVC}>:WindowsApp>
   KDAB::kdsingleapplication

debian/control

@@ -32,7 +32,8 @@ Build-Depends: debhelper-compat (= 12),
                libfftw3-dev,
                libebur128-dev,
                libsparsehash-dev,
-               rapidjson-dev
+               rapidjson-dev,
+               libprojectm-dev
 Standards-Version: 4.7.0
 
 Package: strawberry

dist/unix/strawberry.spec.in

@@ -43,6 +43,7 @@ BuildRequires:  pkgconfig(taglib)
 BuildRequires:  pkgconfig(fftw3)
 BuildRequires:  pkgconfig(icu-uc)
 BuildRequires:  pkgconfig(icu-i18n)
+BuildRequires:  pkgconfig(libprojectM)
 BuildRequires:  cmake(Qt@QT_VERSION_MAJOR@Core)
 BuildRequires:  cmake(Qt@QT_VERSION_MAJOR@Concurrent)
 BuildRequires:  cmake(Qt@QT_VERSION_MAJOR@Network)

src/analyzer/analyzercontainer.cpp

@@ -73,7 +73,8 @@ AnalyzerContainer::AnalyzerContainer(QWidget *parent)
       double_click_timer_(new QTimer(this)),
       ignore_next_click_(false),
       current_analyzer_(nullptr),
-      engine_(nullptr) {
+      engine_(nullptr),
+      action_visualization_(nullptr) {
 
   QHBoxLayout *layout = new QHBoxLayout(this);
   setLayout(layout);
@@ -118,6 +119,17 @@ void AnalyzerContainer::mouseReleaseEvent(QMouseEvent *e) {
 
 }
 
+void AnalyzerContainer::mouseDoubleClickEvent(QMouseEvent *e) {
+
+  Q_UNUSED(e);
+
+  double_click_timer_->stop();
+  ignore_next_click_ = true;
+
+  if (action_visualization_) action_visualization_->trigger();
+
+}
+
 void AnalyzerContainer::ShowPopupMenu() {
   context_menu_->popup(last_click_pos_);
 }
@@ -249,3 +261,10 @@ void AnalyzerContainer::AddFramerate(const QString &name, const int framerate) {
   QObject::connect(action, &QAction::triggered, this, [this, framerate]() { ChangeFramerate(framerate); } );
 
 }
+
+void AnalyzerContainer::SetVisualizationsAction(QAction *visualization) {
+
+  action_visualization_ = visualization;
+  context_menu_->addAction(action_visualization_);
+
+}

src/analyzer/analyzercontainer.h

@@ -46,6 +46,7 @@ class AnalyzerContainer : public QWidget {
   explicit AnalyzerContainer(QWidget *parent);
 
   void SetEngine(SharedPtr<EngineBase> engine);
+  void SetVisualizationsAction(QAction *visualization);
 
   static const char *kSettingsGroup;
   static const char *kSettingsFramerate;
@@ -55,6 +56,7 @@ class AnalyzerContainer : public QWidget {
 
  protected:
   void mouseReleaseEvent(QMouseEvent *e) override;
+  void mouseDoubleClickEvent(QMouseEvent *e) override;
   void wheelEvent(QWheelEvent *e) override;
 
  private Q_SLOTS:
@@ -89,6 +91,8 @@ class AnalyzerContainer : public QWidget {
 
   AnalyzerBase *current_analyzer_;
   SharedPtr<EngineBase> engine_;
+
+  QAction *action_visualization_;
 };
 
 template<typename T>

src/collection/collectionlibrary.cpp

@@ -2,7 +2,7 @@
  * Strawberry Music Player
  * This file was part of Clementine.
  * Copyright 2010, David Sansome <me@davidsansome.com>
- * Copyright 2018-2021, Jonas Kvinge <jonas@jkvinge.net>
+ * Copyright 2018-2025, Jonas Kvinge <jonas@jkvinge.net>
  *
  * Strawberry is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -189,6 +189,26 @@ void CollectionLibrary::ReloadSettings() {
 
 }
 
+void CollectionLibrary::CurrentSongChanged(const Song &song) {
+
+  current_song_url_ = song.url();
+
+  if (!pending_song_saves_.isEmpty()) {
+    SavePendingPlaycountsAndRatings();
+  }
+
+}
+
+void CollectionLibrary::Stopped() {
+
+  current_song_url_ = QUrl();
+
+  if (!pending_song_saves_.isEmpty()) {
+    SavePendingPlaycountsAndRatings();
+  }
+
+}
+
 void CollectionLibrary::SyncPlaycountAndRatingToFilesAsync() {
 
   (void)QtConcurrent::run(&CollectionLibrary::SyncPlaycountAndRatingToFiles, this);
@@ -212,18 +232,85 @@ void CollectionLibrary::SyncPlaycountAndRatingToFiles() {
 
 }
 
-void CollectionLibrary::SongsPlaycountChanged(const SongList &songs, const bool save_tags) const {
+void CollectionLibrary::SongsPlaycountChanged(const SongList &songs, const bool save_tags) {
 
   if (save_tags || save_playcounts_to_files_) {
-    tagreader_client_->SaveSongsPlaycountAsync(songs);
+    SongList songs_to_save_now;
+    for (const Song &song : songs) {
+      if (song.url().isLocalFile() && song.url() == current_song_url_ &&
+          (song.filetype() == Song::FileType::OggFlac || song.filetype() == Song::FileType::OggVorbis || song.filetype() == Song::FileType::OggOpus)) {
+        qLog(Debug) << "Deferring playcount save for currently playing file" << song.url().toLocalFile();
+        if (pending_song_saves_.contains(song.url())) {
+          SharedPtr<PendingSongSave> pending_song_save = pending_song_saves_[song.url()];
+          pending_song_save->save_playcount = true;
+          pending_song_save->song.set_playcount(song.playcount());
+        }
+        else {
+          SharedPtr<PendingSongSave> pending_song_save = make_shared<PendingSongSave>();
+          pending_song_save->save_playcount = true;
+          pending_song_save->song = song;
+          pending_song_saves_.insert(song.url(), pending_song_save);
+        }
+      }
+      else {
+        songs_to_save_now << song;
+      }
+    }
+    if (!songs_to_save_now.isEmpty()) {
+      tagreader_client_->SaveSongsPlaycountAsync(songs_to_save_now);
+    }
   }
 
 }
 
-void CollectionLibrary::SongsRatingChanged(const SongList &songs, const bool save_tags) const {
+void CollectionLibrary::SongsRatingChanged(const SongList &songs, const bool save_tags) {
 
   if (save_tags || save_ratings_to_files_) {
-    tagreader_client_->SaveSongsRatingAsync(songs);
+    SongList songs_to_save_now;
+    for (const Song &song : songs) {
+      if (song.url().isLocalFile() && song.url() == current_song_url_ &&
+          (song.filetype() == Song::FileType::OggFlac || song.filetype() == Song::FileType::OggVorbis || song.filetype() == Song::FileType::OggOpus)) {
+        qLog(Debug) << "Deferring rating save for currently playing file" << song.url().toLocalFile();
+        if (pending_song_saves_.contains(song.url())) {
+          SharedPtr<PendingSongSave> pending_song_save = pending_song_saves_[song.url()];
+          pending_song_save->save_rating = true;
+          pending_song_save->song.set_rating(song.rating());
+        }
+        else {
+          SharedPtr<PendingSongSave> pending_song_save = make_shared<PendingSongSave>();
+          pending_song_save->save_rating = true;
+          pending_song_save->song = song;
+          pending_song_saves_.insert(song.url(), pending_song_save);
+        }
+      }
+      else {
+        songs_to_save_now << song;
+      }
+    }
+    if (!songs_to_save_now.isEmpty()) {
+      tagreader_client_->SaveSongsRatingAsync(songs_to_save_now);
+    }
+  }
+
+}
+
+void CollectionLibrary::SavePendingPlaycountsAndRatings() {
+
+  for (auto it = pending_song_saves_.constBegin(); it != pending_song_saves_.constEnd();) {
+    const QUrl url = it.key();
+    SharedPtr<PendingSongSave> pending_song_save = it.value();
+    if (url == current_song_url_) {
+      ++it;
+      continue;
+    }
+    qLog(Debug) << "Saving deferred playcount/rating for" << url.toLocalFile();
+    if (pending_song_save->save_playcount) {
+      tagreader_client_->SaveSongsPlaycountAsync(SongList() << pending_song_save->song);
+    }
+    if (pending_song_save->save_rating) {
+      tagreader_client_->SaveSongsRatingAsync(SongList() << pending_song_save->song);
+    }
+    it = pending_song_saves_.erase(it);
   }
 
 }

src/collection/collectionlibrary.h

@@ -2,7 +2,7 @@
  * Strawberry Music Player
  * This file was part of Clementine.
  * Copyright 2010, David Sansome <me@davidsansome.com>
- * Copyright 2018-2021, Jonas Kvinge <jonas@jkvinge.net>
+ * Copyright 2018-2025, Jonas Kvinge <jonas@jkvinge.net>
  *
  * Strawberry is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,6 +27,7 @@
 #include <QObject>
 #include <QList>
 #include <QHash>
+#include <QMap>
 #include <QString>
 
 #include "includes/shared_ptr.h"
@@ -71,6 +72,7 @@ class CollectionLibrary : public QObject {
 
  private:
   void SyncPlaycountAndRatingToFiles();
+  void SavePendingPlaycountsAndRatings();
 
  public Q_SLOTS:
   void ReloadSettings();
@@ -84,16 +86,26 @@ class CollectionLibrary : public QObject {
 
   void IncrementalScan();
 
+  void CurrentSongChanged(const Song &song);
+  void Stopped();
+
  private Q_SLOTS:
   void ExitReceived();
-  void SongsPlaycountChanged(const SongList &songs, const bool save_tags = false) const;
+  void SongsPlaycountChanged(const SongList &songs, const bool save_tags = false);
-  void SongsRatingChanged(const SongList &songs, const bool save_tags = false) const;
+  void SongsRatingChanged(const SongList &songs, const bool save_tags = false);
 
  Q_SIGNALS:
   void Error(const QString &error);
   void ExitFinished();
 
  private:
+  class PendingSongSave {
+   public:
+    Song song;
+    bool save_playcount = false;
+    bool save_rating = false;
+  };
+
   const SharedPtr<TaskManager> task_manager_;
   const SharedPtr<TagReaderClient> tagreader_client_;
 
@@ -111,6 +123,10 @@ class CollectionLibrary : public QObject {
 
   bool save_playcounts_to_files_;
   bool save_ratings_to_files_;
+
+  QUrl current_song_url_;
+
+  QMap<QUrl, SharedPtr<PendingSongSave>> pending_song_saves_;
 };
 
 #endif

src/collection/collectionmodel.cpp

@@ -1209,49 +1209,41 @@ QString CollectionModel::ContainerKey(const GroupBy group_by, const Song &song,
   switch (group_by) {
     case GroupBy::AlbumArtist:
       key = TextOrUnknown(song.effective_albumartist());
-      if (!song.effective_albumartistsort().isEmpty() && song.effective_albumartistsort() != song.effective_albumartist()) key.append(QLatin1Char('-') + TextOrUnknown(song.effective_albumartistsort()));
       has_unique_album_identifier = true;
       break;
     case GroupBy::Artist:
       key = TextOrUnknown(song.artist());
-      if (!song.artistsort().isEmpty() && song.artistsort() != song.artist()) key.append(QLatin1Char('-') + TextOrUnknown(song.artistsort()));
       has_unique_album_identifier = true;
       break;
     case GroupBy::Album:
       key = TextOrUnknown(song.album());
-      if (!song.albumsort().isEmpty() && song.albumsort() != song.album()) key.append(QLatin1Char('-') + TextOrUnknown(song.albumsort()));
       if (!song.album_id().isEmpty()) key.append(QLatin1Char('-') + song.album_id());
       if (options_active_.separate_albums_by_grouping && !song.grouping().isEmpty()) key.append(QLatin1Char('-') + song.grouping());
       break;
     case GroupBy::AlbumDisc:
       key = TextOrUnknown(song.album());
-      if (!song.albumsort().isEmpty() && song.albumsort() != song.album()) key.append(QLatin1Char('-') + TextOrUnknown(song.albumsort()));
       key.append(QLatin1Char('-') + SortTextForNumber(song.disc()));
       if (!song.album_id().isEmpty()) key.append(QLatin1Char('-') + song.album_id());
       if (options_active_.separate_albums_by_grouping && !song.grouping().isEmpty()) key.append(QLatin1Char('-') + song.grouping());
       break;
     case GroupBy::YearAlbum:
       key = SortTextForYear(song.year()) + QLatin1Char('-') + TextOrUnknown(song.album());
-      if (!song.albumsort().isEmpty() && song.albumsort() != song.album()) key.append(QLatin1Char('-') + TextOrUnknown(song.albumsort()));
       if (!song.album_id().isEmpty()) key.append(QLatin1Char('-') + song.album_id());
       if (options_active_.separate_albums_by_grouping && !song.grouping().isEmpty()) key.append(QLatin1Char('-') + song.grouping());
       break;
     case GroupBy::YearAlbumDisc:
       key = SortTextForYear(song.year()) + QLatin1Char('-') + TextOrUnknown(song.album());
-      if (!song.albumsort().isEmpty() && song.albumsort() != song.album()) key.append(QLatin1Char('-') + TextOrUnknown(song.albumsort()));
       key.append(QLatin1Char('-') + SortTextForNumber(song.disc()));
       if (!song.album_id().isEmpty()) key.append(QLatin1Char('-') + song.album_id());
       if (options_active_.separate_albums_by_grouping && !song.grouping().isEmpty()) key.append(QLatin1Char('-') + song.grouping());
       break;
     case GroupBy::OriginalYearAlbum:
       key = SortTextForYear(song.effective_originalyear()) + QLatin1Char('-') + TextOrUnknown(song.album());
-      if (!song.albumsort().isEmpty() && song.albumsort() != song.album()) key.append(QLatin1Char('-') + TextOrUnknown(song.albumsort()));
       if (!song.album_id().isEmpty()) key.append(QLatin1Char('-') + song.album_id());
       if (options_active_.separate_albums_by_grouping && !song.grouping().isEmpty()) key.append(QLatin1Char('-') + song.grouping());
       break;
     case GroupBy::OriginalYearAlbumDisc:
       key = SortTextForYear(song.effective_originalyear()) + QLatin1Char('-') + TextOrUnknown(song.album());
-      if (!song.albumsort().isEmpty() && song.albumsort() != song.album()) key.append(QLatin1Char('-') + TextOrUnknown(song.albumsort()));
       key.append(QLatin1Char('-') + SortTextForNumber(song.disc()));
       if (!song.album_id().isEmpty()) key.append(QLatin1Char('-') + song.album_id());
       if (options_active_.separate_albums_by_grouping && !song.grouping().isEmpty()) key.append(QLatin1Char('-') + song.grouping());
@@ -1270,12 +1262,10 @@ QString CollectionModel::ContainerKey(const GroupBy group_by, const Song &song,
       break;
     case GroupBy::Composer:
       key = TextOrUnknown(song.composer());
-      if (!song.composersort().isEmpty() && song.composersort() != song.composer()) key.append(QLatin1Char('-') + song.composersort());
       has_unique_album_identifier = true;
       break;
     case GroupBy::Performer:
       key = TextOrUnknown(song.performer());
-      if (!song.performersort().isEmpty() && song.performersort() != song.performer()) key.append(QLatin1Char('-') + song.performersort());
       has_unique_album_identifier = true;
       break;
     case GroupBy::Grouping:

src/config.h.in

@@ -48,4 +48,7 @@
 
 #cmakedefine ENABLE_WIN32_CONSOLE
 
+#cmakedefine HAVE_VISUALIZATIONS
+#cmakedefine HAVE_PROJECTM4
+
 #endif // CONFIG_H_IN

src/core/filesystemmusicstorage.cpp

@@ -110,21 +110,32 @@ bool FilesystemMusicStorage::CopyToStorage(const CopyJob &job, QString &error_te
 
 bool FilesystemMusicStorage::DeleteFromStorage(const DeleteJob &job) {
 
-  QString path = job.metadata_.url().toLocalFile();
+  const QString path = job.metadata_.url().toLocalFile();
-  QFileInfo fileInfo(path);
+  const QFileInfo fileInfo(path);
 
 #if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0)
   if (job.use_trash_ && QFile::supportsMoveToTrash()) {
 #else
   if (job.use_trash_) {
 #endif
-    return QFile::moveToTrash(path);
+    if (QFile::moveToTrash(path)) {
+      return true;
+    }
+    qLog(Warning) << "Moving file to trash failed for" << path << ", falling back to direct deletion";
   }
 
+  bool success = false;
   if (fileInfo.isDir()) {
-    return Utilities::RemoveRecursive(path);
+    success = Utilities::RemoveRecursive(path);
+  }
+  else {
+    success = QFile::remove(path);
   }
 
-  return QFile::remove(path);
+  if (!success) {
+    qLog(Error) << "Failed to delete file" << path;
+  }
+
+  return success;
 
 }

src/core/mainwindow.cpp

@@ -58,7 +58,6 @@
 #include <QShortcut>
 #include <QMessageBox>
 #include <QErrorMessage>
-#include <QSettings>
 #include <QColor>
 #include <QFrame>
 #include <QItemSelectionModel>
@@ -207,6 +206,11 @@
 
 #include "organize/organizeerrordialog.h"
 
+#ifdef HAVE_VISUALIZATIONS
+#  include "visualizations/visualizationcontainer.h"
+#  include "engine/gstengine.h"
+#endif
+
 #ifdef Q_OS_WIN32
 #  include "core/windows7thumbbar.h"
 #endif
@@ -624,6 +628,12 @@ MainWindow::MainWindow(Application *app,
   stop_menu->addAction(ui_->action_stop_after_this_track);
   ui_->stop_button->setMenu(stop_menu);
 
+#ifdef HAVE_VISUALIZATIONS
+  QObject::connect(ui_->action_visualizations, &QAction::triggered, this, &MainWindow::ShowVisualizations);
+#else
+  ui_->action_visualizations->setEnabled(false);
+#endif
+
   // Player connections
   QObject::connect(ui_->volume, &VolumeSlider::valueChanged, &*app_->player(), &Player::SetVolumeFromSlider);
 
@@ -697,6 +707,9 @@ MainWindow::MainWindow(Application *app,
   QObject::connect(&*app_->task_manager(), &TaskManager::PauseCollectionWatchers, &*app_->collection(), &CollectionLibrary::PauseWatcher);
   QObject::connect(&*app_->task_manager(), &TaskManager::ResumeCollectionWatchers, &*app_->collection(), &CollectionLibrary::ResumeWatcher);
 
+  QObject::connect(&*app_->playlist_manager(), &PlaylistManager::CurrentSongChanged, &*app_->collection(), &CollectionLibrary::CurrentSongChanged);
+  QObject::connect(&*app_->player(), &Player::Stopped, &*app_->collection(), &CollectionLibrary::Stopped);
+
   QObject::connect(&*app_->playlist_manager(), &PlaylistManager::CurrentSongChanged, &*app_->current_albumcover_loader(), &CurrentAlbumCoverLoader::LoadAlbumCover);
   QObject::connect(&*app_->current_albumcover_loader(), &CurrentAlbumCoverLoader::AlbumCoverLoaded, this, &MainWindow::AlbumCoverLoaded);
   QObject::connect(album_cover_choice_controller_, &AlbumCoverChoiceController::Error, this, &MainWindow::ShowErrorDialog);
@@ -905,6 +918,7 @@ MainWindow::MainWindow(Application *app,
 
   // Analyzer
   QObject::connect(ui_->analyzer, &AnalyzerContainer::WheelEvent, this, &MainWindow::VolumeWheelEvent);
+  ui_->analyzer->SetVisualizationsAction(ui_->action_visualizations);
 
   // Statusbar widgets
   ui_->playlist_summary->setMinimumWidth(QFontMetrics(font()).horizontalAdvance(u"WW selected of WW tracks - [ WW:WW ]"_s));
@@ -977,27 +991,28 @@ MainWindow::MainWindow(Application *app,
 
   // Load settings
   qLog(Debug) << "Loading settings";
-  settings_.beginGroup(MainWindowSettings::kSettingsGroup);
+  Settings settings;
+  settings.beginGroup(MainWindowSettings::kSettingsGroup);
 
   // Set last used geometry to position window on the correct monitor
   // Set window state only if the window was last maximized
-  if (settings_.contains("geometry")) {
+  if (settings.contains("geometry")) {
-    restoreGeometry(settings_.value("geometry").toByteArray());
+    restoreGeometry(settings.value("geometry").toByteArray());
   }
 
-  if (!settings_.contains(MainWindowSettings::kSplitterState) || !ui_->splitter->restoreState(settings_.value(MainWindowSettings::kSplitterState).toByteArray())) {
+  if (!settings.contains(MainWindowSettings::kSplitterState) || !ui_->splitter->restoreState(settings.value(MainWindowSettings::kSplitterState).toByteArray())) {
     ui_->splitter->setSizes(QList<int>() << 20 << (width() - 20));
   }
 
-  ui_->tabs->setCurrentIndex(settings_.value("current_tab", 1).toInt());
+  ui_->tabs->setCurrentIndex(settings.value("current_tab", 1).toInt());
   FancyTabWidget::Mode default_mode = FancyTabWidget::Mode::LargeSidebar;
-  FancyTabWidget::Mode tab_mode = static_cast<FancyTabWidget::Mode>(settings_.value("tab_mode", static_cast<int>(default_mode)).toInt());
+  FancyTabWidget::Mode tab_mode = static_cast<FancyTabWidget::Mode>(settings.value("tab_mode", static_cast<int>(default_mode)).toInt());
   if (tab_mode == FancyTabWidget::Mode::None) tab_mode = default_mode;
   ui_->tabs->SetMode(tab_mode);
 
   TabSwitched();
 
-  file_view_->SetPath(settings_.value("file_path", QDir::homePath()).toString());
+  file_view_->SetPath(settings.value("file_path", QDir::homePath()).toString());
 
   // Users often collapse one side of the splitter by mistake and don't know how to restore it. This must be set after the state is restored above.
   ui_->splitter->setChildrenCollapsible(false);
@@ -1040,13 +1055,13 @@ MainWindow::MainWindow(Application *app,
     case BehaviourSettings::StartupBehaviour::Remember:
     default:{
 
-      was_maximized_ = settings_.value(MainWindowSettings::kMaximized, true).toBool();
+      was_maximized_ = settings.value(MainWindowSettings::kMaximized, true).toBool();
       if (was_maximized_) setWindowState(windowState() | Qt::WindowMaximized);
 
-      was_minimized_ = settings_.value(MainWindowSettings::kMinimized, false).toBool();
+      was_minimized_ = settings.value(MainWindowSettings::kMinimized, false).toBool();
       if (was_minimized_) setWindowState(windowState() | Qt::WindowMinimized);
 
-      if (!systemtrayicon_->IsSystemTrayAvailable() || !systemtrayicon_->isVisible() || !settings_.value(MainWindowSettings::kHidden, false).toBool()) {
+      if (!systemtrayicon_->IsSystemTrayAvailable() || !systemtrayicon_->isVisible() || !settings.value(MainWindowSettings::kHidden, false).toBool()) {
         show();
       }
       break;
@@ -1054,7 +1069,7 @@ MainWindow::MainWindow(Application *app,
   }
 #endif
 
-  bool show_sidebar = settings_.value(MainWindowSettings::kShowSidebar, true).toBool();
+  bool show_sidebar = settings.value(MainWindowSettings::kShowSidebar, true).toBool();
   ui_->sidebar_layout->setVisible(show_sidebar);
   ui_->action_toggle_show_sidebar->setChecked(show_sidebar);
 
@@ -1225,7 +1240,9 @@ void MainWindow::ReloadSettings() {
 
   osd_->ReloadSettings();
 
-  album_cover_choice_controller_->search_cover_auto_action()->setChecked(settings_.value(MainWindowSettings::kSearchForCoverAuto, true).toBool());
+  s.beginGroup(MainWindowSettings::kSettingsGroup);
+  album_cover_choice_controller_->search_cover_auto_action()->setChecked(s.value(MainWindowSettings::kSearchForCoverAuto, true).toBool());
+  s.endGroup();
 
 #ifdef HAVE_SUBSONIC
   s.beginGroup(SubsonicSettings::kSettingsGroup);
@@ -1342,8 +1359,11 @@ void MainWindow::SaveSettings() {
   ui_->playlist->view()->SaveSettings();
   app_->scrobbler()->WriteCache();
 
-  settings_.setValue(MainWindowSettings::kShowSidebar, ui_->action_toggle_show_sidebar->isChecked());
+  Settings s;
-  settings_.setValue(MainWindowSettings::kSearchForCoverAuto, album_cover_choice_controller_->search_cover_auto_action()->isChecked());
+  s.beginGroup(MainWindowSettings::kSettingsGroup);
+  s.setValue(MainWindowSettings::kShowSidebar, ui_->action_toggle_show_sidebar->isChecked());
+  s.setValue(MainWindowSettings::kSearchForCoverAuto, album_cover_choice_controller_->search_cover_auto_action()->isChecked());
+  s.endGroup();
 
 }
 
@@ -1584,23 +1604,35 @@ void MainWindow::ToggleSidebar(const bool checked) {
 
   ui_->sidebar_layout->setVisible(checked);
   TabSwitched();
-  settings_.setValue(MainWindowSettings::kShowSidebar, checked);
+
+  Settings s;
+  s.beginGroup(MainWindowSettings::kSettingsGroup);
+  s.setValue(MainWindowSettings::kShowSidebar, checked);
+  s.endGroup();
 
 }
 
 void MainWindow::ToggleSearchCoverAuto(const bool checked) {
-  settings_.setValue(MainWindowSettings::kSearchForCoverAuto, checked);
+
+  Settings s;
+  s.beginGroup(MainWindowSettings::kSettingsGroup);
+  s.setValue(MainWindowSettings::kSearchForCoverAuto, checked);
+  s.endGroup();
+
 }
 
 void MainWindow::SaveGeometry() {
 
   if (!initialized_) return;
 
-  settings_.setValue(MainWindowSettings::kMaximized, isMaximized());
+  Settings s;
-  settings_.setValue(MainWindowSettings::kMinimized, isMinimized());
+  s.beginGroup(MainWindowSettings::kSettingsGroup);
-  settings_.setValue(MainWindowSettings::kHidden, isHidden());
+  s.setValue(MainWindowSettings::kMaximized, isMaximized());
-  settings_.setValue(MainWindowSettings::kGeometry, saveGeometry());
+  s.setValue(MainWindowSettings::kMinimized, isMinimized());
-  settings_.setValue(MainWindowSettings::kSplitterState, ui_->splitter->saveState());
+  s.setValue(MainWindowSettings::kHidden, isHidden());
+  s.setValue(MainWindowSettings::kGeometry, saveGeometry());
+  s.setValue(MainWindowSettings::kSplitterState, ui_->splitter->saveState());
+  s.endGroup();
 
 }
 
@@ -1742,7 +1774,12 @@ void MainWindow::SetHiddenInTray(const bool hidden) {
 }
 
 void MainWindow::FilePathChanged(const QString &path) {
-  settings_.setValue("file_path", path);
+
+  Settings s;
+  s.beginGroup(MainWindowSettings::kSettingsGroup);
+  s.setValue("file_path", path);
+  s.endGroup();
+
 }
 
 void MainWindow::Seeked(const qint64 microseconds) {
@@ -2324,7 +2361,9 @@ void MainWindow::EditValue() {
 void MainWindow::AddFile() {
 
   // Last used directory
-  QString directory = settings_.value("add_media_path", QDir::currentPath()).toString();
+  Settings s;
+  s.beginGroup(MainWindowSettings::kSettingsGroup);
+  QString directory = s.value("add_media_path", QDir::currentPath()).toString();
 
   PlaylistParser parser(app_->tagreader_client(), app_->collection_backend());
 
@@ -2334,7 +2373,7 @@ void MainWindow::AddFile() {
   if (filenames.isEmpty()) return;
 
   // Save last used directory
-  settings_.setValue("add_media_path", filenames[0]);
+  s.setValue("add_media_path", filenames[0]);
 
   // Convert to URLs
   QList<QUrl> urls;
@@ -2352,14 +2391,16 @@ void MainWindow::AddFile() {
 void MainWindow::AddFolder() {
 
   // Last used directory
-  QString directory = settings_.value("add_folder_path", QDir::currentPath()).toString();
+  Settings s;
+  s.beginGroup(MainWindowSettings::kSettingsGroup);
+  QString directory = s.value("add_folder_path", QDir::currentPath()).toString();
 
   // Show dialog
   directory = QFileDialog::getExistingDirectory(this, tr("Add folder"), directory);
   if (directory.isEmpty()) return;
 
   // Save last used directory
-  settings_.setValue("add_folder_path", directory);
+  s.setValue("add_folder_path", directory);
 
   // Add media
   MimeData *mimedata = new MimeData;
@@ -3375,3 +3416,24 @@ void MainWindow::FocusSearchField() {
   }
 
 }
+
+void MainWindow::ShowVisualizations() {
+
+#ifdef HAVE_VISUALIZATIONS
+
+  if (!visualization_) {
+    visualization_.reset(new VisualizationContainer);
+
+    visualization_->SetActions(ui_->action_previous_track, ui_->action_play_pause, ui_->action_stop, ui_->action_next_track);
+    connect(&*app_->player(), &Player::Stopped, &*visualization_, &VisualizationContainer::Stopped);
+    connect(&*app_->player(), &Player::ForceShowOSD, &*visualization_, &VisualizationContainer::SongMetadataChanged);
+    connect(&*app_->playlist_manager(), &PlaylistManager::CurrentSongChanged, &*visualization_, &VisualizationContainer::SongMetadataChanged);
+
+    visualization_->SetEngine(qobject_cast<GstEngine*>(&*app_->player()->engine()));
+  }
+
+  visualization_->show();
+
+#endif  // HAVE_VISUALIZATIONS
+
+}

src/core/mainwindow.h

@@ -45,7 +45,6 @@
 #include <QImage>
 #include <QPixmap>
 #include <QTimer>
-#include <QSettings>
 #include <QtEvents>
 
 #include "includes/scoped_ptr.h"
@@ -53,7 +52,6 @@
 #include "includes/lazy.h"
 #include "core/platforminterface.h"
 #include "core/song.h"
-#include "core/settings.h"
 #include "core/commandlineoptions.h"
 #include "tagreader/tagreaderclient.h"
 #include "osd/osdbase.h"
@@ -99,6 +97,7 @@ class Windows7ThumbBar;
 class AddStreamDialog;
 class LastFMImportDialog;
 class RadioViewContainer;
+class VisualizationContainer;
 
 #ifdef HAVE_DISCORD_RPC
 namespace discord {
@@ -283,6 +282,7 @@ class MainWindow : public QMainWindow, public PlatformInterface {
  public Q_SLOTS:
   void CommandlineOptionsReceived(const QByteArray &string_options);
   void Raise();
+  void ShowVisualizations();
 
  private:
   void SaveSettings();
@@ -362,6 +362,10 @@ class MainWindow : public QMainWindow, public PlatformInterface {
 
   LastFMImportDialog *lastfm_import_dialog_;
 
+#ifdef HAVE_VISUALIZATIONS
+  ScopedPtr<VisualizationContainer> visualization_;
+#endif
+
   QAction *collection_show_all_;
   QAction *collection_show_duplicates_;
   QAction *collection_show_untagged_;
@@ -390,7 +394,6 @@ class MainWindow : public QMainWindow, public PlatformInterface {
 
   QTimer *track_position_timer_;
   QTimer *track_slider_timer_;
-  Settings settings_;
 
   bool keep_running_;
   bool playing_widget_;

src/core/mainwindow.ui

@@ -517,6 +517,7 @@
     <addaction name="action_cover_manager"/>
     <addaction name="action_equalizer"/>
     <addaction name="action_transcoder"/>
+    <addaction name="action_visualizations"/>
     <addaction name="separator"/>
     <addaction name="action_update_collection"/>
     <addaction name="action_full_collection_scan"/>
@@ -863,6 +864,11 @@
     <string>Import data from last.fm...</string>
    </property>
   </action>
+  <action name="action_visualizations">
+    <property name="text">
+      <string>Visualizations</string>
+    </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>

src/core/song.cpp

@@ -805,19 +805,19 @@ bool Song::lyrics_supported() const {
 }
 
 bool Song::albumartistsort_supported() const {
-  return d->filetype_ == FileType::FLAC || d->filetype_ == FileType::OggFlac || d->filetype_ == FileType::OggVorbis || d->filetype_ == FileType::MPEG;
+  return d->filetype_ == FileType::FLAC || d->filetype_ == FileType::OggFlac || d->filetype_ == FileType::OggVorbis || d->filetype_ == FileType::OggOpus || d->filetype_ == FileType::MPEG;
 }
 
 bool Song::albumsort_supported() const {
-  return d->filetype_ == FileType::FLAC || d->filetype_ == FileType::OggFlac || d->filetype_ == FileType::OggVorbis || d->filetype_ == FileType::MPEG;
+  return d->filetype_ == FileType::FLAC || d->filetype_ == FileType::OggFlac || d->filetype_ == FileType::OggVorbis || d->filetype_ == FileType::OggOpus || d->filetype_ == FileType::MPEG;
 }
 
 bool Song::artistsort_supported() const {
-  return d->filetype_ == FileType::FLAC || d->filetype_ == FileType::OggFlac || d->filetype_ == FileType::OggVorbis || d->filetype_ == FileType::MPEG;
+  return d->filetype_ == FileType::FLAC || d->filetype_ == FileType::OggFlac || d->filetype_ == FileType::OggVorbis || d->filetype_ == FileType::OggOpus || d->filetype_ == FileType::MPEG;
 }
 
 bool Song::composersort_supported() const {
-  return d->filetype_ == FileType::FLAC || d->filetype_ == FileType::OggFlac || d->filetype_ == FileType::OggVorbis || d->filetype_ == FileType::MPEG;
+  return d->filetype_ == FileType::FLAC || d->filetype_ == FileType::OggFlac || d->filetype_ == FileType::OggVorbis || d->filetype_ == FileType::OggOpus || d->filetype_ == FileType::MPEG;
 }
 
 bool Song::performersort_supported() const {
@@ -826,7 +826,7 @@ bool Song::performersort_supported() const {
 }
 
 bool Song::titlesort_supported() const {
-  return d->filetype_ == FileType::FLAC || d->filetype_ == FileType::OggFlac || d->filetype_ == FileType::OggVorbis || d->filetype_ == FileType::MPEG;
+  return d->filetype_ == FileType::FLAC || d->filetype_ == FileType::OggFlac || d->filetype_ == FileType::OggVorbis || d->filetype_ == FileType::OggOpus || d->filetype_ == FileType::MPEG;
 }
 
 bool Song::save_embedded_cover_supported(const FileType filetype) {

src/core/songloader.cpp

@@ -98,6 +98,9 @@ SongLoader::SongLoader(const SharedPtr<UrlHandlers> url_handlers,
 
   QObject::connect(timeout_timer_, &QTimer::timeout, this, &SongLoader::Timeout);
 
+  QObject::connect(playlist_parser_, &PlaylistParser::Error, this, &SongLoader::ParserError);
+  QObject::connect(cue_parser_, &CueParser::Error, this, &SongLoader::ParserError);
+
 }
 
 SongLoader::~SongLoader() {
@@ -106,6 +109,10 @@ SongLoader::~SongLoader() {
 
 }
 
+void SongLoader::ParserError(const QString &error) {
+  errors_ << error;
+}
+
 SongLoader::Result SongLoader::Load(const QUrl &url) {
 
   if (url.isEmpty()) return Result::Error;
@@ -287,6 +294,7 @@ SongLoader::Result SongLoader::LoadLocalAsync(const QString &filename) {
   }
 
   if (parser) {  // It's a playlist!
+    QObject::connect(parser, &ParserBase::Error, this, &SongLoader::ParserError, static_cast<Qt::ConnectionType>(Qt::QueuedConnection | Qt::UniqueConnection));
     qLog(Debug) << "Parsing using" << parser->name();
     LoadPlaylist(parser, filename);
     return Result::Success;
@@ -706,6 +714,10 @@ void SongLoader::MagicReady() {
     StopTypefindAsync(true);
   }
 
+  if (parser_) {
+    QObject::connect(parser_, &ParserBase::Error, this, &SongLoader::ParserError, static_cast<Qt::ConnectionType>(Qt::QueuedConnection | Qt::UniqueConnection));
+  }
+
   state_ = State::WaitingForData;
 
   if (!IsPipelinePlaying()) {

src/core/songloader.h

@@ -99,6 +99,7 @@ class SongLoader : public QObject {
   void ScheduleTimeout();
   void Timeout();
   void StopTypefind();
+  void ParserError(const QString &error);
 
 #ifdef HAVE_AUDIOCD
   void AudioCDTracksLoadErrorSlot(const QString &error);

src/engine/gstbufferconsumer.h

@@ -36,7 +36,7 @@ class GstBufferConsumer {
 
   // This is called in some unspecified GStreamer thread.
   // Ownership of the buffer is transferred to the BufferConsumer, and it should gst_buffer_unref it.
-  virtual void ConsumeBuffer(GstBuffer *buffer, const int pipeline_id, const QString &format) = 0;
+  virtual void ConsumeBuffer(GstBuffer *buffer, const int pipeline_id, const QString &format, const int channels) = 0;
 
  private:
   Q_DISABLE_COPY(GstBufferConsumer)

src/engine/gstengine.cpp

@@ -543,7 +543,9 @@ void GstEngine::ReloadSettings() {
 
 }
 
-void GstEngine::ConsumeBuffer(GstBuffer *buffer, const int pipeline_id, const QString &format) {
+void GstEngine::ConsumeBuffer(GstBuffer *buffer, const int pipeline_id, const QString &format, const int channels) {
+
+  Q_UNUSED(channels);
 
   // Schedule this to run in the GUI thread.  The buffer gets added to the queue and unreffed by UpdateScope.
   if (!QMetaObject::invokeMethod(this, "AddBufferToScope", Q_ARG(GstBuffer*, buffer), Q_ARG(int, pipeline_id), Q_ARG(QString, format))) {

src/engine/gstengine.h

@@ -84,7 +84,7 @@ class GstEngine : public EngineBase, public GstBufferConsumer {
   bool ALSADeviceSupport(const QString &output) const override;
   bool ExclusiveModeSupport(const QString &output) const override;
 
-  void ConsumeBuffer(GstBuffer *buffer, const int pipeline_id, const QString &format) override;
+  void ConsumeBuffer(GstBuffer *buffer, const int pipeline_id, const QString &format, const int channels) override;
 
  public Q_SLOTS:
   void ReloadSettings() override;

src/engine/gstenginepipeline.cpp

@@ -178,7 +178,6 @@ GstEnginePipeline::GstEnginePipeline(QObject *parent)
       audiobin_(nullptr),
       audiosink_(nullptr),
       audioqueue_(nullptr),
-      audioqueueconverter_(nullptr),
       volume_(nullptr),
       volume_sw_(nullptr),
       volume_fading_(nullptr),
@@ -187,6 +186,7 @@ GstEnginePipeline::GstEnginePipeline(QObject *parent)
       equalizer_(nullptr),
       equalizer_preamp_(nullptr),
       eventprobe_(nullptr),
+      bufferprobe_(nullptr),
       logged_unsupported_analyzer_format_(false),
       about_to_finish_(false),
       finish_requested_(false),
@@ -436,7 +436,7 @@ void GstEnginePipeline::Disconnect() {
     }
 
     if (buffer_probe_cb_id_.has_value()) {
-      GstPad *pad = gst_element_get_static_pad(audioqueueconverter_, "src");
+      GstPad *pad = gst_element_get_static_pad(bufferprobe_, "src");
       if (pad) {
         gst_pad_remove_probe(pad, buffer_probe_cb_id_.value());
         gst_object_unref(pad);
@@ -674,8 +674,13 @@ bool GstEnginePipeline::InitAudioBin(QString &error) {
     return false;
   }
 
-  audioqueueconverter_ = CreateElement(u"audioconvert"_s, u"audioqueueconverter"_s, audiobin_, error);
+  GstElement *audioqueueconverter = CreateElement(u"audioconvert"_s, u"audioqueueconverter"_s, audiobin_, error);
-  if (!audioqueueconverter_) {
+  if (!audioqueueconverter) {
+    return false;
+  }
+
+  GstElement *audioqueueresampler = CreateElement(u"audioresample"_s, u"audioqueueresampler"_s, audiobin_, error);
+  if (!audioqueueresampler) {
     return false;
   }
 
@@ -684,6 +689,11 @@ bool GstEnginePipeline::InitAudioBin(QString &error) {
     return false;
   }
 
+  GstElement *audiosinkresampler = CreateElement(u"audioresample"_s, u"audiosinkresampler"_s, audiobin_, error);
+  if (!audiosinkresampler) {
+    return false;
+  }
+
   // Create the volume element if it's enabled.
   if (volume_enabled_ && !volume_) {
     volume_sw_ = CreateElement(u"volume"_s, u"volume_sw"_s, audiobin_, error);
@@ -761,7 +771,8 @@ bool GstEnginePipeline::InitAudioBin(QString &error) {
 
   }
 
-  eventprobe_ = audioqueueconverter_;
+  eventprobe_ = audioqueueconverter;
+  bufferprobe_ = audioqueueconverter;
 
   // Create the replaygain elements if it's enabled.
   GstElement *rgvolume = nullptr;
@@ -847,12 +858,17 @@ bool GstEnginePipeline::InitAudioBin(QString &error) {
 
   // Link all elements
 
-  if (!gst_element_link(audioqueue_, audioqueueconverter_)) {
+  if (!gst_element_link(audioqueue_, audioqueueconverter)) {
     error = u"Failed to link audio queue to audio queue converter."_s;
     return false;
   }
 
-  GstElement *element_link = audioqueueconverter_;  // The next element to link from.
+  if (!gst_element_link(audioqueueconverter, audioqueueresampler)) {
+    error = u"Failed to link audio queue converter to audio queue resampler."_s;
+    return false;
+  }
+
+  GstElement *element_link = audioqueueresampler;  // The next element to link from.
 
   // Link replaygain elements if enabled.
   if (rg_enabled_ && rgvolume && rglimiter && rgconverter) {
@@ -928,6 +944,11 @@ bool GstEnginePipeline::InitAudioBin(QString &error) {
     return false;
   }
 
+  if (!gst_element_link(audiosinkconverter, audiosinkresampler)) {
+    error = "Failed to link audio sink converter to audio sink resampler."_L1;
+    return false;
+  }
+
   {
     GstCaps *caps = gst_caps_new_empty_simple("audio/x-raw");
     if (!caps) {
@@ -938,16 +959,16 @@ bool GstEnginePipeline::InitAudioBin(QString &error) {
       qLog(Debug) << "Setting channels to" << channels_;
       gst_caps_set_simple(caps, "channels", G_TYPE_INT, channels_, nullptr);
     }
-    const bool link_filtered_result = gst_element_link_filtered(audiosinkconverter, audiosink_, caps);
+    const bool link_filtered_result = gst_element_link_filtered(audiosinkresampler, audiosink_, caps);
     gst_caps_unref(caps);
     if (!link_filtered_result) {
-      error = "Failed to link audio sink converter to audio sink with filter for "_L1 + output_;
+      error = "Failed to link audio sink resampler to audio sink with filter for "_L1 + output_;
       return false;
     }
   }
 
   {  // Add probes and handlers.
-    GstPad *pad = gst_element_get_static_pad(audioqueueconverter_, "src");
+    GstPad *pad = gst_element_get_static_pad(bufferprobe_, "src");
     if (pad) {
       buffer_probe_cb_id_ = gst_pad_add_probe(pad, GST_PAD_PROBE_TYPE_BUFFER, BufferProbeCallback, this, nullptr);
       gst_object_unref(pad);
@@ -1364,7 +1385,7 @@ GstPadProbeReturn GstEnginePipeline::BufferProbeCallback(GstPad *pad, GstPadProb
 
   for (GstBufferConsumer *consumer : std::as_const(consumers)) {
     gst_buffer_ref(buf);
-    consumer->ConsumeBuffer(buf, instance->id(), format);
+    consumer->ConsumeBuffer(buf, instance->id(), format, channels);
   }
 
   if (buf16) {

src/engine/gstenginepipeline.h

@@ -355,7 +355,6 @@ class GstEnginePipeline : public QObject {
   GstElement *audiobin_;
   GstElement *audiosink_;
   GstElement *audioqueue_;
-  GstElement *audioqueueconverter_;
   GstElement *volume_;
   GstElement *volume_sw_;
   GstElement *volume_fading_;
@@ -364,6 +363,7 @@ class GstEnginePipeline : public QObject {
   GstElement *equalizer_;
   GstElement *equalizer_preamp_;
   GstElement *eventprobe_;
+  GstElement *bufferprobe_;
 
   std::optional<gulong> upstream_events_probe_cb_id_;
   std::optional<gulong> buffer_probe_cb_id_;

src/globalshortcuts/globalshortcutsmanager.cpp

@@ -32,6 +32,7 @@
 #include <QKeySequence>
 
 #include "core/logging.h"
+#include "core/settings.h"
 
 #include "globalshortcutsmanager.h"
 #include "globalshortcutsbackend.h"
@@ -58,29 +59,32 @@ using namespace Qt::Literals::StringLiterals;
 
 GlobalShortcutsManager::GlobalShortcutsManager(QWidget *parent) : QWidget(parent) {
 
-  settings_.beginGroup(GlobalShortcutsSettings::kSettingsGroup);
+  Settings s;
+  s.beginGroup(GlobalShortcutsSettings::kSettingsGroup);
 
   // Create actions
-  AddShortcut(u"play"_s, tr("Play"), std::bind(&GlobalShortcutsManager::Play, this));
+  AddShortcut(s, u"play"_s, tr("Play"), std::bind(&GlobalShortcutsManager::Play, this));
-  AddShortcut(u"pause"_s, tr("Pause"), std::bind(&GlobalShortcutsManager::Pause, this));
+  AddShortcut(s, u"pause"_s, tr("Pause"), std::bind(&GlobalShortcutsManager::Pause, this));
-  AddShortcut(u"play_pause"_s, tr("Play/Pause"), std::bind(&GlobalShortcutsManager::PlayPause, this), QKeySequence(Qt::Key_MediaPlay));
+  AddShortcut(s, u"play_pause"_s, tr("Play/Pause"), std::bind(&GlobalShortcutsManager::PlayPause, this), QKeySequence(Qt::Key_MediaPlay));
-  AddShortcut(u"stop"_s, tr("Stop"), std::bind(&GlobalShortcutsManager::Stop, this), QKeySequence(Qt::Key_MediaStop));
+  AddShortcut(s, u"stop"_s, tr("Stop"), std::bind(&GlobalShortcutsManager::Stop, this), QKeySequence(Qt::Key_MediaStop));
-  AddShortcut(u"stop_after"_s, tr("Stop playing after current track"), std::bind(&GlobalShortcutsManager::StopAfter, this));
+  AddShortcut(s, u"stop_after"_s, tr("Stop playing after current track"), std::bind(&GlobalShortcutsManager::StopAfter, this));
-  AddShortcut(u"next_track"_s, tr("Next track"), std::bind(&GlobalShortcutsManager::Next, this), QKeySequence(Qt::Key_MediaNext));
+  AddShortcut(s, u"next_track"_s, tr("Next track"), std::bind(&GlobalShortcutsManager::Next, this), QKeySequence(Qt::Key_MediaNext));
-  AddShortcut(u"prev_track"_s, tr("Previous track"), std::bind(&GlobalShortcutsManager::Previous, this), QKeySequence(Qt::Key_MediaPrevious));
+  AddShortcut(s, u"prev_track"_s, tr("Previous track"), std::bind(&GlobalShortcutsManager::Previous, this), QKeySequence(Qt::Key_MediaPrevious));
-  AddShortcut(u"restart_or_prev_track"_s, tr("Restart or previous track"), std::bind(&GlobalShortcutsManager::RestartOrPrevious, this));
+  AddShortcut(s, u"restart_or_prev_track"_s, tr("Restart or previous track"), std::bind(&GlobalShortcutsManager::RestartOrPrevious, this));
-  AddShortcut(u"inc_volume"_s, tr("Increase volume"), std::bind(&GlobalShortcutsManager::IncVolume, this));
+  AddShortcut(s, u"inc_volume"_s, tr("Increase volume"), std::bind(&GlobalShortcutsManager::IncVolume, this));
-  AddShortcut(u"dec_volume"_s, tr("Decrease volume"), std::bind(&GlobalShortcutsManager::DecVolume, this));
+  AddShortcut(s, u"dec_volume"_s, tr("Decrease volume"), std::bind(&GlobalShortcutsManager::DecVolume, this));
-  AddShortcut(u"mute"_s, tr("Mute"), std::bind(&GlobalShortcutsManager::Mute, this));
+  AddShortcut(s, u"mute"_s, tr("Mute"), std::bind(&GlobalShortcutsManager::Mute, this));
-  AddShortcut(u"seek_forward"_s, tr("Seek forward"), std::bind(&GlobalShortcutsManager::SeekForward, this));
+  AddShortcut(s, u"seek_forward"_s, tr("Seek forward"), std::bind(&GlobalShortcutsManager::SeekForward, this));
-  AddShortcut(u"seek_backward"_s, tr("Seek backward"), std::bind(&GlobalShortcutsManager::SeekBackward, this));
+  AddShortcut(s, u"seek_backward"_s, tr("Seek backward"), std::bind(&GlobalShortcutsManager::SeekBackward, this));
-  AddShortcut(u"show_hide"_s, tr("Show/Hide"), std::bind(&GlobalShortcutsManager::ShowHide, this));
+  AddShortcut(s, u"show_hide"_s, tr("Show/Hide"), std::bind(&GlobalShortcutsManager::ShowHide, this));
-  AddShortcut(u"show_osd"_s, tr("Show OSD"), std::bind(&GlobalShortcutsManager::ShowOSD, this));
+  AddShortcut(s, u"show_osd"_s, tr("Show OSD"), std::bind(&GlobalShortcutsManager::ShowOSD, this));
-  AddShortcut(u"toggle_pretty_osd"_s, tr("Toggle Pretty OSD"), std::bind(&GlobalShortcutsManager::TogglePrettyOSD, this));  // Toggling possible only for pretty OSD
+  AddShortcut(s, u"toggle_pretty_osd"_s, tr("Toggle Pretty OSD"), std::bind(&GlobalShortcutsManager::TogglePrettyOSD, this));  // Toggling possible only for pretty OSD
-  AddShortcut(u"shuffle_mode"_s, tr("Change shuffle mode"), std::bind(&GlobalShortcutsManager::CycleShuffleMode, this));
+  AddShortcut(s, u"shuffle_mode"_s, tr("Change shuffle mode"), std::bind(&GlobalShortcutsManager::CycleShuffleMode, this));
-  AddShortcut(u"repeat_mode"_s, tr("Change repeat mode"), std::bind(&GlobalShortcutsManager::CycleRepeatMode, this));
+  AddShortcut(s, u"repeat_mode"_s, tr("Change repeat mode"), std::bind(&GlobalShortcutsManager::CycleRepeatMode, this));
-  AddShortcut(u"toggle_scrobbling"_s, tr("Enable/disable scrobbling"), std::bind(&GlobalShortcutsManager::ToggleScrobbling, this));
+  AddShortcut(s, u"toggle_scrobbling"_s, tr("Enable/disable scrobbling"), std::bind(&GlobalShortcutsManager::ToggleScrobbling, this));
-  AddShortcut(u"love"_s, tr("Love"), std::bind(&GlobalShortcutsManager::Love, this));
+  AddShortcut(s, u"love"_s, tr("Love"), std::bind(&GlobalShortcutsManager::Love, this));
+
+  s.endGroup();
 
   // Create backends - these do the actual shortcut registration
 
@@ -116,35 +120,39 @@ void GlobalShortcutsManager::ReloadSettings() {
   backends_enabled_ << GlobalShortcutsBackend::Type::Win;
 #endif
 
+  {
+    Settings s;
+    s.beginGroup(GlobalShortcutsSettings::kSettingsGroup);
 #ifdef HAVE_KGLOBALACCEL_GLOBALSHORTCUTS
-  if (settings_.value(GlobalShortcutsSettings::kUseKGlobalAccel, true).toBool()) {
+    if (s.value(GlobalShortcutsSettings::kUseKGlobalAccel, true).toBool()) {
-    backends_enabled_ << GlobalShortcutsBackend::Type::KGlobalAccel;
+      backends_enabled_ << GlobalShortcutsBackend::Type::KGlobalAccel;
-  }
+    }
 #endif
-
 #ifdef HAVE_X11_GLOBALSHORTCUTS
-  if (settings_.value(GlobalShortcutsSettings::kUseX11, false).toBool()) {
+    if (s.value(GlobalShortcutsSettings::kUseX11, false).toBool()) {
-    backends_enabled_ << GlobalShortcutsBackend::Type::X11;
+      backends_enabled_ << GlobalShortcutsBackend::Type::X11;
-  }
+    }
 #endif
+    s.endGroup();
+  }
 
   Unregister();
   Register();
 
 }
 
-void GlobalShortcutsManager::AddShortcut(const QString &id, const QString &name, std::function<void()> signal, const QKeySequence &default_key) {  // clazy:exclude=function-args-by-ref
+void GlobalShortcutsManager::AddShortcut(Settings &s, const QString &id, const QString &name, std::function<void()> signal, const QKeySequence &default_key) {  // clazy:exclude=function-args-by-ref
 
-  Shortcut shortcut = AddShortcut(id, name, default_key);
+  Shortcut shortcut = AddShortcut(s, id, name, default_key);
   QObject::connect(shortcut.action, &QAction::triggered, this, signal);
 
 }
 
-GlobalShortcutsManager::Shortcut GlobalShortcutsManager::AddShortcut(const QString &id, const QString &name, const QKeySequence &default_key) {
+GlobalShortcutsManager::Shortcut GlobalShortcutsManager::AddShortcut(Settings &s, const QString &id, const QString &name, const QKeySequence &default_key) {
 
   Shortcut shortcut;
   shortcut.action = new QAction(name, this);
-  QKeySequence key_sequence = QKeySequence::fromString(settings_.value(id, default_key.toString()).toString());
+  QKeySequence key_sequence = QKeySequence::fromString(s.value(id, default_key.toString()).toString());
   shortcut.action->setShortcut(key_sequence);
   shortcut.id = id;
   shortcut.default_key = default_key;

src/globalshortcuts/globalshortcutsmanager.h

@@ -32,15 +32,14 @@
 #include <QMap>
 #include <QString>
 #include <QKeySequence>
-#include <QSettings>
 
 #include "globalshortcutsbackend.h"
 
-#include "core/settings.h"
-
 class QShortcut;
 class QAction;
 
+class Settings;
+
 class GlobalShortcutsManager : public QWidget {
   Q_OBJECT
 
@@ -99,12 +98,11 @@ class GlobalShortcutsManager : public QWidget {
   void Love();
 
  private:
-  void AddShortcut(const QString &id, const QString &name, std::function<void()> signal, const QKeySequence &default_key = QKeySequence(0));
+  void AddShortcut(Settings &s, const QString &id, const QString &name, std::function<void()> signal, const QKeySequence &default_key = QKeySequence(0));
-  Shortcut AddShortcut(const QString &id, const QString &name, const QKeySequence &default_key);
+  Shortcut AddShortcut(Settings &s, const QString &id, const QString &name, const QKeySequence &default_key);
 
  private:
   QList<GlobalShortcutsBackend*> backends_;
-  Settings settings_;
   QList<GlobalShortcutsBackend::Type> backends_enabled_;
   QMap<QString, Shortcut> shortcuts_;
 };

src/playlist/playlistcontainer.cpp

@@ -106,8 +106,6 @@ PlaylistContainer::PlaylistContainer(QWidget *parent)
   no_matches_font.setBold(true);
   no_matches_label_->setFont(no_matches_font);
 
-  settings_.beginGroup(kSettingsGroup);
-
   // Tab bar
   ui_->tab_bar->setExpanding(false);
   ui_->tab_bar->setMovable(true);
@@ -257,7 +255,11 @@ void PlaylistContainer::ReloadSettings() {
   ui_->redo->setIconSize(QSize(iconsize, iconsize));
   ui_->search_field->setIconSize(iconsize);
 
-  bool playlist_clear = settings_.value("playlist_clear", true).toBool();
+  s.beginGroup(kSettingsGroup);
+  const bool playlist_clear = s.value("playlist_clear", true).toBool();
+  const bool show_toolbar = s.value("show_toolbar", true).toBool();
+  s.endGroup();
+
   if (playlist_clear) {
     ui_->clear->show();
   }
@@ -265,7 +267,6 @@ void PlaylistContainer::ReloadSettings() {
     ui_->clear->hide();
   }
 
-  bool show_toolbar = settings_.value("show_toolbar", true).toBool();
   ui_->toolbar->setVisible(show_toolbar);
 
   if (!show_toolbar) ui_->search_field->clear();
@@ -308,7 +309,12 @@ void PlaylistContainer::PlaylistAdded(const int id, const QString &name, const b
   ui_->tab_bar->InsertTab(id, index, name, favorite);
 
   // Are we start up, should we select this tab?
-  if (starting_up_ && settings_.value("current_playlist", 1).toInt() == id) {
+  Settings s;
+  s.beginGroup(kSettingsGroup);
+  const int current_playlist = s.value("current_playlist", 1).toInt();
+  s.endGroup();
+
+  if (starting_up_ && current_playlist == id) {
     starting_up_ = false;
     ui_->tab_bar->set_current_id(id);
   }
@@ -347,12 +353,14 @@ void PlaylistContainer::NewPlaylist() { manager_->New(tr("Playlist")); }
 
 void PlaylistContainer::LoadPlaylist() {
 
-  QString filename = settings_.value("last_load_playlist").toString();
+  Settings s;
+  s.beginGroup(kSettingsGroup);
+  QString filename = s.value("last_load_playlist").toString();
   filename = QFileDialog::getOpenFileName(this, tr("Load playlist"), filename, manager_->parser()->filters(PlaylistParser::Type::Load));
 
   if (filename.isNull()) return;
 
-  settings_.setValue("last_load_playlist", filename);
+  s.setValue("last_load_playlist", filename);
 
   manager_->Load(filename);
 
@@ -391,7 +399,10 @@ void PlaylistContainer::Save() {
 
   if (starting_up_) return;
 
-  settings_.setValue("current_playlist", ui_->tab_bar->current_id());
+  Settings s;
+  s.beginGroup(kSettingsGroup);
+  s.setValue("current_playlist", ui_->tab_bar->current_id());
+  s.endGroup();
 
 }
 

src/playlist/playlistcontainer.h

@@ -28,7 +28,6 @@
 #include <QWidget>
 #include <QString>
 #include <QIcon>
-#include <QSettings>
 
 class QTimer;
 class QTimeLine;
@@ -45,7 +44,6 @@ class PlaylistView;
 class Ui_PlaylistContainer;
 
 #include "includes/shared_ptr.h"
-#include "core/settings.h"
 
 class PlaylistContainer : public QWidget {
   Q_OBJECT
@@ -118,7 +116,6 @@ class PlaylistContainer : public QWidget {
   QAction *redo_;
   Playlist *playlist_;
 
-  Settings settings_;
   bool starting_up_;
 
   bool tab_bar_visible_;

src/playlist/playlistsequence.cpp

@@ -22,7 +22,6 @@
 #include "config.h"
 
 #include <utility>
-#include <algorithm>
 
 #include <QWidget>
 #include <QVariant>
@@ -34,12 +33,9 @@
 #include <QAction>
 #include <QActionGroup>
 #include <QToolButton>
-#include <QScreen>
-#include <QGuiApplication>
 
 #include "core/iconloader.h"
 #include "core/settingsprovider.h"
-#include "utilities/screenutils.h"
 #include "playlistsequence.h"
 #include "ui_playlistsequence.h"
 
@@ -47,14 +43,7 @@ using namespace Qt::Literals::StringLiterals;
 
 namespace {
 constexpr char kSettingsGroup[] = "PlaylistSequence";
-
+}
-// Base icon size for reference resolution (1920x1080 at 1.0 scale)
-constexpr int kBaseIconSize = 20;
-constexpr int kReferenceWidth = 1920;
-constexpr int kReferenceHeight = 1080;
-constexpr qreal kReferenceDevicePixelRatio = 1.0;
-
-}  // namespace
 
 PlaylistSequence::PlaylistSequence(QWidget *parent, SettingsProvider *settings)
     : QWidget(parent),
@@ -71,11 +60,9 @@ PlaylistSequence::PlaylistSequence(QWidget *parent, SettingsProvider *settings)
   // Icons
   ui_->repeat->setIcon(AddDesaturatedIcon(IconLoader::Load(u"media-playlist-repeat"_s)));
   ui_->shuffle->setIcon(AddDesaturatedIcon(IconLoader::Load(u"media-playlist-shuffle"_s)));
-  
+  const int base_icon_size = static_cast<int>(fontMetrics().height() * 1.2);
-  // Calculate icon size dynamically based on screen resolution, aspect ratio, and scaling
+  ui_->repeat->setIconSize(QSize(base_icon_size, base_icon_size));
-  const int icon_size = CalculateIconSize();
+  ui_->shuffle->setIconSize(QSize(base_icon_size, base_icon_size));
-  ui_->repeat->setIconSize(QSize(icon_size, icon_size));
-  ui_->shuffle->setIconSize(QSize(icon_size, icon_size));
 
   // Remove arrow indicators
   ui_->repeat->setStyleSheet(u"QToolButton::menu-indicator { image: none; }"_s);
@@ -112,48 +99,6 @@ PlaylistSequence::~PlaylistSequence() {
   delete ui_;
 }
 
-int PlaylistSequence::CalculateIconSize() {
-
-  // Get screen information for the widget
-  QScreen *screen = Utilities::GetScreen(this);
-  if (!screen) {
-    screen = QGuiApplication::primaryScreen();
-  }
-  
-  if (!screen) {
-    // Fallback to a reasonable default if no screen is available
-    return kBaseIconSize;
-  }
-
-  // Get screen properties
-  const QSize screen_size = screen->size();
-  const qreal device_pixel_ratio = screen->devicePixelRatio();
-  const int screen_width = screen_size.width();
-  const int screen_height = screen_size.height();
-  
-  // Calculate scaling factors based on resolution
-  // Use the smaller dimension to handle both landscape and portrait orientations
-  const int min_dimension = std::min(screen_width, screen_height);
-  const int ref_min_dimension = std::min(kReferenceWidth, kReferenceHeight);
-  const qreal resolution_factor = static_cast<qreal>(min_dimension) / static_cast<qreal>(ref_min_dimension);
-  
-  // Apply device pixel ratio (for high-DPI displays)
-  const qreal dpi_factor = device_pixel_ratio / kReferenceDevicePixelRatio;
-  
-  // Calculate final icon size with combined scaling
-  // Formula: 50% from resolution scaling + 50% from DPI scaling + 50% base multiplier
-  // The 0.5 base ensures icons scale up appropriately across different displays
-  // Without it, icons would be too small on average displays
-  const qreal combined_factor = (resolution_factor * 0.5) + (dpi_factor * 0.5) + 0.5;
-  int calculated_size = static_cast<int>(kBaseIconSize * combined_factor);
-  
-  // Clamp to reasonable bounds (minimum 16px, maximum 48px)
-  calculated_size = std::max(16, std::min(48, calculated_size));
-  
-  return calculated_size;
-
-}
-
 void PlaylistSequence::Load() {
 
   loading_ = true;  // Stops these setter functions calling Save()

src/playlist/playlistsequence.h

@@ -83,7 +83,6 @@ class PlaylistSequence : public QWidget {
  private:
   void Load();
   void Save();
-  int CalculateIconSize();
   static QIcon AddDesaturatedIcon(const QIcon &icon);
   static QPixmap DesaturatedPixmap(const QPixmap &pixmap);
 

src/playlist/playlistview.cpp

@@ -57,7 +57,6 @@
 #include <QLinearGradient>
 #include <QScrollBar>
 #include <QtEvents>
-#include <QSettings>
 #include <QDrag>
 
 #include "includes/qt_blurimage.h"

src/playlist/songloaderinserter.cpp

@@ -80,12 +80,13 @@ void SongLoaderInserter::Load(Playlist *destination, const int row, const bool p
       songs_ << loader->songs();
       playlist_name_ = loader->playlist_name();
     }
-    else {
+    
-      const QStringList errors = loader->errors();
+    // Always check for errors, even on success (e.g., playlist parsed but some songs failed to load)
-      for (const QString &error : errors) {
+    const QStringList errors = loader->errors();
-        Q_EMIT Error(error);
+    for (const QString &error : errors) {
-      }
+      Q_EMIT Error(error);
     }
+    
     delete loader;
   }
 
@@ -192,11 +193,13 @@ void SongLoaderInserter::AsyncLoad() {
     const SongLoader::Result result = loader->LoadFilenamesBlocking();
     task_manager_->SetTaskProgress(async_load_id, static_cast<quint64>(++async_progress));
 
+    // Always check for errors, even on success (e.g., playlist parsed but some songs failed to load)
+    const QStringList errors = loader->errors();
+    for (const QString &error : errors) {
+      Q_EMIT Error(error);
+    }
+
     if (result == SongLoader::Result::Error) {
-      const QStringList errors = loader->errors();
-      for (const QString &error : errors) {
-        Q_EMIT Error(error);
-      }
       continue;
     }
 

src/playlistparsers/parserbase.cpp

@@ -112,10 +112,18 @@ void ParserBase::LoadSong(const QString &filename_or_url, const qint64 beginning
     }
   }
 
+  // Check if the file exists before trying to read it
+  if (!QFile::exists(filename)) {
+    qLog(Error) << "File does not exist:" << filename;
+    Q_EMIT Error(tr("File %1 does not exist").arg(filename));
+    return;
+  }
+
   if (tagreader_client_) {
     const TagReaderResult result = tagreader_client_->ReadFileBlocking(filename, song);
     if (!result.success()) {
       qLog(Error) << "Could not read file" << filename << result.error_string();
+      Q_EMIT Error(tr("Could not read file %1: %2").arg(filename, result.error_string()));
     }
   }
 

src/translations/strawberry_ru_RU.ts

@@ -5526,7 +5526,7 @@ Are you sure you want to continue?</source>
     <name>RadioParadiseService</name>
     <message>
       <source>Getting %1 channels</source>
-      <translation>Получение %1 каналов</translation>
+      <translation>Получение каналов %1</translation>
     </message>
   </context>
   <context>
@@ -6191,7 +6191,7 @@ Are you sure you want to continue?</source>
     <name>SomaFMService</name>
     <message>
       <source>Getting %1 channels</source>
-      <translation>Получение %1 каналов</translation>
+      <translation>Получение каналов %1</translation>
     </message>
   </context>
   <context>

src/translations/strawberry_tr_TR.ts

@@ -1187,7 +1187,7 @@ If there are no matches then it will use the largest image in the directory.</tr
     </message>
     <message>
       <source>Queue to play next</source>
-      <translation>Sıradaki Yap</translation>
+      <translation>Sıradaki yap</translation>
     </message>
     <message>
       <source>Search for this</source>
@@ -3496,7 +3496,7 @@ If there are no matches then it will use the largest image in the directory.</tr
     </message>
     <message>
       <source>Queue to play next</source>
-      <translation>Sıradaki Yap</translation>
+      <translation>Sıradaki yap</translation>
     </message>
     <message>
       <source>Unskip track</source>
@@ -4431,7 +4431,7 @@ If there are no matches then it will use the largest image in the directory.</tr
     </message>
     <message>
       <source>&amp;Hide %1</source>
-      <translation>&amp;%1&apos;i sakla</translation>
+      <translation>&amp;%1 ögesini sakla</translation>
     </message>
   </context>
   <context>
@@ -6407,7 +6407,7 @@ Devam etmek istediğinizden emin misiniz?</translation>
     </message>
     <message>
       <source>Queue to play next</source>
-      <translation>Sıradaki Yap</translation>
+      <translation>Sıradaki yap</translation>
     </message>
     <message>
       <source>Remove from favorites</source>

src/visualizations/projectmpresetmodel.cpp

@@ -0,0 +1,159 @@
+/*
+ * Strawberry Music Player
+ * This file was part of Clementine.
+ * Copyright 2010, David Sansome <me@davidsansome.com>
+ * Copyright 2024, Jonas Kvinge <jonas@jkvinge.net>
+ *
+ * Strawberry is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Strawberry is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "config.h"
+
+#include <QAbstractItemModel>
+#include <QString>
+#include <QStringList>
+#include <QFileInfo>
+#include <QDir>
+#include <QDirIterator>
+
+#include "core/logging.h"
+
+#include "projectmpresetmodel.h"
+#include "projectmvisualization.h"
+
+ProjectMPresetModel::ProjectMPresetModel(ProjectMVisualization *projectm_visualization, QObject *parent)
+    : QAbstractItemModel(parent),
+      projectm_visualization_(projectm_visualization) {
+
+  // Find presets
+  if (QFileInfo::exists(projectm_visualization_->preset_path())) {
+    QDirIterator it(projectm_visualization_->preset_path(), QStringList() << QStringLiteral("*.milk") << QStringLiteral("*.prjm"), QDir::Files | QDir::NoDotAndDotDot | QDir::Readable, QDirIterator::Subdirectories);
+    QStringList files;
+    while (it.hasNext()) {
+      it.next();
+      files << it.filePath();
+    }
+    std::stable_sort(files.begin(), files.end());
+    for (const QString &filepath : std::as_const(files)) {
+      const QFileInfo fileinfo(filepath);
+      all_presets_ << Preset(fileinfo.filePath(), fileinfo.fileName(), false);
+    }
+  }
+  else {
+    qLog(Error) << "ProjectM preset path" << projectm_visualization_->preset_path() << "does not exist";
+  }
+
+}
+
+int ProjectMPresetModel::rowCount(const QModelIndex &idx) const {
+
+  Q_UNUSED(idx);
+
+  if (!projectm_visualization_) return 0;
+
+  return static_cast<int>(all_presets_.count());
+
+}
+
+int ProjectMPresetModel::columnCount(const QModelIndex &idx) const {
+  Q_UNUSED(idx);
+  return 1;
+}
+
+QModelIndex ProjectMPresetModel::index(const int row, const int column, const QModelIndex &idx) const {
+  Q_UNUSED(idx);
+  return createIndex(row, column);
+}
+
+QModelIndex ProjectMPresetModel::parent(const QModelIndex &child) const {
+  Q_UNUSED(child);
+  return QModelIndex();
+}
+
+QVariant ProjectMPresetModel::data(const QModelIndex &index, const int role) const {
+
+  switch (role) {
+    case Qt::DisplayRole:
+      return all_presets_[index.row()].name_;
+    case Qt::CheckStateRole:{
+      bool selected = all_presets_[index.row()].selected_;
+      return selected ? Qt::Checked : Qt::Unchecked;
+    }
+    case Role::Role_Path:
+      return all_presets_[index.row()].path_;
+    default:
+      return QVariant();
+  }
+
+}
+
+Qt::ItemFlags ProjectMPresetModel::flags(const QModelIndex &idx) const {
+
+  if (!idx.isValid()) return QAbstractItemModel::flags(idx);
+  return Qt::ItemIsSelectable | Qt::ItemIsEditable | Qt::ItemIsUserCheckable | Qt::ItemIsEnabled;
+
+}
+
+bool ProjectMPresetModel::setData(const QModelIndex &idx, const QVariant &value, int role) {
+
+  if (role == Qt::CheckStateRole) {
+    all_presets_[idx.row()].selected_ = value.toBool();
+    projectm_visualization_->SetSelected(QStringList() << all_presets_[idx.row()].path_, value.toBool());
+    return true;
+  }
+
+  return false;
+
+}
+
+void ProjectMPresetModel::SetImmediatePreset(const QModelIndex &idx) {
+  projectm_visualization_->SetImmediatePreset(all_presets_[idx.row()].path_);
+}
+
+void ProjectMPresetModel::SelectAll() {
+
+  QStringList paths;
+  paths.reserve(all_presets_.count());
+  for (int i = 0; i < all_presets_.count(); ++i) {
+    paths << all_presets_[i].path_;
+    all_presets_[i].selected_ = true;
+  }
+  projectm_visualization_->SetSelected(paths, true);
+
+  Q_EMIT dataChanged(index(0, 0), index(rowCount() - 1, 0));
+
+}
+
+void ProjectMPresetModel::SelectNone() {
+
+  projectm_visualization_->ClearSelected();
+  for (int i = 0; i < all_presets_.count(); ++i) {
+    all_presets_[i].selected_ = false;
+  }
+
+  Q_EMIT dataChanged(index(0, 0), index(rowCount() - 1, 0));
+
+}
+
+void ProjectMPresetModel::MarkSelected(const QString &path, const bool selected) {
+
+  for (int i = 0; i < all_presets_.count(); ++i) {
+    if (path == all_presets_[i].path_) {
+      all_presets_[i].selected_ = selected;
+      return;
+    }
+  }
+
+}

src/visualizations/projectmpresetmodel.h

@@ -0,0 +1,77 @@
+/*
+ * Strawberry Music Player
+ * This file was part of Clementine.
+ * Copyright 2010, David Sansome <me@davidsansome.com>
+ * Copyright 2024, Jonas Kvinge <jonas@jkvinge.net>
+ *
+ * Strawberry is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Strawberry is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef PROJECTMPRESETMODEL_H
+#define PROJECTMPRESETMODEL_H
+
+#include "config.h"
+
+#include <QList>
+#include <QString>
+#include <QAbstractItemModel>
+
+class ProjectMVisualization;
+
+class ProjectMPresetModel : public QAbstractItemModel {
+  Q_OBJECT
+
+  friend class ProjectMVisualization;
+
+ public:
+  explicit ProjectMPresetModel(ProjectMVisualization *projectm_visualization, QObject *parent = nullptr);
+
+  enum Role {
+    Role_Path = Qt::UserRole,
+  };
+
+  void MarkSelected(const QString &path, bool selected);
+
+  // QAbstractItemModel
+  QModelIndex index(const int row, const int column, const QModelIndex &parent = QModelIndex()) const override;
+  QModelIndex parent(const QModelIndex &child) const override;
+  int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+  int columnCount(const QModelIndex &parent = QModelIndex()) const override;
+  QVariant data(const QModelIndex &index, const int role = Qt::DisplayRole) const override;
+  Qt::ItemFlags flags(const QModelIndex &index) const override;
+  bool setData(const QModelIndex &index, const QVariant &value, const int role = Qt::EditRole) override;
+
+ public Q_SLOTS:
+  void SetImmediatePreset(const QModelIndex &index);
+  void SelectAll();
+  void SelectNone();
+
+ private:
+  struct Preset {
+    explicit Preset(const QString &path, const QString &name, const bool selected)
+        : path_(path),
+          name_(name),
+          selected_(selected) {}
+
+    QString path_;
+    QString name_;
+    bool selected_;
+  };
+
+  ProjectMVisualization *projectm_visualization_;
+  QList<Preset> all_presets_;
+};
+
+#endif  // PROJECTMPRESETMODEL_H

src/visualizations/projectmvisualization.cpp

@@ -0,0 +1,469 @@
+/*
+ * Strawberry Music Player
+ * This file was part of Clementine.
+ * Copyright 2010, David Sansome <me@davidsansome.com>
+ * Copyright 2024, Jonas Kvinge <jonas@jkvinge.net>
+ *
+ * Strawberry is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Strawberry is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "config.h"
+
+#include <string>
+#include <memory>
+
+#ifdef HAVE_PROJECTM4
+#  include <projectM-4/types.h>
+#  include <projectM-4/core.h>
+#  include <projectM-4/parameters.h>
+#  include <projectM-4/memory.h>
+#  include <projectM-4/audio.h>
+#  include <projectM-4/render_opengl.h>
+#  include <projectM-4/playlist_types.h>
+#  include <projectM-4/playlist_core.h>
+#  include <projectM-4/playlist_memory.h>
+#  include <projectM-4/playlist_items.h>
+#  include <projectM-4/playlist_playback.h>
+#else
+#  include <libprojectM/projectM.hpp>
+#endif  // HAVE_PROJECTM4
+
+#include <QCoreApplication>
+#include <QGraphicsScene>
+#include <QString>
+#include <QStringList>
+#include <QDir>
+#include <QFileInfo>
+#include <QScopeGuard>
+#include <QPainter>
+#include <QRandomGenerator>
+#include <QMessageBox>
+#include <QTimerEvent>
+
+#include "core/logging.h"
+#include "core/settings.h"
+#include "projectmvisualization.h"
+#include "projectmpresetmodel.h"
+#include "visualizationcontainer.h"
+
+ProjectMVisualization::ProjectMVisualization(VisualizationContainer *container)
+    : QGraphicsScene(container),
+      container_(container),
+      preset_model_(nullptr),
+#ifdef HAVE_PROJECTM4
+      projectm_instance_(nullptr),
+      projectm_playlist_instance_(nullptr),
+#endif
+      mode_(Mode::Random),
+      duration_(15),
+      texture_size_(512) {
+
+  QObject::connect(this, &QGraphicsScene::sceneRectChanged, this, &ProjectMVisualization::SceneRectChanged);
+
+#ifndef HAVE_PROJECTM4
+  for (int i = 0; i < TOTAL_RATING_TYPES; ++i) {
+    default_rating_list_.push_back(3);
+  }
+#endif  // HAVE_PROJECTM4
+
+}
+
+ProjectMVisualization::~ProjectMVisualization() {
+
+#ifdef HAVE_PROJECTM4
+  if (projectm_playlist_instance_) {
+    projectm_playlist_destroy(projectm_playlist_instance_);
+  }
+  if (projectm_instance_) {
+    projectm_destroy(projectm_instance_);
+  }
+#endif  // HAVE_PROJECTM4
+
+}
+
+void ProjectMVisualization::Init() {
+
+#ifdef HAVE_PROJECTM4
+  if (projectm_instance_) {
+    return;
+  }
+#else
+  if (projectm_) {
+    return;
+  }
+#endif  // HAVE_PROJECTM4
+
+  // Find the projectM presets
+
+  QStringList data_paths = QStringList() << QStringLiteral("/usr/share")
+                                         << QStringLiteral("/usr/local/share")
+                                         << QLatin1String(CMAKE_INSTALL_PREFIX) + QLatin1String("/share");
+
+  const QStringList xdg_data_dirs = QString::fromUtf8(qgetenv("XDG_DATA_DIRS")).split(QLatin1Char(':'));
+  for (const QString &xdg_data_dir : xdg_data_dirs) {
+    if (!data_paths.contains(xdg_data_dir)) {
+      data_paths.append(xdg_data_dir);
+    }
+  }
+
+#if defined(Q_OS_WIN32)
+  data_paths.prepend(QCoreApplication::applicationDirPath());
+#endif
+
+  const QStringList projectm_paths = QStringList() << QStringLiteral("projectM/presets")
+                                                   << QStringLiteral("projectm-presets");
+
+  QStringList preset_paths;
+  for (const QString &data_path : std::as_const(data_paths)) {
+    for (const QString &projectm_path : projectm_paths) {
+      const QString path = data_path + QLatin1Char('/') + projectm_path;
+      if (!QFileInfo::exists(path) || QDir(path).entryList(QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot).isEmpty()) {
+        preset_paths << path;
+        continue;
+      }
+      preset_path_ = path;
+      break;
+    }
+  }
+
+  // Create projectM settings
+#ifdef HAVE_PROJECTM4
+  Q_ASSERT(projectm_instance_ == nullptr);
+  Q_ASSERT(projectm_playlist_instance_ == nullptr);
+  projectm_instance_ = projectm_create();
+  projectm_set_preset_duration(projectm_instance_, duration_);
+  projectm_set_mesh_size(projectm_instance_, 32, 24);
+  projectm_set_fps(projectm_instance_, 35);
+  projectm_set_window_size(projectm_instance_, 512, 512);
+  projectm_playlist_instance_ = projectm_playlist_create(projectm_instance_);
+#else
+  projectM::Settings s;
+  s.presetURL = preset_path_.toStdString();
+  s.meshX = 32;
+  s.meshY = 24;
+  s.textureSize = texture_size_;
+  s.fps = 35;
+  s.windowWidth = 512;
+  s.windowHeight = 512;
+  s.smoothPresetDuration = 5;
+  s.presetDuration = duration_;
+  s.shuffleEnabled = true;
+  s.softCutRatingsEnabled = false;
+  s.easterEgg = 0;
+  projectm_ = std::make_unique<projectM>(s);
+#endif  // HAVE_PROJECTM4
+
+  Q_ASSERT(preset_model_ == nullptr);
+  preset_model_ = new ProjectMPresetModel(this, this);
+
+  Load();
+
+  // Start at a random preset.
+#ifdef HAVE_PROJECTM4
+  const uint count = projectm_playlist_size(projectm_playlist_instance_);
+  if (count > 0) {
+    const uint position = QRandomGenerator::global()->bounded(count);
+    projectm_playlist_set_position(projectm_playlist_instance_, position, true);
+  }
+#else
+  const uint count = projectm_->getPlaylistSize();
+  if (count > 0) {
+    const uint selection = QRandomGenerator::global()->bounded(count);
+    projectm_->selectPreset(selection, true);
+  }
+#endif  // HAVE_PROJECTM4
+
+  if (preset_path_.isEmpty()) {
+    qWarning("ProjectM presets could not be found, search path was:\n  %s", preset_paths.join(QLatin1String("\n  ")).toLocal8Bit().constData());
+    QMessageBox::warning(nullptr, tr("Missing projectM presets"), tr("Strawberry could not load any projectM visualizations.  Check that you have installed Strawberry properly."));
+  }
+
+  Resize(sceneRect().width(), sceneRect().height(), container_->devicePixelRatio());
+
+}
+
+void ProjectMVisualization::drawBackground(QPainter *p, const QRectF &rect) {
+
+  Q_UNUSED(rect);
+
+  p->beginNativePainting();
+
+#ifdef HAVE_PROJECTM4
+  projectm_opengl_render_frame(projectm_instance_);
+#else
+  projectm_->renderFrame();
+#endif
+
+  p->endNativePainting();
+
+}
+
+void ProjectMVisualization::SceneRectChanged(const QRectF &rect) {
+
+  Resize(rect.width(), rect.height(), container_->devicePixelRatio());
+
+}
+
+void ProjectMVisualization::Resize(const qreal width, const qreal height, const qreal pixel_ratio) {
+
+#ifdef HAVE_PROJECTM4
+  if (projectm_instance_) {
+    projectm_set_window_size(projectm_instance_, static_cast<size_t>(width * pixel_ratio), static_cast<size_t>(height * pixel_ratio));
+  }
+#else
+  if (projectm_) {
+    projectm_->projectM_resetGL(static_cast<int>(width * pixel_ratio), static_cast<int>(height * pixel_ratio));
+  }
+#endif  // HAVE_PROJECTM4
+
+}
+
+void ProjectMVisualization::SetTextureSize(const int size) {
+
+  texture_size_ = size;
+
+#ifndef HAVE_PROJECTM4
+  if (projectm_) {
+    projectm_->changeTextureSize(texture_size_);
+  }
+#endif  // HAVE_PROJECTM4
+
+}
+
+void ProjectMVisualization::SetDuration(const int seconds) {
+
+  duration_ = seconds;
+
+#ifdef HAVE_PROJECTM4
+  if (projectm_instance_) {
+    projectm_set_preset_duration(projectm_instance_, duration_);
+  }
+#else
+  if (projectm_) {
+    projectm_->changePresetDuration(duration_);
+  }
+#endif  // HAVE_PROJECTM4
+
+  Save();
+
+}
+
+void ProjectMVisualization::ConsumeBuffer(GstBuffer *buffer, const int pipeline_id, const QString &format, const int channels) {
+
+  Q_UNUSED(pipeline_id);
+  Q_UNUSED(format);
+
+  GstMapInfo map;
+  gst_buffer_map(buffer, &map, GST_MAP_READ);
+
+#ifdef HAVE_PROJECTM4
+  if (projectm_instance_) {
+    const unsigned int samples_per_channel = (map.size / sizeof(int16_t)) / channels;
+    const int16_t *data = reinterpret_cast<int16_t*>(map.data);
+    projectm_pcm_add_int16(projectm_instance_, data, samples_per_channel, static_cast<projectm_channels>(channels));
+  }
+#else
+  if (projectm_) {
+    const int16_t samples_per_channel = static_cast<int16_t>((map.size / sizeof(int16_t)) / channels);
+    const int16_t *data = reinterpret_cast<int16_t*>(map.data);
+    projectm_->pcm()->addPCM16Data(data, samples_per_channel);
+  }
+#endif  // HAVE_PROJECTM4
+
+  gst_buffer_unmap(buffer, &map);
+  gst_buffer_unref(buffer);
+
+}
+
+void ProjectMVisualization::SetSelected(const QStringList &paths, const bool selected) {
+
+  for (const QString &path : paths) {
+    const int index = IndexOfPreset(path);
+    if (selected && index == -1) {
+#ifdef HAVE_PROJECTM4
+      projectm_playlist_add_preset(projectm_playlist_instance_, path.toUtf8().constData(), true);
+#else
+      projectm_->addPresetURL(path.toStdString(), std::string(), default_rating_list_);
+#endif
+    }
+    else if (!selected && index != -1) {
+#ifdef HAVE_PROJECTM4
+      projectm_playlist_remove_preset(projectm_playlist_instance_, index);
+#else
+      projectm_->removePreset(index);
+#endif
+    }
+  }
+
+  Save();
+
+}
+
+void ProjectMVisualization::ClearSelected() {
+
+#ifdef HAVE_PROJECTM4
+  projectm_playlist_clear(projectm_playlist_instance_);
+#else
+  projectm_->clearPlaylist();
+#endif
+
+  Save();
+
+}
+
+int ProjectMVisualization::IndexOfPreset(const QString &preset_path) const {
+
+#ifdef HAVE_PROJECTM4
+  const uint count = projectm_playlist_size(projectm_playlist_instance_);
+  for (uint i = 0; i < count; ++i) {
+    char *projectm_preset_path = projectm_playlist_item(projectm_playlist_instance_, i);
+    if (projectm_preset_path) {
+      const QScopeGuard projectm_preset_path_deleter = qScopeGuard([projectm_preset_path](){ projectm_playlist_free_string(projectm_preset_path); });
+      if (QLatin1String(projectm_preset_path) == preset_path) {
+        return static_cast<int>(i);
+      }
+    }
+  }
+#else
+  const uint count = projectm_->getPlaylistSize();
+  for (uint i = 0; i < count; ++i) {
+    if (QString::fromStdString(projectm_->getPresetURL(i)) == preset_path) return static_cast<int>(i);
+  }
+#endif  // HAVE_PROJECTM4
+
+  return -1;
+
+}
+
+void ProjectMVisualization::Load() {
+
+  Settings s;
+  s.beginGroup(QLatin1String(VisualizationContainer::kSettingsGroup));
+  mode_ = Mode(s.value("mode", 0).toInt());
+  duration_ = s.value("duration", duration_).toInt();
+  s.endGroup();
+
+#ifdef HAVE_PROJECTM4
+  projectm_set_preset_duration(projectm_instance_, duration_);
+  projectm_playlist_clear(projectm_playlist_instance_);
+#else
+  projectm_->changePresetDuration(duration_);
+  projectm_->clearPlaylist();
+#endif  // HAVE_PROJECTM4
+
+  switch (mode_) {
+    case Mode::Random:{
+      for (int i = 0; i < preset_model_->all_presets_.count(); ++i) {
+#ifdef HAVE_PROJECTM4
+        projectm_playlist_add_preset(projectm_playlist_instance_, preset_model_->all_presets_[i].path_.toUtf8().constData(), false);
+#else
+        projectm_->addPresetURL(preset_model_->all_presets_[i].path_.toStdString(), std::string(), default_rating_list_);
+#endif
+        preset_model_->all_presets_[i].selected_ = true;
+      }
+      break;
+    }
+    case Mode::FromList:{
+      s.beginGroup(QLatin1String(VisualizationContainer::kSettingsGroup));
+      const QStringList paths = s.value("preset_paths").toStringList();
+      s.endGroup();
+      for (const QString &path : paths) {
+#ifdef HAVE_PROJECTM4
+        projectm_playlist_add_preset(projectm_playlist_instance_, path.toUtf8().constData(), true);
+#else
+        projectm_->addPresetURL(path.toStdString(), std::string(), default_rating_list_);
+#endif
+        preset_model_->MarkSelected(path, true);
+      }
+    }
+  }
+
+}
+
+void ProjectMVisualization::Save() {
+
+  QStringList paths;
+
+  for (const ProjectMPresetModel::Preset &preset : std::as_const(preset_model_->all_presets_)) {
+    if (preset.selected_) paths << preset.path_;
+  }
+
+  Settings s;
+  s.beginGroup(VisualizationContainer::kSettingsGroup);
+  s.setValue("preset_paths", paths);
+  s.setValue("mode", static_cast<int>(mode_));
+  s.setValue("duration", duration_);
+  s.endGroup();
+
+}
+
+void ProjectMVisualization::SetMode(const Mode mode) {
+
+  mode_ = mode;
+  Save();
+
+}
+
+QString ProjectMVisualization::preset_path() const {
+
+#ifdef HAVE_PROJECTM4
+  return preset_path_;
+#else
+  if (projectm_) {
+    return QString::fromStdString(projectm_->settings().presetURL);
+  }
+  return QString();
+#endif  // HAVE_PROJECTM4
+
+}
+
+void ProjectMVisualization::SetImmediatePreset(const int index) {
+
+#ifdef HAVE_PROJECTM4
+  if (projectm_playlist_instance_) {
+    projectm_playlist_set_position(projectm_playlist_instance_, index, true);
+  }
+#else
+  if (projectm_) {
+    projectm_->selectPreset(index, true);
+  }
+#endif  // HAVE_PROJECTM4
+
+}
+
+void ProjectMVisualization::SetImmediatePreset(const QString &path) {
+
+  const int index = IndexOfPreset(path);
+  if (index != -1) {
+    SetImmediatePreset(index);
+  }
+
+}
+
+void ProjectMVisualization::Lock(const bool lock) {
+
+#ifdef HAVE_PROJECTM4
+  if (projectm_instance_) {
+    projectm_set_preset_locked(projectm_instance_, lock);
+  }
+#else
+  if (projectm_) {
+    projectm_->setPresetLock(lock);
+  }
+#endif  // HAVE_PROJECTM4
+
+  if (!lock) Load();
+
+}

src/visualizations/projectmvisualization.h

@@ -0,0 +1,114 @@
+/*
+ * Strawberry Music Player
+ * This file was part of Clementine.
+ * Copyright 2010, David Sansome <me@davidsansome.com>
+ * Copyright 2024, Jonas Kvinge <jonas@jkvinge.net>
+ *
+ * Strawberry is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Strawberry is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef PROJECTMVISUALIZATION_H
+#define PROJECTMVISUALIZATION_H
+
+#include "config.h"
+
+#include <memory>
+#include <vector>
+
+#ifdef HAVE_PROJECTM4
+#  include <projectM-4/types.h>
+#  include <projectM-4/playlist_types.h>
+#else
+#  include <libprojectM/projectM.hpp>
+#endif
+
+#include <QString>
+#include <QStringList>
+#include <QGraphicsScene>
+
+#include "engine/gstbufferconsumer.h"
+
+class projectM;
+class QPainter;
+class ProjectMPresetModel;
+class VisualizationContainer;
+
+class ProjectMVisualization : public QGraphicsScene, public GstBufferConsumer {
+  Q_OBJECT
+
+ public:
+  explicit ProjectMVisualization(VisualizationContainer *container);
+  ~ProjectMVisualization();
+
+  enum class Mode {
+    Random = 0,
+    FromList = 1,
+  };
+
+  QString preset_path() const;
+  ProjectMPresetModel *preset_model() const { return preset_model_; }
+
+  Mode mode() const { return mode_; }
+  int duration() const { return duration_; }
+
+  void Init();
+
+  // BufferConsumer
+  void ConsumeBuffer(GstBuffer *buffer, const int pipeline_id, const QString &format, const int channels) override;
+
+ public Q_SLOTS:
+  void SetTextureSize(const int size);
+  void SetDuration(const int seconds);
+
+  void SetSelected(const QStringList &paths, const bool selected);
+  void ClearSelected();
+  void SetImmediatePreset(const int index);
+  void SetImmediatePreset(const QString &path);
+  void SetMode(const Mode mode);
+
+  void Lock(const bool lock);
+
+ protected:
+  // QGraphicsScene
+  void drawBackground(QPainter *painter, const QRectF &rect) override;
+
+ private Q_SLOTS:
+  void SceneRectChanged(const QRectF &rect);
+
+ private:
+  void Load();
+  void Save();
+
+  int IndexOfPreset(const QString &preset_path) const;
+
+  void Resize(const qreal width, const qreal height, const qreal pixel_ratio);
+
+ private:
+  VisualizationContainer *container_;
+  ProjectMPresetModel *preset_model_;
+#ifdef HAVE_PROJECTM4
+  projectm_handle projectm_instance_;
+  projectm_playlist_handle projectm_playlist_instance_;
+#else
+  std::unique_ptr<projectM> projectm_;
+#endif
+  Mode mode_;
+  int duration_;
+  std::vector<int> default_rating_list_;
+  int texture_size_;
+  QString preset_path_;
+};
+
+#endif  // PROJECTMVISUALIZATION_H

src/visualizations/visualizationcontainer.cpp

@@ -0,0 +1,328 @@
+/*
+ * Strawberry Music Player
+ * This file was part of Clementine.
+ * Copyright 2010, David Sansome <me@davidsansome.com>
+ * Copyright 2024, Jonas Kvinge <jonas@jkvinge.net>
+ *
+ * Strawberry is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Strawberry is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "config.h"
+
+#include <QtGlobal>
+
+#include <QOpenGLWidget>
+
+#include <QGraphicsProxyWidget>
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QMenu>
+#include <QMessageBox>
+#include <QShortcut>
+#include <QActionGroup>
+
+#include "core/logging.h"
+#include "core/iconloader.h"
+#include "core/settings.h"
+#include "engine/gstengine.h"
+#include "visualizationcontainer.h"
+#include "visualizationopenglwidget.h"
+#include "visualizationoverlay.h"
+#include "visualizationselector.h"
+#include "projectmvisualization.h"
+
+const char *VisualizationContainer::kSettingsGroup = "Visualizations";
+
+namespace {
+constexpr int kLowFramerate = 15;
+constexpr int kMediumFramerate = 25;
+constexpr int kHighFramerate = 35;
+constexpr int kSuperHighFramerate = 60;
+
+constexpr int kDefaultWidth = 828;
+constexpr int kDefaultHeight = 512;
+constexpr int kDefaultFps = kHighFramerate;
+constexpr int kDefaultTextureSize = 512;
+}  // namespace
+
+VisualizationContainer::VisualizationContainer(QWidget *parent)
+    : QGraphicsView(parent),
+      projectm_visualization_(new ProjectMVisualization(this)),
+      overlay_(new VisualizationOverlay),
+      selector_(new VisualizationSelector(this)),
+      overlay_proxy_(nullptr),
+      engine_(nullptr),
+      menu_(new QMenu(this)),
+      fps_(kDefaultFps),
+      size_(kDefaultTextureSize) {
+
+  setWindowTitle(tr("Visualizations"));
+  setWindowIcon(IconLoader::Load(QStringLiteral("strawberry")));
+  setMinimumSize(64, 64);
+
+  {
+    Settings s;
+    s.beginGroup(QLatin1String(kSettingsGroup));
+    if (!restoreGeometry(s.value("geometry").toByteArray())) {
+      resize(kDefaultWidth, kDefaultHeight);
+    }
+    fps_ = s.value("fps", kDefaultFps).toInt();
+    size_ = s.value("size", kDefaultTextureSize).toInt();
+    s.endGroup();
+  }
+
+  QShortcut *close = new QShortcut(QKeySequence::Close, this);
+  QObject::connect(close, &QShortcut::activated, this, &VisualizationContainer::close);
+
+  // Set up the graphics view
+  setScene(projectm_visualization_);
+  setViewport(new VisualizationOpenGLWidget(projectm_visualization_));
+  setViewportUpdateMode(QGraphicsView::FullViewportUpdate);
+  setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+  setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+  setFrameStyle(QFrame::NoFrame);
+
+  // Add the overlay
+  overlay_proxy_ = scene()->addWidget(overlay_);
+  QObject::connect(overlay_, &VisualizationOverlay::OpacityChanged, this, &VisualizationContainer::ChangeOverlayOpacity);
+  QObject::connect(overlay_, &VisualizationOverlay::ShowPopupMenu, this, &VisualizationContainer::ShowPopupMenu);
+  ChangeOverlayOpacity(0.0);
+
+  projectm_visualization_->SetTextureSize(size_);
+  SizeChanged();
+
+  // Selector
+  selector_->SetVisualization(projectm_visualization_);
+
+  // Settings menu
+  menu_->addAction(IconLoader::Load(QStringLiteral("view-fullscreen")), tr("Toggle fullscreen"), this, &VisualizationContainer::ToggleFullscreen);
+
+  QMenu *fps_menu = menu_->addMenu(tr("Framerate"));
+  QActionGroup *fps_group = new QActionGroup(this);
+  AddFramerateMenuItem(tr("Low (%1 fps)").arg(kLowFramerate), kLowFramerate, fps_, fps_group);
+  AddFramerateMenuItem(tr("Medium (%1 fps)").arg(kMediumFramerate), kMediumFramerate, fps_, fps_group);
+  AddFramerateMenuItem(tr("High (%1 fps)").arg(kHighFramerate), kHighFramerate, fps_, fps_group);
+  AddFramerateMenuItem(tr("Super high (%1 fps)").arg(kSuperHighFramerate), kSuperHighFramerate, fps_, fps_group);
+  fps_menu->addActions(fps_group->actions());
+
+  QMenu *quality_menu = menu_->addMenu(tr("Quality", "Visualization quality"));
+  QActionGroup *quality_group = new QActionGroup(this);
+  AddQualityMenuItem(tr("Low (256x256)"), 256, size_, quality_group);
+  AddQualityMenuItem(tr("Medium (512x512)"), 512, size_, quality_group);
+  AddQualityMenuItem(tr("High (1024x1024)"), 1024, size_, quality_group);
+  AddQualityMenuItem(tr("Super high (2048x2048)"), 2048, size_, quality_group);
+  quality_menu->addActions(quality_group->actions());
+
+  menu_->addAction(tr("Select visualizations..."), selector_, &VisualizationContainer::show);
+
+  menu_->addSeparator();
+  menu_->addAction(IconLoader::Load(QStringLiteral("application-exit")), tr("Close visualization"), this, &VisualizationContainer::hide);
+
+}
+
+void VisualizationContainer::AddFramerateMenuItem(const QString &name, const int value, const int def, QActionGroup *group) {
+
+  QAction *action = group->addAction(name);
+  action->setCheckable(true);
+  action->setChecked(value == def);
+  QObject::connect(action, &QAction::triggered, this, [this, value]() { SetFps(value); });
+
+}
+
+void VisualizationContainer::AddQualityMenuItem(const QString &name, const int value, const int def, QActionGroup *group) {
+
+  QAction *action = group->addAction(name);
+  action->setCheckable(true);
+  action->setChecked(value == def);
+  QObject::connect(action, &QAction::triggered, this, [this, value]() { SetQuality(value); });
+
+}
+
+void VisualizationContainer::SetEngine(GstEngine *engine) {
+
+  engine_ = engine;
+
+  if (isVisible()) engine_->AddBufferConsumer(projectm_visualization_);
+
+}
+
+void VisualizationContainer::showEvent(QShowEvent *e) {
+
+  qLog(Debug) << "Showing visualization";
+
+  QGraphicsView::showEvent(e);
+
+  update_timer_.start(1000 / fps_, this);
+
+  if (engine_) engine_->AddBufferConsumer(projectm_visualization_);
+
+}
+
+void VisualizationContainer::hideEvent(QHideEvent *e) {
+
+  qLog(Debug) << "Hiding visualization";
+
+  QGraphicsView::hideEvent(e);
+
+  update_timer_.stop();
+
+  if (engine_) engine_->RemoveBufferConsumer(projectm_visualization_);
+
+}
+
+void VisualizationContainer::closeEvent(QCloseEvent *e) {
+
+  Q_UNUSED(e);
+
+  // Don't close the window. Just hide it.
+  e->ignore();
+  hide();
+
+}
+
+void VisualizationContainer::resizeEvent(QResizeEvent *e) {
+  QGraphicsView::resizeEvent(e);
+  SizeChanged();
+}
+
+void VisualizationContainer::SizeChanged() {
+
+  // Save the geometry
+  Settings s;
+  s.beginGroup(kSettingsGroup);
+  s.setValue("geometry", saveGeometry());
+
+  // Resize the scene
+  if (scene()) scene()->setSceneRect(QRect(QPoint(0, 0), size()));
+
+  // Resize the overlay
+  if (overlay_) overlay_->resize(size());
+
+}
+
+void VisualizationContainer::timerEvent(QTimerEvent *e) {
+
+  QGraphicsView::timerEvent(e);
+  if (e->timerId() == update_timer_.timerId()) scene()->update();
+
+}
+
+void VisualizationContainer::SetActions(QAction *previous, QAction *play_pause, QAction *stop, QAction *next) {
+  overlay_->SetActions(previous, play_pause, stop, next);
+}
+
+void VisualizationContainer::SongMetadataChanged(const Song &metadata) {
+  overlay_->SetSongTitle(QStringLiteral("%1 - %2").arg(metadata.artist(), metadata.title()));
+}
+
+void VisualizationContainer::Stopped() {
+  overlay_->SetSongTitle(tr("strawberry"));
+}
+
+void VisualizationContainer::ChangeOverlayOpacity(const qreal value) {
+
+  overlay_proxy_->setOpacity(value);
+
+  // Hide the cursor if the overlay is hidden
+  if (value < 0.5) {
+    viewport()->setCursor(Qt::BlankCursor);
+  }
+  else {
+    viewport()->unsetCursor();
+  }
+
+
+}
+
+void VisualizationContainer::enterEvent(QEnterEvent *e) {
+
+  QGraphicsView::enterEvent(e);
+
+  overlay_->SetVisible(true);
+
+}
+
+void VisualizationContainer::leaveEvent(QEvent *e) {
+  QGraphicsView::leaveEvent(e);
+  overlay_->SetVisible(false);
+}
+
+void VisualizationContainer::mouseMoveEvent(QMouseEvent *e) {
+  QGraphicsView::mouseMoveEvent(e);
+  overlay_->SetVisible(true);
+}
+
+void VisualizationContainer::mouseDoubleClickEvent(QMouseEvent *e) {
+  QGraphicsView::mouseDoubleClickEvent(e);
+  ToggleFullscreen();
+}
+
+void VisualizationContainer::contextMenuEvent(QContextMenuEvent *event) {
+  QGraphicsView::contextMenuEvent(event);
+  ShowPopupMenu(event->pos());
+}
+
+void VisualizationContainer::keyReleaseEvent(QKeyEvent *event) {
+
+  if (event->matches(QKeySequence::Close) || event->key() == Qt::Key_Escape) {
+    if (isFullScreen()) {
+      ToggleFullscreen();
+    }
+    else {
+      hide();
+    }
+    return;
+  }
+
+  QGraphicsView::keyReleaseEvent(event);
+
+}
+
+void VisualizationContainer::ToggleFullscreen() {
+
+  setWindowState(windowState() ^ Qt::WindowFullScreen);
+
+}
+
+void VisualizationContainer::SetFps(const int fps) {
+
+  fps_ = fps;
+
+  // Save settings
+  Settings s;
+  s.beginGroup(kSettingsGroup);
+  s.setValue("fps", fps_);
+
+  update_timer_.stop();
+  update_timer_.start(1000 / fps_, this);
+
+}
+
+void VisualizationContainer::ShowPopupMenu(const QPoint &pos) {
+  menu_->popup(mapToGlobal(pos));
+}
+
+void VisualizationContainer::SetQuality(const int size) {
+
+  size_ = size;
+
+  // Save settings
+  Settings s;
+  s.beginGroup(kSettingsGroup);
+  s.setValue("size", size_);
+
+  projectm_visualization_->SetTextureSize(size_);
+
+}

src/visualizations/visualizationcontainer.h

@@ -0,0 +1,103 @@
+/*
+ * Strawberry Music Player
+ * This file was part of Clementine.
+ * Copyright 2010, David Sansome <me@davidsansome.com>
+ * Copyright 2024, Jonas Kvinge <jonas@jkvinge.net>
+ *
+ * Strawberry is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Strawberry is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef VISUALIZATIONCONTAINER_H
+#define VISUALIZATIONCONTAINER_H
+
+#include "config.h"
+
+#include <QBasicTimer>
+#include <QGraphicsView>
+
+#include "core/song.h"
+
+class GstEngine;
+class ProjectMVisualization;
+class VisualizationOverlay;
+class VisualizationSelector;
+
+class QMenu;
+class QActionGroup;
+class QEvent;
+class QShowEvent;
+class QHideEvent;
+class QCloseEvent;
+class QResizeEvent;
+class QTimerEvent;
+class QMouseEvent;
+class QContextMenuEvent;
+class QKeyEvent;
+class QEnterEvent;
+
+class VisualizationContainer : public QGraphicsView {
+  Q_OBJECT
+
+ public:
+  explicit VisualizationContainer(QWidget *parent = nullptr);
+
+  static const char *kSettingsGroup;
+
+  void SetEngine(GstEngine *engine);
+  void SetActions(QAction *previous, QAction *play_pause, QAction *stop, QAction *next);
+
+ public Q_SLOTS:
+  void SongMetadataChanged(const Song &metadata);
+  void Stopped();
+
+ protected:
+  // QWidget
+  void showEvent(QShowEvent *e) override;
+  void hideEvent(QHideEvent *e) override;
+  void closeEvent(QCloseEvent *e) override;
+  void resizeEvent(QResizeEvent *e) override;
+  void timerEvent(QTimerEvent *e) override;
+  void mouseMoveEvent(QMouseEvent *e) override;
+  void enterEvent(QEnterEvent *e) override;
+  void leaveEvent(QEvent *e) override;
+  void mouseDoubleClickEvent(QMouseEvent *e) override;
+  void contextMenuEvent(QContextMenuEvent *event) override;
+  void keyReleaseEvent(QKeyEvent *event) override;
+
+ private:
+  void SizeChanged();
+  void AddFramerateMenuItem(const QString &name, int value, int def, QActionGroup *group);
+  void AddQualityMenuItem(const QString &name, int value, int def, QActionGroup *group);
+
+ private Q_SLOTS:
+  void ChangeOverlayOpacity(qreal value);
+  void ShowPopupMenu(const QPoint &pos);
+  void ToggleFullscreen();
+  void SetFps(const int fps);
+  void SetQuality(const int size);
+
+ private:
+  ProjectMVisualization *projectm_visualization_;
+  VisualizationOverlay *overlay_;
+  VisualizationSelector *selector_;
+  QGraphicsProxyWidget *overlay_proxy_;
+  GstEngine *engine_;
+  QMenu *menu_;
+  QBasicTimer update_timer_;
+  int fps_;
+  int size_;
+};
+
+#endif  // VISUALIZATIONCONTAINER_H

src/visualizations/visualizationopenglwidget.cpp

@@ -0,0 +1,39 @@
+/*
+ * Strawberry Music Player
+ * Copyright 2024, Jonas Kvinge <jonas@jkvinge.net>
+ *
+ * Strawberry is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Strawberry is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "config.h"
+
+#include <QtGlobal>
+
+#include "visualizationopenglwidget.h"
+#include "projectmvisualization.h"
+
+VisualizationOpenGLWidget::VisualizationOpenGLWidget(ProjectMVisualization *projectm_visualization, QWidget *parent, Qt::WindowFlags f)
+  : QOpenGLWidget(parent, f),
+    projectm_visualization_(projectm_visualization) {}
+
+void VisualizationOpenGLWidget::initializeGL() {
+
+  projectm_visualization_->Init();
+
+  QOpenGLWidget::initializeGL();
+
+  glEnable(GL_BLEND);
+
+}

src/visualizations/visualizationopenglwidget.h

@@ -0,0 +1,42 @@
+/*
+ * Strawberry Music Player
+ * Copyright 2024, Jonas Kvinge <jonas@jkvinge.net>
+ *
+ * Strawberry is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Strawberry is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef VISUALIZATIONOPENGLWIDGET_H
+#define VISUALIZATIONOPENGLWIDGET_H
+
+#include "config.h"
+
+#include <QOpenGLWidget>
+
+class ProjectMVisualization;
+
+class VisualizationOpenGLWidget : public QOpenGLWidget {
+  Q_OBJECT
+
+ public:
+  explicit VisualizationOpenGLWidget(ProjectMVisualization *projectm_visualization, QWidget *parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags());
+
+ protected:
+  void initializeGL() override;
+
+ private:
+  ProjectMVisualization *projectm_visualization_;
+};
+
+#endif  // VISUALIZATIONOPENGLWIDGET_H

src/visualizations/visualizationoverlay.cpp

@@ -0,0 +1,116 @@
+/*
+ * Strawberry Music Player
+ * This file was part of Clementine.
+ * Copyright 2010, David Sansome <me@davidsansome.com>
+ * Copyright 2024, Jonas Kvinge <jonas@jkvinge.net>
+ *
+ * Strawberry is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Strawberry is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "config.h"
+
+#include <QString>
+#include <QBasicTimer>
+#include <QTimeLine>
+#include <QGraphicsProxyWidget>
+#include <QTimerEvent>
+#include <QMouseEvent>
+
+#include "core/iconloader.h"
+#include "visualizationoverlay.h"
+#include "ui_visualizationoverlay.h"
+
+namespace {
+constexpr int kFadeDuration = 500;
+constexpr int kFadeTimeout = 5000;
+}
+
+VisualizationOverlay::VisualizationOverlay(QWidget *parent)
+    : QWidget(parent),
+      ui_(new Ui_VisualizationOverlay),
+      fade_timeline_(new QTimeLine(kFadeDuration, this)),
+      visible_(false) {
+
+  ui_->setupUi(this);
+
+  setAttribute(Qt::WA_TranslucentBackground);
+  setMouseTracking(true);
+
+  ui_->settings->setIcon(IconLoader::Load(QStringLiteral("configure")));
+
+  QObject::connect(ui_->settings, &QToolButton::clicked, this, &VisualizationOverlay::ShowSettingsMenu);
+  QObject::connect(fade_timeline_, &QTimeLine::valueChanged, this, &VisualizationOverlay::OpacityChanged);
+
+}
+
+VisualizationOverlay::~VisualizationOverlay() { delete ui_; }
+
+QGraphicsProxyWidget *VisualizationOverlay::title(QGraphicsProxyWidget *proxy) const {
+  return proxy->createProxyForChildWidget(ui_->song_title);
+}
+
+void VisualizationOverlay::SetActions(QAction *previous, QAction *play_pause, QAction *stop, QAction *next) {
+
+  ui_->previous->setDefaultAction(previous);
+  ui_->play_pause->setDefaultAction(play_pause);
+  ui_->stop->setDefaultAction(stop);
+  ui_->next->setDefaultAction(next);
+
+}
+
+void VisualizationOverlay::ShowSettingsMenu() {
+
+  Q_EMIT ShowPopupMenu(ui_->settings->mapToGlobal(ui_->settings->rect().bottomLeft()));
+
+}
+
+void VisualizationOverlay::timerEvent(QTimerEvent *e) {
+
+  QWidget::timerEvent(e);
+
+  if (e->timerId() == fade_out_timeout_.timerId()) {
+    SetVisible(false);
+  }
+
+}
+
+void VisualizationOverlay::SetVisible(const bool visible) {
+
+  // If we're showing the overlay, then fade out again in a little while
+  fade_out_timeout_.stop();
+  if (visible) fade_out_timeout_.start(kFadeTimeout, this);
+
+  // Don't change to the state we're in already
+  if (visible == visible_) return;
+  visible_ = visible;
+
+  // If there's already another fader running then start from the same time that one was already at.
+  int start_time = visible ? 0 : fade_timeline_->duration();
+  if (fade_timeline_->state() == QTimeLine::Running)
+    start_time = fade_timeline_->currentTime();
+
+  fade_timeline_->stop();
+  fade_timeline_->setDirection(visible ? QTimeLine::Forward : QTimeLine::Backward);
+  fade_timeline_->setCurrentTime(start_time);
+  fade_timeline_->resume();
+
+}
+
+void VisualizationOverlay::SetSongTitle(const QString &title) {
+
+  ui_->song_title->setText(title);
+  SetVisible(true);
+
+}

src/visualizations/visualizationoverlay.h

@@ -0,0 +1,71 @@
+/*
+ * Strawberry Music Player
+ * This file was part of Clementine.
+ * Copyright 2010, David Sansome <me@davidsansome.com>
+ * Copyright 2024, Jonas Kvinge <jonas@jkvinge.net>
+ *
+ * Strawberry is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Strawberry is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef VISUALIZATIONOVERLAY_H
+#define VISUALIZATIONOVERLAY_H
+
+#include "config.h"
+
+#include <QWidget>
+#include <QString>
+#include <QBasicTimer>
+
+class Ui_VisualizationOverlay;
+
+class QGraphicsProxyWidget;
+class QTimeLine;
+class QAction;
+
+class VisualizationOverlay : public QWidget {
+  Q_OBJECT
+
+ public:
+  explicit VisualizationOverlay(QWidget *parent = nullptr);
+  ~VisualizationOverlay();
+
+  QGraphicsProxyWidget *title(QGraphicsProxyWidget *proxy) const;
+
+  void SetActions(QAction *previous, QAction *play_pause, QAction *stop, QAction *next);
+  void SetSongTitle(const QString &title);
+
+ public Q_SLOTS:
+  void SetVisible(const bool visible);
+
+ Q_SIGNALS:
+  void OpacityChanged(const qreal value);
+  void ShowPopupMenu(const QPoint &pos);
+
+ protected:
+  // QWidget
+  void timerEvent(QTimerEvent *e);
+
+ private Q_SLOTS:
+  void ShowSettingsMenu();
+
+ private:
+  Ui_VisualizationOverlay *ui_;
+
+  QTimeLine *fade_timeline_;
+  QBasicTimer fade_out_timeout_;
+  bool visible_;
+};
+
+#endif  // VISUALIZATIONOVERLAY_H

src/visualizations/visualizationoverlay.ui

@@ -0,0 +1,234 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>VisualizationOverlay</class>
+ <widget class="QWidget" name="VisualizationOverlay">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>523</width>
+    <height>302</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <property name="styleSheet">
+   <string notr="true">VisualizationOverlay {
+  background-color: transparent;
+}
+
+#frame {
+  background-color: rgba(96, 59, 25, 70%);
+  border-top-left-radius: 10px;
+  border-top-right-radius: 10px;
+  border-color: rgba(145, 89, 38, 100%);
+  border-width: 4px 4px 0px 4px;
+  border-style: solid;
+}
+
+#song_title {
+  font-weight: bold;
+  font-size: 20px;
+  color: #feae65;
+}
+
+QToolButton {
+  background: transparent;
+  border: none;
+}</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_2">
+   <property name="margin">
+    <number>0</number>
+   </property>
+   <item>
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>210</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_3">
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QFrame" name="frame">
+       <property name="frameShape">
+        <enum>QFrame::StyledPanel</enum>
+       </property>
+       <property name="frameShadow">
+        <enum>QFrame::Raised</enum>
+       </property>
+       <layout class="QVBoxLayout" name="verticalLayout">
+        <item>
+         <widget class="QLabel" name="song_title">
+          <property name="text">
+           <string>Strawberry</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <layout class="QHBoxLayout" name="horizontalLayout_2">
+          <item>
+           <spacer name="horizontalSpacer_5">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeType">
+             <enum>QSizePolicy::Preferred</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>40</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item>
+           <widget class="QWidget" name="widget" native="true">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <layout class="QHBoxLayout" name="horizontalLayout">
+             <property name="margin">
+              <number>0</number>
+             </property>
+             <item>
+              <widget class="QToolButton" name="previous">
+               <property name="iconSize">
+                <size>
+                 <width>24</width>
+                 <height>24</height>
+                </size>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QToolButton" name="play_pause">
+               <property name="iconSize">
+                <size>
+                 <width>24</width>
+                 <height>24</height>
+                </size>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QToolButton" name="stop">
+               <property name="iconSize">
+                <size>
+                 <width>24</width>
+                 <height>24</height>
+                </size>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QToolButton" name="next">
+               <property name="iconSize">
+                <size>
+                 <width>24</width>
+                 <height>24</height>
+                </size>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <spacer name="horizontalSpacer_3">
+               <property name="orientation">
+                <enum>Qt::Horizontal</enum>
+               </property>
+               <property name="sizeType">
+                <enum>QSizePolicy::Fixed</enum>
+               </property>
+               <property name="sizeHint" stdset="0">
+                <size>
+                 <width>20</width>
+                 <height>13</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
+             <item>
+              <widget class="QToolButton" name="settings">
+               <property name="toolTip">
+                <string>Visualizations Settings</string>
+               </property>
+               <property name="iconSize">
+                <size>
+                 <width>24</width>
+                 <height>24</height>
+                </size>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </widget>
+          </item>
+          <item>
+           <spacer name="horizontalSpacer_4">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeType">
+             <enum>QSizePolicy::Preferred</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>40</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+         </layout>
+        </item>
+       </layout>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

src/visualizations/visualizationselector.cpp

@@ -0,0 +1,88 @@
+/*
+ * Strawberry Music Player
+ * This file was part of Clementine.
+ * Copyright 2010, David Sansome <me@davidsansome.com>
+ * Copyright 2024, Jonas Kvinge <jonas@jkvinge.net>
+ *
+ * Strawberry is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Strawberry is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "config.h"
+
+#include <QPushButton>
+
+#include "visualizationselector.h"
+#include "projectmpresetmodel.h"
+#include "projectmvisualization.h"
+#include "ui_visualizationselector.h"
+
+VisualizationSelector::VisualizationSelector(QWidget *parent)
+    : QDialog(parent),
+      ui_(new Ui_VisualizationSelector),
+      projectm_visualization_(nullptr),
+      select_all_(nullptr),
+      select_none_(nullptr) {
+
+  ui_->setupUi(this);
+
+  select_all_ = ui_->buttonBox->addButton(tr("Select All"), QDialogButtonBox::ActionRole);
+  select_none_ = ui_->buttonBox->addButton(tr("Select None"), QDialogButtonBox::ActionRole);
+  QObject::connect(select_all_, &QPushButton::clicked, this, &VisualizationSelector::SelectAll);
+  QObject::connect(select_none_, &QPushButton::clicked, this, &VisualizationSelector::SelectNone);
+  select_all_->setEnabled(false);
+  select_none_->setEnabled(false);
+
+  QObject::connect(ui_->mode, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &VisualizationSelector::ModeChanged);
+
+}
+
+VisualizationSelector::~VisualizationSelector() { delete ui_; }
+
+void VisualizationSelector::showEvent(QShowEvent *e) {
+
+  Q_UNUSED(e);
+
+  if (!ui_->list->model()) {
+    ui_->delay->setValue(projectm_visualization_->duration());
+    ui_->list->setModel(projectm_visualization_->preset_model());
+    QObject::connect(ui_->list->selectionModel(), &QItemSelectionModel::currentChanged, projectm_visualization_->preset_model(), &ProjectMPresetModel::SetImmediatePreset);
+    QObject::connect(ui_->delay, QOverload<int>::of(&QSpinBox::valueChanged), projectm_visualization_, &ProjectMVisualization::SetDuration);
+
+    ui_->mode->setCurrentIndex(static_cast<int>(projectm_visualization_->mode()));
+  }
+
+  projectm_visualization_->Lock(true);
+
+}
+
+void VisualizationSelector::hideEvent(QHideEvent *e) {
+  Q_UNUSED(e);
+  projectm_visualization_->Lock(false);
+}
+
+void VisualizationSelector::ModeChanged(const int mode) {
+
+  const bool enabled = mode == 1;
+  ui_->list->setEnabled(enabled);
+  select_all_->setEnabled(enabled);
+  select_none_->setEnabled(enabled);
+
+  projectm_visualization_->SetMode(static_cast<ProjectMVisualization::Mode>(mode));
+
+}
+
+void VisualizationSelector::SelectAll() { projectm_visualization_->preset_model()->SelectAll(); }
+
+void VisualizationSelector::SelectNone() { projectm_visualization_->preset_model()->SelectNone(); }

src/visualizations/visualizationselector.h

@@ -0,0 +1,61 @@
+/*
+ * Strawberry Music Player
+ * This file was part of Clementine.
+ * Copyright 2010, David Sansome <me@davidsansome.com>
+ * Copyright 2024, Jonas Kvinge <jonas@jkvinge.net>
+ *
+ * Strawberry is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Strawberry is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef VISUALIZATIONSELECTOR_H
+#define VISUALIZATIONSELECTOR_H
+
+#include "config.h"
+
+#include <QDialog>
+
+class QPushButton;
+class QShowEvent;
+class QHideEvent;
+
+class ProjectMVisualization;
+class Ui_VisualizationSelector;
+
+class VisualizationSelector : public QDialog {
+  Q_OBJECT
+
+ public:
+  explicit VisualizationSelector(QWidget *parent = nullptr);
+  ~VisualizationSelector();
+
+  void SetVisualization(ProjectMVisualization *projectm_visualization) { projectm_visualization_ = projectm_visualization; }
+
+ protected:
+  void showEvent(QShowEvent *e) override;
+  void hideEvent(QHideEvent *e) override;
+
+ private Q_SLOTS:
+  void ModeChanged(const int mode);
+  void SelectAll();
+  void SelectNone();
+
+ private:
+  Ui_VisualizationSelector *ui_;
+  ProjectMVisualization *projectm_visualization_;
+  QPushButton *select_all_;
+  QPushButton *select_none_;
+};
+
+#endif  // VISUALIZATIONSELECTOR_H

src/visualizations/visualizationselector.ui

@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>VisualizationSelector</class>
+ <widget class="QDialog" name="VisualizationSelector">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>595</width>
+    <height>475</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Select visualizations</string>
+  </property>
+  <property name="windowIcon">
+   <iconset resource="../../data/data.qrc">
+    <normaloff>:/icon.png</normaloff>:/icon.png</iconset>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <layout class="QFormLayout" name="formLayout">
+     <item row="0" column="0">
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>Visualization mode</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <widget class="QComboBox" name="mode">
+       <item>
+        <property name="text">
+         <string>Random visualization</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Choose from the list</string>
+        </property>
+       </item>
+      </widget>
+     </item>
+     <item row="1" column="0">
+      <widget class="QLabel" name="label_2">
+       <property name="text">
+        <string>Delay between visualizations</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="QSpinBox" name="delay">
+       <property name="suffix">
+        <string> seconds</string>
+       </property>
+       <property name="minimum">
+        <number>2</number>
+       </property>
+       <property name="maximum">
+        <number>120</number>
+       </property>
+       <property name="value">
+        <number>15</number>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QListView" name="list">
+     <property name="enabled">
+      <bool>false</bool>
+     </property>
+     <property name="alternatingRowColors">
+      <bool>true</bool>
+     </property>
+     <property name="selectionBehavior">
+      <enum>QAbstractItemView::SelectRows</enum>
+     </property>
+     <property name="uniformItemSizes">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <tabstops>
+  <tabstop>mode</tabstop>
+  <tabstop>delay</tabstop>
+  <tabstop>list</tabstop>
+  <tabstop>buttonBox</tabstop>
+ </tabstops>
+ <resources>
+  <include location="../../data/data.qrc"/>
+ </resources>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>VisualizationSelector</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>VisualizationSelector</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>