Split into separate libraries

.clang-format

@@ -130,10 +130,7 @@ InsertBraces:    false
 InsertTrailingCommas: None
 JavaScriptQuotes: Leave
 JavaScriptWrapImports: true
-KeepEmptyLines:
-  AtEndOfFile: true
-  AtStartOfBlock: true
-  AtStartOfFile: true
+KeepEmptyLinesAtTheStartOfBlocks: true
 LambdaBodyIndentation: Signature
 MacroBlockBegin: ''
 MacroBlockEnd:   ''

.github/ISSUE_TEMPLATE/config.yml

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

.github/workflows/build.yml

@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        opensuse_version: [ 'tumbleweed', 'leap:15.6', 'leap:16.0' ]
+        opensuse_version: [ 'tumbleweed', 'leap:15.6' ]
     container:
       image: opensuse/${{matrix.opensuse_version}}
     steps:
@@ -27,11 +27,11 @@ jobs:
       - name: Upgrade packages (Leap)
         if: matrix.opensuse_version != 'tumbleweed'
         run: zypper -n --gpg-auto-import-keys up
-      - name: Install gcc
-        if: matrix.opensuse_version != 'leap:15.6'
+      - name: Install gcc (Tumbleweed)
+        if: matrix.opensuse_version == 'tumbleweed'
         run: zypper -n --gpg-auto-import-keys in gcc gcc-c++
-      - name: Install gcc (leap:15.6)
-        if: matrix.opensuse_version == 'leap:15.6'
+      - name: Install gcc (Leap)
+        if: matrix.opensuse_version != 'tumbleweed'
         run: zypper -n --gpg-auto-import-keys in gcc14 gcc14-c++
       - name: Install packages
         run: >
@@ -68,7 +68,6 @@ jobs:
             hicolor-icon-theme
             qt6-core-devel
             qt6-gui-devel
-            qt6-gui-private-devel
             qt6-widgets-devel
             qt6-concurrent-devel
             qt6-network-devel
@@ -80,24 +79,11 @@ jobs:
             qt6-linguist-devel
             gtest
             gmock
-            sparsehash-devel
-            rapidjson-devel
       - name: Install kdsingleapplication-qt6-devel
-        if: matrix.opensuse_version != 'leap:15.6'
+        if: matrix.opensuse_version == 'tumbleweed'
         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@v6
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           submodules: recursive
@@ -115,14 +101,14 @@ jobs:
       - name: Copy source tarball
         working-directory: build
         run: cp strawberry-*.tar.xz /usr/src/packages/SOURCES/
-      - name: Build RPM
-        if: matrix.opensuse_version != 'leap:15.6'
+      - name: Build RPM (Tumbleweed)
+        if: matrix.opensuse_version == 'tumbleweed'
         env:
           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'
+      - name: Build RPM (Leap)
+        if: matrix.opensuse_version != 'tumbleweed'
         env:
           RPM_BUILD_NCPUS: 4
           CC: gcc-14
@@ -134,14 +120,14 @@ jobs:
         run: echo "subdir=$(echo ${{matrix.opensuse_version}} | sed 's/leap:/lp/g' | sed 's/\.//g')" > $GITHUB_OUTPUT
       - name: Upload source
         if: matrix.opensuse_version == 'tumbleweed'
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v4
         with:
           name: source
           path: |
             /usr/src/packages/SOURCES/*.xz
       - name: Upload rpm
         if: matrix.opensuse_version != 'tumbleweed'
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v4
         with:
           name: opensuse-${{steps.set-subdir.outputs.subdir}}
           path: |
@@ -156,7 +142,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        fedora_version: [ '41', '42', '43' ]
+        fedora_version: [ '39', '40', '41', '42' ]
     container:
       image: fedora:${{matrix.fedora_version}}
     steps:
@@ -206,10 +192,8 @@ jobs:
             kdsingleapplication-qt6-devel
             gtest-devel
             gmock-devel
-            sparsehash-devel
-            rapidjson-devel
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           submodules: recursive
@@ -234,7 +218,7 @@ jobs:
         working-directory: build
         run: rpmbuild -ba strawberry.spec
       - name: Upload artifacts
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v4
         with:
           name: fedora-${{matrix.fedora_version}}
           path: |
@@ -244,7 +228,7 @@ jobs:
 
   build-openmandriva:
     name: Build OpenMandriva
-    if: github.repository != 'strawberrymusicplayer/strawberry-private' && github.ref != 'refs/heads/l10n_master'
+    if: github.repository != 'strawberrymusicplayer/strawberry-private' && github.ref != 'refs/heads/l10n_master' && false
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -259,30 +243,31 @@ jobs:
         run: >
           dnf install -y
           which
+          glibc
           gcc-c++
           git
           gnutar
           make
           cmake
+          glib
           lsb-release
           rpmdevtools
           rpm-build
           glibc-devel
           boost-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
+          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
           lib64Qt6Core-devel
           lib64Qt6Concurrent-devel
           lib64Qt6Network-devel
@@ -291,11 +276,6 @@ 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
@@ -303,11 +283,10 @@ 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@v6
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           submodules: recursive
@@ -333,7 +312,7 @@ jobs:
         run: rpmbuild -ba strawberry.spec
       - name: Upload artifacts
         if: matrix.openmandriva_version != 'cooker'
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v4
         with:
           name: openmandriva-${{matrix.openmandriva_version}}
           path: |
@@ -352,6 +331,12 @@ 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
@@ -393,23 +378,12 @@ jobs:
           lib64qt6dbus-devel
           lib64qt6help-devel
           lib64qt6test-devel
-          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@v6
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           submodules: recursive
@@ -434,7 +408,7 @@ jobs:
         working-directory: build
         run: rpmbuild -ba strawberry.spec
       - name: Upload artifacts
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v4
         with:
           name: mageia-${{matrix.mageia_version}}
           path: |
@@ -449,7 +423,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        debian_version: [ 'bookworm', 'trixie', 'forky' ]
+        debian_version: [ 'bookworm', 'trixie' ]
     container:
       image: debian:${{matrix.debian_version}}
     steps:
@@ -490,28 +464,13 @@ 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@v6
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           submodules: recursive
@@ -528,7 +487,7 @@ jobs:
       - name: Copy deb
         run: cp ../*.deb .
       - name: Upload artifacts
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v4
         with:
           name: debian-${{matrix.debian_version}}
           path: |
@@ -542,7 +501,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ubuntu_version: [ 'noble', 'plucky', 'questing' ]
+        ubuntu_version: [ 'noble', 'oracular' ]
     container:
       image: ubuntu:${{matrix.ubuntu_version}}
     steps:
@@ -586,28 +545,13 @@ 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' && matrix.ubuntu_version != 'plucky'
-        run: apt install -y libkdsingleapplication-qt6-dev
-      - name: Build and install KDSingleApplication
-        if: matrix.ubuntu_version == 'noble' || matrix.ubuntu_version == 'plucky'
-        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@v6
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           submodules: recursive
@@ -624,7 +568,7 @@ jobs:
       - name: Copy deb
         run: cp ../*.deb ../*.ddeb .
       - name: Upload artifacts
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v4
         with:
           name: ubuntu-${{matrix.ubuntu_version}}
           path: |
@@ -639,7 +583,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ubuntu_version: [ 'noble', 'plucky', 'questing' ]
+        ubuntu_version: [ 'noble', 'oracular' ]
     container:
       image: ubuntu:${{matrix.ubuntu_version}}
     steps:
@@ -681,34 +625,25 @@ 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
-            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@v6
+        uses: actions/checkout@v4
         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
@@ -735,23 +670,17 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@v6
+      uses: actions/checkout@v4
       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.2
+      uses: vmactions/freebsd-vm@v1.1.8
       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
+        mem: 4096
+        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
         run: |
           set -e
           git config --global --add safe.directory ${GITHUB_WORKSPACE}
@@ -766,23 +695,23 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@v6
+      uses: actions/checkout@v4
       with:
         fetch-depth: 0
         submodules: recursive
     - name: Build OpenBSD
       id: build-openbsd
-      uses: vmactions/openbsd-vm@v1.2.9
+      uses: vmactions/openbsd-vm@v1.1.6
       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
+        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
         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 -S . -B build -DCMAKE_BUILD_TYPE="Debug" -DENABLE_ALSA=OFF
           cmake --build build --config Debug --parallel 4
 
 
@@ -793,7 +722,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        runner: [ 'macos-15-intel', 'macos-15' ]
+        runner: [ 'macos-13', 'macos-14' ]
         buildtype: [ 'release' ]
 
     runs-on: ${{ matrix.runner }}
@@ -832,20 +761,20 @@ jobs:
           rm -f uninstall.sh
 
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
         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@v6
+        uses: apple-actions/import-codesign-certs@v3
         with:
           p12-file-base64: ${{ secrets.APPLE_DEVELOPER_ID_CERTIFICATE }}
           p12-password: ${{ secrets.APPLE_DEVELOPER_ID_CERTIFICATE_PASSWORD }}
 
       - name: Download macOS dependencies
-        run: curl -f -O -L https://github.com/strawberrymusicplayer/strawberry-macos-dependencies$(test "${{env.arch}}" = "x86_64" && echo "-intel" || echo "")/releases/latest/download/strawberry-macos-${{env.arch}}-${{env.buildtype}}.tar.xz
+        run: curl -f -O -L https://github.com/strawberrymusicplayer/strawberry-macos-dependencies/releases/latest/download/strawberry-macos-${{env.arch}}-${{env.buildtype}}.tar.xz
 
       - name: Extract macOS dependencies
         run: sudo tar -C / -xf strawberry-macos-${{env.arch}}-${{env.buildtype}}.tar.xz
@@ -896,12 +825,12 @@ jobs:
         run: make deploy
 
       - name: Manually Codesign
-        if: github.repository == 'strawberrymusicplayer/strawberry' && github.event.pull_request.head.repo.fork == false && matrix.runner == 'macos-15-intel'
+        if: github.repository == 'strawberrymusicplayer/strawberry' && github.event.pull_request.head.repo.fork == false && matrix.runner == 'macos-13'
         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,libbrotlicommon.1.dylib,libbrotlienc.1.dylib} strawberry.app/Contents/Frameworks/png.framework/png strawberry.app
+        run: codesign -s 383J84DVB6 -f strawberry.app/Contents/Frameworks/{libpcre2-8.0.dylib,libpcre2-16.0.dylib,libpng16.16.dylib,libfreetype.6.dylib,libzstd.1.dylib} strawberry.app/Contents/Frameworks/png.framework/png strawberry.app
 
       - name: Manually Codesign
-        if: github.repository == 'strawberrymusicplayer/strawberry' && github.event.pull_request.head.repo.fork == false && matrix.runner == 'macos-15'
+        if: github.repository == 'strawberrymusicplayer/strawberry' && github.event.pull_request.head.repo.fork == false && matrix.runner == 'macos-14'
         working-directory: build
         run: codesign -s 383J84DVB6 -f strawberry.app/Contents/Frameworks/png.framework/png strawberry.app
 
@@ -983,7 +912,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@v6
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           submodules: recursive
@@ -1086,7 +1015,7 @@ jobs:
         run: echo "cmake_buildtype=$(echo ${{matrix.buildtype}} | sed 's/.*/\u&/')" >> $GITHUB_ENV
 
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           submodules: recursive
@@ -1260,42 +1189,12 @@ jobs:
   build-windows-msvc:
     name: Build Windows MSVC
     if: github.repository != 'strawberrymusicplayer/strawberry-private' && github.ref != 'refs/heads/l10n_master'
+    runs-on: windows-2022
     strategy:
       fail-fast: false
       matrix:
-       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}}
-
+        arch: [ 'x86', 'x86_64' ]
+        buildtype: [ 'release' ]
     steps:
 
       - name: Set prefix path
@@ -1309,20 +1208,6 @@ 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
@@ -1351,9 +1236,7 @@ jobs:
 
       - name: Copy bin files
         shell: bash
-        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
+        run: cp /c/strawberry/c/bin/{patch.exe,strip.exe,strings.exe,objdump.exe} ${{env.prefix_path_unix}}/bin
 
       - name: Delete conflicting files
         shell: bash
@@ -1407,11 +1290,11 @@ jobs:
         uses: ilammy/msvc-dev-cmd@v1
         with:
           arch: ${{matrix.arch}}
-          sdk: ${{env.sdk_version}}
+          sdk: 10.0.20348.0
           vsversion: 2022
 
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           submodules: recursive
@@ -1424,18 +1307,15 @@ jobs:
         shell: cmd
         run: cmake -E make_directory build
 
-      - name: Set ENABLE_WIN32_CONSOLE
+      - name: Set ENABLE_WIN32_CONSOLE (debug)
+        if: matrix.buildtype == 'debug'
         shell: bash
-        run: echo "enable_win32_console=$(test "${{matrix.buildtype}}" = "debug" && echo "ON" || echo "OFF")" >> $GITHUB_ENV
+        run: echo "win32_console=ON" >> $GITHUB_ENV
 
-      - name: Set ENABLE_SPOTIFY
+      - name: Set ENABLE_WIN32_CONSOLE (release)
+        if: matrix.buildtype == 'release'
         shell: bash
-        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
+        run: echo "win32_console=OFF" >> $GITHUB_ENV
 
       - name: Run CMake
         shell: cmd
@@ -1447,14 +1327,14 @@ jobs:
           -DCMAKE_BUILD_TYPE="${{env.cmake_buildtype}}"
           -DCMAKE_PREFIX_PATH="${{env.prefix_path_forwardslash}}/lib/cmake"
           -DARCH="${{matrix.arch}}"
-          -DENABLE_WIN32_CONSOLE=${{env.enable_win32_console}}
+          -DENABLE_WIN32_CONSOLE=${{env.win32_console}}
           -DPKG_CONFIG_EXECUTABLE="${{env.prefix_path_forwardslash}}/bin/pkg-config.exe"
           -DICU_ROOT="${{env.prefix_path_forwardslash}}"
           -DENABLE_GIO=OFF
           -DENABLE_AUDIOCD=OFF
           -DENABLE_MTP=OFF
           -DENABLE_GPOD=OFF
-          -DENABLE_SPOTIFY=${{env.enable_spotify}}
+          -DENABLE_SPOTIFY=ON
 
       - name: Run Make
         shell: cmd
@@ -1644,11 +1524,11 @@ jobs:
           DEBIAN_FRONTEND: noninteractive
         run: sudo apt install -y git rsync
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Download artifacts
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v4
         with:
           path: artifacts
       - name: SSH Setup
@@ -1692,7 +1572,7 @@ jobs:
           DEBIAN_FRONTEND: noninteractive
         run: sudo apt install -y git jq gh
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Show release assets
@@ -1700,7 +1580,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@v7
+        uses: actions/download-artifact@v4
         with:
           path: artifacts
       - name: Add artifacts to release

.gitignore

@@ -1,7 +1,6 @@
 /build
 /bin
 /CMakeLists.txt.user
-/.qtcreator
 /.kdev4
 /strawberry.kdev4
 /.vscode
@@ -13,4 +12,3 @@
 /CMakeSettings.json
 /dist/scripts/maketarball.sh
 /debian/changelog
-_codeql_detected_source_root

.gitmodules

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

3rdparty/README.md

@@ -0,0 +1,11 @@
+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/

3rdparty/discord-rpc/CMakeLists.txt

@@ -1,41 +0,0 @@
-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

@@ -1,19 +0,0 @@
-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

@@ -1,162 +0,0 @@
-# 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

