Add visualizations

New translations
GstEnginePipeline: Add audioresample elements
2025-12-29 00:33:14 +01:00 · 2025-12-29 00:02:45 +01:00 · 2025-12-28 22:01:42 +01:00 · 2025-12-28 21:28:49 +01:00 · 2025-12-28 20:54:36 +01:00 · 2025-12-28 19:00:35 +01:00
393 changed files with 13399 additions and 2295 deletions
--- a/.clang-format
+++ b/.clang-format
@@ -130,7 +130,10 @@ InsertBraces:    false
 InsertTrailingCommas: None
 JavaScriptQuotes: Leave
 JavaScriptWrapImports: true
-KeepEmptyLinesAtTheStartOfBlocks: true
+KeepEmptyLines:
+  AtEndOfFile: true
+  AtStartOfBlock: true
+  AtStartOfFile: true
 LambdaBodyIndentation: Signature
 MacroBlockBegin: ''
 MacroBlockEnd:   ''
--- a/.github/workflows/build.yml
+++ b/.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
@@ -97,7 +99,7 @@ jobs:
          cmake --build build --config Release --parallel 4
          cmake --install build
      - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
        with:
          fetch-depth: 0
          submodules: recursive
@@ -134,14 +136,14 @@ jobs:
        run: echo "subdir=$(echo ${{matrix.opensuse_version}} | sed 's/leap:/lp/g' | sed 's/\.//g')" > $GITHUB_OUTPUT
      - name: Upload source
        if: matrix.opensuse_version == 'tumbleweed'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
        with:
          name: source
          path: |
            /usr/src/packages/SOURCES/*.xz
      - name: Upload rpm
        if: matrix.opensuse_version != 'tumbleweed'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
        with:
          name: opensuse-${{steps.set-subdir.outputs.subdir}}
          path: |
@@ -200,6 +202,7 @@ jobs:
            libchromaprint-devel
            libebur128-devel
            fftw-devel
+            libprojectM-devel
            desktop-file-utils
            libappstream-glib
            hicolor-icon-theme
@@ -209,7 +212,7 @@ jobs:
            sparsehash-devel
            rapidjson-devel
      - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
        with:
          fetch-depth: 0
          submodules: recursive
@@ -234,7 +237,7 @@ jobs:
        working-directory: build
        run: rpmbuild -ba strawberry.spec
      - name: Upload artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
        with:
          name: fedora-${{matrix.fedora_version}}
          path: |
@@ -290,6 +293,7 @@ jobs:
          lib64Qt6DBus-devel
          lib64Qt6Gui-devel
          lib64Qt6Widgets-devel
+          lib64Qt6OpenGLWidgets-devel
          lib64Qt6Test-devel
          lib64kdsingleapplication-devel
          lib64xkbcommon-devel
@@ -307,7 +311,7 @@ jobs:
      - name: Remove files
        run: rm -rf /usr/lib64/qt6/lib/cmake/Qt6Sql/{Qt6QMYSQL*,Qt6QODBCD*,Qt6QPSQL*,Qt6QIBase*}
      - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
        with:
          fetch-depth: 0
          submodules: recursive
@@ -333,7 +337,7 @@ jobs:
        run: rpmbuild -ba strawberry.spec
      - name: Upload artifacts
        if: matrix.openmandriva_version != 'cooker'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
        with:
          name: openmandriva-${{matrix.openmandriva_version}}
          path: |
@@ -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
@@ -409,7 +415,7 @@ jobs:
          cmake --build build --config Release --parallel 4
          cmake --install build
      - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
        with:
          fetch-depth: 0
          submodules: recursive
@@ -434,7 +440,7 @@ jobs:
        working-directory: build
        run: rpmbuild -ba strawberry.spec
      - name: Upload artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
        with:
          name: mageia-${{matrix.mageia_version}}
          path: |
@@ -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
@@ -511,7 +518,7 @@ jobs:
          cmake --build build --config Release --parallel 4
          cmake --install build
      - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
        with:
          fetch-depth: 0
          submodules: recursive
@@ -528,7 +535,7 @@ jobs:
      - name: Copy deb
        run: cp ../*.deb .
      - name: Upload artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
        with:
          name: debian-${{matrix.debian_version}}
          path: |
@@ -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
@@ -607,7 +615,7 @@ jobs:
          cmake --build build --config Release --parallel 4
          cmake --install build
      - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
        with:
          fetch-depth: 0
          submodules: recursive
@@ -624,7 +632,7 @@ jobs:
      - name: Copy deb
        run: cp ../*.deb ../*.ddeb .
      - name: Upload artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
        with:
          name: ubuntu-${{matrix.ubuntu_version}}
          path: |
@@ -693,13 +701,14 @@ jobs:
            gstreamer1.0-pulseaudio
            libkdsingleapplication-qt6-dev
            rapidjson-dev
+            libprojectm-dev
      - name: Install keyboxd
        if: matrix.ubuntu_version == 'noble'
        env:
          DEBIAN_FRONTEND: noninteractive
        run: apt install -y keyboxd
      - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
        with:
          fetch-depth: 0
          submodules: recursive
@@ -735,16 +744,22 @@ jobs:
    runs-on: ubuntu-latest
    steps:
    - name: Checkout
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
      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.2.4
+      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
@@ -760,13 +775,13 @@ jobs:
    runs-on: ubuntu-latest
    steps:
    - name: Checkout
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
      with:
        fetch-depth: 0
        submodules: recursive
    - name: Build OpenBSD
      id: build-openbsd
-      uses: vmactions/openbsd-vm@v1.2.1
+      uses: vmactions/openbsd-vm@v1.2.9
      with:
        usesh: true
        mem: 4096
@@ -787,7 +802,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        runner: [ 'macos-13', 'macos-15' ]
+        runner: [ 'macos-15-intel', 'macos-15' ]
        buildtype: [ 'release' ]

    runs-on: ${{ matrix.runner }}
@@ -826,20 +841,20 @@ jobs:
          rm -f uninstall.sh

      - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
        with:
          fetch-depth: 0
          submodules: recursive

      - name: Import certificate file
        if: github.repository == 'strawberrymusicplayer/strawberry' && github.event.pull_request.head.repo.fork == false
-        uses: apple-actions/import-codesign-certs@v5
+        uses: apple-actions/import-codesign-certs@v6
        with:
          p12-file-base64: ${{ secrets.APPLE_DEVELOPER_ID_CERTIFICATE }}
          p12-password: ${{ secrets.APPLE_DEVELOPER_ID_CERTIFICATE_PASSWORD }}

      - name: Download macOS dependencies
-        run: curl -f -O -L https://github.com/strawberrymusicplayer/strawberry-macos-dependencies/releases/latest/download/strawberry-macos-${{env.arch}}-${{env.buildtype}}.tar.xz
+        run: curl -f -O -L https://github.com/strawberrymusicplayer/strawberry-macos-dependencies$(test "${{env.arch}}" = "x86_64" && echo "-intel" || echo "")/releases/latest/download/strawberry-macos-${{env.arch}}-${{env.buildtype}}.tar.xz

      - name: Extract macOS dependencies
        run: sudo tar -C / -xf strawberry-macos-${{env.arch}}-${{env.buildtype}}.tar.xz
@@ -890,9 +905,9 @@ jobs:
        run: make deploy

      - name: Manually Codesign
-        if: github.repository == 'strawberrymusicplayer/strawberry' && github.event.pull_request.head.repo.fork == false && matrix.runner == 'macos-13'
+        if: github.repository == 'strawberrymusicplayer/strawberry' && github.event.pull_request.head.repo.fork == false && matrix.runner == 'macos-15-intel'
        working-directory: build
-        run: codesign -s 383J84DVB6 -f strawberry.app/Contents/Frameworks/{libpcre2-8.0.dylib,libpcre2-16.0.dylib,libpng16.16.dylib,libfreetype.6.dylib,libzstd.1.dylib} strawberry.app/Contents/Frameworks/png.framework/png strawberry.app
+        run: codesign -s 383J84DVB6 -f strawberry.app/Contents/Frameworks/{libpcre2-8.0.dylib,libpcre2-16.0.dylib,libpng16.16.dylib,libfreetype.6.dylib,libzstd.1.dylib,libbrotlicommon.1.dylib,libbrotlienc.1.dylib} strawberry.app/Contents/Frameworks/png.framework/png strawberry.app

      - name: Manually Codesign
        if: github.repository == 'strawberrymusicplayer/strawberry' && github.event.pull_request.head.repo.fork == false && matrix.runner == 'macos-15'
@@ -977,7 +992,7 @@ jobs:
        run: echo "cmake_buildtype=$(echo ${{env.buildtype}} | awk '{print toupper(substr($0,0,1))tolower(substr($0,2))}')" >> $GITHUB_ENV

      - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
        with:
          fetch-depth: 0
          submodules: recursive
@@ -1080,7 +1095,7 @@ jobs:
        run: echo "cmake_buildtype=$(echo ${{matrix.buildtype}} | sed 's/.*/\u&/')" >> $GITHUB_ENV

      - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
        with:
          fetch-depth: 0
          submodules: recursive
@@ -1310,7 +1325,7 @@ jobs:
      - name: Set SDK version
        if: matrix.arch != 'arm64'
        shell: bash
-        run: echo "sdk_version=10.0.19041.0" >> $GITHUB_ENV
+        run: echo "sdk_version=10.0.22621.0" >> $GITHUB_ENV

      - name: Set SDK version
        if: matrix.arch == 'arm64'
@@ -1321,10 +1336,6 @@ jobs:
        shell: cmd
        run: choco install --no-progress rsync

-      - name: Set SSH command
-        shell: bash
-        run: echo "ssh_command=/c/ProgramData/chocolatey/lib/rsync/tools/$(ls -1 /c/ProgramData/chocolatey/lib/rsync/tools/ | grep -v '\.zip$' | grep '^cwrsync' | tail -1)/bin/ssh.exe" >> $GITHUB_ENV
-
      - name: Cleanup PATH
        uses: egor-tensin/cleanup-path@v4
        with:
@@ -1409,7 +1420,7 @@ jobs:
          vsversion: 2022

      - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
        with:
          fetch-depth: 0
          submodules: recursive
@@ -1623,7 +1634,7 @@ jobs:
      - name: rsync
        if: steps.set-upload-path.outputs.upload_path != ''
        shell: bash
-        run: rsync -e "${{env.ssh_command}} -p ${{secrets.SSH_PORT}} -o StrictHostKeyChecking=no" -var build/StrawberrySetup*.exe ${{secrets.SSH_USER}}@${{secrets.SSH_HOST}}:${{steps.set-upload-path.outputs.upload_path}}/
+        run: rsync -e "/c/ProgramData/chocolatey/lib/rsync/tools/bin/ssh.exe -p ${{secrets.SSH_PORT}} -o StrictHostKeyChecking=no" -var build/StrawberrySetup*.exe ${{secrets.SSH_USER}}@${{secrets.SSH_HOST}}:${{steps.set-upload-path.outputs.upload_path}}/


  upload:
@@ -1642,11 +1653,11 @@ jobs:
          DEBIAN_FRONTEND: noninteractive
        run: sudo apt install -y git rsync
      - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
        with:
          fetch-depth: 0
      - name: Download artifacts
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v7
        with:
          path: artifacts
      - name: SSH Setup
@@ -1690,7 +1701,7 @@ jobs:
          DEBIAN_FRONTEND: noninteractive
        run: sudo apt install -y git jq gh
      - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
        with:
          fetch-depth: 0
      - name: Show release assets
@@ -1698,7 +1709,7 @@ jobs:
          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
        run: gh release view "${{github.event.release.tag_name}}" --json assets | jq -r '.assets[].name'
      - name: Download artifacts
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v7
        with:
          path: artifacts
      - name: Add artifacts to release
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 /build
 /bin
 /CMakeLists.txt.user
+/.qtcreator
 /.kdev4
 /strawberry.kdev4
 /.vscode
@@ -12,3 +13,4 @@
 /CMakeSettings.json
 /dist/scripts/maketarball.sh
 /debian/changelog
+_codeql_detected_source_root
--- a/3rdparty/discord-rpc/discord_register_win.cpp
+++ b/3rdparty/discord-rpc/discord_register_win.cpp
@@ -163,4 +163,3 @@ extern "C" void Discord_Register(const char *applicationId, const char *command)
  Discord_RegisterW(appId, wcommand);

 }
-
--- a/CMakeLists.txt
+++ b/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()
@@ -266,6 +275,8 @@ if(WIN32)
    set(GETOPT_LIBRARIES getopt-win::getopt)
  elseif(TARGET getopt::getopt_shared)
    set(GETOPT_LIBRARIES getopt::getopt_shared)
