Release 1.2.17

Also pass the filter column enum through to filter tree instead of string.

.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:   ''

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1 @@
+blank_issues_enabled: false

.github/workflows/build.yml

@@ -10,29 +10,29 @@ jobs:
 
   build-opensuse:
     name: Build openSUSE
-    if: github.repository != 'strawberrymusicplayer/strawberry-private'
+    if: github.repository != 'strawberrymusicplayer/strawberry-private' && github.ref != 'refs/heads/l10n_master'
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        opensuse_version: [ 'tumbleweed', 'leap:15.6' ]
+        opensuse_version: [ 'tumbleweed', 'leap:15.6', 'leap:16.0' ]
     container:
       image: opensuse/${{matrix.opensuse_version}}
     steps:
       - name: Refresh repositories
         run: zypper -n --gpg-auto-import-keys ref
-      - name: Upgrade packages
+      - name: Upgrade packages (Tumbleweed)
         if: matrix.opensuse_version == 'tumbleweed'
         run: zypper -n --gpg-auto-import-keys dup
-      - name: Upgrade packages
+      - name: Upgrade packages (Leap)
         if: matrix.opensuse_version != 'tumbleweed'
         run: zypper -n --gpg-auto-import-keys up
       - name: Install gcc
-        if: matrix.opensuse_version == 'tumbleweed'
+        if: matrix.opensuse_version != 'leap:15.6'
         run: zypper -n --gpg-auto-import-keys in gcc gcc-c++
-      - name: Install gcc 13
-        if: matrix.opensuse_version != 'tumbleweed'
-        run: zypper -n --gpg-auto-import-keys in gcc13 gcc13-c++
+      - name: Install gcc (leap:15.6)
+        if: matrix.opensuse_version == 'leap:15.6'
+        run: zypper -n --gpg-auto-import-keys in gcc14 gcc14-c++
       - name: Install packages
         run: >
             zypper -n --gpg-auto-import-keys in
@@ -42,22 +42,18 @@ jobs:
             tar
             make
             cmake
-            gettext-tools
             openssh-clients
             glibc-devel
             libboost_headers-devel
             boost-devel
             glib2-devel
             glib2-tools
-            dbus-1-devel
             alsa-devel
             libnotify-devel
-            protobuf-devel
             sqlite3-devel
             libpulse-devel
             gstreamer-devel
             gstreamer-plugins-base-devel
-            vlc-devel
             taglib-devel
             libicu-devel
             libcdio-devel
@@ -72,6 +68,7 @@ jobs:
             hicolor-icon-theme
             qt6-core-devel
             qt6-gui-devel
+            qt6-gui-private-devel
             qt6-widgets-devel
             qt6-concurrent-devel
             qt6-network-devel
@@ -81,11 +78,26 @@ jobs:
             qt6-base-common-devel
             qt6-sql-sqlite
             qt6-linguist-devel
+            gtest
+            gmock
+            sparsehash-devel
+            rapidjson-devel
       - name: Install kdsingleapplication-qt6-devel
-        if: matrix.opensuse_version == 'tumbleweed'
+        if: matrix.opensuse_version != 'leap:15.6'
         run: zypper -n --gpg-auto-import-keys in kdsingleapplication-qt6-devel
+      - name: Build and install KDSingleApplication
+        if: matrix.opensuse_version == 'leap:15.6'
+        env:
+          CC: gcc-14
+          CXX: g++-14
+        run: |
+          git clone --depth 1 --recurse-submodules https://github.com/KDAB/KDSingleApplication
+          cd KDSingleApplication
+          cmake -S . -B build -DCMAKE_BUILD_TYPE="Release" -DBUILD_SHARED_LIBS=OFF -DBUILD_STATIC_LIBS=ON -DKDSingleApplication_STATIC=ON
+          cmake --build build --config Release --parallel 4
+          cmake --install build
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
           submodules: recursive
@@ -94,7 +106,7 @@ jobs:
       - name: Create Build Environment
         run: cmake -E make_directory build
       - name: Configure CMake
-        run: cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug -DBUILD_WERROR=ON -DUSE_TAGLIB=ON
+        run: cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug -DBUILD_WERROR=ON
       - name: Create source tarball
         working-directory: build
         run: ../dist/scripts/maketarball.sh
@@ -103,30 +115,33 @@ jobs:
       - name: Copy source tarball
         working-directory: build
         run: cp strawberry-*.tar.xz /usr/src/packages/SOURCES/
-      - name: Build RPM (Tumbleweed)
-        if: matrix.opensuse_version == 'tumbleweed'
-        working-directory: build
-        run: rpmbuild -ba ../dist/unix/strawberry.spec
-      - name: Build RPM (Leap)
-        if: matrix.opensuse_version != 'tumbleweed'
-        working-directory: build
+      - name: Build RPM
+        if: matrix.opensuse_version != 'leap:15.6'
         env:
-          CC: gcc-13
-          CXX: g++-13
-        run: rpmbuild -ba ../dist/unix/strawberry.spec
+          RPM_BUILD_NCPUS: 4
+        working-directory: build
+        run: rpmbuild -ba strawberry.spec
+      - name: Build RPM (leap:15.6)
+        if: matrix.opensuse_version == 'leap:15.6'
+        env:
+          RPM_BUILD_NCPUS: 4
+          CC: gcc-14
+          CXX: g++-14
+        working-directory: build
+        run: rpmbuild -ba strawberry.spec
       - name: Set subdir
         id: set-subdir
         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: |
@@ -136,12 +151,12 @@ jobs:
 
   build-fedora:
     name: Build Fedora
-    if: github.repository != 'strawberrymusicplayer/strawberry-private'
+    if: github.repository != 'strawberrymusicplayer/strawberry-private' && github.ref != 'refs/heads/l10n_master'
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        fedora_version: [ '39', '40', '41' ]
+        fedora_version: [ '42', '43', '44' ]
     container:
       image: fedora:${{matrix.fedora_version}}
     steps:
@@ -153,7 +168,7 @@ jobs:
         run: >
             dnf -y install
             @development-tools
-            redhat-lsb-core
+            lsb_release
             which
             git
             glibc
@@ -165,13 +180,9 @@ jobs:
             glib
             man
             tar
-            gettext
             openssh
             rsync
             boost-devel
-            dbus-devel
-            protobuf-devel
-            protobuf-compiler
             sqlite-devel
             alsa-lib-devel
             pulseaudio-libs-devel
@@ -193,8 +204,12 @@ jobs:
             libappstream-glib
             hicolor-icon-theme
             kdsingleapplication-qt6-devel
+            gtest-devel
+            gmock-devel
+            sparsehash-devel
+            rapidjson-devel
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
           submodules: recursive
@@ -215,11 +230,11 @@ jobs:
         run: cp strawberry-*.tar.xz ~/rpmbuild/SOURCES/
       - name: Build RPM
         env:
-          RPM_BUILD_NCPUS: "2"
+          RPM_BUILD_NCPUS: 4
         working-directory: build
-        run: rpmbuild -ba ../dist/unix/strawberry.spec
+        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: |
@@ -229,7 +244,7 @@ jobs:
 
   build-openmandriva:
     name: Build OpenMandriva
-    if: github.repository != 'strawberrymusicplayer/strawberry-private' && false
+    if: github.repository != 'strawberrymusicplayer/strawberry-private' && github.ref != 'refs/heads/l10n_master'
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -244,35 +259,30 @@ jobs:
         run: >
           dnf install -y
           which
-          glibc
           gcc-c++
           git
           gnutar
           make
           cmake
-          glib
-          gettext
           lsb-release
           rpmdevtools
           rpm-build
           glibc-devel
           boost-devel
-          dbus-devel
-          protobuf-devel
-          protobuf-compiler
-          sqlite-devel
-          libasound-devel
-          pulseaudio-devel
-          libGL-devel
-          libgst-plugins-base1.0-devel
-          taglib-devel
-          chromaprint-devel
-          libebur128-devel
-          fftw-devel
-          icu-devel
-          libcdio-devel
-          libgpod-devel
-          libmtp-devel
+          lib64glib2.0-devel
+          lib64asound-devel
+          lib64pulseaudio-devel
+          lib64sqlite3-devel
+          lib64gstreamer-devel
+          lib64gst-plugins-base1.0-devel
+          lib64taglib-devel
+          lib64chromaprint-devel
+          lib64ebur128-devel
+          lib64fftw-devel
+          lib64icu-devel
+          lib64cdio-devel
+          lib64gpod-devel
+          lib64mtp-devel
           lib64Qt6Core-devel
           lib64Qt6Concurrent-devel
           lib64Qt6Network-devel
@@ -281,6 +291,11 @@ jobs:
           lib64Qt6Gui-devel
           lib64Qt6Widgets-devel
           lib64Qt6Test-devel
+          lib64kdsingleapplication-devel
+          lib64xkbcommon-devel
+          lib64gtest-devel
+          lib64gmock-devel
+          sparsehash-devel
           qt6-cmake
           qt6-qtbase-tools
           qt6-qttools-linguist
@@ -288,10 +303,11 @@ jobs:
           appstream
           appstream-util
           hicolor-icon-theme
+          rapidjson
       - name: Remove files
         run: rm -rf /usr/lib64/qt6/lib/cmake/Qt6Sql/{Qt6QMYSQL*,Qt6QODBCD*,Qt6QPSQL*,Qt6QIBase*}
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
           submodules: recursive
@@ -312,12 +328,12 @@ jobs:
         run: cp strawberry-*.tar.xz ~/rpmbuild/SOURCES/
       - name: Build RPM
         env:
-          RPM_BUILD_NCPUS: "2"
+          RPM_BUILD_NCPUS: 4
         working-directory: build
-        run: rpmbuild -ba ../dist/unix/strawberry.spec
+        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: |
@@ -327,7 +343,7 @@ jobs:
 
   build-mageia:
     name: Build Mageia
-    if: github.repository != 'strawberrymusicplayer/strawberry-private'
+    if: github.repository != 'strawberrymusicplayer/strawberry-private' && github.ref != 'refs/heads/l10n_master'
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -336,12 +352,6 @@ jobs:
     container:
       image: mageia:${{matrix.mageia_version}}
     steps:
-      - name: Set media
-        run: |
-          urpmi.removemedia "Core Release"
-          urpmi.removemedia "Core Updates"
-          urpmi.addmedia "Core Release" "https://mirrors.kernel.org/mageia/distrib/${{matrix.mageia_version}}/x86_64/media/core/release/"
-          urpmi.addmedia "Core Updates" "https://mirrors.kernel.org/mageia/distrib/${{matrix.mageia_version}}/x86_64/media/core/updates/"
       - name: Update repositories
         run: urpmi.update -a
       - name: Upgrade packages
@@ -358,9 +368,7 @@ jobs:
           man
           tar
           rpmdevtools
-          gettext
           lib64boost-devel
-          lib64protobuf-devel
           lib64sqlite3-devel
           lib64alsa2-devel
           lib64pulseaudio-devel
@@ -385,12 +393,23 @@ jobs:
           lib64qt6dbus-devel
           lib64qt6help-devel
           lib64qt6test-devel
-          protobuf-compiler
+          lib64sparsehash-devel
+          lib64kdsingleapplication-devel
           desktop-file-utils
           appstream-util
           hicolor-icon-theme
+          gtest
+          rapidjson
+      - name: Build and install KDSingleApplication
+        if: matrix.mageia_version == '9'
+        run: |
+          git clone --depth 1 --recurse-submodules https://github.com/KDAB/KDSingleApplication
+          cd KDSingleApplication
+          cmake -S . -B build -DCMAKE_BUILD_TYPE="Release" -DBUILD_SHARED_LIBS=OFF -DBUILD_STATIC_LIBS=ON -DKDSingleApplication_STATIC=ON
+          cmake --build build --config Release --parallel 4
+          cmake --install build
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
           submodules: recursive
@@ -411,11 +430,11 @@ jobs:
         run: cp strawberry-*.tar.xz ~/rpmbuild/SOURCES/
       - name: Build RPM
         env:
-          RPM_BUILD_NCPUS: "2"
+          RPM_BUILD_NCPUS: 4
         working-directory: build
-        run: rpmbuild -ba ../dist/unix/strawberry.spec
+        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: |
@@ -425,12 +444,12 @@ jobs:
 
   build-debian:
     name: Build Debian
-    if: github.repository != 'strawberrymusicplayer/strawberry-private'
+    if: github.repository != 'strawberrymusicplayer/strawberry-private' && github.ref != 'refs/heads/l10n_master'
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        debian_version: [ 'bookworm', 'trixie' ]
+        debian_version: [ 'bookworm', 'trixie', 'forky' ]
     container:
       image: debian:${{matrix.debian_version}}
     steps:
@@ -452,14 +471,10 @@ jobs:
             g++
             pkg-config
             fakeroot
-            gettext
             lsb-release
             dpkg-dev
             libglib2.0-dev
-            libdbus-1-dev
             libboost-dev
-            libprotobuf-dev
-            protobuf-compiler
             libsqlite3-dev
             libasound2-dev
             libpulse-dev
@@ -475,13 +490,28 @@ jobs:
             libcdio-dev
             libmtp-dev
             libgpod-dev
+            libxkbcommon-dev
+            libsparsehash-dev
             qt6-base-dev
+            qt6-base-private-dev
             qt6-base-dev-tools
             qt6-tools-dev
             qt6-tools-dev-tools
             qt6-l10n-tools
+            rapidjson-dev
+      - name: Install KDSingleApplication
+        if: matrix.debian_version != 'bookworm'
+        run: apt install -y libkdsingleapplication-qt6-dev
+      - name: Build and install KDSingleApplication
+        if: matrix.debian_version == 'bookworm'
+        run: |
+          git clone --depth 1 --recurse-submodules https://github.com/KDAB/KDSingleApplication
+          cd KDSingleApplication
+          cmake -S . -B build -DCMAKE_BUILD_TYPE="Release" -DBUILD_SHARED_LIBS=OFF -DBUILD_STATIC_LIBS=ON -DKDSingleApplication_STATIC=ON
+          cmake --build build --config Release --parallel 4
+          cmake --install build
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
           submodules: recursive
@@ -490,26 +520,29 @@ jobs:
       - name: Create Build Environment
         run: cmake -E make_directory build
       - name: Configure CMake
-        run: cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug -DBUILD_WERROR=ON
+        run: cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_WERROR=ON
+      - name: Delete build directory
+        run: rm -rf build
       - name: make deb
-        run: dpkg-buildpackage -b -d -uc -us -nc -j2
+        run: dpkg-buildpackage -b -d -uc -us -nc -j4
       - 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: "*.deb"
+          path: |
+            *.deb
 
 
   build-ubuntu:
     name: Build Ubuntu
-    if: github.repository != 'strawberrymusicplayer/strawberry-private'
+    if: github.repository != 'strawberrymusicplayer/strawberry-private' && github.ref != 'refs/heads/l10n_master'
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        ubuntu_version: [ 'noble', 'oracular' ]
+        ubuntu_version: [ 'noble', 'questing', 'resolute' ]
     container:
       image: ubuntu:${{matrix.ubuntu_version}}
     steps:
@@ -533,14 +566,10 @@ jobs:
             fakeroot
             wget
             curl
-            gettext
             lsb-release
             dpkg-dev
             libglib2.0-dev
             libboost-dev
-            libdbus-1-dev
-            libprotobuf-dev
-            protobuf-compiler
             libsqlite3-dev
             libasound2-dev
             libpulse-dev
@@ -557,13 +586,28 @@ jobs:
             libcdio-dev
             libmtp-dev
             libgpod-dev
+            libxkbcommon-dev
+            libsparsehash-dev
             qt6-base-dev
+            qt6-base-private-dev
             qt6-base-dev-tools
             qt6-tools-dev
             qt6-tools-dev-tools
             qt6-l10n-tools
+            rapidjson-dev
+      - name: Install KDSingleApplication
+        if: matrix.ubuntu_version != 'noble'
+        run: apt install -y libkdsingleapplication-qt6-dev
+      - name: Build and install KDSingleApplication
+        if: matrix.ubuntu_version == 'noble'
+        run: |
+          git clone --depth 1 --recurse-submodules https://github.com/KDAB/KDSingleApplication
+          cd KDSingleApplication
+          cmake -S . -B build -DCMAKE_BUILD_TYPE="Release" -DBUILD_SHARED_LIBS=OFF -DBUILD_STATIC_LIBS=ON -DKDSingleApplication_STATIC=ON
+          cmake --build build --config Release --parallel 4
+          cmake --install build
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
           submodules: recursive
@@ -572,13 +616,15 @@ jobs:
       - name: Create Build Environment
         run: cmake -E make_directory build
       - name: Configure CMake
-        run: cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug -DBUILD_WERROR=ON
+        run: cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_WERROR=ON
+      - name: Delete build directory
+        run: rm -rf build
       - name: make deb
-        run: dpkg-buildpackage -b -d -uc -us -nc -j2
+        run: dpkg-buildpackage -b -d -uc -us -nc -j4
       - 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: |
@@ -593,7 +639,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ubuntu_version: [ 'noble', 'oracular' ]
+        ubuntu_version: [ 'noble', 'questing', 'resolute' ]
     container:
       image: ubuntu:${{matrix.ubuntu_version}}
     steps:
@@ -615,15 +661,12 @@ jobs:
             gcc
             g++
             fakeroot
-            gettext
             lsb-release
             gpg
             dput
             dpkg-dev
             libglib2.0-dev
             libboost-dev
-            libdbus-1-dev
-            libprotobuf-dev
             libsqlite3-dev
             libasound2-dev
             libpulse-dev
@@ -638,30 +681,38 @@ jobs:
             libcdio-dev
             libmtp-dev
             libgpod-dev
+            libxkbcommon-dev
+            libsparsehash-dev
             qt6-base-dev
+            qt6-base-private-dev
             qt6-base-dev-tools
             qt6-tools-dev
             qt6-tools-dev-tools
             qt6-l10n-tools
             gstreamer1.0-alsa
             gstreamer1.0-pulseaudio
-            protobuf-compiler
+            libkdsingleapplication-qt6-dev
+            rapidjson-dev
       - name: Install keyboxd
         if: matrix.ubuntu_version == 'noble'
         env:
           DEBIAN_FRONTEND: noninteractive
         run: apt install -y keyboxd
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
           submodules: recursive
       - name: Add safe git directory
         run: git config --global --add safe.directory ${GITHUB_WORKSPACE}
+      - name: Modify required KDSingleApplication version
+        run: |
+          sed -i 's/^find_package(KDSingleApplication-qt\${QT_VERSION_MAJOR} 1.1.0 REQUIRED)$/find_package(KDSingleApplication-qt\${QT_VERSION_MAJOR} 1.0.0 REQUIRED)/g' CMakeLists.txt
+          sed -i 's/, KDSingleApplication::Option::IncludeUsernameInSocketName);$/);/g' src/main.cpp
       - name: Create Build Environment
         run: cmake -E make_directory build
       - name: Configure CMake
-        run: cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug -DBUILD_WERROR=ON
+        run: cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_WERROR=ON
       - name: Delete build directory
         run: rm -rf build
       - name: Import Ubuntu PPA GPG private key
@@ -678,14 +729,71 @@ jobs:
         run: dput ppa:jonaski/strawberry ../*_source.changes
 
 
+  build-freebsd:
+    name: Build FreeBSD
+    if: github.repository != 'strawberrymusicplayer/strawberry-private' && github.ref != 'refs/heads/l10n_master'
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      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.3.7
+      with:
+        usesh: true
+        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
+          git config --global --add safe.directory ${GITHUB_WORKSPACE}
+          cmake -E make_directory build
+          cmake -S . -B build -DCMAKE_BUILD_TYPE="Debug"
+          cmake --build build --config Debug --parallel 4
+
+
+  build-openbsd:
+    name: Build OpenBSD
+    if: github.repository != 'strawberrymusicplayer/strawberry-private' && github.ref != 'refs/heads/l10n_master'
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v6
+      with:
+        fetch-depth: 0
+        submodules: recursive
+    - name: Build OpenBSD
+      id: build-openbsd
+      uses: vmactions/openbsd-vm@v1.3.1
+      with:
+        usesh: true
+        mem: 4096
+        prepare: pkg_add git cmake pkgconf boost glib2 qt6-qtbase qt6-qttools sqlite gstreamer1 gstreamer1-plugins-base chromaprint libebur128 taglib libcdio libmtp gdk-pixbuf libgpod fftw3 icu4c kdsingleapplication pulseaudio sparsehash rapidjson
+        run: |
+          set -e
+          export LDFLAGS="-L/usr/local/lib"
+          git config --global --add safe.directory ${GITHUB_WORKSPACE}
+          cmake -E make_directory build
+          cmake -S . -B build -DCMAKE_BUILD_TYPE="Debug" -DENABLE_ALSA=OFF -DENABLE_DISCORD_RPC=OFF
+          cmake --build build --config Debug --parallel 4
+
+
   build-macos-public:
     name: Build macOS Public
-    if: github.repository != 'strawberrymusicplayer/strawberry-private'
+    if: github.repository != 'strawberrymusicplayer/strawberry-private' && github.ref != 'refs/heads/l10n_master'
 
     strategy:
       fail-fast: false
       matrix:
-        runner: [ 'macos-13', 'macos-14' ]
+        runner: [ 'macos-15-intel', 'macos-15' ]
         buildtype: [ 'release' ]
 
     runs-on: ${{ matrix.runner }}
@@ -724,14 +832,14 @@ jobs:
           rm -f uninstall.sh
 
       - name: Checkout
-        uses: actions/checkout@v4
+        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@v3
+        uses: apple-actions/import-codesign-certs@v6
         with:
           p12-file-base64: ${{ secrets.APPLE_DEVELOPER_ID_CERTIFICATE }}
           p12-password: ${{ secrets.APPLE_DEVELOPER_ID_CERTIFICATE_PASSWORD }}
@@ -762,13 +870,14 @@ jobs:
           -B build
           -DCMAKE_BUILD_TYPE="${{env.cmake_buildtype}}"
           -DCMAKE_PREFIX_PATH="${{env.prefix_path}}/lib/cmake"
-          -DBUILD_WERROR=OFF
+          -DBUILD_WERROR=ON
           -DUSE_BUNDLE=ON
-          -DENABLE_DBUS=OFF
           -DICU_ROOT="${{env.prefix_path}}"
-          -DFFTW3_DIR="${{env.prefix_path}}"
           -DAPPLE_DEVELOPER_ID=$(test '${{github.repository}}' = 'strawberrymusicplayer/strawberry' && test '${{github.event.pull_request.base.repo.full_name}}' = '${{github.event.pull_request.head.repo.full_name}}' && echo "383J84DVB6" || echo "")
+          -DARCH="${{env.arch}}"
           -DENABLE_SPOTIFY=$(test -f "${{env.prefix_path}}/lib/gstreamer-1.0/libgstspotify.dylib" && echo "ON" || echo "OFF")
+          -DENABLE_SPARKLE=ON
+          -DENABLE_QTSPARKLE=OFF
 
       - name: Build
         run: cmake --build build --config Release --parallel 4
@@ -787,12 +896,12 @@ 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,libutf8_validity.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,libbrotlidec.1.dylib,libsoup-3.0.0.dylib,libnghttp2.14.dylib,libpsl.5.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-14'
+        if: github.repository == 'strawberrymusicplayer/strawberry' && github.event.pull_request.head.repo.fork == false && matrix.runner == 'macos-15'
         working-directory: build
         run: codesign -s 383J84DVB6 -f strawberry.app/Contents/Frameworks/png.framework/png strawberry.app
 
@@ -874,7 +983,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@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
           submodules: recursive
@@ -902,13 +1011,14 @@ jobs:
           -B build
           -DCMAKE_BUILD_TYPE="${{env.cmake_buildtype}}"
           -DCMAKE_PREFIX_PATH="${{env.prefix_path}}/lib/cmake"
-          -DBUILD_WERROR=OFF
+          -DBUILD_WERROR=ON
           -DUSE_BUNDLE=ON
-          -DENABLE_DBUS=OFF
           -DICU_ROOT="${{env.prefix_path}}"
-          -DFFTW3_DIR="${{env.prefix_path}}"
           -DAPPLE_DEVELOPER_ID="383J84DVB6"
+          -DARCH="${{env.arch}}"
           -DENABLE_SPOTIFY=$(test -f "${{env.prefix_path}}/lib/gstreamer-1.0/libgstspotify.dylib" && echo "ON" || echo "OFF")
+          -DENABLE_SPARKLE=ON
+          -DENABLE_QTSPARKLE=OFF
 
       - name: Build
         run: cmake --build build --config Release --parallel 4
@@ -960,12 +1070,12 @@ jobs:
 
   build-windows-mingw:
     name: Build Windows MinGW
-    if: github.repository != 'strawberrymusicplayer/strawberry-private'
+    if: github.repository != 'strawberrymusicplayer/strawberry-private' && github.ref != 'refs/heads/l10n_master'
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        arch: [ 'x86_64' ]
+        arch: [ 'i686', 'x86_64' ]
         buildtype: [ 'debug', 'release' ]
     container:
       image: jonaski/strawberry-mxe-${{matrix.arch}}-${{matrix.buildtype}}
@@ -976,7 +1086,7 @@ jobs:
         run: echo "cmake_buildtype=$(echo ${{matrix.buildtype}} | sed 's/.*/\u&/')" >> $GITHUB_ENV
 
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
           submodules: recursive
@@ -1000,15 +1110,14 @@ jobs:
           -DCMAKE_TOOLCHAIN_FILE="../cmake/Toolchain-${{matrix.arch}}-w64-mingw32-shared.cmake"
           -DCMAKE_BUILD_TYPE="${{env.cmake_buildtype}}"
           -DCMAKE_PREFIX_PATH="/strawberry-mxe/usr/${{matrix.arch}}-w64-mingw32.shared/qt6"
-          -DBUILD_WERROR=OFF
+          -DBUILD_WERROR=ON
           -DARCH="${{matrix.arch}}"
           -DENABLE_WIN32_CONSOLE=$(test "${{matrix.buildtype}}" = "debug" && echo "ON" || echo "OFF")
-          -DENABLE_DBUS=OFF
-          -DENABLE_LIBGPOD=OFF
-          -DENABLE_LIBMTP=OFF
+          -DENABLE_GIO=OFF
           -DENABLE_AUDIOCD=OFF
+          -DENABLE_MTP=OFF
+          -DENABLE_GPOD=OFF
           -DENABLE_SPOTIFY=OFF
-          -DProtobuf_PROTOC_EXECUTABLE="/strawberry-mxe/usr/x86_64-pc-linux-gnu/bin/protoc"
 
       - name: Run Make
         run: cmake --build build --config "${{env.cmake_buildtype}}" --parallel $(nproc)
@@ -1081,7 +1190,7 @@ jobs:
 
       - name: Copy nsis files
         working-directory: build
-        run: cp ${GITHUB_WORKSPACE}/dist/windows/*.nsi ${GITHUB_WORKSPACE}/dist/windows/*.nsh ${GITHUB_WORKSPACE}/dist/windows/*.ico .
+        run: cp ${GITHUB_WORKSPACE}/dist/windows/*.nsh ${GITHUB_WORKSPACE}/dist/windows/*.ico .
 
       - name: Copy COPYING license file
         working-directory: build
@@ -1150,13 +1259,43 @@ jobs:
 
   build-windows-msvc:
     name: Build Windows MSVC
-    if: github.repository != 'strawberrymusicplayer/strawberry-private'
-    runs-on: windows-2022
+    if: github.repository != 'strawberrymusicplayer/strawberry-private' && github.ref != 'refs/heads/l10n_master'
     strategy:
       fail-fast: false
       matrix:
-        arch: [ 'x86_64' ]
-        buildtype: [ 'release' ]
+       include:
+         - name: "x86_64 debug"
+           runner: windows-2022
+           arch: x86_64
+           buildtype: debug
+
+         - name: "x86_64 release"
+           runner: windows-2022
+           arch: x86_64
+           buildtype: release
+
+         - name: "x86 debug"
+           runner: windows-2022
+           arch: x86
+           buildtype: debug
+
+         - name: "x86 release"
+           runner: windows-2022
+           arch: x86
+           buildtype: release
+
+         - name: "arm64 debug"
+           runner: windows-11-arm
+           arch: arm64
+           buildtype: debug
+
+         - name: "arm64 release"
+           runner: windows-11-arm
+           arch: arm64
+           buildtype: release
+
+    runs-on: ${{matrix.runner}}
+
     steps:
 
       - name: Set prefix path
@@ -1170,6 +1309,20 @@ jobs:
         shell: bash
         run: echo "cmake_buildtype=$(echo ${{matrix.buildtype}} | sed 's/.*/\u&/')" >> $GITHUB_ENV
 
+      - name: Show SDK versions
+        shell: bash
+        run: ls -la "c:/Program Files (x86)/Windows Kits/10/include"
+
+      - name: Set SDK version
+        if: matrix.arch != 'arm64'
+        shell: bash
+        run: echo "sdk_version=10.0.22621.0" >> $GITHUB_ENV
+
+      - name: Set SDK version
+        if: matrix.arch == 'arm64'
+        shell: bash
+        run: echo "sdk_version=10.0.26100.0" >> $GITHUB_ENV
+
       - name: Install rsync
         shell: cmd
         run: choco install --no-progress rsync
@@ -1198,7 +1351,9 @@ jobs:
 
       - name: Copy bin files
         shell: bash
-        run: cp /c/strawberry/c/bin/{patch.exe,strip.exe,strings.exe,objdump.exe} ${{env.prefix_path_unix}}/bin
+        run: |
+          cp /c/mingw64/bin/{strip.exe,strings.exe,objdump.exe} ${{env.prefix_path_unix}}/bin
+          cp /c/strawberry/c/bin/patch.exe ${{env.prefix_path_unix}}/bin
 
       - name: Delete conflicting files
         shell: bash
@@ -1252,11 +1407,11 @@ jobs:
         uses: ilammy/msvc-dev-cmd@v1
         with:
           arch: ${{matrix.arch}}
-          sdk: 10.0.20348.0
+          sdk: ${{env.sdk_version}}
           vsversion: 2022
 
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
           submodules: recursive
@@ -1269,15 +1424,18 @@ jobs:
         shell: cmd
         run: cmake -E make_directory build
 
-      - name: Set ENABLE_WIN32_CONSOLE (debug)
-        if: matrix.buildtype == 'debug'
+      - name: Set ENABLE_WIN32_CONSOLE
         shell: bash
-        run: echo "win32_console=ON" >> $GITHUB_ENV
+        run: echo "enable_win32_console=$(test "${{matrix.buildtype}}" = "debug" && echo "ON" || echo "OFF")" >> $GITHUB_ENV
 
-      - name: Set ENABLE_WIN32_CONSOLE (release)
-        if: matrix.buildtype == 'release'
+      - name: Set ENABLE_SPOTIFY
         shell: bash
-        run: echo "win32_console=OFF" >> $GITHUB_ENV
+        run: echo "enable_spotify=$(test -f "${{env.prefix_path_unix}}/lib/gstreamer-1.0/gstspotify.dll" && echo "ON" || echo "OFF")" >> $GITHUB_ENV
+
+      - name: Remove -lm from .pc files
+        if: matrix.arch == 'arm64'
+        shell: bash
+        run: sed -i 's/\-lm$//g' ${{env.prefix_path_unix}}/lib/pkgconfig/*.pc
 
       - name: Run CMake
         shell: cmd
@@ -1289,12 +1447,14 @@ jobs:
           -DCMAKE_BUILD_TYPE="${{env.cmake_buildtype}}"
           -DCMAKE_PREFIX_PATH="${{env.prefix_path_forwardslash}}/lib/cmake"
           -DARCH="${{matrix.arch}}"
-          -DENABLE_WIN32_CONSOLE=${{env.win32_console}}
-          -DUSE_TAGLIB=ON
+          -DENABLE_WIN32_CONSOLE=${{env.enable_win32_console}}
           -DPKG_CONFIG_EXECUTABLE="${{env.prefix_path_forwardslash}}/bin/pkg-config.exe"
           -DICU_ROOT="${{env.prefix_path_forwardslash}}"
-          -DFFTW3_DIR="${{env.prefix_path_forwardslash}}"
-          -DBoost_INCLUDE_DIR="${{env.prefix_path_forwardslash}}/include"
+          -DENABLE_GIO=OFF
+          -DENABLE_AUDIOCD=OFF
+          -DENABLE_MTP=OFF
+          -DENABLE_GPOD=OFF
+          -DENABLE_SPOTIFY=${{env.enable_spotify}}
 
       - name: Run Make
         shell: cmd
@@ -1388,7 +1548,6 @@ jobs:
         shell: cmd
         working-directory: build
         run: |
-          copy ..\dist\windows\*.nsi .
           copy ..\dist\windows\*.nsh .
           copy ..\dist\windows\*.ico .
 
@@ -1429,6 +1588,11 @@ jobs:
             exit 1
           fi
 
+      - name: Download MSVC runtime
+        shell: bash
+        working-directory: build
+        run: curl -f -O -L https://aka.ms/vs/17/release/vc_redist.$(test "${{matrix.arch}}" = "x86_64" && echo "x64" || echo "${{matrix.arch}}").exe
+
       - name: Create nsis installer
         shell: cmd
         working-directory: build
@@ -1480,11 +1644,11 @@ jobs:
           DEBIAN_FRONTEND: noninteractive
         run: sudo apt install -y git rsync
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
       - name: Download artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v7
         with:
           path: artifacts
       - name: SSH Setup
@@ -1528,7 +1692,7 @@ jobs:
           DEBIAN_FRONTEND: noninteractive
         run: sudo apt install -y git jq gh
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
       - name: Show release assets
@@ -1536,7 +1700,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@v4
+        uses: actions/download-artifact@v7
         with:
           path: artifacts
       - name: Add artifacts to release

.gitignore

@@ -1,6 +1,7 @@
 /build
 /bin
 /CMakeLists.txt.user
+/.qtcreator
 /.kdev4
 /strawberry.kdev4
 /.vscode
@@ -11,7 +12,5 @@
 /out
 /CMakeSettings.json
 /dist/scripts/maketarball.sh
-/dist/unix/strawberry.spec
-/dist/windows/strawberry.nsi
 /debian/changelog
-/dist/macos/Info.plist
+_codeql_detected_source_root

.gitmodules

@@ -1,4 +0,0 @@
-[submodule "3rdparty/kdsingleapplication/KDSingleApplication"]
-	path = 3rdparty/kdsingleapplication/KDSingleApplication
-	url = https://github.com/KDAB/KDSingleApplication.git
-	branch = master

3rdparty/README.md

@@ -1,29 +0,0 @@
-3rdparty libraries located in this directory
-============================================
-
-KDSingleApplication
--------------------
-A small library used by Strawberry to prevent it from starting twice per user session.
-If the user tries to start strawberry twice, the main window will maximize instead of starting another instance.
-It is also used to pass command-line options through to the first instance.
-This 3rdparty copy is used only if KDSingleApplication 1.1 or higher is not found on the system.
-
-URL: https://github.com/KDAB/KDSingleApplication/
-
-
-SPMediaKeyTap
--------------
-A library used on macOS to exclusively grab global media shortcuts.
-
-The library is no longer maintained by the original author.
-
-The directory can safely be deleted on other platforms.
-
-
-gstfastspectrum
----------------
-A GStreamer spectrum plugin using FFTW3.
-It is needed for moodbar support, and is currently not available
-in GStreamer.
-The plan is to submit it to GStreamer, or move it to
-a seperate repository outside of Strawberry.

3rdparty/SPMediaKeyTap/CMakeLists.txt

@@ -1,11 +0,0 @@
-set(SPMEDIAKEY-SOURCES
-  SPMediaKeyTap.m
-)
-
-set(SPMEDIAKEY-HEADERS
-  SPMediaKeyTap.h
-)
-
-ADD_LIBRARY(SPMediaKeyTap STATIC
-  ${SPMEDIAKEY-SOURCES}
-)

3rdparty/SPMediaKeyTap/LICENSE

@@ -1,8 +0,0 @@
-Copyright (c) 2011, Joachim Bengtsson
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-* Neither the name of the organization nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

3rdparty/SPMediaKeyTap/README.md

@@ -1,12 +0,0 @@
-SPMediaKeyTap
-=============
-
-`SPMediaKeyTap` abstracts a `CGEventHook` and other nastiness in order to give you a relatively simple API to receive media key events (prev/next/playpause, on F7 to F9 on modern MacBook Pros) exclusively, without them reaching other applications like iTunes. `SPMediaKeyTap` is clever enough to resign its exclusive lock on media keys by looking for which application was active most recently: if that application is in `SPMediaKeyTap`'s whitelist, it will resign the keys. This is similar to the behavior of Apple's applications collaborating on media key handling exclusivity, but unfortunately, Apple is not exposing any APIs allowing third-parties to join in on this collaboration.
-
-For now, the whitelist is just a hardcoded array in `+[SPMediaKeyTap defaultMediaKeyUserBundleIdentifiers]`. If your app starts using `SPMediaKeyTap`, please [mail me](mailto:nevyn@spotify.com) your bundle ID, and I'll include it in the canonical repository. This is a bad solution; a better solution would be to use distributed notifications to collaborate in creating this whitelist at runtime. Hopefully someone'll have the time and energy to write this soon. 
-
-In `Example/SPMediaKeyTapExampleAppDelegate.m` is an example of both how you use `SPMediaKeyTap`, and how you handle the semi-private `NSEvent` subtypes involved in media keys, including on how to fall back to non-event tap handling of these events.
-
-`SPMediaKeyTap` and other `CGEventHook`s on the event type `NSSystemDefined` is known to interfere with each other and applications doing weird stuff with mouse input, because mouse clicks are also part of the `NSSystemDefined` category. The single issue we have had reported here at Spotify is Adobe Fireworks, in which item selection stops working with `SPMediaKeyTap` is active.
-
-`SPMediaKeyTap` requires 10.5 to work, and disables itself on 10.4.

3rdparty/SPMediaKeyTap/SPMediaKeyTap.h

@@ -1,53 +0,0 @@
-/*
- Copyright (c) 2011, Joachim Bengtsson
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
-
- * Neither the name of the organization nor the names of its contributors may
-   be used to endorse or promote products derived from this software without
-   specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import <Cocoa/Cocoa.h>
-#import <IOKit/hidsystem/ev_keymap.h>
-
-// http://overooped.com/post/2593597587/mediakeys
-
-#define SPSystemDefinedEventMediaKeys 8
-
-@interface SPMediaKeyTap : NSObject
-
-- (id)initWithDelegate:(id)delegate;
-
-+ (BOOL)usesGlobalMediaKeyTap;
-- (BOOL)startWatchingMediaKeys;
-- (void)stopWatchingMediaKeys;
-- (void)handleAndReleaseMediaKeyEvent:(NSEvent *)event;
-@end
-
-@interface NSObject (SPMediaKeyTapDelegate)
-- (void)mediaKeyTap:(SPMediaKeyTap*)keyTap receivedMediaKeyEvent:(NSEvent*)event;
-@end
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern NSString *kIgnoreMediaKeysDefaultsKey;
-
-#ifdef __cplusplus
-}
-#endif

3rdparty/SPMediaKeyTap/SPMediaKeyTap.m

@@ -1,361 +0,0 @@
-/*
- Copyright (c) 2011, Joachim Bengtsson
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
-
- * Neither the name of the organization nor the names of its contributors may
-   be used to endorse or promote products derived from this software without
-   specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-// Copyright (c) 2010 Spotify AB
-#import "SPMediaKeyTap.h"
-
-// Define to enable app list debug output
-// #define DEBUG_SPMEDIAKEY_APPLIST 1
-
-NSString *kIgnoreMediaKeysDefaultsKey = @"SPIgnoreMediaKeys";
-
-@interface SPMediaKeyTap () {
-    CFMachPortRef _eventPort;
-    CFRunLoopSourceRef _eventPortSource;
-    CFRunLoopRef _tapThreadRL;
-    NSThread *_tapThread;
-    BOOL _shouldInterceptMediaKeyEvents;
-    id _delegate;
-    // The app that is frontmost in this list owns media keys
-    NSMutableArray<NSRunningApplication *> *_mediaKeyAppList;
-}
-
-- (BOOL)shouldInterceptMediaKeyEvents;
-- (void)setShouldInterceptMediaKeyEvents:(BOOL)newSetting;
-- (void)startWatchingAppSwitching;
-- (void)stopWatchingAppSwitching;
-- (void)eventTapThread;
-@end
-
-static CGEventRef tapEventCallback(CGEventTapProxy proxy, CGEventType type, CGEventRef event, void *refcon);
-
-
-// Inspired by http://gist.github.com/546311
-
-@implementation SPMediaKeyTap
-
-#pragma mark -
-#pragma mark Setup and teardown
-
-- (id)initWithDelegate:(id)delegate
-{
-    self = [super init];
-    if (self) {
-        _delegate = delegate;
-        [self startWatchingAppSwitching];
-        _mediaKeyAppList = [NSMutableArray new];
-    }
-    return self;
-}
-
-- (void)dealloc
-{
-    [self stopWatchingMediaKeys];
-    [self stopWatchingAppSwitching];
-    [super dealloc];
-}
-
-- (void)startWatchingAppSwitching
-{
-    // Listen to "app switched" event, so that we don't intercept media keys if we
-    // weren't the last "media key listening" app to be active
-
-    [[[NSWorkspace sharedWorkspace] notificationCenter] addObserver:self
-                                                           selector:@selector(frontmostAppChanged:)
-                                                               name:NSWorkspaceDidActivateApplicationNotification
-                                                             object:nil];
-
-
-    [[[NSWorkspace sharedWorkspace] notificationCenter] addObserver:self
-                                                           selector:@selector(appTerminated:)
-                                                               name:NSWorkspaceDidTerminateApplicationNotification
-                                                             object:nil];
-}
-
-- (void)stopWatchingAppSwitching
-{
-    [[[NSWorkspace sharedWorkspace] notificationCenter] removeObserver:self];
-}
-
-- (BOOL)startWatchingMediaKeys
-{
-    // Prevent having multiple mediaKeys threads
-    [self stopWatchingMediaKeys];
-
-    [self setShouldInterceptMediaKeyEvents:YES];
-
-    // Add an event tap to intercept the system defined media key events
-    _eventPort = CGEventTapCreate(kCGSessionEventTap,
-                                  kCGHeadInsertEventTap,
-                                  kCGEventTapOptionDefault,
-                                  CGEventMaskBit(NX_SYSDEFINED),
-                                  tapEventCallback,
-                                  (__bridge void * __nullable)(self));
-
-    // Can be NULL if the app has no accessibility access permission
-    if (_eventPort == NULL)
-        return NO;
-
-    _eventPortSource = CFMachPortCreateRunLoopSource(kCFAllocatorSystemDefault, _eventPort, 0);
-    assert(_eventPortSource != NULL);
-
-    if (_eventPortSource == NULL)
-        return NO;
-
-    // Let's do this in a separate thread so that a slow app doesn't lag the event tap
-    _tapThread = [[NSThread alloc] initWithTarget:self
-                                         selector:@selector(eventTapThread)
-                                           object:nil];
-    [_tapThread start];
-
-    return YES;
-}
-
-- (void)stopWatchingMediaKeys
-{
-    // Shut down tap thread
-    if(_tapThreadRL){
-        CFRunLoopStop(_tapThreadRL);
-        _tapThreadRL = nil;
-    }
-
-    // Remove tap port
-    if(_eventPort){
-        CFMachPortInvalidate(_eventPort);
-        CFRelease(_eventPort);
-        _eventPort = nil;
-    }
-
-    // Remove tap source
-    if(_eventPortSource){
-        CFRelease(_eventPortSource);
-        _eventPortSource = nil;
-    }
-}
-
-#pragma mark -
-#pragma mark Accessors
-
-+ (BOOL)usesGlobalMediaKeyTap
-{
-#ifdef _DEBUG
-    // breaking in gdb with a key tap inserted sometimes locks up all mouse and keyboard input forever, forcing reboot
-    return NO;
-#else
-    // XXX(nevyn): MediaKey event tap doesn't work on 10.4, feel free to figure out why if you have the energy.
-    return
-        ![[NSUserDefaults standardUserDefaults] boolForKey:kIgnoreMediaKeysDefaultsKey]
-        && floor(NSAppKitVersionNumber) >= 949/*NSAppKitVersionNumber10_5*/;
-#endif
-}
-
-+ (NSArray*)mediaKeyUserBundleIdentifiers
-{
-    return [NSArray arrayWithObjects:
-        [[NSBundle mainBundle] bundleIdentifier], // your app
-        @"com.spotify.client",
-        @"com.apple.iTunes",
-        @"com.apple.QuickTimePlayerX",
-        @"com.apple.quicktimeplayer",
-        @"com.apple.iWork.Keynote",
-        @"com.apple.iPhoto",
-        @"org.videolan.vlc",
-        @"com.apple.Aperture",
-        @"com.plexsquared.Plex",
-        @"com.soundcloud.desktop",
-        @"org.niltsh.MPlayerX",
-        @"com.ilabs.PandorasHelper",
-        @"com.mahasoftware.pandabar",
-        @"com.bitcartel.pandorajam",
-        @"org.clementine-player.clementine",
-        @"fm.last.Last.fm",
-        @"fm.last.Scrobbler",
-        @"com.beatport.BeatportPro",
-        @"com.Timenut.SongKey",
-        @"com.macromedia.fireworks", // the tap messes up their mouse input
-        @"at.justp.Theremin",
-        @"ru.ya.themblsha.YandexMusic",
-        @"com.jriver.MediaCenter18",
-        @"com.jriver.MediaCenter19",
-        @"com.jriver.MediaCenter20",
-        @"co.rackit.mate",
-        @"com.ttitt.b-music",
-        @"com.beardedspice.BeardedSpice",
-        @"com.plug.Plug",
-        @"com.plug.Plug2",
-        @"com.netease.163music",
-        @"org.quodlibet.quodlibet",
-        nil
-    ];
-}
-
-
-- (BOOL)shouldInterceptMediaKeyEvents
-{
-    BOOL shouldIntercept = NO;
-    @synchronized(self) {
-        shouldIntercept = _shouldInterceptMediaKeyEvents;
-    }
-    return shouldIntercept;
-}
-
-- (void)pauseTapOnTapThread:(NSNumber *)yeahno
-{
-    CGEventTapEnable(self->_eventPort, [yeahno boolValue]);
-}
-
-- (void)setShouldInterceptMediaKeyEvents:(BOOL)newSetting
-{
-    BOOL oldSetting;
-    @synchronized(self) {
-        oldSetting = _shouldInterceptMediaKeyEvents;
-        _shouldInterceptMediaKeyEvents = newSetting;
-    }
-    if(_tapThreadRL && oldSetting != newSetting) {
-        [self performSelector:@selector(pauseTapOnTapThread:)
-                     onThread:_tapThread
-                   withObject:@(newSetting)
-                waitUntilDone:NO];
-
-    }
-}
-
-
-#pragma mark -
-#pragma mark Event tap callbacks
-
-// Note: method called on background thread
-
-static CGEventRef tapEventCallback2(CGEventTapProxy proxy, CGEventType type, CGEventRef event, void *refcon)
-{
-    #pragma unused(proxy)
-    SPMediaKeyTap *self = (__bridge SPMediaKeyTap *)refcon;
-
-    if(type == kCGEventTapDisabledByTimeout) {
-        NSLog(@"Media key event tap was disabled by timeout");
-        CGEventTapEnable(self->_eventPort, TRUE);
-        return event;
-    } else if(type == kCGEventTapDisabledByUserInput) {
-        // Was disabled manually by -[pauseTapOnTapThread]
-        return event;
-    }
-    NSEvent *nsEvent = nil;
-    @try {
-        nsEvent = [NSEvent eventWithCGEvent:event];
-    }
-    @catch (NSException * e) {
-        NSLog(@"Strange CGEventType: %d: %@", type, e);
-        assert(0);
-        return event;
-    }
-
-    if (type != NX_SYSDEFINED || [nsEvent subtype] != SPSystemDefinedEventMediaKeys)
-        return event;
-
-    int keyCode = (([nsEvent data1] & 0xFFFF0000) >> 16);
-    if (keyCode != NX_KEYTYPE_PLAY && keyCode != NX_KEYTYPE_FAST && keyCode != NX_KEYTYPE_REWIND && keyCode != NX_KEYTYPE_PREVIOUS && keyCode != NX_KEYTYPE_NEXT)
-        return event;
-
-    if (![self shouldInterceptMediaKeyEvents])
-        return event;
-
-    [self performSelectorOnMainThread:@selector(handleAndReleaseMediaKeyEvent:) withObject:nsEvent waitUntilDone:NO];
-
-    return NULL;
-}
-
-static CGEventRef tapEventCallback(CGEventTapProxy proxy, CGEventType type, CGEventRef event, void *refcon)
-{
-    @autoreleasepool {
-        CGEventRef ret = tapEventCallback2(proxy, type, event, refcon);
-        return ret;
-    }
-}
-
-- (void)handleAndReleaseMediaKeyEvent:(NSEvent *)event
-{
-    [_delegate mediaKeyTap:self receivedMediaKeyEvent:event];
-}
-
-- (void)eventTapThread
-{
-    _tapThreadRL = CFRunLoopGetCurrent();
-    CFRunLoopAddSource(_tapThreadRL, _eventPortSource, kCFRunLoopCommonModes);
-    CFRunLoopRun();
-}
-
-
-#pragma mark -
-#pragma mark Task switching callbacks
-
-- (void)mediaKeyAppListChanged
-{
-    #ifdef DEBUG_SPMEDIAKEY_APPLIST
-    [self debugPrintAppList];
-    #endif
-
-    if([_mediaKeyAppList count] == 0)
-        return;
-
-    NSRunningApplication *thisApp = [NSRunningApplication currentApplication];
-    NSRunningApplication *otherApp = [_mediaKeyAppList firstObject];
-
-    BOOL isCurrent = [thisApp isEqual:otherApp];
-
-    [self setShouldInterceptMediaKeyEvents:isCurrent];
-}
-
-- (void)frontmostAppChanged:(NSNotification *)notification
-{
-    NSRunningApplication *app = [notification.userInfo objectForKey:NSWorkspaceApplicationKey]; 
-    if (app.bundleIdentifier == nil)
-        return;
-
-    if (![[SPMediaKeyTap mediaKeyUserBundleIdentifiers] containsObject:app.bundleIdentifier])
-        return;
-
-    [_mediaKeyAppList removeObject:app];
-    [_mediaKeyAppList insertObject:app atIndex:0];
-    [self mediaKeyAppListChanged];
-}
-
-- (void)appTerminated:(NSNotification *)notification
-{
-    NSRunningApplication *app = [notification.userInfo objectForKey:NSWorkspaceApplicationKey];
-    [_mediaKeyAppList removeObject:app];
-
-    [self mediaKeyAppListChanged];
-}
-
-#ifdef DEBUG_SPMEDIAKEY_APPLIST
-- (void)debugPrintAppList
-{
-    NSMutableString *list = [NSMutableString stringWithCapacity:255];
-    for (NSRunningApplication *app in _mediaKeyAppList) {
-        [list appendFormat:@"     - %@\n", app.bundleIdentifier];
-    }
-    NSLog(@"List: \n%@", list);
-}
-#endif
-
-@end

3rdparty/discord-rpc/CMakeLists.txt

@@ -0,0 +1,41 @@
+set(DISCORD_RPC_SOURCES
+  discord_rpc.h
+  discord_register.h
+  discord_rpc.cpp
+  discord_rpc_connection.h
+  discord_rpc_connection.cpp
+  discord_serialization.h
+  discord_serialization.cpp
+  discord_connection.h
+  discord_backoff.h
+  discord_msg_queue.h
+)
+
+if(UNIX)
+  list(APPEND DISCORD_RPC_SOURCES discord_connection_unix.cpp)
+  if(APPLE)
+    list(APPEND DISCORD_RPC_SOURCES discord_register_osx.m)
+    add_definitions(-DDISCORD_OSX)
+  else()
+    list(APPEND DISCORD_RPC_SOURCES discord_register_linux.cpp)
+    add_definitions(-DDISCORD_LINUX)
+  endif()
+endif()
+
+if(WIN32)
+  list(APPEND DISCORD_RPC_SOURCES discord_connection_win.cpp discord_register_win.cpp)
+  add_definitions(-DDISCORD_WINDOWS)
+endif()
+
+add_library(discord-rpc STATIC ${DISCORD_RPC_SOURCES})
+
+if(APPLE)
+  target_link_libraries(discord-rpc PRIVATE "-framework AppKit")
+endif()
+
+if(WIN32)
+  target_link_libraries(discord-rpc PRIVATE psapi advapi32)
+endif()
+
+target_include_directories(discord-rpc SYSTEM PRIVATE ${RapidJSON_INCLUDE_DIRS})
+target_include_directories(discord-rpc PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})

3rdparty/discord-rpc/LICENSE

@@ -0,0 +1,19 @@
+Copyright 2017 Discord, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

3rdparty/discord-rpc/README.md

@@ -0,0 +1,162 @@
+# Discord RPC
+
+## Fork Notice
+
+This library was slightly modified for Strawberry Music Player with some extra features from the new API and shared library support/more unnecessary components removed. The original repository is [here](https://github.com/discord/discord-rpc)
+
+## Deprecation Notice
+
+This library has been deprecated in favor of Discord's GameSDK. [Learn more here](https://discordapp.com/developers/docs/game-sdk/sdk-starter-guide)
+
+---
+
+This is a library for interfacing your game with a locally running Discord desktop client. It's known to work on Windows, macOS, and Linux. You can use the lib directly if you like, or use it as a guide to writing your own if it doesn't suit your game as is. PRs/feedback welcome if you have an improvement everyone might want, or can describe how this doesn't meet your needs.
+
+Included here are some quick demos that implement the very minimal subset to show current status, and
+have callbacks for where a more complete game would do more things (joining, spectating, etc).
+
+## Documentation
+
+The most up to date documentation for Rich Presence can always be found on our [developer site](https://discordapp.com/developers/docs/rich-presence/how-to)! If you're interested in rolling your own native implementation of Rich Presence via IPC sockets instead of using our SDK—hey, you've got free time, right?—check out the ["Hard Mode" documentation](https://github.com/discordapp/discord-rpc/blob/master/documentation/hard-mode.md).
+
+## Basic Usage
+
+Zeroith, you should be set up to build things because you are a game developer, right?
+
+First, head on over to the [Discord developers site](https://discordapp.com/developers/applications/me) and make yourself an app. Keep track of `Client ID` -- you'll need it here to pass to the init function.
+
+### Unreal Engine 4 Setup
+
+To use the Rich Presense plugin with Unreal Engine Projects:
+
+1.  Download the latest [release](https://github.com/discordapp/discord-rpc/releases) for each operating system you are targeting and the zipped source code
+2.  In the source code zip, copy the UE plugin—`examples/unrealstatus/Plugins/discordrpc`—to your project's plugin directory
+3.  At `[YOUR_UE_PROJECT]/Plugins/discordrpc/source/ThirdParty/DiscordRpcLibrary/`, create an `Include` folder and copy `discord_rpc.h` and `discord_register.h` to it from the zip
+4.  Follow the steps below for each OS
+5.  Build your UE4 project
+6.  Launch the editor, and enable the Discord plugin.
+
+#### Windows
+
+- At `[YOUR_UE_PROJECT]/Plugins/discordrpc/source/ThirdParty/DiscordRpcLibrary/`, create a `Win64` folder
+- Copy `lib/discord-rpc.lib` and `bin/discord-rpc.dll` from `[RELEASE_ZIP]/win64-dynamic` to the `Win64` folder
+
+#### Mac
+
+- At `[YOUR_UE_PROJECT]/Plugins/discordrpc/source/ThirdParty/DiscordRpcLibrary/`, create a `Mac` folder
+- Copy `libdiscord-rpc.dylib` from `[RELEASE_ZIP]/osx-dynamic/lib` to the `Mac` folder
+
+#### Linux
+
+- At `[YOUR_UE_PROJECT]/Plugins/discordrpc/source/ThirdParty/DiscordRpcLibrary/`, create a `Linux` folder
+- Inside, create another folder `x86_64-unknown-linux-gnu`
+- Copy `libdiscord-rpc.so` from `[RELEASE_ZIP]/linux-dynamic/lib` to `Linux/x86_64-unknown-linux-gnu`
+
+### Unity Setup
+
+If you're a Unity developer looking to integrate Rich Presence into your game, follow this simple guide to get started towards success:
+
+1. Download the DLLs for any platform that you need from [our releases](https://github.com/discordapp/discord-rpc/releases)
+2. In your Unity project, create a `Plugins` folder inside your `Assets` folder if you don't already have one
+3. Copy the file `DiscordRpc.cs` from [here](https://github.com/discordapp/discord-rpc/blob/master/examples/button-clicker/Assets/DiscordRpc.cs) into your `Assets` folder. This is basically your header file for the SDK
+
+We've got our `Plugins` folder ready, so let's get platform-specific!
+
+#### Windows
+
+4. Create `x86` and `x86_64` folders inside `Assets/Plugins/`
+5. Copy `discord-rpc-win/win64-dynamic/bin/discord-rpc.dll` to `Assets/Plugins/x86_64/`
+6. Copy `discord-rpc-win/win32-dynamic/bin/discord-rpc.dll` to `Assets/Plugins/x86/`
+7. Click on both DLLs and make sure they are targetting the correct architectures in the Unity editor properties pane
+8. Done!
+
+#### MacOS
+
+4. Copy `discord-rpc-osx/osx-dynamic/lib/libdiscord-rpc.dylib` to `Assets/Plugins/`
+5. Rename `libdiscord-rpc.dylib` to `discord-rpc.bundle`
+6. Done!
+
+#### Linux
+
+4. Copy `discord-rpc-linux/linux-dynamic-lib/libdiscord-rpc.so` to `Assets/Plugins/`
+5. Done!
+
+You're ready to roll! For code examples on how to interact with the SDK using the `DiscordRpc.cs` header file, check out [our example](https://github.com/discordapp/discord-rpc/blob/master/examples/button-clicker/Assets/DiscordController.cs)
+
+### From package
+
+Download a release package for your platform(s) -- they have subdirs with various prebuilt options, select the one you need add `/include` to your compile includes, `/lib` to your linker paths, and link with `discord-rpc`. For the dynamically linked builds, you'll need to ship the associated file along with your game.
+
+### From repo
+
+First-eth, you'll want `CMake`. There's a few different ways to install it on your system, and you should refer to [their website](https://cmake.org/install/). Many package managers provide ways of installing CMake as well.
+
+To make sure it's installed correctly, type `cmake --version` into your flavor of terminal/cmd. If you get a response with a version number, you're good to go!
+
+There's a [CMake](https://cmake.org/download/) file that should be able to generate the lib for you; Sometimes I use it like this:
+
+```sh
+    cd <path to discord-rpc>
+    mkdir build
+    cd build
+    cmake .. -DCMAKE_INSTALL_PREFIX=<path to install discord-rpc to>
+    cmake --build . --config Release --target install
+```
+
+There is a wrapper build script `build.py` that runs `cmake` with a few different options.
+
+Usually, I run `build.py` to get things started, then use the generated project files as I work on things. It does depend on `click` library, so do a quick `pip install click` to make sure you have it if you want to run `build.py`.
+
+There are some CMake options you might care about:
+
+| flag                                                                                     | default | does                                                                                                                                                  |
+| ---------------------------------------------------------------------------------------- | ------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `ENABLE_IO_THREAD`                                                                       | `ON`    | When enabled, we start up a thread to do io processing, if disabled you should call `Discord_UpdateConnection` yourself.                              |
+| `USE_STATIC_CRT`                                                                         | `OFF`   | (Windows) Enable to statically link the CRT, avoiding requiring users install the redistributable package. (The prebuilt binaries enable this option) |
+| [`BUILD_SHARED_LIBS`](https://cmake.org/cmake/help/v3.7/variable/BUILD_SHARED_LIBS.html) | `OFF`   | Build library as a DLL                                                                                                                                |
+| `WARNINGS_AS_ERRORS`                                                                     | `OFF`   | When enabled, compiles with `-Werror` (on \*nix platforms).                                                                                           |
+
+## Continuous Builds
+
+Why do we have three of these? Three times the fun!
+
+| CI                   | badge                                                                                                                                            |
+| -------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------ |
+| TravisCI             | [![Build status](https://travis-ci.org/discordapp/discord-rpc.svg?branch=master)](https://travis-ci.org/discordapp/discord-rpc)                  |
+| AppVeyor             | [![Build status](https://ci.appveyor.com/api/projects/status/qvkoc0w1c4f4b8tj?svg=true)](https://ci.appveyor.com/project/crmarsh/discord-rpc)    |
+| Buildkite (internal) | [![Build status](https://badge.buildkite.com/e103d79d247f6776605a15246352a04b8fd83d69211b836111.svg)](https://buildkite.com/discord/discord-rpc) |
+
+## Sample: send-presence
+
+This is a text adventure "game" that inits/deinits the connection to Discord, and sends a presence update on each command.
+
+## Sample: button-clicker
+
+This is a sample [Unity](https://unity3d.com/) project that wraps a DLL version of the library, and sends presence updates when you click on a button. Run `python build.py unity` in the root directory to build the correct library files and place them in their respective folders.
+
+## Sample: unrealstatus
+
+This is a sample [Unreal](https://www.unrealengine.com) project that wraps the DLL version of the library with an Unreal plugin, exposes a blueprint class for interacting with it, and uses that to make a very simple UI. Run `python build.py unreal` in the root directory to build the correct library files and place them in their respective folders.
+
+## Wrappers and Implementations
+
+Below is a table of unofficial, community-developed wrappers for and implementations of Rich Presence in various languages. If you would like to have yours added, please make a pull request adding your repository to the table. The repository should include:
+
+- The code
+- A brief ReadMe of how to use it
+- A working example
+
+###### Rich Presence Wrappers and Implementations
+
+| Name                                                                      | Language                          |
+| ------------------------------------------------------------------------- | --------------------------------- |
+| [Discord RPC C#](https://github.com/Lachee/discord-rpc-csharp)            | C#                                |
+| [Discord RPC D](https://github.com/voidblaster/discord-rpc-d)             | [D](https://dlang.org/)           |
+| [discord-rpc.jar](https://github.com/Vatuu/discord-rpc 'Discord-RPC.jar') | Java                              |
+| [java-discord-rpc](https://github.com/MinnDevelopment/java-discord-rpc)   | Java                              |
+| [Discord-IPC](https://github.com/jagrosh/DiscordIPC)                      | Java                              |
+| [Discord Rich Presence](https://npmjs.org/discord-rich-presence)          | JavaScript                        |
+| [drpc4k](https://github.com/Bluexin/drpc4k)                               | [Kotlin](https://kotlinlang.org/) |
+| [lua-discordRPC](https://github.com/pfirsich/lua-discordRPC)              | LuaJIT (FFI)                      |
+| [pypresence](https://github.com/qwertyquerty/pypresence)                  | [Python](https://python.org/)     |
+| [SwordRPC](https://github.com/Azoy/SwordRPC)                              | [Swift](https://swift.org)        |

3rdparty/discord-rpc/discord_backoff.h

@@ -0,0 +1,63 @@
+/*
+ * Copyright 2017 Discord, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+#ifndef DISCORD_BACKOFF_H
+#define DISCORD_BACKOFF_H
+
+#include <algorithm>
+#include <random>
+#include <cstdint>
+#include <ctime>
+
+namespace discord_rpc {
+
+struct Backoff {
+  int64_t minAmount;
+  int64_t maxAmount;
+  int64_t current;
+  int fails;
+  std::mt19937_64 randGenerator;
+  std::uniform_real_distribution<> randDistribution;
+
+  double rand01() { return randDistribution(randGenerator); }
+
+  Backoff(int64_t min, int64_t max)
+      : minAmount(min), maxAmount(max), current(min), fails(0), randGenerator(static_cast<uint64_t>(time(0))) {
+  }
+
+  void reset() {
+    fails = 0;
+    current = minAmount;
+  }
+
+  int64_t nextDelay() {
+    ++fails;
+    int64_t delay = static_cast<int64_t>(static_cast<double>(current) * 2.0 * rand01());
+    current = std::min(current + delay, maxAmount);
+    return current;
+  }
+};
+
+}  // namespace discord_rpc
+
+#endif  // DISCORD_BACKOFF_H

3rdparty/discord-rpc/discord_connection.h

@@ -0,0 +1,48 @@
+/*
+ * Copyright 2017 Discord, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+#ifndef DISCORD_CONNECTION_H
+#define DISCORD_CONNECTION_H
+
+// This is to wrap the platform specific kinds of connect/read/write.
+
+#include <cstdlib>
+
+namespace discord_rpc {
+
+// not really connectiony, but need per-platform
+int GetProcessId();
+
+struct BaseConnection {
+  static BaseConnection *Create();
+  static void Destroy(BaseConnection*&);
+  bool isOpen = false;
+  bool Open();
+  bool Close();
+  bool Write(const void *data, size_t length);
+  bool Read(void *data, size_t length);
+};
+
+}  // namespace discord_rpc
+
+#endif  // DISCORD_CONNECTION_H

3rdparty/discord-rpc/discord_connection_unix.cpp

@@ -0,0 +1,160 @@
+/*
+ * Copyright 2017 Discord, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+#include "discord_connection.h"
+
+#include <cerrno>
+#include <fcntl.h>
+#include <cstdio>
+#include <cstring>
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <sys/un.h>
+#include <unistd.h>
+
+namespace discord_rpc {
+
+int GetProcessId() {
+  return ::getpid();
+}
+
+struct BaseConnectionUnix : public BaseConnection {
+  int sock{ -1 };
+};
+
+static BaseConnectionUnix Connection;
+static sockaddr_un PipeAddr{};
+#ifdef MSG_NOSIGNAL
+static int MsgFlags = MSG_NOSIGNAL;
+#else
+static int MsgFlags = 0;
+#endif
+
+static const char *GetTempPath() {
+
+  const char *temp = getenv("XDG_RUNTIME_DIR");
+  temp = temp ? temp : getenv("TMPDIR");
+  temp = temp ? temp : getenv("TMP");
+  temp = temp ? temp : getenv("TEMP");
+  temp = temp ? temp : "/tmp";
+
+  return temp;
+
+}
+
+BaseConnection *BaseConnection::Create() {
+  PipeAddr.sun_family = AF_UNIX;
+  return &Connection;
+}
+
+void BaseConnection::Destroy(BaseConnection *&c) {
+
+  auto self = reinterpret_cast<BaseConnectionUnix*>(c);
+  self->Close();
+  c = nullptr;
+
+}
+
+bool BaseConnection::Open() {
+
+  const char *tempPath = GetTempPath();
+  auto self = reinterpret_cast<BaseConnectionUnix*>(this);
+  self->sock = socket(AF_UNIX, SOCK_STREAM, 0);
+  if (self->sock == -1) {
+    return false;
+  }
+  fcntl(self->sock, F_SETFL, O_NONBLOCK);
+#ifdef SO_NOSIGPIPE
+  int optval = 1;
+  setsockopt(self->sock, SOL_SOCKET, SO_NOSIGPIPE, &optval, sizeof(optval));
+#endif
+
+  for (int pipeNum = 0; pipeNum < 10; ++pipeNum) {
+    snprintf(PipeAddr.sun_path, sizeof(PipeAddr.sun_path), "%s/discord-ipc-%d", tempPath, pipeNum);
+    int err = connect(self->sock, reinterpret_cast<const sockaddr*>(&PipeAddr), sizeof(PipeAddr));
+    if (err == 0) {
+      self->isOpen = true;
+      return true;
+    }
+  }
+  self->Close();
+
+  return false;
+
+}
+
+bool BaseConnection::Close() {
+
+  auto self = reinterpret_cast<BaseConnectionUnix*>(this);
+  if (self->sock == -1) {
+    return false;
+  }
+  close(self->sock);
+  self->sock = -1;
+  self->isOpen = false;
+
+  return true;
+
+}
+
+bool BaseConnection::Write(const void *data, size_t length) {
+
+  auto self = reinterpret_cast<BaseConnectionUnix*>(this);
+
+  if (self->sock == -1) {
+    return false;
+  }
+
+  ssize_t sentBytes = send(self->sock, data, length, MsgFlags);
+  if (sentBytes < 0) {
+    Close();
+  }
+
+  return sentBytes == static_cast<ssize_t>(length);
+
+}
+
+bool BaseConnection::Read(void *data, size_t length) {
+
+  auto self = reinterpret_cast<BaseConnectionUnix*>(this);
+
+  if (self->sock == -1) {
+    return false;
+  }
+
+  long res = recv(self->sock, data, length, MsgFlags);
+  if (res < 0) {
+    if (errno == EAGAIN) {
+      return false;
+    }
+    Close();
+  }
+  else if (res == 0) {
+    Close();
+  }
+
+  return static_cast<size_t>(res) == length;
+
+}
+
+}  // namespace discord_rpc

3rdparty/discord-rpc/discord_connection_win.cpp

@@ -0,0 +1,160 @@
+/*
+ * Copyright 2017 Discord, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+#include "discord_connection.h"
+
+#define WIN32_LEAN_AND_MEAN
+#define NOMCX
+#define NOSERVICE
+#define NOIME
+
+#include <cassert>
+#include <windows.h>
+
+namespace discord_rpc {
+
+int GetProcessId() {
+  return static_cast<int>(::GetCurrentProcessId());
+}
+
+struct BaseConnectionWin : public BaseConnection {
+  HANDLE pipe{ INVALID_HANDLE_VALUE };
+};
+
+static BaseConnectionWin Connection;
+
+BaseConnection *BaseConnection::Create() {
+  return &Connection;
+}
+
+void BaseConnection::Destroy(BaseConnection *&c) {
+
+  auto self = reinterpret_cast<BaseConnectionWin*>(c);
+  self->Close();
+  c = nullptr;
+
+}
+
+bool BaseConnection::Open() {
+
+  wchar_t pipeName[]{ L"\\\\?\\pipe\\discord-ipc-0" };
+  const size_t pipeDigit = sizeof(pipeName) / sizeof(wchar_t) - 2;
+  pipeName[pipeDigit] = L'0';
+  auto self = reinterpret_cast<BaseConnectionWin*>(this);
+  for (;;) {
+    self->pipe = ::CreateFileW(pipeName, GENERIC_READ | GENERIC_WRITE, 0, nullptr, OPEN_EXISTING, 0, nullptr);
+    if (self->pipe != INVALID_HANDLE_VALUE) {
+      self->isOpen = true;
+      return true;
+    }
+
+    auto lastError = GetLastError();
+    if (lastError == ERROR_FILE_NOT_FOUND) {
+      if (pipeName[pipeDigit] < L'9') {
+        pipeName[pipeDigit]++;
+        continue;
+      }
+    }
+    else if (lastError == ERROR_PIPE_BUSY) {
+      if (!WaitNamedPipeW(pipeName, 10000)) {
+        return false;
+      }
+      continue;
+    }
+    return false;
+  }
+
+}
+
+bool BaseConnection::Close() {
+
+  auto self = reinterpret_cast<BaseConnectionWin*>(this);
+  ::CloseHandle(self->pipe);
+  self->pipe = INVALID_HANDLE_VALUE;
+  self->isOpen = false;
+
+  return true;
+
+}
+
+bool BaseConnection::Write(const void *data, size_t length) {
+
+  if (length == 0) {
+    return true;
+  }
+  auto self = reinterpret_cast<BaseConnectionWin*>(this);
+  assert(self);
+  if (!self) {
+    return false;
+  }
+  if (self->pipe == INVALID_HANDLE_VALUE) {
+    return false;
+  }
+  assert(data);
+  if (!data) {
+    return false;
+  }
+  const DWORD bytesLength = static_cast<DWORD>(length);
+  DWORD bytesWritten = 0;
+
+  return ::WriteFile(self->pipe, data, bytesLength, &bytesWritten, nullptr) == TRUE && bytesWritten == bytesLength;
+
+}
+
+bool BaseConnection::Read(void *data, size_t length) {
+
+  assert(data);
+  if (!data) {
+    return false;
+  }
+  auto self = reinterpret_cast<BaseConnectionWin*>(this);
+  assert(self);
+  if (!self) {
+    return false;
+  }
+  if (self->pipe == INVALID_HANDLE_VALUE) {
+    return false;
+  }
+  DWORD bytesAvailable = 0;
+  if (::PeekNamedPipe(self->pipe, nullptr, 0, nullptr, &bytesAvailable, nullptr)) {
+    if (bytesAvailable >= length) {
+      DWORD bytesToRead = static_cast<DWORD>(length);
+      DWORD bytesRead = 0;
+      if (::ReadFile(self->pipe, data, bytesToRead, &bytesRead, nullptr) == TRUE) {
+        assert(bytesToRead == bytesRead);
+        return true;
+      }
+      else {
+        Close();
+      }
+    }
+  }
+  else {
+    Close();
+  }
+
+  return false;
+
+}
+
+}  // namespace discord_rpc

3rdparty/discord-rpc/discord_msg_queue.h

@@ -0,0 +1,64 @@
+/*
+ * Copyright 2017 Discord, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+#ifndef DISCORD_MSG_QUEUE_H
+#define DISCORD_MSG_QUEUE_H
+
+#include <atomic>
+
+// A simple queue. No locks, but only works with a single thread as producer and a single thread as
+// a consumer. Mutex up as needed.
+
+namespace discord_rpc {
+
+template<typename ElementType, std::size_t QueueSize>
+class MsgQueue {
+  ElementType queue_[QueueSize];
+  std::atomic_uint nextAdd_{ 0 };
+  std::atomic_uint nextSend_{ 0 };
+  std::atomic_uint pendingSends_{ 0 };
+
+ public:
+  MsgQueue() {}
+
+  ElementType *GetNextAddMessage() {
+    // if we are falling behind, bail
+    if (pendingSends_.load() >= QueueSize) {
+      return nullptr;
+    }
+    auto index = (nextAdd_++) % QueueSize;
+    return &queue_[index];
+  }
+  void CommitAdd() { ++pendingSends_; }
+
+  bool HavePendingSends() const { return pendingSends_.load() != 0; }
+  ElementType *GetNextSendMessage() {
+    auto index = (nextSend_++) % QueueSize;
+    return &queue_[index];
+  }
+  void CommitSend() { --pendingSends_; }
+};
+
+}  // namespace discord_rpc
+
+#endif  // DISCORD_MSG_QUEUE_H

3rdparty/discord-rpc/discord_register.h

@@ -0,0 +1,37 @@
+/*
+ * Copyright 2017 Discord, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+#ifndef DISCORD_REGISTER_H
+#define DISCORD_REGISTER_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void Discord_Register(const char *applicationId, const char *command);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // DISCORD_REGISTER_H

3rdparty/discord-rpc/discord_register_linux.cpp

@@ -0,0 +1,120 @@
+/*
+ * Copyright 2017 Discord, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+#include "discord_rpc.h"
+#include "discord_register.h"
+
+#include <cstdio>
+#include <errno.h>
+#include <cstdlib>
+#include <cstring>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
+
+namespace {
+
+static bool Mkdir(const char *path) {
+  int result = mkdir(path, 0755);
+  if (result == 0) {
+    return true;
+  }
+  if (errno == EEXIST) {
+    return true;
+  }
+  return false;
+}
+
+}  // namespace
+
+// We want to register games so we can run them from Discord client as discord-<appid>://
+extern "C" void Discord_Register(const char *applicationId, const char *command) {
+
+  // Add a desktop file and update some mime handlers so that xdg-open does the right thing.
+
+  const char *home = getenv("HOME");
+  if (!home) {
+    return;
+  }
+
+  char exePath[1024]{};
+  if (!command || !command[0]) {
+    const ssize_t size = readlink("/proc/self/exe", exePath, sizeof(exePath));
+    if (size <= 0 || size >= static_cast<ssize_t>(sizeof(exePath))) {
+      return;
+    }
+    exePath[size] = '\0';
+    command = exePath;
+  }
+
+  constexpr char desktopFileFormat[] = "[Desktop Entry]\n"
+                                       "Name=Game %s\n"
+                                       "Exec=%s %%u\n"  // note: it really wants that %u in there
+                                       "Type=Application\n"
+                                       "NoDisplay=true\n"
+                                       "Categories=Discord;Games;\n"
+                                       "MimeType=x-scheme-handler/discord-%s;\n";
+  char desktopFile[2048]{};
+  int fileLen = snprintf(desktopFile, sizeof(desktopFile), desktopFileFormat, applicationId, command, applicationId);
+  if (fileLen <= 0) {
+    return;
+  }
+
+  char desktopFilename[256]{};
+  (void)snprintf(desktopFilename, sizeof(desktopFilename), "/discord-%s.desktop", applicationId);
+
+  char desktopFilePath[1024]{};
+  (void)snprintf(desktopFilePath, sizeof(desktopFilePath), "%s/.local", home);
+  if (!Mkdir(desktopFilePath)) {
+    return;
+  }
+  strcat(desktopFilePath, "/share");
+  if (!Mkdir(desktopFilePath)) {
+    return;
+  }
+  strcat(desktopFilePath, "/applications");
+  if (!Mkdir(desktopFilePath)) {
+    return;
+  }
+  strcat(desktopFilePath, desktopFilename);
+
+  FILE *fp = fopen(desktopFilePath, "w");
+  if (fp) {
+    fwrite(desktopFile, 1, fileLen, fp);
+    fclose(fp);
+  }
+  else {
+    return;
+  }
+
+  char xdgMimeCommand[1024]{};
+  snprintf(xdgMimeCommand,
+           sizeof(xdgMimeCommand),
+           "xdg-mime default discord-%s.desktop x-scheme-handler/discord-%s",
+           applicationId,
+           applicationId);
+  if (system(xdgMimeCommand) < 0) {
+    fprintf(stderr, "Failed to register mime handler\n");
+  }
+
+}

3rdparty/discord-rpc/discord_register_osx.m

@@ -0,0 +1,99 @@
+/*
+ * Copyright 2017 Discord, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+#include <stdio.h>
+#include <sys/stat.h>
+
+#import <AppKit/AppKit.h>
+
+#include "discord_register.h"
+
+static void RegisterCommand(const char *applicationId, const char *command) {
+
+  // There does not appear to be a way to register arbitrary commands on OSX, so instead we'll save the command
+  // to a file in the Discord config path, and when it is needed, Discord can try to load the file there, open
+  // the command therein (will pass to js's window.open, so requires a url-like thing)
+
+  // Note: will not work for sandboxed apps
+  NSString *home = NSHomeDirectory();
+  if (!home) {
+    return;
+  }
+
+  NSString *path = [[[[[[home stringByAppendingPathComponent:@"Library"]
+                              stringByAppendingPathComponent:@"Application Support"]
+                              stringByAppendingPathComponent:@"discord"]
+                              stringByAppendingPathComponent:@"games"]
+                              stringByAppendingPathComponent:[NSString stringWithUTF8String:applicationId]]
+                              stringByAppendingPathExtension:@"json"];
+  [[NSFileManager defaultManager] createDirectoryAtPath:[path stringByDeletingLastPathComponent] withIntermediateDirectories:YES attributes:nil error:nil];
+
+  NSString *jsonBuffer = [NSString stringWithFormat:@"{\"command\": \"%s\"}", command];
+  [jsonBuffer writeToFile:path atomically:NO encoding:NSUTF8StringEncoding error:nil];
+
+}
+
+static void RegisterURL(const char *applicationId) {
+
+  char url[256];
+  snprintf(url, sizeof(url), "discord-%s", applicationId);
+  CFStringRef cfURL = CFStringCreateWithCString(NULL, url, kCFStringEncodingUTF8);
+
+  NSString* myBundleId = [[NSBundle mainBundle] bundleIdentifier];
+  if (!myBundleId) {
+    fprintf(stderr, "No bundle id found\n");
+    return;
+  }
+
+  NSURL* myURL = [[NSBundle mainBundle] bundleURL];
+  if (!myURL) {
+    fprintf(stderr, "No bundle url found\n");
+    return;
+  }
+
+  OSStatus status = LSSetDefaultHandlerForURLScheme(cfURL, (__bridge CFStringRef)myBundleId);
+  if (status != noErr) {
+    fprintf(stderr, "Error in LSSetDefaultHandlerForURLScheme: %d\n", (int)status);
+    return;
+  }
+
+  status = LSRegisterURL((__bridge CFURLRef)myURL, true);
+  if (status != noErr) {
+    fprintf(stderr, "Error in LSRegisterURL: %d\n", (int)status);
+  }
+
+}
+
+void Discord_Register(const char *applicationId, const char *command) {
+
+  if (command) {
+    RegisterCommand(applicationId, command);
+  }
+  else {
+    // raii lite
+    @autoreleasepool {
+      RegisterURL(applicationId);
+    }
+  }
+
+}

3rdparty/discord-rpc/discord_register_win.cpp

@@ -0,0 +1,165 @@
+/*
+ * Copyright 2017 Discord, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+#include "discord_rpc.h"
+#include "discord_register.h"
+
+#define WIN32_LEAN_AND_MEAN
+#define NOMCX
+#define NOSERVICE
+#define NOIME
+
+#include <windows.h>
+#include <psapi.h>
+#include <cstdio>
+
+/**
+ * Updated fixes for MinGW and WinXP
+ * This block is written the way it does not involve changing the rest of the code
+ * Checked to be compiling
+ * 1) strsafe.h belongs to Windows SDK and cannot be added to MinGW
+ * #include guarded, functions redirected to <string.h> substitutes
+ * 2) RegSetKeyValueW and LSTATUS are not declared in <winreg.h>
+ * The entire function is rewritten
+ */
+#ifdef __MINGW32__
+#  include <wchar.h>
+/// strsafe.h fixes
+static HRESULT StringCbPrintfW(LPWSTR pszDest, size_t cbDest, LPCWSTR pszFormat, ...) {
+  HRESULT ret;
+  va_list va;
+  va_start(va, pszFormat);
+  cbDest /= 2;  // Size is divided by 2 to convert from bytes to wide characters - causes segfault
+                // othervise
+  ret = vsnwprintf(pszDest, cbDest, pszFormat, va);
+  pszDest[cbDest - 1] = 0;  // Terminate the string in case a buffer overflow; -1 will be returned
+  va_end(va);
+  return ret;
+}
+#else
+#  include <cwchar>
+#  include <strsafe.h>
+#endif  // __MINGW32__
+
+/// winreg.h fixes
+#ifndef LSTATUS
+#  define LSTATUS LONG
+#endif
+#ifdef RegSetKeyValueW
+#  undefine RegSetKeyValueW
+#endif
+#define RegSetKeyValueW regset
+
+static LSTATUS regset(HKEY hkey, LPCWSTR subkey, LPCWSTR name, DWORD type, const void *data, DWORD len) {
+
+  HKEY htkey = hkey, hsubkey = nullptr;
+  LSTATUS ret;
+  if (subkey && subkey[0]) {
+    if ((ret = RegCreateKeyExW(hkey, subkey, 0, 0, 0, KEY_ALL_ACCESS, 0, &hsubkey, 0)) !=
+        ERROR_SUCCESS)
+      return ret;
+    htkey = hsubkey;
+  }
+  ret = RegSetValueExW(htkey, name, 0, type, static_cast<const BYTE*>(data), len);
+  if (hsubkey && hsubkey != hkey)
+    RegCloseKey(hsubkey);
+  return ret;
+
+}
+
+static void Discord_RegisterW(const wchar_t *applicationId, const wchar_t *command) {
+
+  // https://msdn.microsoft.com/en-us/library/aa767914(v=vs.85).aspx
+  // we want to register games so we can run them as discord-<appid>://
+  // Update the HKEY_CURRENT_USER, because it doesn't seem to require special permissions.
+
+  wchar_t exeFilePath[MAX_PATH]{};
+  DWORD exeLen = GetModuleFileNameW(nullptr, exeFilePath, MAX_PATH);
+  wchar_t openCommand[1024]{};
+
+  if (command && command[0]) {
+    StringCbPrintfW(openCommand, sizeof(openCommand), L"%s", command);
+  }
+  else {
+    // StringCbCopyW(openCommand, sizeof(openCommand), exeFilePath);
+    StringCbPrintfW(openCommand, sizeof(openCommand), L"%s", exeFilePath);
+  }
+
+  wchar_t protocolName[64]{};
+  StringCbPrintfW(protocolName, sizeof(protocolName), L"discord-%s", applicationId);
+  wchar_t protocolDescription[128]{};
+  StringCbPrintfW(protocolDescription, sizeof(protocolDescription), L"URL:Run game %s protocol", applicationId);
+  wchar_t urlProtocol = 0;
+
+  wchar_t keyName[256]{};
+  StringCbPrintfW(keyName, sizeof(keyName), L"Software\\Classes\\%s", protocolName);
+  HKEY key;
+  auto status = RegCreateKeyExW(HKEY_CURRENT_USER, keyName, 0, nullptr, 0, KEY_WRITE, nullptr, &key, nullptr);
+  if (status != ERROR_SUCCESS) {
+    fprintf(stderr, "Error creating key\n");
+    return;
+  }
+  DWORD len;
+  LSTATUS result;
+  len = static_cast<DWORD>(lstrlenW(protocolDescription) + 1);
+  result = RegSetKeyValueW(key, nullptr, nullptr, REG_SZ, protocolDescription, len * sizeof(wchar_t));
+  if (FAILED(result)) {
+    fprintf(stderr, "Error writing description\n");
+  }
+
+  len = static_cast<DWORD>(lstrlenW(protocolDescription) + 1);
+  result = RegSetKeyValueW(key, nullptr, L"URL Protocol", REG_SZ, &urlProtocol, sizeof(wchar_t));
+  if (FAILED(result)) {
+    fprintf(stderr, "Error writing description\n");
+  }
+
+  result = RegSetKeyValueW(key, L"DefaultIcon", nullptr, REG_SZ, exeFilePath, (exeLen + 1) * sizeof(wchar_t));
+  if (FAILED(result)) {
+    fprintf(stderr, "Error writing icon\n");
+  }
+
+  len = static_cast<DWORD>(lstrlenW(openCommand) + 1);
+  result = RegSetKeyValueW(key, L"shell\\open\\command", nullptr, REG_SZ, openCommand, len * sizeof(wchar_t));
+  if (FAILED(result)) {
+    fprintf(stderr, "Error writing command\n");
+  }
+  RegCloseKey(key);
+
+}
+
+extern "C" void Discord_Register(const char *applicationId, const char *command) {
+
+  wchar_t appId[32]{};
+  MultiByteToWideChar(CP_UTF8, 0, applicationId, -1, appId, 32);
+
+  wchar_t openCommand[1024]{};
+  const wchar_t *wcommand = nullptr;
+  if (command && command[0]) {
+    const auto commandBufferLen = sizeof(openCommand) / sizeof(*openCommand);
+    MultiByteToWideChar(CP_UTF8, 0, command, -1, openCommand, commandBufferLen);
+    wcommand = openCommand;
+  }
+
+  Discord_RegisterW(appId, wcommand);
+
+}

3rdparty/discord-rpc/discord_rpc.cpp

@@ -0,0 +1,510 @@
+/*
+ * Copyright 2017 Discord, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+#include <atomic>
+#include <chrono>
+#include <mutex>
+#include <condition_variable>
+#include <thread>
+
+#include "discord_rpc.h"
+#include "discord_backoff.h"
+#include "discord_register.h"
+#include "discord_msg_queue.h"
+#include "discord_rpc_connection.h"
+#include "discord_serialization.h"
+
+using namespace discord_rpc;
+
+static void Discord_UpdateConnection();
+
+namespace {
+
+constexpr size_t MaxMessageSize{ 16 * 1024 };
+constexpr size_t MessageQueueSize{ 8 };
+constexpr size_t JoinQueueSize{ 8 };
+
+struct QueuedMessage {
+  size_t length;
+  char buffer[MaxMessageSize];
+
+  void Copy(const QueuedMessage &other) {
+    length = other.length;
+    if (length) {
+      memcpy(buffer, other.buffer, length);
+    }
+  }
+};
+
+struct User {
+  // snowflake (64bit int), turned into a ascii decimal string, at most 20 chars +1 null
+  // terminator = 21
+  char userId[32];
+  // 32 unicode glyphs is max name size => 4 bytes per glyph in the worst case, +1 for null
+  // terminator = 129
+  char username[344];
+  // 4 decimal digits + 1 null terminator = 5
+  char discriminator[8];
+  // optional 'a_' + md5 hex digest (32 bytes) + null terminator = 35
+  char avatar[128];
+  // Rounded way up because I'm paranoid about games breaking from future changes in these sizes
+};
+
+static RpcConnection *Connection{ nullptr };
+static DiscordEventHandlers QueuedHandlers{};
+static DiscordEventHandlers Handlers{};
+static std::atomic_bool WasJustConnected{ false };
+static std::atomic_bool WasJustDisconnected{ false };
+static std::atomic_bool GotErrorMessage{ false };
+static std::atomic_bool WasJoinGame{ false };
+static std::atomic_bool WasSpectateGame{ false };
+static std::atomic_bool UpdatePresence{ false };
+static char JoinGameSecret[256];
+static char SpectateGameSecret[256];
+static int LastErrorCode{ 0 };
+static char LastErrorMessage[256];
+static int LastDisconnectErrorCode{ 0 };
+static char LastDisconnectErrorMessage[256];
+static std::mutex PresenceMutex;
+static std::mutex HandlerMutex;
+static QueuedMessage QueuedPresence{};
+static MsgQueue<QueuedMessage, MessageQueueSize> SendQueue;
+static MsgQueue<User, JoinQueueSize> JoinAskQueue;
+static User connectedUser;
+
+// We want to auto connect, and retry on failure, but not as fast as possible. This does expoential backoff from 0.5 seconds to 1 minute
+static Backoff ReconnectTimeMs(500, 60 * 1000);
+static auto NextConnect = std::chrono::system_clock::now();
+static int Pid{ 0 };
+static int Nonce{ 1 };
+
+class IoThreadHolder {
+ private:
+  std::atomic_bool keepRunning{ true };
+  std::mutex waitForIOMutex;
+  std::condition_variable waitForIOActivity;
+  std::thread ioThread;
+
+ public:
+  void Start() {
+    keepRunning.store(true);
+    ioThread = std::thread([&]() {
+        const std::chrono::duration<int64_t, std::milli> maxWait { 500LL };
+        Discord_UpdateConnection();
+        while (keepRunning.load()) {
+          std::unique_lock<std::mutex> lock(waitForIOMutex);
+          waitForIOActivity.wait_for(lock, maxWait);
+          Discord_UpdateConnection();
+        }
+      });
+  }
+
+  void Notify() { waitForIOActivity.notify_all(); }
+
+  void Stop() {
+    keepRunning.exchange(false);
+    Notify();
+    if (ioThread.joinable()) {
+      ioThread.join();
+    }
+  }
+
+  ~IoThreadHolder() { Stop(); }
+};
+
+static IoThreadHolder *IoThread{ nullptr };
+
+static void UpdateReconnectTime() {
+
+  NextConnect = std::chrono::system_clock::now() + std::chrono::duration<int64_t, std::milli> { ReconnectTimeMs.nextDelay() };
+
+}
+
+static void SignalIOActivity() {
+
+  if (IoThread != nullptr) {
+    IoThread->Notify();
+  }
+
+}
+
+static bool RegisterForEvent(const char *evtName) {
+
+  auto qmessage = SendQueue.GetNextAddMessage();
+  if (qmessage) {
+    qmessage->length = JsonWriteSubscribeCommand(qmessage->buffer, sizeof(qmessage->buffer), Nonce++, evtName);
+    SendQueue.CommitAdd();
+    SignalIOActivity();
+    return true;
+  }
+
+  return false;
+
+}
+
+static bool DeregisterForEvent(const char *evtName) {
+
+  auto qmessage = SendQueue.GetNextAddMessage();
+  if (qmessage) {
+    qmessage->length = JsonWriteUnsubscribeCommand(qmessage->buffer, sizeof(qmessage->buffer), Nonce++, evtName);
+    SendQueue.CommitAdd();
+    SignalIOActivity();
+    return true;
+  }
+
+  return false;
+
+}
+
+} // namespace
+
+static void Discord_UpdateConnection() {
+
+  if (!Connection) {
+    return;
+  }
+
+  if (!Connection->IsOpen()) {
+    if (std::chrono::system_clock::now() >= NextConnect) {
+      UpdateReconnectTime();
+      Connection->Open();
+    }
+  }
+  else {
+    // reads
+
+    for (;;) {
+      JsonDocument message;
+
+      if (!Connection->Read(message)) {
+        break;
+      }
+
+      const char *evtName = GetStrMember(&message, "evt");
+      const char *nonce = GetStrMember(&message, "nonce");
+
+      if (nonce) {
+        // in responses only -- should use to match up response when needed.
+
+        if (evtName && strcmp(evtName, "ERROR") == 0) {
+          auto data = GetObjMember(&message, "data");
+          LastErrorCode = GetIntMember(data, "code");
+          StringCopy(LastErrorMessage, GetStrMember(data, "message", ""));
+          GotErrorMessage.store(true);
+        }
+      }
+      else {
+        // should have evt == name of event, optional data
+        if (evtName == nullptr) {
+          continue;
+        }
+
+        auto data = GetObjMember(&message, "data");
+
+        if (strcmp(evtName, "ACTIVITY_JOIN") == 0) {
+          auto secret = GetStrMember(data, "secret");
+          if (secret) {
+            StringCopy(JoinGameSecret, secret);
+            WasJoinGame.store(true);
+          }
+        }
+        else if (strcmp(evtName, "ACTIVITY_SPECTATE") == 0) {
+          auto secret = GetStrMember(data, "secret");
+          if (secret) {
+            StringCopy(SpectateGameSecret, secret);
+            WasSpectateGame.store(true);
+          }
+        }
+        else if (strcmp(evtName, "ACTIVITY_JOIN_REQUEST") == 0) {
+          auto user = GetObjMember(data, "user");
+          auto userId = GetStrMember(user, "id");
+          auto username = GetStrMember(user, "username");
+          auto avatar = GetStrMember(user, "avatar");
+          auto joinReq = JoinAskQueue.GetNextAddMessage();
+          if (userId && username && joinReq) {
+            StringCopy(joinReq->userId, userId);
+            StringCopy(joinReq->username, username);
+            auto discriminator = GetStrMember(user, "discriminator");
+            if (discriminator) {
+              StringCopy(joinReq->discriminator, discriminator);
+            }
+            if (avatar) {
+              StringCopy(joinReq->avatar, avatar);
+            }
+            else {
+              joinReq->avatar[0] = 0;
+            }
+            JoinAskQueue.CommitAdd();
+          }
+        }
+      }
+    }
+
+    // writes
+    if (UpdatePresence.exchange(false) && QueuedPresence.length) {
+      QueuedMessage local;
+      {
+        std::lock_guard<std::mutex> guard(PresenceMutex);
+        local.Copy(QueuedPresence);
+      }
+      if (!Connection->Write(local.buffer, local.length)) {
+        // if we fail to send, requeue
+        std::lock_guard<std::mutex> guard(PresenceMutex);
+        QueuedPresence.Copy(local);
+        UpdatePresence.exchange(true);
+      }
+    }
+
+    while (SendQueue.HavePendingSends()) {
+      auto qmessage = SendQueue.GetNextSendMessage();
+      Connection->Write(qmessage->buffer, qmessage->length);
+      SendQueue.CommitSend();
+    }
+  }
+
+}
+
+extern "C" void Discord_Initialize(const char *applicationId, DiscordEventHandlers *handlers, const int autoRegister) {
+
+  IoThread = new (std::nothrow) IoThreadHolder();
+  if (IoThread == nullptr) {
+    return;
+  }
+
+  if (autoRegister) {
+    Discord_Register(applicationId, nullptr);
+  }
+
+  Pid = GetProcessId();
+
+  {
+    std::lock_guard<std::mutex> guard(HandlerMutex);
+
+    if (handlers) {
+      QueuedHandlers = *handlers;
+    }
+    else {
+      QueuedHandlers = {};
+    }
+
+    Handlers = {};
+  }
+
+  if (Connection) {
+    return;
+  }
+
+  Connection = RpcConnection::Create(applicationId);
+  Connection->onConnect = [](JsonDocument &readyMessage) {
+    Discord_UpdateHandlers(&QueuedHandlers);
+    if (QueuedPresence.length > 0) {
+      UpdatePresence.exchange(true);
+      SignalIOActivity();
+    }
+    auto data = GetObjMember(&readyMessage, "data");
+    auto user = GetObjMember(data, "user");
+    auto userId = GetStrMember(user, "id");
+    auto username = GetStrMember(user, "username");
+    auto avatar = GetStrMember(user, "avatar");
+    if (userId && username) {
+      StringCopy(connectedUser.userId, userId);
+      StringCopy(connectedUser.username, username);
+      auto discriminator = GetStrMember(user, "discriminator");
+      if (discriminator) {
+        StringCopy(connectedUser.discriminator, discriminator);
+      }
+      if (avatar) {
+        StringCopy(connectedUser.avatar, avatar);
+      }
+      else {
+        connectedUser.avatar[0] = 0;
+      }
+    }
+    WasJustConnected.exchange(true);
+    ReconnectTimeMs.reset();
+  };
+  Connection->onDisconnect = [](int err, const char *message) {
+    LastDisconnectErrorCode = err;
+    StringCopy(LastDisconnectErrorMessage, message);
+    WasJustDisconnected.exchange(true);
+    UpdateReconnectTime();
+  };
+
+  IoThread->Start();
+
+}
+
+extern "C" void Discord_Shutdown() {
+
+  if (!Connection) {
+    return;
+  }
+  Connection->onConnect = nullptr;
+  Connection->onDisconnect = nullptr;
+  Handlers = {};
+  QueuedPresence.length = 0;
+  UpdatePresence.exchange(false);
+  if (IoThread != nullptr) {
+    IoThread->Stop();
+    delete IoThread;
+    IoThread = nullptr;
+  }
+
+  RpcConnection::Destroy(Connection);
+
+}
+
+extern "C" void Discord_UpdatePresence(const DiscordRichPresence *presence) {
+
+  {
+    std::lock_guard<std::mutex> guard(PresenceMutex);
+    QueuedPresence.length = JsonWriteRichPresenceObj(QueuedPresence.buffer, sizeof(QueuedPresence.buffer), Nonce++, Pid, presence);
+    UpdatePresence.exchange(true);
+  }
+
+  SignalIOActivity();
+
+}
+
+extern "C" void Discord_ClearPresence(void) {
+  Discord_UpdatePresence(nullptr);
+}
+
+extern "C" void Discord_Respond(const char *userId, /* DISCORD_REPLY_ */ int reply) {
+
+  // if we are not connected, let's not batch up stale messages for later
+  if (!Connection || !Connection->IsOpen()) {
+    return;
+  }
+  auto qmessage = SendQueue.GetNextAddMessage();
+  if (qmessage) {
+    qmessage->length = JsonWriteJoinReply(qmessage->buffer, sizeof(qmessage->buffer), userId, reply, Nonce++);
+    SendQueue.CommitAdd();
+    SignalIOActivity();
+  }
+
+}
+
+extern "C" void Discord_RunCallbacks() {
+
+  // Note on some weirdness: internally we might connect, get other signals, disconnect any number
+  // of times inbetween calls here. Externally, we want the sequence to seem sane, so any other
+  // signals are book-ended by calls to ready and disconnect.
+
+  if (!Connection) {
+    return;
+  }
+
+  const bool wasDisconnected = WasJustDisconnected.exchange(false);
+  const bool isConnected = Connection->IsOpen();
+
+  if (isConnected) {
+    // if we are connected, disconnect cb first
+    std::lock_guard<std::mutex> guard(HandlerMutex);
+    if (wasDisconnected && Handlers.disconnected) {
+      Handlers.disconnected(LastDisconnectErrorCode, LastDisconnectErrorMessage);
+    }
+  }
+
+  if (WasJustConnected.exchange(false)) {
+    std::lock_guard<std::mutex> guard(HandlerMutex);
+    if (Handlers.ready) {
+      DiscordUser du{ connectedUser.userId, connectedUser.username, connectedUser.discriminator, connectedUser.avatar };
+      Handlers.ready(&du);
+    }
+  }
+
+  if (GotErrorMessage.exchange(false)) {
+    std::lock_guard<std::mutex> guard(HandlerMutex);
+    if (Handlers.errored) {
+      Handlers.errored(LastErrorCode, LastErrorMessage);
+    }
+  }
+
+  if (WasJoinGame.exchange(false)) {
+    std::lock_guard<std::mutex> guard(HandlerMutex);
+    if (Handlers.joinGame) {
+      Handlers.joinGame(JoinGameSecret);
+    }
+  }
+
+  if (WasSpectateGame.exchange(false)) {
+    std::lock_guard<std::mutex> guard(HandlerMutex);
+    if (Handlers.spectateGame) {
+      Handlers.spectateGame(SpectateGameSecret);
+    }
+  }
+
+  // Right now this batches up any requests and sends them all in a burst; I could imagine a world
+  // where the implementer would rather sequentially accept/reject each one before the next invite
+  // is sent. I left it this way because I could also imagine wanting to process these all and
+  // maybe show them in one common dialog and/or start fetching the avatars in parallel, and if
+  // not it should be trivial for the implementer to make a queue themselves.
+  while (JoinAskQueue.HavePendingSends()) {
+    const auto req = JoinAskQueue.GetNextSendMessage();
+    {
+      std::lock_guard<std::mutex> guard(HandlerMutex);
+      if (Handlers.joinRequest) {
+        DiscordUser du{ req->userId, req->username, req->discriminator, req->avatar };
+        Handlers.joinRequest(&du);
+      }
+    }
+    JoinAskQueue.CommitSend();
+  }
+
+  if (!isConnected) {
+    // if we are not connected, disconnect message last
+    std::lock_guard<std::mutex> guard(HandlerMutex);
+    if (wasDisconnected && Handlers.disconnected) {
+      Handlers.disconnected(LastDisconnectErrorCode, LastDisconnectErrorMessage);
+    }
+  }
+
+}
+
+extern "C" void Discord_UpdateHandlers(DiscordEventHandlers *newHandlers) {
+
+  if (newHandlers) {
+#define HANDLE_EVENT_REGISTRATION(handler_name, event)            \
+        if (!Handlers.handler_name && newHandlers->handler_name) {      \
+          RegisterForEvent(event);                                      \
+        }                                                               \
+        else if (Handlers.handler_name && !newHandlers->handler_name) { \
+          DeregisterForEvent(event);                                    \
+        }
+
+    std::lock_guard<std::mutex> guard(HandlerMutex);
+    HANDLE_EVENT_REGISTRATION(joinGame, "ACTIVITY_JOIN")
+    HANDLE_EVENT_REGISTRATION(spectateGame, "ACTIVITY_SPECTATE")
+    HANDLE_EVENT_REGISTRATION(joinRequest, "ACTIVITY_JOIN_REQUEST")
+
+#undef HANDLE_EVENT_REGISTRATION
+
+    Handlers = *newHandlers;
+  }
+  else {
+    std::lock_guard<std::mutex> guard(HandlerMutex);
+    Handlers = {};
+  }
+
+}

3rdparty/discord-rpc/discord_rpc.h

@@ -0,0 +1,94 @@
+/*
+ * Copyright 2017 Discord, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+#ifndef DISCORD_RPC_H
+#define DISCORD_RPC_H
+
+#include <cstdint>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct DiscordRichPresence {
+  int type;
+  int status_display_type;
+  const char *name;    /* max 128 bytes */
+  const char *state;   /* max 128 bytes */
+  const char *details; /* max 128 bytes */
+  int64_t startTimestamp;
+  int64_t endTimestamp;
+  const char *largeImageKey;  /* max 32 bytes */
+  const char *largeImageText; /* max 128 bytes */
+  const char *smallImageKey;  /* max 32 bytes */
+  const char *smallImageText; /* max 128 bytes */
+  const char *partyId;        /* max 128 bytes */
+  int partySize;
+  int partyMax;
+  int partyPrivacy;
+  const char *matchSecret;    /* max 128 bytes */
+  const char *joinSecret;     /* max 128 bytes */
+  const char *spectateSecret; /* max 128 bytes */
+  int8_t instance;
+} DiscordRichPresence;
+
+typedef struct DiscordUser {
+  const char *userId;
+  const char *username;
+  const char *discriminator;
+  const char *avatar;
+} DiscordUser;
+
+typedef struct DiscordEventHandlers {
+  void (*ready)(const DiscordUser *request);
+  void (*disconnected)(int errorCode, const char *message);
+  void (*errored)(int errorCode, const char *message);
+  void (*joinGame)(const char *joinSecret);
+  void (*spectateGame)(const char *spectateSecret);
+  void (*joinRequest)(const DiscordUser *request);
+} DiscordEventHandlers;
+
+#define DISCORD_REPLY_NO      0
+#define DISCORD_REPLY_YES     1
+#define DISCORD_REPLY_IGNORE  2
+#define DISCORD_PARTY_PRIVATE 0
+#define DISCORD_PARTY_PUBLIC  1
+
+void Discord_Initialize(const char *applicationId, DiscordEventHandlers *handlers, const int autoRegister);
+void Discord_Shutdown(void);
+
+// checks for incoming messages, dispatches callbacks
+void Discord_RunCallbacks(void);
+
+void Discord_UpdatePresence(const DiscordRichPresence *presence);
+void Discord_ClearPresence(void);
+
+void Discord_Respond(const char *userid, /* DISCORD_REPLY_ */ int reply);
+
+void Discord_UpdateHandlers(DiscordEventHandlers *handlers);
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif  // DISCORD_RPC_H

3rdparty/discord-rpc/discord_rpc_connection.cpp

@@ -0,0 +1,168 @@
+/*
+ * Copyright 2017 Discord, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+#include "discord_rpc_connection.h"
+#include "discord_serialization.h"
+
+namespace discord_rpc {
+
+static const int RpcVersion = 1;
+static RpcConnection Instance;
+
+RpcConnection *RpcConnection::Create(const char *applicationId) {
+
+  Instance.connection = BaseConnection::Create();
+  StringCopy(Instance.appId, applicationId);
+  return &Instance;
+
+}
+
+void RpcConnection::Destroy(RpcConnection *&c) {
+
+  c->Close();
+  BaseConnection::Destroy(c->connection);
+  c = nullptr;
+
+}
+
+void RpcConnection::Open() {
+
+  if (state == State::Connected) {
+    return;
+  }
+
+  if (state == State::Disconnected && !connection->Open()) {
+    return;
+  }
+
+  if (state == State::SentHandshake) {
+    JsonDocument message;
+    if (Read(message)) {
+      auto cmd = GetStrMember(&message, "cmd");
+      auto evt = GetStrMember(&message, "evt");
+      if (cmd && evt && !strcmp(cmd, "DISPATCH") && !strcmp(evt, "READY")) {
+        state = State::Connected;
+        if (onConnect) {
+          onConnect(message);
+        }
+      }
+    }
+  }
+  else {
+    sendFrame.opcode = Opcode::Handshake;
+    sendFrame.length = static_cast<uint32_t>(JsonWriteHandshakeObj(sendFrame.message, sizeof(sendFrame.message), RpcVersion, appId));
+
+    if (connection->Write(&sendFrame, sizeof(MessageFrameHeader) + sendFrame.length)) {
+      state = State::SentHandshake;
+    }
+    else {
+      Close();
+    }
+  }
+
+}
+
+void RpcConnection::Close() {
+
+  if (onDisconnect && (state == State::Connected || state == State::SentHandshake)) {
+    onDisconnect(lastErrorCode, lastErrorMessage);
+  }
+  connection->Close();
+  state = State::Disconnected;
+
+}
+
+bool RpcConnection::Write(const void *data, size_t length) {
+
+  sendFrame.opcode = Opcode::Frame;
+  memcpy(sendFrame.message, data, length);
+  sendFrame.length = static_cast<uint32_t>(length);
+  if (!connection->Write(&sendFrame, sizeof(MessageFrameHeader) + length)) {
+    Close();
+    return false;
+  }
+
+  return true;
+
+}
+
+bool RpcConnection::Read(JsonDocument &message) {
+
+  if (state != State::Connected && state != State::SentHandshake) {
+    return false;
+  }
+  MessageFrame readFrame{};
+  for (;;) {
+    bool didRead = connection->Read(&readFrame, sizeof(MessageFrameHeader));
+    if (!didRead) {
+      if (!connection->isOpen) {
+        lastErrorCode = static_cast<int>(ErrorCode::PipeClosed);
+        StringCopy(lastErrorMessage, "Pipe closed");
+        Close();
+      }
+      return false;
+    }
+
+    if (readFrame.length > 0) {
+      didRead = connection->Read(readFrame.message, readFrame.length);
+      if (!didRead) {
+        lastErrorCode = static_cast<int>(ErrorCode::ReadCorrupt);
+        StringCopy(lastErrorMessage, "Partial data in frame");
+        Close();
+        return false;
+      }
+      readFrame.message[readFrame.length] = 0;
+    }
+
+    switch (readFrame.opcode) {
+      case Opcode::Close: {
+        message.ParseInsitu(readFrame.message);
+        lastErrorCode = GetIntMember(&message, "code");
+        StringCopy(lastErrorMessage, GetStrMember(&message, "message", ""));
+        Close();
+        return false;
+      }
+      case Opcode::Frame:
+        message.ParseInsitu(readFrame.message);
+        return true;
+      case Opcode::Ping:
+        readFrame.opcode = Opcode::Pong;
+        if (!connection->Write(&readFrame, sizeof(MessageFrameHeader) + readFrame.length)) {
+          Close();
+        }
+        break;
+      case Opcode::Pong:
+        break;
+      case Opcode::Handshake:
+      default:
+        // something bad happened
+        lastErrorCode = static_cast<int>(ErrorCode::ReadCorrupt);
+        StringCopy(lastErrorMessage, "Bad ipc frame");
+        Close();
+        return false;
+    }
+  }
+
+}
+
+}  // namespace discord_rpc

3rdparty/discord-rpc/discord_rpc_connection.h

@@ -0,0 +1,88 @@
+/*
+ * Copyright 2017 Discord, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+#ifndef DISCORD_RPC_CONNECTION_H
+#define DISCORD_RPC_CONNECTION_H
+
+#include "discord_connection.h"
+#include "discord_serialization.h"
+
+namespace discord_rpc {
+
+// I took this from the buffer size libuv uses for named pipes; I suspect ours would usually be much smaller.
+constexpr size_t MaxRpcFrameSize = 64 * 1024;
+
+struct RpcConnection {
+  enum class ErrorCode : int {
+    Success = 0,
+    PipeClosed = 1,
+    ReadCorrupt = 2,
+  };
+
+  enum class Opcode : uint32_t {
+    Handshake = 0,
+    Frame = 1,
+    Close = 2,
+    Ping = 3,
+    Pong = 4,
+  };
+
+  struct MessageFrameHeader {
+    Opcode opcode;
+    uint32_t length;
+  };
+
+  struct MessageFrame : public MessageFrameHeader {
+    char message[MaxRpcFrameSize - sizeof(MessageFrameHeader)];
+  };
+
+  enum class State : uint32_t {
+    Disconnected,
+    SentHandshake,
+    AwaitingResponse,
+    Connected,
+  };
+
+  BaseConnection *connection{ nullptr };
+  State state{ State::Disconnected };
+  void (*onConnect)(JsonDocument &message) { nullptr };
+  void (*onDisconnect)(int errorCode, const char *message) { nullptr };
+  char appId[64]{};
+  int lastErrorCode{ 0 };
+  char lastErrorMessage[256]{};
+  RpcConnection::MessageFrame sendFrame;
+
+  static RpcConnection *Create(const char *applicationId);
+  static void Destroy(RpcConnection*&);
+
+  inline bool IsOpen() const { return state == State::Connected; }
+
+  void Open();
+  void Close();
+  bool Write(const void *data, size_t length);
+  bool Read(JsonDocument &message);
+};
+
+}  // namespace discord_rpc
+
+#endif  // DISCORD_RPC_CONNECTION_H

3rdparty/discord-rpc/discord_serialization.cpp

@@ -0,0 +1,285 @@
+/*
+ * Copyright 2017 Discord, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+#include "discord_serialization.h"
+#include "discord_connection.h"
+#include "discord_rpc.h"
+
+namespace discord_rpc {
+
+template<typename T>
+void NumberToString(char *dest, T number) {
+
+  if (!number) {
+    *dest++ = '0';
+    *dest++ = 0;
+    return;
+  }
+  if (number < 0) {
+    *dest++ = '-';
+    number = -number;
+  }
+  char temp[32];
+  int place = 0;
+  while (number) {
+    auto digit = number % 10;
+    number = number / 10;
+    temp[place++] = '0' + static_cast<char>(digit);
+  }
+  for (--place; place >= 0; --place) {
+    *dest++ = temp[place];
+  }
+  *dest = 0;
+
+}
+
+// it's ever so slightly faster to not have to strlen the key
+template<typename T>
+void WriteKey(JsonWriter &w, T &k) {
+  w.Key(k, sizeof(T) - 1);
+}
+
+struct WriteObject {
+  JsonWriter &writer;
+  WriteObject(JsonWriter &w)
+      : writer(w) {
+    writer.StartObject();
+  }
+  template<typename T>
+  WriteObject(JsonWriter &w, T &name)
+      : writer(w) {
+    WriteKey(writer, name);
+    writer.StartObject();
+  }
+  ~WriteObject() { writer.EndObject(); }
+};
+
+struct WriteArray {
+  JsonWriter &writer;
+  template<typename T>
+  WriteArray(JsonWriter &w, T &name)
+      : writer(w) {
+    WriteKey(writer, name);
+    writer.StartArray();
+  }
+  ~WriteArray() { writer.EndArray(); }
+};
+
+template<typename T>
+void WriteOptionalString(JsonWriter &w, T &k, const char *value) {
+
+  if (value && value[0]) {
+    w.Key(k, sizeof(T) - 1);
+    w.String(value);
+  }
+
+}
+
+static void JsonWriteNonce(JsonWriter &writer, const int nonce) {
+
+  WriteKey(writer, "nonce");
+  char nonceBuffer[32];
+  NumberToString(nonceBuffer, nonce);
+  writer.String(nonceBuffer);
+
+}
+
+size_t JsonWriteRichPresenceObj(char *dest, const size_t maxLen, const int nonce, const int pid, const DiscordRichPresence *presence) {
+
+  JsonWriter writer(dest, maxLen);
+
+  {
+    WriteObject top(writer);
+
+    JsonWriteNonce(writer, nonce);
+
+    WriteKey(writer, "cmd");
+    writer.String("SET_ACTIVITY");
+
+    {
+      WriteObject args(writer, "args");
+
+      WriteKey(writer, "pid");
+      writer.Int(pid);
+
+      if (presence != nullptr) {
+        WriteObject activity(writer, "activity");
+
+        if (presence->type >= 0 && presence->type <= 5) {
+          WriteKey(writer, "type");
+          writer.Int(presence->type);
+
+          WriteKey(writer, "status_display_type");
+          writer.Int(presence->status_display_type);
+        }
+
+        WriteOptionalString(writer, "name", presence->name);
+        WriteOptionalString(writer, "state", presence->state);
+        WriteOptionalString(writer, "details", presence->details);
+
+        if (presence->startTimestamp || presence->endTimestamp) {
+          WriteObject timestamps(writer, "timestamps");
+
+          if (presence->startTimestamp) {
+            WriteKey(writer, "start");
+            writer.Int64(presence->startTimestamp);
+          }
+
+          if (presence->endTimestamp) {
+            WriteKey(writer, "end");
+            writer.Int64(presence->endTimestamp);
+          }
+        }
+
+        if ((presence->largeImageKey && presence->largeImageKey[0]) ||
+            (presence->largeImageText && presence->largeImageText[0]) ||
+            (presence->smallImageKey && presence->smallImageKey[0]) ||
+            (presence->smallImageText && presence->smallImageText[0])) {
+          WriteObject assets(writer, "assets");
+          WriteOptionalString(writer, "large_image", presence->largeImageKey);
+          WriteOptionalString(writer, "large_text", presence->largeImageText);
+          WriteOptionalString(writer, "small_image", presence->smallImageKey);
+          WriteOptionalString(writer, "small_text", presence->smallImageText);
+        }
+
+        if ((presence->partyId && presence->partyId[0]) || presence->partySize ||
+            presence->partyMax || presence->partyPrivacy) {
+          WriteObject party(writer, "party");
+          WriteOptionalString(writer, "id", presence->partyId);
+          if (presence->partySize && presence->partyMax) {
+            WriteArray size(writer, "size");
+            writer.Int(presence->partySize);
+            writer.Int(presence->partyMax);
+          }
+
+          if (presence->partyPrivacy) {
+            WriteKey(writer, "privacy");
+            writer.Int(presence->partyPrivacy);
+          }
+        }
+
+        if ((presence->matchSecret && presence->matchSecret[0]) ||
+            (presence->joinSecret && presence->joinSecret[0]) ||
+            (presence->spectateSecret && presence->spectateSecret[0])) {
+          WriteObject secrets(writer, "secrets");
+          WriteOptionalString(writer, "match", presence->matchSecret);
+          WriteOptionalString(writer, "join", presence->joinSecret);
+          WriteOptionalString(writer, "spectate", presence->spectateSecret);
+        }
+
+        writer.Key("instance");
+        writer.Bool(presence->instance != 0);
+      }
+    }
+  }
+
+  return writer.Size();
+}
+
+size_t JsonWriteHandshakeObj(char *dest, size_t maxLen, int version, const char *applicationId) {
+
+  JsonWriter writer(dest, maxLen);
+
+  {
+    WriteObject obj(writer);
+    WriteKey(writer, "v");
+    writer.Int(version);
+    WriteKey(writer, "client_id");
+    writer.String(applicationId);
+  }
+
+  return writer.Size();
+
+}
+
+size_t JsonWriteSubscribeCommand(char *dest, size_t maxLen, int nonce, const char *evtName) {
+
+  JsonWriter writer(dest, maxLen);
+
+  {
+    WriteObject obj(writer);
+
+    JsonWriteNonce(writer, nonce);
+
+    WriteKey(writer, "cmd");
+    writer.String("SUBSCRIBE");
+
+    WriteKey(writer, "evt");
+    writer.String(evtName);
+  }
+
+  return writer.Size();
+
+}
+
+size_t JsonWriteUnsubscribeCommand(char *dest, size_t maxLen, int nonce, const char *evtName) {
+
+  JsonWriter writer(dest, maxLen);
+
+  {
+    WriteObject obj(writer);
+
+    JsonWriteNonce(writer, nonce);
+
+    WriteKey(writer, "cmd");
+    writer.String("UNSUBSCRIBE");
+
+    WriteKey(writer, "evt");
+    writer.String(evtName);
+  }
+
+  return writer.Size();
+
+}
+
+size_t JsonWriteJoinReply(char *dest, size_t maxLen, const char *userId, const int reply, const int nonce) {
+
+  JsonWriter writer(dest, maxLen);
+
+  {
+    WriteObject obj(writer);
+
+    WriteKey(writer, "cmd");
+    if (reply == DISCORD_REPLY_YES) {
+      writer.String("SEND_ACTIVITY_JOIN_INVITE");
+    }
+    else {
+      writer.String("CLOSE_ACTIVITY_JOIN_REQUEST");
+    }
+
+    WriteKey(writer, "args");
+    {
+      WriteObject args(writer);
+
+      WriteKey(writer, "user_id");
+      writer.String(userId);
+    }
+
+    JsonWriteNonce(writer, nonce);
+  }
+
+  return writer.Size();
+
+}
+
+}  // namespace discord_rpc

3rdparty/discord-rpc/discord_serialization.h

@@ -0,0 +1,213 @@
+/*
+ * Copyright 2017 Discord, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+#ifndef DISCORD_SERIALIZATION_H
+#define DISCORD_SERIALIZATION_H
+
+#include <rapidjson/document.h>
+#include <rapidjson/stringbuffer.h>
+#include <rapidjson/writer.h>
+
+struct DiscordRichPresence;
+
+namespace discord_rpc {
+
+// if only there was a standard library function for this
+template<size_t Len>
+inline size_t StringCopy(char (&dest)[Len], const char *src) {
+  if (!src || !Len) {
+    return 0;
+  }
+  size_t copied;
+  char *out = dest;
+  for (copied = 1; *src && copied < Len; ++copied) {
+    *out++ = *src++;
+  }
+  *out = 0;
+  return copied - 1;
+}
+
+size_t JsonWriteHandshakeObj(char *dest, size_t maxLen, int version, const char *applicationId);
+
+// Commands
+size_t JsonWriteRichPresenceObj(char *dest, const size_t maxLen, const int nonce, const int pid, const DiscordRichPresence *presence);
+size_t JsonWriteSubscribeCommand(char *dest, size_t maxLen, int nonce, const char *evtName);
+
+size_t JsonWriteUnsubscribeCommand(char *dest, size_t maxLen, int nonce, const char *evtName);
+
+size_t JsonWriteJoinReply(char *dest, size_t maxLen, const char *userId, int reply, int nonce);
+
+// I want to use as few allocations as I can get away with, and to do that with RapidJson, you need
+// to supply some of your own allocators for stuff rather than use the defaults
+
+class LinearAllocator {
+ public:
+  char *buffer_;
+  char *end_;
+  LinearAllocator() {
+    assert(0);  // needed for some default case in rapidjson, should not use
+  }
+  LinearAllocator(char *buffer, size_t size)
+      : buffer_(buffer), end_(buffer + size) {
+  }
+  static const bool kNeedFree = false;
+  void *Malloc(size_t size) {
+    char *res = buffer_;
+    buffer_ += size;
+    if (buffer_ > end_) {
+      buffer_ = res;
+      return nullptr;
+    }
+    return res;
+  }
+  void *Realloc(void *originalPtr, size_t originalSize, size_t newSize) {
+    if (newSize == 0) {
+      return nullptr;
+    }
+    // allocate how much you need in the first place
+    assert(!originalPtr && !originalSize);
+    // unused parameter warning
+    (void)(originalPtr);
+    (void)(originalSize);
+    return Malloc(newSize);
+  }
+  static void Free(void *ptr) {
+    /* shrug */
+    (void)ptr;
+  }
+};
+
+template<size_t Size>
+class FixedLinearAllocator : public LinearAllocator {
+ public:
+  char fixedBuffer_[Size];
+  FixedLinearAllocator()
+      : LinearAllocator(fixedBuffer_, Size) {
+  }
+  static const bool kNeedFree = false;
+};
+
+// wonder why this isn't a thing already, maybe I missed it
+class DirectStringBuffer {
+ public:
+  using Ch = char;
+  char *buffer_;
+  char *end_;
+  char *current_;
+
+  DirectStringBuffer(char *buffer, size_t maxLen)
+      : buffer_(buffer), end_(buffer + maxLen), current_(buffer) {
+  }
+
+  void Put(char c) {
+    if (current_ < end_) {
+      *current_++ = c;
+    }
+  }
+  void Flush() {}
+  size_t GetSize() const { return static_cast<size_t>(current_ - buffer_); }
+};
+
+using MallocAllocator = rapidjson::CrtAllocator;
+using PoolAllocator = rapidjson::MemoryPoolAllocator<MallocAllocator>;
+using UTF8 = rapidjson::UTF8<char>;
+// Writer appears to need about 16 bytes per nested object level (with 64bit size_t)
+using StackAllocator = FixedLinearAllocator<2048>;
+constexpr size_t WriterNestingLevels = 2048 / (2 * sizeof(size_t));
+using JsonWriterBase =
+  rapidjson::Writer<DirectStringBuffer, UTF8, UTF8, StackAllocator, rapidjson::kWriteNoFlags>;
+class JsonWriter : public JsonWriterBase {
+ public:
+  DirectStringBuffer stringBuffer_;
+  StackAllocator stackAlloc_;
+
+  JsonWriter(char *dest, size_t maxLen)
+      : JsonWriterBase(stringBuffer_, &stackAlloc_, WriterNestingLevels), stringBuffer_(dest, maxLen), stackAlloc_() {
+  }
+
+  size_t Size() const { return stringBuffer_.GetSize(); }
+};
+
+using JsonDocumentBase = rapidjson::GenericDocument<UTF8, PoolAllocator, StackAllocator>;
+class JsonDocument : public JsonDocumentBase {
+ public:
+  static const int kDefaultChunkCapacity = 32 * 1024;
+  // json parser will use this buffer first, then allocate more if needed; I seriously doubt we
+  // send any messages that would use all of this, though.
+  char parseBuffer_[32 * 1024];
+  MallocAllocator mallocAllocator_;
+  PoolAllocator poolAllocator_;
+  StackAllocator stackAllocator_;
+  JsonDocument()
+      : JsonDocumentBase(rapidjson::kObjectType,
+                         &poolAllocator_,
+                         sizeof(stackAllocator_.fixedBuffer_),
+                         &stackAllocator_),
+        poolAllocator_(parseBuffer_, sizeof(parseBuffer_), kDefaultChunkCapacity, &mallocAllocator_), stackAllocator_() {
+  }
+};
+
+using JsonValue = rapidjson::GenericValue<UTF8, PoolAllocator>;
+
+inline JsonValue *GetObjMember(JsonValue *obj, const char *name) {
+
+  if (obj) {
+    auto member = obj->FindMember(name);
+    if (member != obj->MemberEnd() && member->value.IsObject()) {
+      return &member->value;
+    }
+  }
+
+  return nullptr;
+
+}
+
+inline int GetIntMember(JsonValue *obj, const char *name, int notFoundDefault = 0) {
+
+  if (obj) {
+    auto member = obj->FindMember(name);
+    if (member != obj->MemberEnd() && member->value.IsInt()) {
+      return member->value.GetInt();
+    }
+  }
+
+  return notFoundDefault;
+
+}
+
+inline const char *GetStrMember(JsonValue *obj, const char *name, const char *notFoundDefault = nullptr) {
+
+  if (obj) {
+    auto member = obj->FindMember(name);
+    if (member != obj->MemberEnd() && member->value.IsString()) {
+      return member->value.GetString();
+    }
+  }
+
+  return notFoundDefault;
+
+}
+
+}  // namespace discord_rpc
+
+#endif  // DISCORD_SERIALIZATION_H

3rdparty/gstfastspectrum/CMakeLists.txt

@@ -1,34 +0,0 @@
-cmake_minimum_required(VERSION 3.13)
-
-set(SOURCES gstfastspectrum.cpp)
-
-add_library(gstfastspectrum STATIC ${SOURCES})
-
-target_include_directories(gstfastspectrum SYSTEM PRIVATE
-  ${GLIB_INCLUDE_DIRS}
-  ${GOBJECT_INCLUDE_DIRS}
-  ${GSTREAMER_INCLUDE_DIRS}
-  ${GSTREAMER_BASE_INCLUDE_DIRS}
-  ${GSTREAMER_AUDIO_INCLUDE_DIRS}
-  ${FFTW3_INCLUDE_DIR}
-)
-
-target_include_directories(gstfastspectrum PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
-
-target_link_directories(gstfastspectrum PRIVATE
-  ${GLIB_LIBRARY_DIRS}
-  ${GOBJECT_LIBRARY_DIRS}
-  ${GSTREAMER_LIBRARY_DIRS}
-  ${GSTREAMER_BASE_LIBRARY_DIRS}
-  ${GSTREAMER_AUDIO_LIBRARY_DIRS}
-  ${FFTW3_LIBRARY_DIRS}
-)
-
-target_link_libraries(gstfastspectrum PRIVATE
-  ${GLIB_LIBRARIES}
-  ${GOBJECT_LIBRARIES}
-  ${GSTREAMER_LIBRARIES}
-  ${GSTREAMER_BASE_LIBRARIES}
-  ${GSTREAMER_AUDIO_LIBRARIES}
-  ${FFTW3_FFTW_LIBRARY}
-)

3rdparty/kdsingleapplication/CMakeLists.txt

@@ -1,8 +0,0 @@
-cmake_minimum_required(VERSION 3.13)
-set(SOURCES KDSingleApplication/src/kdsingleapplication.cpp KDSingleApplication/src/kdsingleapplication_localsocket.cpp)
-set(HEADERS KDSingleApplication/src/kdsingleapplication.h KDSingleApplication/src/kdsingleapplication_localsocket_p.h)
-qt_wrap_cpp(MOC ${HEADERS})
-add_library(kdsingleapplication STATIC ${SOURCES} ${MOC})
-target_compile_definitions(kdsingleapplication PRIVATE -DKDSINGLEAPPLICATION_STATIC_BUILD)
-target_include_directories(kdsingleapplication PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
-target_link_libraries(kdsingleapplication PUBLIC Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Network)

Changelog

@@ -2,6 +2,270 @@ Strawberry Music Player
 =======================
 ChangeLog
 
+Version 1.2.17 (2026.01.18):
+
+    * Avoid re-scan of restored songs unless mtime is changed (#1819)
+    * Skip existing files when organizing if not overwriting (#1484)
+    * Fixed cursor highlight disappearing off-screen when using down cursor (#1489)
+    * Fixed CD playback only working for the first optical drive (#1852)
+    * Fixed possible race-condition when switching tracks (#1863)
+    * Fixed possible file descriptor exhaustion by using shared thread pool (#1687)
+    * Don't automatically sort playlist with the auto sort option before it's fully loaded (#1690)
+    * Fixed network features stop working after computer suspends and resumes (#1521)
+    * Fixed crash on exit after Qobuz login
+    * Added tag editor option to select ID3v2 version (#1861)
+    * Fixed Qobuz authentication and added automatic credential fetching (#1898)
+    * Fixed playback stopping after deleting a song from disk via context menu (#1783)
+    * Added option to restore smart playlists to the defaults (#1848)
+    * Fixed possible race condition in pipeline destructor (#1875)
+    * Fixed buffering issue near track end during gapless playback (#1725)
+    * Fixed duplicate collection entries for the same artist if they have different sort tags (#1899)
+    * Defer playcount and rating tag writes for currently playing Ogg songs to prevent playback shutter (#1816)
+    * Fixed tag editing not working for Opus sort tags (#1929)
+    * Show playlist load errors (#1470)
+    * Fallback to delete if moving to trash fails (#1679)
+    * Prefer filenames with "front" or "cover" in the filename for album cover art for songs outside of the collection (#1745)
+    * Fixed collection enter/return behavior to respect double-click settings (#1691)
+    * Added tree view mode to files tab (#1922)
+    * Include .webp in allowed extensions for album covers (#1941)
+    * Exit gracefully on SIGTERM signal for Unix systems (#1942)
+    * Optimize the collection scanning process by deferring media file validation from the initial directory scan (#1954)
+    * Fixed collection scan not finding new directories in the top level collection directory when the mountpoint is restored (#1914)
+    * Added genre metadata parsing for Tidal, Qobuz and Spotify (#1913)
+    * Allow editing metadata for stream songs (#1913)
+    * Optimized collection/playlist filtering
+    * Added sort tags to collection/playlist filtering (#1966)
+
+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:
+    * Fixed showing error dialog minimized when main window is not current active window (#1739)
+    * Fixed Discord timestamp update when seeking (#1813)
+    * Fixed CD metadata lookup to respect MusicBrainz rate limiting
+    * Fixed Tidal Open API cover provider
+    * (Windows) Fixed device selection with WASAPI2
+
+  Enhancements/Other:
+    * Removed libre.fm support
+    * Rewrote MusicBrainzClient to use Json instead of XML
+    * Subsonic will now use cover art from album when available
+    * Added option to remove "Remastered", etc from song titles for Tidal, Qobuz and Spotify
+    * Added webm to supported file extensions
+    * (Windows|MinGW) Added WASAPI2 support
+    * (Windows) Added experimental exclusive mode for WASAPI2
+
+Version 1.2.13 (2025.08.31):
+
+  Bugfixes:
+    * Fixed playlist alternating row colors no longer working with some styles (#1806)
+    * Fixed "Open Audio CD" no longer working (#1803)
+    * Fixed systemtray icon playback status not working with scaling (#1782)
+    * Fixed build without MusicBrainz (#1799)
+    * Fixed build without MTP (#1804)
+
+  Enhancements:
+    * Added Discord status text option (#1796)
+    * Read Vorbis/FLAC "Other" embedded covers if front cover is not available (#1793)
+
+Version 1.2.12 (2025.08.12):
+
+  Bugfixes:
+    * Fixed scrobbling for radio streams.
+    * Fixed CDDA memory leaks.
+    * Fixed device view CDDA loading (#1676).
+    * Fixed collection directory editing (#1767).
+    * Fixed devices sometimes being duplicated in the database.
+    * Fixed alternating playlist row colors with Windows 11 style.
+    * Fixed broken file filter for GME formats.
+    * Fixed collection scanning for GME formats.
+    * Fixed Chartlyrics.
+    * Fixed network cache file descriptor leak on lyrics search with workaround for QTBUG-135641.
+    * Fixed parsing Tidal urls with certain stream URL replies.
+    * Fixed pixelated window icon on Wayland (#1753).
+    * Fixed saving collection grouping with special characters in the name (#1758).
+    * Fixed Spotify token not automatically updated on renewal when playing (#1769).
+    * (macOS/Windows) Fixed network cache file descriptor leak with patch for QTBUG-135641.
+    * (Windows|MSVC) Fixed installer to not restart the computer after installing Visual C++ Redistributable.
+
+  Enhancements:
+    * Implemented edit tag dialog reset for year, track, disc and rating.
+    * Added ALAC to supported filetypes for iPods.
+    * Added CD-TEXT support.
+    * Added back Genius lyrics.
+    * Added support for reporting more info to ListenBrainz.
+    * Added support for BPM, mood and initial key tags.
+    * Added support for sort tags to collection, playlists and smart playlists.
+
+Version 1.2.11 (2025.05.15):
+
+    * Fixed playlist songs sometimes not updated with new cover.
+    * Fixed context album cover showing even when it's disabled in the setting (#1744).
+    * Fixed crash when dragging songs to a closed playlist (#1741).
+    * Enable startup notify in desktop file.
+    * (Windows|MSVC) Add experimental support for native ARM64 builds.
+    * (Windows|MinGW) Fixed crash on exit.
+
+Version 1.2.10 (2025.04.18):
+
+  Bugfixes:
+    * Fixed Discord rich presence showing bogus artist and album.
+    * Fixed incorrect ID3v2 comment tag.
+    * (macOS|Windows MSVC) Fixed stuck playback of some streams.
+
+  Enhancements:
+    * Removed Genius lyrics (longer working properly because of website changes).
+    * (macOS|Windows MSVC) Added back Spotify
+
+Version 1.2.9 (2025.04.08):
+
+  Bugfixes:
+    * Fixed subsonic parse error (#1719).
+    * Fixed Deezer cover provider parse error (#1716).
+    * Fixed last.fm import progress.
+    * (Windows|MinGW) Switched from winpthreads to win32 threads, winpthreads are no longer working with Qt as of version 6.9 (QTBUG-131892).
+
+  Enhancements:
+    * Added option to disable playbin3.
+
+Version 1.2.8 (2025.04.05):
+
+  Bugfixes:
+    * Added "HI_RES_LOSSLESS" for Tidal quality setting.
+    * Increased backend settings device lineedit height.
+    * Possible fix for KGlobalAccel shortcuts sometimes not working.
+
+  Enhancements:
+     * Removed deprecated Tidal username/password login.
+     * Turned off "Grey out unavailable songs in playlists on startup" by default.
+     * Added support for reading tags from streams.
+     * Added tooltips in equalizer, backend and appearance settings.
+     * Added full tag support for AIFF including embedded covers.
+     * Use card ID instead of index for ALSA devices.
+     * Removed KDSingleApplication from 3rdparty.
+     * Support arbitrarily large EBU R 128 loudness normalization.
+
+  New features:
+     * Added Discord rich presence support.
+
+Version 1.2.7 (2025.01.31):
+
+   Bugfixes:
+     * Fixed strawberry exiting when clicking tray icon.
+     * Fixed Clementine import script errors.
+     * Disabled OSD Pretty on Wayland since it's not working properly.
+
+  Enhancements:
+     * Only maximize error dialog if Strawberry is the active window (#1627).
+     * Added QPA Platform Native Interface as optional component.
+
+Version 1.2.6 (2025.01.17):
+
+   Bugfixes:
+    * Fixed dragging songs from playlist to queue.
+
+Version 1.2.5 (2025.01.17):
+
+  Bugfixes:
+    * Fixed crash when saving playcount or rating to file (#1633).
+    * Fixed QFile::open failing in unit tests.
+    * Fixed playlist sequence settings saved to wrong configuration file (#1649).
+
+  Enhancements:
+    * Fixed use of deprecated GIO functions with GLib 2.84 and newer.
+    * (macOS) Added back Sparkle updater to check for new releases.
+
+Version 1.2.4 (2025.01.10):
+
+  Bugfixes:
+     * Fixed Spotify songs not being available for scrobbling.
+     * Fixed leading "A" and "The" articles being skipped for album sort text.
+     * Fixed thread safety issue when validating playlist songs on startup.
+     * Fixed filter search not ignoring space after colon when using column based search.
+     * Fixed KGlobalAccel to use capitalized application name.
+     * Fixed slash not properly handled when saving a playlist (#1624).
+     * (Unix) Fixed collection scanner so it ignores special filesystem paths (/sys, /proc, /run, etc) (#1615).
+     * (Windows) Fixed smart playlist wizard not respecting dark mode with Windows 11 style (#1639).
+
+  Enhancements:
+     * Use XSPF "title" as playlist name when loading and saving playlists (#1624).
+     * Added support for using album ID when receving album covers for Subsonic songs (#1636).
+     * Added option for preserving directory structure when trascoding songs (#1637).
+     * (Windows) Always run MSVC runtime installer to possible fix issues when there is an older runtime installed.
+
+Version 1.2.3 (2024.12.08):
+
+  Bugfixes:
+    * Fixed libcdio NULL related compilation error on FreeBSD (#1610).
+    * Fixed missing seek when starting playback of a CUE song (#1568).
+    * Fixed "QDBusObjectPath: invalid path" error.
+
+Version 1.2.2 (2024.11.23):
+
+  Bugfixes:
+
+    * Fixed crash when creating a new smart playlist (#1609).
+    * Fixed last playlist column being added when dragging a song and switching playlists.
+
+Version 1.2.1 (2024.11.21):
+
+This release features major restructuring of the codebase, moving source files,
+rewriting CMake build files, dropping Qt 5 support, external tagreader,
+and dropping some unmaintained parts such as VLC.
+
+  Bugfixes:
+
+    * Fixed playback of CUE continuing to play from the same file after the song has finished playing (#1568).
+    * Fixed updating collection song sort text when disc is changed.
+    * Fixed current playing file left open when the next track errored (#1582).
+    * Fixed filter search not finding song containing uppercase "A" (#1599).
+    * Fixed crash when removing album from playlist when using shuffle albums (#1588).
+    * Fixed IDv3 MBID's tags with multiple entries being ignored.
+    * Fixed crash when enabling Tidal, Spotify, Qobuz or Subsonic services.
+    * Fixed passing filenames to strawberry on command line not resolving to absolute paths.
+    * (macOS) Fixed program not starting for users with long usernames.
+    * (macoS) Fixed crash when pressing caps lock (#1606).
+    * (macOS) Remove "song progress on taskbar" option in behaviour settings.
+
+  Enhancements:
+
+    * Resolve symbolic links when dragging files to the playlist to match collection song.
+    * Replaced Spotify username/password with access token.
+    * Require Qt 6.4 or higher and drop support for Qt 5.
+    * Require TagLib 1.12 or higher.
+    * Use Qt stringliterals.
+    * Move gstfastspectrum to src.
+    * Use standard user temp location for current album cover.
+    * Removed old MacFSListener.
+    * Removed external tagreader and protobuf dependency.
+    * Removed VLC support.
+    * Ported to Qt translation (.ts) files and removed gettext dependency.
+    * Removed deprecated Gnome/Mate SettingsDaemon global shortcuts.
+
 Version 1.1.3 (2024.09.21):
 
   Bugfixes:

README.md

@@ -1,118 +1,137 @@
-:strawberry: Strawberry Music Player [![Build Status](https://github.com/strawberrymusicplayer/strawberry/workflows/Build/badge.svg)](https://github.com/strawberrymusicplayer/strawberry/actions)
-=======================
+# :strawberry: Strawberry Music Player [![Build Status](https://github.com/strawberrymusicplayer/strawberry/workflows/Build/badge.svg)](https://github.com/strawberrymusicplayer/strawberry/actions)
 [![Sponsor](https://img.shields.io/badge/-Sponsor-green?logo=github)](https://github.com/sponsors/jonaski)
 [![Patreon](https://img.shields.io/badge/patreon-donate-green.svg)](https://patreon.com/jonaskvinge)
 [![PayPal](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://paypal.me/jonaskvinge)
 
-Strawberry is a music player and music collection organizer. It is a fork of Clementine released in 2018 aimed at music collectors and audiophiles. It's written in C++ using the Qt toolkit.
+Strawberry is a **music player and music collection organizer**, originally forked from *Clementine* in 2018.
+It’s written in **C++ using the Qt framework**, designed for **audiophiles and music collectors**.
 
-![Browse](https://raw.githubusercontent.com/strawberrymusicplayer/strawberry/master/data/screenshot/screenshot.png)
+![Screenshot of Strawberry Music Player](https://raw.githubusercontent.com/strawberrymusicplayer/strawberry/master/data/screenshot/screenshot.png)
 
-Resources:
+---
 
-  * Website: https://www.strawberrymusicplayer.org/
-  * Wiki: https://wiki.strawberrymusicplayer.org/
-  * Forum: https://forum.strawberrymusicplayer.org/
-  * Github: https://github.com/strawberrymusicplayer/strawberry
-  * Latest builds: https://builds.strawberrymusicplayer.org/
-  * openSUSE buildservice: https://build.opensuse.org/package/show/home:jonaski:audio/strawberry
-  * Ubuntu PPA: https://launchpad.net/~jonaski/+archive/ubuntu/strawberry
-  * Ubuntu Unstable PPA: https://launchpad.net/~jonaski/+archive/ubuntu/strawberry-unstable
-  * Translations: https://crowdin.com/project/strawberrymusicplayer/
+## :globe_with_meridians: Resources
 
-### :bangbang: Opening an issue
+- **Website:** https://www.strawberrymusicplayer.org
+- **Wiki:** https://wiki.strawberrymusicplayer.org
+- **Forum:** https://forum.strawberrymusicplayer.org
+- **GitHub:** https://github.com/strawberrymusicplayer/strawberry
+- **Latest builds:** https://builds.strawberrymusicplayer.org
+- **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
+- **Translations:** https://crowdin.com/project/strawberrymusicplayer
 
-* Read the FAQ: https://wiki.strawberrymusicplayer.org/wiki/FAQ
-* Search for the issue to see if it is already solved, or if there is an open issue for it already. If there is an open issue already, you can comment on it if you have additional information that could be useful to us.
-* For technical problems, discussion, questions and feature suggestions use the forum (https://forum.strawberrymusicplayer.org/) instead. The forum is better suited for discussion.
-* We do not take feature requests from users on GitHub. Any issues related to feature requests will be closed. This does not necessarily mean that we won't add new features, but we don't have time to take feature requests or answer questions about new features from users. It is still possible to suggest or discuss new features on the forum (https://forum.strawberrymusicplayer.org/).
-* We do not maintain the Flatpak package. Do not report issues related to Flatpak unless the issue can be reproduced with a native package, use Flatpak support instead https://flatpak.org/about/
+---
 
-### :moneybag: Sponsoring
+## :warning: Opening an Issue
 
-The program is free software, released under GPL. If you like this program and can make use of it, consider sponsoring or donating to help fund the project.
-There are currently 4 options for sponsoring:
+Before creating a new GitHub issue:
 
-1. [GitHub](https://github.com/sponsors/jonaski)
-2. [Patreon](https://www.patreon.com/jonaskvinge)
+1. **Read the [FAQ](https://wiki.strawberrymusicplayer.org/wiki/FAQ)**.
+2. **Search existing issues** to avoid duplicates. If one already exists, comment there with any additional information.
+3. **Use the [forum](https://forum.strawberrymusicplayer.org/)** for technical problems, discussions or feature suggestions — it’s better suited for back-and-forth conversation.
+4. **Feature requests are not accepted on GitHub.** Issues created for feature requests will be closed. You can still discuss ideas on the forum.
+5. **Flatpak users:** We do **not** maintain the Flatpak package. Report Flatpak-specific issues via [Flatpak support](https://flatpak.org/about/).
+
+---
+
+## :moneybag: Sponsoring
+
+Strawberry is **free software released under the GPL**.
+If you enjoy using it, please consider **supporting development** through sponsorship or donation.
+
+**Sponsorship options:**
+1. [Patreon](https://www.patreon.com/jonaskvinge)
+2. [GitHub](https://github.com/sponsors/jonaski)
 3. [Ko-fi](https://ko-fi.com/jonaskvinge)
 4. [PayPal](https://paypal.me/jonaskvinge)
 
-Funding developers is a way to contribute to open source projects you appreciate, it helps developers get the resources they need, and recognize contributors working behind the scenes to make open source better for everyone.
+Supporting open-source developers helps ensure continued maintenance and improvements.
 
-### :heavy_check_mark: Features
+---
 
-  * Play and organize music
-  * Supports WAV, FLAC, WavPack, Ogg FLAC, Ogg Vorbis, Ogg Opus, Ogg Speex, MPC, TrueAudio, AIFF, MP4, MP3, ASF and Monkey's Audio.
-  * Audio CD playback
-  * Native desktop notifications
-  * Playlist management
-  * Smart and dynamic playlists
-  * Advanced audio output and device configuration for bit-perfect playback on Linux
-  * In-player song loudness analysis and song playback loudness normalization, as per EBU R 128
-  * Edit tags on audio files
-  * Fetch tags from MusicBrainz
-  * Album cover 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/) and [Spotify](https://www.spotify.com/)
-  * Song lyrics from [Genius](https://genius.com/), [Musixmatch](https://www.musixmatch.com/), [ChartLyrics](http://www.chartlyrics.com/), [lyrics.ovh](https://lyrics.ovh/), [lololyrics.com](https://www.lololyrics.com/), [songlyrics.com](https://www.songlyrics.com/), [azlyrics.com](https://www.azlyrics.com/) and [elyrics.net](https://www.elyrics.net/)
-  * Support for multiple backends
-  * Audio analyzer
-  * Audio equalizer
-  * Transfer music to mass-storage USB players, MTP compatible devices and iPod Nano/Classic
-  * Scrobbler with support for [Last.fm](https://www.last.fm/), [Libre.fm](https://libre.fm/) and [ListenBrainz](https://listenbrainz.org/)
-  * Subsonic, Tidal, Spotify and Qobuz streaming support
+## :white_check_mark: Features
 
+- Play and organize your music collection
+- Supports formats: WAV, FLAC, WavPack, Ogg Vorbis, Opus, MPC, TrueAudio, AIFF, MP4, MP3, ASF, and Monkey’s Audio
+- Audio CD playback
+- Bit-perfect playback on Linux
+- Native desktop notifications
+- Advanced playlist management
+- Smart and dynamic playlists
+- 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) 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/)
+- Streaming from Subsonic-compatible servers
+- Unofficial integrations: Tidal, Spotify, and Qobuz
+- Discord Rich Presence
 
-It has so far been tested to work on Linux, OpenBSD, FreeBSD, macOS and Windows.
+---
 
-**Access to macOS and Windows releases are currently restricted to sponsors, a 5 USD monthly sponsorship is required. You can sponsor strawberry through <a href="https://www.patreon.com/jonaskvinge">Patreon</a> for direct access to new releases. If you are sponsoring through GitHub, Ko-fi or PayPal, please e-mail support AT strawberrymusicplayer.org for access to downloads.**
+:white_check_mark: Tested on **Linux**, **OpenBSD**, **FreeBSD**, **macOS**, and **Windows**.
 
-### :heavy_exclamation_mark: Requirements
+> **Note:** macOS and Windows releases are currently **available to sponsors only**.
+> A monthly sponsorship via [Patreon](https://www.patreon.com/jonaskvinge) grants direct access to new releases.
 
-To build Strawberry from source you need the following installed on your system with the additional development packages/headers:
+---
 
-* [CMake](https://cmake.org/)
-* C/C++ compiler ([GCC](https://gcc.gnu.org/), [Clang](https://clang.llvm.org/) or [MSVC](https://visualstudio.microsoft.com/vs/features/cplusplus/))
-* [pkg-config](https://www.freedesktop.org/wiki/Software/pkg-config/) or [pkgconf](https://github.com/pkgconf/pkgconf)
-* [Boost](https://www.boost.org/)
-* [GLib](https://developer.gnome.org/glib/)
-* [Qt 6.4.0 or higher with components Core, Gui, Widgets, Concurrent, Network and Sql](https://www.qt.io/)
-* [SQLite 3.9 or newer](https://www.sqlite.org)
-* [Protobuf](https://developers.google.com/protocol-buffers/)
-* [ALSA (Required on Linux)](https://www.alsa-project.org/)
-* [D-Bus (Required on Linux)](https://www.freedesktop.org/wiki/Software/dbus/)
-* [GStreamer](https://gstreamer.freedesktop.org/) or [VLC](https://www.videolan.org)
-* [TagLib 1.11.1 or higher](https://www.taglib.org/) or [TagParser](https://github.com/Martchus/tagparser)
-* [ICU](https://unicode-org.github.io/icu/)
+## :gear: Requirements
 
-Optional dependencies:
+To build Strawberry from source, you’ll need:
 
-* Song fingerprinting and MusicBrainz tagging: [Chromaprint](https://acoustid.org/chromaprint)
-* Moodbar: [fftw3](http://www.fftw.org/)
-* PulseAudio integration: [PulseAudio](https://www.freedesktop.org/wiki/Software/PulseAudio/?)
-* Audio CD: [libcdio](https://www.gnu.org/software/libcdio/)
-* MTP devices: [libmtp](http://libmtp.sourceforge.net/)
-* iPod Classic devices: [libgpod](http://www.gtkpod.org/libgpod/)
-* EBU R 128 loudness normalization [libebur128](https://github.com/jiixyj/libebur128)
+**Dependencies:**
+- [CMake ≥= 3.13](https://cmake.org/)
+- C/C++ compiler ([GCC](https://gcc.gnu.org/), [Clang](https://clang.llvm.org/), or [MSVC](https://visualstudio.microsoft.com/vs/features/cplusplus/))
+- [pkg-config](https://www.freedesktop.org/wiki/Software/pkg-config/) or [pkgconf](https://github.com/pkgconf/pkgconf)
+- [Boost](https://www.boost.org/)
+- [GLib](https://developer.gnome.org/glib/)
+- [Qt ≥= 6.4](https://www.qt.io/) (Core, Concurrent, Gui, Widgets, Network, SQL, D-Bus)
+- [SQLite ≥= 3.9](https://www.sqlite.org)
+- [ALSA (Linux only)](https://www.alsa-project.org/)
+- [GStreamer](https://gstreamer.freedesktop.org/)
+- [TagLib ≥= 1.12](https://www.taglib.org/)
+- [ICU](https://unicode-org.github.io/icu/)
+- [KDSingleApplication ≥= 1.1.0](https://github.com/KDAB/KDSingleApplication)
 
-You should also install the gstreamer plugins base and good, and optionally bad, ugly and libav to support all audio formats.
+**Dependencies for optional features:**
+- Fingerprinting & tagging: [Chromaprint](https://acoustid.org/chromaprint)
+- Moodbar: [FFTW3](http://www.fftw.org/)
+- PulseAudio integration: [PulseAudio](https://www.freedesktop.org/wiki/Software/PulseAudio/)
+- Audio CD support: [libcdio](https://www.gnu.org/software/libcdio/)
+- MTP devices: [libmtp](http://libmtp.sourceforge.net/)
+- iPod Classic: [libgpod](http://www.gtkpod.org/libgpod/)
+- EBU R128 normalization: [libebur128](https://github.com/jiixyj/libebur128)
+- Discord presence: [RapidJSON](https://rapidjson.org/)
 
-### :wrench: Compiling from source
+Also install GStreamer plugins **base**, **good**, and optionally **bad**, **ugly** and **libav** for full codec support.
 
-### Get the code:
+---
+
+## :wrench: Build from Source
+
+**Get the code:**
 
     git clone --recursive https://github.com/strawberrymusicplayer/strawberry
 
-### Compile and install:
+**Build and install:**
 
     cd strawberry
-    mkdir build
-    cd build
-    cmake ..
-    make -j $(nproc)
-    sudo make install
+    cmake -S . -B build
+    cmake --build build --parallel $(nproc)
+    sudo cmake --install build
 
-To compile on Windows with Visual Studio 2019 or 2022, see https://github.com/strawberrymusicplayer/strawberry-msvc
+For building on Windows with Visual Studio 2022, see: :point_right: https://github.com/strawberrymusicplayer/strawberry-msvc
 
-### :penguin: Packaging status
+---
+
+## :package: Packaging status
 
 [![Packaging status](https://repology.org/badge/vertical-allrepos/strawberry.svg?columns=3&header=Strawberry&exclude_unsupported=1)](https://repology.org/metapackage/strawberry/versions)

cmake/Deb.cmake

@@ -2,5 +2,5 @@ find_program(LSB_RELEASE_EXEC lsb_release)
 find_program(DPKG_BUILDPACKAGE dpkg-buildpackage)
 
 if (LSB_RELEASE_EXEC AND DPKG_BUILDPACKAGE)
-  add_custom_target(deb WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} COMMAND ${DPKG_BUILDPACKAGE} -b -d -uc -us)
+  add_custom_target(deb WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} COMMAND ${DPKG_BUILDPACKAGE} -b -d -uc -us -nc -j4)
 endif()

cmake/Dmg.cmake

@@ -31,12 +31,12 @@ if(MACDEPLOYQT_EXECUTABLE)
 
   add_custom_target(deploy
     COMMAND mkdir -p ${CMAKE_BINARY_DIR}/strawberry.app/Contents/{Frameworks,Resources}
-    COMMAND cp -v ${CMAKE_SOURCE_DIR}/dist/macos/Info.plist ${CMAKE_BINARY_DIR}/strawberry.app/Contents/
+    COMMAND cp -v ${CMAKE_BINARY_DIR}/dist/macos/Info.plist ${CMAKE_BINARY_DIR}/strawberry.app/Contents/
     COMMAND cp -v ${CMAKE_SOURCE_DIR}/dist/macos/strawberry.icns ${CMAKE_BINARY_DIR}/strawberry.app/Contents/Resources/
     COMMAND ${CMAKE_SOURCE_DIR}/dist/macos/macgstcopy.sh ${CMAKE_BINARY_DIR}/strawberry.app
-    COMMAND ${MACDEPLOYQT_EXECUTABLE} strawberry.app -verbose=3 -executable=${CMAKE_BINARY_DIR}/strawberry.app/Contents/PlugIns/strawberry-tagreader -executable=${CMAKE_BINARY_DIR}/strawberry.app/Contents/PlugIns/gst-plugin-scanner ${MACDEPLOYQT_CODESIGN}
+    COMMAND ${MACDEPLOYQT_EXECUTABLE} strawberry.app -verbose=3 -executable=${CMAKE_BINARY_DIR}/strawberry.app/Contents/PlugIns/gst-plugin-scanner ${MACDEPLOYQT_CODESIGN}
     WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-    DEPENDS strawberry strawberry-tagreader
+    DEPENDS strawberry
   )
   if(MACDEPLOYCHECK_EXECUTABLE)
     add_custom_target(deploycheck

cmake/FindCppUnit.cmake

@@ -1,69 +0,0 @@
-# - Try to find the libcppunit libraries
-# Once done this will define
-#
-# CppUnit_FOUND - system has libcppunit
-# CPPUNIT_INCLUDE_DIR - the libcppunit include directory
-# CPPUNIT_LIBRARIES - libcppunit library
-
-#include (MacroEnsureVersion)
-
-if(NOT CPPUNIT_MIN_VERSION)
-  SET(CPPUNIT_MIN_VERSION 1.12.0)
-endif(NOT CPPUNIT_MIN_VERSION)
-
-FIND_PROGRAM(CPPUNIT_CONFIG_EXECUTABLE cppunit-config )
-
-IF(CPPUNIT_INCLUDE_DIR AND CPPUNIT_LIBRARIES)
-
-    # in cache already
-    SET(CppUnit_FOUND TRUE)
-
-ELSE(CPPUNIT_INCLUDE_DIR AND CPPUNIT_LIBRARIES)
-
-    SET(CPPUNIT_INCLUDE_DIR)
-    SET(CPPUNIT_LIBRARIES)
-
-    IF(CPPUNIT_CONFIG_EXECUTABLE)
-        EXEC_PROGRAM(${CPPUNIT_CONFIG_EXECUTABLE} ARGS --cflags RETURN_VALUE _return_VALUE OUTPUT_VARIABLE CPPUNIT_CFLAGS)
-        EXEC_PROGRAM(${CPPUNIT_CONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE CPPUNIT_LIBRARIES)
-        EXEC_PROGRAM(${CPPUNIT_CONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE CPPUNIT_INSTALLED_VERSION)
-        STRING(REGEX REPLACE "-I(.+)" "\\1" CPPUNIT_CFLAGS "${CPPUNIT_CFLAGS}")
-    ELSE(CPPUNIT_CONFIG_EXECUTABLE)
-        # in case win32 needs to find it the old way?
-        FIND_PATH(CPPUNIT_CFLAGS cppunit/TestRunner.h PATHS /usr/include /usr/local/include )
-        FIND_LIBRARY(CPPUNIT_LIBRARIES NAMES cppunit PATHS /usr/lib /usr/local/lib )
-        # how can we find cppunit version?
-        MESSAGE (STATUS "Ensure you cppunit installed version is at least ${CPPUNIT_MIN_VERSION}")
-        SET (CPPUNIT_INSTALLED_VERSION ${CPPUNIT_MIN_VERSION})
-    ENDIF(CPPUNIT_CONFIG_EXECUTABLE)
-
-    SET(CPPUNIT_INCLUDE_DIR ${CPPUNIT_CFLAGS} "${CPPUNIT_CFLAGS}/cppunit")
-
-ENDIF(CPPUNIT_INCLUDE_DIR AND CPPUNIT_LIBRARIES)
-
-IF(CPPUNIT_INCLUDE_DIR AND CPPUNIT_LIBRARIES)
-
-  SET(CppUnit_FOUND TRUE)
-
-  if(NOT CppUnit_FIND_QUIETLY)
-    MESSAGE (STATUS "Found cppunit: ${CPPUNIT_LIBRARIES}")
-  endif(NOT CppUnit_FIND_QUIETLY)
-
-  IF(CPPUNIT_CONFIG_EXECUTABLE)
-    EXEC_PROGRAM(${CPPUNIT_CONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE CPPUNIT_INSTALLED_VERSION)
-  ENDIF(CPPUNIT_CONFIG_EXECUTABLE)
-
-  #macro_ensure_version( ${CPPUNIT_MIN_VERSION} ${CPPUNIT_INSTALLED_VERSION} CPPUNIT_INSTALLED_VERSION_OK )
-
-  #IF(NOT CPPUNIT_INSTALLED_VERSION_OK)
-  #  MESSAGE ("** CppUnit version is too old: found ${CPPUNIT_INSTALLED_VERSION} installed, ${CPPUNIT_MIN_VERSION} or major is required")
-  #  SET(CppUnit_FOUND FALSE)
-  #ENDIF(NOT CPPUNIT_INSTALLED_VERSION_OK)
-
-ELSE(CPPUNIT_INCLUDE_DIR AND CPPUNIT_LIBRARIES)
-
-  SET(CppUnit_FOUND FALSE CACHE BOOL "Not found cppunit library")
-
-ENDIF(CPPUNIT_INCLUDE_DIR AND CPPUNIT_LIBRARIES)
-
-MARK_AS_ADVANCED(CPPUNIT_INCLUDE_DIR CPPUNIT_LIBRARIES)

cmake/FindFFTW3.cmake

@@ -1,132 +0,0 @@
-# 
-# Try to find FFTW3  library  
-# (see www.fftw.org)
-# Once run this will define: 
-# 
-# FFTW3_FOUND
-# FFTW3_INCLUDE_DIR 
-# FFTW3_LIBRARIES
-# FFTW3_LINK_DIRECTORIES
-#
-# You may set one of these options before including this file:
-#  FFTW3_USE_SSE2
-#
-#  TODO: _F_ versions.
-#
-# Jan Woetzel 05/2004
-# www.mip.informatik.uni-kiel.de
-# --------------------------------
-
- FIND_PATH(FFTW3_INCLUDE_DIR fftw3.h
-   ${FFTW3_DIR}/include
-   ${FFTW3_HOME}/include
-   ${FFTW3_DIR}
-   ${FFTW3_HOME}
-   $ENV{FFTW3_DIR}/include
-   $ENV{FFTW3_HOME}/include
-   $ENV{FFTW3_DIR}
-   $ENV{FFTW3_HOME}
-   /usr/include
-   /usr/local/include
-   $ENV{SOURCE_DIR}/fftw3
-   $ENV{SOURCE_DIR}/fftw3/include
-   $ENV{SOURCE_DIR}/fftw
-   $ENV{SOURCE_DIR}/fftw/include
- )
-#MESSAGE("DBG FFTW3_INCLUDE_DIR=${FFTW3_INCLUDE_DIR}")  
-
-
-SET(FFTW3_POSSIBLE_LIBRARY_PATH
-  ${FFTW3_DIR}/lib
-  ${FFTW3_HOME}/lib
-  ${FFTW3_DIR}
-  ${FFTW3_HOME}  
-  $ENV{FFTW3_DIR}/lib
-  $ENV{FFTW3_HOME}/lib
-  $ENV{FFTW3_DIR}
-  $ENV{FFTW3_HOME}  
-  /usr/lib
-  /usr/local/lib
-  $ENV{SOURCE_DIR}/fftw3
-  $ENV{SOURCE_DIR}/fftw3/lib
-  $ENV{SOURCE_DIR}/fftw
-  $ENV{SOURCE_DIR}/fftw/lib
-)
-
-  
-# The lib prefix is contained in filename of W32, unfortunately. In the "general" lib:
-FIND_LIBRARY(FFTW3_FFTW_LIBRARY
-  NAMES fftw3 libfftw libfftw3 libfftw3-3
-  PATHS 
-  ${FFTW3_POSSIBLE_LIBRARY_PATH}
-  )
-#MESSAGE("DBG FFTW3_FFTW_LIBRARY=${FFTW3_FFTW_LIBRARY}")
-
-FIND_LIBRARY(FFTW3_FFTWF_LIBRARY
-  NAMES fftwf3 fftw3f fftwf libfftwf libfftwf3 libfftw3f-3
-  PATHS 
-  ${FFTW3_POSSIBLE_LIBRARY_PATH}
-  )
-#MESSAGE("DBG FFTW3_FFTWF_LIBRARY=${FFTW3_FFTWF_LIBRARY}")
-
-FIND_LIBRARY(FFTW3_FFTWL_LIBRARY
-  NAMES fftwl3 fftw3l fftwl libfftwl libfftwl3 libfftw3l-3
-  PATHS 
-  ${FFTW3_POSSIBLE_LIBRARY_PATH}
-  )
-#MESSAGE("DBG FFTW3_FFTWF_LIBRARY=${FFTW3_FFTWL_LIBRARY}")
-
-
-FIND_LIBRARY(FFTW3_FFTW_SSE2_LIBRARY
-  NAMES fftw_sse2 fftw3_sse2 libfftw_sse2 libfftw3_sse2
-  PATHS 
-  ${FFTW3_POSSIBLE_LIBRARY_PATH}
-  )
-#MESSAGE("DBG FFTW3_FFTW_SSE2_LIBRARY=${FFTW3_FFTW_SSE2_LIBRARY}")
-
-FIND_LIBRARY(FFTW3_FFTWF_SSE_LIBRARY
-  NAMES fftwf_sse fftwf3_sse libfftwf_sse libfftwf3_sse
-  PATHS 
-  ${FFTW3_POSSIBLE_LIBRARY_PATH}
-  )
-#MESSAGE("DBG FFTW3_FFTWF_SSE_LIBRARY=${FFTW3_FFTWF_SSE_LIBRARY}")
-
-
-# --------------------------------
-# select one of the above
-# default: 
-IF (FFTW3_FFTW_LIBRARY)
-  SET(FFTW3_LIBRARIES ${FFTW3_FFTW_LIBRARY})
-ENDIF (FFTW3_FFTW_LIBRARY)
-# specialized: 
-IF (FFTW3_USE_SSE2 AND FFTW3_FFTW_SSE2_LIBRARY)
-  SET(FFTW3_LIBRARIES ${FFTW3_FFTW_SSE2_LIBRARY})
-ENDIF (FFTW3_USE_SSE2 AND FFTW3_FFTW_SSE2_LIBRARY)
-
-# --------------------------------
-
-IF(FFTW3_LIBRARIES)
-  IF (FFTW3_INCLUDE_DIR)
-
-    # OK, found all we need
-    SET(FFTW3_FOUND TRUE)
-    GET_FILENAME_COMPONENT(FFTW3_LINK_DIRECTORIES ${FFTW3_LIBRARIES} PATH)
-    
-  ELSE (FFTW3_INCLUDE_DIR)
-    MESSAGE("FFTW3 include dir not found. Set FFTW3_DIR to find it.")
-  ENDIF(FFTW3_INCLUDE_DIR)
-ELSE(FFTW3_LIBRARIES)
-  MESSAGE("FFTW3 lib not found. Set FFTW3_DIR to find it.")
-ENDIF(FFTW3_LIBRARIES)
-
-
-MARK_AS_ADVANCED(
-  FFTW3_INCLUDE_DIR
-  FFTW3_LIBRARIES
-  FFTW3_FFTW_LIBRARY
-  FFTW3_FFTW_SSE2_LIBRARY
-  FFTW3_FFTWF_LIBRARY
-  FFTW3_FFTWF_SSE_LIBRARY
-  FFTW3_FFTWL_LIBRARY
-  FFTW3_LINK_DIRECTORIES
-)

cmake/OptionalComponent.cmake

@@ -1,15 +1,15 @@
 set(summary_willbuild "")
 set(summary_willnotbuild "")
 
-macro(summary_add name test)
+macro(optional_component_summary_add name test)
   if (${test})
     list(APPEND summary_willbuild ${name})
   else (${test})
     list(APPEND summary_willnotbuild "${name}")
   endif (${test})
-endmacro(summary_add)
+endmacro(optional_component_summary_add)
 
-macro(summary_show_part variable title)
+macro(optional_component_summary_show_part variable title)
   list(LENGTH ${variable} _len)
   if (_len)
     message("")
@@ -18,19 +18,20 @@ macro(summary_show_part variable title)
       message("   ${_item}")
     endforeach (_item)
   endif (_len)
-endmacro(summary_show_part)
+endmacro(optional_component_summary_show_part)
 
-macro(summary_show)
+macro(optional_component_summary_show)
   list(SORT summary_willbuild)
   list(SORT summary_willnotbuild)
   message("")
   message("Building strawberry version: ${STRAWBERRY_VERSION_DISPLAY}, Qt version ${Qt${QT_VERSION_MAJOR}Core_VERSION}")
-  summary_show_part(summary_willbuild "The following components will be built:")
-  summary_show_part(summary_willnotbuild "The following components WILL NOT be built:")
+  optional_component_summary_show_part(summary_willbuild "The following components will be built:")
+  optional_component_summary_show_part(summary_willnotbuild "The following components WILL NOT be built:")
   message("")
-endmacro(summary_show)
+endmacro(optional_component_summary_show)
 
 function(optional_component name default description)
+
   set(option_variable "ENABLE_${name}")
   set(have_variable "HAVE_${name}")
   set(${have_variable} OFF)
@@ -79,6 +80,9 @@ function(optional_component name default description)
     set(text "${description} (missing ${deplist_text})")
 
     set(summary_willnotbuild "${summary_willnotbuild};${text}" PARENT_SCOPE)
+
+    message(FATAL_ERROR "${text}, to disable this optional feature, pass -D${option_variable}=OFF to CMake")
+
   else()
     set(${have_variable} ON PARENT_SCOPE)
     set(summary_willbuild "${summary_willbuild};${description}" PARENT_SCOPE)

cmake/Rpm.cmake

@@ -64,7 +64,7 @@ if (LSB_RELEASE_EXEC AND RPMBUILD_EXEC)
     add_custom_target(rpm
       COMMAND ${CMAKE_SOURCE_DIR}/dist/scripts/maketarball.sh
       COMMAND ${CMAKE_COMMAND} -E copy strawberry-${STRAWBERRY_VERSION_PACKAGE}.tar.xz ${RPMBUILD_DIR}/SOURCES/
-      COMMAND ${RPMBUILD_EXEC} -ba ${CMAKE_SOURCE_DIR}/dist/unix/strawberry.spec
+      COMMAND ${RPMBUILD_EXEC} -ba ${CMAKE_BINARY_DIR}/strawberry.spec
     )
 
   endif()

cmake/Translations.cmake

@@ -1,92 +0,0 @@
-find_program(GETTEXT_XGETTEXT_EXECUTABLE xgettext REQUIRED)
-find_program(CAT_EXECUTABLE cat REQUIRED)
-
-list(APPEND XGETTEXT_OPTIONS
-  --qt
-  --keyword=tr:1,2c
-  --keyword=tr
-  --flag=tr:1:pass-c-format
-  --flag=tr:1:pass-qt-format
-  --keyword=trUtf8
-  --flag=tr:1:pass-c-format
-  --flag=tr:1:pass-qt-format
-  --keyword=translate:2,3c
-  --keyword=translate:2
-  --flag=translate:2:pass-c-format
-  --flag=translate:2:pass-qt-format
-  --keyword=QT_TR_NOOP
-  --flag=QT_TR_NOOP:1:pass-c-format
-  --flag=QT_TR_NOOP:1:pass-qt-format
-  --keyword=QT_TRANSLATE_NOOP:2
-  --flag=QT_TRANSLATE_NOOP:2:pass-c-format
-  --flag=QT_TRANSLATE_NOOP:2:pass-qt-format
-  --keyword=_
-  --flag=_:1:pass-c-format
-  --flag=_:1:pass-qt-format
-  --keyword=N_
-  --flag=N_:1:pass-c-format
-  --flag=N_:1:pass-qt-format
-  --from-code=utf-8
-)
-
-execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/translations)
-
-macro(add_pot outfiles header pot)
-  # Make relative filenames for all source files
-  set(add_pot_sources)
-  foreach(_filename ${ARGN})
-    get_filename_component(_absolute_filename ${_filename} ABSOLUTE)
-    file(RELATIVE_PATH _relative_filename ${CMAKE_CURRENT_SOURCE_DIR} ${_absolute_filename})
-    list(APPEND add_pot_sources ${_relative_filename})
-  endforeach(_filename)
-
-  # Generate the .pot
-  add_custom_command(
-    OUTPUT ${pot}
-    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-    COMMAND ${GETTEXT_XGETTEXT_EXECUTABLE} ${XGETTEXT_OPTIONS} -C --omit-header --no-location --output="${CMAKE_CURRENT_BINARY_DIR}/pot.temp" ${add_pot_sources}
-    COMMAND cat ${header} ${CMAKE_CURRENT_BINARY_DIR}/pot.temp > ${pot}
-    DEPENDS ${add_pot_sources} ${header}
-  )
-
-  list(APPEND ${outfiles} ${pot})
-endmacro(add_pot)
-
-# Syntax is:
-#   add_po(sources_var po_prefix LANGUAGES language1 language2 ... DIRECTORY dir)
-
-macro(add_po outfiles po_prefix)
-  parse_arguments(ADD_PO
-    "LANGUAGES;DIRECTORY"
-    ""
-    ${ARGN}
-  )
-
-  foreach (_lang ${ADD_PO_LANGUAGES})
-    set(_po_filename "${_lang}.po")
-    set(_po_filepath "${CMAKE_CURRENT_SOURCE_DIR}/${ADD_PO_DIRECTORY}/${_po_filename}")
-    set(_qm_filename "strawberry_${_lang}.qm")
-    set(_qm_filepath "${CMAKE_CURRENT_BINARY_DIR}/${ADD_PO_DIRECTORY}/${_qm_filename}")
-
-    # Convert the .po files to .qm files
-    add_custom_command(
-      OUTPUT ${_qm_filepath}
-      COMMAND ${QT_LCONVERT_EXECUTABLE} ARGS ${_po_filepath} -o ${_qm_filepath} -of qm -target-language ${_lang}
-      DEPENDS ${_po_filepath} ${_po_filepath}
-    )
-
-    list(APPEND ${outfiles} ${_qm_filepath})
-    list(APPEND INSTALL_TRANSLATIONS_FILES ${_qm_filepath})
-  endforeach (_lang)
-
-  # Generate a qrc file for the translations
-  if(NOT INSTALL_TRANSLATIONS)
-    set(_qrc ${CMAKE_CURRENT_BINARY_DIR}/${ADD_PO_DIRECTORY}/translations.qrc)
-    file(WRITE ${_qrc} "<RCC><qresource prefix=\"/${ADD_PO_DIRECTORY}\">")
-    foreach(_lang ${ADD_PO_LANGUAGES})
-      file(APPEND ${_qrc} "<file>${po_prefix}${_lang}.qm</file>")
-    endforeach(_lang)
-    file(APPEND ${_qrc} "</qresource></RCC>")
-    qt_add_resources(${outfiles} ${_qrc})
-  endif()
-endmacro(add_po)

cmake/Version.cmake

@@ -1,9 +1,9 @@
 set(STRAWBERRY_VERSION_MAJOR 1)
 set(STRAWBERRY_VERSION_MINOR 2)
-set(STRAWBERRY_VERSION_PATCH 0)
+set(STRAWBERRY_VERSION_PATCH 17)
 #set(STRAWBERRY_VERSION_PRERELEASE rc1)
 
-set(INCLUDE_GIT_REVISION ON)
+set(INCLUDE_GIT_REVISION OFF)
 
 set(majorminorpatch "${STRAWBERRY_VERSION_MAJOR}.${STRAWBERRY_VERSION_MINOR}.${STRAWBERRY_VERSION_PATCH}")
 

crowdin.yml

@@ -1,3 +1,3 @@
 files:
-  - source: /src/translations/translations.pot
-    translation: /src/translations/%locale_with_underscore%.po
+  - source: /src/translations/strawberry_en_US.ts
+    translation: /src/translations/strawberry_%locale_with_underscore%.ts

data/data.qrc

@@ -12,6 +12,7 @@
         <file>schema/schema-18.sql</file>
         <file>schema/schema-19.sql</file>
         <file>schema/schema-20.sql</file>
+        <file>schema/schema-21.sql</file>
         <file>schema/device-schema.sql</file>
         <file>style/strawberry.css</file>
         <file>style/smartplaylistsearchterm.css</file>

data/schema/device-schema.sql

@@ -12,9 +12,13 @@ CREATE TABLE device_%deviceid_subdirectories (
 CREATE TABLE device_%deviceid_songs (
 
   title TEXT,
+  titlesort TEXT,
   album TEXT,
+  albumsort TEXT,
   artist TEXT,
+  artistsort TEXT,
   albumartist TEXT,
+  albumartistsort TEXT,
   track INTEGER NOT NULL DEFAULT -1,
   disc INTEGER NOT NULL DEFAULT -1,
   year INTEGER NOT NULL DEFAULT -1,
@@ -22,7 +26,9 @@ CREATE TABLE device_%deviceid_songs (
   genre TEXT,
   compilation INTEGER NOT NULL DEFAULT 0,
   composer TEXT,
+  composersort TEXT,
   performer TEXT,
+  performersort TEXT,
   grouping TEXT,
   comment TEXT,
   lyrics TEXT,
@@ -86,7 +92,11 @@ CREATE TABLE device_%deviceid_songs (
   musicbrainz_work_id TEXT,
 
   ebur128_integrated_loudness_lufs REAL,
-  ebur128_loudness_range_lu REAL
+  ebur128_loudness_range_lu REAL,
+
+  bpm REAL,
+  mood TEXT,
+  initial_key TEXT
 
 );
 
@@ -94,4 +104,4 @@ CREATE INDEX idx_device_%deviceid_songs_album ON device_%deviceid_songs (album);
 
 CREATE INDEX idx_device_%deviceid_songs_comp_artist ON device_%deviceid_songs (compilation_effective, artist);
 
-UPDATE devices SET schema_version=5 WHERE ROWID=%deviceid;
+UPDATE devices SET schema_version=6 WHERE ROWID=%deviceid;

data/schema/schema-21.sql

@@ -0,0 +1,43 @@
+DROP INDEX IF EXISTS idx_albumartistsort;
+
+DROP INDEX IF EXISTS idx_albumsort;
+
+DROP INDEX IF EXISTS idx_artistsort;
+
+DROP INDEX IF EXISTS idx_composersort;
+
+DROP INDEX IF EXISTS idx_performersort;
+
+DROP INDEX IF EXISTS idx_titlesort;
+
+ALTER TABLE %allsongstables ADD COLUMN albumartistsort TEXT;
+
+ALTER TABLE %allsongstables ADD COLUMN albumsort TEXT;
+
+ALTER TABLE %allsongstables ADD COLUMN artistsort TEXT;
+
+ALTER TABLE %allsongstables ADD COLUMN composersort TEXT;
+
+ALTER TABLE %allsongstables ADD COLUMN performersort TEXT;
+
+ALTER TABLE %allsongstables ADD COLUMN titlesort TEXT;
+
+ALTER TABLE %allsongstables ADD COLUMN bpm REAL;
+
+ALTER TABLE %allsongstables ADD COLUMN mood TEXT;
+
+ALTER TABLE %allsongstables ADD COLUMN initial_key TEXT;
+
+CREATE INDEX IF NOT EXISTS idx_albumartistsort ON songs (albumartistsort);
+
+CREATE INDEX IF NOT EXISTS idx_albumsort ON songs (album);
+
+CREATE INDEX IF NOT EXISTS idx_artistsort ON songs (artistsort);
+
+CREATE INDEX IF NOT EXISTS idx_composersort ON songs (title);
+
+CREATE INDEX IF NOT EXISTS idx_performersort ON songs (title);
+
+CREATE INDEX IF NOT EXISTS idx_titlesort ON songs (title);
+
+UPDATE schema_version SET version=21;

data/schema/schema.sql

@@ -4,7 +4,7 @@ CREATE TABLE IF NOT EXISTS schema_version (
 
 DELETE FROM schema_version;
 
-INSERT INTO schema_version (version) VALUES (20);
+INSERT INTO schema_version (version) VALUES (21);
 
 CREATE TABLE IF NOT EXISTS directories (
   path TEXT NOT NULL,
@@ -20,9 +20,13 @@ CREATE TABLE IF NOT EXISTS subdirectories (
 CREATE TABLE IF NOT EXISTS songs (
 
   title TEXT,
+  titlesort TEXT,
   album TEXT,
+  albumsort TEXT,
   artist TEXT,
+  artistsort TEXT,
   albumartist TEXT,
+  albumartistsort TEXT,
   track INTEGER NOT NULL DEFAULT -1,
   disc INTEGER NOT NULL DEFAULT -1,
   year INTEGER NOT NULL DEFAULT -1,
@@ -30,7 +34,9 @@ CREATE TABLE IF NOT EXISTS songs (
   genre TEXT,
   compilation INTEGER NOT NULL DEFAULT 0,
   composer TEXT,
+  composersort TEXT,
   performer TEXT,
+  performersort TEXT,
   grouping TEXT,
   comment TEXT,
   lyrics TEXT,
@@ -94,16 +100,24 @@ CREATE TABLE IF NOT EXISTS songs (
   musicbrainz_work_id TEXT,
 
   ebur128_integrated_loudness_lufs REAL,
-  ebur128_loudness_range_lu REAL
+  ebur128_loudness_range_lu REAL,
+
+  bpm REAL,
+  mood TEXT,
+  initial_key TEXT
 
 );
 
 CREATE TABLE IF NOT EXISTS subsonic_songs (
 
   title TEXT,
+  titlesort TEXT,
   album TEXT,
+  albumsort TEXT,
   artist TEXT,
+  artistsort TEXT,
   albumartist TEXT,
+  albumartistsort TEXT,
   track INTEGER NOT NULL DEFAULT -1,
   disc INTEGER NOT NULL DEFAULT -1,
   year INTEGER NOT NULL DEFAULT -1,
@@ -111,7 +125,9 @@ CREATE TABLE IF NOT EXISTS subsonic_songs (
   genre TEXT,
   compilation INTEGER NOT NULL DEFAULT 0,
   composer TEXT,
+  composersort TEXT,
   performer TEXT,
+  performersort TEXT,
   grouping TEXT,
   comment TEXT,
   lyrics TEXT,
@@ -175,16 +191,24 @@ CREATE TABLE IF NOT EXISTS subsonic_songs (
   musicbrainz_work_id TEXT,
 
   ebur128_integrated_loudness_lufs REAL,
-  ebur128_loudness_range_lu REAL
+  ebur128_loudness_range_lu REAL,
+
+  bpm REAL,
+  mood TEXT,
+  initial_key TEXT
 
 );
 
 CREATE TABLE IF NOT EXISTS tidal_artists_songs (
 
   title TEXT,
+  titlesort TEXT,
   album TEXT,
+  albumsort TEXT,
   artist TEXT,
+  artistsort TEXT,
   albumartist TEXT,
+  albumartistsort TEXT,
   track INTEGER NOT NULL DEFAULT -1,
   disc INTEGER NOT NULL DEFAULT -1,
   year INTEGER NOT NULL DEFAULT -1,
@@ -192,7 +216,9 @@ CREATE TABLE IF NOT EXISTS tidal_artists_songs (
   genre TEXT,
   compilation INTEGER NOT NULL DEFAULT 0,
   composer TEXT,
+  composersort TEXT,
   performer TEXT,
+  performersort TEXT,
   grouping TEXT,
   comment TEXT,
   lyrics TEXT,
@@ -256,16 +282,24 @@ CREATE TABLE IF NOT EXISTS tidal_artists_songs (
   musicbrainz_work_id TEXT,
 
   ebur128_integrated_loudness_lufs REAL,
-  ebur128_loudness_range_lu REAL
+  ebur128_loudness_range_lu REAL,
+
+  bpm REAL,
+  mood TEXT,
+  initial_key TEXT
 
 );
 
 CREATE TABLE IF NOT EXISTS tidal_albums_songs (
 
   title TEXT,
+  titlesort TEXT,
   album TEXT,
+  albumsort TEXT,
   artist TEXT,
+  artistsort TEXT,
   albumartist TEXT,
+  albumartistsort TEXT,
   track INTEGER NOT NULL DEFAULT -1,
   disc INTEGER NOT NULL DEFAULT -1,
   year INTEGER NOT NULL DEFAULT -1,
@@ -273,7 +307,9 @@ CREATE TABLE IF NOT EXISTS tidal_albums_songs (
   genre TEXT,
   compilation INTEGER NOT NULL DEFAULT 0,
   composer TEXT,
+  composersort TEXT,
   performer TEXT,
+  performersort TEXT,
   grouping TEXT,
   comment TEXT,
   lyrics TEXT,
@@ -337,16 +373,24 @@ CREATE TABLE IF NOT EXISTS tidal_albums_songs (
   musicbrainz_work_id TEXT,
 
   ebur128_integrated_loudness_lufs REAL,
-  ebur128_loudness_range_lu REAL
+  ebur128_loudness_range_lu REAL,
+
+  bpm REAL,
+  mood TEXT,
+  initial_key TEXT
 
 );
 
 CREATE TABLE IF NOT EXISTS tidal_songs (
 
   title TEXT,
+  titlesort TEXT,
   album TEXT,
+  albumsort TEXT,
   artist TEXT,
+  artistsort TEXT,
   albumartist TEXT,
+  albumartistsort TEXT,
   track INTEGER NOT NULL DEFAULT -1,
   disc INTEGER NOT NULL DEFAULT -1,
   year INTEGER NOT NULL DEFAULT -1,
@@ -354,7 +398,9 @@ CREATE TABLE IF NOT EXISTS tidal_songs (
   genre TEXT,
   compilation INTEGER NOT NULL DEFAULT 0,
   composer TEXT,
+  composersort TEXT,
   performer TEXT,
+  performersort TEXT,
   grouping TEXT,
   comment TEXT,
   lyrics TEXT,
@@ -418,16 +464,24 @@ CREATE TABLE IF NOT EXISTS tidal_songs (
   musicbrainz_work_id TEXT,
 
   ebur128_integrated_loudness_lufs REAL,
-  ebur128_loudness_range_lu REAL
+  ebur128_loudness_range_lu REAL,
+
+  bpm REAL,
+  mood TEXT,
+  initial_key TEXT
 
 );
 
 CREATE TABLE IF NOT EXISTS spotify_artists_songs (
 
   title TEXT,
+  titlesort TEXT,
   album TEXT,
+  albumsort TEXT,
   artist TEXT,
+  artistsort TEXT,
   albumartist TEXT,
+  albumartistsort TEXT,
   track INTEGER NOT NULL DEFAULT -1,
   disc INTEGER NOT NULL DEFAULT -1,
   year INTEGER NOT NULL DEFAULT -1,
@@ -435,7 +489,9 @@ CREATE TABLE IF NOT EXISTS spotify_artists_songs (
   genre TEXT,
   compilation INTEGER NOT NULL DEFAULT 0,
   composer TEXT,
+  composersort TEXT,
   performer TEXT,
+  performersort TEXT,
   grouping TEXT,
   comment TEXT,
   lyrics TEXT,
@@ -499,16 +555,24 @@ CREATE TABLE IF NOT EXISTS spotify_artists_songs (
   musicbrainz_work_id TEXT,
 
   ebur128_integrated_loudness_lufs REAL,
-  ebur128_loudness_range_lu REAL
+  ebur128_loudness_range_lu REAL,
+
+  bpm REAL,
+  mood TEXT,
+  initial_key TEXT
 
 );
 
 CREATE TABLE IF NOT EXISTS spotify_albums_songs (
 
   title TEXT,
+  titlesort TEXT,
   album TEXT,
+  albumsort TEXT,
   artist TEXT,
+  artistsort TEXT,
   albumartist TEXT,
+  albumartistsort TEXT,
   track INTEGER NOT NULL DEFAULT -1,
   disc INTEGER NOT NULL DEFAULT -1,
   year INTEGER NOT NULL DEFAULT -1,
@@ -516,7 +580,9 @@ CREATE TABLE IF NOT EXISTS spotify_albums_songs (
   genre TEXT,
   compilation INTEGER NOT NULL DEFAULT 0,
   composer TEXT,
+  composersort TEXT,
   performer TEXT,
+  performersort TEXT,
   grouping TEXT,
   comment TEXT,
   lyrics TEXT,
@@ -580,16 +646,24 @@ CREATE TABLE IF NOT EXISTS spotify_albums_songs (
   musicbrainz_work_id TEXT,
 
   ebur128_integrated_loudness_lufs REAL,
-  ebur128_loudness_range_lu REAL
+  ebur128_loudness_range_lu REAL,
+
+  bpm REAL,
+  mood TEXT,
+  initial_key TEXT
 
 );
 
 CREATE TABLE IF NOT EXISTS spotify_songs (
 
   title TEXT,
+  titlesort TEXT,
   album TEXT,
+  albumsort TEXT,
   artist TEXT,
+  artistsort TEXT,
   albumartist TEXT,
+  albumartistsort TEXT,
   track INTEGER NOT NULL DEFAULT -1,
   disc INTEGER NOT NULL DEFAULT -1,
   year INTEGER NOT NULL DEFAULT -1,
@@ -597,7 +671,9 @@ CREATE TABLE IF NOT EXISTS spotify_songs (
   genre TEXT,
   compilation INTEGER NOT NULL DEFAULT 0,
   composer TEXT,
+  composersort TEXT,
   performer TEXT,
+  performersort TEXT,
   grouping TEXT,
   comment TEXT,
   lyrics TEXT,
@@ -661,16 +737,24 @@ CREATE TABLE IF NOT EXISTS spotify_songs (
   musicbrainz_work_id TEXT,
 
   ebur128_integrated_loudness_lufs REAL,
-  ebur128_loudness_range_lu REAL
+  ebur128_loudness_range_lu REAL,
+
+  bpm REAL,
+  mood TEXT,
+  initial_key TEXT
 
 );
 
 CREATE TABLE IF NOT EXISTS qobuz_artists_songs (
 
   title TEXT,
+  titlesort TEXT,
   album TEXT,
+  albumsort TEXT,
   artist TEXT,
+  artistsort TEXT,
   albumartist TEXT,
+  albumartistsort TEXT,
   track INTEGER NOT NULL DEFAULT -1,
   disc INTEGER NOT NULL DEFAULT -1,
   year INTEGER NOT NULL DEFAULT -1,
@@ -678,7 +762,9 @@ CREATE TABLE IF NOT EXISTS qobuz_artists_songs (
   genre TEXT,
   compilation INTEGER NOT NULL DEFAULT 0,
   composer TEXT,
+  composersort TEXT,
   performer TEXT,
+  performersort TEXT,
   grouping TEXT,
   comment TEXT,
   lyrics TEXT,
@@ -742,16 +828,24 @@ CREATE TABLE IF NOT EXISTS qobuz_artists_songs (
   musicbrainz_work_id TEXT,
 
   ebur128_integrated_loudness_lufs REAL,
-  ebur128_loudness_range_lu REAL
+  ebur128_loudness_range_lu REAL,
+
+  bpm REAL,
+  mood TEXT,
+  initial_key TEXT
 
 );
 
 CREATE TABLE IF NOT EXISTS qobuz_albums_songs (
 
   title TEXT,
+  titlesort TEXT,
   album TEXT,
+  albumsort TEXT,
   artist TEXT,
+  artistsort TEXT,
   albumartist TEXT,
+  albumartistsort TEXT,
   track INTEGER NOT NULL DEFAULT -1,
   disc INTEGER NOT NULL DEFAULT -1,
   year INTEGER NOT NULL DEFAULT -1,
@@ -759,7 +853,9 @@ CREATE TABLE IF NOT EXISTS qobuz_albums_songs (
   genre TEXT,
   compilation INTEGER NOT NULL DEFAULT 0,
   composer TEXT,
+  composersort TEXT,
   performer TEXT,
+  performersort TEXT,
   grouping TEXT,
   comment TEXT,
   lyrics TEXT,
@@ -823,16 +919,24 @@ CREATE TABLE IF NOT EXISTS qobuz_albums_songs (
   musicbrainz_work_id TEXT,
 
   ebur128_integrated_loudness_lufs REAL,
-  ebur128_loudness_range_lu REAL
+  ebur128_loudness_range_lu REAL,
+
+  bpm REAL,
+  mood TEXT,
+  initial_key TEXT
 
 );
 
 CREATE TABLE IF NOT EXISTS qobuz_songs (
 
   title TEXT,
+  titlesort TEXT,
   album TEXT,
+  albumsort TEXT,
   artist TEXT,
+  artistsort TEXT,
   albumartist TEXT,
+  albumartistsort TEXT,
   track INTEGER NOT NULL DEFAULT -1,
   disc INTEGER NOT NULL DEFAULT -1,
   year INTEGER NOT NULL DEFAULT -1,
@@ -840,7 +944,9 @@ CREATE TABLE IF NOT EXISTS qobuz_songs (
   genre TEXT,
   compilation INTEGER NOT NULL DEFAULT 0,
   composer TEXT,
+  composersort TEXT,
   performer TEXT,
+  performersort TEXT,
   grouping TEXT,
   comment TEXT,
   lyrics TEXT,
@@ -904,7 +1010,11 @@ CREATE TABLE IF NOT EXISTS qobuz_songs (
   musicbrainz_work_id TEXT,
 
   ebur128_integrated_loudness_lufs REAL,
-  ebur128_loudness_range_lu REAL
+  ebur128_loudness_range_lu REAL,
+
+  bpm REAL,
+  mood TEXT,
+  initial_key TEXT
 
 );
 
@@ -931,9 +1041,13 @@ CREATE TABLE IF NOT EXISTS playlist_items (
   playlist_url TEXT,
 
   title TEXT,
+  titlesort TEXT,
   album TEXT,
+  albumsort TEXT,
   artist TEXT,
+  artistsort TEXT,
   albumartist TEXT,
+  albumartistsort TEXT,
   track INTEGER,
   disc INTEGER,
   year INTEGER,
@@ -941,7 +1055,9 @@ CREATE TABLE IF NOT EXISTS playlist_items (
   genre TEXT,
   compilation INTEGER DEFAULT 0,
   composer TEXT,
+  composersort TEXT,
   performer TEXT,
+  performersort TEXT,
   grouping TEXT,
   comment TEXT,
   lyrics TEXT,
@@ -1005,7 +1121,11 @@ CREATE TABLE IF NOT EXISTS playlist_items (
   musicbrainz_work_id TEXT,
 
   ebur128_integrated_loudness_lufs REAL,
-  ebur128_loudness_range_lu REAL
+  ebur128_loudness_range_lu REAL,
+
+  bpm REAL,
+  mood TEXT,
+  initial_key TEXT
 
 );
 
@@ -1032,10 +1152,22 @@ CREATE INDEX IF NOT EXISTS idx_comp_artist ON songs (compilation_effective, arti
 
 CREATE INDEX IF NOT EXISTS idx_albumartist ON songs (albumartist);
 
+CREATE INDEX IF NOT EXISTS idx_albumartistsort ON songs (albumartistsort);
+
 CREATE INDEX IF NOT EXISTS idx_artist ON songs (artist);
 
+CREATE INDEX IF NOT EXISTS idx_artistsort ON songs (artistsort);
+
 CREATE INDEX IF NOT EXISTS idx_album ON songs (album);
 
+CREATE INDEX IF NOT EXISTS idx_albumsort ON songs (album);
+
 CREATE INDEX IF NOT EXISTS idx_title ON songs (title);
 
+CREATE INDEX IF NOT EXISTS idx_titlesort ON songs (title);
+
+CREATE INDEX IF NOT EXISTS idx_composersort ON songs (title);
+
+CREATE INDEX IF NOT EXISTS idx_performersort ON songs (title);
+
 CREATE VIEW IF NOT EXISTS duplicated_songs as select artist dup_artist, album dup_album, title dup_title from songs as inner_songs where artist != '' and album != '' and title != '' and unavailable = 0 group by artist, album , title having count(*) > 1;

debian/clean

@@ -0,0 +1,3 @@
+dist/scripts/maketarball.sh
+CMakeCache.txt
+CMakeFiles/

debian/compat

@@ -1 +0,0 @@
-11

debian/control

@@ -2,27 +2,27 @@ Source: strawberry
 Section: sound
 Priority: optional
 Maintainer: Jonas Kvinge <jonas@jkvinge.net>
-Build-Depends: debhelper (>= 11),
+Build-Depends: debhelper-compat (= 12),
                git,
                make,
                cmake,
                gcc,
                g++,
-               protobuf-compiler,
                libglib2.0-dev,
-               libdbus-1-dev,
-               libprotobuf-dev,
                libboost-dev,
                libsqlite3-dev,
                libasound2-dev,
                libpulse-dev,
                libtag1-dev,
                libicu-dev,
+               libxkbcommon-dev,
                qt6-base-dev,
+               qt6-base-private-dev,
                qt6-base-dev-tools,
                qt6-tools-dev,
                qt6-tools-dev-tools,
                qt6-l10n-tools,
+               libkdsingleapplication-qt6-dev,
                libgstreamer1.0-dev,
                libgstreamer-plugins-base1.0-dev,
                libcdio-dev,
@@ -30,8 +30,10 @@ Build-Depends: debhelper (>= 11),
                libmtp-dev,
                libchromaprint-dev,
                libfftw3-dev,
-               libebur128-dev
-Standards-Version: 4.6.1
+               libebur128-dev,
+               libsparsehash-dev,
+               rapidjson-dev
+Standards-Version: 4.7.0
 
 Package: strawberry
 Architecture: any
@@ -58,11 +60,11 @@ 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 and elyrics.net
+  - Lyrics from multiple sources
   - Audio analyzer
   - Audio equalizer
   - Transfer music to mass-storage USB players, MTP compatible devices and iPod Nano/Classic
-  - Scrobbler with support for Last.fm, Libre.fm and ListenBrainz
+  - Scrobbler with support for Last.fm and ListenBrainz
   - Streaming support for Subsonic-compatible servers
   - Unofficial streaming support for Tidal and Qobuz
  .

debian/copyright

@@ -5,14 +5,12 @@ Source: https://github.com/strawberrymusicplayer/strawberry
 
 Files: *
 Copyright: 2010-2015, David Sansome <me@davidsansome.com>
-           2012-2014, 2017-2023 Jonas Kvinge <jonas@jkvinge.net>
+           2012-2014, 2017-2024 Jonas Kvinge <jonas@jkvinge.net>
 License: GPL-3+
 
 Files: src/utilities/timeconstants.h
-       ext/libstrawberry-common/core/logging.cpp
-       ext/libstrawberry-common/core/logging.h
-       ext/libstrawberry-common/core/messagehandler.cpp
-       ext/libstrawberry-common/core/messagehandler.h
+       src/core/logging.cpp
+       src/core/logging.h
 Copyright: 2011, 2012, David Sansome <me@davidsansome.com>
            2018-2022, Jonas Kvinge <jonas@jkvinge.net>
 License: Apache-2.0
@@ -31,18 +29,20 @@ Files: src/core/main.h
        src/engine/alsapcmdevicefinder.h
        src/engine/mmdevicefinder.cpp
        src/engine/mmdevicefinder.h
+       src/engine/uwpdevicefinder.cpp
+       src/engine/uwpdevicefinder.h
        src/engine/devicefinder.cpp
        src/engine/devicefinder.h
        src/engine/enginedevice.cpp
        src/engine/enginedevice.h
        src/engine/enginemetadata.cpp
        src/engine/enginemetadata.h
-       src/internet/internetservice.cpp
-       src/internet/internetservice.h
-       src/internet/internettabsview.cpp
-       src/internet/internettabsview.h
-       src/internet/internetsongsview.cpp
-       src/internet/internetsongsview.h
+       src/streaming/streamingservice.cpp
+       src/streaming/streamingservice.h
+       src/streaming/streamingtabsview.cpp
+       src/streaming/streamingtabsview.h
+       src/streaming/streamingsongsview.cpp
+       src/streaming/streamingsongsview.h
        src/settings/backendsettingspage.cpp
        src/settings/backendsettingspage.h
        src/settings/coverssettingspage.cpp
@@ -55,6 +55,8 @@ Files: src/core/main.h
        src/settings/subsonicsettingspage.h
        src/settings/tidalsettingspage.cpp
        src/settings/tidalsettingspage.h
+       src/settings/spotifysettingspage.cpp
+       src/settings/spotifysettingspage.h
        src/covermanager/jsoncoverprovider.cpp
        src/covermanager/jsoncoverprovider.h
        src/covermanager/lastfmcoverprovider.cpp
@@ -65,16 +67,16 @@ Files: src/core/main.h
        src/covermanager/deezercoverprovider.h
        src/covermanager/tidalcoverprovider.cpp
        src/covermanager/tidalcoverprovider.h
+       src/covermanager/opentidalcoverprovider.cpp
+       src/covermanager/opentidalcoverprovider.h
        src/covermanager/qobuzcoverprovider.cpp
        src/covermanager/qobuzcoverprovider.h
        src/covermanager/spotifycoverprovider.cpp
        src/covermanager/spotifycoverprovider.h
        src/covermanager/musixmatchcoverprovider.cpp
        src/covermanager/musixmatchcoverprovider.h
-       src/globalshortcuts/globalshortcutsbackend-kde.cpp
-       src/globalshortcuts/globalshortcutsbackend-kde.h
-       src/globalshortcuts/globalshortcutsbackend-mate.cpp
-       src/globalshortcuts/globalshortcutsbackend-mate.h
+       src/globalshortcuts/globalshortcutsbackend-kglobalaccel.cpp
+       src/globalshortcuts/globalshortcutsbackend-kglobalaccel.h
        src/globalshortcuts/globalshortcutsbackend-x11.cpp
        src/globalshortcuts/globalshortcutsbackend-x11.h
        src/globalshortcuts/globalshortcutsbackend-win.cpp
@@ -91,13 +93,14 @@ Files: src/core/main.h
        src/tidal/*
        src/qobuz/*
        src/radios/*
+       src/spotify/*
        src/transcoder/transcoderoptionswavpack.cpp
        src/transcoder/transcoderoptionswavpack.h
-       ext/libstrawberry-tagreader/tagreadertagparser.cpp
-       ext/libstrawberry-tagreader/tagreadertagparser.h
        src/widgets/resizabletextedit.cpp
        src/widgets/resizabletextedit.h
-Copyright: 2012-2014, 2017-2023, Jonas Kvinge <jonas@jkvinge.net>
+       src/widgets/fancytabdata.cpp
+       src/widgets/fancytabdata.h
+Copyright: 2012-2014, 2017-2024, Jonas Kvinge <jonas@jkvinge.net>
 License: GPL-3+
 
 Files: src/engine/enginebase.cpp
@@ -118,6 +121,8 @@ License: GPL-2+
 
 Files: src/widgets/fancytabwidget.cpp
        src/widgets/fancytabwidget.h
+       src/widgets/fancytabbar.cpp
+       src/widgets/fancytabbar.h
 Copyright: 2018, Vikram Ambrose <ambroseworks@gmail.com>
            2018, Jonas Kvinge <jonas@jkvinge.net>
 License: GPL-3+
@@ -207,8 +212,8 @@ Files: src/device/udisks2lister.cpp
 Copyright: 2016, Valeriy Malov <jazzvoid@gmail.com>
 License: GPL-3+
 
-Files: src/internet/localredirectserver.cpp
-       src/internet/localredirectserver.h
+Files: src/core/localredirectserver.cpp
+       src/core/localredirectserver.h
 Copyright: 2012, 2014, John Maguire <john.maguire@gmail.com>
            2014, Krzysztof Sobiecki <sobkas@gmail.com>
            2018-2021, Jonas Kvinge <jonas@jkvinge.net>
@@ -247,25 +252,24 @@ Files: src/core/stylehelper.cpp
 Copyright: 2016 The Qt Company Ltd.
 License: GPL-3+
 
-Files: ext/gstmoodbar/gstfastspectrum.cpp
-       ext/gstmoodbar/gstfastspectrum.h
+Files: 3rdparty/gstfastspectrum/gstfastspectrum.cpp
+       3rdparty/gstfastspectrum/gstfastspectrum.h
 Copyright: 1999 Erik Walthinsen <omega@cse.ogi.edu>
            2006,2011 Stefan Kost <ensonic@users.sf.net>
            2007-2009 Sebastian Dröge <sebastian.droege@collabora.co.uk>
+           2018-2024 Jonas Kvinge <jonas@jkvinge.net>
 License: GPL-2+
 
-Files: src/widgets/qsearchfield_nonmac.cpp
+Files: src/widgets/qsearchfield_qt.cpp
        src/widgets/qsearchfield_mac.mm
        src/widgets/qsearchfield.h
        src/widgets/qocoa_mac.h
+       src/widgets/searchfield_qt_private.cpp
+       src/widgets/searchfield_qt_private.h
 Copyright: 2011, Mike McQuaid <mike@mikemcquaid.com>
+           2018-2024, Jonas Kvinge <jonas@jkvinge.net>
 License: Expat
 
-Files: 3rdparty/SPMediaKeyTap/*
-Copyright: 2010, Spotify AB
-           2011, Joachim Bengtsson
-License: BSD-3-clause
-
 Files: 3rdparty/kdsingleapplication/*
 Copyright: 2019-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
 License: MIT

debian/rules

@@ -1,17 +1,14 @@
 #!/usr/bin/make -f
 
-%:
-	dh $@ --buildsystem=cmake -builddirectory=build
+export DH_VERBOSE=1
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
-override_dh_auto_clean:
-	rm -f dist/macos/Info.plist
-	rm -f dist/unix/strawberry.spec
-	rm -f dist/scripts/maketarball.sh
-	rm -f dist/windows/strawberry.nsi
-	rm -f src/translations/translations.pot
-	dh_auto_clean
+override_dh_auto_configure:
+	dh_auto_configure -- \
+	-DBUILD_WERROR=ON
 
 override_dh_installchangelogs:
 	dh_installchangelogs Changelog
 
-override_dh_auto_test:
+%:
+	dh $@

dist/CMakeLists.txt

@@ -1,7 +1,7 @@
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/scripts/maketarball.sh.in ${CMAKE_CURRENT_SOURCE_DIR}/scripts/maketarball.sh @ONLY)
 if(RPM_DISTRO AND RPM_DATE)
-  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/unix/strawberry.spec.in ${CMAKE_CURRENT_SOURCE_DIR}/unix/strawberry.spec @ONLY)
-endif(RPM_DISTRO AND RPM_DATE)
+  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/unix/strawberry.spec.in ${CMAKE_BINARY_DIR}/strawberry.spec @ONLY)
+endif()
 
 if(APPLE)
   if(DEFINED ENV{MACOSX_DEPLOYMENT_TARGET})
@@ -9,12 +9,13 @@ if(APPLE)
   else()
     set(LSMinimumSystemVersion 12.0)
   endif()
-  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/macos/Info.plist.in ${CMAKE_CURRENT_SOURCE_DIR}/macos/Info.plist)
-endif(APPLE)
+  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/macos/Info.plist.in ${CMAKE_CURRENT_BINARY_DIR}/macos/Info.plist)
+endif()
 
 if(WIN32)
-  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/windows/strawberry.nsi.in ${CMAKE_CURRENT_SOURCE_DIR}/windows/strawberry.nsi @ONLY)
-endif(WIN32)
+  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/windows/windres.rc.in ${CMAKE_BINARY_DIR}/windres.rc)
+  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/windows/strawberry.nsi.in ${CMAKE_BINARY_DIR}/strawberry.nsi @ONLY)
+endif()
 
 if(UNIX AND NOT APPLE)
   install(FILES ../data/icons/48x48/strawberry.png DESTINATION share/icons/hicolor/48x48/apps/)
@@ -22,10 +23,10 @@ if(UNIX AND NOT APPLE)
   install(FILES ../data/icons/128x128/strawberry.png DESTINATION share/icons/hicolor/128x128/apps/)
   install(FILES unix/org.strawberrymusicplayer.strawberry.desktop DESTINATION share/applications)
   install(FILES unix/org.strawberrymusicplayer.strawberry.appdata.xml DESTINATION share/metainfo)
-  install(FILES unix/strawberry.1 unix/strawberry-tagreader.1 DESTINATION share/man/man1)
-endif(UNIX AND NOT APPLE)
+  install(FILES unix/strawberry.1 DESTINATION share/man/man1)
+endif()
 
 if(APPLE)
-  install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/macos/Info.plist" DESTINATION "${CMAKE_BINARY_DIR}/strawberry.app/Contents")
+  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/macos/Info.plist" DESTINATION "${CMAKE_BINARY_DIR}/strawberry.app/Contents")
   install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/macos/strawberry.icns" DESTINATION "${CMAKE_BINARY_DIR}/strawberry.app/Contents/Resources")
 endif()

dist/macos/Info.plist.in

@@ -35,9 +35,9 @@
   <key>LSMinimumSystemVersion</key>
   <string>@LSMinimumSystemVersion@</string>
   <key>SUFeedURL</key>
-  <string>https://www.strawberrymusicplayer.org/sparkle-macos</string>
+  <string>https://www.strawberrymusicplayer.org/sparkle-macos-@ARCH@</string>
   <key>SUPublicEDKey</key>
-  <string>3IRScV8YtNVnx7zoeJAXvg28Kh1gN/Pyl2iPM467pG8=</string>
+  <string>/OydhYVfypuO2Mf7G6DUqVZWW9G19eFV74qaDCBTOUk=</string>
   <key>CFBundleURLTypes</key>
   <array>
     <dict>

dist/macos/macversion.sh

@@ -1,22 +0,0 @@
-#!/bin/sh
-
-macos_version=$(sw_vers -productVersion)
-macos_version_major=$(echo $macos_version | awk -F '[.]' '{print $1}')
-macos_version_minor=$(echo $macos_version | awk -F '[.]' '{print $2}')
-
-if [ "${macos_version_major}" = "10" ]; then
-  macos_codenames=(
-    ["13"]="highsierra"
-    ["14"]="mojave"
-    ["15"]="catalina"
-  )
-  if [[ -n "${macos_codenames[$macos_version_minor]}" ]]; then
-    echo "${macos_codenames[$macos_version_minor]}"
-  else
-    echo "unknown"
-  fi
-elif [ "${macos_version_major}" = "11" ]; then
-  echo "bigsur"
-else
-  echo "unknown"
-fi

dist/scripts/import-from-clementine.sh

@@ -2,7 +2,7 @@
 
 # Strawberry Music Player
 # Copyright 2020, Jonas Kvinge <jonas@jkvinge.net>
-# 2021 Alexey Vazhnov
+# Copyright 2021, Alexey Vazhnov
 #
 # Strawberry is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
 # SPDX-License-Identifier: GPL-3.0-only
 
 
-# Based on https://github.com/strawberrymusicplayer/strawberry/wiki/Import-collection-library-and-playlists-data-from-Clementine
+# Based on https://wiki.strawberrymusicplayer.org/wiki/Import_collection_library_and_playlists_from_Clementine
 
 set -o nounset
 set -o errexit
@@ -35,8 +35,8 @@ test -f "$FILE_DST" || { echo "No such file: $FILE_DST"; exit 1; }
 
 echo "Will try to copy information from $FILE_SRC to $FILE_DST."
 echo
-echo 'This script will **delete all information** from Strawberry database!'
-read -r -p 'Do you want to continue? (the only YES is accepted) ' answer
+echo 'This script will **delete all data** from the Strawberry database!'
+read -r -p 'Do you want to continue? (Only YES is accepted) ' answer
 if [ "$answer" != "YES" ]; then exit 1; fi
 
 # 'heredoc' with substitution of variables, see `man bash`, "Here Documents":
@@ -62,9 +62,9 @@ INSERT INTO strawberry.subdirectories (directory_id, path, mtime) SELECT directo
 INSERT INTO strawberry.songs (ROWID, title, album, artist, albumartist, track, disc, year, originalyear, genre, compilation, composer, performer, grouping, comment, lyrics, beginning, length, bitrate, samplerate, directory_id, url, filetype, filesize, mtime, ctime, unavailable, playcount, skipcount, lastplayed, compilation_detected, compilation_on, compilation_off, compilation_effective, art_automatic, art_manual, effective_albumartist, effective_originalyear, cue_path, rating)
 SELECT ROWID, title, album, artist, albumartist, track, disc, year, originalyear, genre, compilation, composer, performer, grouping, comment, lyrics, beginning, length, bitrate, samplerate, directory, filename, filetype, filesize, mtime, ctime, unavailable, playcount, skipcount, lastplayed, sampler, forced_compilation_on, forced_compilation_off, effective_compilation, art_automatic, art_manual, effective_albumartist, effective_originalyear, cue_path, rating FROM clementine.songs WHERE unavailable = 0;
 UPDATE strawberry.songs SET source = 2;
-UPDATE strawberry.songs SET artist_id = "";
-UPDATE strawberry.songs SET album_id = "";
-UPDATE strawberry.songs SET song_id = "";
+UPDATE strawberry.songs SET artist_id = '';
+UPDATE strawberry.songs SET album_id = '';
+UPDATE strawberry.songs SET song_id = '';
 
 /* Import playlists */
 
@@ -140,7 +140,7 @@ SELECT ROWID,
    bitrate,
    samplerate,
    directory,
-   filename,
+   CASE WHEN filename IS NULL THEN '' ELSE filename END,
    filetype,
    filesize,
    mtime,
@@ -162,16 +162,9 @@ SELECT ROWID,
 
 UPDATE strawberry.playlist_items SET source = 2;
 UPDATE strawberry.playlist_items SET type = 2;
-UPDATE strawberry.playlist_items SET artist_id = "";
-UPDATE strawberry.playlist_items SET album_id = "";
-UPDATE strawberry.playlist_items SET song_id = "";
-
-/* Recreate the FTS tables */
-
-DELETE FROM strawberry.songs_fts;
-INSERT INTO strawberry.songs_fts (ROWID, ftstitle, ftsalbum, ftsartist, ftsalbumartist, ftscomposer, ftsperformer, ftsgrouping, ftsgenre, ftscomment)
-SELECT ROWID, title, album, artist, albumartist, composer, performer, grouping, genre, comment
-FROM strawberry.songs;
+UPDATE strawberry.playlist_items SET artist_id = '';
+UPDATE strawberry.playlist_items SET album_id = '';
+UPDATE strawberry.playlist_items SET song_id = '';
 
 EOF
 

dist/unix/org.strawberrymusicplayer.strawberry.appdata.xml

@@ -6,7 +6,6 @@
   <project_license>GPL-3.0+</project_license>
   <provides>
     <binary>strawberry</binary>
-    <binary>strawberry-tagreader</binary>
   </provides>
   <name>Strawberry Music Player</name>
   <summary>A music player and collection organizer</summary>
@@ -15,7 +14,7 @@
   <developer id="net.jkvinge.jonas">
     <name>Jonas Kvinge</name>
   </developer>
-  ​<translation type="gettext">strawberry</translation>
+  ​<translation type="qt">strawberry</translation>
   <content_rating type="oars-1.1" />
   <description>
     <p>
@@ -32,10 +31,10 @@
       <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 and elyrics.net</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, Libre.fm and ListenBrainz</li>
+      <li>Scrobbler with support for Last.fm and ListenBrainz</li>
       <li>Streaming support for Subsonic-compatible servers</li>
       <li>Unofficial streaming support for Tidal, Spotify and Qobuz</li>
     </ul>
@@ -52,6 +51,23 @@
   </screenshots>
   <update_contact>eclipseo@fedoraproject.org</update_contact>
     <releases>
+        <release version="1.2.17" date="2026-01-18"/>
+        <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"/>
+        <release version="1.2.11" date="2025-05-15"/>
+        <release version="1.2.10" date="2025-04-18"/>
+        <release version="1.2.9" date="2025-04-08"/>
+        <release version="1.2.8" date="2025-04-05"/>
+        <release version="1.2.7" date="2025-01-31"/>
+        <release version="1.2.6" date="2025-01-17"/>
+        <release version="1.2.5" date="2025-01-17"/>
+        <release version="1.2.4" date="2025-01-10"/>
+        <release version="1.2.3" date="2024-12-08"/>
+        <release version="1.2.2" date="2024-11-23"/>
+        <release version="1.2.1" date="2024-11-21"/>
         <release version="1.1.3" date="2024-09-21"/>
         <release version="1.1.2" date="2024-09-12"/>
         <release version="1.1.1" date="2024-07-22"/>

dist/unix/org.strawberrymusicplayer.strawberry.desktop

@@ -13,8 +13,7 @@ TryExec=strawberry
 Icon=strawberry
 Terminal=false
 Categories=AudioVideo;Player;Qt;Audio;
-Keywords=Audio;Player;
-StartupNotify=false
+Keywords=Audio;Player;Clementine;
 MimeType=x-content/audio-player;application/ogg;application/x-ogg;application/x-ogm-audio;audio/flac;audio/ogg;audio/vorbis;audio/aac;audio/mp4;audio/mpeg;audio/mpegurl;audio/vnd.rn-realaudio;audio/x-flac;audio/x-oggflac;audio/x-vorbis;audio/x-vorbis+ogg;audio/x-speex;audio/x-wav;audio/x-wavpack;audio/x-ape;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-ms-wma;audio/x-musepack;audio/x-pn-realaudio;audio/x-scpls;video/x-ms-asf;x-scheme-handler/tidal;
 StartupWMClass=strawberry
 Actions=Play-Pause;Stop;StopAfterCurrent;Previous;Next;

dist/unix/strawberry-tagreader.1

@@ -1,10 +0,0 @@
-.TH STRAWBERRY-TAGREADER "1"
-.SH NAME
-strawberry-tagreader \- internal tag reader for strawberry
-.SH SYNOPSIS
-.B strawberry-tagreader
-.SH DESCRIPTION
-This program is used internally by Strawberry to parse tags in music files without exposing the whole application to crashes caused by malformed files.  It is not meant to be run on its own.
-.SH "AUTHORS"
-.PP
-Strawberry main developer is Jonas Kvinge <jonas@jkvinge.net>.

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 Lyrics.com, Genius, Musixmatch, ChartLyrics, lyrics.ovh and lololyrics.com
-.br
-- Support for multiple backends
+- Lyrics from multiple sources
 .br
 - Audio analyzer
 .br
@@ -39,7 +37,7 @@ Features:
 .br
 - Transfer music to mass-storage USB players, MTP compatible devices and iPod Nano/Classic
 .br
-- Scrobbler with support for Last.fm, Libre.fm and ListenBrainz
+- Scrobbler with support for Last.fm and ListenBrainz
 .br
 - Streaming support for Subsonic-compatible servers
 .br

dist/unix/strawberry.spec.in

@@ -21,7 +21,6 @@ BuildRequires:  gcc-c++
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  make
 BuildRequires:  git
-BuildRequires:  gettext
 BuildRequires:  desktop-file-utils
 %if 0%{?suse_version}
 BuildRequires:  update-desktop-files
@@ -38,9 +37,7 @@ BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(gio-2.0)
 BuildRequires:  pkgconfig(gio-unix-2.0)
 BuildRequires:  pkgconfig(gthread-2.0)
-BuildRequires:  pkgconfig(dbus-1)
 BuildRequires:  pkgconfig(alsa)
-BuildRequires:  pkgconfig(protobuf)
 BuildRequires:  pkgconfig(sqlite3) >= 3.9
 BuildRequires:  pkgconfig(taglib)
 BuildRequires:  pkgconfig(fftw3)
@@ -66,8 +63,13 @@ BuildRequires:  pkgconfig(libcdio)
 BuildRequires:  pkgconfig(libebur128)
 BuildRequires:  pkgconfig(libgpod-1.0)
 BuildRequires:  pkgconfig(libmtp)
-%if 0%{?suse_version} || 0%{?fedora_version}
-BuildRequires:  pkgconfig(libvlc)
+BuildRequires:  pkgconfig(libsparsehash)
+BuildRequires:  cmake(GTest)
+BuildRequires:  pkgconfig(gmock)
+BuildRequires:  cmake(RapidJSON)
+
+%if 0%{?fedora} || (0%{?suse_version} && 0%{?suse_version} > 1600) || "%{?_vendor}" == "openmandriva"
+BuildRequires:  cmake(KDSingleApplication-qt6)
 %endif
 
 %if 0%{?suse_version}
@@ -91,16 +93,15 @@ 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 and elyrics.net
-  - Support for multiple backends
+  - Lyrics from multiple sources
   - Audio analyzer
   - Audio equalizer
-  - Scrobbler with support for Last.fm, Libre.fm and ListenBrainz
+  - Scrobbler with support for Last.fm and ListenBrainz
   - Transfer music to mass-storage USB players, MTP compatible devices and iPod Nano/Classic
   - Streaming support for Subsonic-compatible servers
   - Unofficial streaming support for Tidal and Qobuz
 
-%if 0%{?suse_version}
+%if 0%{?suse_version} && 0%{?suse_version} < 1600
 %debug_package
 %endif
 
@@ -109,13 +110,13 @@ Features:
 
 %build
 %if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos}
-  export CXXFLAGS="-fPIC $RPM_OPT_FLAGS"
+  export CXXFLAGS="-fPIC -Wno-maybe-uninitialized $RPM_OPT_FLAGS"
 %endif
 %if "%{?_vendor}" == "openmandriva"
-%{cmake} -DQT_VERSION_MAJOR=@QT_VERSION_MAJOR@ -DENABLE_TRANSLATIONS=OFF
+%{cmake} -DBUILD_WERROR=ON
 %make_build
 %else
-%{cmake} -DQT_VERSION_MAJOR=@QT_VERSION_MAJOR@
+%{cmake} -DBUILD_WERROR=ON
 %cmake_build
 %endif
 
@@ -126,11 +127,13 @@ Features:
 %cmake_install
 %endif
 
-%if 0%{?suse_version}
-  %suse_update_desktop_file org.strawberrymusicplayer.strawberry Qt AudioVideo Audio Player
-%endif
-
 %check
+export QT_QPA_PLATFORM="offscreen"
+%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos}
+%{cmake_build} -t strawberry_tests
+%else
+%{make_build} -j $(nproc) -C build strawberry_tests
+%endif
 desktop-file-validate %{buildroot}%{_datadir}/applications/org.strawberrymusicplayer.strawberry.desktop
 %if 0%{?suse_version}
   appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.strawberrymusicplayer.strawberry.appdata.xml
@@ -143,11 +146,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.strawberrymusicpl
 %doc README.md Changelog
 %license COPYING
 %{_bindir}/strawberry
-%{_bindir}/strawberry-tagreader
 %{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/*/apps/strawberry.*
 %{_mandir}/man1/%{name}.1.*
-%{_mandir}/man1/%{name}-tagreader.1.*
 %if 0%{?suse_version}
 %{_datadir}/metainfo/*.appdata.xml
 %else

dist/windows/strawberry.nsi.in

@@ -21,6 +21,10 @@
   !define arch_x64
 !else if "@ARCH@" == "x86_64-w64-mingw32.shared"
   !define arch_x64
+!else if "@ARCH@" == "arm64"
+  !define arch_arm64
+!else
+  !error "Missing ARCH"
 !endif
 
 !ifdef arch_x86
@@ -31,6 +35,10 @@
   !define arch "x64"
 !endif
 
+!ifdef arch_arm64
+  !define arch "arm64"
+!endif
+
 
 !if "@CMAKE_BUILD_TYPE@" == "Release"
   !define release
@@ -38,6 +46,8 @@
   !define release
 !else if "@CMAKE_BUILD_TYPE@" == "Debug"
   !define debug
+!else
+  !error "Missing CMAKE_BUILD_TYPE"
 !endif
 
 !ifdef release
@@ -70,7 +80,7 @@
   !ifdef arch_x86
     !define PRODUCT_INSTALL_DIR "$PROGRAMFILES\Strawberry Music Player Debug"
   !endif
-  !ifdef arch_x64
+  !ifdef arch_x64 || arch_arm64
     !define PRODUCT_INSTALL_DIR "$PROGRAMFILES64\Strawberry Music Player Debug"
   !endif
 !else
@@ -80,7 +90,7 @@
   !ifdef arch_x86
     !define PRODUCT_INSTALL_DIR "$PROGRAMFILES\Strawberry Music Player"
   !endif
-  !ifdef arch_x64
+  !ifdef arch_x64 || arch_arm64
     !define PRODUCT_INSTALL_DIR "$PROGRAMFILES64\Strawberry Music Player"
   !endif
 !endif
@@ -208,14 +218,16 @@ FunctionEnd
 !ifdef msvc
 !define vc_redist_file "vc_redist.${arch}.exe"
 Function InstallMSVCRuntime
-  ${registry::Read} "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\${arch}" "Version" $R0 $R1
-  ${If} $R0 == ""
+  SetOutPath "$TEMP"
+  File "${vc_redist_file}"
+  ; ${registry::Read} "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\${arch}" "Version" $R0 $R1
+  ; ${If} $R0 == ""
     SetDetailsView hide
-    inetc::get /caption "Downloading..." "https://aka.ms/vs/17/release/${vc_redist_file}" "$TEMP\${vc_redist_file}" /end
-    ExecWait '"$TEMP\${vc_redist_file}" /install /passive'
+    ; inetc::get /caption "Downloading..." "https://aka.ms/vs/17/release/${vc_redist_file}" "$TEMP\${vc_redist_file}" /end
+    ExecWait '"$TEMP\${vc_redist_file}" /install /passive /norestart'
     Delete "$TEMP\${vc_redist_file}"
     SetDetailsView show
-  ${EndIf}
+  ; ${EndIf}
 FunctionEnd
 !endif
 
@@ -236,7 +248,6 @@ Section "Strawberry" Strawberry
   ; Common executables
 
   File "strawberry.exe"
-  File "strawberry-tagreader.exe"
   File "strawberry.ico"
   File "sqlite3.exe"
   File "gst-launch-1.0.exe"
@@ -258,7 +269,7 @@ Section "Strawberry" Strawberry
   File "libssl-3-x64.dll"
 !endif
 
-  File "libFLAC-12.dll"
+  File "libFLAC-14.dll"
   File "libbrotlicommon.dll"
   File "libbrotlidec.dll"
   File "libbrotlienc.dll"
@@ -330,7 +341,6 @@ Section "Strawberry" Strawberry
   File "libtasn1-6.dll"
   File "libtwolame-0.dll"
   File "libunistring-5.dll"
-  File "libutf8_validity.dll"
   File "libvorbis-0.dll"
   File "libvorbisenc-2.dll"
   File "libvorbisfile-3.dll"
@@ -339,48 +349,6 @@ Section "Strawberry" Strawberry
   File "libzstd.dll"
   File "zlib1.dll"
 
-  File "libabsl_base.dll"
-  File "libabsl_city.dll"
-  File "libabsl_cord.dll"
-  File "libabsl_cord_internal.dll"
-  File "libabsl_cordz_handle.dll"
-  File "libabsl_cordz_info.dll"
-  File "libabsl_crc32c.dll"
-  File "libabsl_crc_cord_state.dll"
-  File "libabsl_crc_internal.dll"
-  File "libabsl_die_if_null.dll"
-  File "libabsl_examine_stack.dll"
-  File "libabsl_hash.dll"
-  File "libabsl_int128.dll"
-  File "libabsl_kernel_timeout_internal.dll"
-  File "libabsl_log_globals.dll"
-  File "libabsl_log_internal_check_op.dll"
-  File "libabsl_log_internal_conditions.dll"
-  File "libabsl_log_internal_format.dll"
-  File "libabsl_log_internal_globals.dll"
-  File "libabsl_log_internal_log_sink_set.dll"
-  File "libabsl_log_internal_message.dll"
-  File "libabsl_log_internal_nullguard.dll"
-  File "libabsl_log_internal_proto.dll"
-  File "libabsl_log_sink.dll"
-  File "libabsl_low_level_hash.dll"
-  File "libabsl_malloc_internal.dll"
-  File "libabsl_raw_hash_set.dll"
-  File "libabsl_raw_logging_internal.dll"
-  File "libabsl_spinlock_wait.dll"
-  File "libabsl_stacktrace.dll"
-  File "libabsl_status.dll"
-  File "libabsl_statusor.dll"
-  File "libabsl_strerror.dll"
-  File "libabsl_str_format_internal.dll"
-  File "libabsl_strings.dll"
-  File "libabsl_strings_internal.dll"
-  File "libabsl_symbolize.dll"
-  File "libabsl_synchronization.dll"
-  File "libabsl_throw_delegate.dll"
-  File "libabsl_time.dll"
-  File "libabsl_time_zone.dll"
-
 !ifdef debug
   File "gdb.exe"
   File "libexpat-1.dll"
@@ -390,7 +358,6 @@ Section "Strawberry" Strawberry
   File "libpcre2-16d.dll"
   File "libreadline8.dll"
   File "libtermcap.dll"
-  File "libabsl_graphcycles_internal.dll"
 !else
   File "libpcre2-8.dll"
   File "libpcre2-16.dll"
@@ -410,9 +377,12 @@ Section "Strawberry" Strawberry
   File "libcrypto-3-x64.dll"
   File "libssl-3-x64.dll"
 !endif
+!ifdef arch_arm64
+  File "libcrypto-3-arm64.dll"
+  File "libssl-3-arm64.dll"
+!endif
 
   File "FLAC.dll"
-  File "abseil_dll.dll"
   File "brotlicommon.dll"
   File "brotlidec.dll"
   File "chromaprint.dll"
@@ -445,14 +415,11 @@ Section "Strawberry" Strawberry
   File "gsttag-1.0-0.dll"
   File "gsturidownloader-1.0-0.dll"
   File "gstvideo-1.0-0.dll"
-  File "gstwinrt-1.0-0.dll"
   File "harfbuzz.dll"
   File "intl-8.dll"
   File "jpeg62.dll"
   File "kdsingleapplication-qt6.dll"
   File "libbs2b.dll"
-  File "libfaac_dll.dll"
-  File "liblzma.dll"
   File "libmp3lame.dll"
   File "libopenmpt.dll"
   File "mpcdec.dll"
@@ -466,11 +433,15 @@ Section "Strawberry" Strawberry
   File "soup-3.0-0.dll"
   File "sqlite3.dll"
   File "tag.dll"
-  File "utf8_validity.dll"
   File "vorbis.dll"
   File "vorbisfile.dll"
   File "wavpackdll.dll"
 
+!ifndef arch_arm64
+  File "gnutls.dll"
+  File "libfaac_dll.dll"
+!endif
+
 !ifdef release
   File "freetype.dll"
   File "libiconv.dll"
@@ -478,8 +449,10 @@ Section "Strawberry" Strawberry
   File "libspeex.dll"
   File "pcre2-8.dll"
   File "pcre2-16.dll"
+  File "zlib1.dll"
+!ifndef arch_arm64
   File "twolame.dll"
-  File "zlib.dll"
+!endif
 !endif
 !ifdef debug
   File "freetyped.dll"
@@ -488,8 +461,10 @@ Section "Strawberry" Strawberry
   File "libspeexd.dll"
   File "pcre2-8d.dll"
   File "pcre2-16d.dll"
+  File "zlibd1.dll"
+!ifndef arch_arm64
   File "twolamed.dll"
-  File "zlibd.dll"
+!endif
 !endif
 
   ; Used by libfftw3-3.dll because fftw is compiled with MinGW.
@@ -502,16 +477,15 @@ Section "Strawberry" Strawberry
 
   ; Common files
 
-  File "icudt75.dll"
-  File "libfftw3-3.dll"
-!ifdef debug
-  File "libprotobufd.dll"
+  File "icudt78.dll"
+!ifdef msvc && arch_arm64
+  File "fftw3.dll"
 !else
-  File "libprotobuf.dll"
+  File "libfftw3-3.dll"
 !endif
 !ifdef msvc && debug
-  File "icuin75d.dll"
-  File "icuuc75d.dll"
+  File "icuin78d.dll"
+  File "icuuc78d.dll"
   File "libxml2d.dll"
   File "Qt6Concurrentd.dll"
   File "Qt6Cored.dll"
@@ -520,8 +494,8 @@ Section "Strawberry" Strawberry
   File "Qt6Sqld.dll"
   File "Qt6Widgetsd.dll"
 !else
-  File "icuin75.dll"
-  File "icuuc75.dll"
+  File "icuin78.dll"
+  File "icuuc78.dll"
   File "libxml2.dll"
   File "Qt6Concurrent.dll"
   File "Qt6Core.dll"
@@ -531,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"
@@ -538,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
@@ -575,11 +558,13 @@ Section "GIO modules" gio-modules
   SetOutPath "$INSTDIR\gio-modules"
 !ifdef mingw
   File "/oname=libgiognutls.dll" "gio-modules\libgiognutls.dll"
-  File "/oname=libgioopenssl.dll" "gio-modules\libgioopenssl.dll"
 !endif
 !ifdef msvc
-  File "/oname=giognutls.dll" "gio-modules\giognutls.dll"
+!ifdef arch_arm64
   File "/oname=gioopenssl.dll" "gio-modules\gioopenssl.dll"
+!else
+  File "/oname=giognutls.dll" "gio-modules\giognutls.dll"
+!endif
 !endif
 SectionEnd
 
@@ -645,6 +630,7 @@ Section "Gstreamer plugins" gstreamer-plugins
   File "/oname=libgstapp.dll" "gstreamer-plugins\libgstapp.dll"
   File "/oname=libgstasf.dll" "gstreamer-plugins\libgstasf.dll"
   File "/oname=libgstasfmux.dll" "gstreamer-plugins\libgstasfmux.dll"
+  File "/oname=libgstasio.dll" "gstreamer-plugins\libgstasio.dll"
   File "/oname=libgstaudioconvert.dll" "gstreamer-plugins\libgstaudioconvert.dll"
   File "/oname=libgstaudiofx.dll" "gstreamer-plugins\libgstaudiofx.dll"
   File "/oname=libgstaudioparsers.dll" "gstreamer-plugins\libgstaudioparsers.dll"
@@ -695,6 +681,7 @@ Section "Gstreamer plugins" gstreamer-plugins
   File "/oname=libgstvolume.dll" "gstreamer-plugins\libgstvolume.dll"
   File "/oname=libgstvorbis.dll" "gstreamer-plugins\libgstvorbis.dll"
   File "/oname=libgstwasapi.dll" "gstreamer-plugins\libgstwasapi.dll"
+  File "/oname=libgstwasapi2.dll" "gstreamer-plugins\libgstwasapi2.dll"
   File "/oname=libgstwaveform.dll" "gstreamer-plugins\libgstwaveform.dll"
   File "/oname=libgstwavenc.dll" "gstreamer-plugins\libgstwavenc.dll"
   File "/oname=libgstwavpack.dll" "gstreamer-plugins\libgstwavpack.dll"
@@ -722,7 +709,6 @@ Section "Gstreamer plugins" gstreamer-plugins
   File "/oname=gstdirectsound.dll" "gstreamer-plugins\gstdirectsound.dll"
   File "/oname=gstdsd.dll" "gstreamer-plugins\gstdsd.dll"
   File "/oname=gstequalizer.dll" "gstreamer-plugins\gstequalizer.dll"
-  File "/oname=gstfaac.dll" "gstreamer-plugins\gstfaac.dll"
   File "/oname=gstfaad.dll" "gstreamer-plugins\gstfaad.dll"
   File "/oname=gstfdkaac.dll" "gstreamer-plugins\gstfdkaac.dll"
   File "/oname=gstflac.dll" "gstreamer-plugins\gstflac.dll"
@@ -755,7 +741,6 @@ Section "Gstreamer plugins" gstreamer-plugins
   File "/oname=gstspeex.dll" "gstreamer-plugins\gstspeex.dll"
   File "/oname=gsttaglib.dll" "gstreamer-plugins\gsttaglib.dll"
   File "/oname=gsttcp.dll" "gstreamer-plugins\gsttcp.dll"
-  File "/oname=gsttwolame.dll" "gstreamer-plugins\gsttwolame.dll"
   File "/oname=gsttypefindfunctions.dll" "gstreamer-plugins\gsttypefindfunctions.dll"
   File "/oname=gstudp.dll" "gstreamer-plugins\gstudp.dll"
   File "/oname=gstvolume.dll" "gstreamer-plugins\gstvolume.dll"
@@ -767,6 +752,10 @@ Section "Gstreamer plugins" gstreamer-plugins
   File "/oname=gstwavpack.dll" "gstreamer-plugins\gstwavpack.dll"
   File "/oname=gstwavparse.dll" "gstreamer-plugins\gstwavparse.dll"
   File "/oname=gstxingmux.dll" "gstreamer-plugins\gstxingmux.dll"
+!ifndef arch_arm64
+  File "/oname=gstfaac.dll" "gstreamer-plugins\gstfaac.dll"
+  File "/oname=gsttwolame.dll" "gstreamer-plugins\gsttwolame.dll"
+!endif
 !ifdef arch_x64
   File "/oname=gstspotify.dll" "gstreamer-plugins\gstspotify.dll"
 !endif
@@ -810,7 +799,6 @@ Section "Uninstall"
   ; Delete all the files
 
   Delete "$INSTDIR\strawberry.exe"
-  Delete "$INSTDIR\strawberry-tagreader.exe"
   Delete "$INSTDIR\strawberry.ico"
   Delete "$INSTDIR\sqlite3.exe"
   Delete "$INSTDIR\gst-launch-1.0.exe"
@@ -833,7 +821,7 @@ Section "Uninstall"
   Delete "$INSTDIR\libssl-3-x64.dll"
 !endif
 
-  Delete "$INSTDIR\libFLAC-12.dll"
+  Delete "$INSTDIR\libFLAC-14.dll"
   Delete "$INSTDIR\libbrotlicommon.dll"
   Delete "$INSTDIR\libbrotlidec.dll"
   Delete "$INSTDIR\libbrotlienc.dll"
@@ -905,7 +893,6 @@ Section "Uninstall"
   Delete "$INSTDIR\libtasn1-6.dll"
   Delete "$INSTDIR\libtwolame-0.dll"
   Delete "$INSTDIR\libunistring-5.dll"
-  Delete "$INSTDIR\libutf8_validity.dll"
   Delete "$INSTDIR\libvorbis-0.dll"
   Delete "$INSTDIR\libvorbisenc-2.dll"
   Delete "$INSTDIR\libvorbisfile-3.dll"
@@ -914,48 +901,6 @@ Section "Uninstall"
   Delete "$INSTDIR\libzstd.dll"
   Delete "$INSTDIR\zlib1.dll"
 
-  Delete "$INSTDIR\libabsl_base.dll"
-  Delete "$INSTDIR\libabsl_city.dll"
-  Delete "$INSTDIR\libabsl_cord.dll"
-  Delete "$INSTDIR\libabsl_cord_internal.dll"
-  Delete "$INSTDIR\libabsl_cordz_handle.dll"
-  Delete "$INSTDIR\libabsl_cordz_info.dll"
-  Delete "$INSTDIR\libabsl_crc32c.dll"
-  Delete "$INSTDIR\libabsl_crc_cord_state.dll"
-  Delete "$INSTDIR\libabsl_crc_internal.dll"
-  Delete "$INSTDIR\libabsl_die_if_null.dll"
-  Delete "$INSTDIR\libabsl_examine_stack.dll"
-  Delete "$INSTDIR\libabsl_hash.dll"
-  Delete "$INSTDIR\libabsl_int128.dll"
-  Delete "$INSTDIR\libabsl_kernel_timeout_internal.dll"
-  Delete "$INSTDIR\libabsl_log_globals.dll"
-  Delete "$INSTDIR\libabsl_log_internal_check_op.dll"
-  Delete "$INSTDIR\libabsl_log_internal_conditions.dll"
-  Delete "$INSTDIR\libabsl_log_internal_format.dll"
-  Delete "$INSTDIR\libabsl_log_internal_globals.dll"
-  Delete "$INSTDIR\libabsl_log_internal_log_sink_set.dll"
-  Delete "$INSTDIR\libabsl_log_internal_message.dll"
-  Delete "$INSTDIR\libabsl_log_internal_nullguard.dll"
-  Delete "$INSTDIR\libabsl_log_internal_proto.dll"
-  Delete "$INSTDIR\libabsl_log_sink.dll"
-  Delete "$INSTDIR\libabsl_low_level_hash.dll"
-  Delete "$INSTDIR\libabsl_malloc_internal.dll"
-  Delete "$INSTDIR\libabsl_raw_hash_set.dll"
-  Delete "$INSTDIR\libabsl_raw_logging_internal.dll"
-  Delete "$INSTDIR\libabsl_spinlock_wait.dll"
-  Delete "$INSTDIR\libabsl_stacktrace.dll"
-  Delete "$INSTDIR\libabsl_status.dll"
-  Delete "$INSTDIR\libabsl_statusor.dll"
-  Delete "$INSTDIR\libabsl_strerror.dll"
-  Delete "$INSTDIR\libabsl_str_format_internal.dll"
-  Delete "$INSTDIR\libabsl_strings.dll"
-  Delete "$INSTDIR\libabsl_strings_internal.dll"
-  Delete "$INSTDIR\libabsl_symbolize.dll"
-  Delete "$INSTDIR\libabsl_synchronization.dll"
-  Delete "$INSTDIR\libabsl_throw_delegate.dll"
-  Delete "$INSTDIR\libabsl_time.dll"
-  Delete "$INSTDIR\libabsl_time_zone.dll"
-
 !ifdef debug
   Delete "$INSTDIR\gdb.exe"
   Delete "$INSTDIR\libexpat-1.dll"
@@ -965,7 +910,6 @@ Section "Uninstall"
   Delete "$INSTDIR\libpcre2-16d.dll"
   Delete "$INSTDIR\libreadline8.dll"
   Delete "$INSTDIR\libtermcap.dll"
-  Delete "$INSTDIR\libabsl_graphcycles_internal.dll"
 !else
   Delete "$INSTDIR\libpcre2-8.dll"
   Delete "$INSTDIR\libpcre2-16.dll"
@@ -985,9 +929,12 @@ Section "Uninstall"
   Delete "$INSTDIR\libcrypto-3-x64.dll"
   Delete "$INSTDIR\libssl-3-x64.dll"
 !endif
+!ifdef arch_arm64
+  Delete "$INSTDIR\libcrypto-3-arm64.dll"
+  Delete "$INSTDIR\libssl-3-arm64.dll"
+!endif
 
   Delete "$INSTDIR\FLAC.dll"
-  Delete "$INSTDIR\abseil_dll.dll"
   Delete "$INSTDIR\brotlicommon.dll"
   Delete "$INSTDIR\brotlidec.dll"
   Delete "$INSTDIR\chromaprint.dll"
@@ -1020,14 +967,11 @@ Section "Uninstall"
   Delete "$INSTDIR\gsttag-1.0-0.dll"
   Delete "$INSTDIR\gsturidownloader-1.0-0.dll"
   Delete "$INSTDIR\gstvideo-1.0-0.dll"
-  Delete "$INSTDIR\gstwinrt-1.0-0.dll"
   Delete "$INSTDIR\harfbuzz.dll"
   Delete "$INSTDIR\intl-8.dll"
   Delete "$INSTDIR\jpeg62.dll"
   Delete "$INSTDIR\kdsingleapplication-qt6.dll"
   Delete "$INSTDIR\libbs2b.dll"
-  Delete "$INSTDIR\libfaac_dll.dll"
-  Delete "$INSTDIR\liblzma.dll"
   Delete "$INSTDIR\libmp3lame.dll"
   Delete "$INSTDIR\libopenmpt.dll"
   Delete "$INSTDIR\mpcdec.dll"
@@ -1041,11 +985,15 @@ Section "Uninstall"
   Delete "$INSTDIR\soup-3.0-0.dll"
   Delete "$INSTDIR\sqlite3.dll"
   Delete "$INSTDIR\tag.dll"
-  Delete "$INSTDIR\utf8_validity.dll"
   Delete "$INSTDIR\vorbis.dll"
   Delete "$INSTDIR\vorbisfile.dll"
   Delete "$INSTDIR\wavpackdll.dll"
 
+!ifndef arch_arm64
+  Delete "$INSTDIR\gnutls.dll"
+  Delete "$INSTDIR\libfaac_dll.dll"
+!endif
+
 !ifdef release
   Delete "$INSTDIR\freetype.dll"
   Delete "$INSTDIR\libiconv.dll"
@@ -1053,8 +1001,10 @@ Section "Uninstall"
   Delete "$INSTDIR\libspeex.dll"
   Delete "$INSTDIR\pcre2-8.dll"
   Delete "$INSTDIR\pcre2-16.dll"
+  Delete "$INSTDIR\zlib1.dll"
+!ifndef arch_arm64
   Delete "$INSTDIR\twolame.dll"
-  Delete "$INSTDIR\zlib.dll"
+!endif
 !endif
 !ifdef debug
   Delete "$INSTDIR\freetyped.dll"
@@ -1063,8 +1013,10 @@ Section "Uninstall"
   Delete "$INSTDIR\libspeexd.dll"
   Delete "$INSTDIR\pcre2-8d.dll"
   Delete "$INSTDIR\pcre2-16d.dll"
+  Delete "$INSTDIR\zlibd1.dll"
+!ifndef arch_arm64
   Delete "$INSTDIR\twolamed.dll"
-  Delete "$INSTDIR\zlibd.dll"
+!endif
 !endif
 
 !ifdef arch_x86
@@ -1076,16 +1028,15 @@ Section "Uninstall"
 
   ; Common files
 
-  Delete "$INSTDIR\icudt75.dll"
-  Delete "$INSTDIR\libfftw3-3.dll"
-!ifdef debug
-  Delete "$INSTDIR\libprotobufd.dll"
+  Delete "$INSTDIR\icudt78.dll"
+!ifdef msvc && arch_arm64
+  Delete "$INSTDIR\fftw3.dll"
 !else
-  Delete "$INSTDIR\libprotobuf.dll"
+  Delete "$INSTDIR\libfftw3-3.dll"
 !endif
 !ifdef msvc && debug
-  Delete "$INSTDIR\icuin75d.dll"
-  Delete "$INSTDIR\icuuc75d.dll"
+  Delete "$INSTDIR\icuin78d.dll"
+  Delete "$INSTDIR\icuuc78d.dll"
   Delete "$INSTDIR\libxml2d.dll"
   Delete "$INSTDIR\Qt6Concurrentd.dll"
   Delete "$INSTDIR\Qt6Cored.dll"
@@ -1094,8 +1045,8 @@ Section "Uninstall"
   Delete "$INSTDIR\Qt6Sqld.dll"
   Delete "$INSTDIR\Qt6Widgetsd.dll"
 !else
-  Delete "$INSTDIR\icuin75.dll"
-  Delete "$INSTDIR\icuuc75.dll"
+  Delete "$INSTDIR\icuin78.dll"
+  Delete "$INSTDIR\icuuc78.dll"
   Delete "$INSTDIR\libxml2.dll"
   Delete "$INSTDIR\Qt6Concurrent.dll"
   Delete "$INSTDIR\Qt6Core.dll"
@@ -1105,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"
@@ -1112,14 +1064,24 @@ 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"
-  Delete "$INSTDIR\gio-modules\libgioopenssl.dll"
 !endif
 !ifdef msvc
-  Delete "$INSTDIR\gio-modules\giognutls.dll"
+!ifdef arch_arm64
   Delete "$INSTDIR\gio-modules\gioopenssl.dll"
+!else
+  Delete "$INSTDIR\gio-modules\giognutls.dll"
+!endif
 !endif
 
 !ifdef msvc && debug
@@ -1152,6 +1114,7 @@ Section "Uninstall"
   Delete "$INSTDIR\gstreamer-plugins\libgstapp.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstasf.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstasfmux.dll"
+  Delete "$INSTDIR\gstreamer-plugins\libgstasio.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstaudioconvert.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstaudiofx.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstaudioparsers.dll"
@@ -1202,6 +1165,7 @@ Section "Uninstall"
   Delete "$INSTDIR\gstreamer-plugins\libgstvolume.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstvorbis.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstwasapi.dll"
+  Delete "$INSTDIR\gstreamer-plugins\libgstwasapi2.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstwaveform.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstwavenc.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstwavpack.dll"
@@ -1231,7 +1195,6 @@ Section "Uninstall"
   Delete "$INSTDIR\gstreamer-plugins\gstdirectsound.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstdsd.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstequalizer.dll"
-  Delete "$INSTDIR\gstreamer-plugins\gstfaac.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstfaad.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstfdkaac.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstflac.dll"
@@ -1264,7 +1227,6 @@ Section "Uninstall"
   Delete "$INSTDIR\gstreamer-plugins\gstspeex.dll"
   Delete "$INSTDIR\gstreamer-plugins\gsttaglib.dll"
   Delete "$INSTDIR\gstreamer-plugins\gsttcp.dll"
-  Delete "$INSTDIR\gstreamer-plugins\gsttwolame.dll"
   Delete "$INSTDIR\gstreamer-plugins\gsttypefindfunctions.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstudp.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstvolume.dll"
@@ -1276,9 +1238,14 @@ Section "Uninstall"
   Delete "$INSTDIR\gstreamer-plugins\gstwavpack.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstwavparse.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstxingmux.dll"
+!ifndef arch_arm64
+  Delete "$INSTDIR\gstreamer-plugins\gstfaac.dll"
+  Delete "$INSTDIR\gstreamer-plugins\gsttwolame.dll"
+!endif
   !ifdef arch_x64
   Delete "$INSTDIR\gstreamer-plugins\gstspotify.dll"
 !endif
+
 !endif ; msvc
 
   Delete "$INSTDIR\Uninstall.exe"

dist/windows/windres.rc.in

@@ -1,4 +1,4 @@
-strawberry ICON "${CMAKE_CURRENT_SOURCE_DIR}/../dist/windows/strawberry.ico"
+strawberry ICON "${CMAKE_SOURCE_DIR}/dist/windows/strawberry.ico"
 1 VERSIONINFO
 FILEVERSION     ${STRAWBERRY_VERSION_MAJOR},${STRAWBERRY_VERSION_MINOR},${STRAWBERRY_VERSION_PATCH}
 PRODUCTVERSION  ${STRAWBERRY_VERSION_MAJOR},${STRAWBERRY_VERSION_MINOR},${STRAWBERRY_VERSION_PATCH}

ext/libstrawberry-common/CMakeLists.txt

@@ -1,43 +0,0 @@
-cmake_minimum_required(VERSION 3.13)
-
-set(SOURCES
-  core/logging.cpp
-  core/messagehandler.cpp
-  core/messagereply.cpp
-  core/workerpool.cpp
-)
-
-set(HEADERS
-  core/logging.h
-  core/messagehandler.h
-  core/messagereply.h
-  core/workerpool.h
-)
-
-qt_wrap_cpp(MOC ${HEADERS})
-
-add_library(libstrawberry-common STATIC ${SOURCES} ${MOC})
-
-target_include_directories(libstrawberry-common SYSTEM PRIVATE ${GLIB_INCLUDE_DIRS})
-target_include_directories(libstrawberry-common PRIVATE
-  ${CMAKE_CURRENT_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}
-  ${CMAKE_BINARY_DIR}/src
-)
-
-if(Backtrace_FOUND)
-  target_include_directories(libstrawberry-common SYSTEM PRIVATE ${Backtrace_INCLUDE_DIRS})
-endif()
-
-target_link_directories(libstrawberry-common PRIVATE ${GLIB_LIBRARY_DIRS})
-
-target_link_libraries(libstrawberry-common PRIVATE
-  ${CMAKE_THREAD_LIBS_INIT}
-  ${GLIB_LIBRARIES}
-  Qt${QT_VERSION_MAJOR}::Core
-  Qt${QT_VERSION_MAJOR}::Network
-)
-
-if(Backtrace_FOUND)
-  target_link_libraries(libstrawberry-common PRIVATE ${Backtrace_LIBRARIES})
-endif()

ext/libstrawberry-common/core/messagehandler.cpp

@@ -1,117 +0,0 @@
-/* This file is part of Strawberry.
-   Copyright 2011, David Sansome <me@davidsansome.com>
-   Copyright 2018-2021, Jonas Kvinge <jonas@jkvinge.net>
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-*/
-
-#include "messagehandler.h"
-
-#include <QObject>
-#include <QAbstractSocket>
-#include <QDataStream>
-#include <QIODevice>
-#include <QLocalSocket>
-#include <QByteArray>
-
-#include "core/logging.h"
-
-_MessageHandlerBase::_MessageHandlerBase(QIODevice *device, QObject *parent)
-    : QObject(parent),
-      device_(nullptr),
-      flush_abstract_socket_(nullptr),
-      flush_local_socket_(nullptr),
-      reading_protobuf_(false),
-      expected_length_(0),
-      is_device_closed_(false) {
-  if (device) {
-    SetDevice(device);
-  }
-}
-
-void _MessageHandlerBase::SetDevice(QIODevice *device) {
-
-  device_ = device;
-
-  buffer_.open(QIODevice::ReadWrite);
-
-  QObject::connect(device, &QIODevice::readyRead, this, &_MessageHandlerBase::DeviceReadyRead);
-
-  // Yeah I know.
-  if (QAbstractSocket *abstractsocket = qobject_cast<QAbstractSocket*>(device)) {
-    flush_abstract_socket_ = &QAbstractSocket::flush;
-    QObject::connect(abstractsocket, &QAbstractSocket::disconnected, this, &_MessageHandlerBase::DeviceClosed);
-  }
-  else if (QLocalSocket *localsocket = qobject_cast<QLocalSocket*>(device)) {
-    flush_local_socket_ = &QLocalSocket::flush;
-    QObject::connect(localsocket, &QLocalSocket::disconnected, this, &_MessageHandlerBase::DeviceClosed);
-  }
-  else {
-    qFatal("Unsupported device type passed to _MessageHandlerBase");
-  }
-
-}
-
-void _MessageHandlerBase::DeviceReadyRead() {
-
-  while (device_->bytesAvailable() > 0) {
-    if (!reading_protobuf_) {
-      // Read the length of the next message
-      QDataStream s(device_);
-      s >> expected_length_;
-
-      reading_protobuf_ = true;
-    }
-
-    // Read some of the message
-    buffer_.write(device_->read(expected_length_ - buffer_.size()));
-
-    // Did we get everything?
-    if (buffer_.size() == expected_length_) {
-      // Parse the message
-      if (!RawMessageArrived(buffer_.data())) {
-        qLog(Error) << "Malformed protobuf message";
-        device_->close();
-        return;
-      }
-
-      // Clear the buffer
-      buffer_.close();
-      buffer_.setData(QByteArray());
-      buffer_.open(QIODevice::ReadWrite);
-      reading_protobuf_ = false;
-    }
-  }
-
-}
-
-void _MessageHandlerBase::WriteMessage(const QByteArray &data) {
-
-  QDataStream s(device_);
-  s << static_cast<quint32>(data.length());
-  s.writeRawData(data.data(), static_cast<int>(data.length()));
-
-  // Sorry.
-  if (flush_abstract_socket_) {
-    ((qobject_cast<QAbstractSocket*>(device_))->*(flush_abstract_socket_))();
-  }
-  else if (flush_local_socket_) {
-    ((qobject_cast<QLocalSocket*>(device_))->*(flush_local_socket_))();
-  }
-
-}
-
-void _MessageHandlerBase::DeviceClosed() {
-  is_device_closed_ = true;
-  AbortAll();
-}

ext/libstrawberry-common/core/messagehandler.h

@@ -1,176 +0,0 @@
-/* This file is part of Strawberry.
-   Copyright 2011, David Sansome <me@davidsansome.com>
-   Copyright 2018-2021, Jonas Kvinge <jonas@jkvinge.net>
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-*/
-
-
-#ifndef MESSAGEHANDLER_H
-#define MESSAGEHANDLER_H
-
-#include <string>
-
-#include <QtGlobal>
-#include <QObject>
-#include <QThread>
-#include <QBuffer>
-#include <QByteArray>
-#include <QMap>
-#include <QString>
-#include <QLocalSocket>
-#include <QAbstractSocket>
-
-#include "core/messagereply.h"
-
-class QIODevice;
-
-// Reads and writes uint32 length encoded protobufs to a socket.
-// This base QObject is separate from AbstractMessageHandler because moc can't handle templated classes.
-// Use AbstractMessageHandler instead.
-class _MessageHandlerBase : public QObject {
-  Q_OBJECT
-
- public:
-  // device can be nullptr, in which case you must call SetDevice before writing any messages.
-  _MessageHandlerBase(QIODevice *device, QObject *parent);
-
-  void SetDevice(QIODevice *device);
-
-  // After this is true, messages cannot be sent to the handler any more.
-  bool is_device_closed() const { return is_device_closed_; }
-
- protected Q_SLOTS:
-  void WriteMessage(const QByteArray &data);
-  void DeviceReadyRead();
-  virtual void DeviceClosed();
-
- protected:
-  virtual bool RawMessageArrived(const QByteArray &data) = 0;
-  virtual void AbortAll() = 0;
-
- protected:
-  typedef bool (QAbstractSocket::*FlushAbstractSocket)();
-  typedef bool (QLocalSocket::*FlushLocalSocket)();
-
-  QIODevice *device_;
-  FlushAbstractSocket flush_abstract_socket_;
-  FlushLocalSocket flush_local_socket_;
-
-  bool reading_protobuf_;
-  quint32 expected_length_;
-  QBuffer buffer_;
-
-  bool is_device_closed_;
-};
-
-// Reads and writes uint32 length encoded MessageType messages to a socket.
-// You should subclass this and implement the MessageArrived(MessageType) method.
-template<typename MT>
-class AbstractMessageHandler : public _MessageHandlerBase {
- public:
-  AbstractMessageHandler(QIODevice *device, QObject *parent);
-  ~AbstractMessageHandler() override { AbstractMessageHandler::AbortAll(); }
-
-  using MessageType = MT;
-  using ReplyType = MessageReply<MT>;
-
-  // Serialises the message and writes it to the socket.
-  // This version MUST be called from the thread in which the AbstractMessageHandler was created.
-  void SendMessage(const MessageType &message);
-
-  // Serialises the message and writes it to the socket.
-  // This version may be called from any thread.
-  void SendMessageAsync(const MessageType &message);
-
-  // Sends the request message inside and takes ownership of the MessageReply.
-  // The MessageReply's Finished() signal will be emitted when a reply arrives with the same ID.  Must be called from my thread.
-  void SendRequest(ReplyType *reply);
-
-  // Sets the "id" field of reply to the same as the request, and sends the reply on the socket.  Used on the worker side.
-  void SendReply(const MessageType &request, MessageType *reply);
-
- protected:
-  // Called when a message is received from the socket.
-  virtual void MessageArrived(const MessageType &message) { Q_UNUSED(message); }
-
-  // _MessageHandlerBase
-  bool RawMessageArrived(const QByteArray &data) override;
-  void AbortAll() override;
-
- private:
-  QMap<int, ReplyType*> pending_replies_;
-};
-
-template<typename MT>
-AbstractMessageHandler<MT>::AbstractMessageHandler(QIODevice *device, QObject *parent)
-    : _MessageHandlerBase(device, parent) {}
-
-template<typename MT>
-void AbstractMessageHandler<MT>::SendMessage(const MessageType &message) {
-  Q_ASSERT(QThread::currentThread() == thread());
-
-  const std::string data = message.SerializeAsString();
-  WriteMessage(QByteArray(data.data(), data.size()));
-}
-
-template<typename MT>
-void AbstractMessageHandler<MT>::SendMessageAsync(const MessageType &message) {
-  const std::string data = message.SerializeAsString();
-  QMetaObject::invokeMethod(this, "WriteMessage", Qt::QueuedConnection, Q_ARG(QByteArray, QByteArray(data.data(), data.size())));
-}
-
-template<typename MT>
-void AbstractMessageHandler<MT>::SendRequest(ReplyType *reply) {
-  pending_replies_[reply->id()] = reply;
-  SendMessage(reply->request_message());
-}
-
-template<typename MT>
-void AbstractMessageHandler<MT>::SendReply(const MessageType &request, MessageType *reply) {
-  reply->set_id(request.id());
-  SendMessage(*reply);
-}
-
-template<typename MT>
-bool AbstractMessageHandler<MT>::RawMessageArrived(const QByteArray &data) {
-
-  MessageType message;
-  if (!message.ParseFromArray(data.constData(), data.size())) {
-    return false;
-  }
-
-  if (pending_replies_.contains(message.id())) {
-    // This is a reply to a message that we created earlier.
-    ReplyType *reply = pending_replies_.take(message.id());
-    reply->SetReply(message);
-  }
-  else {
-    MessageArrived(message);
-  }
-
-  return true;
-
-}
-
-template<typename MT>
-void AbstractMessageHandler<MT>::AbortAll() {
-
-  for (ReplyType *reply : pending_replies_) {
-    reply->Abort();
-  }
-  pending_replies_.clear();
-
-}
-
-#endif  // MESSAGEHANDLER_H

ext/libstrawberry-common/core/messagereply.cpp

@@ -1,48 +0,0 @@
-/* This file is part of Strawberry.
-   Copyright 2011, David Sansome <me@davidsansome.com>
-   Copyright 2018-2021, Jonas Kvinge <jonas@jkvinge.net>
-
-   Strawberry is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   Strawberry is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "messagereply.h"
-
-#include <QObject>
-#include <QtDebug>
-
-#include "core/logging.h"
-
-_MessageReplyBase::_MessageReplyBase(QObject *parent)
-    : QObject(parent), finished_(false), success_(false) {}
-
-bool _MessageReplyBase::WaitForFinished() {
-
-  qLog(Debug) << "Waiting on ID" << id();
-  semaphore_.acquire();
-  qLog(Debug) << "Acquired ID" << id();
-  return success_;
-
-}
-
-void _MessageReplyBase::Abort() {
-
-  Q_ASSERT(!finished_);
-  finished_ = true;
-  success_ = false;
-
-  Q_EMIT Finished();
-  qLog(Debug) << "Releasing ID" << id() << "(aborted)";
-  semaphore_.release();
-
-}

ext/libstrawberry-common/core/messagereply.h

@@ -1,99 +0,0 @@
-/* This file is part of Strawberry.
-   Copyright 2011, David Sansome <me@davidsansome.com>
-   Copyright 2018-2021, Jonas Kvinge <jonas@jkvinge.net>
-
-   Strawberry is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   Strawberry is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef MESSAGEREPLY_H
-#define MESSAGEREPLY_H
-
-#include <QtGlobal>
-#include <QObject>
-#include <QSemaphore>
-#include <QString>
-#include <QTimer>
-
-#include "core/logging.h"
-
-// Base QObject for a reply future class that is returned immediately for requests that will occur in the background.
-// Similar to QNetworkReply. Use MessageReply instead.
-class _MessageReplyBase : public QObject {
-  Q_OBJECT
-
- public:
-  explicit _MessageReplyBase(QObject *parent = nullptr);
-
-  virtual int id() const = 0;
-  bool is_finished() const { return finished_; }
-  bool is_successful() const { return success_; }
-
-  // Waits for the reply to finish by waiting on a semaphore.  Never call this from the MessageHandler's thread or it will block forever.
-  // Returns true if the call was successful.
-  bool WaitForFinished();
-
-  void Abort();
-
- Q_SIGNALS:
-  void Finished();
-
- protected:
-  bool finished_;
-  bool success_;
-
-  QSemaphore semaphore_;
-};
-
-// A reply future class that is returned immediately for requests that will occur in the background.  Similar to QNetworkReply.
-template<typename MessageType>
-class MessageReply : public _MessageReplyBase {
- public:
-  explicit MessageReply(const MessageType &request_message, QObject *parent = nullptr);
-
-  int id() const override { return request_message_.id(); }
-  const MessageType &request_message() const { return request_message_; }
-  const MessageType &message() const { return reply_message_; }
-
-  void SetReply(const MessageType &message);
-
- private:
-  MessageType request_message_;
-  MessageType reply_message_;
-};
-
-
-template<typename MessageType>
-MessageReply<MessageType>::MessageReply(const MessageType &request_message, QObject *parent) : _MessageReplyBase(parent) {
-  request_message_.MergeFrom(request_message);
-}
-
-template<typename MessageType>
-void MessageReply<MessageType>::SetReply(const MessageType &message) {
-
-  Q_ASSERT(!finished_);
-
-  reply_message_.MergeFrom(message);
-  finished_ = true;
-  success_ = true;
-
-  qLog(Debug) << "Releasing ID" << id() << "(finished)";
-
-  // Delay the signal as workaround to fix the signal periodically not emitted.
-  QTimer::singleShot(1, this, &_MessageReplyBase::Finished);
-
-  semaphore_.release();
-
-}
-
-#endif  // MESSAGEREPLY_H

ext/libstrawberry-common/core/workerpool.cpp

@@ -1,23 +0,0 @@
-/* This file is part of Strawberry.
-   Copyright 2011, David Sansome <me@davidsansome.com>
-   Copyright 2018-2021, Jonas Kvinge <jonas@jkvinge.net>
-
-   Strawberry is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   Strawberry is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <QObject>
-
-#include "workerpool.h"
-
-_WorkerPoolBase::_WorkerPoolBase(QObject *parent) : QObject(parent) {}

ext/libstrawberry-common/core/workerpool.h

@@ -1,466 +0,0 @@
-/* This file is part of Strawberry.
-   Copyright 2011, David Sansome <me@davidsansome.com>
-   Copyright 2018-2021, Jonas Kvinge <jonas@jkvinge.net>
-
-   Strawberry is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   Strawberry is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef WORKERPOOL_H
-#define WORKERPOOL_H
-
-#include "config.h"
-
-#include <cstdio>
-#include <cstddef>
-#include <utility>
-
-#include <QtGlobal>
-#include <QObject>
-#include <QCoreApplication>
-#include <QThread>
-#include <QMutex>
-#include <QLocalServer>
-#include <QProcess>
-#include <QDir>
-#include <QFile>
-#include <QList>
-#include <QQueue>
-#include <QString>
-#include <QStringList>
-#include <QAtomicInt>
-#include <QRandomGenerator>
-
-#include "core/logging.h"
-
-class QLocalSocket;
-
-// Base class containing signals and slots - required because moc doesn't do templated objects.
-class _WorkerPoolBase : public QObject {
-  Q_OBJECT
-
- public:
-  explicit _WorkerPoolBase(QObject *parent = nullptr);
-
- Q_SIGNALS:
-  // Emitted when a worker failed to start.  This usually happens when the worker wasn't found, or couldn't be executed.
-  void WorkerFailedToStart();
-
- protected Q_SLOTS:
-  virtual void DoStart() {}
-  virtual void NewConnection() {}
-  virtual void ProcessReadyReadStandardOutput() {}
-  virtual void ProcessReadyReadStandardError() {}
-  virtual void ProcessError(QProcess::ProcessError) {}
-  virtual void SendQueuedMessages() {}
-};
-
-
-// Manages a pool of one or more external processes.
-// A local socket server is started for each process, and the address is passed to the process as argv[1].
-// The process is expected to connect back to the socket server, and when it does a HandlerType is created for it.
-// Instances of HandlerType are created in the WorkerPool's thread.
-template<typename HandlerType>
-class WorkerPool : public _WorkerPoolBase {
- public:
-  explicit WorkerPool(QObject *parent = nullptr);
-  ~WorkerPool() override;
-
-  using MessageType = typename HandlerType::MessageType;
-  using ReplyType = typename HandlerType::ReplyType;
-
-  // Sets the name of the worker executable.  This is looked for first in the current directory, and then in $PATH.
-  // You must call this before calling Start().
-  void SetExecutableName(const QString &executable_name);
-
-  // Sets the number of worker process to use.  Defaults to 1 <= (processors / 2) <= 2.
-  void SetWorkerCount(const int count);
-
-  // Sets the prefix to use for the local server (on unix this is a named pipe in /tmp).
-  // Defaults to QApplication::applicationName().
-  // A random number is appended to this name when creating each server.
-  void SetLocalServerName(const QString &local_server_name);
-
-  // Starts all workers.
-  void Start();
-
-  // Fills in the message's "id" field and creates a reply future.
-  // The message is queued and the WorkerPool's thread will send it to the next available worker.
-  // Can be called from any thread.
-  ReplyType *SendMessageWithReply(MessageType *message);
-
- protected:
-  // These are all reimplemented slots, they are called on the WorkerPool's thread.
-  void DoStart() override;
-  void NewConnection() override;
-  void ProcessReadyReadStandardOutput() override;
-  void ProcessReadyReadStandardError() override;
-  void ProcessError(QProcess::ProcessError error) override;
-  void SendQueuedMessages() override;
-
- private:
-  struct Worker {
-    Worker() : local_server_(nullptr), local_socket_(nullptr), process_(nullptr), handler_(nullptr) {}
-
-    QLocalServer *local_server_;
-    QLocalSocket *local_socket_;
-    QProcess *process_;
-    HandlerType *handler_;
-  };
-
-  // Must only ever be called on my thread.
-  void StartOneWorker(Worker *worker);
-
-  template<typename T>
-  Worker *FindWorker(T Worker::*member, T value) {
-    for (typename QList<Worker>::iterator it = workers_.begin(); it != workers_.end(); ++it) {
-      if ((*it).*member == value) {
-        return &(*it);
-      }
-    }
-    return nullptr;
-  }
-
-  template<typename T>
-  void DeleteQObjectPointerLater(T **p) {
-    if (*p) {
-      (*p)->deleteLater();
-      *p = nullptr;
-    }
-  }
-
-  // Creates a new reply future for the request with the next sequential ID,
-  // and sets the request's ID to the ID of the reply.  Can be called from any thread
-  ReplyType *NewReply(MessageType *message);
-
-  // Returns the next handler, or nullptr if there isn't one.  Must be called from my thread.
-  HandlerType *NextHandler() const;
-
- private:
-  QString local_server_name_;
-  QString executable_name_;
-  QString executable_path_;
-
-  int worker_count_;
-  mutable int next_worker_;
-  QList<Worker> workers_;
-
-  QAtomicInt next_id_;
-
-  QMutex message_queue_mutex_;
-  QQueue<ReplyType *> message_queue_;
-};
-
-
-template<typename HandlerType>
-WorkerPool<HandlerType>::WorkerPool(QObject *parent)
-    : _WorkerPoolBase(parent),
-      worker_count_(1),
-      next_worker_(0),
-      next_id_(0) {
-
-  local_server_name_ = qApp->applicationName().toLower();
-
-  if (local_server_name_.isEmpty()) {
-    local_server_name_ = QStringLiteral("workerpool");
-  }
-
-}
-
-template<typename HandlerType>
-WorkerPool<HandlerType>::~WorkerPool() {
-
-  for (const Worker &worker : workers_) {
-    if (worker.local_socket_ && worker.process_) {
-      QObject::disconnect(worker.process_, &QProcess::errorOccurred, this, &WorkerPool::ProcessError);
-      QObject::disconnect(worker.process_, &QProcess::readyReadStandardOutput, this, &WorkerPool::ProcessReadyReadStandardOutput);
-      QObject::disconnect(worker.process_, &QProcess::readyReadStandardError, this, &WorkerPool::ProcessReadyReadStandardError);
-
-      // The worker is connected.  Close his socket and wait for him to exit.
-      qLog(Debug) << "Closing worker socket";
-      worker.local_socket_->close();
-      worker.process_->waitForFinished(500);
-    }
-
-    if (worker.process_ && worker.process_->state() == QProcess::Running) {
-      // The worker is still running - kill it.
-      qLog(Debug) << "Killing worker process";
-      worker.process_->terminate();
-      if (!worker.process_->waitForFinished(500)) {
-        worker.process_->kill();
-      }
-    }
-  }
-
-  for (ReplyType *reply : message_queue_) {
-    reply->Abort();
-  }
-
-}
-
-template<typename HandlerType>
-void WorkerPool<HandlerType>::SetWorkerCount(const int count) {
-  Q_ASSERT(workers_.isEmpty());
-  worker_count_ = count;
-}
-
-template<typename HandlerType>
-void WorkerPool<HandlerType>::SetLocalServerName(const QString &local_server_name) {
-  Q_ASSERT(workers_.isEmpty());
-  local_server_name_ = local_server_name;
-}
-
-template<typename HandlerType>
-void WorkerPool<HandlerType>::SetExecutableName(const QString &executable_name) {
-  Q_ASSERT(workers_.isEmpty());
-  executable_name_ = executable_name;
-}
-
-template<typename HandlerType>
-void WorkerPool<HandlerType>::Start() {
-  QMetaObject::invokeMethod(this, &WorkerPool<HandlerType>::DoStart);
-}
-
-template<typename HandlerType>
-void WorkerPool<HandlerType>::DoStart() {
-
-  Q_ASSERT(workers_.isEmpty());
-  Q_ASSERT(!executable_name_.isEmpty());
-  Q_ASSERT(QThread::currentThread() == thread());
-
-  // Find the executable if we can, default to searching $PATH
-  executable_path_ = executable_name_;
-
-  QStringList search_path;
-  search_path << QCoreApplication::applicationDirPath();
-#if defined(Q_OS_UNIX)
-  search_path << QStringLiteral("/usr/libexec");
-  search_path << QStringLiteral("/usr/local/libexec");
-#endif
-#if defined(Q_OS_MACOS)
-  search_path << QDir::cleanPath(QCoreApplication::applicationDirPath() + QStringLiteral("/../PlugIns"));
-#endif
-
-  for (const QString &path_prefix : std::as_const(search_path)) {
-    const QString executable_path = path_prefix + QLatin1Char('/') + executable_name_;
-    if (QFile::exists(executable_path)) {
-      executable_path_ = executable_path;
-      qLog(Debug) << "Using worker" << executable_name_ << "from" << path_prefix;
-      break;
-    }
-  }
-
-  if (executable_path_ == executable_name_) {
-    qLog(Debug) << "Using worker" << executable_name_;
-  }
-
-  // Start all the workers
-  for (int i = 0; i < worker_count_; ++i) {
-    Worker worker;
-    StartOneWorker(&worker);
-
-    workers_ << worker;
-  }
-
-}
-
-template<typename HandlerType>
-void WorkerPool<HandlerType>::StartOneWorker(Worker *worker) {
-
-  Q_ASSERT(QThread::currentThread() == thread());
-
-  DeleteQObjectPointerLater(&worker->local_server_);
-  DeleteQObjectPointerLater(&worker->local_socket_);
-  DeleteQObjectPointerLater(&worker->process_);
-  DeleteQObjectPointerLater(&worker->handler_);
-
-  worker->local_server_ = new QLocalServer(this);
-  worker->process_ = new QProcess(this);
-
-  QObject::connect(worker->local_server_, &QLocalServer::newConnection, this, &WorkerPool::NewConnection);
-  QObject::connect(worker->process_, &QProcess::errorOccurred, this, &WorkerPool::ProcessError);
-  QObject::connect(worker->process_, &QProcess::readyReadStandardOutput, this, &WorkerPool::ProcessReadyReadStandardOutput);
-  QObject::connect(worker->process_, &QProcess::readyReadStandardError, this, &WorkerPool::ProcessReadyReadStandardError);
-
-  // Create a server, find an unused name and start listening
-  Q_FOREVER {
-    const quint32 unique_number = QRandomGenerator::global()->bounded(static_cast<quint32>(quint64(this) & 0xFFFFFFFF));
-    const QString name = QStringLiteral("%1_%2").arg(local_server_name_).arg(unique_number);
-
-    if (worker->local_server_->listen(name)) {
-      break;
-    }
-  }
-
-  qLog(Debug) << "Starting worker" << worker << executable_path_ << worker->local_server_->fullServerName();
-
-#ifdef Q_OS_WIN32
-  worker->process_->setProcessChannelMode(QProcess::SeparateChannels);
-#else
-  worker->process_->setProcessChannelMode(QProcess::ForwardedChannels);
-#endif
-
-  worker->process_->start(executable_path_, QStringList() << worker->local_server_->fullServerName());
-}
-
-template<typename HandlerType>
-void WorkerPool<HandlerType>::NewConnection() {
-
-  Q_ASSERT(QThread::currentThread() == thread());
-
-  QLocalServer *server = qobject_cast<QLocalServer*>(sender());
-
-  // Find the worker with this server.
-  Worker *worker = FindWorker(&Worker::local_server_, server);
-  if (!worker) return;
-
-  qLog(Debug) << "Worker" << worker << "connected to" << server->fullServerName();
-
-  // Accept the connection.
-  worker->local_socket_ = server->nextPendingConnection();
-
-  // We only ever accept one connection per worker, so destroy the server now.
-  worker->local_socket_->setParent(this);
-  worker->local_server_->deleteLater();
-  worker->local_server_ = nullptr;
-
-  // Create the handler.
-  worker->handler_ = new HandlerType(worker->local_socket_, this);
-
-  SendQueuedMessages();
-
-}
-
-template<typename HandlerType>
-void WorkerPool<HandlerType>::ProcessError(QProcess::ProcessError error) {
-
-  Q_ASSERT(QThread::currentThread() == thread());
-
-  QProcess *process = qobject_cast<QProcess*>(sender());
-
-  // Find the worker with this process.
-  Worker *worker = FindWorker(&Worker::process_, process);
-  if (!worker) return;
-
-  switch (error) {
-    case QProcess::FailedToStart:
-      // Failed to start errors are bad - it usually means the worker isn't installed.
-      // Don't restart the process, but tell our owner, who will probably want to do something fatal.
-      qLog(Error) << "Worker failed to start";
-      Q_EMIT WorkerFailedToStart();
-      break;
-
-    default:
-      // On any other error we just restart the process.
-      qLog(Debug) << "Worker" << worker << "failed with error" << error << "- restarting";
-      StartOneWorker(worker);
-      break;
-  }
-
-}
-
-template<typename HandlerType>
-void WorkerPool<HandlerType>::ProcessReadyReadStandardOutput() {
-
-  Q_ASSERT(QThread::currentThread() == thread());
-
-  QProcess *process = qobject_cast<QProcess*>(sender());
-  QByteArray data = process->readAllStandardOutput();
-
-  fprintf(stdout, "%s", data.data());
-  fflush(stdout);
-
-}
-
-template<typename HandlerType>
-void WorkerPool<HandlerType>::ProcessReadyReadStandardError() {
-
-  Q_ASSERT(QThread::currentThread() == thread());
-
-  QProcess *process = qobject_cast<QProcess*>(sender());
-  QByteArray data = process->readAllStandardError();
-
-  fprintf(stderr, "%s", data.data());
-  fflush(stderr);
-
-}
-
-template <typename HandlerType>
-typename WorkerPool<HandlerType>::ReplyType*
-WorkerPool<HandlerType>::NewReply(MessageType *message) {
-
-  const int id = next_id_.fetchAndAddOrdered(1);
-  message->set_id(id);
-
-  return new ReplyType(*message);
-
-}
-
-template <typename HandlerType>
-typename WorkerPool<HandlerType>::ReplyType*
-WorkerPool<HandlerType>::SendMessageWithReply(MessageType *message) {
-
-  ReplyType *reply = NewReply(message);
-
-  // Add the pending reply to the queue
-  {
-    QMutexLocker l(&message_queue_mutex_);
-    message_queue_.enqueue(reply);
-  }
-
-  // Wake up the main thread
-  QMetaObject::invokeMethod(this, &WorkerPool<HandlerType>::SendQueuedMessages, Qt::QueuedConnection);
-
-  return reply;
-
-}
-
-template<typename HandlerType>
-void WorkerPool<HandlerType>::SendQueuedMessages() {
-
-  QMutexLocker l(&message_queue_mutex_);
-
-  while (!message_queue_.isEmpty()) {
-    ReplyType *reply = message_queue_.dequeue();
-
-    // Find a worker for this message
-    HandlerType *handler = NextHandler();
-    if (!handler) {
-      // No available handlers - put the message on the front of the queue.
-      message_queue_.prepend(reply);
-      qLog(Debug) << "No available handlers to process request";
-      break;
-    }
-
-    handler->SendRequest(reply);
-  }
-
-}
-
-template<typename HandlerType>
-HandlerType *WorkerPool<HandlerType>::NextHandler() const {
-
-  for (int i = 0; i < workers_.count(); ++i) {
-    const int worker_index = (next_worker_ + i) % workers_.count();
-
-    if (workers_[worker_index].handler_ && !workers_[worker_index].handler_->is_device_closed()) {
-      next_worker_ = (worker_index + 1) % workers_.count();
-      return workers_[worker_index].handler_;
-    }
-  }
-
-  return nullptr;
-
-}
-
-#endif  // WORKERPOOL_H

ext/libstrawberry-tagreader/CMakeLists.txt

@@ -1,63 +0,0 @@
-cmake_minimum_required(VERSION 3.13)
-
-# Workaround a bug in protobuf-generate.cmake (https://github.com/protocolbuffers/protobuf/issues/12450)
-if(NOT protobuf_PROTOC_EXE)
-  set(protobuf_PROTOC_EXE "protobuf::protoc")
-endif()
-
-if(NOT Protobuf_LIBRARIES)
-  set(Protobuf_LIBRARIES protobuf::libprotobuf)
-endif()
-
-set(SOURCES tagreaderbase.cpp tagreadermessages.proto)
-
-if(HAVE_TAGLIB)
-  list(APPEND SOURCES tagreadertaglib.cpp tagreadergme.cpp)
-endif()
-
-if(HAVE_TAGPARSER)
-  list(APPEND SOURCES tagreadertagparser.cpp)
-endif()
-
-add_library(libstrawberry-tagreader STATIC ${PROTO_SOURCES} ${SOURCES})
-
-target_include_directories(libstrawberry-tagreader SYSTEM PRIVATE
-  ${GLIB_INCLUDE_DIRS}
-  ${PROTOBUF_INCLUDE_DIRS}
-)
-
-target_include_directories(libstrawberry-tagreader PRIVATE
-  ${CMAKE_CURRENT_SOURCE_DIR}
-  ${CMAKE_CURRENT_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/ext/libstrawberry-common
-  ${CMAKE_SOURCE_DIR}/src
-  ${CMAKE_BINARY_DIR}/src
-)
-
-target_link_directories(libstrawberry-tagreader PRIVATE
-  ${GLIB_LIBRARY_DIRS}
-  ${PROTOBUF_LIBRARY_DIRS}
-)
-
-target_link_libraries(libstrawberry-tagreader PRIVATE
-  ${GLIB_LIBRARIES}
-  ${Protobuf_LIBRARIES}
-  Qt${QT_VERSION_MAJOR}::Core
-  Qt${QT_VERSION_MAJOR}::Network
-  Qt${QT_VERSION_MAJOR}::Gui
-  libstrawberry-common
-)
-
-if(HAVE_TAGLIB)
-  target_include_directories(libstrawberry-tagreader SYSTEM PRIVATE ${TAGLIB_INCLUDE_DIRS})
-  target_link_directories(libstrawberry-tagreader PRIVATE ${TAGLIB_LIBRARY_DIRS})
-  target_link_libraries(libstrawberry-tagreader PRIVATE ${TAGLIB_LIBRARIES})
-endif()
-
-if(HAVE_TAGPARSER)
-  target_include_directories(libstrawberry-tagreader SYSTEM PRIVATE ${TAGPARSER_INCLUDE_DIRS})
-  target_link_directories(libstrawberry-tagreader PRIVATE ${TAGPARSER_LIBRARY_DIRS})
-  target_link_libraries(libstrawberry-tagreader PRIVATE ${TAGPARSER_LIBRARIES})
-endif()
-
-protobuf_generate(TARGET libstrawberry-tagreader)

ext/libstrawberry-tagreader/tagreaderbase.cpp

@@ -1,173 +0,0 @@
-/* This file is part of Strawberry.
-   Copyright 2018-2024, Jonas Kvinge <jonas@jkvinge.net>
-
-   Strawberry is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   Strawberry is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "config.h"
-
-#include <string>
-
-#include <QObject>
-#include <QByteArray>
-#include <QString>
-#include <QIODevice>
-#include <QFile>
-#include <QBuffer>
-#include <QImage>
-#include <QMimeDatabase>
-
-#include "core/logging.h"
-#include "tagreaderbase.h"
-
-using namespace Qt::StringLiterals;
-
-TagReaderBase::TagReaderBase() = default;
-TagReaderBase::~TagReaderBase() = default;
-
-QString TagReaderBase::ErrorString(const Result &result) {
-
-  switch (result.error_code) {
-    case Result::ErrorCode::Success:
-      return QObject::tr("Success");
-    case Result::ErrorCode::Unsupported:
-      return QObject::tr("File is unsupported");
-    case Result::ErrorCode::FilenameMissing:
-      return QObject::tr("Filename is missing");
-    case Result::ErrorCode::FileDoesNotExist:
-      return QObject::tr("File does not exist");
-    case Result::ErrorCode::FileOpenError:
-      return QObject::tr("File could not be opened");
-    case Result::ErrorCode::FileParseError:
-      return QObject::tr("Could not parse file");
-    case Result::ErrorCode::FileSaveError:
-      return QObject::tr("Could save file");
-    case Result::ErrorCode::CustomError:
-      return result.error;
-  }
-
-  return QObject::tr("Unknown error");
-
-}
-
-float TagReaderBase::ConvertPOPMRating(const int POPM_rating) {
-
-  if (POPM_rating < 0x01) return 0.0F;
-  if (POPM_rating < 0x40) return 0.20F;
-  if (POPM_rating < 0x80) return 0.40F;
-  if (POPM_rating < 0xC0) return 0.60F;
-  if (POPM_rating < 0xFC) return 0.80F;
-
-  return 1.0F;
-
-}
-
-int TagReaderBase::ConvertToPOPMRating(const float rating) {
-
-  if (rating < 0.20) return 0x00;
-  if (rating < 0.40) return 0x01;
-  if (rating < 0.60) return 0x40;
-  if (rating < 0.80) return 0x80;
-  if (rating < 1.0)  return 0xC0;
-
-  return 0xFF;
-
-}
-
-TagReaderBase::Cover TagReaderBase::LoadCoverFromRequest(const QString &song_filename, const spb::tagreader::WriteFileRequest &request) {
-
-  if (!request.has_save_cover() || !request.save_cover()) {
-    return Cover();
-  }
-
-  QString cover_filename;
-  if (request.has_cover_filename()) {
-    cover_filename = QString::fromStdString(request.cover_filename());
-  }
-  QByteArray cover_data;
-  if (request.has_cover_data()) {
-    cover_data = QByteArray(request.cover_data().data(), static_cast<qint64>(request.cover_data().size()));
-  }
-  QString cover_mime_type;
-  if (request.has_cover_mime_type()) {
-    cover_mime_type = QString::fromStdString(request.cover_mime_type());
-  }
-
-  return LoadCoverFromRequest(song_filename, cover_filename, cover_data, cover_mime_type);
-
-}
-
-TagReaderBase::Cover TagReaderBase::LoadCoverFromRequest(const QString &song_filename, const spb::tagreader::SaveEmbeddedArtRequest &request) {
-
-  QString cover_filename;
-  if (request.has_cover_filename()) {
-    cover_filename = QString::fromStdString(request.cover_filename());
-  }
-  QByteArray cover_data;
-  if (request.has_cover_data()) {
-    cover_data = QByteArray(request.cover_data().data(), static_cast<qint64>(request.cover_data().size()));
-  }
-  QString cover_mime_type;
-  if (request.has_cover_mime_type()) {
-    cover_mime_type = QString::fromStdString(request.cover_mime_type());
-  }
-
-  return LoadCoverFromRequest(song_filename, cover_filename, cover_data, cover_mime_type);
-
-}
-
-TagReaderBase::Cover TagReaderBase::LoadCoverFromRequest(const QString &song_filename, const QString &cover_filename, QByteArray cover_data, QString cover_mime_type) {
-
-  if (cover_data.isEmpty() && !cover_filename.isEmpty()) {
-    qLog(Debug) << "Loading cover from" << cover_filename << "for" << song_filename;
-    QFile file(cover_filename);
-    if (!file.open(QIODevice::ReadOnly)) {
-      qLog(Error) << "Failed to open file" << cover_filename << "for reading:" << file.errorString();
-      return Cover();
-    }
-    cover_data = file.readAll();
-    file.close();
-  }
-
-  if (!cover_data.isEmpty()) {
-    if (cover_mime_type.isEmpty()) {
-      cover_mime_type = QMimeDatabase().mimeTypeForData(cover_data).name();
-    }
-    if (cover_mime_type == "image/jpeg"_L1) {
-      qLog(Debug) << "Using cover from JPEG data for" << song_filename;
-      return Cover(cover_data, cover_mime_type);
-    }
-    if (cover_mime_type == "image/png"_L1) {
-      qLog(Debug) << "Using cover from PNG data for" << song_filename;
-      return Cover(cover_data, cover_mime_type);
-    }
-    // Convert image to JPEG.
-    qLog(Debug) << "Converting cover to JPEG data for" << song_filename;
-    QImage cover_image;
-    if (!cover_image.loadFromData(cover_data)) {
-      qLog(Error) << "Failed to load image from cover data for" << song_filename;
-      return Cover();
-    }
-    cover_data.clear();
-    QBuffer buffer(&cover_data);
-    if (buffer.open(QIODevice::WriteOnly)) {
-      cover_image.save(&buffer, "JPEG");
-      buffer.close();
-    }
-    return Cover(cover_data, QStringLiteral("image/jpeg"));
-  }
-
-  return Cover();
-
-}

ext/libstrawberry-tagreader/tagreaderbase.h

@@ -1,91 +0,0 @@
-/* This file is part of Strawberry.
-   Copyright 2018-2024, Jonas Kvinge <jonas@jkvinge.net>
-
-   Strawberry is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   Strawberry is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef TAGREADERBASE_H
-#define TAGREADERBASE_H
-
-#include "config.h"
-
-#include <string>
-
-#include <QByteArray>
-#include <QString>
-
-#include "tagreadermessages.pb.h"
-
-/*
- * This class holds all useful methods to read and write tags from/to files.
- * You should not use it directly in the main process but rather use a TagReaderWorker process (using TagReaderClient)
- */
-class TagReaderBase {
- public:
-  explicit TagReaderBase();
-  virtual ~TagReaderBase();
-
-  class Result {
-   public:
-    enum class ErrorCode {
-      Success,
-      Unsupported,
-      FilenameMissing,
-      FileDoesNotExist,
-      FileOpenError,
-      FileParseError,
-      FileSaveError,
-      CustomError,
-    };
-    Result(const ErrorCode _error_code, const QString &_error = QString()) : error_code(_error_code), error(_error) {}
-    ErrorCode error_code;
-    QString error;
-    bool success() const { return error_code == ErrorCode::Success; }
-  };
-
-  class Cover {
-   public:
-    explicit Cover(const QByteArray &_data = QByteArray(), const QString &_mime_type = QString()) : data(_data), mime_type(_mime_type) {}
-    QByteArray data;
-    QString mime_type;
-    QString error;
-  };
-
-  static QString ErrorString(const Result &result);
-
-  virtual bool IsMediaFile(const QString &filename) const = 0;
-
-  virtual Result ReadFile(const QString &filename, spb::tagreader::SongMetadata *song) const = 0;
-  virtual Result WriteFile(const QString &filename, const spb::tagreader::WriteFileRequest &request) const = 0;
-
-  virtual Result LoadEmbeddedArt(const QString &filename, QByteArray &data) const = 0;
-  virtual Result SaveEmbeddedArt(const QString &filename, const spb::tagreader::SaveEmbeddedArtRequest &request) const = 0;
-
-  virtual Result SaveSongPlaycountToFile(const QString &filename, const uint playcount) const = 0;
-  virtual Result SaveSongRatingToFile(const QString &filename, const float rating) const = 0;
-
- protected:
-  static float ConvertPOPMRating(const int POPM_rating);
-  static int ConvertToPOPMRating(const float rating);
-
-  static Cover LoadCoverFromRequest(const QString &song_filename, const spb::tagreader::WriteFileRequest &request);
-  static Cover LoadCoverFromRequest(const QString &song_filename, const spb::tagreader::SaveEmbeddedArtRequest &request);
-
- private:
-  static Cover LoadCoverFromRequest(const QString &song_filename, const QString &cover_filename, QByteArray cover_data, QString cover_mime_type);
-
-  Q_DISABLE_COPY(TagReaderBase)
-};
-
-#endif  // TAGREADERBASE_H

ext/libstrawberry-tagreader/tagreadermessages.proto

@@ -1,195 +0,0 @@
-syntax = "proto2";
-
-package spb.tagreader;
-
-message SongMetadata {
-
-  enum FileType {
-    UNKNOWN = 0;
-    WAV = 1;
-    FLAC = 2;
-    WAVPACK = 3;
-    OGGFLAC = 4;
-    OGGVORBIS = 5;
-    OGGOPUS = 6;
-    OGGSPEEX = 7;
-    MPEG = 8;
-    MP4 = 9;
-    ASF = 10;
-    AIFF = 11;
-    MPC = 12;
-    TRUEAUDIO = 13;
-    DSF = 14;
-    DSDIFF = 15;
-    PCM = 16;
-    APE = 17;
-    MOD = 18;
-    S3M = 19;
-    XM = 20;
-    IT = 21;
-    SPC = 22;
-    VGM = 23;
-    CDDA = 90;
-    STREAM = 91;
-  }
-
-  optional bool valid = 1;
-
-  optional string title = 2;
-  optional string album = 3;
-  optional string artist = 4;
-  optional string albumartist = 5;
-  optional int32 track = 6;
-  optional int32 disc = 7;
-  optional int32 year = 8;
-  optional int32 originalyear = 9;
-  optional string genre = 10;
-  optional bool compilation = 11;
-  optional string composer = 12;
-  optional string performer = 13;
-  optional string grouping = 14;
-  optional string comment = 15;
-  optional string lyrics = 16;
-
-  optional uint64 length_nanosec = 17;
-
-  optional int32 bitrate = 18;
-  optional int32 samplerate = 19;
-  optional int32 bitdepth = 20;
-
-  optional string url = 21;
-  optional string basefilename = 22;
-  optional FileType filetype = 23;
-  optional int64 filesize = 24;
-  optional int64 mtime = 25;
-  optional int64 ctime = 26;
-
-  optional uint32 playcount = 27;
-  optional uint32 skipcount = 28;
-  optional int64 lastplayed = 29;
-  optional int64 lastseen = 30;
-
-  optional bool art_embedded = 31;
-
-  optional float rating = 32;
-
-  optional string acoustid_id = 33;
-  optional string acoustid_fingerprint = 34;
-
-  optional string musicbrainz_album_artist_id = 35;     // MusicBrainz Release Artist ID (MUSICBRAINZ_ALBUMARTISTID)
-  optional string musicbrainz_artist_id = 36;           // MusicBrainz Artist ID (MUSICBRAINZ_ARTISTID)
-  optional string musicbrainz_original_artist_id = 37;  // MusicBrainz Original Artist ID (MUSICBRAINZ_ORIGINALARTISTID)
-  optional string musicbrainz_album_id = 38;            // MusicBrainz Release ID (MUSICBRAINZ_ALBUMID)
-  optional string musicbrainz_original_album_id = 39;   // MusicBrainz Original Release ID (MUSICBRAINZ_ORIGINALALBUMID)
-  optional string musicbrainz_recording_id = 40;        // MusicBrainz Recording ID (MUSICBRAINZ_TRACKID)
-  optional string musicbrainz_track_id = 41;            // MusicBrainz Track ID (MUSICBRAINZ_RELEASETRACKID)
-  optional string musicbrainz_disc_id = 42;             // MusicBrainz Disc ID (MUSICBRAINZ_DISCID)
-  optional string musicbrainz_release_group_id = 43;    // MusicBrainz Release Group ID (MUSICBRAINZ_RELEASEGROUPID)
-  optional string musicbrainz_work_id = 44;             // MusicBrainz Work ID (MUSICBRAINZ_WORKID)
-
-  optional bool suspicious_tags = 50;
-
-}
-
-message IsMediaFileRequest {
-  optional string filename = 1;
-}
-
-message IsMediaFileResponse {
-  optional bool success = 1;
-}
-
-message ReadFileRequest {
-  optional string filename = 1;
-}
-
-message ReadFileResponse {
-  optional bool success = 1;
-  optional SongMetadata metadata = 2;
-  optional string error = 3;
-}
-
-message WriteFileRequest {
-  optional string filename = 1;
-  optional bool save_tags = 2;
-  optional bool save_playcount = 3;
-  optional bool save_rating = 4;
-  optional bool save_cover = 5;
-  optional SongMetadata metadata = 6;
-  optional string cover_filename = 7;
-  optional bytes cover_data = 8;
-  optional string cover_mime_type = 9;
-}
-
-message WriteFileResponse {
-  optional bool success = 1;
-  optional string error = 2;
-}
-
-message LoadEmbeddedArtRequest {
-  optional string filename = 1;
-}
-
-message LoadEmbeddedArtResponse {
-  optional bool success = 1;
-  optional bytes data = 2;
-  optional string error = 3;
-}
-
-message SaveEmbeddedArtRequest {
-  optional string filename = 1;
-  optional string cover_filename = 2;
-  optional bytes cover_data = 3;
-  optional string cover_mime_type = 4;
-}
-
-message SaveEmbeddedArtResponse {
-  optional bool success = 1;
-  optional string error = 2;
-}
-
-message SaveSongPlaycountToFileRequest {
-  optional string filename = 1;
-  optional uint32 playcount = 2;
-}
-
-message SaveSongPlaycountToFileResponse {
-  optional bool success = 1;
-  optional string error = 2;
-}
-
-message SaveSongRatingToFileRequest {
-  optional string filename = 1;
-  optional float rating = 2;
-}
-
-message SaveSongRatingToFileResponse {
-  optional bool success = 1;
-  optional string error = 2;
-}
-
-message Message {
-  optional int32 id = 1;
-
-  optional ReadFileRequest read_file_request = 2;
-  optional ReadFileResponse read_file_response = 3;
-
-  optional WriteFileRequest write_file_request = 4;
-  optional WriteFileResponse write_file_response = 5;
-
-  optional IsMediaFileRequest is_media_file_request = 6;
-  optional IsMediaFileResponse is_media_file_response = 7;
-
-  optional LoadEmbeddedArtRequest load_embedded_art_request = 8;
-  optional LoadEmbeddedArtResponse load_embedded_art_response = 9;
-
-  optional SaveEmbeddedArtRequest save_embedded_art_request = 10;
-  optional SaveEmbeddedArtResponse save_embedded_art_response = 11;
-
-  optional SaveSongPlaycountToFileRequest save_song_playcount_to_file_request = 12;
-  optional SaveSongPlaycountToFileResponse save_song_playcount_to_file_response = 13;
-
-  optional SaveSongRatingToFileRequest save_song_rating_to_file_request = 14;
-  optional SaveSongRatingToFileResponse save_song_rating_to_file_response = 15;
-
-}

ext/libstrawberry-tagreader/tagreadertaglib.h

@@ -1,147 +0,0 @@
-/* This file is part of Strawberry.
-   Copyright 2013, David Sansome <me@davidsansome.com>
-   Copyright 2018-2024, Jonas Kvinge <jonas@jkvinge.net>
-
-   Strawberry is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   Strawberry is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef TAGREADERTAGLIB_H
-#define TAGREADERTAGLIB_H
-
-#include "config.h"
-
-#include <string>
-
-#include <QByteArray>
-#include <QString>
-
-#include <taglib/tstring.h>
-#include <taglib/fileref.h>
-#include <taglib/xiphcomment.h>
-#include <taglib/flacfile.h>
-#include <taglib/mpegfile.h>
-#include <taglib/mp4file.h>
-#include <taglib/apetag.h>
-#include <taglib/apefile.h>
-#include <taglib/asffile.h>
-#include <taglib/id3v2tag.h>
-#include <taglib/popularimeterframe.h>
-#include <taglib/mp4tag.h>
-#include <taglib/asftag.h>
-
-#include "tagreaderbase.h"
-#include "tagreadermessages.pb.h"
-
-#undef TStringToQString
-#undef QStringToTString
-
-class FileRefFactory;
-
-/*
- * This class holds all useful methods to read and write tags from/to files.
- * You should not use it directly in the main process but rather use a TagReaderWorker process (using TagReaderClient)
- */
-class TagReaderTagLib : public TagReaderBase {
- public:
-  explicit TagReaderTagLib();
-  ~TagReaderTagLib() override;
-
-  static inline TagLib::String StdStringToTagLibString(const std::string &s) {
-    return TagLib::String(s.c_str(), TagLib::String::UTF8);
-  }
-
-  static inline std::string TagLibStringToStdString(const TagLib::String &s) {
-    return std::string(s.toCString(true), s.length());
-  }
-
-  static inline TagLib::String QStringToTagLibString(const QString &s) {
-    return TagLib::String(s.toUtf8().constData(), TagLib::String::UTF8);
-  }
-
-  static inline QString TagLibStringToQString(const TagLib::String &s) {
-    return QString::fromUtf8((s).toCString(true));
-  }
-
-  static inline void AssignTagLibStringToStdString(const TagLib::String &tstr, std::string *output) {
-
-    const QString qstr = TagLibStringToQString(tstr).trimmed();
-    const QByteArray data = qstr.toUtf8();
-    output->assign(data.constData(), data.size());
-
-  }
-
-  bool IsMediaFile(const QString &filename) const override;
-
-  Result ReadFile(const QString &filename, spb::tagreader::SongMetadata *song) const override;
-  Result WriteFile(const QString &filename, const spb::tagreader::WriteFileRequest &request) const override;
-
-  Result LoadEmbeddedArt(const QString &filename, QByteArray &data) const override;
-  Result SaveEmbeddedArt(const QString &filename, const spb::tagreader::SaveEmbeddedArtRequest &request) const override;
-
-  Result SaveSongPlaycountToFile(const QString &filename, const uint playcount) const override;
-  Result SaveSongRatingToFile(const QString &filename, const float rating) const override;
-
- private:
-  spb::tagreader::SongMetadata_FileType GuessFileType(TagLib::FileRef *fileref) const;
-
-  void ParseID3v2Tags(TagLib::ID3v2::Tag *tag, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const;
-  void ParseVorbisComments(const TagLib::Ogg::FieldListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const;
-  void ParseAPETags(const TagLib::APE::ItemListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const;
-  void ParseMP4Tags(TagLib::MP4::Tag *tag, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const;
-  void ParseASFTags(TagLib::ASF::Tag *tag, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const;
-  void ParseASFAttribute(const TagLib::ASF::AttributeListMap &attributes_map, const char *attribute, std::string *str) const;
-
-  void SetID3v2Tag(TagLib::ID3v2::Tag *tag, const spb::tagreader::SongMetadata &song) const;
-  void SetTextFrame(const char *id, const QString &value, TagLib::ID3v2::Tag *tag) const;
-  void SetTextFrame(const char *id, const std::string &value, TagLib::ID3v2::Tag *tag) const;
-  void SetUserTextFrame(const QString &description, const QString &value, TagLib::ID3v2::Tag *tag) const;
-  void SetUserTextFrame(const std::string &description, const std::string &value, TagLib::ID3v2::Tag *tag) const;
-  void SetUnsyncLyricsFrame(const std::string &value, TagLib::ID3v2::Tag *tag) const;
-
-  void SetVorbisComments(TagLib::Ogg::XiphComment *vorbis_comment, const spb::tagreader::SongMetadata &song) const;
-  void SetAPETag(TagLib::APE::Tag *tag, const spb::tagreader::SongMetadata &song) const;
-  void SetASFTag(TagLib::ASF::Tag *tag, const spb::tagreader::SongMetadata &song) const;
-  void SetAsfAttribute(TagLib::ASF::Tag *tag, const char *attribute, const std::string &value) const;
-  void SetAsfAttribute(TagLib::ASF::Tag *tag, const char *attribute, const int value) const;
-
-  QByteArray LoadEmbeddedAPEArt(const TagLib::APE::ItemListMap &map) const;
-
-  static TagLib::ID3v2::PopularimeterFrame *GetPOPMFrameFromTag(TagLib::ID3v2::Tag *tag);
-
-  void SetPlaycount(TagLib::Ogg::XiphComment *vorbis_comment, const uint playcount) const;
-  void SetPlaycount(TagLib::APE::Tag *tag, const uint playcount) const;
-  void SetPlaycount(TagLib::ID3v2::Tag *tag, const uint playcount) const;
-  void SetPlaycount(TagLib::MP4::Tag *tag, const uint playcount) const;
-  void SetPlaycount(TagLib::ASF::Tag *tag, const uint playcount) const;
-
-  void SetRating(TagLib::Ogg::XiphComment *vorbis_comment, const float rating) const;
-  void SetRating(TagLib::APE::Tag *tag, const float rating) const;
-  void SetRating(TagLib::ID3v2::Tag *tag, const float rating) const;
-  void SetRating(TagLib::MP4::Tag *tag, const float rating) const;
-  void SetRating(TagLib::ASF::Tag *tag, const float rating) const;
-
-  void SetEmbeddedArt(TagLib::FLAC::File *flac_file, TagLib::Ogg::XiphComment *vorbis_comment, const QByteArray &data, const QString &mime_type) const;
-  void SetEmbeddedArt(TagLib::Ogg::XiphComment *vorbis_comment, const QByteArray &data, const QString &mime_type) const;
-  void SetEmbeddedArt(TagLib::ID3v2::Tag *tag, const QByteArray &data, const QString &mime_type) const;
-  void SetEmbeddedArt(TagLib::MP4::File *aac_file, TagLib::MP4::Tag *tag, const QByteArray &data, const QString &mime_type) const;
-
-  static TagLib::String TagLibStringListToSlashSeparatedString(const TagLib::StringList &taglib_string_list);
-
- private:
-  FileRefFactory *factory_;
-
-  Q_DISABLE_COPY(TagReaderTagLib)
-};
-
-#endif  // TAGREADERTAGLIB_H

ext/libstrawberry-tagreader/tagreadertagparser.cpp

@@ -1,555 +0,0 @@
-/* This file is part of Strawberry.
-   Copyright 2021-2024, Jonas Kvinge <jonas@jkvinge.net>
-
-   Strawberry is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   Strawberry is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "config.h"
-
-#include "tagreadertagparser.h"
-
-#include <string>
-#include <memory>
-#include <algorithm>
-#include <vector>
-#include <sys/stat.h>
-
-#include <tagparser/mediafileinfo.h>
-#include <tagparser/diagnostics.h>
-#include <tagparser/progressfeedback.h>
-#include <tagparser/tag.h>
-#include <tagparser/abstracttrack.h>
-
-#include <QtGlobal>
-#include <QFile>
-#include <QFileInfo>
-#include <QByteArray>
-#include <QString>
-#include <QUrl>
-#include <QDateTime>
-#include <QtDebug>
-
-#include "core/logging.h"
-#include "core/messagehandler.h"
-#include "utilities/timeconstants.h"
-
-TagReaderTagParser::TagReaderTagParser() = default;
-
-bool TagReaderTagParser::IsMediaFile(const QString &filename) const {
-
-  qLog(Debug) << "Checking for valid file" << filename;
-
-  QFileInfo fileinfo(filename);
-  if (!fileinfo.exists() || fileinfo.suffix().compare(QLatin1String("bak"), Qt::CaseInsensitive) == 0) return false;
-
-  try {
-    TagParser::MediaFileInfo taginfo;
-    TagParser::Diagnostics diag;
-    TagParser::AbortableProgressFeedback progress;
-
-    taginfo.setPath(QFile::encodeName(filename).toStdString());
-    taginfo.open(true);
-
-    taginfo.parseContainerFormat(diag, progress);
-    if (progress.isAborted()) {
-      taginfo.close();
-      return false;
-    }
-
-    taginfo.parseTracks(diag, progress);
-    if (progress.isAborted()) {
-      taginfo.close();
-      return false;
-    }
-
-    for (const TagParser::DiagMessage &msg : diag) {
-      qLog(Debug) << QString::fromStdString(msg.message());
-    }
-
-    const auto tracks = taginfo.tracks();
-    for (TagParser::AbstractTrack *track : tracks) {
-      if (track->mediaType() == TagParser::MediaType::Audio) {
-        taginfo.close();
-        return true;
-      }
-    }
-    taginfo.close();
-  }
-  catch(...) {}
-
-  return false;
-
-}
-
-TagReaderBase::Result TagReaderTagParser::ReadFile(const QString &filename, spb::tagreader::SongMetadata *song) const {
-
-  qLog(Debug) << "Reading tags from" << filename;
-
-  const QFileInfo fileinfo(filename);
-
-  if (!fileinfo.exists() || fileinfo.suffix().compare(QLatin1String("bak"), Qt::CaseInsensitive) == 0) return Result::ErrorCode::FileParseError;
-
-  const QByteArray url(QUrl::fromLocalFile(filename).toEncoded());
-  const QByteArray basefilename = fileinfo.fileName().toUtf8();
-
-  song->set_basefilename(basefilename.constData(), basefilename.size());
-  song->set_url(url.constData(), url.size());
-  song->set_filesize(fileinfo.size());
-
-  song->set_mtime(fileinfo.lastModified().isValid() ? std::max(fileinfo.lastModified().toSecsSinceEpoch(), 0LL) : 0LL);
-  song->set_ctime(fileinfo.birthTime().isValid() ? std::max(fileinfo.birthTime().toSecsSinceEpoch(), 0LL) : fileinfo.lastModified().isValid() ? std::max(fileinfo.lastModified().toSecsSinceEpoch(), 0LL) : 0LL);
-
-  if (song->ctime() <= 0) {
-    song->set_ctime(song->mtime());
-  }
-
-  song->set_lastseen(QDateTime::currentDateTime().toSecsSinceEpoch());
-
-  try {
-    TagParser::MediaFileInfo taginfo;
-    TagParser::Diagnostics diag;
-    TagParser::AbortableProgressFeedback progress;
-
-#ifdef Q_OS_WIN32
-    taginfo.setPath(filename.toStdWString().toStdString());
-#else
-    taginfo.setPath(QFile::encodeName(filename).toStdString());
-#endif
-
-    taginfo.open(true);
-
-    taginfo.parseContainerFormat(diag, progress);
-    if (progress.isAborted()) {
-      taginfo.close();
-      return Result::ErrorCode::FileParseError;
-    }
-
-    taginfo.parseTracks(diag, progress);
-    if (progress.isAborted()) {
-      taginfo.close();
-      return Result::ErrorCode::FileParseError;
-    }
-
-    taginfo.parseTags(diag, progress);
-    if (progress.isAborted()) {
-      taginfo.close();
-      return Result::ErrorCode::FileParseError;
-    }
-
-    for (const TagParser::DiagMessage &msg : diag) {
-      qLog(Debug) << QString::fromStdString(msg.message());
-    }
-
-    std::vector<TagParser::AbstractTrack*> tracks = taginfo.tracks();
-    for (TagParser::AbstractTrack *track : tracks) {
-      switch (track->format().general) {
-        case TagParser::GeneralMediaFormat::Flac:
-          song->set_filetype(spb::tagreader::SongMetadata_FileType::SongMetadata_FileType_FLAC);
-          break;
-        case TagParser::GeneralMediaFormat::WavPack:
-          song->set_filetype(spb::tagreader::SongMetadata_FileType::SongMetadata_FileType_WAVPACK);
-          break;
-        case TagParser::GeneralMediaFormat::MonkeysAudio:
-          song->set_filetype(spb::tagreader::SongMetadata_FileType::SongMetadata_FileType_APE);
-          break;
-        case TagParser::GeneralMediaFormat::WindowsMediaAudio:
-          song->set_filetype(spb::tagreader::SongMetadata_FileType::SongMetadata_FileType_ASF);
-          break;
-        case TagParser::GeneralMediaFormat::Vorbis:
-          song->set_filetype(spb::tagreader::SongMetadata_FileType::SongMetadata_FileType_OGGVORBIS);
-          break;
-        case TagParser::GeneralMediaFormat::Opus:
-          song->set_filetype(spb::tagreader::SongMetadata_FileType::SongMetadata_FileType_OGGOPUS);
-          break;
-        case TagParser::GeneralMediaFormat::Speex:
-          song->set_filetype(spb::tagreader::SongMetadata_FileType::SongMetadata_FileType_OGGSPEEX);
-          break;
-        case TagParser::GeneralMediaFormat::Mpeg1Audio:
-          switch (track->format().sub) {
-            case TagParser::SubFormats::Mpeg1Layer3:
-              song->set_filetype(spb::tagreader::SongMetadata_FileType::SongMetadata_FileType_MPEG);
-              break;
-            case TagParser::SubFormats::None:
-            default:
-              break;
-          }
-          break;
-        case TagParser::GeneralMediaFormat::Mpc:
-          song->set_filetype(spb::tagreader::SongMetadata_FileType::SongMetadata_FileType_MPC);
-          break;
-        case TagParser::GeneralMediaFormat::Pcm:
-          song->set_filetype(spb::tagreader::SongMetadata_FileType::SongMetadata_FileType_PCM);
-          break;
-        case TagParser::GeneralMediaFormat::Unknown:
-        default:
-          break;
-      }
-      song->set_length_nanosec(track->duration().totalMilliseconds() * kNsecPerMsec);
-      song->set_samplerate(track->samplingFrequency());
-      song->set_bitdepth(track->bitsPerSample());
-      song->set_bitrate(std::max(track->bitrate(), track->maxBitrate()));
-    }
-
-    if (song->filetype() == spb::tagreader::SongMetadata_FileType::SongMetadata_FileType_UNKNOWN) {
-      taginfo.close();
-      return Result::ErrorCode::Unsupported;
-    }
-
-    for (TagParser::Tag *tag : taginfo.tags()) {
-      song->set_albumartist(tag->value(TagParser::KnownField::AlbumArtist).toString(TagParser::TagTextEncoding::Utf8));
-      song->set_artist(tag->value(TagParser::KnownField::Artist).toString(TagParser::TagTextEncoding::Utf8));
-      song->set_album(tag->value(TagParser::KnownField::Album).toString(TagParser::TagTextEncoding::Utf8));
-      song->set_title(tag->value(TagParser::KnownField::Title).toString(TagParser::TagTextEncoding::Utf8));
-      song->set_genre(tag->value(TagParser::KnownField::Genre).toString(TagParser::TagTextEncoding::Utf8));
-      song->set_composer(tag->value(TagParser::KnownField::Composer).toString(TagParser::TagTextEncoding::Utf8));
-      song->set_performer(tag->value(TagParser::KnownField::Performers).toString(TagParser::TagTextEncoding::Utf8));
-      song->set_grouping(tag->value(TagParser::KnownField::Grouping).toString(TagParser::TagTextEncoding::Utf8));
-      song->set_comment(tag->value(TagParser::KnownField::Comment).toString(TagParser::TagTextEncoding::Utf8));
-      song->set_lyrics(tag->value(TagParser::KnownField::Lyrics).toString(TagParser::TagTextEncoding::Utf8));
-      song->set_year(tag->value(TagParser::KnownField::RecordDate).toInteger());
-      song->set_originalyear(tag->value(TagParser::KnownField::ReleaseDate).toInteger());
-      song->set_track(tag->value(TagParser::KnownField::TrackPosition).toInteger());
-      song->set_disc(tag->value(TagParser::KnownField::DiskPosition).toInteger());
-      if (!tag->value(TagParser::KnownField::Cover).empty() && tag->value(TagParser::KnownField::Cover).dataSize() > 0) {
-        song->set_art_embedded(true);
-      }
-      const float rating = ConvertPOPMRating(tag->value(TagParser::KnownField::Rating));
-      if (song->rating() <= 0 && rating > 0.0 && rating <= 1.0) {
-        song->set_rating(rating);
-      }
-    }
-
-    // Set integer fields to -1 if they're not valid
-    if (song->track() <= 0) { song->set_track(-1); }
-    if (song->disc() <= 0) { song->set_disc(-1); }
-    if (song->year() <= 0) { song->set_year(-1); }
-    if (song->originalyear() <= 0) { song->set_originalyear(-1); }
-    if (song->samplerate() <= 0) { song->set_samplerate(-1); }
-    if (song->bitdepth() <= 0) { song->set_bitdepth(-1); }
-    if (song->bitrate() <= 0) { song->set_bitrate(-1); }
-    if (song->lastplayed() <= 0) { song->set_lastplayed(-1); }
-
-    song->set_valid(true);
-
-    taginfo.close();
-
-    return Result::ErrorCode::Success;
-
-  }
-  catch(...) {
-    return Result::ErrorCode::FileParseError;
-  }
-
-}
-
-TagReaderBase::Result TagReaderTagParser::WriteFile(const QString &filename, const spb::tagreader::WriteFileRequest &request) const {
-
-  if (request.filename().empty()) return Result::ErrorCode::FilenameMissing;
-
-  const spb::tagreader::SongMetadata &song = request.metadata();
-  const bool save_tags = request.has_save_tags() && request.save_tags();
-  const bool save_playcount = request.has_save_playcount() && request.save_playcount();
-  const bool save_rating = request.has_save_rating() && request.save_rating();
-  const bool save_cover = request.has_save_cover() && request.save_cover();
-
-  QStringList save_tags_options;
-  if (save_tags) {
-    save_tags_options << QStringLiteral("tags");
-  }
-  if (save_playcount) {
-    save_tags_options << QStringLiteral("playcount");
-  }
-  if (save_rating) {
-    save_tags_options << QStringLiteral("rating");
-  }
-  if (save_cover) {
-    save_tags_options << QStringLiteral("embedded cover");
-  }
-
-  qLog(Debug) << "Saving" << save_tags_options.join(QLatin1String(", ")) << "to" << filename;
-
-  const Cover cover = LoadCoverFromRequest(filename, request);
-
-  try {
-    TagParser::MediaFileInfo taginfo;
-    TagParser::Diagnostics diag;
-    TagParser::AbortableProgressFeedback progress;
-#ifdef Q_OS_WIN32
-    taginfo.setPath(filename.toStdWString().toStdString());
-#else
-    taginfo.setPath(QFile::encodeName(filename).toStdString());
-#endif
-    taginfo.open(false);
-
-    taginfo.parseContainerFormat(diag, progress);
-    if (progress.isAborted()) {
-      taginfo.close();
-      return Result::ErrorCode::FileParseError;
-    }
-
-    taginfo.parseTracks(diag, progress);
-    if (progress.isAborted()) {
-      taginfo.close();
-      return Result::ErrorCode::FileParseError;
-    }
-
-    taginfo.parseTags(diag, progress);
-    if (progress.isAborted()) {
-      taginfo.close();
-      return Result::ErrorCode::FileParseError;
-    }
-
-    if (taginfo.tags().size() <= 0) {
-      taginfo.createAppropriateTags();
-    }
-
-    for (TagParser::Tag *tag : taginfo.tags()) {
-      if (save_tags) {
-        tag->setValue(TagParser::KnownField::AlbumArtist, TagParser::TagValue(song.albumartist(), TagParser::TagTextEncoding::Utf8, tag->proposedTextEncoding()));
-        tag->setValue(TagParser::KnownField::Artist, TagParser::TagValue(song.artist(), TagParser::TagTextEncoding::Utf8, tag->proposedTextEncoding()));
-        tag->setValue(TagParser::KnownField::Album, TagParser::TagValue(song.album(), TagParser::TagTextEncoding::Utf8, tag->proposedTextEncoding()));
-        tag->setValue(TagParser::KnownField::Title, TagParser::TagValue(song.title(), TagParser::TagTextEncoding::Utf8, tag->proposedTextEncoding()));
-        tag->setValue(TagParser::KnownField::Genre, TagParser::TagValue(song.genre(), TagParser::TagTextEncoding::Utf8, tag->proposedTextEncoding()));
-        tag->setValue(TagParser::KnownField::Composer, TagParser::TagValue(song.composer(), TagParser::TagTextEncoding::Utf8, tag->proposedTextEncoding()));
-        tag->setValue(TagParser::KnownField::Performers, TagParser::TagValue(song.performer(), TagParser::TagTextEncoding::Utf8, tag->proposedTextEncoding()));
-        tag->setValue(TagParser::KnownField::Grouping, TagParser::TagValue(song.grouping(), TagParser::TagTextEncoding::Utf8, tag->proposedTextEncoding()));
-        tag->setValue(TagParser::KnownField::Comment, TagParser::TagValue(song.comment(), TagParser::TagTextEncoding::Utf8, tag->proposedTextEncoding()));
-        tag->setValue(TagParser::KnownField::Lyrics, TagParser::TagValue(song.lyrics(), TagParser::TagTextEncoding::Utf8, tag->proposedTextEncoding()));
-        tag->setValue(TagParser::KnownField::TrackPosition, TagParser::TagValue(song.track()));
-        tag->setValue(TagParser::KnownField::DiskPosition, TagParser::TagValue(song.disc()));
-        tag->setValue(TagParser::KnownField::RecordDate, TagParser::TagValue(song.year()));
-        tag->setValue(TagParser::KnownField::ReleaseDate, TagParser::TagValue(song.originalyear()));
-      }
-      if (save_playcount) {
-        SaveSongPlaycountToFile(tag, song.playcount());
-      }
-      if (save_rating) {
-        SaveSongRatingToFile(tag, song.rating());
-      }
-      if (save_cover) {
-        SaveEmbeddedArt(tag, cover.data);
-      }
-    }
-
-    taginfo.applyChanges(diag, progress);
-    taginfo.close();
-
-    for (const TagParser::DiagMessage &msg : diag) {
-      qLog(Debug) << QString::fromStdString(msg.message());
-    }
-
-    return Result::ErrorCode::Success;
-  }
-  catch(...) {}
-
-  return Result::ErrorCode::FileParseError;
-
-}
-
-TagReaderBase::Result TagReaderTagParser::LoadEmbeddedArt(const QString &filename, QByteArray &data) const {
-
-  if (filename.isEmpty()) return Result::ErrorCode::FilenameMissing;
-
-  qLog(Debug) << "Loading art from" << filename;
-
-  try {
-
-    TagParser::MediaFileInfo taginfo;
-    TagParser::Diagnostics diag;
-    TagParser::AbortableProgressFeedback progress;
-
-#ifdef Q_OS_WIN32
-    taginfo.setPath(filename.toStdWString().toStdString());
-#else
-    taginfo.setPath(QFile::encodeName(filename).toStdString());
-#endif
-
-    taginfo.open();
-
-    taginfo.parseContainerFormat(diag, progress);
-    if (progress.isAborted()) {
-      taginfo.close();
-      return Result::ErrorCode::FileParseError;
-    }
-
-    taginfo.parseTags(diag, progress);
-    if (progress.isAborted()) {
-      taginfo.close();
-      return Result::ErrorCode::FileParseError;
-    }
-
-    for (TagParser::Tag *tag : taginfo.tags()) {
-      if (!tag->value(TagParser::KnownField::Cover).empty() && tag->value(TagParser::KnownField::Cover).dataSize() > 0) {
-        data = QByteArray(tag->value(TagParser::KnownField::Cover).dataPointer(), tag->value(TagParser::KnownField::Cover).dataSize());
-        taginfo.close();
-        return Result::ErrorCode::Success;
-      }
-    }
-
-    taginfo.close();
-
-    for (const TagParser::DiagMessage &msg : diag) {
-      qLog(Debug) << QString::fromStdString(msg.message());
-    }
-
-  }
-  catch(...) {}
-
-  return Result::ErrorCode::FileParseError;
-
-}
-
-void TagReaderTagParser::SaveEmbeddedArt(TagParser::Tag *tag, const QByteArray &data) const {
-
-  tag->setValue(TagParser::KnownField::Cover, TagParser::TagValue(data.toStdString()));
-
-}
-
-TagReaderBase::Result TagReaderTagParser::SaveEmbeddedArt(const QString &filename, const spb::tagreader::SaveEmbeddedArtRequest &request) const {
-
-  if (request.filename().empty()) return Result::ErrorCode::FilenameMissing;
-
-  qLog(Debug) << "Saving art to" << filename;
-
-  const Cover cover = LoadCoverFromRequest(filename, request);
-
-  try {
-
-    TagParser::MediaFileInfo taginfo;
-    TagParser::Diagnostics diag;
-    TagParser::AbortableProgressFeedback progress;
-
-#ifdef Q_OS_WIN32
-    taginfo.setPath(filename.toStdWString().toStdString());
-#else
-    taginfo.setPath(QFile::encodeName(filename).toStdString());
-#endif
-
-    taginfo.open();
-
-    taginfo.parseContainerFormat(diag, progress);
-    if (progress.isAborted()) {
-      taginfo.close();
-      return Result::ErrorCode::FileParseError;
-    }
-
-    taginfo.parseTags(diag, progress);
-    if (progress.isAborted()) {
-      taginfo.close();
-      return Result::ErrorCode::FileParseError;
-    }
-
-    if (taginfo.tags().size() <= 0) {
-      taginfo.createAppropriateTags();
-    }
-
-    for (TagParser::Tag *tag : taginfo.tags()) {
-      SaveEmbeddedArt(tag, cover.data);
-    }
-
-    taginfo.applyChanges(diag, progress);
-    taginfo.close();
-
-    for (const TagParser::DiagMessage &msg : diag) {
-      qLog(Debug) << QString::fromStdString(msg.message());
-    }
-
-    return Result::ErrorCode::Success;
-
-  }
-  catch(...) {}
-
-  return Result::ErrorCode::FileParseError;
-
-}
-
-void TagReaderTagParser::SaveSongPlaycountToFile(TagParser::Tag *tag, const uint playcount) const {
-
-  Q_UNUSED(tag);
-  Q_UNUSED(playcount);
-
-}
-
-TagReaderBase::Result TagReaderTagParser::SaveSongPlaycountToFile(const QString &filename, const uint playcount) const {
-
-  Q_UNUSED(filename);
-  Q_UNUSED(playcount);
-
-  return Result::ErrorCode::Unsupported;
-
-}
-
-void TagReaderTagParser::SaveSongRatingToFile(TagParser::Tag *tag, const float rating) const {
-
-  tag->setValue(TagParser::KnownField::Rating, TagParser::TagValue(ConvertToPOPMRating(rating)));
-
-}
-
-TagReaderBase::Result TagReaderTagParser::SaveSongRatingToFile(const QString &filename, const float rating) const {
-
-    if (filename.isEmpty()) return Result::ErrorCode::FilenameMissing;
-
-    qLog(Debug) << "Saving song rating to" << filename;
-
-    try {
-      TagParser::MediaFileInfo taginfo;
-      TagParser::Diagnostics diag;
-      TagParser::AbortableProgressFeedback progress;
-  #ifdef Q_OS_WIN32
-      taginfo.setPath(filename.toStdWString().toStdString());
-  #else
-      taginfo.setPath(QFile::encodeName(filename).toStdString());
-  #endif
-      taginfo.open(false);
-
-      taginfo.parseContainerFormat(diag, progress);
-      if (progress.isAborted()) {
-        taginfo.close();
-        return Result::ErrorCode::FileParseError;
-      }
-
-      taginfo.parseTracks(diag, progress);
-      if (progress.isAborted()) {
-        taginfo.close();
-        return Result::ErrorCode::FileParseError;
-      }
-
-      taginfo.parseTags(diag, progress);
-      if (progress.isAborted()) {
-        taginfo.close();
-        return Result::ErrorCode::FileParseError;
-      }
-
-      if (taginfo.tags().size() <= 0) {
-        taginfo.createAppropriateTags();
-      }
-
-      for (TagParser::Tag *tag : taginfo.tags()) {
-        SaveSongRatingToFile(tag, rating);
-      }
-
-      taginfo.applyChanges(diag, progress);
-      taginfo.close();
-
-      for (const TagParser::DiagMessage &msg : diag) {
-        qLog(Debug) << QString::fromStdString(msg.message());
-      }
-
-      return Result::ErrorCode::Success;
-    }
-    catch(...) {}
-
-    return Result::ErrorCode::FileParseError;
-
-}

ext/libstrawberry-tagreader/tagreadertagparser.h

@@ -1,61 +0,0 @@
-/* This file is part of Strawberry.
-   Copyright 2021-2024, Jonas Kvinge <jonas@jkvinge.net>
-
-   Strawberry is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   Strawberry is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef TAGREADERTAGPARSER_H
-#define TAGREADERTAGPARSER_H
-
-#include "config.h"
-
-#include <string>
-
-#include <tagparser/tag.h>
-
-#include <QByteArray>
-#include <QString>
-
-#include "tagreadermessages.pb.h"
-#include "tagreaderbase.h"
-
-/*
- * This class holds all useful methods to read and write tags from/to files.
- * You should not use it directly in the main process but rather use a TagReaderWorker process (using TagReaderClient)
- */
-class TagReaderTagParser : public TagReaderBase {
- public:
-  explicit TagReaderTagParser();
-
-  bool IsMediaFile(const QString &filename) const override;
-
-  Result ReadFile(const QString &filename, spb::tagreader::SongMetadata *song) const override;
-  Result WriteFile(const QString &filename, const spb::tagreader::WriteFileRequest &request) const override;
-
-  Result LoadEmbeddedArt(const QString &filename, QByteArray &data) const override;
-  Result SaveEmbeddedArt(const QString &filename, const spb::tagreader::SaveEmbeddedArtRequest &request) const override;
-
-  Result SaveSongPlaycountToFile(const QString &filename, const uint playcount) const override;
-  Result SaveSongRatingToFile(const QString &filename, const float rating) const override;
-
- private:
-  void SaveSongPlaycountToFile(TagParser::Tag *tag, const uint playcount) const;
-  void SaveSongRatingToFile(TagParser::Tag *tag, const float rating) const;
-  void SaveEmbeddedArt(TagParser::Tag *tag, const QByteArray &data) const;
-
- public:
-  Q_DISABLE_COPY(TagReaderTagParser)
-};
-
-#endif  // TAGREADERTAGPARSER_H

ext/strawberry-tagreader/CMakeLists.txt

@@ -1,58 +0,0 @@
-cmake_minimum_required(VERSION 3.13)
-
-set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR})
-
-set(SOURCES main.cpp tagreaderworker.cpp)
-set(HEADERS tagreaderworker.h)
-
-qt_wrap_cpp(MOC ${HEADERS})
-
-add_executable(strawberry-tagreader ${SOURCES} ${MOC} ${QRC})
-
-target_include_directories(strawberry-tagreader SYSTEM PRIVATE
-  ${GLIB_INCLUDE_DIRS}
-  ${PROTOBUF_INCLUDE_DIRS}
-)
-
-target_include_directories(strawberry-tagreader PRIVATE
-  ${CMAKE_SOURCE_DIR}/ext/libstrawberry-common
-  ${CMAKE_SOURCE_DIR}/ext/libstrawberry-tagreader
-  ${CMAKE_BINARY_DIR}/ext/libstrawberry-tagreader
-  ${CMAKE_BINARY_DIR}/src
-)
-
-target_link_directories(strawberry-tagreader PRIVATE ${GLIB_LIBRARY_DIRS})
-
-target_link_libraries(strawberry-tagreader PRIVATE
-  ${GLIB_LIBRARIES}
-  Qt${QT_VERSION_MAJOR}::Core
-  Qt${QT_VERSION_MAJOR}::Network
-  libstrawberry-common
-  libstrawberry-tagreader
-)
-
-if(HAVE_TAGLIB)
-  target_include_directories(strawberry-tagreader SYSTEM PRIVATE ${TAGLIB_INCLUDE_DIRS})
-  target_link_directories(strawberry-tagreader PRIVATE ${TAGLIB_LIBRARY_DIRS})
-  target_link_libraries(strawberry-tagreader PRIVATE ${TAGLIB_LIBRARIES})
-endif()
-
-if(HAVE_TAGPARSER)
-  target_include_directories(strawberry-tagreader SYSTEM PRIVATE ${TAGPARSER_INCLUDE_DIRS})
-  target_link_directories(strawberry-tagreader PRIVATE ${TAGPARSER_LIBRARY_DIRS})
-  target_link_libraries(strawberry-tagreader PRIVATE ${TAGPARSER_LIBRARIES})
-endif()
-
-if(FREEBSD)
-  target_link_libraries(strawberry-tagreader PRIVATE execinfo)
-endif()
-
-if(APPLE)
-  target_link_libraries(strawberry-tagreader PRIVATE /System/Library/Frameworks/Foundation.framework)
-endif()
-
-if(APPLE)
-  install(TARGETS strawberry-tagreader DESTINATION ${CMAKE_BINARY_DIR}/strawberry.app/Contents/PlugIns)
-else()
-  install(TARGETS strawberry-tagreader RUNTIME DESTINATION bin)
-endif()

ext/strawberry-tagreader/main.cpp

@@ -1,61 +0,0 @@
-/* This file is part of Strawberry.
-   Copyright 2011, David Sansome <me@davidsansome.com>
-   Copyright 2018-2021, Jonas Kvinge <jonas@jkvinge.net>
-
-   Strawberry is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   Strawberry is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "config.h"
-
-#include <QtGlobal>
-
-#include <iostream>
-
-#include <QCoreApplication>
-#include <QList>
-#include <QString>
-#include <QStringList>
-#include <QLocalSocket>
-
-#include "core/logging.h"
-#include "tagreaderworker.h"
-
-int main(int argc, char **argv) {
-
-  QCoreApplication a(argc, argv);
-  QStringList args(a.arguments());
-
-  if (args.count() != 2) {
-    std::cerr << "This program is used internally by Strawberry to parse tags in music files\n"
-                 "without exposing the whole application to crashes caused by malformed\n"
-                 "files.  It is not meant to be run on its own.\n";
-    return 1;
-  }
-
-  logging::Init();
-  qLog(Info) << "TagReader worker connecting to" << args[1];
-
-  // Connect to the parent process.
-  QLocalSocket socket;
-  socket.connectToServer(args[1]);
-  if (!socket.waitForConnected(2000)) {
-    std::cerr << "Failed to connect to the parent process.\n";
-    return 1;
-  }
-
-  TagReaderWorker worker(&socket);
-
-  return a.exec();
-  
-}

ext/strawberry-tagreader/tagreaderworker.cpp

@@ -1,194 +0,0 @@
-/* This file is part of Strawberry.
-   Copyright 2011, David Sansome <me@davidsansome.com>
-   Copyright 2018-2024, Jonas Kvinge <jonas@jkvinge.net>
-
-   Strawberry is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   Strawberry is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "config.h"
-
-#include <utility>
-#include <memory>
-#include <string>
-
-#include <QCoreApplication>
-#include <QObject>
-#include <QIODevice>
-#include <QByteArray>
-
-#include "tagreaderworker.h"
-
-#ifdef HAVE_TAGLIB
-#  include "tagreadertaglib.h"
-#  include "tagreadergme.h"
-#endif
-
-#ifdef HAVE_TAGPARSER
-#  include "tagreadertagparser.h"
-#endif
-
-using std::make_shared;
-using std::shared_ptr;
-
-TagReaderWorker::TagReaderWorker(QIODevice *socket, QObject *parent)
-    : AbstractMessageHandler<spb::tagreader::Message>(socket, parent) {
-
-#ifdef HAVE_TAGLIB
-  tagreaders_ << make_shared<TagReaderTagLib>();
-  tagreaders_ << make_shared<TagReaderGME>();
-#endif
-
-#ifdef HAVE_TAGPARSER
-  tagreaders_ << make_shared<TagReaderTagParser>();
-#endif
-
-}
-
-void TagReaderWorker::MessageArrived(const spb::tagreader::Message &message) {
-
-  spb::tagreader::Message reply;
-
-  HandleMessage(message, reply);
-  SendReply(message, &reply);
-
-}
-
-void TagReaderWorker::DeviceClosed() {
-
-  AbstractMessageHandler<spb::tagreader::Message>::DeviceClosed();
-
-  QCoreApplication::exit();
-
-}
-
-void TagReaderWorker::HandleMessage(const spb::tagreader::Message &message, spb::tagreader::Message &reply) {
-
-  for (shared_ptr<TagReaderBase> reader : std::as_const(tagreaders_)) {
-
-    if (message.has_is_media_file_request()) {
-      const QString filename = QString::fromStdString(message.is_media_file_request().filename());
-      const bool success = reader->IsMediaFile(filename);
-      reply.mutable_is_media_file_response()->set_success(success);
-      if (success) {
-        return;
-      }
-    }
-    if (message.has_read_file_request()) {
-      const QString filename = QString::fromStdString(message.read_file_request().filename());
-      spb::tagreader::ReadFileResponse *response = reply.mutable_read_file_response();
-      const TagReaderBase::Result result = reader->ReadFile(filename, response->mutable_metadata());
-      response->set_success(result.success());
-      if (result.success()) {
-        if (response->has_error()) {
-          response->clear_error();
-        }
-        return;
-      }
-      else {
-        if (!response->has_error()) {
-          response->set_error(TagReaderBase::ErrorString(result).toStdString());
-        }
-      }
-    }
-    if (message.has_write_file_request()) {
-      const QString filename = QString::fromStdString(message.write_file_request().filename());
-      const TagReaderBase::Result result = reader->WriteFile(filename, message.write_file_request());
-      spb::tagreader::WriteFileResponse *response = reply.mutable_write_file_response();
-      response->set_success(result.success());
-      if (result.success()) {
-        if (response->has_error()) {
-          response->clear_error();
-        }
-        return;
-      }
-      else {
-        if (!response->has_error()) {
-          response->set_error(TagReaderBase::ErrorString(result).toStdString());
-        }
-      }
-    }
-    if (message.has_load_embedded_art_request()) {
-      const QString filename = QString::fromStdString(message.load_embedded_art_request().filename());
-      QByteArray data;
-      const TagReaderBase::Result result = reader->LoadEmbeddedArt(filename, data);
-      spb::tagreader::LoadEmbeddedArtResponse *response = reply.mutable_load_embedded_art_response();
-      response->set_success(result.success());
-      if (result.success()) {
-        response->set_data(data.toStdString());
-        if (response->has_error()) {
-          response->clear_error();
-        }
-        return;
-      }
-      else {
-        if (!response->has_error()) {
-          response->set_error(TagReaderBase::ErrorString(result).toStdString());
-        }
-      }
-    }
-    if (message.has_save_embedded_art_request()) {
-      const QString filename = QString::fromStdString(message.save_embedded_art_request().filename());
-      const TagReaderBase::Result result = reader->SaveEmbeddedArt(filename, message.save_embedded_art_request());
-      spb::tagreader::SaveEmbeddedArtResponse *response = reply.mutable_save_embedded_art_response();
-      response->set_success(result.success());
-      if (result.success()) {
-        if (response->has_error()) {
-          response->clear_error();
-        }
-        return;
-      }
-      else {
-        if (!response->has_error()) {
-          response->set_error(TagReaderBase::ErrorString(result).toStdString());
-        }
-      }
-    }
-    if (message.has_save_song_playcount_to_file_request()) {
-      const QString filename = QString::fromStdString(message.save_song_playcount_to_file_request().filename());
-      const TagReaderBase::Result result = reader->SaveSongPlaycountToFile(filename, message.save_song_playcount_to_file_request().playcount());
-      spb::tagreader::SaveSongPlaycountToFileResponse *response = reply.mutable_save_song_playcount_to_file_response();
-      response->set_success(result.success());
-      if (result.success()) {
-        if (response->has_error()) {
-          response->clear_error();
-        }
-        return;
-      }
-      else {
-        if (!response->has_error()) {
-          response->set_error(TagReaderBase::ErrorString(result).toStdString());
-        }
-      }
-    }
-    if (message.has_save_song_rating_to_file_request()) {
-      const QString filename = QString::fromStdString(message.save_song_rating_to_file_request().filename());
-      const TagReaderBase::Result result = reader->SaveSongRatingToFile(filename, message.save_song_rating_to_file_request().rating());
-      spb::tagreader::SaveSongRatingToFileResponse *response = reply.mutable_save_song_rating_to_file_response();
-      response->set_success(result.success());
-      if (result.success()) {
-        if (response->has_error()) {
-          response->clear_error();
-        }
-        return;
-      }
-      else {
-        if (!response->has_error()) {
-          response->set_error(TagReaderBase::ErrorString(result).toStdString());
-        }
-      }
-    }
-
-  }
-
-}

ext/strawberry-tagreader/tagreaderworker.h

@@ -1,54 +0,0 @@
-/* This file is part of Strawberry.
-   Copyright 2011, David Sansome <me@davidsansome.com>
-   Copyright 2018-2024, Jonas Kvinge <jonas@jkvinge.net>
-
-   Strawberry is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   Strawberry is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef TAGREADERWORKER_H
-#define TAGREADERWORKER_H
-
-#include "config.h"
-
-#include <memory>
-
-#include <QObject>
-#include <QList>
-
-#include "core/messagehandler.h"
-
-#include "tagreadermessages.pb.h"
-
-class QIODevice;
-class TagReaderBase;
-
-using std::shared_ptr;
-
-class TagReaderWorker : public AbstractMessageHandler<spb::tagreader::Message> {
-  Q_OBJECT
-
- public:
-  explicit TagReaderWorker(QIODevice *socket, QObject *parent = nullptr);
-
- protected:
-  void MessageArrived(const spb::tagreader::Message &message) override;
-  void DeviceClosed() override;
-
- private:
-  void HandleMessage(const spb::tagreader::Message &message, spb::tagreader::Message &reply);
-
-  QList<shared_ptr<TagReaderBase>> tagreaders_;
-};
-
-#endif  // TAGREADERWORKER_H

src/analyzer/analyzerbase.cpp

@@ -29,7 +29,7 @@
 #include <algorithm>
 
 #include <QWidget>
-#include <QVector>
+#include <QList>
 #include <QPainter>
 #include <QPalette>
 #include <QBasicTimer>
@@ -50,9 +50,9 @@
 // Make an INSTRUCTIONS file
 // can't mod scope in analyze you have to use transform for 2D use setErasePixmap Qt function insetead of m_background
 
-AnalyzerBase::AnalyzerBase(QWidget *parent, const uint scopeSize)
+AnalyzerBase::AnalyzerBase(QWidget *parent, const uint scope_size)
     : QWidget(parent),
-      fht_(new FHT(scopeSize)),
+      fht_(new FHT(scope_size)),
       engine_(nullptr),
       lastscope_(512),
       new_frame_(false),
@@ -67,11 +67,13 @@ AnalyzerBase::~AnalyzerBase() {
   delete fht_;
 }
 
-void AnalyzerBase::showEvent(QShowEvent*) {
+void AnalyzerBase::showEvent(QShowEvent *e) {
+  Q_UNUSED(e)
   timer_.start(timeout(), this);
 }
 
-void AnalyzerBase::hideEvent(QHideEvent*) {
+void AnalyzerBase::hideEvent(QHideEvent *e) {
+  Q_UNUSED(e)
   timer_.stop();
 }
 
@@ -87,7 +89,7 @@ void AnalyzerBase::ChangeTimeout(const int timeout) {
 
 void AnalyzerBase::transform(Scope &scope) {
 
-  QVector<float> aux(fht_->size());
+  QList<float> aux(fht_->size());
   if (static_cast<quint64>(aux.size()) >= scope.size()) {
     std::copy(scope.begin(), scope.end(), aux.begin());
   }
@@ -98,7 +100,7 @@ void AnalyzerBase::transform(Scope &scope) {
   fht_->logSpectrum(scope.data(), aux.data());
   fht_->scale(scope.data(), 1.0F / 20);
 
-  scope.resize(fht_->size() / 2);  // second half of values are rubbish
+  scope.resize(static_cast<size_t>(fht_->size() / 2));  // second half of values are rubbish
 
 }
 
@@ -110,7 +112,7 @@ void AnalyzerBase::paintEvent(QPaintEvent *e) {
   switch (engine_->state()) {
     case EngineBase::State::Playing:{
       const EngineBase::Scope &thescope = engine_->scope(timeout_);
-      int i = 0;
+      size_t i = 0;
 
       // convert to mono here - our built in analyzers need mono, but the engines provide interleaved pcm
       for (uint x = 0; static_cast<int>(x) < fht_->size(); ++x) {
@@ -122,7 +124,7 @@ void AnalyzerBase::paintEvent(QPaintEvent *e) {
       transform(lastscope_);
       analyze(p, lastscope_, new_frame_);
 
-      lastscope_.resize(fht_->size());
+      lastscope_.resize(static_cast<size_t>(fht_->size()));
 
       break;
     }
@@ -151,7 +153,7 @@ int AnalyzerBase::resizeExponent(int exp) {
 
   if (exp != fht_->sizeExp()) {
     delete fht_;
-    fht_ = new FHT(exp);
+    fht_ = new FHT(static_cast<uint>(exp));
   }
   return exp;
 
@@ -209,28 +211,28 @@ void AnalyzerBase::demo(QPainter &p) {
 
 }
 
-void AnalyzerBase::interpolate(const Scope &inVec, Scope &outVec) {
+void AnalyzerBase::interpolate(const Scope &in_scope, Scope &out_scope) {
 
   double pos = 0.0;
-  const double step = static_cast<double>(inVec.size()) / static_cast<double>(outVec.size());
+  const double step = static_cast<double>(in_scope.size()) / static_cast<double>(out_scope.size());
 
-  for (uint i = 0; i < outVec.size(); ++i, pos += step) {
+  for (uint i = 0; i < out_scope.size(); ++i, pos += step) {
     const double error = pos - std::floor(pos);
     const uint64_t offset = static_cast<uint64_t>(pos);
 
     uint64_t indexLeft = offset + 0;
 
-    if (indexLeft >= inVec.size()) {
-      indexLeft = inVec.size() - 1;
+    if (indexLeft >= in_scope.size()) {
+      indexLeft = in_scope.size() - 1;
     }
 
     uint64_t indexRight = offset + 1;
 
-    if (indexRight >= inVec.size()) {
-      indexRight = inVec.size() - 1;
+    if (indexRight >= in_scope.size()) {
+      indexRight = in_scope.size() - 1;
     }
 
-    outVec[i] = inVec[indexLeft] * (1.0F - static_cast<float>(error)) + inVec[indexRight] * static_cast<float>(error);
+    out_scope[i] = in_scope[indexLeft] * (1.0F - static_cast<float>(error)) + in_scope[indexRight] * static_cast<float>(error);
   }
 
 }

src/analyzer/analyzerbase.h

@@ -31,14 +31,12 @@
 
 #include <vector>
 
-#include <QtGlobal>
-#include <QObject>
 #include <QWidget>
 #include <QBasicTimer>
 #include <QString>
 #include <QPainter>
 
-#include "core/shared_ptr.h"
+#include "includes/shared_ptr.h"
 #include "analyzer/fht.h"
 #include "engine/enginebase.h"
 
@@ -63,22 +61,22 @@ class AnalyzerBase : public QWidget {
 
  protected:
   using Scope = std::vector<float>;
-  explicit AnalyzerBase(QWidget*, const uint scopeSize = 7);
+  explicit AnalyzerBase(QWidget *parent, const uint scope_size = 7);
 
-  void hideEvent(QHideEvent*) override;
-  void showEvent(QShowEvent*) override;
+  void hideEvent(QHideEvent *e) override;
+  void showEvent(QShowEvent *e) override;
   void paintEvent(QPaintEvent *e) override;
   void timerEvent(QTimerEvent *e) override;
 
-  int resizeExponent(int);
-  int resizeForBands(const int);
+  int resizeExponent(int exp);
+  int resizeForBands(const int bands);
   virtual void init() {}
-  virtual void transform(Scope&);
-  virtual void analyze(QPainter &p, const Scope&, const bool new_frame) = 0;
+  virtual void transform(Scope &scope);
+  virtual void analyze(QPainter &p, const Scope &s, const bool new_frame) = 0;
   virtual void demo(QPainter &p);
 
-  void interpolate(const Scope&, Scope&);
-  void initSin(Scope&, const uint = 6000);
+  void interpolate(const Scope &in_scope, Scope &out_scope);
+  void initSin(Scope &v, const uint size = 6000);
 
  protected:
   QBasicTimer timer_;
@@ -92,4 +90,3 @@ class AnalyzerBase : public QWidget {
 };
 
 #endif  // ANALYZERBASE_H
-

src/analyzer/analyzercontainer.cpp

@@ -44,12 +44,13 @@
 #include "waverubberanalyzer.h"
 #include "rainbowanalyzer.h"
 
+#include "includes/shared_ptr.h"
 #include "core/logging.h"
-#include "core/shared_ptr.h"
 #include "core/settings.h"
 #include "engine/enginebase.h"
 
 using namespace std::chrono_literals;
+using namespace Qt::Literals::StringLiterals;
 
 const char *AnalyzerContainer::kSettingsGroup = "Analyzer";
 const char *AnalyzerContainer::kSettingsFramerate = "framerate";
@@ -111,10 +112,6 @@ AnalyzerContainer::AnalyzerContainer(QWidget *parent)
 
 void AnalyzerContainer::mouseReleaseEvent(QMouseEvent *e) {
 
-  if (engine_->type() != EngineBase::Type::GStreamer) {
-    return;
-  }
-
   if (e->button() == Qt::RightButton) {
     context_menu_->popup(e->globalPosition().toPoint());
   }
@@ -137,10 +134,12 @@ void AnalyzerContainer::SetEngine(SharedPtr<EngineBase> engine) {
 }
 
 void AnalyzerContainer::DisableAnalyzer() {
+
   delete current_analyzer_;
   current_analyzer_ = nullptr;
 
   Save();
+
 }
 
 void AnalyzerContainer::ChangeAnalyzer(const int id) {
@@ -183,7 +182,7 @@ void AnalyzerContainer::Load() {
 
   Settings s;
   s.beginGroup(kSettingsGroup);
-  QString type = s.value("type", QStringLiteral("BlockAnalyzer")).toString();
+  QString type = s.value("type", u"BlockAnalyzer"_s).toString();
   current_framerate_ = s.value(kSettingsFramerate, kMediumFramerate).toInt();
   s.endGroup();
 

src/analyzer/analyzercontainer.h

@@ -30,7 +30,7 @@
 #include <QAction>
 #include <QActionGroup>
 
-#include "core/shared_ptr.h"
+#include "includes/shared_ptr.h"
 #include "engine/enginebase.h"
 
 class QTimer;
@@ -102,7 +102,6 @@ void AnalyzerContainer::AddAnalyzerType() {
   action->setCheckable(true);
   actions_ << action;
   QObject::connect(action, &QAction::triggered, [this, id]() { ChangeAnalyzer(id); });
-
 }
 
 #endif  // ANALYZERCONTAINER_H

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) {
@@ -85,7 +86,7 @@ void BlockAnalyzer::resizeEvent(QResizeEvent *e) {
   // this is the y-offset for drawing from the top of the widget
   y_ = (height() - (rows_ * (kHeight + 1)) + 2) / 2;
 
-  scope_.resize(columns_);
+  scope_.resize(static_cast<size_t>(columns_));
 
   if (rows_ != oldRows) {
     barpixmap_ = QPixmap(kWidth, rows_ * (kHeight + 1));
@@ -165,9 +166,9 @@ void BlockAnalyzer::analyze(QPainter &p, const Scope &s, const bool new_frame) {
   // Paint the background
   canvas_painter.drawPixmap(0, 0, background_);
 
-  for (int x = 0, y = 0; x < static_cast<int>(scope_.size()); ++x) {
+  for (qint64 x = 0, y = 0; x < static_cast<qint64>(scope_.size()); ++x) {
     // determine y
-    for (y = 0; scope_[x] < yscale_.at(y); ++y);
+    for (y = 0; scope_[static_cast<quint64>(x)] < yscale_.at(y); ++y);
 
     // This is opposite to what you'd think, higher than y means the bar is lower than y (physically)
     if (static_cast<double>(y) > store_.at(x)) {
@@ -175,13 +176,13 @@ void BlockAnalyzer::analyze(QPainter &p, const Scope &s, const bool new_frame) {
       y = static_cast<int>(store_.value(x));
     }
     else {
-      store_[x] = y;
+      store_[x] = static_cast<double>(y);
     }
 
     // If y is lower than fade_pos_, then the bar has exceeded the height of the fadeout
     // if the fadeout is quite faded now, then display the new one
     if (y <= fade_pos_.at(x) /*|| fade_intensity_[x] < kFadeSize / 3*/) {
-      fade_pos_[x] = y;
+      fade_pos_[x] = static_cast<int>(y);
       fade_intensity_[x] = kFadeSize;
     }
 
@@ -189,13 +190,13 @@ void BlockAnalyzer::analyze(QPainter &p, const Scope &s, const bool new_frame) {
       --fade_intensity_[x];
       const int offset = fade_intensity_.value(x);
       const int y2 = y_ + (fade_pos_.value(x) * (kHeight + 1));
-      canvas_painter.drawPixmap(x * (kWidth + 1), y2, fade_bars_[offset], 0, 0, kWidth, height() - y2);
+      canvas_painter.drawPixmap(static_cast<int>(x) * (kWidth + 1), y2, fade_bars_[offset], 0, 0, kWidth, height() - y2);
     }
 
     if (fade_intensity_.at(x) == 0) fade_pos_[x] = rows_;
 
     // REMEMBER: y is a number from 0 to rows_, 0 means all blocks are glowing, rows_ means none are
-    canvas_painter.drawPixmap(x * (kWidth + 1), y * (kHeight + 1) + y_, *bar(), 0, y * (kHeight + 1), bar()->width(), bar()->height());
+    canvas_painter.drawPixmap(static_cast<int>(x) * (kWidth + 1), static_cast<int>(y) * (kHeight + 1) + y_, *bar(), 0, static_cast<int>(y) * (kHeight + 1), bar()->width(), bar()->height());
   }
 
   for (int x = 0; x < store_.size(); ++x) {
@@ -340,7 +341,9 @@ QColor ensureContrast(const QColor &bg, const QColor &fg, int amount) {
 
 }
 
-void BlockAnalyzer::paletteChange(const QPalette&) {
+void BlockAnalyzer::paletteChange(const QPalette &_palette) {
+
+  Q_UNUSED(_palette)
 
   const QColor bg = palette().color(QPalette::Window);
   const QColor fg = ensureContrast(bg, palette().color(QPalette::Highlight));

src/analyzer/blockanalyzer.h

@@ -26,7 +26,7 @@
 
 #include <QtGlobal>
 #include <QObject>
-#include <QVector>
+#include <QList>
 #include <QString>
 #include <QPixmap>
 #include <QPainter>
@@ -41,15 +41,15 @@ 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;
-  virtual void paletteChange(const QPalette&);
+  void resizeEvent(QResizeEvent *e) override;
+  virtual void paletteChange(const QPalette &_palette);
   void framerateChanged() override;
 
   void drawBackground();
@@ -65,12 +65,12 @@ class BlockAnalyzer : public AnalyzerBase {
   QPixmap background_;
   QPixmap canvas_;
   Scope scope_;  // so we don't create a vector every frame
-  QVector<double> store_;  // current bar heights
-  QVector<double> yscale_;
+  QList<double> store_;  // current bar heights
+  QList<double> yscale_;
 
-  QVector<QPixmap> fade_bars_;
-  QVector<int> fade_pos_;
-  QVector<int> fade_intensity_;
+  QList<QPixmap> fade_bars_;
+  QList<int> fade_pos_;
+  QList<int> fade_intensity_;
 
   double step_;  // rows to fall per frame
 };

src/analyzer/boomanalyzer.cpp

@@ -76,7 +76,7 @@ void BoomAnalyzer::resizeEvent(QResizeEvent *e) {
   const double h = 1.2 / HEIGHT;
 
   bands_ = qMin(static_cast<int>(static_cast<double>(width() + 1) / (kColumnWidth + 1)) + 1, kMaxBandCount);
-  scope_.resize(bands_);
+  scope_.resize(static_cast<size_t>(bands_));
 
   F_ = static_cast<double>(HEIGHT) / (log10(256) * 1.1 /*<- max. amplitude*/);
 
@@ -112,17 +112,19 @@ void BoomAnalyzer::analyze(QPainter &p, const Scope &scope, const bool new_frame
     return;
   }
 
-  const uint MAX_HEIGHT = height() - 1;
+  const uint MAX_HEIGHT = static_cast<uint>(height() - 1);
 
   QPainter canvas_painter(&canvas_);
   canvas_.fill(palette().color(QPalette::Window));
 
   interpolate(scope, scope_);
 
-  for (int i = 0, x = 0, y = 0; i < bands_; ++i, x += kColumnWidth + 1) {
+  int x = 0;
+  int y = 0;
+  for (size_t i = 0; i < static_cast<size_t>(bands_); ++i, x += kColumnWidth + 1) {
     double h = log10(scope_[i] * 256.0) * F_;
 
-    if (h > MAX_HEIGHT) h = MAX_HEIGHT;
+    h = std::min(h, static_cast<double>(MAX_HEIGHT));
 
     if (h > bar_height_[i]) {
       bar_height_[i] = h;
@@ -138,7 +140,7 @@ void BoomAnalyzer::analyze(QPainter &p, const Scope &scope, const bool new_frame
     else {
       if (bar_height_[i] > 0.0) {
         bar_height_[i] -= K_barHeight_;  // 1.4
-        if (bar_height_[i] < 0.0) bar_height_[i] = 0.0;
+        bar_height_[i] = std::max(0.0, bar_height_[i]);
       }
 
       peak_handling:
@@ -147,8 +149,8 @@ void BoomAnalyzer::analyze(QPainter &p, const Scope &scope, const bool new_frame
         peak_height_[i] -= peak_speed_[i];
         peak_speed_[i] *= F_peakSpeed_;  // 1.12
 
-        if (peak_height_[i] < bar_height_[i]) peak_height_[i] = bar_height_[i];
-        if (peak_height_[i] < 0.0) peak_height_[i] = 0.0;
+        peak_height_[i] = std::max(bar_height_[i], bar_height_[i]);
+        peak_height_[i] = std::max(0.0, peak_height_[i]);
       }
     }
 

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

src/analyzer/fht.cpp

@@ -25,7 +25,7 @@
 #include <algorithm>
 #include <cmath>
 
-#include <QVector>
+#include <QList>
 #include <QtMath>
 
 FHT::FHT(uint n) : num_((n < 3) ? 0 : 1 << n), exp2_((n < 3) ? -1 : static_cast<int>(n)) {

src/analyzer/fht.h

@@ -23,7 +23,7 @@
 #ifndef FHT_H
 #define FHT_H
 
-#include <QVector>
+#include <QList>
 
 /**
  * Implementation of the Hartley Transform after Bracewell's discrete
@@ -37,9 +37,9 @@ class FHT {
   const int num_;
   const int exp2_;
 
-  QVector<float> buf_vector_;
-  QVector<float> tab_vector_;
-  QVector<int> log_vector_;
+  QList<float> buf_vector_;
+  QList<float> tab_vector_;
+  QList<int> log_vector_;
 
   float *buf_();
   float *tab_();
@@ -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

src/analyzer/rainbowanalyzer.cpp

@@ -41,6 +41,8 @@
 #include "fht.h"
 #include "analyzerbase.h"
 
+using namespace Qt::Literals::StringLiterals;
+
 const char *NyanCatAnalyzer::kName = "Nyanalyzer Cat";
 const char *RainbowDashAnalyzer::kName = "Rainbow Dash";
 
@@ -68,8 +70,8 @@ RainbowAnalyzer::RainbowAnalyzer(const RainbowType rbtype, QWidget *parent)
       background_brush_(QColor(0x0f, 0x43, 0x73)) {
 
   rainbowtype = rbtype;
-  cat_dash_[0] = QPixmap(QStringLiteral(":/pictures/nyancat.png"));
-  cat_dash_[1] = QPixmap(QStringLiteral(":/pictures/rainbowdash.png"));
+  cat_dash_[0] = QPixmap(u":/pictures/nyancat.png"_s);
+  cat_dash_[1] = QPixmap(u":/pictures/rainbowdash.png"_s);
   memset(history_, 0, sizeof(history_));
 
   for (int i = 0; i < kRainbowBands; ++i) {
@@ -127,7 +129,7 @@ void RainbowAnalyzer::analyze(QPainter &p, const Scope &s, const bool new_frame)
     // of band pass filters for this, so bands can leak into neighbouring bands,
     // but for now it's a series of separate square filters.
     const int samples_per_band = scope_size / kRainbowBands;
-    int sample = 0;
+    size_t sample = 0;
     for (int band = 0; band < kRainbowBands; ++band) {
       float accumulator = 0.0;
       for (int i = 0; i < samples_per_band; ++i) {

src/analyzer/sonogramanalyzer.cpp

@@ -85,10 +85,10 @@ void SonogramAnalyzer::transform(Scope &scope) {
 
   fht_->power2(scope.data());
   fht_->scale(scope.data(), 1.0 / 256);
-  scope.resize(fht_->size() / 2);
+  scope.resize(static_cast<size_t>(fht_->size() / 2));
 
 }
 
 void SonogramAnalyzer::demo(QPainter &p) {
-  analyze(p, Scope(fht_->size(), 0), new_frame_);
+  analyze(p, Scope(static_cast<size_t>(fht_->size()), 0), new_frame_);
 }

src/analyzer/turbineanalyzer.cpp

@@ -43,7 +43,7 @@ void TurbineAnalyzer::analyze(QPainter &p, const Scope &scope, const bool new_fr
     return;
   }
 
-  const uint hd2 = height() / 2;
+  const uint hd2 = static_cast<uint>(height() / 2);
   const uint kMaxHeight = hd2 - 1;
 
   QPainter canvas_painter(&canvas_);
@@ -67,7 +67,7 @@ void TurbineAnalyzer::analyze(QPainter &p, const Scope &scope, const bool new_fr
     else {
       if (bar_height_[i] > 0.0) {
         bar_height_[i] -= K_barHeight_;  // 1.4
-        if (bar_height_[i] < 0.0) bar_height_[i] = 0.0;
+        bar_height_[i] = std::max(0.0, bar_height_[i]);
       }
 
       peak_handling:

src/analyzer/waverubberanalyzer.cpp

@@ -54,13 +54,13 @@ void WaveRubberAnalyzer::analyze(QPainter &p, const Scope &s, const bool new_fra
   const float *amplitude_data = s.data();
 
   const int mid_y = height() / 4;
-  const int num_samples = static_cast<int>(s.size());
+  const size_t num_samples = static_cast<size_t>(s.size());
 
   const float x_scale = static_cast<float>(width()) / static_cast<float>(num_samples);
   float prev_y = static_cast<float>(mid_y);
 
   // Draw the waveform
-  for (int i = 0; i < num_samples; ++i) {
+  for (size_t i = 0; i < num_samples; ++i) {
 
     // Normalize amplitude to 0-1 range
     const float color_factor = amplitude_data[i] / 2.0F + 0.5F;
@@ -82,11 +82,11 @@ void WaveRubberAnalyzer::analyze(QPainter &p, const Scope &s, const bool new_fra
 
 }
 
-void WaveRubberAnalyzer::transform(Scope &s) {
+void WaveRubberAnalyzer::transform(Scope &scope) {
   // No need transformation for waveform analyzer
-  Q_UNUSED(s);
+  Q_UNUSED(scope);
 }
 
 void WaveRubberAnalyzer::demo(QPainter &p) {
-  analyze(p, Scope(fht_->size(), 0), new_frame_);
+  analyze(p, Scope(static_cast<size_t>(fht_->size()), 0), new_frame_);
 }

src/collection/collection.cpp

@@ -1,230 +0,0 @@
-/*
- * Strawberry Music Player
- * This file was part of Clementine.
- * Copyright 2010, David Sansome <me@davidsansome.com>
- * Copyright 2018-2021, Jonas Kvinge <jonas@jkvinge.net>
- *
- * Strawberry is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Strawberry is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "config.h"
-
-#include <memory>
-
-#include <QtGlobal>
-#include <QObject>
-#include <QThread>
-#include <QList>
-#include <QSettings>
-#include <QtConcurrentRun>
-
-#include "core/application.h"
-#include "core/taskmanager.h"
-#include "core/database.h"
-#include "core/tagreaderclient.h"
-#include "core/thread.h"
-#include "core/song.h"
-#include "core/logging.h"
-#include "core/settings.h"
-#include "utilities/threadutils.h"
-#include "collection.h"
-#include "collectionwatcher.h"
-#include "collectionbackend.h"
-#include "collectionmodel.h"
-#include "scrobbler/lastfmimport.h"
-#include "settings/collectionsettingspage.h"
-
-using std::make_shared;
-
-const char *SCollection::kSongsTable = "songs";
-const char *SCollection::kDirsTable = "directories";
-const char *SCollection::kSubdirsTable = "subdirectories";
-
-SCollection::SCollection(Application *app, QObject *parent)
-    : QObject(parent),
-      app_(app),
-      backend_(nullptr),
-      model_(nullptr),
-      watcher_(nullptr),
-      watcher_thread_(nullptr),
-      original_thread_(nullptr),
-      save_playcounts_to_files_(false),
-      save_ratings_to_files_(false) {
-
-  setObjectName(QLatin1String(metaObject()->className()));
-
-  original_thread_ = thread();
-
-  backend_ = make_shared<CollectionBackend>();
-  backend()->moveToThread(app->database()->thread());
-  qLog(Debug) << &*backend_ << "moved to thread" << app->database()->thread();
-
-  backend_->Init(app->database(), app->task_manager(), Song::Source::Collection, QLatin1String(kSongsTable), QLatin1String(kDirsTable), QLatin1String(kSubdirsTable));
-
-  model_ = new CollectionModel(backend_, app_, this);
-
-  ReloadSettings();
-
-}
-
-SCollection::~SCollection() {
-
-  if (watcher_) {
-    watcher_->Abort();
-    watcher_->deleteLater();
-  }
-  if (watcher_thread_) {
-    watcher_thread_->exit();
-    watcher_thread_->wait(5000);
-  }
-
-}
-
-void SCollection::Init() {
-
-  watcher_ = new CollectionWatcher(Song::Source::Collection);
-  watcher_thread_ = new Thread(this);
-  watcher_thread_->setObjectName(watcher_->objectName());
-
-  watcher_thread_->SetIoPriority(Utilities::IoPriority::IOPRIO_CLASS_IDLE);
-
-  watcher_->moveToThread(watcher_thread_);
-
-  qLog(Debug) << watcher_ << "moved to thread" << watcher_thread_;
-
-  watcher_thread_->start(QThread::IdlePriority);
-
-  watcher_->set_backend(backend_);
-  watcher_->set_task_manager(app_->task_manager());
-
-  QObject::connect(&*backend_, &CollectionBackend::Error, this, &SCollection::Error);
-  QObject::connect(&*backend_, &CollectionBackend::DirectoryAdded, watcher_, &CollectionWatcher::AddDirectory);
-  QObject::connect(&*backend_, &CollectionBackend::DirectoryDeleted, watcher_, &CollectionWatcher::RemoveDirectory);
-  QObject::connect(&*backend_, &CollectionBackend::SongsRatingChanged, this, &SCollection::SongsRatingChanged);
-  QObject::connect(&*backend_, &CollectionBackend::SongsStatisticsChanged, this, &SCollection::SongsPlaycountChanged);
-
-  QObject::connect(watcher_, &CollectionWatcher::NewOrUpdatedSongs, &*backend_, &CollectionBackend::AddOrUpdateSongs);
-  QObject::connect(watcher_, &CollectionWatcher::SongsMTimeUpdated, &*backend_, &CollectionBackend::UpdateMTimesOnly);
-  QObject::connect(watcher_, &CollectionWatcher::SongsDeleted, &*backend_, &CollectionBackend::DeleteSongs);
-  QObject::connect(watcher_, &CollectionWatcher::SongsUnavailable, &*backend_, &CollectionBackend::MarkSongsUnavailable);
-  QObject::connect(watcher_, &CollectionWatcher::SongsReadded, &*backend_, &CollectionBackend::MarkSongsUnavailable);
-  QObject::connect(watcher_, &CollectionWatcher::SubdirsDiscovered, &*backend_, &CollectionBackend::AddOrUpdateSubdirs);
-  QObject::connect(watcher_, &CollectionWatcher::SubdirsMTimeUpdated, &*backend_, &CollectionBackend::AddOrUpdateSubdirs);
-  QObject::connect(watcher_, &CollectionWatcher::CompilationsNeedUpdating, &*backend_, &CollectionBackend::CompilationsNeedUpdating);
-  QObject::connect(watcher_, &CollectionWatcher::UpdateLastSeen, &*backend_, &CollectionBackend::UpdateLastSeen);
-
-  QObject::connect(&*app_->lastfm_import(), &LastFMImport::UpdateLastPlayed, &*backend_, &CollectionBackend::UpdateLastPlayed);
-  QObject::connect(&*app_->lastfm_import(), &LastFMImport::UpdatePlayCount, &*backend_, &CollectionBackend::UpdatePlayCount);
-
-  // This will start the watcher checking for updates
-  backend_->LoadDirectoriesAsync();
-
-}
-
-void SCollection::Exit() {
-
-  wait_for_exit_ << &*backend_ << watcher_;
-
-  QObject::disconnect(&*backend_, nullptr, watcher_, nullptr);
-  QObject::disconnect(watcher_, nullptr, &*backend_, nullptr);
-
-  QObject::connect(&*backend_, &CollectionBackend::ExitFinished, this, &SCollection::ExitReceived);
-  QObject::connect(watcher_, &CollectionWatcher::ExitFinished, this, &SCollection::ExitReceived);
-  backend_->ExitAsync();
-  watcher_->Abort();
-  watcher_->ExitAsync();
-
-}
-
-void SCollection::ExitReceived() {
-
-  QObject *obj = sender();
-  QObject::disconnect(obj, nullptr, this, nullptr);
-  qLog(Debug) << obj << "successfully exited.";
-  wait_for_exit_.removeAll(obj);
-  if (wait_for_exit_.isEmpty()) Q_EMIT ExitFinished();
-
-}
-
-void SCollection::IncrementalScan() { watcher_->IncrementalScanAsync(); }
-
-void SCollection::FullScan() { watcher_->FullScanAsync(); }
-
-void SCollection::StopScan() { watcher_->Stop(); }
-
-void SCollection::Rescan(const SongList &songs) {
-
-  qLog(Debug) << "Rescan" << songs.size() << "songs";
-  if (!songs.isEmpty()) {
-    watcher_->RescanSongsAsync(songs);
-  }
-
-}
-
-void SCollection::PauseWatcher() { watcher_->SetRescanPausedAsync(true); }
-
-void SCollection::ResumeWatcher() { watcher_->SetRescanPausedAsync(false); }
-
-void SCollection::ReloadSettings() {
-
-  watcher_->ReloadSettingsAsync();
-  model_->ReloadSettings();
-
-  Settings s;
-  s.beginGroup(CollectionSettingsPage::kSettingsGroup);
-  save_playcounts_to_files_ = s.value("save_playcounts", false).toBool();
-  save_ratings_to_files_ = s.value("save_ratings", false).toBool();
-  s.endGroup();
-
-}
-
-void SCollection::SyncPlaycountAndRatingToFilesAsync() {
-
-  (void)QtConcurrent::run(&SCollection::SyncPlaycountAndRatingToFiles, this);
-
-}
-
-void SCollection::SyncPlaycountAndRatingToFiles() {
-
-  const int task_id = app_->task_manager()->StartTask(tr("Saving playcounts and ratings"));
-  app_->task_manager()->SetTaskBlocksCollectionScans(task_id);
-
-  const SongList songs = backend_->GetAllSongs();
-  const qint64 nb_songs = songs.size();
-  int i = 0;
-  for (const Song &song : songs) {
-    (void)TagReaderClient::Instance()->SaveSongPlaycountBlocking(song.url().toLocalFile(), song.playcount());
-    (void)TagReaderClient::Instance()->SaveSongRatingBlocking(song.url().toLocalFile(), song.rating());
-    app_->task_manager()->SetTaskProgress(task_id, ++i, nb_songs);
-  }
-  app_->task_manager()->SetTaskFinished(task_id);
-
-}
-
-void SCollection::SongsPlaycountChanged(const SongList &songs, const bool save_tags) {
-
-  if (save_tags || save_playcounts_to_files_) {
-    app_->tag_reader_client()->SaveSongsPlaycount(songs);
-  }
-
-}
-
-void SCollection::SongsRatingChanged(const SongList &songs, const bool save_tags) {
-
-  if (save_tags || save_ratings_to_files_) {
-    app_->tag_reader_client()->SaveSongsRating(songs);
-  }
-
-}

src/collection/collectionbackend.cpp

@@ -2,7 +2,7 @@
  * Strawberry Music Player
  * This file was part of Clementine.
  * Copyright 2010, David Sansome <me@davidsansome.com>
- * Copyright 2018-2024, Jonas Kvinge <jonas@jkvinge.net>
+ * Copyright 2018-2026, 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
@@ -31,7 +31,7 @@
 #include <QMutex>
 #include <QSet>
 #include <QMap>
-#include <QVector>
+#include <QList>
 #include <QVariant>
 #include <QByteArray>
 #include <QString>
@@ -45,13 +45,11 @@
 #include <QSqlQuery>
 #include <QSqlError>
 
-#include "core/shared_ptr.h"
+#include "includes/shared_ptr.h"
 #include "core/logging.h"
 #include "core/database.h"
 #include "core/scopedtransaction.h"
 #include "core/song.h"
-#include "core/sqlrow.h"
-#include "smartplaylists/smartplaylistsearch.h"
 
 #include "collectiondirectory.h"
 #include "collectionbackend.h"
@@ -59,7 +57,7 @@
 #include "collectionquery.h"
 #include "collectiontask.h"
 
-using namespace Qt::StringLiterals;
+using namespace Qt::Literals::StringLiterals;
 
 CollectionBackend::CollectionBackend(QObject *parent)
     : CollectionBackendInterface(parent),
@@ -80,7 +78,7 @@ CollectionBackend::~CollectionBackend() {
 
 void CollectionBackend::Init(SharedPtr<Database> db, SharedPtr<TaskManager> task_manager, const Song::Source source, const QString &songs_table, const QString &dirs_table, const QString &subdirs_table) {
 
-  setObjectName(source == Song::Source::Collection ? QLatin1String(metaObject()->className()) : QStringLiteral("%1%2").arg(Song::DescriptionForSource(source), QLatin1String(metaObject()->className())));
+  setObjectName(source == Song::Source::Collection ? QLatin1String(QObject::metaObject()->className()) : QStringLiteral("%1%2").arg(Song::DescriptionForSource(source), QLatin1String(QObject::metaObject()->className())));
 
   db_ = db;
   task_manager_ = task_manager;
@@ -210,8 +208,8 @@ void CollectionBackend::ChangeDirPath(const int id, const QString &old_path, con
   {
     SqlQuery q(db);
     q.prepare(QStringLiteral("UPDATE %1 SET path=:path WHERE ROWID=:id").arg(dirs_table_));
-    q.BindValue(QStringLiteral(":path"), new_path);
-    q.BindValue(QStringLiteral(":id"), id);
+    q.BindValue(u":path"_s, new_path);
+    q.BindValue(u":id"_s, id);
     if (!q.Exec()) {
       db_->ReportErrors(q);
       return;
@@ -227,8 +225,8 @@ void CollectionBackend::ChangeDirPath(const int id, const QString &old_path, con
   {
     SqlQuery q(db);
     q.prepare(QStringLiteral("UPDATE %1 SET path=:path || substr(path, %2) WHERE directory=:id").arg(subdirs_table_).arg(path_len));
-    q.BindValue(QStringLiteral(":path"), new_url);
-    q.BindValue(QStringLiteral(":id"), id);
+    q.BindValue(u":path"_s, new_url);
+    q.BindValue(u":id"_s, id);
     if (!q.Exec()) {
       db_->ReportErrors(q);
       return;
@@ -239,8 +237,8 @@ void CollectionBackend::ChangeDirPath(const int id, const QString &old_path, con
   {
     SqlQuery q(db);
     q.prepare(QStringLiteral("UPDATE %1 SET url=:path || substr(url, %2) WHERE directory=:id").arg(songs_table_).arg(path_len));
-    q.BindValue(QStringLiteral(":path"), new_url);
-    q.BindValue(QStringLiteral(":id"), id);
+    q.BindValue(u":path"_s, new_url);
+    q.BindValue(u":id"_s, id);
     if (!q.Exec()) {
       db_->ReportErrors(q);
       return;
@@ -288,7 +286,7 @@ CollectionSubdirectoryList CollectionBackend::SubdirsInDirectory(const int id, Q
 
   SqlQuery q(db);
   q.prepare(QStringLiteral("SELECT path, mtime FROM %1 WHERE directory_id = :dir").arg(subdirs_table_));
-  q.BindValue(QStringLiteral(":dir"), id);
+  q.BindValue(u":dir"_s, id);
   if (!q.Exec()) {
     db_->ReportErrors(q);
     return CollectionSubdirectoryList();
@@ -379,7 +377,7 @@ void CollectionBackend::AddDirectory(const QString &path) {
   {
     SqlQuery q(db);
     q.prepare(QStringLiteral("SELECT ROWID FROM %1 WHERE path = :path").arg(dirs_table_));
-    q.BindValue(QStringLiteral(":path"), path);
+    q.BindValue(u":path"_s, path);
     if (!q.Exec()) {
       db_->ReportErrors(q);
       return;
@@ -391,7 +389,7 @@ void CollectionBackend::AddDirectory(const QString &path) {
 
   SqlQuery q(db);
   q.prepare(QStringLiteral("INSERT INTO %1 (path, subdirs) VALUES (:path, 1)").arg(dirs_table_));
-  q.BindValue(QStringLiteral(":path"), path);
+  q.BindValue(u":path"_s, path);
   if (!q.Exec()) {
     db_->ReportErrors(q);
     return;
@@ -423,7 +421,7 @@ void CollectionBackend::RemoveDirectory(const CollectionDirectory &dir) {
   {
     SqlQuery q(db);
     q.prepare(QStringLiteral("DELETE FROM %1 WHERE directory_id = :id").arg(subdirs_table_));
-    q.BindValue(QStringLiteral(":id"), dir.id);
+    q.BindValue(u":id"_s, dir.id);
     if (!q.Exec()) {
       db_->ReportErrors(q);
       return;
@@ -434,7 +432,7 @@ void CollectionBackend::RemoveDirectory(const CollectionDirectory &dir) {
   {
     SqlQuery q(db);
     q.prepare(QStringLiteral("DELETE FROM %1 WHERE ROWID = :id").arg(dirs_table_));
-    q.BindValue(QStringLiteral(":id"), dir.id);
+    q.BindValue(u":id"_s, dir.id);
     if (!q.Exec()) {
       db_->ReportErrors(q);
       return;
@@ -454,7 +452,7 @@ SongList CollectionBackend::FindSongsInDirectory(const int id) {
 
   SqlQuery q(db);
   q.prepare(QStringLiteral("SELECT %1 FROM %2 WHERE directory_id = :directory_id").arg(Song::kRowIdColumnSpec, songs_table_));
-  q.BindValue(QStringLiteral(":directory_id"), id);
+  q.BindValue(u":directory_id"_s, id);
   if (!q.Exec()) {
     db_->ReportErrors(q);
     return SongList();
@@ -477,7 +475,7 @@ SongList CollectionBackend::SongsWithMissingFingerprint(const int id) {
 
   SqlQuery q(db);
   q.prepare(QStringLiteral("SELECT %1 FROM %2 WHERE directory_id = :directory_id AND unavailable = 0 AND (fingerprint IS NULL OR fingerprint = '')").arg(Song::kRowIdColumnSpec, songs_table_));
-  q.BindValue(QStringLiteral(":directory_id"), id);
+  q.BindValue(u":directory_id"_s, id);
   if (!q.Exec()) {
     db_->ReportErrors(q);
     return SongList();
@@ -500,7 +498,7 @@ SongList CollectionBackend::SongsWithMissingLoudnessCharacteristics(const int id
 
   SqlQuery q(db);
   q.prepare(QStringLiteral("SELECT %1 FROM %2 WHERE directory_id = :directory_id AND unavailable = 0 AND (ebur128_integrated_loudness_lufs IS NULL OR ebur128_loudness_range_lu IS NULL)").arg(Song::kRowIdColumnSpec, songs_table_));
-  q.BindValue(QStringLiteral(":directory_id"), id);
+  q.BindValue(u":directory_id"_s, id);
   if (!q.Exec()) {
     db_->ReportErrors(q);
     return SongList();
@@ -524,7 +522,7 @@ void CollectionBackend::SongPathChanged(const Song &song, const QFileInfo &new_f
   updated_song.set_url(QUrl::fromLocalFile(QDir::cleanPath(new_file.filePath())));
   updated_song.set_basefilename(new_file.fileName());
   updated_song.InitArtManual();
-  if (updated_song.is_collection_song() && new_collection_directory_id) {
+  if (updated_song.is_linked_collection_song() && new_collection_directory_id) {
     updated_song.set_directory_id(new_collection_directory_id.value());
   }
 
@@ -539,25 +537,13 @@ void CollectionBackend::AddOrUpdateSubdirs(const CollectionSubdirectoryList &sub
 
   ScopedTransaction transaction(&db);
   for (const CollectionSubdirectory &subdir : subdirs) {
-    if (subdir.mtime == 0) {
-      // Delete the subdirectory
-      SqlQuery q(db);
-      q.prepare(QStringLiteral("DELETE FROM %1 WHERE directory_id = :id AND path = :path").arg(subdirs_table_));
-      q.BindValue(QStringLiteral(":id"), subdir.directory_id);
-      q.BindValue(QStringLiteral(":path"), subdir.path);
-      if (!q.Exec()) {
-        db_->ReportErrors(q);
-        return;
-      }
-    }
-    else {
     // See if this subdirectory already exists in the database
     bool exists = false;
     {
       SqlQuery q(db);
       q.prepare(QStringLiteral("SELECT ROWID FROM %1 WHERE directory_id = :id AND path = :path").arg(subdirs_table_));
-        q.BindValue(QStringLiteral(":id"), subdir.directory_id);
-        q.BindValue(QStringLiteral(":path"), subdir.path);
+      q.BindValue(u":id"_s, subdir.directory_id);
+      q.BindValue(u":path"_s, subdir.path);
       if (!q.Exec()) {
         db_->ReportErrors(q);
         return;
@@ -568,9 +554,9 @@ void CollectionBackend::AddOrUpdateSubdirs(const CollectionSubdirectoryList &sub
     if (exists) {
       SqlQuery q(db);
       q.prepare(QStringLiteral("UPDATE %1 SET mtime = :mtime WHERE directory_id = :id AND path = :path").arg(subdirs_table_));
-        q.BindValue(QStringLiteral(":mtime"), subdir.mtime);
-        q.BindValue(QStringLiteral(":id"), subdir.directory_id);
-        q.BindValue(QStringLiteral(":path"), subdir.path);
+      q.BindValue(u":mtime"_s, subdir.mtime);
+      q.BindValue(u":id"_s, subdir.directory_id);
+      q.BindValue(u":path"_s, subdir.path);
       if (!q.Exec()) {
         db_->ReportErrors(q);
         return;
@@ -579,15 +565,35 @@ void CollectionBackend::AddOrUpdateSubdirs(const CollectionSubdirectoryList &sub
     else {
       SqlQuery q(db);
       q.prepare(QStringLiteral("INSERT INTO %1 (directory_id, path, mtime) VALUES (:id, :path, :mtime)").arg(subdirs_table_));
-        q.BindValue(QStringLiteral(":id"), subdir.directory_id);
-        q.BindValue(QStringLiteral(":path"), subdir.path);
-        q.BindValue(QStringLiteral(":mtime"), subdir.mtime);
+      q.BindValue(u":id"_s, subdir.directory_id);
+      q.BindValue(u":path"_s, subdir.path);
+      q.BindValue(u":mtime"_s, subdir.mtime);
       if (!q.Exec()) {
         db_->ReportErrors(q);
         return;
       }
     }
   }
+
+  transaction.Commit();
+
+}
+
+void CollectionBackend::DeleteSubdirs(const CollectionSubdirectoryList &subdirs) {
+
+  QMutexLocker l(db_->Mutex());
+  QSqlDatabase db(db_->Connect());
+
+  ScopedTransaction transaction(&db);
+  for (const CollectionSubdirectory &subdir : subdirs) {
+    SqlQuery q(db);
+    q.prepare(QStringLiteral("DELETE FROM %1 WHERE directory_id = :id AND path = :path").arg(subdirs_table_));
+    q.BindValue(u":id"_s, subdir.directory_id);
+    q.BindValue(u":path"_s, subdir.path);
+    if (!q.Exec()) {
+      db_->ReportErrors(q);
+      return;
+    }
   }
 
   transaction.Commit();
@@ -625,6 +631,7 @@ void CollectionBackend::AddOrUpdateSongs(const SongList &songs) {
   QMutexLocker l(db_->Mutex());
   QSqlDatabase db(db_->Connect());
 
+  CollectionTask task(task_manager_, tr("Updating %1 database.").arg(Song::TextForSource(source_)));
   ScopedTransaction transaction(&db);
 
   SongList added_songs;
@@ -637,7 +644,7 @@ void CollectionBackend::AddOrUpdateSongs(const SongList &songs) {
     if (!dirs_table_.isEmpty()) {
       SqlQuery check_dir(db);
       check_dir.prepare(QStringLiteral("SELECT ROWID FROM %1 WHERE ROWID = :id").arg(dirs_table_));
-      check_dir.BindValue(QStringLiteral(":id"), song.directory_id());
+      check_dir.BindValue(u":id"_s, song.directory_id());
       if (!check_dir.Exec()) {
         db_->ReportErrors(check_dir);
         return;
@@ -658,7 +665,7 @@ void CollectionBackend::AddOrUpdateSongs(const SongList &songs) {
         SqlQuery q(db);
         q.prepare(QStringLiteral("UPDATE %1 SET %2 WHERE ROWID = :id").arg(songs_table_, Song::kUpdateSpec));
         song.BindToQuery(&q);
-        q.BindValue(QStringLiteral(":id"), song.id());
+        q.BindValue(u":id"_s, song.id());
         if (!q.Exec()) {
           db_->ReportErrors(q);
           return;
@@ -685,7 +692,7 @@ void CollectionBackend::AddOrUpdateSongs(const SongList &songs) {
           SqlQuery q(db);
           q.prepare(QStringLiteral("UPDATE %1 SET %2 WHERE ROWID = :id").arg(songs_table_, Song::kUpdateSpec));
           new_song.BindToQuery(&q);
-          q.BindValue(QStringLiteral(":id"), new_song.id());
+          q.BindValue(u":id"_s, new_song.id());
           if (!q.Exec()) {
             db_->ReportErrors(q);
             return;
@@ -770,7 +777,7 @@ void CollectionBackend::UpdateSongsBySongID(const SongMap &new_songs) {
           SqlQuery q(db);
           q.prepare(QStringLiteral("UPDATE %1 SET %2 WHERE ROWID = :id").arg(songs_table_, Song::kUpdateSpec));
           new_song.BindToQuery(&q);
-          q.BindValue(QStringLiteral(":id"), old_song.id());
+          q.BindValue(u":id"_s, old_song.id());
           if (!q.Exec()) {
             db_->ReportErrors(q);
             return;
@@ -813,7 +820,7 @@ void CollectionBackend::UpdateSongsBySongID(const SongMap &new_songs) {
       {
         SqlQuery q(db);
         q.prepare(QStringLiteral("DELETE FROM %1 WHERE ROWID = :id").arg(songs_table_));
-        q.BindValue(QStringLiteral(":id"), old_song.id());
+        q.BindValue(u":id"_s, old_song.id());
         if (!q.Exec()) {
           db_->ReportErrors(q);
           return;
@@ -844,8 +851,8 @@ void CollectionBackend::UpdateMTimesOnly(const SongList &songs) {
   for (const Song &song : songs) {
     SqlQuery q(db);
     q.prepare(QStringLiteral("UPDATE %1 SET mtime = :mtime WHERE ROWID = :id").arg(songs_table_));
-    q.BindValue(QStringLiteral(":mtime"), song.mtime());
-    q.BindValue(QStringLiteral(":id"), song.id());
+    q.BindValue(u":mtime"_s, song.mtime());
+    q.BindValue(u":id"_s, song.id());
     if (!q.Exec()) {
       db_->ReportErrors(q);
       return;
@@ -855,6 +862,10 @@ void CollectionBackend::UpdateMTimesOnly(const SongList &songs) {
 
 }
 
+void CollectionBackend::DeleteSongsAsync(const SongList &songs) {
+  QMetaObject::invokeMethod(this, "DeleteSongs", Qt::QueuedConnection, Q_ARG(SongList, songs));
+}
+
 void CollectionBackend::DeleteSongs(const SongList &songs) {
 
   QMutexLocker l(db_->Mutex());
@@ -864,7 +875,7 @@ void CollectionBackend::DeleteSongs(const SongList &songs) {
   for (const Song &song : songs) {
     SqlQuery q(db);
     q.prepare(QStringLiteral("DELETE FROM %1 WHERE ROWID = :id").arg(songs_table_));
-    q.BindValue(QStringLiteral(":id"), song.id());
+    q.BindValue(u":id"_s, song.id());
     if (!q.Exec()) {
       db_->ReportErrors(q);
       return;
@@ -881,6 +892,24 @@ void CollectionBackend::DeleteSongs(const SongList &songs) {
 
 }
 
+void CollectionBackend::DeleteSongsByUrlsAsync(const QList<QUrl> &urls) {
+  QMetaObject::invokeMethod(this, "DeleteSongsByUrl", Qt::QueuedConnection, Q_ARG(QList<QUrl>, urls));
+}
+
+void CollectionBackend::DeleteSongsByUrls(const QList<QUrl> &urls) {
+
+  SongList songs;
+  songs.reserve(urls.count());
+  for (const QUrl &url : urls) {
+    songs << GetSongsByUrl(url);
+  }
+
+  if (!songs.isEmpty()) {
+    DeleteSongs(songs);
+  }
+
+}
+
 void CollectionBackend::MarkSongsUnavailable(const SongList &songs, const bool unavailable) {
 
   QMutexLocker l(db_->Mutex());
@@ -891,7 +920,7 @@ void CollectionBackend::MarkSongsUnavailable(const SongList &songs, const bool u
 
   ScopedTransaction transaction(&db);
   for (const Song &song : songs) {
-    query.BindValue(QStringLiteral(":id"), song.id());
+    query.BindValue(u":id"_s, song.id());
     if (!query.Exec()) {
       db_->ReportErrors(query);
       return;
@@ -918,7 +947,7 @@ QStringList CollectionBackend::GetAll(const QString &column, const CollectionFil
   QSqlDatabase db(db_->Connect());
 
   CollectionQuery query(db, songs_table_, filter_options);
-  query.SetColumnSpec(QStringLiteral("DISTINCT ") + column);
+  query.SetColumnSpec(u"DISTINCT "_s + column);
   query.AddCompilationRequirement(false);
 
   if (!query.Exec()) {
@@ -936,7 +965,8 @@ QStringList CollectionBackend::GetAll(const QString &column, const CollectionFil
 
 QStringList CollectionBackend::GetAllArtists(const CollectionFilterOptions &opt) {
 
-  return GetAll(QStringLiteral("artist"), opt);
+  return GetAll(u"artist"_s, opt);
+
 }
 
 QStringList CollectionBackend::GetAllArtistsWithAlbums(const CollectionFilterOptions &opt) {
@@ -946,16 +976,16 @@ QStringList CollectionBackend::GetAllArtistsWithAlbums(const CollectionFilterOpt
 
   // Albums with 'albumartist' field set:
   CollectionQuery query(db, songs_table_, opt);
-  query.SetColumnSpec(QStringLiteral("DISTINCT albumartist"));
+  query.SetColumnSpec(u"DISTINCT albumartist"_s);
   query.AddCompilationRequirement(false);
-  query.AddWhere(QStringLiteral("album"), ""_L1, QStringLiteral("!="));
+  query.AddWhere(u"album"_s, ""_L1, u"!="_s);
 
   // Albums with no 'albumartist' (extract 'artist'):
   CollectionQuery query2(db, songs_table_, opt);
-  query2.SetColumnSpec(QStringLiteral("DISTINCT artist"));
+  query2.SetColumnSpec(u"DISTINCT artist"_s);
   query2.AddCompilationRequirement(false);
-  query2.AddWhere(QStringLiteral("album"), ""_L1, QStringLiteral("!="));
-  query2.AddWhere(QStringLiteral("albumartist"), ""_L1, QStringLiteral("="));
+  query2.AddWhere(u"album"_s, ""_L1, u"!="_s);
+  query2.AddWhere(u"albumartist"_s, ""_L1, u"="_s);
 
   if (!query.Exec()) {
     ReportErrors(query);
@@ -994,7 +1024,7 @@ SongList CollectionBackend::GetArtistSongs(const QString &effective_albumartist,
 
   CollectionQuery query(db, songs_table_, opt);
   query.AddCompilationRequirement(false);
-  query.AddWhere(QStringLiteral("effective_albumartist"), effective_albumartist);
+  query.AddWhere(u"effective_albumartist"_s, effective_albumartist);
 
   SongList songs;
   if (!ExecCollectionQuery(&query, songs)) {
@@ -1012,8 +1042,8 @@ SongList CollectionBackend::GetAlbumSongs(const QString &effective_albumartist,
 
   CollectionQuery query(db, songs_table_, opt);
   query.AddCompilationRequirement(false);
-  query.AddWhere(QStringLiteral("effective_albumartist"), effective_albumartist);
-  query.AddWhere(QStringLiteral("album"), album);
+  query.AddWhere(u"effective_albumartist"_s, effective_albumartist);
+  query.AddWhere(u"album"_s, album);
 
   SongList songs;
   if (!ExecCollectionQuery(&query, songs)) {
@@ -1031,7 +1061,7 @@ SongList CollectionBackend::GetSongsByAlbum(const QString &album, const Collecti
 
   CollectionQuery query(db, songs_table_, opt);
   query.AddCompilationRequirement(false);
-  query.AddWhere(QStringLiteral("album"), album);
+  query.AddWhere(u"album"_s, album);
 
   SongList songs;
   if (!ExecCollectionQuery(&query, songs)) {
@@ -1044,7 +1074,7 @@ SongList CollectionBackend::GetSongsByAlbum(const QString &album, const Collecti
 
 bool CollectionBackend::ExecCollectionQuery(CollectionQuery *query, SongList &songs) {
 
-  query->SetColumnSpec(QStringLiteral("%songs_table.ROWID, ") + Song::kColumnSpec);
+  query->SetColumnSpec(u"%songs_table.ROWID, "_s + Song::kColumnSpec);
 
   if (!query->Exec()) return false;
 
@@ -1059,7 +1089,7 @@ bool CollectionBackend::ExecCollectionQuery(CollectionQuery *query, SongList &so
 
 bool CollectionBackend::ExecCollectionQuery(CollectionQuery *query, SongMap &songs) {
 
-  query->SetColumnSpec(QStringLiteral("%songs_table.ROWID, ") + Song::kColumnSpec);
+  query->SetColumnSpec(u"%songs_table.ROWID, "_s + Song::kColumnSpec);
 
   if (!query->Exec()) return false;
 
@@ -1118,7 +1148,7 @@ SongList CollectionBackend::GetSongsByForeignId(const QStringList &ids, const QS
     return SongList();
   }
 
-  QVector<Song> ret(ids.count());
+  QList<Song> ret(ids.count());
   while (q.next()) {
     const QString foreign_id = q.value(static_cast<int>(Song::kColumns.count()) + 1).toString();
     const qint64 index = ids.indexOf(foreign_id);
@@ -1166,11 +1196,11 @@ Song CollectionBackend::GetSongByUrl(const QUrl &url, const qint64 beginning) {
 
   SqlQuery q(db);
   q.prepare(QStringLiteral("SELECT %1 FROM %2 WHERE (url = :url1 OR url = :url2 OR url = :url3 OR url = :url4) AND beginning = :beginning AND unavailable = 0").arg(Song::kRowIdColumnSpec, songs_table_));
-  q.BindValue(QStringLiteral(":url1"), url.toString());
-  q.BindValue(QStringLiteral(":url2"), url.toString(QUrl::FullyEncoded));
-  q.BindValue(QStringLiteral(":url3"), url.toEncoded(QUrl::FullyDecoded));
-  q.BindValue(QStringLiteral(":url4"), url.toEncoded(QUrl::FullyEncoded));
-  q.BindValue(QStringLiteral(":beginning"), beginning);
+  q.BindValue(u":url1"_s, url.toString());
+  q.BindValue(u":url2"_s, url.toString(QUrl::FullyEncoded));
+  q.BindValue(u":url3"_s, url.toEncoded(QUrl::FullyDecoded));
+  q.BindValue(u":url4"_s, url.toEncoded(QUrl::FullyEncoded));
+  q.BindValue(u":beginning"_s, beginning);
 
   if (!q.Exec()) {
     db_->ReportErrors(q);
@@ -1195,11 +1225,11 @@ Song CollectionBackend::GetSongByUrlAndTrack(const QUrl &url, const int track) {
 
   SqlQuery q(db);
   q.prepare(QStringLiteral("SELECT %1 FROM %2 WHERE (url = :url1 OR url = :url2 OR url = :url3 OR url = :url4) AND track = :track AND unavailable = 0").arg(Song::kRowIdColumnSpec, songs_table_));
-  q.BindValue(QStringLiteral(":url1"), url.toString());
-  q.BindValue(QStringLiteral(":url2"), url.toString(QUrl::FullyEncoded));
-  q.BindValue(QStringLiteral(":url3"), url.toEncoded(QUrl::FullyDecoded));
-  q.BindValue(QStringLiteral(":url4"), url.toEncoded(QUrl::FullyEncoded));
-  q.BindValue(QStringLiteral(":track"), track);
+  q.BindValue(u":url1"_s, url.toString());
+  q.BindValue(u":url2"_s, url.toString(QUrl::FullyEncoded));
+  q.BindValue(u":url3"_s, url.toEncoded(QUrl::FullyDecoded));
+  q.BindValue(u":url4"_s, url.toEncoded(QUrl::FullyEncoded));
+  q.BindValue(u":track"_s, track);
 
   if (!q.Exec()) {
     db_->ReportErrors(q);
@@ -1224,11 +1254,11 @@ SongList CollectionBackend::GetSongsByUrl(const QUrl &url, const bool unavailabl
 
   SqlQuery q(db);
   q.prepare(QStringLiteral("SELECT %1 FROM %2 WHERE (url = :url1 OR url = :url2 OR url = :url3 OR url = :url4) AND unavailable = :unavailable").arg(Song::kRowIdColumnSpec, songs_table_));
-  q.BindValue(QStringLiteral(":url1"), url.toString());
-  q.BindValue(QStringLiteral(":url2"), url.toString(QUrl::FullyEncoded));
-  q.BindValue(QStringLiteral(":url3"), url.toEncoded(QUrl::FullyDecoded));
-  q.BindValue(QStringLiteral(":url4"), url.toEncoded(QUrl::FullyEncoded));
-  q.BindValue(QStringLiteral(":unavailable"), (unavailable ? 1 : 0));
+  q.BindValue(u":url1"_s, url.toString());
+  q.BindValue(u":url2"_s, url.toString(QUrl::FullyEncoded));
+  q.BindValue(u":url3"_s, url.toEncoded(QUrl::FullyDecoded));
+  q.BindValue(u":url4"_s, url.toEncoded(QUrl::FullyEncoded));
+  q.BindValue(u":unavailable"_s, (unavailable ? 1 : 0));
 
   SongList songs;
   if (!q.Exec()) {
@@ -1305,7 +1335,7 @@ SongList CollectionBackend::GetSongsByFingerprint(const QString &fingerprint) {
 
   SqlQuery q(db);
   q.prepare(QStringLiteral("SELECT %1 FROM %2 WHERE fingerprint = :fingerprint").arg(Song::kRowIdColumnSpec, songs_table_));
-  q.BindValue(QStringLiteral(":fingerprint"), fingerprint);
+  q.BindValue(u":fingerprint"_s, fingerprint);
   if (!q.Exec()) {
     db_->ReportErrors(q);
     return SongList();
@@ -1333,9 +1363,9 @@ SongList CollectionBackend::GetCompilationSongs(const QString &album, const Coll
   QSqlDatabase db(db_->Connect());
 
   CollectionQuery query(db, songs_table_, opt);
-  query.SetColumnSpec(QStringLiteral("%songs_table.ROWID, ") + Song::kColumnSpec);
+  query.SetColumnSpec(u"%songs_table.ROWID, "_s + Song::kColumnSpec);
   query.AddCompilationRequirement(true);
-  query.AddWhere(QStringLiteral("album"), album);
+  query.AddWhere(u"album"_s, album);
 
   if (!query.Exec()) {
     ReportErrors(query);
@@ -1426,10 +1456,10 @@ bool CollectionBackend::UpdateCompilations(const QSqlDatabase &db, SongList &cha
   {  // Get song, so we can tell the model its updated
     SqlQuery q(db);
     q.prepare(QStringLiteral("SELECT %1 FROM %2 WHERE (url = :url1 OR url = :url2 OR url = :url3 OR url = :url4) AND unavailable = 0").arg(Song::kRowIdColumnSpec, songs_table_));
-    q.BindValue(QStringLiteral(":url1"), url.toString());
-    q.BindValue(QStringLiteral(":url2"), url.toString(QUrl::FullyEncoded));
-    q.BindValue(QStringLiteral(":url3"), url.toEncoded(QUrl::FullyDecoded));
-    q.BindValue(QStringLiteral(":url4"), url.toEncoded(QUrl::FullyEncoded));
+    q.BindValue(u":url1"_s, url.toString());
+    q.BindValue(u":url2"_s, url.toString(QUrl::FullyEncoded));
+    q.BindValue(u":url3"_s, url.toEncoded(QUrl::FullyDecoded));
+    q.BindValue(u":url4"_s, url.toEncoded(QUrl::FullyEncoded));
     if (q.Exec()) {
       while (q.next()) {
         Song song(source_);
@@ -1447,11 +1477,11 @@ bool CollectionBackend::UpdateCompilations(const QSqlDatabase &db, SongList &cha
   // Update the song
   SqlQuery q(db);
   q.prepare(QStringLiteral("UPDATE %1 SET compilation_detected = :compilation_detected, compilation_effective = ((compilation OR :compilation_detected OR compilation_on) AND NOT compilation_off) + 0 WHERE (url = :url1 OR url = :url2 OR url = :url3 OR url = :url4) AND unavailable = 0").arg(songs_table_));
-  q.BindValue(QStringLiteral(":compilation_detected"), static_cast<int>(compilation_detected));
-  q.BindValue(QStringLiteral(":url1"), url.toString());
-  q.BindValue(QStringLiteral(":url2"), url.toString(QUrl::FullyEncoded));
-  q.BindValue(QStringLiteral(":url3"), url.toEncoded(QUrl::FullyDecoded));
-  q.BindValue(QStringLiteral(":url4"), url.toEncoded(QUrl::FullyEncoded));
+  q.BindValue(u":compilation_detected"_s, static_cast<int>(compilation_detected));
+  q.BindValue(u":url1"_s, url.toString());
+  q.BindValue(u":url2"_s, url.toString(QUrl::FullyEncoded));
+  q.BindValue(u":url3"_s, url.toEncoded(QUrl::FullyDecoded));
+  q.BindValue(u":url4"_s, url.toEncoded(QUrl::FullyEncoded));
   if (!q.Exec()) {
     db_->ReportErrors(q);
     return false;
@@ -1467,15 +1497,15 @@ CollectionBackend::AlbumList CollectionBackend::GetAlbums(const QString &artist,
   QSqlDatabase db(db_->Connect());
 
   CollectionQuery query(db, songs_table_, opt);
-  query.SetColumnSpec(QStringLiteral("url, filetype, cue_path, effective_albumartist, album, compilation_effective, art_embedded, art_automatic, art_manual, art_unset"));
-  query.SetOrderBy(QStringLiteral("effective_albumartist, album, url"));
+  query.SetColumnSpec(u"url, filetype, cue_path, effective_albumartist, album, compilation_effective, art_embedded, art_automatic, art_manual, art_unset"_s);
+  query.SetOrderBy(u"effective_albumartist, album, url"_s);
 
   if (compilation_required) {
     query.AddCompilationRequirement(true);
   }
   else if (!artist.isEmpty()) {
     query.AddCompilationRequirement(false);
-    query.AddWhere(QStringLiteral("effective_albumartist"), artist);
+    query.AddWhere(u"effective_albumartist"_s, artist);
   }
 
   if (!query.Exec()) {
@@ -1503,7 +1533,7 @@ CollectionBackend::AlbumList CollectionBackend::GetAlbums(const QString &artist,
     album_info.art_embedded = query.Value(6).toBool();
 
     const QString art_automatic = query.Value(7).toString();
-    static const QRegularExpression regex_url_schema(QStringLiteral("..+:.*"));
+    static const QRegularExpression regex_url_schema(u"..+:.*"_s);
     if (art_automatic.contains(regex_url_schema)) {
       album_info.art_automatic = QUrl::fromEncoded(art_automatic.toUtf8());
     }
@@ -1559,11 +1589,11 @@ CollectionBackend::Album CollectionBackend::GetAlbumArt(const QString &effective
   ret.album_artist = effective_albumartist;
 
   CollectionQuery query(db, songs_table_);
-  query.SetColumnSpec(QStringLiteral("url, art_embedded, art_automatic, art_manual, art_unset"));
+  query.SetColumnSpec(u"url, art_embedded, art_automatic, art_manual, art_unset"_s);
   if (!effective_albumartist.isEmpty()) {
-    query.AddWhere(QStringLiteral("effective_albumartist"), effective_albumartist);
+    query.AddWhere(u"effective_albumartist"_s, effective_albumartist);
   }
-  query.AddWhere(QStringLiteral("album"), album);
+  query.AddWhere(u"album"_s, album);
 
   if (!query.Exec()) {
     ReportErrors(query);
@@ -1596,9 +1626,9 @@ void CollectionBackend::UpdateEmbeddedAlbumArt(const QString &effective_albumart
   {
     SqlQuery q(db);
     q.prepare(QStringLiteral("UPDATE %1 SET art_embedded = :art_embedded, art_unset = 0 WHERE effective_albumartist = :effective_albumartist AND album = :album AND unavailable = 0").arg(songs_table_));
-    q.BindValue(QStringLiteral(":art_embedded"), art_embedded ? 1 : 0);
-    q.BindValue(QStringLiteral(":effective_albumartist"), effective_albumartist);
-    q.BindValue(QStringLiteral(":album"), album);
+    q.BindValue(u":art_embedded"_s, art_embedded ? 1 : 0);
+    q.BindValue(u":effective_albumartist"_s, effective_albumartist);
+    q.BindValue(u":album"_s, album);
     if (!q.Exec()) {
       db_->ReportErrors(q);
       return;
@@ -1609,8 +1639,8 @@ void CollectionBackend::UpdateEmbeddedAlbumArt(const QString &effective_albumart
   {
     CollectionQuery q(db, songs_table_);
     q.SetColumnSpec(Song::kRowIdColumnSpec);
-    q.AddWhere(QStringLiteral("effective_albumartist"), effective_albumartist);
-    q.AddWhere(QStringLiteral("album"), album);
+    q.AddWhere(u"effective_albumartist"_s, effective_albumartist);
+    q.AddWhere(u"album"_s, album);
     if (!q.Exec()) {
       ReportErrors(q);
       return;
@@ -1642,9 +1672,9 @@ void CollectionBackend::UpdateManualAlbumArt(const QString &effective_albumartis
   {
     SqlQuery q(db);
     q.prepare(QStringLiteral("UPDATE %1 SET art_manual = :art_manual, art_unset = 0 WHERE effective_albumartist = :effective_albumartist AND album = :album AND unavailable = 0").arg(songs_table_));
-    q.BindValue(QStringLiteral(":art_manual"), art_manual.isValid() ? art_manual.toString(QUrl::FullyEncoded) : ""_L1);
-    q.BindValue(QStringLiteral(":effective_albumartist"), effective_albumartist);
-    q.BindValue(QStringLiteral(":album"), album);
+    q.BindValue(u":art_manual"_s, art_manual.isValid() ? art_manual.toString(QUrl::FullyEncoded) : ""_L1);
+    q.BindValue(u":effective_albumartist"_s, effective_albumartist);
+    q.BindValue(u":album"_s, album);
     if (!q.Exec()) {
       db_->ReportErrors(q);
       return;
@@ -1655,8 +1685,8 @@ void CollectionBackend::UpdateManualAlbumArt(const QString &effective_albumartis
   {
     CollectionQuery q(db, songs_table_);
     q.SetColumnSpec(Song::kRowIdColumnSpec);
-    q.AddWhere(QStringLiteral("effective_albumartist"), effective_albumartist);
-    q.AddWhere(QStringLiteral("album"), album);
+    q.AddWhere(u"effective_albumartist"_s, effective_albumartist);
+    q.AddWhere(u"album"_s, album);
     if (!q.Exec()) {
       ReportErrors(q);
       return;
@@ -1688,8 +1718,8 @@ void CollectionBackend::UnsetAlbumArt(const QString &effective_albumartist, cons
   {
     SqlQuery q(db);
     q.prepare(QStringLiteral("UPDATE %1 SET art_unset = 1, art_manual = '', art_automatic = '', art_embedded = '' WHERE effective_albumartist = :effective_albumartist AND album = :album AND unavailable = 0").arg(songs_table_));
-    q.BindValue(QStringLiteral(":effective_albumartist"), effective_albumartist);
-    q.BindValue(QStringLiteral(":album"), album);
+    q.BindValue(u":effective_albumartist"_s, effective_albumartist);
+    q.BindValue(u":album"_s, album);
     if (!q.Exec()) {
       db_->ReportErrors(q);
       return;
@@ -1700,8 +1730,8 @@ void CollectionBackend::UnsetAlbumArt(const QString &effective_albumartist, cons
   {
     CollectionQuery q(db, songs_table_);
     q.SetColumnSpec(Song::kRowIdColumnSpec);
-    q.AddWhere(QStringLiteral("effective_albumartist"), effective_albumartist);
-    q.AddWhere(QStringLiteral("album"), album);
+    q.AddWhere(u"effective_albumartist"_s, effective_albumartist);
+    q.AddWhere(u"album"_s, album);
     if (!q.Exec()) {
       ReportErrors(q);
       return;
@@ -1733,9 +1763,9 @@ void CollectionBackend::ClearAlbumArt(const QString &effective_albumartist, cons
   {
     SqlQuery q(db);
     q.prepare(QStringLiteral("UPDATE %1 SET art_embedded = 0, art_automatic = '', art_manual = '', art_unset = :art_unset WHERE effective_albumartist = :effective_albumartist AND album = :album AND unavailable = 0").arg(songs_table_));
-    q.BindValue(QStringLiteral(":art_unset"), art_unset ? 1 : 0);
-    q.BindValue(QStringLiteral(":effective_albumartist"), effective_albumartist);
-    q.BindValue(QStringLiteral(":album"), album);
+    q.BindValue(u":art_unset"_s, art_unset ? 1 : 0);
+    q.BindValue(u":effective_albumartist"_s, effective_albumartist);
+    q.BindValue(u":album"_s, album);
     if (!q.Exec()) {
       db_->ReportErrors(q);
       return;
@@ -1746,8 +1776,8 @@ void CollectionBackend::ClearAlbumArt(const QString &effective_albumartist, cons
   {
     CollectionQuery q(db, songs_table_);
     q.SetColumnSpec(Song::kRowIdColumnSpec);
-    q.AddWhere(QStringLiteral("effective_albumartist"), effective_albumartist);
-    q.AddWhere(QStringLiteral("album"), album);
+    q.AddWhere(u"effective_albumartist"_s, effective_albumartist);
+    q.AddWhere(u"album"_s, album);
     if (!q.Exec()) {
       ReportErrors(q);
       return;
@@ -1779,10 +1809,10 @@ void CollectionBackend::ForceCompilation(const QString &album, const QStringList
 
     SqlQuery q(db);
     q.prepare(sql);
-    q.BindValue(QStringLiteral(":compilation_on"), on ? 1 : 0);
-    q.BindValue(QStringLiteral(":compilation_off"), on ? 0 : 1);
-    q.BindValue(QStringLiteral(":album"), album);
-    if (!artist.isEmpty()) q.BindValue(QStringLiteral(":artist"), artist);
+    q.BindValue(u":compilation_on"_s, on ? 1 : 0);
+    q.BindValue(u":compilation_off"_s, on ? 0 : 1);
+    q.BindValue(u":album"_s, album);
+    if (!artist.isEmpty()) q.BindValue(u":artist"_s, artist);
 
     if (!q.Exec()) {
       db_->ReportErrors(q);
@@ -1793,8 +1823,8 @@ void CollectionBackend::ForceCompilation(const QString &album, const QStringList
 
     CollectionQuery query(db, songs_table_);
     query.SetColumnSpec(Song::kRowIdColumnSpec);
-    query.AddWhere(QStringLiteral("album"), album);
-    if (!artist.isEmpty()) query.AddWhere(QStringLiteral("artist"), artist);
+    query.AddWhere(u"album"_s, album);
+    if (!artist.isEmpty()) query.AddWhere(u"artist"_s, artist);
 
     if (!query.Exec()) {
       ReportErrors(query);
@@ -1823,8 +1853,8 @@ void CollectionBackend::IncrementPlayCount(const int id) {
 
   SqlQuery q(db);
   q.prepare(QStringLiteral("UPDATE %1 SET playcount = playcount + 1, lastplayed = :now WHERE ROWID = :id").arg(songs_table_));
-  q.BindValue(QStringLiteral(":now"), QDateTime::currentSecsSinceEpoch());
-  q.BindValue(QStringLiteral(":id"), id);
+  q.BindValue(u":now"_s, QDateTime::currentSecsSinceEpoch());
+  q.BindValue(u":id"_s, id);
   if (!q.Exec()) {
     db_->ReportErrors(q);
     return;
@@ -1846,7 +1876,7 @@ void CollectionBackend::IncrementSkipCount(const int id, const float progress) {
 
   SqlQuery q(db);
   q.prepare(QStringLiteral("UPDATE %1 SET skipcount = skipcount + 1 WHERE ROWID = :id").arg(songs_table_));
-  q.BindValue(QStringLiteral(":id"), id);
+  q.BindValue(u":id"_s, id);
   if (!q.Exec()) {
     db_->ReportErrors(q);
     return;
@@ -1892,7 +1922,7 @@ bool CollectionBackend::ResetPlayStatistics(const QStringList &id_str_list) {
 
   SqlQuery q(db);
   q.prepare(QStringLiteral("UPDATE %1 SET playcount = 0, skipcount = 0, lastplayed = -1 WHERE ROWID IN (:ids)").arg(songs_table_));
-  q.BindValue(QStringLiteral(":ids"), id_str_list.join(u','));
+  q.BindValue(u":ids"_s, id_str_list.join(u','));
   if (!q.Exec()) {
     db_->ReportErrors(q);
     return false;
@@ -1917,7 +1947,7 @@ void CollectionBackend::DeleteAll() {
 
     {
       SqlQuery q(db);
-      q.prepare(QStringLiteral("DELETE FROM ") + songs_table_);
+      q.prepare(u"DELETE FROM "_s + songs_table_);
       if (!q.Exec()) {
         db_->ReportErrors(q);
         return;
@@ -1931,37 +1961,26 @@ void CollectionBackend::DeleteAll() {
 
 }
 
-SongList CollectionBackend::SmartPlaylistsFindSongs(const SmartPlaylistSearch &search) {
+SongList CollectionBackend::ExecuteQuery(const QString &sql) {
 
   QMutexLocker l(db_->Mutex());
   QSqlDatabase db(db_->Connect());
 
-  // Build the query
-  QString sql = search.ToSql(songs_table());
-
-  // Run the query
-  SongList ret;
   SqlQuery query(db);
   query.prepare(sql);
   if (!query.Exec()) {
     db_->ReportErrors(query);
-    return ret;
+    return SongList();
   }
 
-  // Read the results
+  SongList songs;
   while (query.next()) {
     Song song;
     song.InitFromQuery(query, true);
-    ret << song;
-  }
-  return ret;
-
+    songs << song;
   }
 
-SongList CollectionBackend::SmartPlaylistsGetAllSongs() {
-
-  // Get all the songs!
-  return SmartPlaylistsFindSongs(SmartPlaylistSearch(SmartPlaylistSearch::SearchType::All, SmartPlaylistSearch::TermList(), SmartPlaylistSearch::SortType::FieldAsc, SmartPlaylistSearchTerm::Field::Artist, -1));
+  return songs;
 
 }
 
@@ -1978,9 +1997,9 @@ SongList CollectionBackend::GetSongsBy(const QString &artist, const QString &alb
   else {
     q.prepare(QStringLiteral("SELECT %1 FROM %2 WHERE artist = :artist COLLATE NOCASE AND album = :album COLLATE NOCASE AND title = :title COLLATE NOCASE").arg(Song::kRowIdColumnSpec, songs_table_));
   }
-  q.BindValue(QStringLiteral(":artist"), artist);
-  if (!album.isEmpty()) q.BindValue(QStringLiteral(":album"), album);
-  q.BindValue(QStringLiteral(":title"), title);
+  q.BindValue(u":artist"_s, artist);
+  if (!album.isEmpty()) q.BindValue(u":album"_s, album);
+  q.BindValue(u":title"_s, title);
   if (!q.Exec()) {
     db_->ReportErrors(q);
     return SongList();
@@ -2012,8 +2031,8 @@ void CollectionBackend::UpdateLastPlayed(const QString &artist, const QString &a
     }
     SqlQuery q(db);
     q.prepare(QStringLiteral("UPDATE %1 SET lastplayed = :lastplayed WHERE ROWID = :id").arg(songs_table_));
-    q.BindValue(QStringLiteral(":lastplayed"), lastplayed);
-    q.BindValue(QStringLiteral(":id"), song.id());
+    q.BindValue(u":lastplayed"_s, lastplayed);
+    q.BindValue(u":id"_s, song.id());
     if (!q.Exec()) {
       db_->ReportErrors(q);
       continue;
@@ -2038,8 +2057,8 @@ void CollectionBackend::UpdatePlayCount(const QString &artist, const QString &ti
   for (const Song &song : songs) {
     SqlQuery q(db);
     q.prepare(QStringLiteral("UPDATE %1 SET playcount = :playcount WHERE ROWID = :id").arg(songs_table_));
-    q.BindValue(QStringLiteral(":playcount"), playcount);
-    q.BindValue(QStringLiteral(":id"), song.id());
+    q.BindValue(u":playcount"_s, playcount);
+    q.BindValue(u":id"_s, song.id());
     if (!q.Exec()) {
       db_->ReportErrors(q);
       return;
@@ -2073,7 +2092,7 @@ void CollectionBackend::UpdateSongsRating(const QList<int> &id_list, const float
   QString ids = id_str_list.join(u',');
   SqlQuery q(db);
   q.prepare(QStringLiteral("UPDATE %1 SET rating = :rating WHERE ROWID IN (%2)").arg(songs_table_, ids));
-  q.BindValue(QStringLiteral(":rating"), rating);
+  q.BindValue(u":rating"_s, rating);
   if (!q.Exec()) {
     db_->ReportErrors(q);
     return;
@@ -2101,8 +2120,8 @@ void CollectionBackend::UpdateLastSeen(const int directory_id, const int expire_
 
     SqlQuery q(db);
     q.prepare(QStringLiteral("UPDATE %1 SET lastseen = :lastseen WHERE directory_id = :directory_id AND unavailable = 0").arg(songs_table_));
-    q.BindValue(QStringLiteral(":lastseen"), QDateTime::currentSecsSinceEpoch());
-    q.BindValue(QStringLiteral(":directory_id"), directory_id);
+    q.BindValue(u":lastseen"_s, QDateTime::currentSecsSinceEpoch());
+    q.BindValue(u":directory_id"_s, directory_id);
     if (!q.Exec()) {
       db_->ReportErrors(q);
       return;
@@ -2121,8 +2140,8 @@ void CollectionBackend::ExpireSongs(const int directory_id, const int expire_una
     QSqlDatabase db(db_->Connect());
     SqlQuery q(db);
     q.prepare(QStringLiteral("SELECT %1 FROM %2 LEFT JOIN playlist_items ON %2.ROWID = playlist_items.collection_id WHERE %2.directory_id = :directory_id AND %2.unavailable = 1 AND %2.lastseen > 0 AND %2.lastseen < :time AND playlist_items.collection_id IS NULL").arg(Song::JoinSpec(songs_table_), songs_table_));
-    q.BindValue(QStringLiteral(":directory_id"), directory_id);
-    q.BindValue(QStringLiteral(":time"), QDateTime::currentSecsSinceEpoch() - (expire_unavailable_songs_days * 86400LL));
+    q.BindValue(u":directory_id"_s, directory_id);
+    q.BindValue(u":time"_s, QDateTime::currentSecsSinceEpoch() - (expire_unavailable_songs_days * 86400LL));
     if (!q.Exec()) {
       db_->ReportErrors(q);
       return;
@@ -2137,5 +2156,3 @@ void CollectionBackend::ExpireSongs(const int directory_id, const int expire_una
   if (!songs.isEmpty()) DeleteSongs(songs);
 
 }
-
-