@@ -1,63 +0,0 @@
-/*
- * 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

@@ -1,48 +0,0 @@
-/*
- * 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

@@ -1,160 +0,0 @@
-/*
- * 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

@@ -1,160 +0,0 @@
-/*
- * 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

@@ -1,64 +0,0 @@
-/*
- * 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

@@ -1,37 +0,0 @@
-/*
- * 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

@@ -1,120 +0,0 @@
-/*
- * 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

@@ -1,99 +0,0 @@
-/*
- * 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

@@ -1,165 +0,0 @@
-/*
- * 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

@@ -1,510 +0,0 @@
-/*
- * 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

@@ -1,94 +0,0 @@
-/*
- * 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

@@ -1,168 +0,0 @@
-/*
- * 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

@@ -1,88 +0,0 @@
-/*
- * 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

@@ -1,285 +0,0 @@
-/*
- * 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

@@ -1,213 +0,0 @@
-/*
- * 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/kdsingleapplication/CMakeLists.txt

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

README.md

@@ -1,137 +1,117 @@
-# :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**, originally forked from *Clementine* in 2018.
-It’s written in **C++ using the Qt framework**, designed for **audiophiles and music collectors**.
+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.
 
-![Screenshot of Strawberry Music Player](https://raw.githubusercontent.com/strawberrymusicplayer/strawberry/master/data/screenshot/screenshot.png)
+![Browse](https://raw.githubusercontent.com/strawberrymusicplayer/strawberry/master/data/screenshot/screenshot.png)
 
----
+Resources:
 
-## :globe_with_meridians: 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/
 
-- **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
+### :bangbang: Opening an issue
 
----
+* 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/
 
-## :warning: Opening an Issue
+### :moneybag: Sponsoring
 
-Before creating a new GitHub 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:
 
-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)
 
-Supporting open-source developers helps ensure continued maintenance and improvements.
+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.
 
----
+### :heavy_check_mark: Features
 
-## :white_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
 
-- 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.
 
-:white_check_mark: Tested 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.**
 
-> **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.
+### :heavy_exclamation_mark: Requirements
 
----
+To build Strawberry from source you need the following installed on your system with the additional development packages/headers:
 
-## :gear: Requirements
+* [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, Concurrent, Gui, Widgets, Network, Sql and D-Bus](https://www.qt.io/)
+* [SQLite 3.9 or newer](https://www.sqlite.org)
+* [ALSA (Required on Linux)](https://www.alsa-project.org/)
+* [GStreamer](https://gstreamer.freedesktop.org/)
+* [TagLib 1.12 or higher](https://www.taglib.org/)
+* [ICU](https://unicode-org.github.io/icu/)
+* [KDSingleApplication](https://github.com/KDAB/KDSingleApplication)
 
-To build Strawberry from source, you’ll need:
+Optional dependencies:
 
-**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)
+* 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 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/)
+You should also install the gstreamer plugins base and good, and optionally bad, ugly and libav to support all audio formats.
 
-Also install GStreamer plugins **base**, **good**, and optionally **bad**, **ugly** and **libav** for full codec support.
+### :wrench: Compiling from source
 
----
-
-## :wrench: Build from Source
-
-**Get the code:**
+### Get the code:
 
     git clone --recursive https://github.com/strawberrymusicplayer/strawberry
 
-**Build and install:**
+### Compile and install:
 
     cd strawberry
-    cmake -S . -B build
-    cmake --build build --parallel $(nproc)
-    sudo cmake --install build
+    mkdir build
+    cd build
+    cmake ..
+    make -j $(nproc)
+    sudo make install
 
-For building on Windows with Visual Studio 2022, see: :point_right: https://github.com/strawberrymusicplayer/strawberry-msvc
+To compile on Windows with Visual Studio 2019 or 2022, see https://github.com/strawberrymusicplayer/strawberry-msvc
 
----
-
-## :package: Packaging status
+### :penguin: 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/Version.cmake

@@ -1,6 +1,6 @@
 set(STRAWBERRY_VERSION_MAJOR 1)
 set(STRAWBERRY_VERSION_MINOR 2)
-set(STRAWBERRY_VERSION_PATCH 16)
+set(STRAWBERRY_VERSION_PATCH 6)
 #set(STRAWBERRY_VERSION_PRERELEASE rc1)
 
 set(INCLUDE_GIT_REVISION ON)

data/data.qrc

@@ -12,7 +12,6 @@
         <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,13 +12,9 @@ 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,
@@ -26,9 +22,7 @@ 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,
@@ -92,11 +86,7 @@ CREATE TABLE device_%deviceid_songs (
   musicbrainz_work_id TEXT,
 
   ebur128_integrated_loudness_lufs REAL,
-  ebur128_loudness_range_lu REAL,
-
-  bpm REAL,
-  mood TEXT,
-  initial_key TEXT
+  ebur128_loudness_range_lu REAL
 
 );
 
@@ -104,4 +94,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=6 WHERE ROWID=%deviceid;
+UPDATE devices SET schema_version=5 WHERE ROWID=%deviceid;

data/schema/schema-21.sql

@@ -1,43 +0,0 @@
-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 (21);
+INSERT INTO schema_version (version) VALUES (20);
 
 CREATE TABLE IF NOT EXISTS directories (
   path TEXT NOT NULL,
@@ -20,13 +20,9 @@ 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,
@@ -34,9 +30,7 @@ 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,
@@ -100,24 +94,16 @@ CREATE TABLE IF NOT EXISTS songs (
   musicbrainz_work_id TEXT,
 
   ebur128_integrated_loudness_lufs REAL,
-  ebur128_loudness_range_lu REAL,
-
-  bpm REAL,
-  mood TEXT,
-  initial_key TEXT
+  ebur128_loudness_range_lu REAL
 
 );
 
 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,
@@ -125,9 +111,7 @@ 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,
@@ -191,24 +175,16 @@ CREATE TABLE IF NOT EXISTS subsonic_songs (
   musicbrainz_work_id TEXT,
 
   ebur128_integrated_loudness_lufs REAL,
-  ebur128_loudness_range_lu REAL,
-
-  bpm REAL,
-  mood TEXT,
-  initial_key TEXT
+  ebur128_loudness_range_lu REAL
 
 );
 
 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,
@@ -216,9 +192,7 @@ 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,
@@ -282,24 +256,16 @@ CREATE TABLE IF NOT EXISTS tidal_artists_songs (
   musicbrainz_work_id TEXT,
 
   ebur128_integrated_loudness_lufs REAL,
-  ebur128_loudness_range_lu REAL,
-
-  bpm REAL,
-  mood TEXT,
-  initial_key TEXT
+  ebur128_loudness_range_lu REAL
 
 );
 
 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,
@@ -307,9 +273,7 @@ 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,
@@ -373,24 +337,16 @@ CREATE TABLE IF NOT EXISTS tidal_albums_songs (
   musicbrainz_work_id TEXT,
 
   ebur128_integrated_loudness_lufs REAL,
-  ebur128_loudness_range_lu REAL,
-
-  bpm REAL,
-  mood TEXT,
-  initial_key TEXT
+  ebur128_loudness_range_lu REAL
 
 );
 
 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,
@@ -398,9 +354,7 @@ 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,
@@ -464,24 +418,16 @@ CREATE TABLE IF NOT EXISTS tidal_songs (
   musicbrainz_work_id TEXT,
 
   ebur128_integrated_loudness_lufs REAL,
-  ebur128_loudness_range_lu REAL,
-
-  bpm REAL,
-  mood TEXT,
-  initial_key TEXT
+  ebur128_loudness_range_lu REAL
 
 );
 
 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,
@@ -489,9 +435,7 @@ 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,
@@ -555,24 +499,16 @@ CREATE TABLE IF NOT EXISTS spotify_artists_songs (
   musicbrainz_work_id TEXT,
 
   ebur128_integrated_loudness_lufs REAL,
-  ebur128_loudness_range_lu REAL,
-
-  bpm REAL,
-  mood TEXT,
-  initial_key TEXT
+  ebur128_loudness_range_lu REAL
 
 );
 
 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,
@@ -580,9 +516,7 @@ 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,
@@ -646,24 +580,16 @@ CREATE TABLE IF NOT EXISTS spotify_albums_songs (
   musicbrainz_work_id TEXT,
 
   ebur128_integrated_loudness_lufs REAL,
-  ebur128_loudness_range_lu REAL,
-
-  bpm REAL,
-  mood TEXT,
-  initial_key TEXT
+  ebur128_loudness_range_lu REAL
 
 );
 
 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,
@@ -671,9 +597,7 @@ 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,
@@ -737,24 +661,16 @@ CREATE TABLE IF NOT EXISTS spotify_songs (
   musicbrainz_work_id TEXT,
 
   ebur128_integrated_loudness_lufs REAL,
-  ebur128_loudness_range_lu REAL,
-
-  bpm REAL,
-  mood TEXT,
-  initial_key TEXT
+  ebur128_loudness_range_lu REAL
 
 );
 
 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,
@@ -762,9 +678,7 @@ 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,
@@ -828,24 +742,16 @@ CREATE TABLE IF NOT EXISTS qobuz_artists_songs (
   musicbrainz_work_id TEXT,
 
   ebur128_integrated_loudness_lufs REAL,
-  ebur128_loudness_range_lu REAL,
-
-  bpm REAL,
-  mood TEXT,
-  initial_key TEXT
+  ebur128_loudness_range_lu REAL
 
 );
 
 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,
@@ -853,9 +759,7 @@ 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,
@@ -919,24 +823,16 @@ CREATE TABLE IF NOT EXISTS qobuz_albums_songs (
   musicbrainz_work_id TEXT,
 
   ebur128_integrated_loudness_lufs REAL,
-  ebur128_loudness_range_lu REAL,
-
-  bpm REAL,
-  mood TEXT,
-  initial_key TEXT
+  ebur128_loudness_range_lu REAL
 
 );
 
 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,
@@ -944,9 +840,7 @@ 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,
@@ -1010,11 +904,7 @@ CREATE TABLE IF NOT EXISTS qobuz_songs (
   musicbrainz_work_id TEXT,
 
   ebur128_integrated_loudness_lufs REAL,
-  ebur128_loudness_range_lu REAL,
-
-  bpm REAL,
-  mood TEXT,
-  initial_key TEXT
+  ebur128_loudness_range_lu REAL
 
 );
 
@@ -1041,13 +931,9 @@ 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,
@@ -1055,9 +941,7 @@ 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,
@@ -1121,11 +1005,7 @@ CREATE TABLE IF NOT EXISTS playlist_items (
   musicbrainz_work_id TEXT,
 
   ebur128_integrated_loudness_lufs REAL,
-  ebur128_loudness_range_lu REAL,
-
-  bpm REAL,
-  mood TEXT,
-  initial_key TEXT
+  ebur128_loudness_range_lu REAL
 
 );
 
@@ -1152,22 +1032,10 @@ 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/control

@@ -15,14 +15,11 @@ Build-Depends: debhelper-compat (= 12),
                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,9 +27,7 @@ Build-Depends: debhelper-compat (= 12),
                libmtp-dev,
                libchromaprint-dev,
                libfftw3-dev,
-               libebur128-dev,
-               libsparsehash-dev,
-               rapidjson-dev
+               libebur128-dev
 Standards-Version: 4.7.0
 
 Package: strawberry
@@ -60,11 +55,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
-  - Lyrics from multiple sources
+  - Song lyrics from Genius, Musixmatch, ChartLyrics, lyrics.ovh, lololyrics.com, songlyrics.com, azlyrics.com and elyrics.net
   - Audio analyzer
   - Audio equalizer
   - Transfer music to mass-storage USB players, MTP compatible devices and iPod Nano/Classic
-  - Scrobbler with support for Last.fm and ListenBrainz
+  - Scrobbler with support for Last.fm, Libre.fm and ListenBrainz
   - Streaming support for Subsonic-compatible servers
   - Unofficial streaming support for Tidal and Qobuz
  .

debian/rules

@@ -3,10 +3,6 @@
 export DH_VERBOSE=1
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
-override_dh_auto_configure:
-	dh_auto_configure -- \
-	-DBUILD_WERROR=ON
-
 override_dh_installchangelogs:
 	dh_installchangelogs Changelog
 

dist/macos/macversion.sh

@@ -0,0 +1,22 @@
+#!/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>
-# Copyright 2021, Alexey Vazhnov
+# 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://wiki.strawberrymusicplayer.org/wiki/Import_collection_library_and_playlists_from_Clementine
+# Based on https://github.com/strawberrymusicplayer/strawberry/wiki/Import-collection-library-and-playlists-data-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 data** from the Strawberry database!'
-read -r -p 'Do you want to continue? (Only YES is accepted) ' answer
+echo 'This script will **delete all information** from Strawberry database!'
+read -r -p 'Do you want to continue? (the 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,
-   CASE WHEN filename IS NULL THEN '' ELSE filename END,
+   filename,
    filetype,
    filesize,
    mtime,
@@ -162,9 +162,16 @@ 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 = '';
+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;
 
 EOF
 

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

@@ -31,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>Lyrics from multiple sources</li>
+      <li>Song lyrics from Genius, Musixmatch, ChartLyrics, lyrics.ovh, lololyrics.com, songlyrics.com, azlyrics.com and elyrics.net</li>
       <li>Audio analyzer and equalizer</li>
       <li>Transfer music to mass-storage USB players, MTP compatible devices and iPod Nano/Classic</li>
-      <li>Scrobbler with support for Last.fm and ListenBrainz</li>
+      <li>Scrobbler with support for Last.fm, Libre.fm and ListenBrainz</li>
       <li>Streaming support for Subsonic-compatible servers</li>
       <li>Unofficial streaming support for Tidal, Spotify and Qobuz</li>
     </ul>
@@ -51,16 +51,6 @@
   </screenshots>
   <update_contact>eclipseo@fedoraproject.org</update_contact>
     <releases>
-        <release version="1.2.16" date="2025-12-16"/>
-        <release version="1.2.15" date="2025-11-25"/>
-        <release version="1.2.14" date="2025-10-25"/>
-        <release version="1.2.13" date="2025-08-31"/>
-        <release version="1.2.12" date="2025-08-12"/>
-        <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"/>

dist/unix/org.strawberrymusicplayer.strawberry.desktop

@@ -13,7 +13,8 @@ TryExec=strawberry
 Icon=strawberry
 Terminal=false
 Categories=AudioVideo;Player;Qt;Audio;
-Keywords=Audio;Player;Clementine;
+Keywords=Audio;Player;
+StartupNotify=false
 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.1

@@ -29,7 +29,9 @@ Features:
 .br
 - Album cover art from Last.fm, Musicbrainz, Discogs, Musixmatch, Deezer, Tidal, Qobuz and Spotify
 .br
-- Lyrics from multiple sources
+- Song lyrics from Lyrics.com, Genius, Musixmatch, ChartLyrics, lyrics.ovh and lololyrics.com
+.br
+- Support for multiple backends
 .br
 - Audio analyzer
 .br
@@ -37,7 +39,7 @@ Features:
 .br
 - Transfer music to mass-storage USB players, MTP compatible devices and iPod Nano/Classic
 .br
-- Scrobbler with support for Last.fm and ListenBrainz
+- Scrobbler with support for Last.fm, Libre.fm and ListenBrainz
 .br
 - Streaming support for Subsonic-compatible servers
 .br

dist/unix/strawberry.spec.in

@@ -63,14 +63,8 @@ BuildRequires:  pkgconfig(libcdio)
 BuildRequires:  pkgconfig(libebur128)
 BuildRequires:  pkgconfig(libgpod-1.0)
 BuildRequires:  pkgconfig(libmtp)
-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}
 Requires:  qt6-sql-sqlite
@@ -93,15 +87,16 @@ 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
-  - Lyrics from multiple sources
+  - Song lyrics from Genius, Musixmatch, ChartLyrics, lyrics.ovh, lololyrics.com, songlyrics.com, azlyrics.com and elyrics.net
+  - Support for multiple backends
   - Audio analyzer
   - Audio equalizer
-  - Scrobbler with support for Last.fm and ListenBrainz
+  - Scrobbler with support for Last.fm, Libre.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} && 0%{?suse_version} < 1600
+%if 0%{?suse_version}
 %debug_package
 %endif
 

dist/windows/strawberry.nsi.in

@@ -21,10 +21,6 @@
   !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
@@ -35,10 +31,6 @@
   !define arch "x64"
 !endif
 
-!ifdef arch_arm64
-  !define arch "arm64"
-!endif
-
 
 !if "@CMAKE_BUILD_TYPE@" == "Release"
   !define release
@@ -46,8 +38,6 @@
   !define release
 !else if "@CMAKE_BUILD_TYPE@" == "Debug"
   !define debug
-!else
-  !error "Missing CMAKE_BUILD_TYPE"
 !endif
 
 !ifdef release
@@ -80,7 +70,7 @@
   !ifdef arch_x86
     !define PRODUCT_INSTALL_DIR "$PROGRAMFILES\Strawberry Music Player Debug"
   !endif
-  !ifdef arch_x64 || arch_arm64
+  !ifdef arch_x64
     !define PRODUCT_INSTALL_DIR "$PROGRAMFILES64\Strawberry Music Player Debug"
   !endif
 !else
@@ -90,7 +80,7 @@
   !ifdef arch_x86
     !define PRODUCT_INSTALL_DIR "$PROGRAMFILES\Strawberry Music Player"
   !endif
-  !ifdef arch_x64 || arch_arm64
+  !ifdef arch_x64
     !define PRODUCT_INSTALL_DIR "$PROGRAMFILES64\Strawberry Music Player"
   !endif
 !endif
@@ -224,7 +214,7 @@ Function InstallMSVCRuntime
   ; ${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 /norestart'
+    ExecWait '"$TEMP\${vc_redist_file}" /install /passive'
     Delete "$TEMP\${vc_redist_file}"
     SetDetailsView show
   ; ${EndIf}
@@ -269,7 +259,7 @@ Section "Strawberry" Strawberry
   File "libssl-3-x64.dll"
 !endif
 
-  File "libFLAC-14.dll"
+  File "libFLAC-12.dll"
   File "libbrotlicommon.dll"
   File "libbrotlidec.dll"
   File "libbrotlienc.dll"
@@ -377,10 +367,6 @@ 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 "brotlicommon.dll"
@@ -395,6 +381,7 @@ Section "Strawberry" Strawberry
   File "glib-2.0-0.dll"
   File "gme.dll"
   File "gmodule-2.0-0.dll"
+  File "gnutls.dll"
   File "gobject-2.0-0.dll"
   File "gstadaptivedemux-1.0-0.dll"
   File "gstapp-1.0-0.dll"
@@ -415,11 +402,14 @@ 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"
@@ -437,11 +427,6 @@ Section "Strawberry" Strawberry
   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"
@@ -449,10 +434,8 @@ Section "Strawberry" Strawberry
   File "libspeex.dll"
   File "pcre2-8.dll"
   File "pcre2-16.dll"
-  File "zlib1.dll"
-!ifndef arch_arm64
   File "twolame.dll"
-!endif
+  File "zlib.dll"
 !endif
 !ifdef debug
   File "freetyped.dll"
@@ -461,10 +444,8 @@ Section "Strawberry" Strawberry
   File "libspeexd.dll"
   File "pcre2-8d.dll"
   File "pcre2-16d.dll"
-  File "zlibd1.dll"
-!ifndef arch_arm64
   File "twolamed.dll"
-!endif
+  File "zlibd.dll"
 !endif
 
   ; Used by libfftw3-3.dll because fftw is compiled with MinGW.
@@ -477,15 +458,11 @@ Section "Strawberry" Strawberry
 
   ; Common files
 
-  File "icudt78.dll"
-!ifdef msvc && arch_arm64
-  File "fftw3.dll"
-!else
+  File "icudt76.dll"
   File "libfftw3-3.dll"
-!endif
 !ifdef msvc && debug
-  File "icuin78d.dll"
-  File "icuuc78d.dll"
+  File "icuin76d.dll"
+  File "icuuc76d.dll"
   File "libxml2d.dll"
   File "Qt6Concurrentd.dll"
   File "Qt6Cored.dll"
@@ -494,8 +471,8 @@ Section "Strawberry" Strawberry
   File "Qt6Sqld.dll"
   File "Qt6Widgetsd.dll"
 !else
-  File "icuin78.dll"
-  File "icuuc78.dll"
+  File "icuin76.dll"
+  File "icuuc76.dll"
   File "libxml2.dll"
   File "Qt6Concurrent.dll"
   File "Qt6Core.dll"
@@ -505,7 +482,6 @@ Section "Strawberry" Strawberry
   File "Qt6Widgets.dll"
 !endif
 
-!ifdef msvc && arch_x86
   File "avcodec-61.dll"
   File "avfilter-10.dll"
   File "avformat-61.dll"
@@ -513,14 +489,6 @@ 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
@@ -558,13 +526,11 @@ 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
-!ifdef arch_arm64
-  File "/oname=gioopenssl.dll" "gio-modules\gioopenssl.dll"
-!else
   File "/oname=giognutls.dll" "gio-modules\giognutls.dll"
-!endif
+  File "/oname=gioopenssl.dll" "gio-modules\gioopenssl.dll"
 !endif
 SectionEnd
 
@@ -630,7 +596,6 @@ 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"
@@ -681,7 +646,6 @@ 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"
@@ -709,6 +673,7 @@ 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"
@@ -741,6 +706,7 @@ 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"
@@ -752,10 +718,6 @@ 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
@@ -821,7 +783,7 @@ Section "Uninstall"
   Delete "$INSTDIR\libssl-3-x64.dll"
 !endif
 
-  Delete "$INSTDIR\libFLAC-14.dll"
+  Delete "$INSTDIR\libFLAC-12.dll"
   Delete "$INSTDIR\libbrotlicommon.dll"
   Delete "$INSTDIR\libbrotlidec.dll"
   Delete "$INSTDIR\libbrotlienc.dll"
@@ -929,10 +891,6 @@ 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\brotlicommon.dll"
@@ -947,6 +905,7 @@ Section "Uninstall"
   Delete "$INSTDIR\glib-2.0-0.dll"
   Delete "$INSTDIR\gme.dll"
   Delete "$INSTDIR\gmodule-2.0-0.dll"
+  Delete "$INSTDIR\gnutls.dll"
   Delete "$INSTDIR\gobject-2.0-0.dll"
   Delete "$INSTDIR\gstadaptivedemux-1.0-0.dll"
   Delete "$INSTDIR\gstapp-1.0-0.dll"
@@ -967,11 +926,14 @@ 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"
@@ -989,11 +951,6 @@ Section "Uninstall"
   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"
@@ -1001,10 +958,8 @@ 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"
-!endif
+  Delete "$INSTDIR\zlib.dll"
 !endif
 !ifdef debug
   Delete "$INSTDIR\freetyped.dll"
@@ -1013,10 +968,8 @@ 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"
-!endif
+  Delete "$INSTDIR\zlibd.dll"
 !endif
 
 !ifdef arch_x86
@@ -1028,15 +981,11 @@ Section "Uninstall"
 
   ; Common files
 
-  Delete "$INSTDIR\icudt78.dll"
-!ifdef msvc && arch_arm64
-  Delete "$INSTDIR\fftw3.dll"
-!else
+  Delete "$INSTDIR\icudt76.dll"
   Delete "$INSTDIR\libfftw3-3.dll"
-!endif
 !ifdef msvc && debug
-  Delete "$INSTDIR\icuin78d.dll"
-  Delete "$INSTDIR\icuuc78d.dll"
+  Delete "$INSTDIR\icuin76d.dll"
+  Delete "$INSTDIR\icuuc76d.dll"
   Delete "$INSTDIR\libxml2d.dll"
   Delete "$INSTDIR\Qt6Concurrentd.dll"
   Delete "$INSTDIR\Qt6Cored.dll"
@@ -1045,8 +994,8 @@ Section "Uninstall"
   Delete "$INSTDIR\Qt6Sqld.dll"
   Delete "$INSTDIR\Qt6Widgetsd.dll"
 !else
-  Delete "$INSTDIR\icuin78.dll"
-  Delete "$INSTDIR\icuuc78.dll"
+  Delete "$INSTDIR\icuin76.dll"
+  Delete "$INSTDIR\icuuc76.dll"
   Delete "$INSTDIR\libxml2.dll"
   Delete "$INSTDIR\Qt6Concurrent.dll"
   Delete "$INSTDIR\Qt6Core.dll"
@@ -1056,7 +1005,6 @@ 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"
@@ -1064,24 +1012,14 @@ Section "Uninstall"
   Delete "$INSTDIR\postproc-58.dll"
   Delete "$INSTDIR\swresample-5.dll"
   Delete "$INSTDIR\swscale-8.dll"
-!else
-  Delete "$INSTDIR\avcodec-62.dll"
-  Delete "$INSTDIR\avfilter-11.dll"
-  Delete "$INSTDIR\avformat-62.dll"
-  Delete "$INSTDIR\avutil-60.dll"
-  Delete "$INSTDIR\swresample-6.dll"
-  Delete "$INSTDIR\swscale-9.dll"
-!endif
 
 !ifdef mingw
   Delete "$INSTDIR\gio-modules\libgiognutls.dll"
+  Delete "$INSTDIR\gio-modules\libgioopenssl.dll"
 !endif
 !ifdef msvc
-!ifdef arch_arm64
-  Delete "$INSTDIR\gio-modules\gioopenssl.dll"
-!else
   Delete "$INSTDIR\gio-modules\giognutls.dll"
-!endif
+  Delete "$INSTDIR\gio-modules\gioopenssl.dll"
 !endif
 
 !ifdef msvc && debug
@@ -1114,7 +1052,6 @@ 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"
@@ -1165,7 +1102,6 @@ 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"
@@ -1195,6 +1131,7 @@ 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"
@@ -1227,6 +1164,7 @@ 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"
@@ -1238,14 +1176,9 @@ 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
+!ifdef arch_x64
   Delete "$INSTDIR\gstreamer-plugins\gstspotify.dll"
 !endif
-
 !endif ; msvc
 
   Delete "$INSTDIR\Uninstall.exe"

org.freedesktop.Avahi.EntryGroup.xml

@@ -1,101 +0,0 @@
-<?xml version="1.0" standalone='no'?><!--*-nxml-*-->
-<?xml-stylesheet type="text/xsl" href="introspect.xsl"?>
-<!DOCTYPE node SYSTEM "introspect.dtd">
-
-<!--
-  This file is part of avahi.
-
-  avahi is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License as
-  published by the Free Software Foundation; either version 2 of the
-  License, or (at your option) any later version.
-
-  avahi 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 Lesser General Public
-  License along with avahi; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-  02111-1307 USA.
--->
-
-<node>
-
-  <interface name="org.freedesktop.DBus.Introspectable">
-    <method name="Introspect">
-      <arg name="data" type="s" direction="out"/>
-    </method>
-  </interface>
-
-  <interface name="org.freedesktop.Avahi.EntryGroup">
-    <method name="Free"/>
-    <method name="Commit"/>
-    <method name="Reset"/>
-
-    <method name="GetState">
-      <arg name="state" type="i" direction="out"/>
-    </method>
-
-    <signal name="StateChanged">
-      <arg name="state" type="i"/>
-      <arg name="error" type="s"/>
-    </signal>
-
-    <method name="IsEmpty">
-      <arg name="empty" type="b" direction="out"/>
-    </method>
-
-    <method name="AddService">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-      <arg name="name" type="s" direction="in"/>
-      <arg name="type" type="s" direction="in"/>
-      <arg name="domain" type="s" direction="in"/>
-      <arg name="host" type="s" direction="in"/>
-      <arg name="port" type="q" direction="in"/>
-      <arg name="txt" type="aay" direction="in"/>
-    </method>
-
-    <method name="AddServiceSubtype">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-      <arg name="name" type="s" direction="in"/>
-      <arg name="type" type="s" direction="in"/>
-      <arg name="domain" type="s" direction="in"/>
-      <arg name="subtype" type="s" direction="in"/>
-    </method>
-
-    <method name="UpdateServiceTxt">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-      <arg name="name" type="s" direction="in"/>
-      <arg name="type" type="s" direction="in"/>
-      <arg name="domain" type="s" direction="in"/>
-      <arg name="txt" type="aay" direction="in"/>
-    </method>
-
-    <method name="AddAddress">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-      <arg name="name" type="s" direction="in"/>
-      <arg name="address" type="s" direction="in"/>
-    </method>
-
-    <method name="AddRecord">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-      <arg name="name" type="s" direction="in"/>
-      <arg name="clazz" type="q" direction="in"/>
-      <arg name="type" type="q" direction="in"/>
-      <arg name="ttl" type="u" direction="in"/>
-      <arg name="rdata" type="ay" direction="in"/>
-    </method>
-  </interface>
-</node>

org.freedesktop.Avahi.Server.xml

@@ -1,405 +0,0 @@
-<?xml version="1.0" standalone='no'?><!--*-nxml-*-->
-<?xml-stylesheet type="text/xsl" href="introspect.xsl"?>
-<!DOCTYPE node SYSTEM "introspect.dtd">
-
-<!--
-  This file is part of avahi.
-
-  avahi is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License as
-  published by the Free Software Foundation; either version 2 of the
-  License, or (at your option) any later version.
-
-  avahi 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 Lesser General Public
-  License along with avahi; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-  02111-1307 USA.
--->
-
-<node>
-
- <interface name="org.freedesktop.DBus.Introspectable">
-    <method name="Introspect">
-      <arg name="data" type="s" direction="out"/>
-    </method>
-  </interface>
-
-  <interface name="org.freedesktop.Avahi.Server">
-
-    <method name="GetVersionString">
-      <arg name="version" type="s" direction="out"/>
-    </method>
-
-    <method name="GetAPIVersion">
-      <arg name="version" type="u" direction="out"/>
-    </method>
-
-    <method name="GetHostName">
-      <arg name="name" type="s" direction="out"/>
-    </method>
-    <method name="SetHostName">
-      <arg name="name" type="s" direction="in"/>
-    </method>
-    <method name="GetHostNameFqdn">
-      <arg name="name" type="s" direction="out"/>
-    </method>
-    <method name="GetDomainName">
-      <arg name="name" type="s" direction="out"/>
-    </method>
-
-    <method name="IsNSSSupportAvailable">
-      <arg name="yes" type="b" direction="out"/>
-    </method>
-
-    <method name="GetState">
-      <arg name="state" type="i" direction="out"/>
-    </method>
-
-    <signal name="StateChanged">
-      <arg name="state" type="i"/>
-      <arg name="error" type="s"/>
-    </signal>
-
-    <method name="GetLocalServiceCookie">
-      <arg name="cookie" type="u" direction="out"/>
-    </method>
-
-    <method name="GetAlternativeHostName">
-      <arg name="name" type="s" direction="in"/>
-      <arg name="name" type="s" direction="out"/>
-    </method>
-
-    <method name="GetAlternativeServiceName">
-      <arg name="name" type="s" direction="in"/>
-      <arg name="name" type="s" direction="out"/>
-    </method>
-
-    <method name="GetNetworkInterfaceNameByIndex">
-      <arg name="index" type="i" direction="in"/>
-      <arg name="name" type="s" direction="out"/>
-    </method>
-    <method name="GetNetworkInterfaceIndexByName">
-      <arg name="name" type="s" direction="in"/>
-      <arg name="index" type="i" direction="out"/>
-    </method>
-
-    <method name="ResolveHostName">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="name" type="s" direction="in"/>
-      <arg name="aprotocol" type="i" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="interface" type="i" direction="out"/>
-      <arg name="protocol" type="i" direction="out"/>
-      <arg name="name" type="s" direction="out"/>
-      <arg name="aprotocol" type="i" direction="out"/>
-      <arg name="address" type="s" direction="out"/>
-      <arg name="flags" type="u" direction="out"/>
-    </method>
-
-    <method name="ResolveAddress">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="address" type="s" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="interface" type="i" direction="out"/>
-      <arg name="protocol" type="i" direction="out"/>
-      <arg name="aprotocol" type="i" direction="out"/>
-      <arg name="address" type="s" direction="out"/>
-      <arg name="name" type="s" direction="out"/>
-      <arg name="flags" type="u" direction="out"/>
-    </method>
-
-    <method name="ResolveService">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="name" type="s" direction="in"/>
-      <arg name="type" type="s" direction="in"/>
-      <arg name="domain" type="s" direction="in"/>
-      <arg name="aprotocol" type="i" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="interface" type="i" direction="out"/>
-      <arg name="protocol" type="i" direction="out"/>
-      <arg name="name" type="s" direction="out"/>
-      <arg name="type" type="s" direction="out"/>
-      <arg name="domain" type="s" direction="out"/>
-      <arg name="host" type="s" direction="out"/>
-      <arg name="aprotocol" type="i" direction="out"/>
-      <arg name="address" type="s" direction="out"/>
-      <arg name="port" type="q" direction="out"/>
-      <arg name="txt" type="aay" direction="out"/>
-      <arg name="flags" type="u" direction="out"/>
-    </method>
-
-    <method name="EntryGroupNew">
-      <arg name="path" type="o" direction="out"/>
-    </method>
-
-    <method name="DomainBrowserNew">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="domain" type="s" direction="in"/>
-      <arg name="btype" type="i" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="path" type="o" direction="out"/>
-    </method>
-
-    <method name="ServiceTypeBrowserNew">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="domain" type="s" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="path" type="o" direction="out"/>
-    </method>
-
-    <method name="ServiceBrowserNew">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="type" type="s" direction="in"/>
-      <arg name="domain" type="s" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="path" type="o" direction="out"/>
-    </method>
-
-    <method name="ServiceResolverNew">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="name" type="s" direction="in"/>
-      <arg name="type" type="s" direction="in"/>
-      <arg name="domain" type="s" direction="in"/>
-      <arg name="aprotocol" type="i" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="path" type="o" direction="out"/>
-    </method>
-
-    <method name="HostNameResolverNew">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="name" type="s" direction="in"/>
-      <arg name="aprotocol" type="i" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="path" type="o" direction="out"/>
-    </method>
-
-    <method name="AddressResolverNew">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="address" type="s" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="path" type="o" direction="out"/>
-    </method>
-
-    <method name="RecordBrowserNew">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="name" type="s" direction="in"/>
-      <arg name="clazz" type="q" direction="in"/>
-      <arg name="type" type="q" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="path" type="o" direction="out"/>
-    </method>
-
-  </interface>
-
-  <interface name="org.freedesktop.Avahi.Server2">
-
-    <method name="GetVersionString">
-      <arg name="version" type="s" direction="out"/>
-    </method>
-
-    <method name="GetAPIVersion">
-      <arg name="version" type="u" direction="out"/>
-    </method>
-
-    <method name="GetHostName">
-      <arg name="name" type="s" direction="out"/>
-    </method>
-    <method name="SetHostName">
-      <arg name="name" type="s" direction="in"/>
-    </method>
-    <method name="GetHostNameFqdn">
-      <arg name="name" type="s" direction="out"/>
-    </method>
-    <method name="GetDomainName">
-      <arg name="name" type="s" direction="out"/>
-    </method>
-
-    <method name="IsNSSSupportAvailable">
-      <arg name="yes" type="b" direction="out"/>
-    </method>
-
-    <method name="GetState">
-      <arg name="state" type="i" direction="out"/>
-    </method>
-
-    <signal name="StateChanged">
-      <arg name="state" type="i"/>
-      <arg name="error" type="s"/>
-    </signal>
-
-    <method name="GetLocalServiceCookie">
-      <arg name="cookie" type="u" direction="out"/>
-    </method>
-
-    <method name="GetAlternativeHostName">
-      <arg name="name" type="s" direction="in"/>
-      <arg name="name" type="s" direction="out"/>
-    </method>
-
-    <method name="GetAlternativeServiceName">
-      <arg name="name" type="s" direction="in"/>
-      <arg name="name" type="s" direction="out"/>
-    </method>
-
-    <method name="GetNetworkInterfaceNameByIndex">
-      <arg name="index" type="i" direction="in"/>
-      <arg name="name" type="s" direction="out"/>
-    </method>
-    <method name="GetNetworkInterfaceIndexByName">
-      <arg name="name" type="s" direction="in"/>
-      <arg name="index" type="i" direction="out"/>
-    </method>
-
-    <method name="ResolveHostName">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="name" type="s" direction="in"/>
-      <arg name="aprotocol" type="i" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="interface" type="i" direction="out"/>
-      <arg name="protocol" type="i" direction="out"/>
-      <arg name="name" type="s" direction="out"/>
-      <arg name="aprotocol" type="i" direction="out"/>
-      <arg name="address" type="s" direction="out"/>
-      <arg name="flags" type="u" direction="out"/>
-    </method>
-
-    <method name="ResolveAddress">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="address" type="s" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="interface" type="i" direction="out"/>
-      <arg name="protocol" type="i" direction="out"/>
-      <arg name="aprotocol" type="i" direction="out"/>
-      <arg name="address" type="s" direction="out"/>
-      <arg name="name" type="s" direction="out"/>
-      <arg name="flags" type="u" direction="out"/>
-    </method>
-
-    <method name="ResolveService">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="name" type="s" direction="in"/>
-      <arg name="type" type="s" direction="in"/>
-      <arg name="domain" type="s" direction="in"/>
-      <arg name="aprotocol" type="i" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="interface" type="i" direction="out"/>
-      <arg name="protocol" type="i" direction="out"/>
-      <arg name="name" type="s" direction="out"/>
-      <arg name="type" type="s" direction="out"/>
-      <arg name="domain" type="s" direction="out"/>
-      <arg name="host" type="s" direction="out"/>
-      <arg name="aprotocol" type="i" direction="out"/>
-      <arg name="address" type="s" direction="out"/>
-      <arg name="port" type="q" direction="out"/>
-      <arg name="txt" type="aay" direction="out"/>
-      <arg name="flags" type="u" direction="out"/>
-    </method>
-
-    <method name="EntryGroupNew">
-      <arg name="path" type="o" direction="out"/>
-    </method>
-
-    <method name="DomainBrowserPrepare">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="domain" type="s" direction="in"/>
-      <arg name="btype" type="i" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="path" type="o" direction="out"/>
-    </method>
-
-    <method name="ServiceTypeBrowserPrepare">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="domain" type="s" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="path" type="o" direction="out"/>
-    </method>
-
-    <method name="ServiceBrowserPrepare">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="type" type="s" direction="in"/>
-      <arg name="domain" type="s" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="path" type="o" direction="out"/>
-    </method>
-
-    <method name="ServiceResolverPrepare">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="name" type="s" direction="in"/>
-      <arg name="type" type="s" direction="in"/>
-      <arg name="domain" type="s" direction="in"/>
-      <arg name="aprotocol" type="i" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="path" type="o" direction="out"/>
-    </method>
-
-    <method name="HostNameResolverPrepare">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="name" type="s" direction="in"/>
-      <arg name="aprotocol" type="i" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="path" type="o" direction="out"/>
-    </method>
-
-    <method name="AddressResolverPrepare">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="address" type="s" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="path" type="o" direction="out"/>
-    </method>
-
-    <method name="RecordBrowserPrepare">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="name" type="s" direction="in"/>
-      <arg name="clazz" type="q" direction="in"/>
-      <arg name="type" type="q" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="path" type="o" direction="out"/>
-    </method>
-
-  </interface>
-</node>

src/CMakeLists.txt

@@ -1,2 +1,71 @@
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h)
+
+add_subdirectory(utilities)
+add_subdirectory(core)
+add_subdirectory(mimedata)
+add_subdirectory(osd)
+add_subdirectory(tagreader)
+add_subdirectory(widgets)
+add_subdirectory(dialogs)
+add_subdirectory(engine)
+add_subdirectory(lyrics)
+add_subdirectory(filterparser)
+add_subdirectory(analyzer)
+add_subdirectory(transcoder)
+add_subdirectory(collection)
+add_subdirectory(playlist)
+add_subdirectory(playlistparsers)
+add_subdirectory(equalizer)
+add_subdirectory(edittagdialog)
+add_subdirectory(smartplaylists)
+add_subdirectory(settings)
+add_subdirectory(device)
+add_subdirectory(covermanager)
+add_subdirectory(fileview)
+add_subdirectory(player)
+add_subdirectory(radios)
+add_subdirectory(streaming)
+add_subdirectory(scrobbler)
+add_subdirectory(organize)
+add_subdirectory(context)
+add_subdirectory(queue)
+add_subdirectory(providers)
+add_subdirectory(songloader)
+add_subdirectory(systemtrayicon)
+
+if(HAVE_MUSICBRAINZ)
+  add_subdirectory(musicbrainz)
+endif()
+
+if(HAVE_GLOBALSHORTCUTS)
+  add_subdirectory(globalshortcuts)
+endif()
+
+if(HAVE_MOODBAR)
+  add_subdirectory(moodbar)
+endif()
+
+if(HAVE_MPRIS2)
+  add_subdirectory(mpris2)
+endif()
+
+if(HAVE_SUBSONIC)
+  add_subdirectory(subsonic)
+endif()
+
+if(HAVE_TIDAL)
+  add_subdirectory(tidal)
+endif()
+
+if(HAVE_SPOTIFY)
+  add_subdirectory(spotify)
+endif()
+
+if(HAVE_QOBUZ)
+  add_subdirectory(qobuz)
+endif()
+
+if(APPLE)
+  add_subdirectory(macstartup)
+endif()

src/analyzer/CMakeLists.txt

@@ -0,0 +1,41 @@
+set(ANALYZER_SOURCES
+  fht.cpp
+  analyzerbase.cpp
+  analyzercontainer.cpp
+  blockanalyzer.cpp
+  boomanalyzer.cpp
+  turbineanalyzer.cpp
+  sonogramanalyzer.cpp
+  waverubberanalyzer.cpp
+  rainbowanalyzer.cpp
+)
+
+set(ANALYZER_HEADERS
+  analyzerbase.h
+  analyzercontainer.h
+  blockanalyzer.h
+  boomanalyzer.h
+  turbineanalyzer.h
+  sonogramanalyzer.h
+  waverubberanalyzer.h
+  rainbowanalyzer.h
+)
+
+qt_wrap_cpp(ANALYZER_SOURCES ${ANALYZER_HEADERS})
+
+add_library(strawberry_analyzer STATIC ${ANALYZER_SOURCES})
+
+target_include_directories(strawberry_analyzer PRIVATE
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/src
+  ${CMAKE_BINARY_DIR}/src
+)
+
+target_link_libraries(strawberry_analyzer PRIVATE
+  Qt${QT_VERSION_MAJOR}::Core
+  Qt${QT_VERSION_MAJOR}::Gui
+  Qt${QT_VERSION_MAJOR}::Widgets
+  strawberry_core
+  strawberry_engine
+)

src/analyzer/analyzerbase.cpp

@@ -18,7 +18,7 @@
 
    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"
 
@@ -100,7 +100,7 @@ void AnalyzerBase::transform(Scope &scope) {
   fht_->logSpectrum(scope.data(), aux.data());
   fht_->scale(scope.data(), 1.0F / 20);
 
-  scope.resize(static_cast<size_t>(fht_->size() / 2));  // second half of values are rubbish
+  scope.resize(fht_->size() / 2);  // second half of values are rubbish
 
 }
 
@@ -112,7 +112,7 @@ void AnalyzerBase::paintEvent(QPaintEvent *e) {
   switch (engine_->state()) {
     case EngineBase::State::Playing:{
       const EngineBase::Scope &thescope = engine_->scope(timeout_);
-      size_t i = 0;
+      int 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) {
@@ -124,7 +124,7 @@ void AnalyzerBase::paintEvent(QPaintEvent *e) {
       transform(lastscope_);
       analyze(p, lastscope_, new_frame_);
 
-      lastscope_.resize(static_cast<size_t>(fht_->size()));
+      lastscope_.resize(fht_->size());
 
       break;
     }
@@ -153,7 +153,7 @@ int AnalyzerBase::resizeExponent(int exp) {
 
   if (exp != fht_->sizeExp()) {
     delete fht_;
-    fht_ = new FHT(static_cast<uint>(exp));
+    fht_ = new FHT(exp);
   }
   return exp;
 

src/analyzer/analyzerbase.h

@@ -18,7 +18,7 @@
 
    You should have received a copy of the GNU General Public License
    along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
- */
+*/
 
 #ifndef ANALYZERBASE_H
 #define ANALYZERBASE_H