+  elseif(TARGET unofficial::getopt-win32::getopt)
+    set(GETOPT_LIBRARIES unofficial::getopt-win32::getopt)
  else()
    message(FATAL_ERROR "Missing getopt")
  endif()
@@ -387,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")
@@ -699,6 +715,7 @@ set(SOURCES
  src/lyrics/elyricsnetlyricsprovider.cpp
  src/lyrics/letraslyricsprovider.cpp
  src/lyrics/lyricfindlyricsprovider.cpp
+  src/lyrics/lrcliblyricsprovider.cpp

  src/settings/settingsdialog.cpp
  src/settings/settingspage.cpp
@@ -995,6 +1012,7 @@ set(HEADERS
  src/lyrics/elyricsnetlyricsprovider.h
  src/lyrics/letraslyricsprovider.h
  src/lyrics/lyricfindlyricsprovider.h
+  src/lyrics/lrcliblyricsprovider.h

  src/settings/settingsdialog.h
  src/settings/settingspage.h
@@ -1459,6 +1477,7 @@ optional_source(HAVE_QOBUZ
    src/qobuz/qobuzrequest.cpp
    src/qobuz/qobuzstreamurlrequest.cpp
    src/qobuz/qobuzfavoriterequest.cpp
+    src/qobuz/qobuzcredentialfetcher.cpp
    src/settings/qobuzsettingspage.cpp
    src/covermanager/qobuzcoverprovider.cpp
  HEADERS
@@ -1468,12 +1487,33 @@ optional_source(HAVE_QOBUZ
    src/qobuz/qobuzrequest.h
    src/qobuz/qobuzstreamurlrequest.h
    src/qobuz/qobuzfavoriterequest.h
+    src/qobuz/qobuzcredentialfetcher.h
    src/settings/qobuzsettingspage.h
    src/covermanager/qobuzcoverprovider.h
  UI
    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)
@@ -1544,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>
@@ -1559,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
--- a/25
+++ b/25
@@ -2,6 +2,31 @@ Strawberry Music Player
 =======================
 ChangeLog

+Version 1.2.16 (2025.12.16):
+
+    * Make Discord Rich presence use filename if song title is missing
+    * Added better error message when a GStreamer plugin is missing
+    * Preserve track order in album shuffle mode when restarting playback (#1623)
+    * Possible fixes for context word wrap
+    * Added lyrics from lrclib.net
+    * Added option to turn off the use of sort tags for the collection
+    * Fixed Spotify login
+    * Fixed error dialog shown minimized if another Strawberry window than the mainwindow was active
+    * Fixed seeking to the end of the track and back causing seeking to stop working (#1675)
+    * Set current index when automatically selecting track (#1825)
+    * Make icon size for shuffle and repeat buttons adjust to screen resolution (#1838)
+    * Fixed song being removed from playlist when dragging to another application (#1815)
+    * Don't automatically scroll on dynamic playlists (#1427)
+
+Version 1.2.15 (2025.11.25):
+
+    * Fixed system default language not respected
+    * Fixed length filter search
+    * Fixed playlist parser converting Spotify URL's
+    * Removed use of deprecated QStyle::State_Editing
+    * Ignore connection closed errors for ListenBrainz
+    * (Windows) Support building with vcpkg unofficial::getopt-win32::getopt
+
 Version 1.2.14 (2025.10.25):

  Bugfixes:
--- a/README.md
+++ b/README.md
@@ -17,7 +17,9 @@ It’s written in **C++ using the Qt framework**, designed for **audiophiles and
 - **Forum:** https://forum.strawberrymusicplayer.org
 - **GitHub:** https://github.com/strawberrymusicplayer/strawberry
 - **Latest builds:** https://builds.strawberrymusicplayer.org
- **openSUSE Build Service:** https://build.opensuse.org/package/show/home:jonaski:audio/strawberry
+- **openSUSE Build Service:**
+  - Stable: https://build.opensuse.org/package/show/home:jonaski:strawberry/strawberry
+  - Unstable: https://build.opensuse.org/package/show/home:jonaski:strawberry-dev/strawberry
 - **Ubuntu PPAs:**
  - Stable: https://launchpad.net/~jonaski/+archive/ubuntu/strawberry
  - Unstable: https://launchpad.net/~jonaski/+archive/ubuntu/strawberry-unstable
@@ -64,7 +66,7 @@ Supporting open-source developers helps ensure continued maintenance and improve
 - Loudness analysis and EBU R128 normalization
 - Editing tags and fetching missing tags via [MusicBrainz](https://musicbrainz.org/)
 - Album art from: [Last.fm](https://www.last.fm/), [MusicBrainz](https://musicbrainz.org/), [Discogs](https://www.discogs.com/), [Musixmatch](https://www.musixmatch.com/), [Deezer](https://www.deezer.com/), [Tidal](https://www.tidal.com/), [Qobuz](https://www.qobuz.com/), [Spotify](https://www.spotify.com/)
- Lyrics from: [Genius](https://genius.com/), [Musixmatch](https://www.musixmatch.com/), [ChartLyrics](http://www.chartlyrics.com/), [lyrics.ovh](https://lyrics.ovh/), [lololyrics](https://www.lololyrics.com/), [songlyrics](https://www.songlyrics.com/), [azlyrics](https://www.azlyrics.com/), [elyrics](https://www.elyrics.net/), [letras](https://www.letras.mus.br), [LyricFind](https://lyrics.lyricfind.com)
+- Lyrics from: [Genius](https://genius.com/), [Musixmatch](https://www.musixmatch.com/), [ChartLyrics](http://www.chartlyrics.com/), [lyrics.ovh](https://lyrics.ovh/), [lololyrics](https://www.lololyrics.com/), [songlyrics](https://www.songlyrics.com/), [azlyrics](https://www.azlyrics.com/), [elyrics](https://www.elyrics.net/), [letras](https://www.letras.mus.br), [LyricFind](https://lyrics.lyricfind.com) and [lrclib.net](https://lrclib.net/)
 - Audio analyzer and equalizer
 - Transfer music to USB, MTP and iPod devices
 - Scrobbling to [Last.fm](https://www.last.fm/) and [ListenBrainz](https://listenbrainz.org/)
--- a/cmake/Version.cmake
+++ b/cmake/Version.cmake
@@ -1,9 +1,9 @@
 set(STRAWBERRY_VERSION_MAJOR 1)
 set(STRAWBERRY_VERSION_MINOR 2)
-set(STRAWBERRY_VERSION_PATCH 14)
+set(STRAWBERRY_VERSION_PATCH 16)
 #set(STRAWBERRY_VERSION_PRERELEASE rc1)

-set(INCLUDE_GIT_REVISION OFF)
+set(INCLUDE_GIT_REVISION ON)

 set(majorminorpatch "${STRAWBERRY_VERSION_MAJOR}.${STRAWBERRY_VERSION_MINOR}.${STRAWBERRY_VERSION_PATCH}")

--- a/debian/control
+++ b/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
@@ -60,7 +61,7 @@ Description: music player and music collection organizer
  - Edit tags on audio files
  - Automatically retrieve tags from MusicBrainz
  - Album cover art from Last.fm, Musicbrainz, Discogs, Musixmatch, Deezer, Tidal, Qobuz and Spotify
-  - Song lyrics from Genius, Musixmatch, ChartLyrics, lyrics.ovh, lololyrics.com, songlyrics.com, azlyrics.com, elyrics.net, letras.mus.br and LyricFind
+  - Lyrics from multiple sources
  - Audio analyzer
  - Audio equalizer
  - Transfer music to mass-storage USB players, MTP compatible devices and iPod Nano/Classic
--- a/dist/unix/org.strawberrymusicplayer.strawberry.appdata.xml
+++ b/dist/unix/org.strawberrymusicplayer.strawberry.appdata.xml
@@ -31,7 +31,7 @@
      <li>Edit tags on audio files</li>
      <li>Automatically retrieve tags from MusicBrainz</li>
      <li>Album cover art from Last.fm, Musicbrainz, Discogs, Musixmatch, Deezer, Tidal, Qobuz and Spotify</li>
-      <li>Song lyrics from Genius, Musixmatch, ChartLyrics, lyrics.ovh, lololyrics.com, songlyrics.com, azlyrics.com, elyrics.net, letras.mus.br and LyricFind</li>
+      <li>Lyrics from multiple sources</li>
      <li>Audio analyzer and equalizer</li>
      <li>Transfer music to mass-storage USB players, MTP compatible devices and iPod Nano/Classic</li>
      <li>Scrobbler with support for Last.fm and ListenBrainz</li>
@@ -51,6 +51,8 @@
  </screenshots>
  <update_contact>eclipseo@fedoraproject.org</update_contact>
    <releases>
+        <release version="1.2.16" date="2025-12-16"/>
+        <release version="1.2.15" date="2025-11-25"/>
        <release version="1.2.14" date="2025-10-25"/>
        <release version="1.2.13" date="2025-08-31"/>
        <release version="1.2.12" date="2025-08-12"/>
--- a/dist/unix/strawberry.1
+++ b/dist/unix/strawberry.1
@@ -29,9 +29,7 @@ Features:
 .br
 - Album cover art from Last.fm, Musicbrainz, Discogs, Musixmatch, Deezer, Tidal, Qobuz and Spotify
 .br
- Song lyrics from Genius, Musixmatch, ChartLyrics, lyrics.ovh, lololyrics.com, songlyrics.com, azlyrics.com, elyrics.net, letras.mus.br and LyricFind
-.br
- Support for multiple backends
+- Lyrics from multiple sources
 .br
 - Audio analyzer
 .br
--- a/dist/unix/strawberry.spec.in
+++ b/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)
@@ -93,8 +94,7 @@ Features:
  - Edit tags on audio files
  - Automatically retrieve tags from MusicBrainz
  - Album cover art from Last.fm, Musicbrainz, Discogs, Musixmatch, Deezer, Tidal, Qobuz and Spotify
-  - Song lyrics from Genius, Musixmatch, ChartLyrics, lyrics.ovh, lololyrics.com, songlyrics.com, azlyrics.com, elyrics.net, letras.mus.br and LyricFind
-  - Support for multiple backends
+  - Lyrics from multiple sources
  - Audio analyzer
  - Audio equalizer
  - Scrobbler with support for Last.fm and ListenBrainz
--- a/dist/windows/strawberry.nsi.in
+++ b/dist/windows/strawberry.nsi.in
@@ -477,15 +477,15 @@ Section "Strawberry" Strawberry

  ; Common files

-  File "icudt77.dll"
+  File "icudt78.dll"
 !ifdef msvc && arch_arm64
  File "fftw3.dll"
 !else
  File "libfftw3-3.dll"
 !endif
 !ifdef msvc && debug
-  File "icuin77d.dll"
-  File "icuuc77d.dll"
+  File "icuin78d.dll"
+  File "icuuc78d.dll"
  File "libxml2d.dll"
  File "Qt6Concurrentd.dll"
  File "Qt6Cored.dll"
@@ -494,8 +494,8 @@ Section "Strawberry" Strawberry
  File "Qt6Sqld.dll"
  File "Qt6Widgetsd.dll"
 !else
-  File "icuin77.dll"
-  File "icuuc77.dll"
+  File "icuin78.dll"
+  File "icuuc78.dll"
  File "libxml2.dll"
  File "Qt6Concurrent.dll"
  File "Qt6Core.dll"
@@ -505,6 +505,7 @@ Section "Strawberry" Strawberry
  File "Qt6Widgets.dll"
 !endif

+!ifdef msvc && arch_x86
  File "avcodec-61.dll"
  File "avfilter-10.dll"
  File "avformat-61.dll"
@@ -512,6 +513,14 @@ Section "Strawberry" Strawberry
  File "postproc-58.dll"
  File "swresample-5.dll"
  File "swscale-8.dll"
+!else
+  File "avcodec-62.dll"
+  File "avfilter-11.dll"
+  File "avformat-62.dll"
+  File "avutil-60.dll"
+  File "swresample-6.dll"
+  File "swscale-9.dll"
+!endif

  ; Register Strawberry with Default Programs
  Var /GLOBAL AppIcon
@@ -1019,15 +1028,15 @@ Section "Uninstall"

  ; Common files

-  Delete "$INSTDIR\icudt77.dll"
+  Delete "$INSTDIR\icudt78.dll"
 !ifdef msvc && arch_arm64
  Delete "$INSTDIR\fftw3.dll"
 !else
  Delete "$INSTDIR\libfftw3-3.dll"
 !endif
 !ifdef msvc && debug
-  Delete "$INSTDIR\icuin77d.dll"
-  Delete "$INSTDIR\icuuc77d.dll"
+  Delete "$INSTDIR\icuin78d.dll"
+  Delete "$INSTDIR\icuuc78d.dll"
  Delete "$INSTDIR\libxml2d.dll"
  Delete "$INSTDIR\Qt6Concurrentd.dll"
  Delete "$INSTDIR\Qt6Cored.dll"
@@ -1036,8 +1045,8 @@ Section "Uninstall"
  Delete "$INSTDIR\Qt6Sqld.dll"
  Delete "$INSTDIR\Qt6Widgetsd.dll"
 !else
-  Delete "$INSTDIR\icuin77.dll"
-  Delete "$INSTDIR\icuuc77.dll"
+  Delete "$INSTDIR\icuin78.dll"
+  Delete "$INSTDIR\icuuc78.dll"
  Delete "$INSTDIR\libxml2.dll"
  Delete "$INSTDIR\Qt6Concurrent.dll"
  Delete "$INSTDIR\Qt6Core.dll"
@@ -1047,6 +1056,7 @@ Section "Uninstall"
  Delete "$INSTDIR\Qt6Widgets.dll"
 !endif

+!ifdef msvc && arch_x86
  Delete "$INSTDIR\avcodec-61.dll"
  Delete "$INSTDIR\avfilter-10.dll"
  Delete "$INSTDIR\avformat-61.dll"
@@ -1054,6 +1064,14 @@ Section "Uninstall"
  Delete "$INSTDIR\postproc-58.dll"
  Delete "$INSTDIR\swresample-5.dll"
  Delete "$INSTDIR\swscale-8.dll"
+!else
+  Delete "$INSTDIR\avcodec-62.dll"
+  Delete "$INSTDIR\avfilter-11.dll"
+  Delete "$INSTDIR\avformat-62.dll"
+  Delete "$INSTDIR\avutil-60.dll"
+  Delete "$INSTDIR\swresample-6.dll"
+  Delete "$INSTDIR\swscale-9.dll"
+!endif

 !ifdef mingw
  Delete "$INSTDIR\gio-modules\libgiognutls.dll"
--- a/src/analyzer/analyzerbase.h
+++ b/src/analyzer/analyzerbase.h
@@ -90,4 +90,3 @@ class AnalyzerBase : public QWidget {
 };

 #endif  // ANALYZERBASE_H
-
--- a/src/analyzer/analyzercontainer.cpp
+++ b/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_);
+
+}
--- a/src/analyzer/analyzercontainer.h
+++ b/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>
@@ -102,7 +106,6 @@ void AnalyzerContainer::AddAnalyzerType() {
  action->setCheckable(true);
  actions_ << action;
  QObject::connect(action, &QAction::triggered, [this, id]() { ChangeAnalyzer(id); });
-
 }

 #endif  // ANALYZERCONTAINER_H
--- a/src/analyzer/blockanalyzer.cpp
+++ b/src/analyzer/blockanalyzer.cpp
@@ -66,6 +66,7 @@ BlockAnalyzer::BlockAnalyzer(QWidget *parent)

  // mxcl says null pixmaps cause crashes, so let's play it safe
  std::fill(fade_bars_.begin(), fade_bars_.end(), QPixmap(1, 1));
+
 }

 void BlockAnalyzer::resizeEvent(QResizeEvent *e) {
--- a/src/analyzer/blockanalyzer.h
+++ b/src/analyzer/blockanalyzer.h
@@ -41,14 +41,14 @@ class BlockAnalyzer : public AnalyzerBase {
  Q_OBJECT

 public:
-  Q_INVOKABLE explicit BlockAnalyzer(QWidget*);
+  Q_INVOKABLE explicit BlockAnalyzer(QWidget *parent);

  static const char *kName;

 protected:
-  void transform(Scope&) override;
+  void transform(Scope &s) override;
  void analyze(QPainter &p, const Scope &s, const bool new_frame) override;
-  void resizeEvent(QResizeEvent*) override;
+  void resizeEvent(QResizeEvent *e) override;
  virtual void paletteChange(const QPalette &_palette);
  void framerateChanged() override;

--- a/src/analyzer/boomanalyzer.h
+++ b/src/analyzer/boomanalyzer.h
@@ -40,7 +40,7 @@ class BoomAnalyzer : public AnalyzerBase {
  Q_OBJECT

 public:
-  Q_INVOKABLE explicit BoomAnalyzer(QWidget*);
+  Q_INVOKABLE explicit BoomAnalyzer(QWidget *parent);

  static const char *kName;

@@ -70,7 +70,6 @@ class BoomAnalyzer : public AnalyzerBase {

  QPixmap barPixmap_;
  QPixmap canvas_;
-
 };

 #endif  // BOOMANALYZER_H
--- a/src/analyzer/fht.h
+++ b/src/analyzer/fht.h
@@ -55,7 +55,7 @@ class FHT {
  /**
   * Recursive in-place Hartley transform. For internal use only!
   */
-  void _transform(float*, int, int);
+  void _transform(float *p, int n, int k);

 public:
  /**
@@ -68,7 +68,7 @@ class FHT {
  ~FHT();
  int sizeExp() const;
  int size() const;
-  void scale(float*, float) const;
+  void scale(float *p, float d) const;

  /**
   * Exponentially Weighted Moving Average (EWMA) filter.
@@ -90,12 +90,12 @@ class FHT {
  /**
   * Semi-logarithmic audio spectrum.
   */
-  void semiLogSpectrum(float*);
+  void semiLogSpectrum(float *p);

  /**
   * Fourier spectrum.
   */
-  void spectrum(float*);
+  void spectrum(float *p);

  /**
   * Calculates a mathematically correct FFT power spectrum.
@@ -103,7 +103,7 @@ class FHT {
   * and factor the 0.5 in the final scaling factor.
   * @see FHT::power2()
   */
-  void power(float*);
+  void power(float *p);

  /**
   * Calculates an FFT power spectrum with doubled values as a
@@ -112,14 +112,14 @@ class FHT {
   * of @f$2^n@f$ input values. This is the fastest transform.
   * @see FHT::power()
   */
-  void power2(float*);
+  void power2(float *p);

  /**
   * Discrete Hartley transform of data sets with 8 values.
   */
-  static void transform8(float*);
+  static void transform8(float *p);

-  void transform(float*);
+  void transform(float *p);
 };

 #endif  // FHT_H
--- a/src/collection/collectionbackend.h
+++ b/src/collection/collectionbackend.h
@@ -140,7 +140,6 @@ class CollectionBackend : public CollectionBackendInterface {
  Q_OBJECT

 public:
-
  Q_INVOKABLE explicit CollectionBackend(QObject *parent = nullptr);

  ~CollectionBackend();
@@ -331,4 +330,3 @@ class CollectionBackend : public CollectionBackendInterface {
 };

 #endif  // COLLECTIONBACKEND_H
-
--- a/src/collection/collectionfilteroptions.h
+++ b/src/collection/collectionfilteroptions.h
@@ -26,7 +26,6 @@

 class CollectionFilterOptions {
 public:
-
  explicit CollectionFilterOptions();

  // Filter mode:
--- a/src/collection/collectionfilterwidget.h
+++ b/src/collection/collectionfilterwidget.h
@@ -135,4 +135,3 @@ class CollectionFilterWidget : public QWidget {
 };

 #endif  // COLLECTIONFILTERWIDGET_H
-
--- a/src/collection/collectionlibrary.cpp
+++ b/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);
  }

 }
--- a/src/collection/collectionlibrary.h
+++ b/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 SongsRatingChanged(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);

 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
--- a/src/collection/collectionmodel.cpp
+++ b/src/collection/collectionmodel.cpp
@@ -212,6 +212,7 @@ void CollectionModel::ReloadSettings() {
  const bool show_various_artists = settings.value(CollectionSettings::kVariousArtists, true).toBool();
  const bool sort_skip_articles_for_artists = settings.value(CollectionSettings::kSkipArticlesForArtists, true).toBool();
  const bool sort_skip_articles_for_albums = settings.value(CollectionSettings::kSkipArticlesForAlbums, false).toBool();
+  const bool use_sort_tags = settings.value(CollectionSettings::kUseSortTags, true).toBool();

  use_disk_cache_ = settings.value(CollectionSettings::kSettingsDiskCacheEnable, false).toBool();
  QPixmapCache::setCacheLimit(static_cast<int>(MaximumCacheSize(&settings, CollectionSettings::kSettingsCacheSize, CollectionSettings::kSettingsCacheSizeUnit, CollectionSettings::kSettingsCacheSizeDefault) / 1024));
@@ -227,12 +228,14 @@ void CollectionModel::ReloadSettings() {
      show_dividers != options_current_.show_dividers ||
      show_various_artists != options_current_.show_various_artists ||
      sort_skip_articles_for_artists != options_current_.sort_skip_articles_for_artists ||
-      sort_skip_articles_for_albums != options_current_.sort_skip_articles_for_albums) {
+      sort_skip_articles_for_albums != options_current_.sort_skip_articles_for_albums ||
+      use_sort_tags != options_current_.use_sort_tags) {
    options_current_.show_pretty_covers = show_pretty_covers;
    options_current_.show_dividers = show_dividers;
    options_current_.show_various_artists = show_various_artists;
    options_current_.sort_skip_articles_for_artists = sort_skip_articles_for_artists;
    options_current_.sort_skip_articles_for_albums = sort_skip_articles_for_albums;
+    options_current_.use_sort_tags = use_sort_tags;
    ScheduleReset();
  }

@@ -705,7 +708,7 @@ CollectionItem *CollectionModel::CreateContainerItem(const GroupBy group_by, con

  QString divider_key;
  if (options_active_.show_dividers && container_level == 0) {
-    divider_key = DividerKey(group_by, song, SortText(group_by, song, options_active_.sort_skip_articles_for_artists, options_active_.sort_skip_articles_for_albums));
+    divider_key = DividerKey(group_by, song, SortText(group_by, song, options_active_.sort_skip_articles_for_artists, options_active_.sort_skip_articles_for_albums, options_active_.use_sort_tags));
    if (!divider_key.isEmpty()) {
      if (!divider_nodes_.contains(divider_key)) {
        CreateDividerItem(divider_key, DividerDisplayText(group_by, divider_key), parent);
@@ -719,7 +722,7 @@ CollectionItem *CollectionModel::CreateContainerItem(const GroupBy group_by, con
  item->container_level = container_level;
  item->container_key = container_key;
  item->display_text = DisplayText(group_by, song);
-  item->sort_text = SortText(group_by, song, options_active_.sort_skip_articles_for_artists, options_active_.sort_skip_articles_for_albums);
+  item->sort_text = SortText(group_by, song, options_active_.sort_skip_articles_for_artists, options_active_.sort_skip_articles_for_albums, options_active_.use_sort_tags);
  if (!divider_key.isEmpty()) {
    item->sort_text.prepend(divider_key + QLatin1Char(' '));
  }
@@ -1074,37 +1077,37 @@ QString CollectionModel::PrettyFormat(const Song &song) {

 }

-QString CollectionModel::SortText(const GroupBy group_by, const Song &song, const bool sort_skip_articles_for_artists, const bool sort_skip_articles_for_albums) {
+QString CollectionModel::SortText(const GroupBy group_by, const Song &song, const bool sort_skip_articles_for_artists, const bool sort_skip_articles_for_albums, const bool use_sort_tags) {

  switch (group_by) {
    case GroupBy::AlbumArtist:
-      return SortTextForName(song.effective_albumartistsort(), sort_skip_articles_for_artists);
+      return SortTextForName(use_sort_tags ? song.effective_albumartistsort() : song.effective_albumartist(), sort_skip_articles_for_artists);
    case GroupBy::Artist:
-      return SortTextForName(song.effective_artistsort(), sort_skip_articles_for_artists);
+      return SortTextForName(use_sort_tags ? song.effective_artistsort() : song.artist(), sort_skip_articles_for_artists);
    case GroupBy::Album:
-      return SortTextForName(song.effective_albumsort(), sort_skip_articles_for_albums);
+      return SortTextForName(use_sort_tags ? song.effective_albumsort() : song.album(), sort_skip_articles_for_albums);
    case GroupBy::AlbumDisc:
-      return SortTextForName(song.effective_albumsort(), sort_skip_articles_for_albums) + SortTextForNumber(std::max(0, song.disc()));
+      return SortTextForName(use_sort_tags ? song.effective_albumsort() : song.album(), sort_skip_articles_for_albums) + SortTextForNumber(std::max(0, song.disc()));
    case GroupBy::YearAlbum:
-      return SortTextForNumber(std::max(0, song.year())) + song.grouping() + SortTextForName(song.effective_albumsort(), sort_skip_articles_for_albums);
+      return SortTextForYear(song.year()) + song.grouping() + SortTextForName(use_sort_tags ? song.effective_albumsort() : song.album(), sort_skip_articles_for_albums);
    case GroupBy::YearAlbumDisc:
-      return SortTextForNumber(std::max(0, song.year())) + SortTextForName(song.effective_albumsort(), sort_skip_articles_for_albums) + SortTextForNumber(std::max(0, song.disc()));
+      return SortTextForYear(song.year()) + SortTextForName(use_sort_tags ? song.effective_albumsort() : song.album(), sort_skip_articles_for_albums) + SortTextForNumber(std::max(0, song.disc()));
    case GroupBy::OriginalYearAlbum:
-      return SortTextForNumber(std::max(0, song.effective_originalyear())) + song.grouping() + SortTextForName(song.effective_albumsort(), sort_skip_articles_for_albums);
+      return SortTextForYear(song.effective_originalyear()) + song.grouping() + SortTextForName(use_sort_tags ? song.effective_albumsort() : song.album(), sort_skip_articles_for_albums);
    case GroupBy::OriginalYearAlbumDisc:
-      return SortTextForNumber(std::max(0, song.effective_originalyear())) + SortTextForName(song.effective_albumsort(), sort_skip_articles_for_albums) + SortTextForNumber(std::max(0, song.disc()));
+      return SortTextForYear(song.effective_originalyear()) + SortTextForName(use_sort_tags ? song.effective_albumsort() : song.album(), sort_skip_articles_for_albums) + SortTextForNumber(std::max(0, song.disc()));
    case GroupBy::Disc:
      return SortTextForNumber(std::max(0, song.disc()));
    case GroupBy::Year:
-      return SortTextForNumber(std::max(0, song.year())) + QLatin1Char(' ');
+      return SortTextForYear(song.year()) + QLatin1Char(' ');
    case GroupBy::OriginalYear:
-      return SortTextForNumber(std::max(0, song.effective_originalyear())) + QLatin1Char(' ');
+      return SortTextForYear(song.effective_originalyear()) + QLatin1Char(' ');
    case GroupBy::Genre:
      return SortText(song.genre());
    case GroupBy::Composer:
-      return SortTextForName(song.effective_composersort(), sort_skip_articles_for_artists);
+      return SortTextForName(use_sort_tags ? song.effective_composersort() : song.composer(), sort_skip_articles_for_artists);
    case GroupBy::Performer:
-      return SortTextForName(song.effective_performersort(), sort_skip_articles_for_artists);
+      return SortTextForName(use_sort_tags ? song.effective_performersort() : song.performer(), sort_skip_articles_for_artists);
    case GroupBy::Grouping:
      return SortText(song.grouping());
    case GroupBy::FileType:
@@ -1162,14 +1165,14 @@ QString CollectionModel::SortTextForSong(const Song &song) {

 QString CollectionModel::SortTextForYear(const int year) {

-  QString str = QString::number(year);
+  const QString str = QString::number(std::max(year, 0));
  return QStringLiteral("0").repeated(qMax(0, 4 - str.length())) + str;

 }

 QString CollectionModel::SortTextForBitrate(const int bitrate) {

-  QString str = QString::number(bitrate);
+  const QString str = QString::number(bitrate);
  return QStringLiteral("0").repeated(qMax(0, 3 - str.length())) + str;

 }
@@ -1218,27 +1221,30 @@ QString CollectionModel::ContainerKey(const GroupBy group_by, const Song &song,
      if (options_active_.separate_albums_by_grouping && !song.grouping().isEmpty()) key.append(QLatin1Char('-') + song.grouping());
      break;
    case GroupBy::AlbumDisc:
-      key = PrettyAlbumDisc(song.album(), song.disc());
+      key = TextOrUnknown(song.album());
+      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 = PrettyYearAlbum(song.year(), song.album());
+      key = SortTextForYear(song.year()) + QLatin1Char('-') + TextOrUnknown(song.album());
      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 = PrettyYearAlbumDisc(song.year(), song.album(), song.disc());
+      key = SortTextForYear(song.year()) + QLatin1Char('-') + TextOrUnknown(song.album());
+      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 = PrettyYearAlbum(song.effective_originalyear(), song.album());
+      key = SortTextForYear(song.effective_originalyear()) + QLatin1Char('-') + TextOrUnknown(song.album());
      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 = PrettyYearAlbumDisc(song.effective_originalyear(), song.album(), song.disc());
+      key = SortTextForYear(song.effective_originalyear()) + QLatin1Char('-') + TextOrUnknown(song.album());
+      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;
@@ -1246,10 +1252,10 @@ QString CollectionModel::ContainerKey(const GroupBy group_by, const Song &song,
      key = PrettyDisc(song.disc());
      break;
    case GroupBy::Year:
-      key = QString::number(std::max(0, song.year()));
+      key = SortTextForYear(song.year());
      break;
    case GroupBy::OriginalYear:
-      key = QString::number(std::max(0, song.effective_originalyear()));
+      key = SortTextForYear(song.effective_originalyear());
      break;
    case GroupBy::Genre:
      key = TextOrUnknown(song.genre());
@@ -1341,7 +1347,7 @@ QString CollectionModel::DividerKey(const GroupBy group_by, const Song &song, co
    case GroupBy::Bitdepth:
      return SortTextForNumber(song.bitdepth());
    case GroupBy::Bitrate:
-      return SortTextForNumber(song.bitrate());
+      return SortTextForBitrate(song.bitrate());
    case GroupBy::None:
    case GroupBy::GroupByCount:
      return QString();
--- a/src/collection/collectionmodel.h
+++ b/src/collection/collectionmodel.h
@@ -131,6 +131,7 @@ class CollectionModel : public SimpleTreeModel<CollectionItem> {
                show_various_artists(true),
                sort_skip_articles_for_artists(false),
                sort_skip_articles_for_albums(false),
+                use_sort_tags(true),
                separate_albums_by_grouping(false) {}

    Grouping group_by;
@@ -139,6 +140,7 @@ class CollectionModel : public SimpleTreeModel<CollectionItem> {
    bool show_various_artists;
    bool sort_skip_articles_for_artists;
    bool sort_skip_articles_for_albums;
+    bool use_sort_tags;
    bool separate_albums_by_grouping;
    CollectionFilterOptions filter_options;
  };
@@ -178,14 +180,14 @@ class CollectionModel : public SimpleTreeModel<CollectionItem> {
  QMimeData *mimeData(const QModelIndexList &indexes) const override;

  // Utility functions for manipulating text
-  QString DisplayText(const GroupBy group_by, const Song &song);
+  static QString DisplayText(const GroupBy group_by, const Song &song);
  static QString TextOrUnknown(const QString &text);
  static QString PrettyYearAlbum(const int year, const QString &album);
  static QString PrettyAlbumDisc(const QString &album, const int disc);
  static QString PrettyYearAlbumDisc(const int year, const QString &album, const int disc);
  static QString PrettyDisc(const int disc);
  static QString PrettyFormat(const Song &song);
-  QString SortText(const GroupBy group_by, const Song &song, const bool sort_skip_articles_for_artists, const bool sort_skip_articles_for_albums);
+  static QString SortText(const GroupBy group_by, const Song &song, const bool sort_skip_articles_for_artists, const bool sort_skip_articles_for_albums, const bool use_sort_tags);
  static QString SortText(QString text);
  static QString SortTextForName(const QString &name, const bool sort_skip_articles);
  static QString SortTextForNumber(const int number);
--- a/src/collection/collectionplaylistitem.h
+++ b/src/collection/collectionplaylistitem.h
@@ -58,4 +58,3 @@ class CollectionPlaylistItem : public PlaylistItem {
 };

 #endif  // COLLECTIONPLAYLISTITEM_H
-
--- a/src/collection/collectionwatcher.cpp
+++ b/src/collection/collectionwatcher.cpp
@@ -706,8 +706,14 @@ void CollectionWatcher::ScanSubdirectory(const QString &path, const CollectionSu
        qLog(Debug) << file << "is missing EBU R 128 loudness characteristics.";
      }

+      // If the song is unavailable and nothing has changed, just mark it as available without re-scanning
+      // For CUE files with multiple sections, all sections share the same file and would have the same availability status
+      if (matching_song.unavailable() && !changed && !missing_fingerprint && !missing_loudness_characteristics) {
+        qLog(Debug) << "Unavailable song" << file << "restored without re-scanning.";
+        t->readded_songs << matching_songs;
+      }
      // The song's changed or missing fingerprint - create fingerprint and reread the metadata from file.
-      if (t->ignores_mtime() || changed || missing_fingerprint || missing_loudness_characteristics) {
+      else if (t->ignores_mtime() || changed || missing_fingerprint || missing_loudness_characteristics) {

        QString fingerprint;
 #ifdef HAVE_SONGFINGERPRINTING
@@ -728,12 +734,6 @@ void CollectionWatcher::ScanSubdirectory(const QString &path, const CollectionSu
        }
      }

-      // Nothing has changed - mark the song available without re-scanning
-      else if (matching_song.unavailable()) {
-        qLog(Debug) << "Unavailable song" << file << "restored.";
-        t->readded_songs << matching_songs;
-      }
-
    }
    else {  // Search the DB by fingerprint.
      QString fingerprint;
--- a/src/collection/collectionwatcher.h
+++ b/src/collection/collectionwatcher.h
@@ -137,7 +137,7 @@ class CollectionWatcher : public QObject {
    QStringList files_changed_path_;

   private:
-    ScanTransaction &operator=(const ScanTransaction&) { return *this; }
+    ScanTransaction &operator=(const ScanTransaction &transaction) { Q_UNUSED(transaction); return *this; }

    int task_id_;
    quint64 progress_;
@@ -261,7 +261,6 @@ class CollectionWatcher : public QObject {
  static QStringList sValidImages;

  qint64 last_scan_time_;
-
 };

 inline QString CollectionWatcher::NoExtensionPart(const QString &fileName) {
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -48,4 +48,7 @@

 #cmakedefine ENABLE_WIN32_CONSOLE

+#cmakedefine HAVE_VISUALIZATIONS
+#cmakedefine HAVE_PROJECTM4
+
 #endif // CONFIG_H_IN
--- a/src/constants/appearancesettings.h
+++ b/src/constants/appearancesettings.h
@@ -70,6 +70,6 @@ enum class BackgroundImagePosition {
  BottomRight = 5
 };

-}  // namespace
+}  // namespace AppearanceSettings

 #endif  // APPEARANCESETTINGS_H
--- a/src/constants/backendsettings.h
+++ b/src/constants/backendsettings.h
@@ -63,6 +63,6 @@ constexpr qint64 kDefaultBufferDuration = 4000;
 constexpr double kDefaultBufferLowWatermark = 0.33;
 constexpr double kDefaultBufferHighWatermark = 0.99;

-}  // namespace
+}  // namespace BackendSettings

 #endif  // BACKENDSETTINGS_H
--- a/src/constants/behavioursettings.h
+++ b/src/constants/behavioursettings.h
@@ -71,6 +71,6 @@ constexpr char kDoubleClickPlaylistAddMode[] = "doubleclick_playlist_addmode";
 constexpr char kSeekStepSec[] = "seek_step_sec";
 constexpr char kVolumeIncrement[] = "volume_increment";

-}  // namespace
+}  // namespace BehaviourSettings

 #endif  // BEHAVIOURSETTINGS_H
--- a/src/constants/collectionsettings.h
+++ b/src/constants/collectionsettings.h
@@ -37,7 +37,7 @@ constexpr char kPrettyCovers[] = "pretty_covers";
 constexpr char kVariousArtists[] = "various_artists";
 constexpr char kSkipArticlesForArtists[] = "skip_articles_for_artists";
 constexpr char kSkipArticlesForAlbums[] = "skip_articles_for_albums";
-constexpr char kShowSortText[] = "show_sort_text";
+constexpr char kUseSortTags[] = "use_short_tags";
 constexpr char kSettingsCacheSize[] = "cache_size";
 constexpr char kSettingsCacheSizeUnit[] = "cache_size_unit";
 constexpr char kSettingsDiskCacheEnable[] = "disk_cache_enable";
@@ -59,6 +59,6 @@ enum class CacheSizeUnit {
  TB
 };

-}  // namespace
+}  // namespace CollectionSettings

 #endif  // COLLECTIONSETTINGS_H
--- a/src/constants/contextsettings.h
+++ b/src/constants/contextsettings.h
@@ -43,6 +43,6 @@ constexpr char kSettingsSummaryFmt[] = "SummaryFmt";
 constexpr char kDefaultFontFamily[] = "Noto Sans";
 constexpr qreal kDefaultFontSizeHeadline = 11;

-}  // namespace
+}  // namespace ContextSettings

 #endif  // CONTEXTSETTINGS_H
--- a/src/constants/coverssettings.h
+++ b/src/constants/coverssettings.h
@@ -32,6 +32,6 @@ constexpr char kSaveOverwrite[] = "save_overwrite";
 constexpr char kSaveLowercase[] = "save_lowercase";
 constexpr char kSaveReplaceSpaces[] = "save_replace_spaces";

-}  // namespace
+}  // namespace CoversSettings

 #endif  // COVERSSETTINGS_H
--- a/src/constants/globalshortcutssettings.h
+++ b/src/constants/globalshortcutssettings.h
@@ -26,6 +26,6 @@ constexpr char kSettingsGroup[] = "GlobalShortcuts";
 constexpr char kUseKGlobalAccel[] = "use_kglobalaccel";
 constexpr char kUseX11[] = "use_x11";

-}  // namespace
+}  // namespace GlobalShortcutsSettings

 #endif  // GLOBALSHORTCUTSSETTINGS_H
--- a/src/constants/lyricssettings.h
+++ b/src/constants/lyricssettings.h
@@ -25,6 +25,6 @@ namespace LyricsSettings {
 constexpr char kSettingsGroup[] = "Lyrics";
 constexpr char kProviders[] = "providers";

-}  // namespace
+}  // namespace LyricsSettings

 #endif  // LYRICSSETTINGS_H
--- a/src/constants/mainwindowsettings.h
+++ b/src/constants/mainwindowsettings.h
@@ -32,6 +32,6 @@ constexpr char kGeometry[] = "geometry";
 constexpr char kSplitterState[] = "splitter_state";
 constexpr char kDoNotShowSponsorMessage[] = "do_not_show_sponsor_message";

-} // namespace
+}  // namespace MainWindowSettings

 #endif  // MAINWINDOWSETTINGS_H
--- a/src/constants/moodbarsettings.h
+++ b/src/constants/moodbarsettings.h
@@ -38,6 +38,6 @@ constexpr char kShow[] = "show";
 constexpr char kStyle[] = "style";
 constexpr char kSave[] = "save";

-}  // namespace
+}  // namespace MoodbarSettings

 #endif  // MOODBARSETTINGS_H
--- a/src/constants/networkproxysettings.h
+++ b/src/constants/networkproxysettings.h
@@ -32,6 +32,6 @@ constexpr char kUsername[] = "username";
 constexpr char kPassword[] = "password";
 constexpr char kEngine[] = "engine";

-}  // namespace
+}  // namespace NetworkProxySettings

 #endif  // NETWORKPROXYSETTINGS_H
--- a/src/constants/notificationssettings.h
+++ b/src/constants/notificationssettings.h
@@ -45,7 +45,7 @@ constexpr char kCustomTextEnabled[] = "CustomTextEnabled";
 constexpr char kCustomText1[] = "CustomText1";
 constexpr char kCustomText2[] = "CustomText2";

-}  // namespace
+}  // namespace OSDSettings

 namespace OSDPrettySettings {

@@ -63,7 +63,7 @@ constexpr char kFading[] = "fading";
 constexpr QRgb kPresetBlue = qRgb(102, 150, 227);
 constexpr QRgb kPresetRed = qRgb(202, 22, 16);

-}  // namespace
+}  // namespace OSDPrettySettings

 namespace DiscordRPCSettings {

@@ -79,6 +79,6 @@ enum class StatusDisplayType {
  Song
 };

-}  // namespace
+}  // namespace DiscordRPCSettings

 #endif  // NOTIFICATIONSSETTINGS_H
--- a/src/constants/playlistsettings.h
+++ b/src/constants/playlistsettings.h
@@ -63,7 +63,7 @@ constexpr char kLastSaveExtension[] = "last_save_extension";
 constexpr char kLastSaveAllPath[] = "last_save_all_path";
 constexpr char kLastSaveAllExtension[] = "last_save_all_extension";

-}  // namespace
+}  // namespace PlaylistSettings

 Q_DECLARE_METATYPE(PlaylistSettings::PathType)

--- a/src/constants/qobuzsettings.h
+++ b/src/constants/qobuzsettings.h
@@ -43,6 +43,6 @@ constexpr char kCredentialsId[] = "credentials_id";
 constexpr char kDeviceId[] = "device_id";
 constexpr char kUserAuthToken[] = "user_auth_token";

-}  // namespace
+}  // namespace QobuzSettings

 #endif  // QOBUZSETTINGS_H