@@ -90,3 +90,4 @@ class AnalyzerBase : public QWidget {
 };
 
 #endif  // ANALYZERBASE_H
+

src/analyzer/analyzercontainer.cpp

@@ -15,7 +15,7 @@
 
    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"
 
@@ -61,7 +61,7 @@ constexpr int kLowFramerate = 20;
 constexpr int kMediumFramerate = 25;
 constexpr int kHighFramerate = 30;
 constexpr int kSuperHighFramerate = 60;
-}  // namespace
+} // namespace
 
 AnalyzerContainer::AnalyzerContainer(QWidget *parent)
     : QWidget(parent),

src/analyzer/analyzercontainer.h

@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public License
    along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
- */
+*/
 
 #ifndef ANALYZERCONTAINER_H
 #define ANALYZERCONTAINER_H
@@ -101,7 +101,8 @@ void AnalyzerContainer::AddAnalyzerType() {
   group_->addAction(action);
   action->setCheckable(true);
   actions_ << action;
-  QObject::connect(action, &QAction::triggered, [this, id]() { ChangeAnalyzer(id); });
+  QObject::connect(action, &QAction::triggered, [this, id]() { ChangeAnalyzer(id); } );
+
 }
 
 #endif  // ANALYZERCONTAINER_H

src/analyzer/blockanalyzer.cpp