--- a/src/constants/scrobblersettings.h
+++ b/src/constants/scrobblersettings.h
@@ -35,6 +35,6 @@ constexpr char kStripRemastered[] = "strip_remastered";
 constexpr char kSources[] = "sources";
 constexpr char kUserToken[] = "user_token";

-}  // namespace
+}  // namespace ScrobblerSettings

 #endif  // SCROBBLERSETTINGS_H
--- a/src/constants/spotifysettings.h
+++ b/src/constants/spotifysettings.h
@@ -38,6 +38,6 @@ constexpr char kRefreshToken[] = "refresh_token";
 constexpr char kExpiresIn[] = "expires_in";
 constexpr char kLoginTime[] = "login_time";

-}  // namespace
+}  // namespace SpotifySettings

 #endif  // SPOTIFYSETTINGS_H
--- a/src/constants/subsonicsettings.h
+++ b/src/constants/subsonicsettings.h
@@ -41,6 +41,6 @@ constexpr char kUseAlbumIdForAlbumCovers[] = "usealbumidforalbumcovers";
 constexpr char kServerSideScrobbling[] = "serversidescrobbling";
 constexpr char kAuthMethod[] = "authmethod";

-}  // namespace
+}  // namespace SubsonicSettings

 #endif  // SUBSONICETTINGS_H
--- a/src/constants/tidalsettings.h
+++ b/src/constants/tidalsettings.h
@@ -48,6 +48,6 @@ enum class StreamUrlMethod {
  PlaybackInfoPostPaywall
 };

-}
+}  // namespace TidalSettings

 #endif  // TIDALSETTINGS_H
--- a/src/constants/transcodersettings.h
+++ b/src/constants/transcodersettings.h
@@ -26,4 +26,3 @@ constexpr char kSettingsGroup[] = "Transcoder";
 }

 #endif  // TRANSCODERSETTINGS_H
-
--- a/src/context/contextalbum.h
+++ b/src/context/contextalbum.h
@@ -61,7 +61,6 @@ class ContextAlbum : public QWidget {
  void contextMenuEvent(QContextMenuEvent *e) override;

 private:
-
  struct PreviousCover {
    explicit PreviousCover() : opacity(0.0) {}
    QImage image;
--- a/src/context/contextview.cpp
+++ b/src/context/contextview.cpp
@@ -59,6 +59,7 @@
 #include "covermanager/albumcoverchoicecontroller.h"
 #include "lyrics/lyricsfetcher.h"
 #include "constants/contextsettings.h"
+#include "constants/timeconstants.h"

 #include "contextview.h"
 #include "contextalbum.h"
@@ -353,7 +354,7 @@ void ContextView::SearchLyrics() {
  if (lyrics_.isEmpty() && action_show_lyrics_->isChecked() && action_search_lyrics_->isChecked() && !song_playing_.artist().isEmpty() && !song_playing_.title().isEmpty() && !lyrics_tried_ && lyrics_id_ == -1) {
    lyrics_fetcher_->Clear();
    lyrics_tried_ = true;
-    lyrics_id_ = static_cast<qint64>(lyrics_fetcher_->Search(song_playing_.effective_albumartist(), song_playing_.artist(), song_playing_.album(), song_playing_.title()));
+    lyrics_id_ = static_cast<qint64>(lyrics_fetcher_->Search(song_playing_.effective_albumartist(), song_playing_.artist(), song_playing_.album(), song_playing_.title(), song_playing_.length_nanosec() / kNsecPerSec));
  }

 }
--- a/src/context/contextview.h
+++ b/src/context/contextview.h
@@ -65,9 +65,9 @@ class ContextView : public QWidget {

 protected:
  void resizeEvent(QResizeEvent *e) override;
-  void contextMenuEvent(QContextMenuEvent*) override;
-  void dragEnterEvent(QDragEnterEvent*) override;
-  void dropEvent(QDropEvent*) override;
+  void contextMenuEvent(QContextMenuEvent *e) override;
+  void dragEnterEvent(QDragEnterEvent *e) override;
+  void dropEvent(QDropEvent *e) override;

 private:
  void AddActions();
--- a/src/core/application.cpp
+++ b/src/core/application.cpp
@@ -74,6 +74,7 @@
 #include "lyrics/elyricsnetlyricsprovider.h"
 #include "lyrics/letraslyricsprovider.h"
 #include "lyrics/lyricfindlyricsprovider.h"
+#include "lyrics/lrcliblyricsprovider.h"

 #include "scrobbler/audioscrobbler.h"
 #include "scrobbler/lastfmscrobbler.h"
@@ -117,8 +118,8 @@ using namespace std::chrono_literals;

 class ApplicationImpl {
 public:
-  explicit ApplicationImpl(Application *app) :
-       tagreader_client_([app](){
+  explicit ApplicationImpl(Application *app)
+      : tagreader_client_([app]() {
          TagReaderClient *client = new TagReaderClient();
          app->MoveToNewThread(client);
          return client;
@@ -182,6 +183,7 @@ class ApplicationImpl {
          lyrics_providers->AddProvider(new ElyricsNetLyricsProvider(lyrics_providers->network()));
          lyrics_providers->AddProvider(new LetrasLyricsProvider(lyrics_providers->network()));
          lyrics_providers->AddProvider(new LyricFindLyricsProvider(lyrics_providers->network()));
+          lyrics_providers->AddProvider(new LrcLibLyricsProvider(lyrics_providers->network()));
          lyrics_providers->ReloadSettings();
          return lyrics_providers;
        }),
--- a/src/core/database.cpp
+++ b/src/core/database.cpp
@@ -61,8 +61,8 @@ constexpr char kMagicAllSongsTables[] = "%allsongstables";
 int Database::sNextConnectionId = 1;
 QMutex Database::sNextConnectionIdMutex;

-Database::Database(SharedPtr<TaskManager> task_manager, QObject *parent, const QString &database_name) :
-      QObject(parent),
+Database::Database(SharedPtr<TaskManager> task_manager, QObject *parent, const QString &database_name)
+    : QObject(parent),
      task_manager_(task_manager),
      injected_database_name_(database_name),
      query_hash_(0),
@@ -503,7 +503,9 @@ bool Database::IntegrityCheck(const QSqlDatabase &db) {
        break;
      }
      else {
-        if (!error_reported) { Q_EMIT Error(tr("Database corruption detected.")); }
+        if (!error_reported) {
+          Q_EMIT Error(tr("Database corruption detected."));
+        }
        Q_EMIT Error(u"Database: "_s + message);
        error_reported = true;
      }
@@ -594,8 +596,7 @@ void Database::BackupFile(const QString &filename) {
    ret = sqlite3_backup_step(backup, 16);
    const int page_count = sqlite3_backup_pagecount(backup);
    task_manager_->SetTaskProgress(task_id, static_cast<quint64>(page_count - sqlite3_backup_remaining(backup)), static_cast<quint64>(page_count));
-  }
-  while (ret == SQLITE_OK);
+  } while (ret == SQLITE_OK);

  if (ret != SQLITE_DONE) {
    qLog(Error) << "Database backup failed";
--- a/src/core/database.h
+++ b/src/core/database.h
@@ -128,7 +128,6 @@ class Database : public QObject {
  int startup_schema_version_;

  QThread *original_thread_;
-
 };

 #endif  // DATABASE_H
--- a/src/core/filesystemmusicstorage.cpp
+++ b/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();
-  QFileInfo fileInfo(path);
+  const QString path = job.metadata_.url().toLocalFile();
+  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;

 }
--- a/src/core/iconloader.h
+++ b/src/core/iconloader.h
@@ -27,6 +27,7 @@ class IconLoader {
 public:
  static void Init();
  static QIcon Load(const QString &name, const bool system_icon = true, const int fixed_size = 0, const int min_size = 0, const int max_size = 0);
+
 private:
  explicit IconLoader() {}
  static bool system_icons_;
--- a/src/core/localredirectserver.cpp
+++ b/src/core/localredirectserver.cpp
@@ -155,11 +155,7 @@ void LocalRedirectServer::WriteTemplate() const {

  QBuffer image_buffer;
  if (image_buffer.open(QIODevice::ReadWrite)) {
-    QApplication::style()
-        ->standardIcon(QStyle::SP_DialogOkButton)
-        .pixmap(16)
-        .toImage()
-        .save(&image_buffer, "PNG");
+    QApplication::style()->standardIcon(QStyle::SP_DialogOkButton).pixmap(16).toImage().save(&image_buffer, "PNG");
    page_data.replace("@IMAGE_DATA@"_L1, QString::fromUtf8(image_buffer.data().toBase64()));
    image_buffer.close();
  }
--- a/src/core/mainwindow.cpp
+++ b/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
@@ -296,9 +300,6 @@ MainWindow::MainWindow(Application *app,
 #ifdef HAVE_DISCORD_RPC
      discord_rich_presence_(discord_rich_presence),
 #endif
-      error_dialog_([this]() {
-        return new ErrorDialog(this);
-      }),
      console_([app, this]() {
        Console *console = new Console(app->database());
        QObject::connect(console, &Console::Error, this, &MainWindow::ShowErrorDialog);
@@ -627,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);

@@ -700,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);
@@ -908,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));
@@ -980,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")) {
-    restoreGeometry(settings_.value("geometry").toByteArray());
+  if (settings.contains("geometry")) {
+    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);
@@ -1043,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;
@@ -1057,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);

@@ -1228,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);
@@ -1345,8 +1359,11 @@ void MainWindow::SaveSettings() {
  ui_->playlist->view()->SaveSettings();
  app_->scrobbler()->WriteCache();

-  settings_.setValue(MainWindowSettings::kShowSidebar, ui_->action_toggle_show_sidebar->isChecked());
-  settings_.setValue(MainWindowSettings::kSearchForCoverAuto, album_cover_choice_controller_->search_cover_auto_action()->isChecked());
+  Settings s;
+  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();

 }

@@ -1587,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_.setValue(MainWindowSettings::kMinimized, isMinimized());
-  settings_.setValue(MainWindowSettings::kHidden, isHidden());
-  settings_.setValue(MainWindowSettings::kGeometry, saveGeometry());
-  settings_.setValue(MainWindowSettings::kSplitterState, ui_->splitter->saveState());
+  Settings s;
+  s.beginGroup(MainWindowSettings::kSettingsGroup);
+  s.setValue(MainWindowSettings::kMaximized, isMaximized());
+  s.setValue(MainWindowSettings::kMinimized, isMinimized());
+  s.setValue(MainWindowSettings::kHidden, isHidden());
+  s.setValue(MainWindowSettings::kGeometry, saveGeometry());
+  s.setValue(MainWindowSettings::kSplitterState, ui_->splitter->saveState());
+  s.endGroup();

 }

@@ -1745,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) {
@@ -2327,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());

@@ -2337,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;
@@ -2355,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;
@@ -3321,7 +3359,7 @@ void MainWindow::PlaylistDelete() {

  if (DeleteConfirmationDialog::warning(files) != QDialogButtonBox::Yes) return;

-  if (app_->player()->GetState() == EngineBase::State::Playing && app_->playlist_manager()->current()->rowCount() == selected_songs.count()) {
+  if (app_->player()->GetState() == EngineBase::State::Playing && app_->playlist_manager()->current() == app_->playlist_manager()->active() && app_->playlist_manager()->current()->rowCount() == selected_songs.count()) {
    app_->player()->Stop();
  }

@@ -3378,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
+
+}
--- a/src/core/mainwindow.h
+++ b/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,9 +282,9 @@ class MainWindow : public QMainWindow, public PlatformInterface {
 public Q_SLOTS:
  void CommandlineOptionsReceived(const QByteArray &string_options);
  void Raise();
+  void ShowVisualizations();

 private:
-
  void SaveSettings();

  static void ApplyAddBehaviour(const BehaviourSettings::AddBehaviour b, MimeData *mimedata);
@@ -363,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_;
@@ -391,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_;
@@ -415,7 +417,6 @@ class MainWindow : public QMainWindow, public PlatformInterface {
  bool playlists_loaded_;
  bool delete_files_;
  std::optional<CommandlineOptions> options_;
-
 };

 #endif  // MAINWINDOW_H
--- a/src/core/mainwindow.ui
+++ b/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>
--- a/src/core/networkaccessmanager.cpp
+++ b/src/core/networkaccessmanager.cpp
@@ -29,6 +29,7 @@
 #include <QNetworkAccessManager>
 #include <QNetworkRequest>
 #include <QNetworkReply>
+#include <QNetworkInformation>

 #include "networkaccessmanager.h"
 #include "threadsafenetworkdiskcache.h"
@@ -41,6 +42,22 @@ NetworkAccessManager::NetworkAccessManager(QObject *parent)
  setRedirectPolicy(QNetworkRequest::NoLessSafeRedirectPolicy);
  setCache(new ThreadSafeNetworkDiskCache(this));

+  // Handle network state changes after system suspend/resume
+  // QNetworkInformation provides cross-platform network reachability monitoring in Qt 6
+  if (QNetworkInformation::loadDefaultBackend()) {
+    QNetworkInformation *network_info = QNetworkInformation::instance();
+    if (network_info) {
+      QObject::connect(network_info, &QNetworkInformation::reachabilityChanged, this, [this](QNetworkInformation::Reachability reachability) {
+        if (reachability == QNetworkInformation::Reachability::Online) {
+          // Clear connection cache to force reconnection after network becomes available
+          // This fixes issues after system suspend/resume
+          clearConnectionCache();
+          clearAccessCache();
+        }
+      });
+    }
+  }
+
 }

 QNetworkReply *NetworkAccessManager::createRequest(Operation op, const QNetworkRequest &network_request, QIODevice *outgoing_data) {
@@ -50,7 +67,7 @@ QNetworkReply *NetworkAccessManager::createRequest(Operation op, const QNetworkR
    user_agent = network_request.header(QNetworkRequest::UserAgentHeader).toByteArray();
  }
  else {
-    user_agent = QStringLiteral("%1 %2").arg(QCoreApplication::applicationName(), QCoreApplication::applicationVersion()).toUtf8();
+    user_agent = "Strawberry Music Player";
  }

  QNetworkRequest new_network_request(network_request);
--- a/src/core/player.h
+++ b/src/core/player.h
@@ -121,8 +121,8 @@ class Player : public PlayerInterface {
  void PlayPlaylistInternal(const EngineBase::TrackChangeFlags, const Playlist::AutoScroll autoscroll, const QString &playlist_name);

  void FatalError();
-  void ValidSongRequested(const QUrl&);
-  void InvalidSongRequested(const QUrl&);
+  void ValidSongRequested(const QUrl &url);
+  void InvalidSongRequested(const QUrl &url);

  void HandleLoadResult(const UrlHandler::LoadResult &result);

--- a/src/core/qtfslistener.h
+++ b/src/core/qtfslistener.h
@@ -40,7 +40,6 @@ class QtFSListener : public FileSystemWatcherInterface {

 private:
  QFileSystemWatcher watcher_;
-
 };

 #endif  // QTFSLISTENER_H
--- a/src/core/scoped_nsautorelease_pool.h
+++ b/src/core/scoped_nsautorelease_pool.h
@@ -28,6 +28,7 @@ class ScopedNSAutoreleasePool {
  // Only use then when you're certain the items currently in the pool are
  // no longer needed.
  void Recycle();
+
 private:
  NSAutoreleasePool *autorelease_pool_;

--- a/src/core/song.cpp
+++ b/src/core/song.cpp
@@ -353,6 +353,8 @@ struct Song::Private : public QSharedData {
  std::optional<double> ebur128_integrated_loudness_lufs_;
  std::optional<double> ebur128_loudness_range_lu_;

+  int id3v2_version_;  // ID3v2 tag version (3 or 4), 0 if not applicable or unknown
+
  bool init_from_file_;         // Whether this song was loaded from a file using taglib.
  bool suspicious_tags_;        // Whether our encoding guesser thinks these tags might be incorrectly encoded.

@@ -400,6 +402,8 @@ Song::Private::Private(const Source source)
      rating_(-1),
      bpm_(-1),

+      id3v2_version_(0),
+
      init_from_file_(false),
      suspicious_tags_(false)

@@ -510,6 +514,8 @@ const QString &Song::musicbrainz_work_id() const { return d->musicbrainz_work_id
 std::optional<double> Song::ebur128_integrated_loudness_lufs() const { return d->ebur128_integrated_loudness_lufs_; }
 std::optional<double> Song::ebur128_loudness_range_lu() const { return d->ebur128_loudness_range_lu_; }

+int Song::id3v2_version() const { return d->id3v2_version_; }
+
 QString *Song::mutable_title() { return &d->title_; }
 QString *Song::mutable_album() { return &d->album_; }
 QString *Song::mutable_artist() { return &d->artist_; }
@@ -624,6 +630,8 @@ void Song::set_musicbrainz_work_id(const QString &v) { d->musicbrainz_work_id_ =
 void Song::set_ebur128_integrated_loudness_lufs(const std::optional<double> v) { d->ebur128_integrated_loudness_lufs_ = v; }
 void Song::set_ebur128_loudness_range_lu(const std::optional<double> v) { d->ebur128_loudness_range_lu_ = v; }

+void Song::set_id3v2_version(const int v) { d->id3v2_version_ = v; }
+
 void Song::set_init_from_file(const bool v) { d->init_from_file_ = v; }

 void Song::set_stream_url(const QUrl &v) { d->stream_url_ = v; }
@@ -797,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 {
@@ -818,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) {
@@ -833,6 +841,10 @@ bool Song::save_embedded_cover_supported(const FileType filetype) {

 }

+bool Song::id3v2_tags_supported() const {
+  return d->filetype_ == FileType::MPEG || d->filetype_ == FileType::WAV || d->filetype_ == FileType::AIFF;
+}
+
 int Song::ColumnIndex(const QString &field) {

  return static_cast<int>(kRowIdColumns.indexOf(field));
@@ -2150,4 +2162,3 @@ QString Song::GetNameForNewPlaylist(const SongList &songs) {
  return result;

 }
-
--- a/src/core/song.h
+++ b/src/core/song.h
@@ -234,6 +234,8 @@ class Song {
  std::optional<double> ebur128_integrated_loudness_lufs() const;
  std::optional<double> ebur128_loudness_range_lu() const;

+  int id3v2_version() const;
+
  QString *mutable_title();
  QString *mutable_album();
  QString *mutable_artist();
@@ -349,6 +351,8 @@ class Song {
  void set_ebur128_integrated_loudness_lufs(const std::optional<double> v);
  void set_ebur128_loudness_range_lu(const std::optional<double> v);

+  void set_id3v2_version(const int v);
+
  void set_init_from_file(const bool v);

  void set_stream_url(const QUrl &v);
@@ -439,6 +443,8 @@ class Song {
  static bool save_embedded_cover_supported(const FileType filetype);
  bool save_embedded_cover_supported() const { return url().isLocalFile() && save_embedded_cover_supported(filetype()) && !has_cue(); };

+  bool id3v2_tags_supported() const;
+
  static int ColumnIndex(const QString &field);
  static QString JoinSpec(const QString &table);

--- a/src/core/songloader.cpp
+++ b/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()) {
@@ -784,4 +796,3 @@ void SongLoader::CleanupPipeline() {
  state_ = State::Finished;

 }
-
--- a/src/core/songloader.h
+++ b/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);
@@ -171,7 +172,6 @@ class SongLoader : public QObject {
  QStringList errors_;

  bool success_;
-
 };

 #endif  // SONGLOADER_H
--- a/src/core/songmimedata.h
+++ b/src/core/songmimedata.h
@@ -41,4 +41,3 @@ class SongMimeData : public MimeData {
 };

 #endif  // SONGMIMEDATA_H
-
--- a/src/core/translations.cpp
+++ b/src/core/translations.cpp
@@ -41,17 +41,19 @@ Translations::~Translations() {

 }

-void Translations::LoadTranslation(const QString &prefix, const QString &path, const QString &language) {
+bool Translations::LoadTranslation(const QString &prefix, const QString &path, const QString &language) {

  const QString basefilename = prefix + u'_' + language;
  QTranslator *t = new QTranslator;
-  if (t->load(basefilename, path)) {
+  if (!t->load(basefilename, path)) {
+    delete t;
+    return false;
+  }
+
  qLog(Debug) << "Tranlations loaded from" << basefilename;
  QCoreApplication::installTranslator(t);
  translations_ << t;
-  }
-  else {
-    delete t;
-  }
+
+  return true;

 }
--- a/src/core/translations.h
+++ b/src/core/translations.h
@@ -31,7 +31,7 @@ class Translations {
 public:
  explicit Translations();
  ~Translations();
-  void LoadTranslation(const QString &prefix, const QString &path, const QString &language);
+  bool LoadTranslation(const QString &prefix, const QString &path, const QString &language);

 private:
  QList<QTranslator*> translations_;
--- a/src/core/urlhandler.cpp
+++ b/src/core/urlhandler.cpp
@@ -53,4 +53,3 @@ UrlHandler::LoadResult::LoadResult(const QUrl &media_url, const Type type, const
      bit_depth_(-1),
      length_nanosec_(-1),
      error_(error) {}
-
--- a/src/core/urlhandler.h
+++ b/src/core/urlhandler.h
@@ -89,7 +89,6 @@ class UrlHandler : public QObject {

 Q_SIGNALS:
  void AsyncLoadComplete(const UrlHandler::LoadResult &result);
-
 };

 #endif  // URLHANDLER_H
--- a/src/covermanager/albumcoverchoicecontroller.cpp
+++ b/src/covermanager/albumcoverchoicecontroller.cpp
@@ -812,8 +812,8 @@ QUrl AlbumCoverChoiceController::SaveCoverAutomatic(Song *song, const AlbumCover
        SaveCoverEmbeddedToCollectionSongs(*song, result);
        break;
      }
-    }
      [[fallthrough]];
+    }
    case CoverOptions::CoverType::Cache:
    case CoverOptions::CoverType::Album:{
      cover_url = SaveCoverToFileAutomatic(song, result);
--- a/src/covermanager/albumcoverexporter.h
+++ b/src/covermanager/albumcoverexporter.h
@@ -75,4 +75,3 @@ class AlbumCoverExporter : public QObject {
 };

 #endif  // ALBUMCOVEREXPORTER_H
-
--- a/src/covermanager/albumcoverfetchersearch.h
+++ b/src/covermanager/albumcoverfetchersearch.h
@@ -113,7 +113,6 @@ class AlbumCoverFetcherSearch : public QObject {
  SharedPtr<NetworkAccessManager> network_;

  bool cancel_requested_;
-
 };

 #endif  // ALBUMCOVERFETCHERSEARCH_H
--- a/src/covermanager/albumcoverloaderoptions.cpp
+++ b/src/covermanager/albumcoverloaderoptions.cpp
@@ -58,5 +58,4 @@ AlbumCoverLoaderOptions::Types AlbumCoverLoaderOptions::LoadTypes() {
  s.endGroup();

  return cover_types;
-
 }
--- a/src/covermanager/albumcoverloaderresult.h
+++ b/src/covermanager/albumcoverloaderresult.h
@@ -44,8 +44,8 @@ class AlbumCoverLoaderResult {
                                  const AlbumCoverImageResult &_album_cover = AlbumCoverImageResult(),
                                  const QImage &_image_scaled = QImage(),
                                  const QUrl &_art_manual_updated = QUrl(),
-                                  const QUrl &_art_automatic_updated = QUrl()) :
-                                  success(_success),
+                                  const QUrl &_art_automatic_updated = QUrl())
+      : success(_success),
        type(_type),
        album_cover(_album_cover),
        image_scaled(_image_scaled),
--- a/src/covermanager/albumcovermanager.cpp
+++ b/src/covermanager/albumcovermanager.cpp
@@ -102,7 +102,7 @@ using std::make_shared;
 namespace {
 constexpr char kSettingsGroup[] = "CoverManager";
 constexpr int kThumbnailSize = 120;
-}
+}  // namespace

 AlbumCoverManager::AlbumCoverManager(const SharedPtr<NetworkAccessManager> network,
                                     const SharedPtr<CollectionBackend> collection_backend,
@@ -604,10 +604,7 @@ void AlbumCoverManager::AlbumCoverFetched(const quint64 id, const AlbumCoverImag

 void AlbumCoverManager::UpdateStatusText() {

-  QString message = tr("Got %1 covers out of %2 (%3 failed)")
-                        .arg(fetch_statistics_.chosen_images_)
-                        .arg(jobs_)
-                        .arg(fetch_statistics_.missing_images_);
+  QString message = tr("Got %1 covers out of %2 (%3 failed)").arg(fetch_statistics_.chosen_images_).arg(jobs_).arg(fetch_statistics_.missing_images_);

  if (fetch_statistics_.bytes_transferred_ > 0) {
    message += ", "_L1 + tr("%1 transferred").arg(Utilities::PrettySize(fetch_statistics_.bytes_transferred_));
@@ -1083,10 +1080,7 @@ void AlbumCoverManager::UpdateExportStatus(const int exported, const int skipped

  progress_bar_->setValue(exported);

-  QString message = tr("Exported %1 covers out of %2 (%3 skipped)")
-                        .arg(exported)
-                        .arg(max)
-                        .arg(skipped);
+  QString message = tr("Exported %1 covers out of %2 (%3 skipped)").arg(exported).arg(max).arg(skipped);
  statusBar()->showMessage(message);

  // End of the current process
@@ -1131,4 +1125,3 @@ void AlbumCoverManager::SaveEmbeddedCoverFinished(TagReaderReplyPtr reply, Album
  LoadAlbumCoverAsync(album_item);

 }
-
--- a/src/covermanager/albumcoversearcher.h
+++ b/src/covermanager/albumcoversearcher.h
@@ -83,7 +83,7 @@ class AlbumCoverSearcher : public QDialog {
  AlbumCoverImageResult Exec(const QString &artist, const QString &album);

 protected:
-  void keyPressEvent(QKeyEvent*) override;
+  void keyPressEvent(QKeyEvent *e) override;

 private Q_SLOTS:
  void Search();
--- a/src/covermanager/coversearchstatisticsdialog.cpp
+++ b/src/covermanager/coversearchstatisticsdialog.cpp
@@ -45,8 +45,7 @@ CoverSearchStatisticsDialog::CoverSearchStatisticsDialog(QWidget *parent)
  details_layout_ = new QVBoxLayout(ui_->details);
  details_layout_->setSpacing(0);

-  setStyleSheet(
-      u"#details {"
+  setStyleSheet(u"#details {"
                "  background-color: palette(base);"
                "}"
                "#details QLabel[type=\"label\"] {"
@@ -67,10 +66,7 @@ void CoverSearchStatisticsDialog::Show(const CoverSearchStatistics &statistics)
  QStringList providers(statistics.total_images_by_provider_.keys());
  std::sort(providers.begin(), providers.end());

-  ui_->summary->setText(tr("Got %1 covers out of %2 (%3 failed)")
-          .arg(statistics.chosen_images_)
-          .arg(statistics.chosen_images_ + statistics.missing_images_)
-          .arg(statistics.missing_images_));
+  ui_->summary->setText(tr("Got %1 covers out of %2 (%3 failed)").arg(statistics.chosen_images_).arg(statistics.chosen_images_ + statistics.missing_images_).arg(statistics.missing_images_));

  for (const QString &provider : std::as_const(providers)) {
    AddLine(tr("Covers from %1").arg(provider), QString::number(statistics.chosen_images_by_provider_[provider]));
--- a/src/device/cddadevice.cpp
+++ b/src/device/cddadevice.cpp
@@ -138,4 +138,3 @@ void CDDADevice::SongLoadingFinished() {
  WatchForDiscChanges(true);

 }
-
--- a/src/device/cddalister.cpp
+++ b/src/device/cddalister.cpp
@@ -159,3 +159,11 @@ bool CDDALister::Init() {
  return true;

 }
+
+bool CDDALister::AskForScan(const QString &id) const {
+
+  Q_UNUSED(id)
+
+  return false;
+
+}
--- a/src/device/cddalister.h
+++ b/src/device/cddalister.h
@@ -47,11 +47,11 @@ class CDDALister : public DeviceLister {
  quint64 DeviceCapacity(const QString &id) override;
  quint64 DeviceFreeSpace(const QString &id) override;
  QVariantMap DeviceHardwareInfo(const QString &id) override;
-  bool AskForScan(const QString&) const override { return false; }
-  QString MakeFriendlyName(const QString&) override;
-  QList<QUrl> MakeDeviceUrls(const QString&) override;
-  void UnmountDevice(const QString&) override;
-  void UpdateDeviceFreeSpace(const QString&) override;
+  bool AskForScan(const QString &id) const override;
+  QString MakeFriendlyName(const QString &id) override;
+  QList<QUrl> MakeDeviceUrls(const QString &id) override;
+  void UnmountDevice(const QString &id) override;
+  void UpdateDeviceFreeSpace(const QString &id) override;
  bool Init() override;
  bool CopyMusic() override { return false; }

--- a/src/device/devicedatabasebackend.cpp
+++ b/src/device/devicedatabasebackend.cpp
@@ -227,8 +227,7 @@ void DeviceDatabaseBackend::SetDeviceOptions(const int id, const QString &friend
  QSqlDatabase db(db_->Connect());

  SqlQuery q(db);
-  q.prepare(QStringLiteral(
-      "UPDATE devices"
+  q.prepare(QStringLiteral("UPDATE devices"
                           " SET friendly_name=:friendly_name,"
                           "     icon=:icon_name,"
                           "     transcode_mode=:transcode_mode,"
--- a/src/device/devicedatabasebackend.h
+++ b/src/device/devicedatabasebackend.h
@@ -77,7 +77,6 @@ class DeviceDatabaseBackend : public QObject {
 private:
  SharedPtr<Database> db_;
  QThread *original_thread_;
-
 };

 #endif  // DEVICEDATABASEBACKEND_H
--- a/src/device/deviceview.h
+++ b/src/device/deviceview.h
@@ -61,7 +61,6 @@ class DeviceItemDelegate : public CollectionItemDelegate {
  static const int kIconPadding;

  void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &idx) const override;
-
 };

 class DeviceView : public AutoExpandingTreeView {
@@ -80,7 +79,7 @@ class DeviceView : public AutoExpandingTreeView {
  bool CanRecursivelyExpand(const QModelIndex &idx) const override;

 protected:
-  void contextMenuEvent(QContextMenuEvent*) override;
+  void contextMenuEvent(QContextMenuEvent *e) override;
  void mouseDoubleClickEvent(QMouseEvent *e) override;

 private Q_SLOTS:
--- a/src/device/giolister.cpp
+++ b/src/device/giolister.cpp
@@ -160,7 +160,10 @@ QVariantList GioLister::DeviceIcons(const QString &id) {

 }

-QString GioLister::DeviceManufacturer(const QString &id) { Q_UNUSED(id); return QString(); }
+QString GioLister::DeviceManufacturer(const QString &id) {
+  Q_UNUSED(id);
+  return QString();
+}

 QString GioLister::DeviceModel(const QString &id) {

--- a/src/device/giolister.h
+++ b/src/device/giolister.h
@@ -119,8 +119,8 @@ class GioLister : public DeviceLister {
  static void VolumeAddedCallback(GVolumeMonitor *volume_monitor, GVolume *volume, gpointer instance);
  static void VolumeRemovedCallback(GVolumeMonitor *volume_monitor, GVolume *volume, gpointer instance);

-  static void MountAddedCallback(GVolumeMonitor *volume_monitor, GMount*, gpointer instance);
-  static void MountChangedCallback(GVolumeMonitor *volume_monitor, GMount*, gpointer instance);
+  static void MountAddedCallback(GVolumeMonitor *volume_monitor, GMount *mount, gpointer instance);
+  static void MountChangedCallback(GVolumeMonitor *volume_monitor, GMount *mount, gpointer instance);
  static void MountRemovedCallback(GVolumeMonitor *volume_monitor, GMount *mount, gpointer instance);

  static void VolumeMountFinished(GObject *object, GAsyncResult *result, gpointer instance);
--- a/src/device/mtploader.h
+++ b/src/device/mtploader.h
@@ -64,7 +64,6 @@ class MtpLoader : public QObject {
  ScopedPtr<MtpConnection> connection_;
  QThread *original_thread_;
  bool abort_;
-
 };

 #endif  // MTPLOADER_H
--- a/src/device/udisks2lister.cpp
+++ b/src/device/udisks2lister.cpp
@@ -411,10 +411,7 @@ Udisks2Lister::PartitionData Udisks2Lister::ReadPartitionData(const QDBusObjectP
 }

 QString Udisks2Lister::PartitionData::unique_id() const {
-  return u"Udisks2/%1/%2/%3/%4/%5"_s
-      .arg(serial, vendor, model)
-      .arg(capacity)
-      .arg(uuid);
+  return u"Udisks2/%1/%2/%3/%4/%5"_s.arg(serial, vendor, model).arg(capacity).arg(uuid);
 }

 Udisks2Lister::Udisks2Job::Udisks2Job() : is_mount(true) {}
--- a/src/dialogs/about.cpp
+++ b/src/dialogs/about.cpp
@@ -127,8 +127,9 @@ QString About::MainHtml() const {
  ret += "<p>"_L1;
  ret += tr("If you like Strawberry and can make use of it, consider sponsoring or donating.");
  ret += "<br />"_L1;
-  ret += tr("You can sponsor the author on %1. You can also make a one-time payment through %2.").arg(
-    QStringLiteral("<a style=\"color:%1;\" href=\"https://github.com/sponsors/jonaski\">GitHub sponsors</a>").arg(palette().text().color().name()),
+  ret += tr("You can sponsor the author on %1 or %2. You can also make a one-time payment through %3.").arg(
+    QStringLiteral("<a style=\"color:%1;\" href=\"https://www.patreon.com/jonaskvinge\">Patreon</a>").arg(palette().text().color().name()),
+    QStringLiteral("<a style=\"color:%1;\" href=\"https://github.com/sponsors/jonaski\">GitHub</a>").arg(palette().text().color().name()),
    QStringLiteral("<a style=\"color:%1;\" href=\"https://paypal.me/jonaskvinge\">paypal.me/jonaskvinge</a>").arg(palette().text().color().name())
  );

--- a/src/dialogs/edittagdialog.cpp
+++ b/src/dialogs/edittagdialog.cpp
@@ -71,6 +71,7 @@
 #include <QSettings>
 #include <QMimeData>

+#include "constants/timeconstants.h"
 #include "core/iconloader.h"
 #include "core/logging.h"
 #include "core/settings.h"
@@ -80,6 +81,7 @@
 #include "utilities/coverutils.h"
 #include "utilities/coveroptions.h"
 #include "tagreader/tagreaderclient.h"
+#include "tagreader/tagid3v2version.h"
 #include "widgets/busyindicator.h"
 #include "widgets/lineedit.h"
 #include "collection/collectionbackend.h"
@@ -103,14 +105,29 @@
 using std::make_shared;
 using namespace Qt::Literals::StringLiterals;

+#ifdef __clang__
+#  pragma clang diagnostic push
+#  pragma clang diagnostic ignored "-Wunused-const-variable"
+#endif
+
 namespace {
 constexpr char kSettingsGroup[] = "EditTagDialog";
 constexpr int kSmallImageSize = 128;
+
+// ID3v2 version constants
+constexpr int kID3v2_Version_3 = 3;
+constexpr int kID3v2_Version_4 = 4;
+constexpr int kComboBoxIndex_ID3v2_3 = 0;
+constexpr int kComboBoxIndex_ID3v2_4 = 1;
 }  // namespace

 const char EditTagDialog::kTagsDifferentHintText[] = QT_TR_NOOP("(different across multiple songs)");
 const char EditTagDialog::kArtDifferentHintText[] = QT_TR_NOOP("Different art across multiple songs.");

+#ifdef __clang_
+#  pragma clang diagnostic pop
+#endif
+
 EditTagDialog::EditTagDialog(const SharedPtr<NetworkAccessManager> network,
                             const SharedPtr<TagReaderClient> tagreader_client,
                             const SharedPtr<CollectionBackend> collection_backend,
@@ -707,6 +724,9 @@ void EditTagDialog::SelectionChanged() {
  bool titlesort_enabled = false;
  bool artistsort_enabled = false;
  bool albumsort_enabled = false;
+  bool has_id3v2_support = false;
+  int id3v2_version = 0;
+  bool id3v2_version_different = false;
  for (const QModelIndex &idx : indexes) {
    if (data_.value(idx.row()).cover_action_ == UpdateCoverAction::None) {
      data_[idx.row()].cover_result_ = AlbumCoverImageResult();
@@ -768,6 +788,15 @@ void EditTagDialog::SelectionChanged() {
    if (song.albumsort_supported()) {
      albumsort_enabled = true;
    }
+    if (song.id3v2_tags_supported()) {
+      has_id3v2_support = true;
+      if (id3v2_version == 0) {
+        id3v2_version = song.id3v2_version();
+      }
+      else if (id3v2_version != song.id3v2_version()) {
+        id3v2_version_different = true;
+      }
+    }
  }

  QString summary;
@@ -839,6 +868,23 @@ void EditTagDialog::SelectionChanged() {
  ui_->artistsort->setEnabled(artistsort_enabled);
  ui_->albumsort->setEnabled(albumsort_enabled);

+  ui_->label_id3v2_version->setVisible(has_id3v2_support);
+  ui_->combobox_id3v2_version->setVisible(has_id3v2_support);
+
+  if (has_id3v2_support) {
+    // Set default based on existing version(s)
+    if (id3v2_version_different || id3v2_version == 0) {
+      // Mixed versions or unknown - default to ID3v2.4
+      ui_->combobox_id3v2_version->setCurrentIndex(kComboBoxIndex_ID3v2_4);
+    }
+    else if (id3v2_version == kID3v2_Version_3) {
+      ui_->combobox_id3v2_version->setCurrentIndex(kComboBoxIndex_ID3v2_3);
+    }
+    else {
+      ui_->combobox_id3v2_version->setCurrentIndex(kComboBoxIndex_ID3v2_4);
+    }
+  }
+
 }

 void EditTagDialog::UpdateUI(const QModelIndexList &indexes) {
@@ -1370,6 +1416,13 @@ void EditTagDialog::SaveData() {
        }
        save_tag_cover_data.cover_data = ref.cover_result_.image_data;
      }
+
+      // Determine ID3v2 version based on user selection
+      TagID3v2Version tag_id3v2_version = TagID3v2Version::Default;
+      if (ref.current_.filetype() == Song::FileType::MPEG || ref.current_.filetype() == Song::FileType::WAV || ref.current_.filetype() == Song::FileType::AIFF) {
+        tag_id3v2_version = ui_->combobox_id3v2_version->currentIndex() == kComboBoxIndex_ID3v2_3 ? TagID3v2Version::V3 : TagID3v2Version::V4;
+      }
+
      TagReaderClient::SaveOptions save_tags_options;
      if (save_tags) {
        save_tags_options |= TagReaderClient::SaveOption::Tags;
@@ -1383,7 +1436,7 @@ void EditTagDialog::SaveData() {
      if (save_embedded_cover) {
        save_tags_options |= TagReaderClient::SaveOption::Cover;
      }
-      TagReaderReplyPtr reply = tagreader_client_->WriteFileAsync(ref.current_.url().toLocalFile(), ref.current_, save_tags_options, save_tag_cover_data);
+      TagReaderReplyPtr reply = tagreader_client_->WriteFileAsync(ref.current_.url().toLocalFile(), ref.current_, save_tags_options, save_tag_cover_data, tag_id3v2_version);
      SharedPtr<QMetaObject::Connection> connection = make_shared<QMetaObject::Connection>();
      *connection = QObject::connect(&*reply, &TagReaderReply::Finished, this, [this, reply, ref, connection]() {
        SongSaveTagsComplete(reply, ref.current_.url().toLocalFile(), ref.current_, ref.cover_action_);
@@ -1520,7 +1573,7 @@ void EditTagDialog::FetchLyrics() {
  const Song song = data_.value(ui_->song_list->selectionModel()->selectedIndexes().first().row()).current_;
  lyrics_fetcher_->Clear();
  ui_->lyrics->setPlainText(tr("loading..."));
-  lyrics_id_ = static_cast<qint64>(lyrics_fetcher_->Search(song.effective_albumartist(), song.artist(), song.album(), song.title()));
+  lyrics_id_ = static_cast<qint64>(lyrics_fetcher_->Search(song.effective_albumartist(), song.artist(), song.album(), song.title(), song.length_nanosec() / kNsecPerSec));

 }

--- a/src/dialogs/edittagdialog.ui
+++ b/src/dialogs/edittagdialog.ui
@@ -650,6 +650,47 @@
                  </property>
                 </widget>
                </item>
+                <item>
+                 <layout class="QHBoxLayout" name="layout_id3v2_version">
+                  <item>
+                   <widget class="QLabel" name="label_id3v2_version">
+                    <property name="text">
+                     <string>ID3v2 version:</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item>
+                   <widget class="QComboBox" name="combobox_id3v2_version">
+                    <property name="enabled">
+                     <bool>true</bool>
+                    </property>
+                    <item>
+                     <property name="text">
+                      <string>2.3</string>
+                     </property>
+                    </item>
+                    <item>
+                     <property name="text">
+                      <string>2.4</string>
+                     </property>
+                    </item>
+                   </widget>
+                  </item>
+                  <item>
+                   <spacer name="spacer_id3v2_version">
+                    <property name="orientation">
+                     <enum>Qt::Horizontal</enum>
+                    </property>
+                    <property name="sizeHint" stdset="0">
+                     <size>
+                      <width>0</width>
+                      <height>0</height>
+                     </size>
+                    </property>
+                   </spacer>
+                  </item>
+                 </layout>
+                </item>
                <item>
                 <spacer name="spacer_albumart_bottom">
                  <property name="orientation">
--- a/src/dialogs/errordialog.cpp
+++ b/src/dialogs/errordialog.cpp
@@ -24,6 +24,7 @@
 #include <utility>

 #include <QWidget>
+#include <QApplication>
 #include <QString>
 #include <QIcon>
 #include <QPalette>
@@ -40,9 +41,8 @@

 using namespace Qt::Literals::StringLiterals;

-ErrorDialog::ErrorDialog(QWidget *mainwindow, QWidget *parent)
+ErrorDialog::ErrorDialog(QWidget *parent)
    : QDialog(parent),
-      mainwindow_(mainwindow),
      ui_(new Ui_ErrorDialog) {

  ui_->setupUi(this);
@@ -64,8 +64,9 @@ ErrorDialog::~ErrorDialog() {

 void ErrorDialog::ShowDialog() {

-  if (screen() && mainwindow_->screen() && screen() != mainwindow_->screen()) {
-    Utilities::CenterWidgetOnScreen(mainwindow_->screen(), this);
+  QWidget *active_window = QApplication::activeWindow();
+  if (active_window && screen() && active_window->screen() && screen() != active_window->screen()) {
+    Utilities::CenterWidgetOnScreen(active_window->screen(), this);
  }
  setWindowState((windowState() & ~Qt::WindowMinimized) | Qt::WindowActive);
  show();
@@ -81,7 +82,7 @@ void ErrorDialog::ShowMessage(const QString &message) {
  current_messages_ << message;
  UpdateContent();

-  if (mainwindow_->isActiveWindow()) {
+  if (QApplication::activeWindow()) {
    ShowDialog();
  }
  else if (!isVisible()) {
--- a/src/dialogs/errordialog.h
+++ b/src/dialogs/errordialog.h
@@ -37,7 +37,7 @@ class ErrorDialog : public QDialog {
  Q_OBJECT

 public:
-  explicit ErrorDialog(QWidget *mainwindow, QWidget *parent = nullptr);
+  explicit ErrorDialog(QWidget *parent = nullptr);
  ~ErrorDialog() override;

 public Q_SLOTS:
@@ -50,7 +50,6 @@ class ErrorDialog : public QDialog {
 private:
  void UpdateContent();

-  QWidget *mainwindow_;
  Ui_ErrorDialog *ui_;

  QStringList current_messages_;
--- a/src/discord/richpresence.cpp
+++ b/src/discord/richpresence.cpp
@@ -1,5 +1,6 @@
 /*
 * Strawberry Music Player
+ * Copyright 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
@@ -105,7 +106,7 @@ void RichPresence::CurrentSongChanged(const Song &song) {

  SetTimestamp(0LL);
  activity_.length_secs = song.length_nanosec() / kNsecPerSec;
-  activity_.title = song.title();
+  activity_.title = song.PrettyTitle();
  activity_.artist = song.artist();
  activity_.album = song.album();

--- a/src/discord/richpresence.h
+++ b/src/discord/richpresence.h
@@ -1,5 +1,6 @@
 /*
 * Strawberry Music Player
+ * Copyright 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
--- a/Show More
+++ b/Show More