@@ -19,7 +19,7 @@
    You should have received a copy of the GNU General Public License
    along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
 
- */
+*/
 
 #include "blockanalyzer.h"
 
@@ -61,12 +61,11 @@ BlockAnalyzer::BlockAnalyzer(QWidget *parent)
       fade_intensity_(1 << 8, 32),
       step_(0) {
 
-  setMinimumSize(kMinColumns * (kWidth + 1) - 1, kMinRows * (kHeight + 1) - 1);  // -1 is padding, no drawing takes place there
+  setMinimumSize(kMinColumns * (kWidth + 1) - 1, kMinRows * (kHeight + 1) - 1);  //-1 is padding, no drawing takes place there
   setMaximumWidth(kMaxColumns * (kWidth + 1) - 1);
 
   // 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) {
@@ -86,7 +85,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(static_cast<size_t>(columns_));
+  scope_.resize(columns_);
 
   if (rows_ != oldRows) {
     barpixmap_ = QPixmap(kWidth, rows_ * (kHeight + 1));
@@ -166,9 +165,9 @@ void BlockAnalyzer::analyze(QPainter &p, const Scope &s, const bool new_frame) {
   // Paint the background
   canvas_painter.drawPixmap(0, 0, background_);
 
-  for (qint64 x = 0, y = 0; x < static_cast<qint64>(scope_.size()); ++x) {
+  for (int x = 0, y = 0; x < static_cast<int>(scope_.size()); ++x) {
     // determine y
-    for (y = 0; scope_[static_cast<quint64>(x)] < yscale_.at(y); ++y);
+    for (y = 0; scope_[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)) {
@@ -176,13 +175,13 @@ void BlockAnalyzer::analyze(QPainter &p, const Scope &s, const bool new_frame) {
       y = static_cast<int>(store_.value(x));
     }
     else {
-      store_[x] = static_cast<double>(y);
+      store_[x] = 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] = static_cast<int>(y);
+      fade_pos_[x] = y;
       fade_intensity_[x] = kFadeSize;
     }
 
@@ -190,13 +189,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(static_cast<int>(x) * (kWidth + 1), y2, fade_bars_[offset], 0, 0, kWidth, height() - y2);
+      canvas_painter.drawPixmap(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(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());
+    canvas_painter.drawPixmap(x * (kWidth + 1), y * (kHeight + 1) + y_, *bar(), 0, y * (kHeight + 1), bar()->width(), bar()->height());
   }
 
   for (int x = 0; x < store_.size(); ++x) {
@@ -238,7 +237,7 @@ static inline void adjustToLimits(const int b, int &f, int &amount) {
  * Clever contrast function
  *
  * It will try to adjust the foreground color such that it contrasts well with
- * the background
+ *the background
  * It won't modify the hue of fg unless absolutely necessary
  * @return the adjusted form of fg
  */

src/analyzer/blockanalyzer.h

@@ -19,7 +19,7 @@
    You should have received a copy of the GNU General Public License
    along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
 
- */
+*/
 
 #ifndef BLOCKANALYZER_H
 #define BLOCKANALYZER_H
@@ -41,14 +41,14 @@ class BlockAnalyzer : public AnalyzerBase {
   Q_OBJECT
 
  public:
-  Q_INVOKABLE explicit BlockAnalyzer(QWidget *parent);
+  Q_INVOKABLE explicit BlockAnalyzer(QWidget*);
 
   static const char *kName;
 
  protected:
-  void transform(Scope &s) override;
+  void transform(Scope&) override;
   void analyze(QPainter &p, const Scope &s, const bool new_frame) override;
-  void resizeEvent(QResizeEvent *e) override;
+  void resizeEvent(QResizeEvent*) override;
   virtual void paletteChange(const QPalette &_palette);
   void framerateChanged() override;
 

src/analyzer/boomanalyzer.cpp

@@ -20,7 +20,7 @@
    You should have received a copy of the GNU General Public License
    along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
 
- */
+*/
 
 #include "boomanalyzer.h"
 
@@ -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(static_cast<size_t>(bands_));
+  scope_.resize(bands_);
 
   F_ = static_cast<double>(HEIGHT) / (log10(256) * 1.1 /*<- max. amplitude*/);
 
@@ -112,19 +112,17 @@ void BoomAnalyzer::analyze(QPainter &p, const Scope &scope, const bool new_frame
     return;
   }
 
-  const uint MAX_HEIGHT = static_cast<uint>(height() - 1);
+  const uint MAX_HEIGHT = height() - 1;
 
   QPainter canvas_painter(&canvas_);
   canvas_.fill(palette().color(QPalette::Window));
 
   interpolate(scope, scope_);
 
-  int x = 0;
-  int y = 0;
-  for (size_t i = 0; i < static_cast<size_t>(bands_); ++i, x += kColumnWidth + 1) {
+  for (int i = 0, x = 0, y = 0; i < bands_; ++i, x += kColumnWidth + 1) {
     double h = log10(scope_[i] * 256.0) * F_;
 
-    h = std::min(h, static_cast<double>(MAX_HEIGHT));
+    if (h > MAX_HEIGHT) h = MAX_HEIGHT;
 
     if (h > bar_height_[i]) {
       bar_height_[i] = h;
@@ -140,17 +138,17 @@ 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
-        bar_height_[i] = std::max(0.0, bar_height_[i]);
+        if (bar_height_[i] < 0.0) bar_height_[i] = 0.0;
       }
 
-      peak_handling:
+    peak_handling:
 
       if (peak_height_[i] > 0.0) {
         peak_height_[i] -= peak_speed_[i];
         peak_speed_[i] *= F_peakSpeed_;  // 1.12
 
-        peak_height_[i] = std::max(bar_height_[i], bar_height_[i]);
-        peak_height_[i] = std::max(0.0, peak_height_[i]);
+        if (peak_height_[i] < bar_height_[i]) peak_height_[i] = bar_height_[i];
+        if (peak_height_[i] < 0.0) peak_height_[i] = 0.0;
       }
     }
 

src/analyzer/boomanalyzer.h

@@ -20,7 +20,7 @@
    You should have received a copy of the GNU General Public License
    along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
 
- */
+*/
 
 #ifndef BOOMANALYZER_H
 #define BOOMANALYZER_H
@@ -40,7 +40,7 @@ class BoomAnalyzer : public AnalyzerBase {
   Q_OBJECT
 
  public:
-  Q_INVOKABLE explicit BoomAnalyzer(QWidget *parent);
+  Q_INVOKABLE explicit BoomAnalyzer(QWidget*);
 
   static const char *kName;
 
@@ -70,6 +70,7 @@ class BoomAnalyzer : public AnalyzerBase {
 
   QPixmap barPixmap_;
   QPixmap canvas_;
+
 };
 
 #endif  // BOOMANALYZER_H

src/analyzer/fht.cpp

@@ -18,7 +18,7 @@
 
    You should have received a copy of the GNU General Public License
    along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
- */
+*/
 
 #include "fht.h"
 

src/analyzer/fht.h

@@ -18,7 +18,7 @@
 
    You should have received a copy of the GNU General Public License
    along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
- */
+*/
 
 #ifndef FHT_H
 #define FHT_H
@@ -55,20 +55,20 @@ class FHT {
   /**
    * Recursive in-place Hartley transform. For internal use only!
    */
-  void _transform(float *p, int n, int k);
+  void _transform(float*, int, int);
 
  public:
   /**
-   * Prepare transform for data sets with @f$2^n@f$ numbers, whereby @f$n@f$
-   * should be at least 3. Values of more than 3 need a trigonometry table.
-   * @see makeCasTable()
-   */
+  * Prepare transform for data sets with @f$2^n@f$ numbers, whereby @f$n@f$
+  * should be at least 3. Values of more than 3 need a trigonometry table.
+  * @see makeCasTable()
+  */
   explicit FHT(uint);
 
   ~FHT();
   int sizeExp() const;
   int size() const;
-  void scale(float *p, float d) const;
+  void scale(float*, float) const;
 
   /**
    * Exponentially Weighted Moving Average (EWMA) filter.
@@ -90,12 +90,12 @@ class FHT {
   /**
    * Semi-logarithmic audio spectrum.
    */
-  void semiLogSpectrum(float *p);
+  void semiLogSpectrum(float*);
 
   /**
    * Fourier spectrum.
    */
-  void spectrum(float *p);
+  void spectrum(float*);
 
   /**
    * 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 *p);
+  void power(float*);
 
   /**
    * 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 *p);
+  void power2(float*);
 
   /**
    * Discrete Hartley transform of data sets with 8 values.
    */
-  static void transform8(float *p);
+  static void transform8(float*);
 
-  void transform(float *p);
+  void transform(float*);
 };
 
 #endif  // FHT_H

src/analyzer/rainbowanalyzer.cpp

@@ -21,7 +21,7 @@
 
    You should have received a copy of the GNU General Public License
    along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
- */
+*/
 
 #include "rainbowanalyzer.h"
 
@@ -129,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;
-    size_t sample = 0;
+    int sample = 0;
     for (int band = 0; band < kRainbowBands; ++band) {
       float accumulator = 0.0;
       for (int i = 0; i < samples_per_band; ++i) {

src/analyzer/rainbowanalyzer.h

@@ -21,7 +21,7 @@
 
    You should have received a copy of the GNU General Public License
    along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
- */
+*/
 
 #ifndef RAINBOWANALYZER_H
 #define RAINBOWANALYZER_H
@@ -85,7 +85,7 @@ class RainbowAnalyzer : public AnalyzerBase {
 
  private:
   // "constants" that get initialized in the constructor
-  float band_scale_[kRainbowBands]{};
+  float band_scale_[kRainbowBands] {};
   QPen colors_[kRainbowBands];
 
   // Rainbow Nyancat & Dash
@@ -96,7 +96,7 @@ class RainbowAnalyzer : public AnalyzerBase {
   int frame_;
 
   // The y positions of each point on the rainbow.
-  float history_[kHistorySize * kRainbowBands]{};
+  float history_[kHistorySize * kRainbowBands] {};
 
   // A cache of the last frame's rainbow,
   // so it can be used in the next frame.

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(static_cast<size_t>(fht_->size() / 2));
+  scope.resize(fht_->size() / 2);
 
 }
 
 void SonogramAnalyzer::demo(QPainter &p) {
-  analyze(p, Scope(static_cast<size_t>(fht_->size()), 0), new_frame_);
+  analyze(p, Scope(fht_->size(), 0), new_frame_);
 }

src/analyzer/sonogramanalyzer.h

@@ -19,7 +19,7 @@
 
    You should have received a copy of the GNU General Public License
    along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
- */
+*/
 
 #ifndef SONOGRAMANALYZER_H
 #define SONOGRAMANALYZER_H

src/analyzer/turbineanalyzer.cpp

@@ -20,7 +20,7 @@
 
    You should have received a copy of the GNU General Public License
    along with Clementine.  If not, see <http://www.gnu.org/licenses/>.
- */
+*/
 
 #include "config.h"
 
@@ -43,7 +43,7 @@ void TurbineAnalyzer::analyze(QPainter &p, const Scope &scope, const bool new_fr
     return;
   }
 
-  const uint hd2 = static_cast<uint>(height() / 2);
+  const uint hd2 = height() / 2;
   const uint kMaxHeight = hd2 - 1;
 
   QPainter canvas_painter(&canvas_);
@@ -67,10 +67,10 @@ 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
-        bar_height_[i] = std::max(0.0, bar_height_[i]);
+        if (bar_height_[i] < 0.0) bar_height_[i] = 0.0;
       }
 
-      peak_handling:
+    peak_handling:
       if (peak_height_[i] > 0.0) {
         peak_height_[i] -= peak_speed_[i];
         peak_speed_[i] *= F_peakSpeed_;  // 1.12

src/analyzer/turbineanalyzer.h

@@ -18,7 +18,7 @@
 
    You should have received a copy of the GNU General Public License
    along with Clementine.  If not, see <http://www.gnu.org/licenses/>.
- */
+*/
 
 #ifndef TURBINEANALYZER_H
 #define TURBINEANALYZER_H

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 size_t num_samples = static_cast<size_t>(s.size());
+  const int num_samples = static_cast<int>(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 (size_t i = 0; i < num_samples; ++i) {
+  for (int i = 0; i < num_samples; ++i) {
 
     // Normalize amplitude to 0-1 range
     const float color_factor = amplitude_data[i] / 2.0F + 0.5F;
@@ -88,5 +88,5 @@ void WaveRubberAnalyzer::transform(Scope &scope) {
 }
 
 void WaveRubberAnalyzer::demo(QPainter &p) {
-  analyze(p, Scope(static_cast<size_t>(fht_->size()), 0), new_frame_);
+  analyze(p, Scope(fht_->size(), 0), new_frame_);
 }

src/analyzer/waverubberanalyzer.h

@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License
    along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
- */
+*/
 
 
 #include <QPixmap>

src/avahi/avahi.cpp

@@ -1,114 +0,0 @@
-/*
- * Strawberry Music Player
- * Copyright 2024, Jonas Kvinge <jonas@jkvinge.net>
- *
- * Strawberry is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Strawberry is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include <QByteArray>
-#include <QString>
-#include <QDBusConnection>
-#include <QDBusPendingReply>
-#include <QDBusPendingCallWatcher>
-
-#include "core/logging.h"
-
-#include "avahi.h"
-#include "avahi/avahiserver.h"
-#include "avahi/avahientrygroup.h"
-
-using namespace Qt::StringLiterals;
-
-Avahi::Avahi(QObject *parent) : Zeroconf(parent), port_(0), entry_group_interface_(nullptr) {}
-
-void Avahi::PublishInternal(const QString &domain, const QString &type, const QByteArray &name, quint16 port) {
-
-  domain_ = domain;
-  type_ = type;
-  name_ = name;
-  port_ = port;
-
-  OrgFreedesktopAvahiServerInterface server_interface(u"org.freedesktop.Avahi"_s, u"/"_s, QDBusConnection::systemBus());
-  QDBusPendingReply<QDBusObjectPath> reply = server_interface.EntryGroupNew();
-  QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(reply);
-  QObject::connect(watcher, &QDBusPendingCallWatcher::finished, this, &Avahi::PublishInternalFinished);
-
-}
-
-void Avahi::PublishInternalFinished(QDBusPendingCallWatcher *watcher) {
-
-  const QDBusPendingReply<QDBusObjectPath> path_reply = watcher->reply();
-
-  watcher->deleteLater();
-
-  if (path_reply.isError()) {
-    qLog(Error) << "Failed to create Avahi entry group:" << path_reply.error();
-    qLog(Info) << "This might be because 'disable-user-service-publishing'" << "is set to 'yes' in avahi-daemon.conf";
-    return;
-  }
-
-  AddService(path_reply.reply().path());
-
-}
-
-void Avahi::AddService(const QString &path) {
-
-  entry_group_interface_ = new OrgFreedesktopAvahiEntryGroupInterface(u"org.freedesktop.Avahi"_s, path, QDBusConnection::systemBus());
-  QDBusPendingReply<> reply = entry_group_interface_->AddService(-1, -1, 0, QString::fromUtf8(name_.constData(), name_.size()), type_, domain_, QString(), port_);
-  QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(reply);
-  QObject::connect(watcher, &QDBusPendingCallWatcher::finished, this, &Avahi::AddServiceFinished);
-
-}
-
-void Avahi::AddServiceFinished(QDBusPendingCallWatcher *watcher) {
-
-  const QDBusPendingReply<QDBusObjectPath> path_reply = watcher->reply();
-
-  watcher->deleteLater();
-
-  if (path_reply.isError()) {
-    qLog(Error) << "Failed to add Avahi service:" << path_reply.error();
-    return;
-  }
-
-  Commit();
-
-}
-
-void Avahi::Commit() {
-
-  QDBusPendingReply<> reply = entry_group_interface_->Commit();
-  QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(reply);
-  QObject::connect(watcher, &QDBusPendingCallWatcher::finished, this, &Avahi::CommitFinished);
-
-}
-
-void Avahi::CommitFinished(QDBusPendingCallWatcher *watcher) {
-
-  const QDBusPendingReply<QDBusObjectPath> path_reply = watcher->reply();
-
-  watcher->deleteLater();
-
-  entry_group_interface_->deleteLater();
-  entry_group_interface_ = nullptr;
-
-  if (path_reply.isError()) {
-    qLog(Debug) << "Commit error:" << path_reply.error();
-  }
-  else {
-    qLog(Debug) << "Remote interface published on Avahi";
-  }
-
-}

src/avahi/avahi.h

@@ -1,58 +0,0 @@
-/*
- * Strawberry Music Player
- * Copyright 2024, Jonas Kvinge <jonas@jkvinge.net>
- *
- * Strawberry is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Strawberry is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef AVAHI_H
-#define AVAHI_H
-
-#include <QObject>
-#include <QByteArray>
-#include <QString>
-
-#include "core/zeroconf.h"
-
-class QDBusPendingCallWatcher;
-class OrgFreedesktopAvahiEntryGroupInterface;
-
-class Avahi : public Zeroconf {
-  Q_OBJECT
-
-public:
-  explicit Avahi(QObject *parent = nullptr);
-
- private:
-  void AddService(const QString &path);
-  void Commit();
-
- private Q_SLOTS:
-  void PublishInternalFinished(QDBusPendingCallWatcher *watcher);
-  void AddServiceFinished(QDBusPendingCallWatcher *watcher);
-  void CommitFinished(QDBusPendingCallWatcher *watcher);
-
- protected:
-  virtual void PublishInternal(const QString &domain, const QString &type, const QByteArray &name, quint16 port) override;
-
- private:
-  QString domain_;
-  QString type_;
-  QByteArray name_;
-  quint16 port_;
-  OrgFreedesktopAvahiEntryGroupInterface *entry_group_interface_;
-};
-
-#endif  // AVAHI_H

src/avahi/org.freedesktop.Avahi.EntryGroup.xml

@@ -1,98 +0,0 @@
-<?xml version="1.0" standalone='no'?><!--*-nxml-*-->
-<!DOCTYPE node SYSTEM "introspect.dtd">
-
-<!--
-  This file is part of avahi.
-
-  avahi is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License as
-  published by the Free Software Foundation; either version 2 of the
-  License, or (at your option) any later version.
-
-  avahi 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 Lesser General Public
-  License along with avahi; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-  02111-1307 USA.
--->
-
-<node>
-
-  <interface name="org.freedesktop.DBus.Introspectable">
-    <method name="Introspect">
-      <arg name="data" type="s" direction="out"/>
-    </method>
-  </interface>
-
-  <interface name="org.freedesktop.Avahi.EntryGroup">
-    <method name="Free"/>
-    <method name="Commit"/>
-    <method name="Reset"/>
-
-    <method name="GetState">
-      <arg name="state" type="i" direction="out"/>
-    </method>
-
-    <signal name="StateChanged">
-      <arg name="state" type="i"/>
-      <arg name="error" type="s"/>
-    </signal>
-
-    <method name="IsEmpty">
-      <arg name="empty" type="b" direction="out"/>
-    </method>
-
-    <method name="AddService">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-      <arg name="name" type="s" direction="in"/>
-      <arg name="type" type="s" direction="in"/>
-      <arg name="domain" type="s" direction="in"/>
-      <arg name="host" type="s" direction="in"/>
-      <arg name="port" type="q" direction="in"/>
-    </method>
-
-    <method name="AddServiceSubtype">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-      <arg name="name" type="s" direction="in"/>
-      <arg name="type" type="s" direction="in"/>
-      <arg name="domain" type="s" direction="in"/>
-      <arg name="subtype" type="s" direction="in"/>
-    </method>
-
-    <method name="UpdateServiceTxt">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-      <arg name="name" type="s" direction="in"/>
-      <arg name="type" type="s" direction="in"/>
-      <arg name="domain" type="s" direction="in"/>
-    </method>
-
-    <method name="AddAddress">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-      <arg name="name" type="s" direction="in"/>
-      <arg name="address" type="s" direction="in"/>
-    </method>
-
-    <method name="AddRecord">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-      <arg name="name" type="s" direction="in"/>
-      <arg name="clazz" type="q" direction="in"/>
-      <arg name="type" type="q" direction="in"/>
-      <arg name="ttl" type="u" direction="in"/>
-      <arg name="rdata" type="ay" direction="in"/>
-    </method>
-  </interface>
-</node>

src/avahi/org.freedesktop.Avahi.Server.xml

@@ -1,396 +0,0 @@
-<?xml version="1.0" standalone='no'?><!--*-nxml-*-->
-<!DOCTYPE node SYSTEM "introspect.dtd">
-
-<!--
-  This file is part of avahi.
-
-  avahi is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License as
-  published by the Free Software Foundation; either version 2 of the
-  License, or (at your option) any later version.
-
-  avahi 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 Lesser General Public
-  License along with avahi; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-  02111-1307 USA.
--->
-
-<node>
-
-  <interface name="org.freedesktop.Avahi.Server">
-
-    <method name="GetVersionString">
-      <arg name="version" type="s" direction="out"/>
-    </method>
-
-    <method name="GetAPIVersion">
-      <arg name="version" type="u" direction="out"/>
-    </method>
-
-    <method name="GetHostName">
-      <arg name="name" type="s" direction="out"/>
-    </method>
-    <method name="SetHostName">
-      <arg name="name" type="s" direction="in"/>
-    </method>
-    <method name="GetHostNameFqdn">
-      <arg name="name" type="s" direction="out"/>
-    </method>
-    <method name="GetDomainName">
-      <arg name="name" type="s" direction="out"/>
-    </method>
-
-    <method name="IsNSSSupportAvailable">
-      <arg name="yes" type="b" direction="out"/>
-    </method>
-
-    <method name="GetState">
-      <arg name="state" type="i" direction="out"/>
-    </method>
-
-    <signal name="StateChanged">
-      <arg name="state" type="i"/>
-      <arg name="error" type="s"/>
-    </signal>
-
-    <method name="GetLocalServiceCookie">
-      <arg name="cookie" type="u" direction="out"/>
-    </method>
-
-    <method name="GetAlternativeHostName">
-      <arg name="name" type="s" direction="in"/>
-      <arg name="name" type="s" direction="out"/>
-    </method>
-
-    <method name="GetAlternativeServiceName">
-      <arg name="name" type="s" direction="in"/>
-      <arg name="name" type="s" direction="out"/>
-    </method>
-
-    <method name="GetNetworkInterfaceNameByIndex">
-      <arg name="index" type="i" direction="in"/>
-      <arg name="name" type="s" direction="out"/>
-    </method>
-    <method name="GetNetworkInterfaceIndexByName">
-      <arg name="name" type="s" direction="in"/>
-      <arg name="index" type="i" direction="out"/>
-    </method>
-
-    <method name="ResolveHostName">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="name" type="s" direction="in"/>
-      <arg name="aprotocol" type="i" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="interface" type="i" direction="out"/>
-      <arg name="protocol" type="i" direction="out"/>
-      <arg name="name" type="s" direction="out"/>
-      <arg name="aprotocol" type="i" direction="out"/>
-      <arg name="address" type="s" direction="out"/>
-      <arg name="flags" type="u" direction="out"/>
-    </method>
-
-    <method name="ResolveAddress">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="address" type="s" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="interface" type="i" direction="out"/>
-      <arg name="protocol" type="i" direction="out"/>
-      <arg name="aprotocol" type="i" direction="out"/>
-      <arg name="address" type="s" direction="out"/>
-      <arg name="name" type="s" direction="out"/>
-      <arg name="flags" type="u" direction="out"/>
-    </method>
-
-    <method name="ResolveService">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="name" type="s" direction="in"/>
-      <arg name="type" type="s" direction="in"/>
-      <arg name="domain" type="s" direction="in"/>
-      <arg name="aprotocol" type="i" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="interface" type="i" direction="out"/>
-      <arg name="protocol" type="i" direction="out"/>
-      <arg name="name" type="s" direction="out"/>
-      <arg name="type" type="s" direction="out"/>
-      <arg name="domain" type="s" direction="out"/>
-      <arg name="host" type="s" direction="out"/>
-      <arg name="aprotocol" type="i" direction="out"/>
-      <arg name="address" type="s" direction="out"/>
-      <arg name="port" type="q" direction="out"/>
-      <arg name="flags" type="u" direction="out"/>
-    </method>
-
-    <method name="EntryGroupNew">
-      <arg name="path" type="o" direction="out"/>
-    </method>
-
-    <method name="DomainBrowserNew">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="domain" type="s" direction="in"/>
-      <arg name="btype" type="i" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="path" type="o" direction="out"/>
-    </method>
-
-    <method name="ServiceTypeBrowserNew">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="domain" type="s" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="path" type="o" direction="out"/>
-    </method>
-
-    <method name="ServiceBrowserNew">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="type" type="s" direction="in"/>
-      <arg name="domain" type="s" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="path" type="o" direction="out"/>
-    </method>
-
-    <method name="ServiceResolverNew">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="name" type="s" direction="in"/>
-      <arg name="type" type="s" direction="in"/>
-      <arg name="domain" type="s" direction="in"/>
-      <arg name="aprotocol" type="i" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="path" type="o" direction="out"/>
-    </method>
-
-    <method name="HostNameResolverNew">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="name" type="s" direction="in"/>
-      <arg name="aprotocol" type="i" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="path" type="o" direction="out"/>
-    </method>
-
-    <method name="AddressResolverNew">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="address" type="s" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="path" type="o" direction="out"/>
-    </method>
-
-    <method name="RecordBrowserNew">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="name" type="s" direction="in"/>
-      <arg name="clazz" type="q" direction="in"/>
-      <arg name="type" type="q" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="path" type="o" direction="out"/>
-    </method>
-
-  </interface>
-
-  <interface name="org.freedesktop.Avahi.Server2">
-
-    <method name="GetVersionString">
-      <arg name="version" type="s" direction="out"/>
-    </method>
-
-    <method name="GetAPIVersion">
-      <arg name="version" type="u" direction="out"/>
-    </method>
-
-    <method name="GetHostName">
-      <arg name="name" type="s" direction="out"/>
-    </method>
-    <method name="SetHostName">
-      <arg name="name" type="s" direction="in"/>
-    </method>
-    <method name="GetHostNameFqdn">
-      <arg name="name" type="s" direction="out"/>
-    </method>
-    <method name="GetDomainName">
-      <arg name="name" type="s" direction="out"/>
-    </method>
-
-    <method name="IsNSSSupportAvailable">
-      <arg name="yes" type="b" direction="out"/>
-    </method>
-
-    <method name="GetState">
-      <arg name="state" type="i" direction="out"/>
-    </method>
-
-    <signal name="StateChanged">
-      <arg name="state" type="i"/>
-      <arg name="error" type="s"/>
-    </signal>
-
-    <method name="GetLocalServiceCookie">
-      <arg name="cookie" type="u" direction="out"/>
-    </method>
-
-    <method name="GetAlternativeHostName">
-      <arg name="name" type="s" direction="in"/>
-      <arg name="name" type="s" direction="out"/>
-    </method>
-
-    <method name="GetAlternativeServiceName">
-      <arg name="name" type="s" direction="in"/>
-      <arg name="name" type="s" direction="out"/>
-    </method>
-
-    <method name="GetNetworkInterfaceNameByIndex">
-      <arg name="index" type="i" direction="in"/>
-      <arg name="name" type="s" direction="out"/>
-    </method>
-    <method name="GetNetworkInterfaceIndexByName">
-      <arg name="name" type="s" direction="in"/>
-      <arg name="index" type="i" direction="out"/>
-    </method>
-
-    <method name="ResolveHostName">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="name" type="s" direction="in"/>
-      <arg name="aprotocol" type="i" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="interface" type="i" direction="out"/>
-      <arg name="protocol" type="i" direction="out"/>
-      <arg name="name" type="s" direction="out"/>
-      <arg name="aprotocol" type="i" direction="out"/>
-      <arg name="address" type="s" direction="out"/>
-      <arg name="flags" type="u" direction="out"/>
-    </method>
-
-    <method name="ResolveAddress">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="address" type="s" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="interface" type="i" direction="out"/>
-      <arg name="protocol" type="i" direction="out"/>
-      <arg name="aprotocol" type="i" direction="out"/>
-      <arg name="address" type="s" direction="out"/>
-      <arg name="name" type="s" direction="out"/>
-      <arg name="flags" type="u" direction="out"/>
-    </method>
-
-    <method name="ResolveService">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="name" type="s" direction="in"/>
-      <arg name="type" type="s" direction="in"/>
-      <arg name="domain" type="s" direction="in"/>
-      <arg name="aprotocol" type="i" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="interface" type="i" direction="out"/>
-      <arg name="protocol" type="i" direction="out"/>
-      <arg name="name" type="s" direction="out"/>
-      <arg name="type" type="s" direction="out"/>
-      <arg name="domain" type="s" direction="out"/>
-      <arg name="host" type="s" direction="out"/>
-      <arg name="aprotocol" type="i" direction="out"/>
-      <arg name="address" type="s" direction="out"/>
-      <arg name="port" type="q" direction="out"/>
-      <arg name="flags" type="u" direction="out"/>
-    </method>
-
-    <method name="EntryGroupNew">
-      <arg name="path" type="o" direction="out"/>
-    </method>
-
-    <method name="DomainBrowserPrepare">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="domain" type="s" direction="in"/>
-      <arg name="btype" type="i" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="path" type="o" direction="out"/>
-    </method>
-
-    <method name="ServiceTypeBrowserPrepare">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="domain" type="s" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="path" type="o" direction="out"/>
-    </method>
-
-    <method name="ServiceBrowserPrepare">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="type" type="s" direction="in"/>
-      <arg name="domain" type="s" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="path" type="o" direction="out"/>
-    </method>
-
-    <method name="ServiceResolverPrepare">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="name" type="s" direction="in"/>
-      <arg name="type" type="s" direction="in"/>
-      <arg name="domain" type="s" direction="in"/>
-      <arg name="aprotocol" type="i" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="path" type="o" direction="out"/>
-    </method>
-
-    <method name="HostNameResolverPrepare">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="name" type="s" direction="in"/>
-      <arg name="aprotocol" type="i" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="path" type="o" direction="out"/>
-    </method>
-
-    <method name="AddressResolverPrepare">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="address" type="s" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="path" type="o" direction="out"/>
-    </method>
-
-    <method name="RecordBrowserPrepare">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="name" type="s" direction="in"/>
-      <arg name="clazz" type="q" direction="in"/>
-      <arg name="type" type="q" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="path" type="o" direction="out"/>
-    </method>
-
-  </interface>
-</node>

src/collection/CMakeLists.txt

@@ -0,0 +1,82 @@
+set(COLLECTION_SOURCES
+  collectionlibrary.cpp
+  collectionmodel.cpp
+  collectionbackend.cpp
+  collectionwatcher.cpp
+  collectionview.cpp
+  collectionitemdelegate.cpp
+  collectionviewcontainer.cpp
+  collectiondirectorymodel.cpp
+  collectionfilteroptions.cpp
+  collectionfilterwidget.cpp
+  collectionfilter.cpp
+  collectionplaylistitem.cpp
+  collectionquery.cpp
+  savedgroupingmanager.cpp
+  groupbydialog.cpp
+  collectiontask.cpp
+  collectionmodelupdate.cpp
+  collectionitem.cpp
+)
+
+set(COLLECTION_HEADERS
+  collectionlibrary.h
+  collectionmodel.h
+  collectionbackend.h
+  collectionwatcher.h
+  collectionview.h
+  collectionitemdelegate.h
+  collectionviewcontainer.h
+  collectiondirectorymodel.h
+  collectionfilterwidget.h
+  collectionfilter.h
+  savedgroupingmanager.h
+  groupbydialog.h
+)
+
+set(COLLECTION_UI
+  groupbydialog.ui
+  collectionfilterwidget.ui
+  collectionviewcontainer.ui
+  savedgroupingmanager.ui
+)
+
+qt_wrap_cpp(COLLECTION_SOURCES ${COLLECTION_HEADERS})
+qt_wrap_ui(COLLECTION_SOURCES ${COLLECTION_UI})
+
+add_library(strawberry_collection STATIC ${COLLECTION_SOURCES})
+
+target_include_directories(strawberry_collection PRIVATE
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/src
+  ${CMAKE_BINARY_DIR}/src
+)
+
+target_link_libraries(strawberry_collection PRIVATE
+  PkgConfig::GLIB
+  PkgConfig::GOBJECT
+  PkgConfig::GSTREAMER
+  PkgConfig::GSTREAMER_BASE
+  PkgConfig::GSTREAMER_AUDIO
+  PkgConfig::GSTREAMER_APP
+  PkgConfig::GSTREAMER_TAG
+  PkgConfig::GSTREAMER_PBUTILS
+  Qt${QT_VERSION_MAJOR}::Core
+  Qt${QT_VERSION_MAJOR}::Concurrent
+  Qt${QT_VERSION_MAJOR}::Network
+  Qt${QT_VERSION_MAJOR}::Sql
+  Qt${QT_VERSION_MAJOR}::Gui
+  Qt${QT_VERSION_MAJOR}::Widgets
+  strawberry_utilities
+  strawberry_core
+  strawberry_mimedata
+  strawberry_engine
+  strawberry_tagreader
+  strawberry_covermanager
+  strawberry_filterparser
+  strawberry_dialogs
+  strawberry_edittagdialog
+  strawberry_organize
+  strawberry_playlistparsers
+)

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-2025, Jonas Kvinge <jonas@jkvinge.net>
+ * 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
@@ -522,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_linked_collection_song() && new_collection_directory_id) {
+  if (updated_song.is_collection_song() && new_collection_directory_id) {
     updated_song.set_directory_id(new_collection_directory_id.value());
   }
 
@@ -623,7 +623,6 @@ 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;
@@ -854,10 +853,6 @@ 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());
@@ -884,24 +879,6 @@ 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());

src/collection/collectionbackend.h

@@ -2,7 +2,7 @@
  * Strawberry Music Player
  * This file was part of Clementine.
  * Copyright 2010, David Sansome <me@davidsansome.com>
- * Copyright 2018-2025, Jonas Kvinge <jonas@jkvinge.net>
+ * 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
@@ -140,6 +140,7 @@ class CollectionBackend : public CollectionBackendInterface {
   Q_OBJECT
 
  public:
+
   Q_INVOKABLE explicit CollectionBackend(QObject *parent = nullptr);
 
   ~CollectionBackend();
@@ -233,9 +234,6 @@ class CollectionBackend : public CollectionBackendInterface {
   void UpdateSongRatingAsync(const int id, const float rating, const bool save_tags = false);
   void UpdateSongsRatingAsync(const QList<int> &ids, const float rating, const bool save_tags = false);
 
-  void DeleteSongsAsync(const SongList &songs);
-  void DeleteSongsByUrlsAsync(const QList<QUrl> &url);
-
  public Q_SLOTS:
   void Exit();
   void GetAllSongs(const int id);
@@ -249,7 +247,6 @@ class CollectionBackend : public CollectionBackendInterface {
   void UpdateSongsBySongID(const SongMap &new_songs);
   void UpdateMTimesOnly(const SongList &songs);
   void DeleteSongs(const SongList &songs);
-  void DeleteSongsByUrls(const QList<QUrl> &url);
   void MarkSongsUnavailable(const SongList &songs, const bool unavailable = true);
   void AddOrUpdateSubdirs(const CollectionSubdirectoryList &subdirs);
   void CompilationsNeedUpdating();
@@ -330,3 +327,4 @@ class CollectionBackend : public CollectionBackendInterface {
 };
 
 #endif  // COLLECTIONBACKEND_H
+

src/collection/collectionfilter.cpp

@@ -28,7 +28,7 @@
 #include <QUrl>
 
 #include "core/song.h"
-#include "core/songmimedata.h"
+#include "mimedata/songmimedata.h"
 #include "filterparser/filterparser.h"
 #include "filterparser/filtertree.h"
 #include "collectionbackend.h"

src/collection/collectionfilteroptions.h

@@ -26,6 +26,7 @@
 
 class CollectionFilterOptions {
  public:
+
   explicit CollectionFilterOptions();
 
   // Filter mode:

src/collection/collectionfilterwidget.cpp

@@ -34,7 +34,6 @@
 #include <QVariant>
 #include <QString>
 #include <QStringList>
-#include <QUrl>
 #include <QRegularExpression>
 #include <QInputDialog>
 #include <QList>
@@ -54,7 +53,7 @@
 #include "savedgroupingmanager.h"
 #include "collectionfilterwidget.h"
 #include "groupbydialog.h"
-#include "ui_collectionfilterwidget.h"
+#include "collection/ui_collectionfilterwidget.h"
 #include "widgets/searchfield.h"
 #include "constants/collectionsettings.h"
 #include "constants/appearancesettings.h"
@@ -296,21 +295,19 @@ QActionGroup *CollectionFilterWidget::CreateGroupByActions(const QString &saved_
   if (version == 1) {
     QStringList saved = s.childKeys();
     for (int i = 0; i < saved.size(); ++i) {
-      const QString &name = saved.at(i);
-      if (name == "version"_L1) continue;
-      QByteArray bytes = s.value(name).toByteArray();
+      if (saved.at(i) == "version"_L1) continue;
+      QByteArray bytes = s.value(saved.at(i)).toByteArray();
       QDataStream ds(&bytes, QIODevice::ReadOnly);
       CollectionModel::Grouping g;
       ds >> g;
-      ret->addAction(CreateGroupByAction(QUrl::fromPercentEncoding(name.toUtf8()), parent, g));
+      ret->addAction(CreateGroupByAction(saved.at(i), parent, g));
     }
   }
   else {
     QStringList saved = s.childKeys();
     for (int i = 0; i < saved.size(); ++i) {
-      const QString &name = saved.at(i);
-      if (name == "version"_L1) continue;
-      s.remove(name);
+      if (saved.at(i) == "version"_L1) continue;
+      s.remove(saved.at(i));
     }
   }
   s.endGroup();
@@ -342,7 +339,7 @@ void CollectionFilterWidget::SaveGroupBy() {
 
   if (!model_) return;
 
-  const QString name = QInputDialog::getText(this, tr("Grouping Name"), tr("Grouping name:"));
+  QString name = QInputDialog::getText(this, tr("Grouping Name"), tr("Grouping name:"));
   if (name.isEmpty()) return;
 
   qLog(Debug) << "Saving current grouping to" << name;
@@ -358,7 +355,7 @@ void CollectionFilterWidget::SaveGroupBy() {
   QDataStream datastream(&buffer, QIODevice::WriteOnly);
   datastream << model_->GetGroupBy();
   s.setValue("version", u"1"_s);
-  s.setValue(QUrl::toPercentEncoding(name), buffer);
+  s.setValue(name, buffer);
   s.endGroup();
 
   UpdateGroupByActions();

src/collection/collectionfilterwidget.h

@@ -135,3 +135,4 @@ class CollectionFilterWidget : public QWidget {
 };
 
 #endif  // COLLECTIONFILTERWIDGET_H
+

src/collection/collectionlibrary.cpp

@@ -2,7 +2,7 @@
  * Strawberry Music Player
  * This file was part of Clementine.
  * Copyright 2010, David Sansome <me@davidsansome.com>
- * Copyright 2018-2025, Jonas Kvinge <jonas@jkvinge.net>
+ * 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
@@ -78,8 +78,6 @@ CollectionLibrary::CollectionLibrary(const SharedPtr<Database> database,
 
   model_ = new CollectionModel(backend_, albumcover_loader, this);
 
-  full_rescan_revisions_[21] = tr("Support for sort tags artist, album, album artist, title, composer, and performer");
-
   ReloadSettings();
 
 }
@@ -189,26 +187,6 @@ void CollectionLibrary::ReloadSettings() {
 
 }
 
-void CollectionLibrary::CurrentSongChanged(const Song &song) {
-
-  current_song_url_ = song.url();
-
-  if (!pending_song_saves_.isEmpty()) {
-    SavePendingPlaycountsAndRatings();
-  }
-
-}
-
-void CollectionLibrary::Stopped() {
-
-  current_song_url_ = QUrl();
-
-  if (!pending_song_saves_.isEmpty()) {
-    SavePendingPlaycountsAndRatings();
-  }
-
-}
-
 void CollectionLibrary::SyncPlaycountAndRatingToFilesAsync() {
 
   (void)QtConcurrent::run(&CollectionLibrary::SyncPlaycountAndRatingToFiles, this);
@@ -221,8 +199,8 @@ void CollectionLibrary::SyncPlaycountAndRatingToFiles() {
   task_manager_->SetTaskBlocksCollectionScans(task_id);
 
   const SongList songs = backend_->GetAllSongs();
-  const quint64 nb_songs = static_cast<quint64>(songs.size());
-  quint64 i = 0;
+  const qint64 nb_songs = songs.size();
+  int i = 0;
   for (const Song &song : songs) {
     (void)tagreader_client_->SaveSongPlaycountBlocking(song.url().toLocalFile(), song.playcount());
     (void)tagreader_client_->SaveSongRatingBlocking(song.url().toLocalFile(), song.rating());
@@ -232,85 +210,18 @@ void CollectionLibrary::SyncPlaycountAndRatingToFiles() {
 
 }
 
-void CollectionLibrary::SongsPlaycountChanged(const SongList &songs, const bool save_tags) {
+void CollectionLibrary::SongsPlaycountChanged(const SongList &songs, const bool save_tags) const {
 
   if (save_tags || save_playcounts_to_files_) {
-    SongList songs_to_save_now;
-    for (const Song &song : songs) {
-      if (song.url().isLocalFile() && song.url() == current_song_url_ &&
-          (song.filetype() == Song::FileType::OggFlac || song.filetype() == Song::FileType::OggVorbis || song.filetype() == Song::FileType::OggOpus)) {
-        qLog(Debug) << "Deferring playcount save for currently playing file" << song.url().toLocalFile();
-        if (pending_song_saves_.contains(song.url())) {
-          SharedPtr<PendingSongSave> pending_song_save = pending_song_saves_[song.url()];
-          pending_song_save->save_playcount = true;
-          pending_song_save->song.set_playcount(song.playcount());
-        }
-        else {
-          SharedPtr<PendingSongSave> pending_song_save = make_shared<PendingSongSave>();
-          pending_song_save->save_playcount = true;
-          pending_song_save->song = song;
-          pending_song_saves_.insert(song.url(), pending_song_save);
-        }
-      }
-      else {
-        songs_to_save_now << song;
-      }
-    }
-    if (!songs_to_save_now.isEmpty()) {
-      tagreader_client_->SaveSongsPlaycountAsync(songs_to_save_now);
-    }
+    tagreader_client_->SaveSongsPlaycountAsync(songs);
   }
 
 }
 
-void CollectionLibrary::SongsRatingChanged(const SongList &songs, const bool save_tags) {
+void CollectionLibrary::SongsRatingChanged(const SongList &songs, const bool save_tags) const {
 
   if (save_tags || save_ratings_to_files_) {
-    SongList songs_to_save_now;
-    for (const Song &song : songs) {
-      if (song.url().isLocalFile() && song.url() == current_song_url_ &&
-          (song.filetype() == Song::FileType::OggFlac || song.filetype() == Song::FileType::OggVorbis || song.filetype() == Song::FileType::OggOpus)) {
-        qLog(Debug) << "Deferring rating save for currently playing file" << song.url().toLocalFile();
-        if (pending_song_saves_.contains(song.url())) {
-          SharedPtr<PendingSongSave> pending_song_save = pending_song_saves_[song.url()];
-          pending_song_save->save_rating = true;
-          pending_song_save->song.set_rating(song.rating());
-        }
-        else {
-          SharedPtr<PendingSongSave> pending_song_save = make_shared<PendingSongSave>();
-          pending_song_save->save_rating = true;
-          pending_song_save->song = song;
-          pending_song_saves_.insert(song.url(), pending_song_save);
-        }
-      }
-      else {
-        songs_to_save_now << song;
-      }
-    }
-    if (!songs_to_save_now.isEmpty()) {
-      tagreader_client_->SaveSongsRatingAsync(songs_to_save_now);
-    }
-  }
-
-}
-
-void CollectionLibrary::SavePendingPlaycountsAndRatings() {
-
-  for (auto it = pending_song_saves_.constBegin(); it != pending_song_saves_.constEnd();) {
-    const QUrl url = it.key();
-    SharedPtr<PendingSongSave> pending_song_save = it.value();
-    if (url == current_song_url_) {
-      ++it;
-      continue;
-    }
-    qLog(Debug) << "Saving deferred playcount/rating for" << url.toLocalFile();
-    if (pending_song_save->save_playcount) {
-      tagreader_client_->SaveSongsPlaycountAsync(SongList() << pending_song_save->song);
-    }
-    if (pending_song_save->save_rating) {
-      tagreader_client_->SaveSongsRatingAsync(SongList() << pending_song_save->song);
-    }
-    it = pending_song_saves_.erase(it);
+    tagreader_client_->SaveSongsRatingAsync(songs);
   }
 
 }

src/collection/collectionlibrary.h

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

src/collection/collectionmodel.cpp

@@ -1,6 +1,6 @@
 /*
  * Strawberry Music Player
- * Copyright 2018-2025, Jonas Kvinge <jonas@jkvinge.net>
+ * 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
@@ -54,13 +54,12 @@
 
 #include "includes/scoped_ptr.h"
 #include "includes/shared_ptr.h"
-#include "constants/collectionsettings.h"
 #include "core/logging.h"
 #include "core/standardpaths.h"
 #include "core/database.h"
 #include "core/iconloader.h"
 #include "core/settings.h"
-#include "core/songmimedata.h"
+#include "mimedata/songmimedata.h"
 #include "collectionfilteroptions.h"
 #include "collectionquery.h"
 #include "collectionbackend.h"
@@ -72,12 +71,12 @@
 #include "covermanager/albumcoverloaderoptions.h"
 #include "covermanager/albumcoverloaderresult.h"
 #include "covermanager/albumcoverloader.h"
+#include "constants/collectionsettings.h"
 
 using namespace std::chrono_literals;
 using namespace Qt::Literals::StringLiterals;
 
 const int CollectionModel::kPrettyCoverSize = 32;
-
 namespace {
 constexpr char kPixmapDiskCacheDir[] = "pixmapcache";
 constexpr char kVariousArtists[] = QT_TR_NOOP("Various artists");
@@ -89,6 +88,7 @@ CollectionModel::CollectionModel(const SharedPtr<CollectionBackend> backend, con
       albumcover_loader_(albumcover_loader),
       dir_model_(new CollectionDirectoryModel(backend, this)),
       filter_(new CollectionFilter(this)),
+      timer_reload_(new QTimer(this)),
       timer_update_(new QTimer(this)),
       icon_artist_(IconLoader::Load(u"folder-sound"_s)),
       use_disk_cache_(false),
@@ -130,6 +130,10 @@ CollectionModel::CollectionModel(const SharedPtr<CollectionBackend> backend, con
   backend_->UpdateTotalArtistCountAsync();
   backend_->UpdateTotalAlbumCountAsync();
 
+  timer_reload_->setSingleShot(true);
+  timer_reload_->setInterval(300ms);
+  QObject::connect(timer_reload_, &QTimer::timeout, this, &CollectionModel::Reload);
+
   timer_update_->setSingleShot(false);
   timer_update_->setInterval(20ms);
   QObject::connect(timer_update_, &QTimer::timeout, this, &CollectionModel::ProcessUpdate);
@@ -187,9 +191,13 @@ void CollectionModel::EndReset() {
 
 }
 
-void CollectionModel::ResetInternal() {
+void CollectionModel::Reload() {
 
   loading_ = true;
+  if (timer_reload_->isActive()) {
+    timer_reload_->stop();
+  }
+  updates_.clear();
 
   options_active_ = options_current_;
 
@@ -203,16 +211,22 @@ void CollectionModel::ResetInternal() {
 
 }
 
+void CollectionModel::ScheduleReset() {
+
+  if (!timer_reload_->isActive()) {
+    timer_reload_->start();
+  }
+
+}
+
 void CollectionModel::ReloadSettings() {
 
   Settings settings;
   settings.beginGroup(CollectionSettings::kSettingsGroup);
   const bool show_pretty_covers = settings.value(CollectionSettings::kPrettyCovers, true).toBool();
-  const bool show_dividers = settings.value(CollectionSettings::kShowDividers, true).toBool();
+  const bool show_dividers= settings.value(CollectionSettings::kShowDividers, true).toBool();
   const bool show_various_artists = settings.value(CollectionSettings::kVariousArtists, true).toBool();
-  const bool sort_skip_articles_for_artists = settings.value(CollectionSettings::kSkipArticlesForArtists, true).toBool();
-  const bool sort_skip_articles_for_albums = settings.value(CollectionSettings::kSkipArticlesForAlbums, false).toBool();
-  const bool use_sort_tags = settings.value(CollectionSettings::kUseSortTags, true).toBool();
+  const bool sort_skips_articles = settings.value(CollectionSettings::kSortSkipsArticles, true).toBool();
 
   use_disk_cache_ = settings.value(CollectionSettings::kSettingsDiskCacheEnable, false).toBool();
   QPixmapCache::setCacheLimit(static_cast<int>(MaximumCacheSize(&settings, CollectionSettings::kSettingsCacheSize, CollectionSettings::kSettingsCacheSizeUnit, CollectionSettings::kSettingsCacheSizeDefault) / 1024));
@@ -227,15 +241,11 @@ void CollectionModel::ReloadSettings() {
   if (show_pretty_covers != options_current_.show_pretty_covers ||
       show_dividers != options_current_.show_dividers ||
       show_various_artists != options_current_.show_various_artists ||
-      sort_skip_articles_for_artists != options_current_.sort_skip_articles_for_artists ||
-      sort_skip_articles_for_albums != options_current_.sort_skip_articles_for_albums ||
-      use_sort_tags != options_current_.use_sort_tags) {
+      sort_skips_articles != options_current_.sort_skips_articles) {
     options_current_.show_pretty_covers = show_pretty_covers;
     options_current_.show_dividers = show_dividers;
     options_current_.show_various_artists = show_various_artists;
-    options_current_.sort_skip_articles_for_artists = sort_skip_articles_for_artists;
-    options_current_.sort_skip_articles_for_albums = sort_skip_articles_for_albums;
-    options_current_.use_sort_tags = use_sort_tags;
+    options_current_.sort_skips_articles = sort_skips_articles;
     ScheduleReset();
   }
 
@@ -387,13 +397,13 @@ QMimeData *CollectionModel::mimeData(const QModelIndexList &indexes) const {
     GetChildSongs(IndexToItem(idx), songs, song_ids, urls);
   }
 
-  SongMimeData *song_mime_data = new SongMimeData;
-  song_mime_data->setUrls(urls);
-  song_mime_data->backend = backend_;
-  song_mime_data->songs = songs;
-  song_mime_data->name_for_new_playlist_ = Song::GetNameForNewPlaylist(songs);
+  SongMimeData *data = new SongMimeData;
+  data->setUrls(urls);
+  data->backend = backend_;
+  data->songs = songs;
+  data->name_for_new_playlist_ = Song::GetNameForNewPlaylist(data->songs);
 
-  return song_mime_data;
+  return data;
 
 }
 
@@ -411,15 +421,10 @@ void CollectionModel::RemoveSongs(const SongList &songs) {
 
 void CollectionModel::ScheduleUpdate(const CollectionModelUpdate::Type type, const SongList &songs) {
 
-  if (type == CollectionModelUpdate::Type::Reset) {
-    updates_.enqueue(CollectionModelUpdate(type));
-  }
-  else {
-    for (qint64 i = 0; i < songs.count(); i += 400LL) {
-      const qint64 number = std::min(songs.count() - i, 400LL);
-      const SongList songs_to_queue = songs.mid(i, number);
-      updates_.enqueue(CollectionModelUpdate(type, songs_to_queue));
-    }
+  for (qint64 i = 0; i < songs.count(); i += 400LL) {
+    const qint64 number = std::min(songs.count() - i, 400LL);
+    const SongList songs_to_queue = songs.mid(i, number);
+    updates_.enqueue(CollectionModelUpdate(type, songs_to_queue));
   }
 
   if (!timer_update_->isActive()) {
@@ -428,14 +433,6 @@ void CollectionModel::ScheduleUpdate(const CollectionModelUpdate::Type type, con
 
 }
 
-void CollectionModel::ScheduleReset() {
-
-  if (!updates_.isEmpty() && updates_.first().type == CollectionModelUpdate::Type::Reset) return;
-
-  ScheduleUpdate(CollectionModelUpdate::Type::Reset);
-
-}
-
 void CollectionModel::ScheduleAddSongs(const SongList &songs) {
 
   ScheduleUpdate(CollectionModelUpdate::Type::Add, songs);
@@ -468,9 +465,6 @@ void CollectionModel::ProcessUpdate() {
   }
 
   switch (update.type) {
-    case CollectionModelUpdate::Type::Reset:
-      ResetInternal();
-      break;
     case CollectionModelUpdate::Type::AddReAddOrUpdate:
       AddReAddOrUpdateSongsInternal(update.songs);
       break;
@@ -545,10 +539,7 @@ void CollectionModel::AddSongsInternal(const SongList &songs) {
     // Sanity check to make sure we don't add songs that are outside the user's filter
     if (!options_active_.filter_options.Matches(song)) continue;
 
-    if (song_nodes_.contains(song.id())) {
-      qLog(Debug) << song.id() << song.title() << "already exists, skipping";
-      continue;
-    }
+    if (song_nodes_.contains(song.id())) continue;
 
     // Before we can add each song we need to make sure the required container items already exist in the tree.
     // These depend on which "group by" settings the user has on the collection.
@@ -689,8 +680,8 @@ void CollectionModel::RemoveSongsInternal(const SongList &songs) {
     if (!divider_nodes_.contains(divider_key)) continue;
 
     // Look to see if there are any other items still under this divider
-    QList<CollectionItem *> container_nodes = container_nodes_[0].values();
-    if (std::any_of(container_nodes.begin(), container_nodes.end(), [this, divider_key](CollectionItem *node) { return DividerKey(options_active_.group_by[0], node->metadata, node->sort_text) == divider_key; })) {
+    QList<CollectionItem*> container_nodes = container_nodes_[0].values();
+    if (std::any_of(container_nodes.begin(), container_nodes.end(), [this, divider_key](CollectionItem *node){ return DividerKey(options_active_.group_by[0], node->metadata, node->sort_text) == divider_key; })) {
       continue;
     }
 
@@ -708,7 +699,7 @@ CollectionItem *CollectionModel::CreateContainerItem(const GroupBy group_by, con
 
   QString divider_key;
   if (options_active_.show_dividers && container_level == 0) {
-    divider_key = DividerKey(group_by, song, SortText(group_by, song, options_active_.sort_skip_articles_for_artists, options_active_.sort_skip_articles_for_albums, options_active_.use_sort_tags));
+    divider_key = DividerKey(group_by, song, SortText(group_by, song, options_active_.sort_skips_articles));
     if (!divider_key.isEmpty()) {
       if (!divider_nodes_.contains(divider_key)) {
         CreateDividerItem(divider_key, DividerDisplayText(group_by, divider_key), parent);
@@ -722,7 +713,7 @@ CollectionItem *CollectionModel::CreateContainerItem(const GroupBy group_by, con
   item->container_level = container_level;
   item->container_key = container_key;
   item->display_text = DisplayText(group_by, song);
-  item->sort_text = SortText(group_by, song, options_active_.sort_skip_articles_for_artists, options_active_.sort_skip_articles_for_albums, options_active_.use_sort_tags);
+  item->sort_text = SortText(group_by, song, options_active_.sort_skips_articles);
   if (!divider_key.isEmpty()) {
     item->sort_text.prepend(divider_key + QLatin1Char(' '));
   }
@@ -1077,39 +1068,39 @@ QString CollectionModel::PrettyFormat(const Song &song) {
 
 }
 
-QString CollectionModel::SortText(const GroupBy group_by, const Song &song, const bool sort_skip_articles_for_artists, const bool sort_skip_articles_for_albums, const bool use_sort_tags) {
+QString CollectionModel::SortText(const GroupBy group_by, const Song &song, const bool sort_skips_articles) {
 
   switch (group_by) {
     case GroupBy::AlbumArtist:
-      return SortTextForName(use_sort_tags ? song.effective_albumartistsort() : song.effective_albumartist(), sort_skip_articles_for_artists);
+      return SortTextForArtist(song.effective_albumartist(), sort_skips_articles);
     case GroupBy::Artist:
-      return SortTextForName(use_sort_tags ? song.effective_artistsort() : song.artist(), sort_skip_articles_for_artists);
+      return SortTextForArtist(song.artist(), sort_skips_articles);
     case GroupBy::Album:
-      return SortTextForName(use_sort_tags ? song.effective_albumsort() : song.album(), sort_skip_articles_for_albums);
+      return SortText(song.album());
     case GroupBy::AlbumDisc:
-      return SortTextForName(use_sort_tags ? song.effective_albumsort() : song.album(), sort_skip_articles_for_albums) + SortTextForNumber(std::max(0, song.disc()));
+      return song.album() + SortTextForNumber(std::max(0, song.disc()));
     case GroupBy::YearAlbum:
-      return SortTextForYear(song.year()) + song.grouping() + SortTextForName(use_sort_tags ? song.effective_albumsort() : song.album(), sort_skip_articles_for_albums);
+      return SortTextForNumber(std::max(0, song.year())) + song.grouping() + song.album();
     case GroupBy::YearAlbumDisc:
-      return SortTextForYear(song.year()) + SortTextForName(use_sort_tags ? song.effective_albumsort() : song.album(), sort_skip_articles_for_albums) + SortTextForNumber(std::max(0, song.disc()));
+      return SortTextForNumber(std::max(0, song.year())) + song.album() + SortTextForNumber(std::max(0, song.disc()));
     case GroupBy::OriginalYearAlbum:
-      return SortTextForYear(song.effective_originalyear()) + song.grouping() + SortTextForName(use_sort_tags ? song.effective_albumsort() : song.album(), sort_skip_articles_for_albums);
+      return SortTextForNumber(std::max(0, song.effective_originalyear())) + song.grouping() + song.album();
     case GroupBy::OriginalYearAlbumDisc:
-      return SortTextForYear(song.effective_originalyear()) + SortTextForName(use_sort_tags ? song.effective_albumsort() : song.album(), sort_skip_articles_for_albums) + SortTextForNumber(std::max(0, song.disc()));
+      return SortTextForNumber(std::max(0, song.effective_originalyear())) + song.album() + SortTextForNumber(std::max(0, song.disc()));
     case GroupBy::Disc:
       return SortTextForNumber(std::max(0, song.disc()));
     case GroupBy::Year:
-      return SortTextForYear(song.year()) + QLatin1Char(' ');
+      return SortTextForNumber(std::max(0, song.year())) + QLatin1Char(' ');
     case GroupBy::OriginalYear:
-      return SortTextForYear(song.effective_originalyear()) + QLatin1Char(' ');
+      return SortTextForNumber(std::max(0, song.effective_originalyear())) + QLatin1Char(' ');
     case GroupBy::Genre:
-      return SortText(song.genre());
+      return SortTextForArtist(song.genre(), sort_skips_articles);
     case GroupBy::Composer:
-      return SortTextForName(use_sort_tags ? song.effective_composersort() : song.composer(), sort_skip_articles_for_artists);
+      return SortTextForArtist(song.composer(), sort_skips_articles);
     case GroupBy::Performer:
-      return SortTextForName(use_sort_tags ? song.effective_performersort() : song.performer(), sort_skip_articles_for_artists);
+      return SortTextForArtist(song.performer(), sort_skips_articles);
     case GroupBy::Grouping:
-      return SortText(song.grouping());
+      return SortTextForArtist(song.grouping(), sort_skips_articles);
     case GroupBy::FileType:
       return song.TextForFiletype();
     case GroupBy::Format:
@@ -1144,9 +1135,21 @@ QString CollectionModel::SortText(QString text) {
 
 }
 
-QString CollectionModel::SortTextForName(const QString &name, const bool sort_skip_articles) {
+QString CollectionModel::SortTextForArtist(QString artist, const bool skip_articles) {
 
-  return sort_skip_articles ? SkipArticles(SortText(name)) : SortText(name);
+  artist = SortText(artist);
+
+  if (skip_articles) {
+    for (const auto &i : Song::kArticles) {
+      if (artist.startsWith(i)) {
+        qint64 ilen = i.length();
+        artist = artist.right(artist.length() - ilen) + ", "_L1 + i.left(ilen - 1);
+        break;
+      }
+    }
+  }
+
+  return artist;
 
 }
 
@@ -1165,32 +1168,18 @@ QString CollectionModel::SortTextForSong(const Song &song) {
 
 QString CollectionModel::SortTextForYear(const int year) {
 
-  const QString str = QString::number(std::max(year, 0));
+  QString str = QString::number(year);
   return QStringLiteral("0").repeated(qMax(0, 4 - str.length())) + str;
 
 }
 
 QString CollectionModel::SortTextForBitrate(const int bitrate) {
 
-  const QString str = QString::number(bitrate);
+  QString str = QString::number(bitrate);
   return QStringLiteral("0").repeated(qMax(0, 3 - str.length())) + str;
 
 }
 
-QString CollectionModel::SkipArticles(QString name) {
-
-  for (const auto &i : Song::kArticles) {
-    if (name.startsWith(i)) {
-      qint64 ilen = i.length();
-      name = name.right(name.length() - ilen) + ", "_L1 + i.left(ilen - 1);
-      break;
-    }
-  }
-
-  return name;
-
-}
-
 bool CollectionModel::IsSongTitleDataChanged(const Song &song1, const Song &song2) {
 
   return song1.url() != song2.url() ||
@@ -1221,30 +1210,27 @@ QString CollectionModel::ContainerKey(const GroupBy group_by, const Song &song,
       if (options_active_.separate_albums_by_grouping && !song.grouping().isEmpty()) key.append(QLatin1Char('-') + song.grouping());
       break;
     case GroupBy::AlbumDisc:
-      key = TextOrUnknown(song.album());
-      key.append(QLatin1Char('-') + SortTextForNumber(song.disc()));
+      key = PrettyAlbumDisc(song.album(), song.disc());
       if (!song.album_id().isEmpty()) key.append(QLatin1Char('-') + song.album_id());
       if (options_active_.separate_albums_by_grouping && !song.grouping().isEmpty()) key.append(QLatin1Char('-') + song.grouping());
       break;
     case GroupBy::YearAlbum:
-      key = SortTextForYear(song.year()) + QLatin1Char('-') + TextOrUnknown(song.album());
+      key = PrettyYearAlbum(song.year(), song.album());
       if (!song.album_id().isEmpty()) key.append(QLatin1Char('-') + song.album_id());
       if (options_active_.separate_albums_by_grouping && !song.grouping().isEmpty()) key.append(QLatin1Char('-') + song.grouping());
       break;
     case GroupBy::YearAlbumDisc:
-      key = SortTextForYear(song.year()) + QLatin1Char('-') + TextOrUnknown(song.album());
-      key.append(QLatin1Char('-') + SortTextForNumber(song.disc()));
+      key = PrettyYearAlbumDisc(song.year(), song.album(), song.disc());
       if (!song.album_id().isEmpty()) key.append(QLatin1Char('-') + song.album_id());
       if (options_active_.separate_albums_by_grouping && !song.grouping().isEmpty()) key.append(QLatin1Char('-') + song.grouping());
       break;
     case GroupBy::OriginalYearAlbum:
-      key = SortTextForYear(song.effective_originalyear()) + QLatin1Char('-') + TextOrUnknown(song.album());
+      key = PrettyYearAlbum(song.effective_originalyear(), song.album());
       if (!song.album_id().isEmpty()) key.append(QLatin1Char('-') + song.album_id());
       if (options_active_.separate_albums_by_grouping && !song.grouping().isEmpty()) key.append(QLatin1Char('-') + song.grouping());
       break;
     case GroupBy::OriginalYearAlbumDisc:
-      key = SortTextForYear(song.effective_originalyear()) + QLatin1Char('-') + TextOrUnknown(song.album());
-      key.append(QLatin1Char('-') + SortTextForNumber(song.disc()));
+      key = PrettyYearAlbumDisc(song.effective_originalyear(), song.album(), song.disc());
       if (!song.album_id().isEmpty()) key.append(QLatin1Char('-') + song.album_id());
       if (options_active_.separate_albums_by_grouping && !song.grouping().isEmpty()) key.append(QLatin1Char('-') + song.grouping());
       break;
@@ -1252,10 +1238,10 @@ QString CollectionModel::ContainerKey(const GroupBy group_by, const Song &song,
       key = PrettyDisc(song.disc());
       break;
     case GroupBy::Year:
-      key = SortTextForYear(song.year());
+      key = QString::number(std::max(0, song.year()));
       break;
     case GroupBy::OriginalYear:
-      key = SortTextForYear(song.effective_originalyear());
+      key = QString::number(std::max(0, song.effective_originalyear()));
       break;
     case GroupBy::Genre:
       key = TextOrUnknown(song.genre());
@@ -1347,7 +1333,7 @@ QString CollectionModel::DividerKey(const GroupBy group_by, const Song &song, co
     case GroupBy::Bitdepth:
       return SortTextForNumber(song.bitdepth());
     case GroupBy::Bitrate:
-      return SortTextForBitrate(song.bitrate());
+      return SortTextForNumber(song.bitrate());
     case GroupBy::None:
     case GroupBy::GroupByCount:
       return QString();

src/collection/collectionmodel.h

@@ -1,6 +1,6 @@
 /*
  * Strawberry Music Player
- * Copyright 2018-2025, Jonas Kvinge <jonas@jkvinge.net>
+ * 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
@@ -129,18 +129,14 @@ class CollectionModel : public SimpleTreeModel<CollectionItem> {
                 show_dividers(true),
                 show_pretty_covers(true),
                 show_various_artists(true),
-                sort_skip_articles_for_artists(false),
-                sort_skip_articles_for_albums(false),
-                use_sort_tags(true),
+                sort_skips_articles(true),
                 separate_albums_by_grouping(false) {}
 
     Grouping group_by;
     bool show_dividers;
     bool show_pretty_covers;
     bool show_various_artists;
-    bool sort_skip_articles_for_artists;
-    bool sort_skip_articles_for_albums;
-    bool use_sort_tags;
+    bool sort_skips_articles;
     bool separate_albums_by_grouping;
     CollectionFilterOptions filter_options;
   };
@@ -159,7 +155,7 @@ class CollectionModel : public SimpleTreeModel<CollectionItem> {
   int total_artist_count() const { return total_artist_count_; }
   int total_album_count() const { return total_album_count_; }
 
-  quint64 icon_disk_cache_size() { return static_cast<quint64>(icon_disk_cache_->cacheSize()); }
+  quint64 icon_disk_cache_size() { return icon_disk_cache_->cacheSize(); }
 
   const CollectionModel::Grouping GetGroupBy() const { return options_current_.group_by; }
   void SetGroupBy(const CollectionModel::Grouping g, const std::optional<bool> separate_albums_by_grouping = std::optional<bool>());
@@ -187,14 +183,13 @@ class CollectionModel : public SimpleTreeModel<CollectionItem> {
   static QString PrettyYearAlbumDisc(const int year, const QString &album, const int disc);
   static QString PrettyDisc(const int disc);
   static QString PrettyFormat(const Song &song);
-  static QString SortText(const GroupBy group_by, const Song &song, const bool sort_skip_articles_for_artists, const bool sort_skip_articles_for_albums, const bool use_sort_tags);
+  QString SortText(const GroupBy group_by, const Song &song, const bool sort_skips_articles);
   static QString SortText(QString text);
-  static QString SortTextForName(const QString &name, const bool sort_skip_articles);
   static QString SortTextForNumber(const int number);
+  static QString SortTextForArtist(QString artist, const bool skip_articles);
   static QString SortTextForSong(const Song &song);
   static QString SortTextForYear(const int year);
   static QString SortTextForBitrate(const int bitrate);
-  static QString SkipArticles(QString name);
   static bool IsSongTitleDataChanged(const Song &song1, const Song &song2);
   QString ContainerKey(const GroupBy group_by, const Song &song, bool &has_unique_album_identifier) const;
 
@@ -233,7 +228,7 @@ class CollectionModel : public SimpleTreeModel<CollectionItem> {
 
   QVariant data(CollectionItem *item, const int role) const;
 
-  void ScheduleUpdate(const CollectionModelUpdate::Type type, const SongList &songs = SongList());
+  void ScheduleUpdate(const CollectionModelUpdate::Type type, const SongList &songs);
   void ScheduleAddSongs(const SongList &songs);
   void ScheduleUpdateSongs(const SongList &songs);
   void ScheduleRemoveSongs(const SongList &songs);
@@ -264,7 +259,7 @@ class CollectionModel : public SimpleTreeModel<CollectionItem> {
   static qint64 MaximumCacheSize(Settings *s, const char *size_id, const char *size_unit_id, const qint64 cache_size_default);
 
  private Q_SLOTS:
-  void ResetInternal();
+  void Reload();
   void ScheduleReset();
   void ProcessUpdate();
   void LoadSongsFromSqlAsyncFinished();
@@ -283,6 +278,7 @@ class CollectionModel : public SimpleTreeModel<CollectionItem> {
   const SharedPtr<AlbumCoverLoader> albumcover_loader_;
   CollectionDirectoryModel *dir_model_;
   CollectionFilter *filter_;
+  QTimer *timer_reload_;
   QTimer *timer_update_;
 
   QPixmap pixmap_no_cover_;

src/collection/collectionmodelupdate.h

@@ -25,13 +25,12 @@
 class CollectionModelUpdate {
  public:
   enum class Type {
-    Reset,
     AddReAddOrUpdate,
     Add,
     Update,
     Remove,
   };
-  explicit CollectionModelUpdate(const Type _type, const SongList &_songs = SongList());
+  explicit CollectionModelUpdate(const Type _type, const SongList &_songs);
   Type type;
   SongList songs;
 };

src/collection/collectionplaylistitem.cpp

@@ -1,6 +1,8 @@
 /*
  * Strawberry Music Player
- * Copyright 2018-2025, Jonas Kvinge <jonas@jkvinge.net>
+ * 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
@@ -28,57 +30,55 @@
 
 class SqlRow;
 
-CollectionPlaylistItem::CollectionPlaylistItem(const Song::Source source) : PlaylistItem(source) {
-  song_.set_source(source);
+CollectionPlaylistItem::CollectionPlaylistItem() : PlaylistItem(Song::Source::Collection) {
+  song_.set_source(Song::Source::Collection);
 }
 
-CollectionPlaylistItem::CollectionPlaylistItem(const Song &song) : PlaylistItem(song.source()), song_(song) {}
+CollectionPlaylistItem::CollectionPlaylistItem(const Song &song) : PlaylistItem(Song::Source::Collection), song_(song) {
+  song_.set_source(Song::Source::Collection);
+}
+
+QUrl CollectionPlaylistItem::Url() const { return song_.url(); }
+
+void CollectionPlaylistItem::Reload() {
+
+  const TagReaderResult result = TagReaderClient::Instance()->ReadFileBlocking(song_.url().toLocalFile(), &song_);
+  if (!result.success()) {
+    qLog(Error) << "Could not reload file" << song_.url() << result.error_string();
+    return;
+  }
+  UpdateTemporaryMetadata(song_);
+
+}
 
 bool CollectionPlaylistItem::InitFromQuery(const SqlRow &query) {
 
-  int col = 0;
-  switch (source_) {
-    case Song::Source::Collection:
-      col = 0;
-      break;
-    default:
-      col = static_cast<int>(Song::kRowIdColumns.count());
-      break;
-  }
-
-  song_.InitFromQuery(query, true, col);
-
+  // Rows from the songs tables come first
+  song_.InitFromQuery(query, true);
+  song_.set_source(Song::Source::Collection);
   return song_.is_valid();
 
 }
 
-void CollectionPlaylistItem::Reload() {
+QVariant CollectionPlaylistItem::DatabaseValue(DatabaseColumn column) const {
 
-  if (song_.url().isLocalFile()) {
-    const TagReaderResult result = TagReaderClient::Instance()->ReadFileBlocking(song_.url().toLocalFile(), &song_);
-    if (!result.success()) {
-      qLog(Error) << "Could not reload file" << song_.url() << result.error_string();
-      return;
-    }
-    UpdateStreamMetadata(song_);
+  switch (column) {
+    case Column_CollectionId: return song_.id();
+    default: return PlaylistItem::DatabaseValue(column);
   }
 
 }
 
-QVariant CollectionPlaylistItem::DatabaseValue(const DatabaseColumn database_column) const {
+Song CollectionPlaylistItem::Metadata() const {
 
-  switch (database_column) {
-    case DatabaseColumn::CollectionId:
-      return song_.id();
-    default:
-      return PlaylistItem::DatabaseValue(database_column);
-  }
+  if (HasTemporaryMetadata()) return temp_metadata_;
+  return song_;
 
 }
 
 void CollectionPlaylistItem::SetArtManual(const QUrl &cover_url) {
 
   song_.set_art_manual(cover_url);
-  if (HasStreamMetadata()) stream_song_.set_art_manual(cover_url);
+  if (HasTemporaryMetadata()) temp_metadata_.set_art_manual(cover_url);
 
 }

src/collection/collectionplaylistitem.h

@@ -1,6 +1,8 @@
 /*
  * Strawberry Music Player
- * Copyright 2018-2025, Jonas Kvinge <jonas@jkvinge.net>
+ * 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
@@ -32,23 +34,25 @@ class SqlRow;
 
 class CollectionPlaylistItem : public PlaylistItem {
  public:
-  explicit CollectionPlaylistItem(const Song::Source source);
+  explicit CollectionPlaylistItem();
   explicit CollectionPlaylistItem(const Song &song);
 
-  Song OriginalMetadata() const override { return song_; }
-  void SetOriginalMetadata(const Song &song) override { song_ = song; }
-
-  QUrl OriginalUrl() const override { return song_.url(); }
-  bool IsLocalCollectionItem() const override { return song_.source() == Song::Source::Collection; }
-
   bool InitFromQuery(const SqlRow &query) override;
   void Reload() override;
 
+  Song Metadata() const override;
+  Song OriginalMetadata() const override { return song_; }
+  void SetMetadata(const Song &song) override { song_ = song; }
+
+  QUrl Url() const override;
+
+  bool IsLocalCollectionItem() const override { return true; }
+
   void SetArtManual(const QUrl &cover_url) override;
 
  protected:
-  QVariant DatabaseValue(const DatabaseColumn database_column) const override;
-  Song DatabaseSongMetadata() const override { return Song(source_); }
+  QVariant DatabaseValue(DatabaseColumn column) const override;
+  Song DatabaseSongMetadata() const override { return Song(Song::Source::Collection); }
 
  protected:
   Song song_;
@@ -58,3 +62,4 @@ class CollectionPlaylistItem : public PlaylistItem {
 };
 
 #endif  // COLLECTIONPLAYLISTITEM_H
+

src/collection/collectionquery.cpp

@@ -101,9 +101,9 @@ void CollectionQuery::AddCompilationRequirement(const bool compilation) {
 QString CollectionQuery::GetInnerQuery() const {
   return duplicates_only_
              ? QStringLiteral(" INNER JOIN (select * from duplicated_songs) dsongs        "
-                              "ON (%songs_table.artist = dsongs.dup_artist       "
-                              "AND %songs_table.album = dsongs.dup_album     "
-                              "AND %songs_table.title = dsongs.dup_title)    ")
+                   "ON (%songs_table.artist = dsongs.dup_artist       "
+                   "AND %songs_table.album = dsongs.dup_album     "
+                   "AND %songs_table.title = dsongs.dup_title)    ")
              : QString();
 }
 

src/collection/collectionview.cpp

@@ -51,7 +51,7 @@
 #include <QContextMenuEvent>
 
 #include "core/iconloader.h"
-#include "core/mimedata.h"
+#include "mimedata/mimedata.h"
 #include "core/musicstorage.h"
 #include "core/deletefiles.h"
 #include "core/settings.h"
@@ -65,9 +65,11 @@
 #include "collectionitem.h"
 #include "collectionitemdelegate.h"
 #include "collectionview.h"
-#include "device/devicemanager.h"
-#include "device/devicestatefiltermodel.h"
-#include "dialogs/edittagdialog.h"
+#ifndef Q_OS_WIN
+#  include "device/devicemanager.h"
+#  include "device/devicestatefiltermodel.h"
+#endif
+#include "edittagdialog/edittagdialog.h"
 #include "dialogs/deleteconfirmationdialog.h"
 #include "organize/organizedialog.h"
 #include "organize/organizeerrordialog.h"
@@ -93,7 +95,9 @@ CollectionView::CollectionView(QWidget *parent)
       action_open_in_new_playlist_(nullptr),
       action_organize_(nullptr),
       action_search_for_this_(nullptr),
+#ifndef Q_OS_WIN
       action_copy_to_device_(nullptr),
+#endif
       action_edit_track_(nullptr),
       action_edit_tracks_(nullptr),
       action_rescan_songs_(nullptr),
@@ -413,7 +417,9 @@ void CollectionView::contextMenuEvent(QContextMenuEvent *e) {
 
     context_menu_->addSeparator();
     action_organize_ = context_menu_->addAction(IconLoader::Load(u"edit-copy"_s), tr("Organize files..."), this, &CollectionView::Organize);
+#ifndef Q_OS_WIN
     action_copy_to_device_ = context_menu_->addAction(IconLoader::Load(u"device"_s), tr("Copy to device..."), this, &CollectionView::CopyToDevice);
+#endif
     action_delete_files_ = context_menu_->addAction(IconLoader::Load(u"edit-delete"_s), tr("Delete from disk..."), this, &CollectionView::Delete);
 
     context_menu_->addSeparator();
@@ -433,8 +439,10 @@ void CollectionView::contextMenuEvent(QContextMenuEvent *e) {
 
     context_menu_->addMenu(filter_widget_->menu());
 
+#ifndef Q_OS_WIN
     action_copy_to_device_->setDisabled(device_manager_->connected_devices_model()->rowCount() == 0);
     QObject::connect(device_manager_->connected_devices_model(), &DeviceStateFilterModel::IsEmptyChanged, action_copy_to_device_, &QAction::setDisabled);
+#endif
 
   }
 
@@ -473,7 +481,9 @@ void CollectionView::contextMenuEvent(QContextMenuEvent *e) {
   action_rescan_songs_->setEnabled(regular_editable > 0);
 
   action_organize_->setVisible(regular_elements == regular_editable);
+#ifndef Q_OS_WIN
   action_copy_to_device_->setVisible(regular_elements == regular_editable);
+#endif
 
   action_delete_files_->setVisible(delete_files_);
 
@@ -482,7 +492,9 @@ void CollectionView::contextMenuEvent(QContextMenuEvent *e) {
 
   // only when all selected items are editable
   action_organize_->setEnabled(regular_elements == regular_editable);
+#ifndef Q_OS_WIN
   action_copy_to_device_->setEnabled(regular_elements == regular_editable);
+#endif
 
   action_delete_files_->setEnabled(delete_files_);
 
@@ -747,6 +759,7 @@ void CollectionView::RescanSongs() {
 
 void CollectionView::CopyToDevice() {
 
+#ifndef Q_OS_WIN
   if (!organize_dialog_) {
     organize_dialog_ = make_unique<OrganizeDialog>(task_manager_, tagreader_client_, nullptr, this);
   }
@@ -755,6 +768,7 @@ void CollectionView::CopyToDevice() {
   organize_dialog_->SetCopy(true);
   organize_dialog_->SetSongs(GetSelectedSongs());
   organize_dialog_->show();
+#endif
 
 }
 

src/collection/collectionview.h

@@ -138,6 +138,7 @@ class CollectionView : public AutoExpandingTreeView {
   void DeleteFilesFinished(const SongList &songs_with_errors);
 
  private:
+  void RecheckIsEmpty();
   void SetShowInVarious(const bool on);
   bool RestoreLevelFocus(const QModelIndex &parent = QModelIndex());
   void SaveContainerPath(const QModelIndex &child);
@@ -175,7 +176,9 @@ class CollectionView : public AutoExpandingTreeView {
   QAction *action_organize_;
   QAction *action_search_for_this_;
 
+#ifndef Q_OS_WIN
   QAction *action_copy_to_device_;
+#endif
   QAction *action_edit_track_;
   QAction *action_edit_tracks_;
   QAction *action_rescan_songs_;

src/collection/collectionviewcontainer.cpp

@@ -26,7 +26,7 @@
 #include "collectionfilterwidget.h"
 #include "collectionview.h"
 #include "collectionviewcontainer.h"
-#include "ui_collectionviewcontainer.h"
+#include "collection/ui_collectionviewcontainer.h"
 
 CollectionViewContainer::CollectionViewContainer(QWidget *parent) : QWidget(parent), ui_(new Ui_CollectionViewContainer) {
 

src/collection/collectionwatcher.cpp

@@ -706,14 +706,8 @@ void CollectionWatcher::ScanSubdirectory(const QString &path, const CollectionSu
         qLog(Debug) << file << "is missing EBU R 128 loudness characteristics.";
       }
 
-      // If the song is unavailable and nothing has changed, just mark it as available without re-scanning
-      // For CUE files with multiple sections, all sections share the same file and would have the same availability status
-      if (matching_song.unavailable() && !changed && !missing_fingerprint && !missing_loudness_characteristics) {
-        qLog(Debug) << "Unavailable song" << file << "restored without re-scanning.";
-        t->readded_songs << matching_songs;
-      }
       // The song's changed or missing fingerprint - create fingerprint and reread the metadata from file.
-      else if (t->ignores_mtime() || changed || missing_fingerprint || missing_loudness_characteristics) {
+      if (t->ignores_mtime() || changed || missing_fingerprint || missing_loudness_characteristics) {
 
         QString fingerprint;
 #ifdef HAVE_SONGFINGERPRINTING
@@ -734,6 +728,12 @@ void CollectionWatcher::ScanSubdirectory(const QString &path, const CollectionSu
         }
       }
 
+      // Nothing has changed - mark the song available without re-scanning
+      else if (matching_song.unavailable()) {
+        qLog(Debug) << "Unavailable song" << file << "restored.";
+        t->readded_songs << matching_songs;
+      }
+
     }
     else {  // Search the DB by fingerprint.
       QString fingerprint;
@@ -858,7 +858,7 @@ void CollectionWatcher::UpdateCueAssociatedSongs(const QString &file,
 
   QHash<quint64, Song> sections_map;
   for (const Song &song : old_cue_songs) {
-    sections_map.insert(static_cast<quint64>(song.beginning_nanosec()), song);
+    sections_map.insert(song.beginning_nanosec(), song);
   }
 
   // Load new CUE songs
@@ -879,8 +879,8 @@ void CollectionWatcher::UpdateCueAssociatedSongs(const QString &file,
     PerformEBUR128Analysis(new_cue_song);
     new_cue_song.set_fingerprint(fingerprint);
 
-    if (sections_map.contains(static_cast<quint64>(new_cue_song.beginning_nanosec()))) {  // Changed section
-      const Song matching_cue_song = sections_map[static_cast<quint64>(new_cue_song.beginning_nanosec())];
+    if (sections_map.contains(new_cue_song.beginning_nanosec())) {  // Changed section
+      const Song matching_cue_song = sections_map[new_cue_song.beginning_nanosec()];
       new_cue_song.set_id(matching_cue_song.id());
       new_cue_song.set_art_automatic(art_automatic);
       new_cue_song.MergeUserSetData(matching_cue_song, true, true);
@@ -999,18 +999,6 @@ void CollectionWatcher::AddChangedSong(const QString &file, const Song &matching
       changes << u"file path"_s;
       notify_new = true;
     }
-    if (matching_song.filetype() != new_song.filetype()) {
-      changes << u"filetype"_s;
-      notify_new = true;
-    }
-    if (matching_song.filesize() != new_song.filesize()) {
-      changes << u"filesize"_s;
-      notify_new = true;
-    }
-    if (matching_song.length_nanosec() != new_song.length_nanosec()) {
-      changes << u"length"_s;
-      notify_new = true;
-    }
     if (matching_song.fingerprint() != new_song.fingerprint()) {
       changes << u"fingerprint"_s;
       notify_new = true;
@@ -1046,9 +1034,6 @@ void CollectionWatcher::AddChangedSong(const QString &file, const Song &matching
     if (matching_song.mtime() != new_song.mtime()) {
       changes << u"mtime"_s;
     }
-    if (matching_song.ctime() != new_song.ctime()) {
-      changes << u"ctime"_s;
-    }
 
     if (changes.isEmpty()) {
       qLog(Debug) << "Song" << file << "unchanged.";
@@ -1097,7 +1082,7 @@ quint64 CollectionWatcher::GetMtimeForCue(const QString &cue_path) {
 
   const QDateTime cue_last_modified = fileinfo.lastModified();
 
-  return cue_last_modified.isValid() ? static_cast<quint64>(cue_last_modified.toSecsSinceEpoch()) : 0;
+  return cue_last_modified.isValid() ? cue_last_modified.toSecsSinceEpoch() : 0;
 
 }
 

src/collection/collectionwatcher.h

@@ -137,7 +137,7 @@ class CollectionWatcher : public QObject {
     QStringList files_changed_path_;
 
    private:
-    ScanTransaction &operator=(const ScanTransaction &transaction) { Q_UNUSED(transaction); return *this; }
+    ScanTransaction &operator=(const ScanTransaction&) { return *this; }
 
     int task_id_;
     quint64 progress_;
@@ -261,6 +261,7 @@ class CollectionWatcher : public QObject {
   static QStringList sValidImages;
 
   qint64 last_scan_time_;
+
 };
 
 inline QString CollectionWatcher::NoExtensionPart(const QString &fileName) {

src/collection/savedgroupingmanager.cpp

@@ -30,7 +30,6 @@
 #include <QByteArray>
 #include <QString>
 #include <QStringList>
-#include <QUrl>
 #include <QIODevice>
 #include <QDataStream>
 #include <QKeySequence>
@@ -168,20 +167,14 @@ void SavedGroupingManager::UpdateModel() {
   if (version == 1) {
     QStringList saved = s.childKeys();
     for (int i = 0; i < saved.size(); ++i) {
-      const QString &name = saved.at(i);
-      if (name == "version"_L1) continue;
-      QByteArray bytes = s.value(name).toByteArray();
+      if (saved.at(i) == "version"_L1) continue;
+      QByteArray bytes = s.value(saved.at(i)).toByteArray();
       QDataStream ds(&bytes, QIODevice::ReadOnly);
       CollectionModel::Grouping g;
       ds >> g;
 
       QList<QStandardItem*> list;
-
-      QStandardItem *item = new QStandardItem();
-      item->setText(QUrl::fromPercentEncoding(name.toUtf8()));
-      item->setData(name);
-
-      list << item
+      list << new QStandardItem(saved.at(i))
            << new QStandardItem(GroupByToString(g.first))
            << new QStandardItem(GroupByToString(g.second))
            << new QStandardItem(GroupByToString(g.third));
@@ -192,9 +185,8 @@ void SavedGroupingManager::UpdateModel() {
   else {
     QStringList saved = s.childKeys();
     for (int i = 0; i < saved.size(); ++i) {
-      const QString &name = saved.at(i);
-      if (name == "version"_L1) continue;
-      s.remove(name);
+      if (saved.at(i) == "version"_L1) continue;
+      s.remove(saved.at(i));
     }
   }
   s.endGroup();
@@ -210,7 +202,7 @@ void SavedGroupingManager::Remove() {
     for (const QModelIndex &idx : indexes) {
       if (idx.isValid()) {
         qLog(Debug) << "Remove saved grouping: " << model_->item(idx.row(), 0)->text();
-        s.remove(model_->item(idx.row(), 0)->data().toString());
+        s.remove(model_->item(idx.row(), 0)->text());
       }
     }
     s.endGroup();

src/config.h.in

@@ -27,13 +27,10 @@
 #cmakedefine HAVE_GLOBALSHORTCUTS
 #cmakedefine HAVE_X11_GLOBALSHORTCUTS
 #cmakedefine HAVE_KGLOBALACCEL_GLOBALSHORTCUTS
-#cmakedefine HAVE_STREAMTAGREADER
 #cmakedefine HAVE_SUBSONIC
 #cmakedefine HAVE_TIDAL
 #cmakedefine HAVE_SPOTIFY
 #cmakedefine HAVE_QOBUZ
-#cmakedefine HAVE_DISCORD_RPC
-#cmakedefine HAVE_NETWORKREMOTE
 
 #cmakedefine HAVE_TAGLIB_DSFFILE
 #cmakedefine HAVE_TAGLIB_DSDIFFFILE
@@ -44,8 +41,8 @@
 #cmakedefine INSTALL_TRANSLATIONS
 #define TRANSLATIONS_DIR "${CMAKE_INSTALL_PREFIX}/share/strawberry/translations"
 
-#cmakedefine HAVE_QPA_QPLATFORMNATIVEINTERFACE
 #cmakedefine HAVE_QX11APPLICATION
+#cmakedefine HAVE_QPA_QPLATFORMNATIVEINTERFACE_H
 
 #cmakedefine ENABLE_WIN32_CONSOLE
 

src/constants/appearancesettings.h

@@ -1,21 +1,21 @@
 /*
- * Strawberry Music Player
- * Copyright 2024, Jonas Kvinge <jonas@jkvinge.net>
- *
- * Strawberry is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Strawberry is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
+* Strawberry Music Player
+* Copyright 2024, Jonas Kvinge <jonas@jkvinge.net>
+*
+* Strawberry is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* Strawberry is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
+*
+*/
 
 #ifndef APPEARANCESETTINGS_H
 #define APPEARANCESETTINGS_H
@@ -70,6 +70,6 @@ enum class BackgroundImagePosition {
   BottomRight = 5
 };
 
-}  // namespace AppearanceSettings
+}  // namespace
 
 #endif  // APPEARANCESETTINGS_H

src/constants/backendsettings.h

@@ -1,21 +1,21 @@
 /*
- * Strawberry Music Player
- * Copyright 2024, Jonas Kvinge <jonas@jkvinge.net>
- *
- * Strawberry is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Strawberry is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
+* Strawberry Music Player
+* Copyright 2024, Jonas Kvinge <jonas@jkvinge.net>
+*
+* Strawberry is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* Strawberry is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
+*
+*/
 
 #ifndef BACKENDSETTINGS_H
 #define BACKENDSETTINGS_H
@@ -26,14 +26,10 @@ namespace BackendSettings {
 
 constexpr char kSettingsGroup[] = "Backend";
 
-constexpr char kEngine[] = "engine";
-constexpr char kEngineU[] = "Engine";
-constexpr char kOutput[] = "output";
-constexpr char kOutputU[] = "Output";
-constexpr char kDevice[] = "device";
-constexpr char kDeviceU[] = "Device";
+constexpr char kEngine[] = "Engine";
+constexpr char kOutput[] = "Output";
+constexpr char kDevice[] = "Device";
 constexpr char kALSAPlugin[] = "alsaplugin";
-constexpr char kPlaybin3[] = "playbin3";
 constexpr char kExclusiveMode[] = "exclusive_mode";
 constexpr char kVolumeControl[] = "volume_control";
 constexpr char kChannelsEnabled[] = "channels_enabled";
@@ -63,6 +59,6 @@ constexpr qint64 kDefaultBufferDuration = 4000;
 constexpr double kDefaultBufferLowWatermark = 0.33;
 constexpr double kDefaultBufferHighWatermark = 0.99;
 
-}  // namespace BackendSettings
+}  // namespace
 
 #endif  // BACKENDSETTINGS_H

src/constants/behavioursettings.h

@@ -1,21 +1,21 @@
 /*
- * Strawberry Music Player
- * Copyright 2024, Jonas Kvinge <jonas@jkvinge.net>
- *
- * Strawberry is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Strawberry is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
+* Strawberry Music Player
+* Copyright 2024, Jonas Kvinge <jonas@jkvinge.net>
+*
+* Strawberry is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* Strawberry is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
+*
+*/
 
 #ifndef BEHAVIOURSETTINGS_H
 #define BEHAVIOURSETTINGS_H
@@ -71,6 +71,6 @@ constexpr char kDoubleClickPlaylistAddMode[] = "doubleclick_playlist_addmode";
 constexpr char kSeekStepSec[] = "seek_step_sec";
 constexpr char kVolumeIncrement[] = "volume_increment";
 
-}  // namespace BehaviourSettings
+}  // namespace
 
 #endif  // BEHAVIOURSETTINGS_H

src/constants/collectionsettings.h

@@ -1,21 +1,21 @@
 /*
- * Strawberry Music Player
- * Copyright 2024-2025, Jonas Kvinge <jonas@jkvinge.net>
- *
- * Strawberry is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * 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/>.
- *
- */
+* Strawberry Music Player
+* Copyright 2024, Jonas Kvinge <jonas@jkvinge.net>
+*
+* Strawberry is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* Strawberry is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
+*
+*/
 
 #ifndef COLLECTIONSETTINGS_H
 #define COLLECTIONSETTINGS_H
@@ -24,20 +24,18 @@ namespace CollectionSettings {
 
 constexpr char kSettingsGroup[] = "Collection";
 
-constexpr char kStartupScan[] = "startup_scan";
-constexpr char kMonitor[] = "monitor";
-constexpr char kSongTracking[] = "song_tracking";
-constexpr char kMarkSongsUnavailable[] = "mark_songs_unavailable";
-constexpr char kSongENUR128LoudnessAnalysis[] = "song_ebur128_loudness_analysis";
-constexpr char kExpireUnavailableSongs[] = "expire_unavailable_songs";
-constexpr char kCoverArtPatterns[] = "cover_art_patterns";
 constexpr char kAutoOpen[] = "auto_open";
 constexpr char kShowDividers[] = "show_dividers";
 constexpr char kPrettyCovers[] = "pretty_covers";
 constexpr char kVariousArtists[] = "various_artists";
-constexpr char kSkipArticlesForArtists[] = "skip_articles_for_artists";
-constexpr char kSkipArticlesForAlbums[] = "skip_articles_for_albums";
-constexpr char kUseSortTags[] = "use_short_tags";
+constexpr char kSortSkipsArticles[] = "sort_skips_articles";
+constexpr char kStartupScan[] = "startup_scan";
+constexpr char kMonitor[] = "monitor";
+constexpr char kSongTracking[] = "song_tracking";
+constexpr char kSongENUR128LoudnessAnalysis[] = "song_ebur128_loudness_analysis";
+constexpr char kMarkSongsUnavailable[] = "mark_songs_unavailable";
+constexpr char kExpireUnavailableSongs[] = "expire_unavailable_songs";
+constexpr char kCoverArtPatterns[] = "cover_art_patterns";
 constexpr char kSettingsCacheSize[] = "cache_size";
 constexpr char kSettingsCacheSizeUnit[] = "cache_size_unit";
 constexpr char kSettingsDiskCacheEnable[] = "disk_cache_enable";
@@ -59,6 +57,6 @@ enum class CacheSizeUnit {
   TB
 };
 
-}  // namespace CollectionSettings
+}  // namespace
 
 #endif  // COLLECTIONSETTINGS_H

src/constants/contextsettings.h

@@ -1,21 +1,21 @@
 /*
- * Strawberry Music Player
- * Copyright 2024, Jonas Kvinge <jonas@jkvinge.net>
- *
- * Strawberry is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Strawberry is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
+* Strawberry Music Player
+* Copyright 2024, Jonas Kvinge <jonas@jkvinge.net>
+*
+* Strawberry is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* Strawberry is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
+*
+*/
 
 #ifndef CONTEXTSETTINGS_H
 #define CONTEXTSETTINGS_H
@@ -43,6 +43,6 @@ constexpr char kSettingsSummaryFmt[] = "SummaryFmt";
 constexpr char kDefaultFontFamily[] = "Noto Sans";
 constexpr qreal kDefaultFontSizeHeadline = 11;
 
-}  // namespace ContextSettings
+}  // namespace
 
 #endif  // CONTEXTSETTINGS_H

src/constants/coverssettings.h

@@ -1,21 +1,21 @@
 /*
- * Strawberry Music Player
- * Copyright 2024, Jonas Kvinge <jonas@jkvinge.net>
- *
- * Strawberry is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Strawberry is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
+* Strawberry Music Player
+* Copyright 2024, Jonas Kvinge <jonas@jkvinge.net>
+*
+* Strawberry is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* Strawberry is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
+*
+*/
 
 #ifndef COVERSSETTINGS_H
 #define COVERSSETTINGS_H
@@ -32,6 +32,6 @@ constexpr char kSaveOverwrite[] = "save_overwrite";
 constexpr char kSaveLowercase[] = "save_lowercase";
 constexpr char kSaveReplaceSpaces[] = "save_replace_spaces";
 
-}  // namespace CoversSettings
+}  // namespace
 
 #endif  // COVERSSETTINGS_H

src/constants/filefilterconstants.h

@@ -1,21 +1,21 @@
 /*
- * Strawberry Music Player
- * Copyright 2024, Jonas Kvinge <jonas@jkvinge.net>
- *
- * Strawberry is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Strawberry is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
+* Strawberry Music Player
+* Copyright 2024, Jonas Kvinge <jonas@jkvinge.net>
+*
+* Strawberry is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* Strawberry is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
+*
+*/
 
 #ifndef FILEFILTERCONSTANTS_H
 #define FILEFILTERCONSTANTS_H
@@ -27,10 +27,10 @@ constexpr char kAllFilesFilterSpec[] = QT_TRANSLATE_NOOP("FileFilter", "All File
 constexpr char kFileFilter[] =
     "*.wav *.flac *.wv *.ogg *.oga *.opus *.spx *.ape *.mpc "
     "*.mp2 *.mp3 *.m4a *.mp4 *.aac *.asf *.asx *.wma "
-    "*.aif *.aiff *.mka *.tta *.dsf *.dsd *.webm "
+    "*.aif *.aiff *.mka *.tta *.dsf *.dsd "
     "*.cue *.m3u *.m3u8 *.pls *.xspf *.asxini "
     "*.ac3 *.dts "
-    "*.mod *.s3m *.xm *.it "
+    "*.mod *.s3m *.xm *.it"
     "*.spc *.vgm";
 
 constexpr char kLoadImageFileFilter[] = QT_TRANSLATE_NOOP("FileFilter", "Images (*.png *.jpg *.jpeg *.bmp *.gif *.xpm *.pbm *.pgm *.ppm *.xbm)");

src/constants/filenameconstants.h

@@ -1,21 +1,21 @@
 /*
- * Strawberry Music Player
- * Copyright 2023, 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/>.
- *
- */
+* Strawberry Music Player
+* Copyright 2023, 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 FILENAMECONSTANTS_H
 #define FILENAMECONSTANTS_H