Release 1.0.0

Workaround bug in GStreamer

Fixes #787
Fixes #772

.circleci/config.yml

@@ -1,417 +0,0 @@
-version: 2.1
-commands:
-
-  cmake:
-    description: Configure build
-    steps:
-      - run:
-          name: Configure build
-          command: cmake ..
-          working_directory: build
-
-
-  build_source:
-    description: Create source tarball
-    steps:
-      - run:
-          name: Create source tarball
-          command: ../dist/scripts/maketarball.sh
-          working_directory: build
-
-
-  build_rpm:
-    description: Build RPM
-    steps:
-      - run:
-          name: Create RPM build sources directories
-          command: mkdir -p ~/rpmbuild/SOURCES /usr/src/packages/SOURCES
-      - run:
-          name: Copy source tarball 1
-          command: cp strawberry-*.tar.xz ~/rpmbuild/SOURCES/
-          working_directory: build
-      - run:
-          name: Copy source tarball 2
-          command: cp strawberry-*.tar.xz /usr/src/packages/SOURCES/
-          working_directory: build
-      - run:
-          name: Build RPM
-          command: rpmbuild -ba ../dist/unix/strawberry.spec
-          working_directory: build
-
-
-  build_deb:
-    description: Build Deb
-    steps:
-      - run:
-          name: make deb
-          command: dpkg-buildpackage -b -d -uc -us -nc -j2
-
-
-  install_opensuse_dependencies:
-    description: Install openSUSE dependencies
-    steps:
-      - run:
-          name: Update packages
-          command: zypper --non-interactive --gpg-auto-import-keys ref
-      - run:
-          name: Install openSUSE dependencies
-          command: >
-            zypper --non-interactive --gpg-auto-import-keys install
-            lsb-release
-            rpm-build
-            git
-            tar
-            make
-            cmake
-            gcc
-            gcc-c++
-            gettext-tools
-            glibc-devel
-            libboost_headers-devel
-            boost-devel
-            glib2-devel
-            glib2-tools
-            dbus-1-devel
-            alsa-devel
-            libnotify-devel
-            libgnutls-devel
-            protobuf-devel
-            sqlite3-devel
-            libpulse-devel
-            gstreamer-devel
-            gstreamer-plugins-base-devel
-            taglib-devel
-            vlc-devel
-            libQt5Core-devel
-            libQt5Gui-devel
-            libQt5Widgets-devel
-            libQt5Concurrent-devel
-            libQt5Network-devel
-            libQt5Sql-devel
-            libQt5DBus-devel
-            libQt5Test-devel
-            libqt5-qtx11extras-devel
-            libqt5-qtbase-common-devel
-            libQt5Sql5-sqlite
-            libqt5-linguist-devel
-            libcdio-devel
-            libgpod-devel
-            libmtp-devel
-            libchromaprint-devel
-            desktop-file-utils
-            update-desktop-files
-            appstream-glib
-            hicolor-icon-theme
-
-
-  install_fedora_dependencies:
-    description: Install Fedora dependencies
-    steps:
-      - run:
-          name: Update packages
-          command: yum update --assumeyes
-      - run:
-          name: Upgrade packages
-          command: yum upgrade --assumeyes
-      - run:
-          name: Install Fedora dependencies
-          command: >
-            dnf install --assumeyes
-            @development-tools
-            redhat-lsb-core
-            git
-            glibc
-            gcc-c++
-            rpmdevtools
-            make
-            cmake
-            pkgconfig
-            glib
-            man
-            tar
-            gettext
-            openssh
-            boost-devel
-            dbus-devel
-            protobuf-devel
-            protobuf-compiler
-            sqlite-devel
-            alsa-lib-devel
-            pulseaudio-libs-devel
-            libnotify-devel
-            gnutls-devel
-            qt5-qtbase-devel
-            qt5-qtx11extras-devel
-            qt5-qttools-devel
-            gstreamer1-devel
-            gstreamer1-plugins-base-devel
-            taglib-devel
-            libcdio-devel
-            libgpod-devel
-            libmtp-devel
-            libchromaprint-devel
-            fftw-devel
-            desktop-file-utils
-            libappstream-glib
-            hicolor-icon-theme
-
-
-  install_debian_dependencies:
-    description: Install Debian dependencies
-    steps:
-      - run:
-          name: Install Debian dependencies
-          command: >
-            apt-get update && apt-get install -y
-            build-essential
-            dh-make
-            ssh
-            git
-            make
-            cmake
-            gcc
-            pkg-config
-            fakeroot
-            gettext
-            lsb-release
-            libglib2.0-dev
-            dpkg-dev
-            libdbus-1-dev
-            libboost-dev
-            libprotobuf-dev
-            protobuf-compiler
-            libsqlite3-dev
-            libgnutls28-dev
-            libasound2-dev
-            libpulse-dev
-            libtag1-dev
-            qtbase5-dev
-            qtbase5-dev-tools
-            qtbase5-private-dev
-            libqt5x11extras5-dev
-            qttools5-dev
-            libgstreamer1.0-dev
-            libgstreamer-plugins-base1.0-dev
-            gstreamer1.0-alsa
-            gstreamer1.0-pulseaudio
-            libchromaprint-dev
-            libfftw3-dev
-            libcdio-dev
-            libmtp-dev
-            libgpod-dev
-
-
-  install_ubuntu_dependencies:
-    description: Install Ubuntu dependencies
-    steps:
-      - run:
-          name: Setup environment
-          command: |
-            echo 'export DEBIAN_FRONTEND=noninteractive' >> $BASH_ENV
-            source $BASH_ENV
-      - run:
-          name: Install Ubuntu dependencies
-          command: >
-            apt-get update && apt-get install -y
-            build-essential
-            dh-make
-            ssh
-            git
-            make
-            cmake
-            pkg-config
-            gcc
-            fakeroot
-            wget
-            curl
-            gettext
-            lsb-release
-            dpkg-dev
-            libglib2.0-dev
-            libboost-dev
-            libdbus-1-dev
-            libprotobuf-dev
-            protobuf-compiler
-            libsqlite3-dev
-            libgnutls28-dev
-            libasound2-dev
-            libpulse-dev
-            libtag1-dev
-            qtbase5-dev
-            qtbase5-dev-tools
-            qtbase5-private-dev
-            libqt5x11extras5-dev
-            qttools5-dev
-            libgstreamer1.0-dev
-            libgstreamer-plugins-base1.0-dev
-            libgstreamer-plugins-good1.0-dev
-            gstreamer1.0-alsa
-            gstreamer1.0-pulseaudio
-            libchromaprint-dev
-            libfftw3-dev
-            libcdio-dev
-            libmtp-dev
-            libgpod-dev
-
-
-jobs:
-
-  build_source:
-    docker:
-      - image: opensuse/leap:15.2
-    steps:
-      - install_opensuse_dependencies
-      - checkout
-      - cmake
-      - build_source
-
-
-  build_opensuse_lp151:
-    docker:
-      - image: opensuse/leap:15.1
-    environment:
-      RPM_BUILD_NCPUS: "2"
-    steps:
-      - install_opensuse_dependencies
-      - checkout
-      - cmake
-      - build_source
-      - build_rpm
-
-  build_opensuse_lp152:
-    docker:
-      - image: opensuse/leap:15.2
-    environment:
-      RPM_BUILD_NCPUS: "2"
-    steps:
-      - install_opensuse_dependencies
-      - checkout
-      - cmake
-      - build_source
-      - build_rpm
-
-
-  build_fedora_32:
-    docker:
-      - image: fedora:32
-    environment:
-      RPM_BUILD_NCPUS: "2"
-    steps:
-      - install_fedora_dependencies
-      - checkout
-      - cmake
-      - build_source
-      - build_rpm
-
-  build_fedora_33:
-    docker:
-      - image: fedora:33
-    environment:
-      RPM_BUILD_NCPUS: "2"
-    steps:
-      - install_fedora_dependencies
-      - checkout
-      - cmake
-      - build_source
-      - build_rpm
-
-
-  build_debian_buster:
-    docker:
-      - image: debian:buster
-    steps:
-      - install_debian_dependencies
-      - checkout
-      - cmake
-      - build_deb
-
-  build_debian_bullseye:
-    docker:
-      - image: debian:bullseye
-    steps:
-      - install_debian_dependencies
-      - checkout
-      - cmake
-      - build_deb
-
-
-  build_ubuntu_bionic:
-    docker:
-      - image: ubuntu:bionic
-    steps:
-      - install_ubuntu_dependencies
-      - checkout
-      - cmake
-      - build_deb
-
-  build_ubuntu_focal:
-    docker:
-      - image: ubuntu:focal
-    steps:
-      - install_ubuntu_dependencies
-      - checkout
-      - cmake
-      - build_deb
-
-  build_ubuntu_groovy:
-    docker:
-      - image: ubuntu:groovy
-    steps:
-      - install_ubuntu_dependencies
-      - checkout
-      - cmake
-      - build_deb
-
-workflows:
-  version: 2
-  build_all:
-    jobs:
-
-      - build_source:
-          filters:
-            tags:
-              only: /.*/
-
-
-      - build_opensuse_lp151:
-          filters:
-            tags:
-              only: /.*/
-      - build_opensuse_lp152:
-          filters:
-            tags:
-              only: /.*/
-
-
-      - build_fedora_32:
-          filters:
-            tags:
-              only: /.*/
-      - build_fedora_33:
-          filters:
-            tags:
-              only: /.*/
-
-
-      - build_debian_buster:
-          filters:
-            tags:
-              only: /.*/
-      - build_debian_bullseye:
-          filters:
-            tags:
-              only: /.*/
-
-
-      - build_ubuntu_bionic:
-          filters:
-            tags:
-              only: /.*/
-      - build_ubuntu_focal:
-          filters:
-            tags:
-              only: /.*/
-      - build_ubuntu_groovy:
-          filters:
-            tags:
-              only: /.*/

.github/FUNDING.yml

@@ -1,2 +1,3 @@
 github: jonaski
 patreon: jonaskvinge
+custom: https://paypal.me/jonaskvinge

.travis.yml

@@ -1,48 +0,0 @@
-sudo: required
-language: C++
-os: osx
-osx_image: xcode11.3
-compiler: clang
-
-before_install:
-  - if ! [ "$DEPLOY_KEY_ENC" == "" ]; then
-      echo $DEPLOY_KEY_ENC | base64 --decode | openssl aes-256-cbc -K $encrypted_83a41ac424a6_key -iv $encrypted_83a41ac424a6_iv -out ~/.ssh/id_rsa -d ;
-      chmod 600 ~/.ssh/id_rsa ;
-    fi
-  - git fetch --unshallow
-  - git pull
-  - brew update
-  - travis_wait 400 brew upgrade || echo "Failed"
-  - travis_wait 400 brew upgrade || echo "Failed"
-  - brew install glib pkgconfig libffi protobuf protobuf-c qt gettext gnutls fftw sqlite chromaprint zlib taglib
-  - brew install gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav
-  - brew install libcdio libmtp
-  - brew install create-dmg
-  - brew install --cask sparkle
-  - sudo ln -s /usr/local/Caskroom/sparkle/$(ls /usr/local/Caskroom/sparkle | head -n1)/Sparkle.framework /Library/Frameworks/Sparkle.framework
-  - sudo ln -s /usr/local/Caskroom/sparkle/$(ls /usr/local/Caskroom/sparkle | head -n1)/Sparkle.framework.dSYM /Library/Frameworks/Sparkle.framework.dSYM
-  - export Qt6_DIR=/usr/local/opt/qt6/lib/cmake
-  - export Qt6LinguistTools_DIR=/usr/local/opt/qt6/lib/cmake/Qt6LinguistTools
-  - ls /usr/local/lib/gstreamer-1.0
-before_script:
-  - mkdir build
-  - cd build
-  - cmake .. -DCMAKE_BUILD_TYPE=Release -DBUILD_WITH_QT6=ON -DBUILD_WERROR=ON -DUSE_BUNDLE=ON
-script:
-  - make -j8
-  - make install
-  - sudo ln -s /usr/local/Cellar/qt/$(ls /usr/local/Cellar/qt/ | tail -n1)/share/qt/plugins /usr/local/plugins
-  - make dmg2
-after_success:
-  - ls -lh strawberry*.dmg
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [ -f ~/.ssh/id_rsa ]; then
-      if [[ "$TRAVIS_BRANCH" == "master" ]] || [[ "$TRAVIS_BRANCH" == "travis" ]]; then
-        rsync -e "ssh -o StrictHostKeyChecking=no" -va strawberry*.dmg travis@echoes.jkvinge.net:/home/travis/builds/macos/mojave/;
-      fi
-    fi
-
-branches:
-  except:
-    - # Do not build tags that we create when we upload to GitHub Releases
-    - /^(?i:continuous)$/
-  

3rdparty/README.md

@@ -14,6 +14,12 @@ URL: https://github.com/itay-grudev/SingleApplication
 
 SPMediaKeyTap
 -------------
+Used on macOS to exclusively enable strawberry to grab global media shortcuts.
+Can safely be deleted on other platforms.
 
-This is used for macOS only to enable strawberry to grab global shortcuts and can safely be deleted on other
-platforms.
+
+macdeployqt
+-----------
+A modified version of Qt's official macdeployqt utility that fixes some issues,
+this version also deploys gstreamer plugins.
+Can safely be deleted on other platforms.

3rdparty/macdeployqt/CMakeLists.txt

@@ -0,0 +1,7 @@
+add_executable(macdeployqt main.cpp shared.cpp)
+target_link_libraries(macdeployqt PRIVATE
+  "-framework AppKit"
+  ${QtCore_LIBRARIES}
+)
+
+#execute_process(COMMAND cp ${CMAKE_CURRENT_BINARY_DIR}/macdeployqt ${CMAKE_BINARY_DIR})

3rdparty/macdeployqt/main.cpp

@@ -0,0 +1,286 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the tools applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#undef QT_NO_DEBUG_OUTPUT
+#undef QT_NO_WARNING_OUTPUT
+#undef QT_NO_INFO_OUTPUT
+
+#include <QCoreApplication>
+#include <QDir>
+#include <QLibraryInfo>
+
+#include "shared.h"
+
+int main(int argc, char **argv)
+{
+    QCoreApplication app(argc, argv);
+
+    QString appBundlePath;
+    if (argc > 1)
+        appBundlePath = QString::fromLocal8Bit(argv[1]);
+
+    if (argc < 2 || appBundlePath.startsWith("-")) {
+        qDebug() << "Usage: macdeployqt app-bundle [options]";
+        qDebug() << "";
+        qDebug() << "Options:";
+        qDebug() << "   -verbose=<0-3>                : 0 = no output, 1 = error/warning (default), 2 = normal, 3 = debug";
+        qDebug() << "   -no-plugins                   : Skip plugin deployment";
+        qDebug() << "   -dmg                          : Create a .dmg disk image";
+        qDebug() << "   -no-strip                     : Don't run 'strip' on the binaries";
+        qDebug() << "   -use-debug-libs               : Deploy with debug versions of frameworks and plugins (implies -no-strip)";
+        qDebug() << "   -executable=<path>            : Let the given executable use the deployed frameworks too";
+        qDebug() << "   -qmldir=<path>                : Scan for QML imports in the given path";
+        qDebug() << "   -qmlimport=<path>             : Add the given path to the QML module search locations";
+        qDebug() << "   -always-overwrite             : Copy files even if the target file exists";
+        qDebug() << "   -codesign=<ident>             : Run codesign with the given identity on all executables";
+        qDebug() << "   -hardened-runtime             : Enable Hardened Runtime when code signing";
+        qDebug() << "   -timestamp                    : Include a secure timestamp when code signing (requires internet connection)";
+        qDebug() << "   -sign-for-notarization=<ident>: Activate the necessary options for notarization (requires internet connection)";
+        qDebug() << "   -appstore-compliant           : Skip deployment of components that use private API";
+        qDebug() << "   -libpath=<path>               : Add the given path to the library search path";
+        qDebug() << "   -fs=<filesystem>              : Set the filesystem used for the .dmg disk image (defaults to HFS+)";
+        qDebug() << "";
+        qDebug() << "macdeployqt takes an application bundle as input and makes it";
+        qDebug() << "self-contained by copying in the Qt frameworks and plugins that";
+        qDebug() << "the application uses.";
+        qDebug() << "";
+        qDebug() << "Plugins related to a framework are copied in with the";
+        qDebug() << "framework. The accessibility, image formats, and text codec";
+        qDebug() << "plugins are always copied, unless \"-no-plugins\" is specified.";
+        qDebug() << "";
+        qDebug() << "Qt plugins may use private API and will cause the app to be";
+        qDebug() << "rejected from the Mac App store. MacDeployQt will print a warning";
+        qDebug() << "when known incompatible plugins are deployed. Use -appstore-compliant ";
+        qDebug() << "to skip these plugins. Currently two SQL plugins are known to";
+        qDebug() << "be incompatible: qsqlodbc and qsqlpsql.";
+        qDebug() << "";
+        qDebug() << "See the \"Deploying Applications on OS X\" topic in the";
+        qDebug() << "documentation for more information about deployment on OS X.";
+
+        return 1;
+    }
+
+    appBundlePath = QDir::cleanPath(appBundlePath);
+
+    if (QDir().exists(appBundlePath) == false) {
+        qDebug() << "Error: Could not find app bundle" << appBundlePath;
+        return 1;
+    }
+
+    bool plugins = true;
+    bool dmg = false;
+    QByteArray filesystem("HFS+");
+    bool useDebugLibs = false;
+    extern bool runStripEnabled;
+    extern bool alwaysOwerwriteEnabled;
+    extern QStringList librarySearchPath;
+    QStringList additionalExecutables;
+    bool qmldirArgumentUsed = false;
+    QStringList qmlDirs;
+    QStringList qmlImportPaths;
+    extern bool runCodesign;
+    extern QString codesignIdentiy;
+    extern bool hardenedRuntime;
+    extern bool appstoreCompliant;
+    extern bool deployFramework;
+    extern bool secureTimestamp;
+
+    for (int i = 2; i < argc; ++i) {
+        QByteArray argument = QByteArray(argv[i]);
+        if (argument == QByteArray("-no-plugins")) {
+            LogDebug() << "Argument found:" << argument;
+            plugins = false;
+        } else if (argument == QByteArray("-dmg")) {
+            LogDebug() << "Argument found:" << argument;
+            dmg = true;
+        } else if (argument == QByteArray("-no-strip")) {
+            LogDebug() << "Argument found:" << argument;
+            runStripEnabled = false;
+        } else if (argument == QByteArray("-use-debug-libs")) {
+            LogDebug() << "Argument found:" << argument;
+            useDebugLibs = true;
+            runStripEnabled = false;
+        } else if (argument.startsWith(QByteArray("-verbose"))) {
+            LogDebug() << "Argument found:" << argument;
+            int index = argument.indexOf("=");
+            bool ok = false;
+            int number = argument.mid(index+1).toInt(&ok);
+            if (!ok)
+                LogError() << "Could not parse verbose level";
+            else
+                logLevel = number;
+        } else if (argument.startsWith(QByteArray("-executable"))) {
+            LogDebug() << "Argument found:" << argument;
+            int index = argument.indexOf('=');
+            if (index == -1)
+                LogError() << "Missing executable path";
+            else
+                additionalExecutables << argument.mid(index+1);
+        } else if (argument.startsWith(QByteArray("-qmldir"))) {
+            LogDebug() << "Argument found:" << argument;
+            qmldirArgumentUsed = true;
+            int index = argument.indexOf('=');
+            if (index == -1)
+                LogError() << "Missing qml directory path";
+            else
+                qmlDirs << argument.mid(index+1);
+        } else if (argument.startsWith(QByteArray("-qmlimport"))) {
+            LogDebug() << "Argument found:" << argument;
+            int index = argument.indexOf('=');
+            if (index == -1)
+                LogError() << "Missing qml import path";
+            else
+                qmlImportPaths << argument.mid(index+1);
+        } else if (argument.startsWith(QByteArray("-libpath"))) {
+            LogDebug() << "Argument found:" << argument;
+            int index = argument.indexOf('=');
+            if (index == -1)
+                LogError() << "Missing library search path";
+            else
+                librarySearchPath << argument.mid(index+1);
+        } else if (argument == QByteArray("-always-overwrite")) {
+            LogDebug() << "Argument found:" << argument;
+            alwaysOwerwriteEnabled = true;
+        } else if (argument.startsWith(QByteArray("-codesign"))) {
+            LogDebug() << "Argument found:" << argument;
+            int index = argument.indexOf("=");
+            if (index < 0 || index >= argument.size()) {
+                LogError() << "Missing code signing identity";
+            } else {
+                runCodesign = true;
+                codesignIdentiy = argument.mid(index+1);
+            }
+        } else if (argument.startsWith(QByteArray("-sign-for-notarization"))) {
+            LogDebug() << "Argument found:" << argument;
+            int index = argument.indexOf("=");
+            if (index < 0 || index >= argument.size()) {
+                LogError() << "Missing code signing identity";
+            } else {
+                runCodesign = true;
+                hardenedRuntime = true;
+                secureTimestamp = true;
+                codesignIdentiy = argument.mid(index+1);
+            }
+        } else if (argument.startsWith(QByteArray("-hardened-runtime"))) {
+            LogDebug() << "Argument found:" << argument;
+            hardenedRuntime = true;
+        } else if (argument.startsWith(QByteArray("-timestamp"))) {
+            LogDebug() << "Argument found:" << argument;
+            secureTimestamp = true;
+        } else if (argument == QByteArray("-appstore-compliant")) {
+            LogDebug() << "Argument found:" << argument;
+            appstoreCompliant = true;
+
+        // Undocumented option, may not work as intended
+        } else if (argument == QByteArray("-deploy-framework")) {
+            LogDebug() << "Argument found:" << argument;
+            deployFramework = true;
+
+        } else if (argument.startsWith(QByteArray("-fs"))) {
+            LogDebug() << "Argument found:" << argument;
+            int index = argument.indexOf('=');
+            if (index == -1)
+                LogError() << "Missing filesystem type";
+            else
+                filesystem = argument.mid(index+1);
+        } else if (argument.startsWith("-")) {
+            LogError() << "Unknown argument" << argument << "\n";
+            return 1;
+        }
+     }
+
+    DeploymentInfo deploymentInfo = deployQtFrameworks(appBundlePath, additionalExecutables, useDebugLibs);
+
+    if (deploymentInfo.isDebug)
+        useDebugLibs = true;
+
+    if (deployFramework && deploymentInfo.isFramework)
+        fixupFramework(appBundlePath);
+
+    // Convenience: Look for .qml files in the current directory if no -qmldir specified.
+    if (qmlDirs.isEmpty()) {
+        QDir dir;
+        if (!dir.entryList(QStringList() << QStringLiteral("*.qml")).isEmpty()) {
+            qmlDirs += QStringLiteral(".");
+        }
+    }
+
+    if (!qmlDirs.isEmpty()) {
+        bool ok = deployQmlImports(appBundlePath, deploymentInfo, qmlDirs, qmlImportPaths);
+        if (!ok && qmldirArgumentUsed)
+            return 1; // exit if the user explicitly asked for qml import deployment
+
+        // Update deploymentInfo.deployedFrameworks - the QML imports
+        // may have brought in extra frameworks as dependencies.
+        deploymentInfo.deployedFrameworks += findAppFrameworkNames(appBundlePath);
+        deploymentInfo.deployedFrameworks =
+            QSet<QString>(deploymentInfo.deployedFrameworks.begin(),
+                          deploymentInfo.deployedFrameworks.end()).values();
+    }
+
+    // Handle plugins
+    if (plugins) {
+        // Set the plugins search directory
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+        deploymentInfo.pluginPath = QLibraryInfo::path(QLibraryInfo::PluginsPath);
+#else
+        deploymentInfo.pluginPath = QLibraryInfo::location(QLibraryInfo::PluginsPath);
+#endif
+        // Sanity checks
+        if (deploymentInfo.pluginPath.isEmpty()) {
+            LogError() << "Missing Qt plugins path\n";
+            return 1;
+        }
+
+        if (!QDir(deploymentInfo.pluginPath).exists()) {
+            LogError() << "Plugins path does not exist" << deploymentInfo.pluginPath << "\n";
+            return 1;
+        }
+
+        // Deploy plugins
+        Q_ASSERT(!deploymentInfo.pluginPath.isEmpty());
+        if (!deploymentInfo.pluginPath.isEmpty()) {
+            LogNormal();
+            deployPlugins(appBundlePath, deploymentInfo, useDebugLibs);
+            createQtConf(appBundlePath);
+        }
+    }
+
+    if (runStripEnabled)
+        stripAppBinary(appBundlePath);
+
+    if (runCodesign)
+        codesign(codesignIdentiy, appBundlePath);
+
+    if (dmg) {
+        LogNormal();
+        createDiskImage(appBundlePath, filesystem);
+    }
+
+    return 0;
+}

3rdparty/macdeployqt/shared.h

@@ -0,0 +1,141 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the tools applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#ifndef MAC_DEPLOMYMENT_SHARED_H
+#define MAC_DEPLOMYMENT_SHARED_H
+
+#include <QString>
+#include <QStringList>
+#include <QDebug>
+#include <QSet>
+#include <QVersionNumber>
+
+extern int logLevel;
+#define LogError()      if (logLevel < 0) {} else qDebug() << "ERROR:"
+#define LogWarning()    if (logLevel < 1) {} else qDebug() << "WARNING:"
+#define LogNormal()     if (logLevel < 2) {} else qDebug() << "Log:"
+#define LogDebug()      if (logLevel < 3) {} else qDebug() << "Log:"
+
+extern bool runStripEnabled;
+
+class FrameworkInfo
+{
+public:
+    bool isDylib;
+    QString frameworkDirectory;
+    QString frameworkName;
+    QString frameworkPath;
+    QString binaryDirectory;
+    QString binaryName;
+    QString binaryPath;
+    QString rpathUsed;
+    QString version;
+    QString installName;
+    QString deployedInstallName;
+    QString sourceFilePath;
+    QString frameworkDestinationDirectory;
+    QString binaryDestinationDirectory;
+
+    bool isDebugLibrary() const
+    {
+        return binaryName.endsWith(QStringLiteral("_debug"));
+    }
+};
+
+class DylibInfo
+{
+public:
+    QString binaryPath;
+    QVersionNumber currentVersion;
+    QVersionNumber compatibilityVersion;
+};
+
+class OtoolInfo
+{
+public:
+    QString installName;
+    QString binaryPath;
+    QVersionNumber currentVersion;
+    QVersionNumber compatibilityVersion;
+    QList<DylibInfo> dependencies;
+};
+
+bool operator==(const FrameworkInfo &a, const FrameworkInfo &b);
+QDebug operator<<(QDebug debug, const FrameworkInfo &info);
+
+class ApplicationBundleInfo
+{
+    public:
+    QString path;
+    QString binaryPath;
+    QStringList libraryPaths;
+};
+
+class DeploymentInfo
+{
+public:
+    QString qtPath;
+    QString pluginPath;
+    QStringList deployedFrameworks;
+    QList<QString> rpathsUsed;
+    bool useLoaderPath;
+    bool isFramework;
+    bool isDebug;
+
+    bool containsModule(const QString &module, const QString &libInFix) const;
+};
+
+inline QDebug operator<<(QDebug debug, const ApplicationBundleInfo &info);
+
+OtoolInfo findDependencyInfo(const QString &binaryPath);
+FrameworkInfo parseOtoolLibraryLine(const QString &line, const QString &appBundlePath, const QList<QString> &rpaths, bool useDebugLibs);
+QString findAppBinary(const QString &appBundlePath);
+QList<FrameworkInfo> getQtFrameworks(const QString &path, const QString &appBundlePath, const QList<QString> &rpaths, bool useDebugLibs);
+QList<FrameworkInfo> getQtFrameworks(const QStringList &otoolLines, const QString &appBundlePath, const QList<QString> &rpaths, bool useDebugLibs);
+QString copyFramework(const FrameworkInfo &framework, const QString path);
+DeploymentInfo deployQtFrameworks(const QString &appBundlePath, const QStringList &additionalExecutables, bool useDebugLibs);
+DeploymentInfo deployQtFrameworks(QList<FrameworkInfo> frameworks,const QString &bundlePath, const QStringList &binaryPaths, bool useDebugLibs, bool useLoaderPath);
+void createQtConf(const QString &appBundlePath);
+void deployPlugins(const QString &appBundlePath, DeploymentInfo deploymentInfo, bool useDebugLibs);
+bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInfo, QStringList &qmlDirs, QStringList &qmlImportPaths);
+void changeIdentification(const QString &id, const QString &binaryPath);
+void changeInstallName(const QString &oldName, const QString &newName, const QString &binaryPath);
+void runStrip(const QString &binaryPath);
+void stripAppBinary(const QString &bundlePath);
+QString findAppBinary(const QString &appBundlePath);
+QStringList findAppFrameworkNames(const QString &appBundlePath);
+QStringList findAppFrameworkPaths(const QString &appBundlePath);
+void codesignFile(const QString &identity, const QString &filePath);
+QSet<QString> codesignBundle(const QString &identity,
+                             const QString &appBundlePath,
+                             QList<QString> additionalBinariesContainingRpaths);
+void codesign(const QString &identity, const QString &appBundlePath);
+void createDiskImage(const QString &appBundlePath, const QString &filesystemType);
+void fixupFramework(const QString &appBundlePath);
+
+
+#endif

3rdparty/singleapplication/CMakeLists.txt

@@ -10,11 +10,7 @@ endif()
 
 set(SINGLEAPP-SOURCES singleapplication.cpp singleapplication_p.cpp)
 set(SINGLEAPP-MOC-HEADERS singleapplication.h singleapplication_p.h)
-if(BUILD_WITH_QT6)
-  qt6_wrap_cpp(SINGLEAPP-SOURCES-MOC ${SINGLEAPP-MOC-HEADERS})
-else()
-  qt5_wrap_cpp(SINGLEAPP-SOURCES-MOC ${SINGLEAPP-MOC-HEADERS})
-endif()
+qt_wrap_cpp(SINGLEAPP-SOURCES-MOC ${SINGLEAPP-MOC-HEADERS})
 add_library(singleapplication STATIC ${SINGLEAPP-SOURCES} ${SINGLEAPP-SOURCES-MOC})
 target_include_directories(singleapplication PRIVATE
   ${CMAKE_CURRENT_SOURCE_DIR}
@@ -28,11 +24,7 @@ target_link_libraries(singleapplication PRIVATE
 
 set(SINGLECOREAPP-SOURCES singlecoreapplication.cpp singlecoreapplication_p.cpp)
 set(SINGLECOREAPP-MOC-HEADERS singlecoreapplication.h singlecoreapplication_p.h)
-if(BUILD_WITH_QT6)
-  qt6_wrap_cpp(SINGLECOREAPP-SOURCES-MOC ${SINGLECOREAPP-MOC-HEADERS})
-else()
-  qt5_wrap_cpp(SINGLECOREAPP-SOURCES-MOC ${SINGLECOREAPP-MOC-HEADERS})
-endif()
+qt_wrap_cpp(SINGLECOREAPP-SOURCES-MOC ${SINGLECOREAPP-MOC-HEADERS})
 add_library(singlecoreapplication STATIC ${SINGLECOREAPP-SOURCES} ${SINGLECOREAPP-SOURCES-MOC})
 target_include_directories(singlecoreapplication PRIVATE
   ${CMAKE_CURRENT_SOURCE_DIR}

3rdparty/singleapplication/singleapplication.cpp

@@ -134,7 +134,7 @@ SingleApplication::SingleApplication(int &argc, char *argv[], bool allowSecondar
     }
   }
 
-  if (inst->primary == false) {
+  if (!inst->primary) {
     d->startPrimary();
     if (!d->memory_->unlock()) {
       qDebug() << "SingleApplication: Unable to unlock memory after primary start.";
@@ -234,9 +234,9 @@ QString SingleApplication::currentUser() {
  * Sends message to the Primary Instance.
  * @param message The message to send.
  * @param timeout the maximum timeout in milliseconds for blocking functions.
- * @return true if the message was sent successfuly, false otherwise.
+ * @return true if the message was sent successfully, false otherwise.
  */
-bool SingleApplication::sendMessage(QByteArray message, int timeout) {
+bool SingleApplication::sendMessage(const QByteArray &message, const int timeout) {
 
   Q_D(SingleApplication);
 
@@ -244,8 +244,9 @@ bool SingleApplication::sendMessage(QByteArray message, int timeout) {
   if (isPrimary()) return false;
 
   // Make sure the socket is connected
-  if (!d->connectToPrimary(timeout, SingleApplicationPrivate::Reconnect))
+  if (!d->connectToPrimary(timeout, SingleApplicationPrivate::Reconnect)) {
     return false;
+  }
 
   d->socket_->write(message);
   const bool dataWritten = d->socket_->waitForBytesWritten(timeout);

3rdparty/singleapplication/singleapplication.h

@@ -42,10 +42,10 @@
 class SingleApplicationPrivate;
 
 /**
- * @brief The SingleApplication class handles multipe instances of the same Application
+ * @brief The SingleApplication class handles multiple instances of the same Application
  * @see QApplication
  */
-class SingleApplication : public QApplication {
+class SingleApplication : public QApplication {  // clazy:exclude=ctor-missing-parent-argument
   Q_OBJECT
 
   typedef QApplication app_t;
@@ -136,7 +136,7 @@ class SingleApplication : public QApplication {
    * @note sendMessage() will return false if invoked from the primary
    * instance.
    */
-  bool sendMessage(QByteArray message, int timeout = 1000);
+  bool sendMessage(const QByteArray &message, const int timeout = 1000);
 
  signals:
   void instanceStarted();

3rdparty/singleapplication/singleapplication_p.cpp

@@ -169,7 +169,7 @@ void SingleApplicationPrivate::genBlockServerName() {
 
 }
 
-void SingleApplicationPrivate::initializeMemoryBlock() {
+void SingleApplicationPrivate::initializeMemoryBlock() const {
 
   InstancesInfo *inst = static_cast<InstancesInfo*>(memory_->data());
   inst->primary = false;
@@ -220,7 +220,7 @@ void SingleApplicationPrivate::startSecondary() {
 
 }
 
-bool SingleApplicationPrivate::connectToPrimary(int timeout, ConnectionType connectionType) {
+bool SingleApplicationPrivate::connectToPrimary(const int timeout, const ConnectionType connectionType) {
 
   QElapsedTimer time;
   time.start();
@@ -237,11 +237,12 @@ bool SingleApplicationPrivate::connectToPrimary(int timeout, ConnectionType conn
     forever {
       randomSleep();
 
-      if (socket_->state() != QLocalSocket::ConnectingState)
+      if (socket_->state() != QLocalSocket::ConnectingState) {
         socket_->connectToServer(blockServerName_);
+      }
 
       if (socket_->state() == QLocalSocket::ConnectingState) {
-        socket_->waitForConnected(timeout - time.elapsed());
+        socket_->waitForConnected(static_cast<int>(timeout - time.elapsed()));
       }
 
       // If connected break out of the loop
@@ -277,14 +278,14 @@ bool SingleApplicationPrivate::connectToPrimary(int timeout, ConnectionType conn
 
   socket_->write(header);
   socket_->write(initMsg);
-  bool result = socket_->waitForBytesWritten(timeout - time.elapsed());
+  bool result = socket_->waitForBytesWritten(static_cast<int>(timeout - time.elapsed()));
   socket_->flush();
 
   return result;
 
 }
 
-quint16 SingleApplicationPrivate::blockChecksum() {
+quint16 SingleApplicationPrivate::blockChecksum() const {
 
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
   quint16 checksum = qChecksum(QByteArray(static_cast<const char*>(memory_->constData()), offsetof(InstancesInfo, checksum)));
@@ -296,7 +297,7 @@ quint16 SingleApplicationPrivate::blockChecksum() {
 
 }
 
-qint64 SingleApplicationPrivate::primaryPid() {
+qint64 SingleApplicationPrivate::primaryPid() const {
 
   memory_->lock();
   InstancesInfo *inst = static_cast<InstancesInfo*>(memory_->data());
@@ -307,7 +308,7 @@ qint64 SingleApplicationPrivate::primaryPid() {
 
 }
 
-QString SingleApplicationPrivate::primaryUser() {
+QString SingleApplicationPrivate::primaryUser() const {
 
   memory_->lock();
   InstancesInfo *inst = static_cast<InstancesInfo*>(memory_->data());
@@ -326,18 +327,18 @@ void SingleApplicationPrivate::slotConnectionEstablished() {
   QLocalSocket *nextConnSocket = server_->nextPendingConnection();
   connectionMap_.insert(nextConnSocket, ConnectionInfo());
 
-  QObject::connect(nextConnSocket, &QLocalSocket::aboutToClose, [nextConnSocket, this]() {
-    auto &info = connectionMap_[nextConnSocket];
-    Q_EMIT this->slotClientConnectionClosed(nextConnSocket, info.instanceId);
+  QObject::connect(nextConnSocket, &QLocalSocket::aboutToClose, this, [nextConnSocket, this]() {
+    const ConnectionInfo info = connectionMap_[nextConnSocket];
+    slotClientConnectionClosed(nextConnSocket, info.instanceId);
   });
 
-  QObject::connect(nextConnSocket, &QLocalSocket::disconnected, [nextConnSocket, this]() {
+  QObject::connect(nextConnSocket, &QLocalSocket::disconnected, this, [nextConnSocket, this]() {
     connectionMap_.remove(nextConnSocket);
     nextConnSocket->deleteLater();
   });
 
-  QObject::connect(nextConnSocket, &QLocalSocket::readyRead, [nextConnSocket, this]() {
-    auto &info = connectionMap_[nextConnSocket];
+  QObject::connect(nextConnSocket, &QLocalSocket::readyRead, this, [nextConnSocket, this]() {
+    const ConnectionInfo info = connectionMap_[nextConnSocket];
     switch (info.stage) {
       case StageHeader:
         readInitMessageHeader(nextConnSocket);
@@ -346,7 +347,7 @@ void SingleApplicationPrivate::slotConnectionEstablished() {
         readInitMessageBody(nextConnSocket);
         break;
       case StageConnected:
-        Q_EMIT this->slotDataAvailable(nextConnSocket, info.instanceId);
+        slotDataAvailable(nextConnSocket, info.instanceId);
         break;
       default:
         break;
@@ -438,7 +439,7 @@ void SingleApplicationPrivate::readInitMessageBody(QLocalSocket *sock) {
   }
 
   if (sock->bytesAvailable() > 0) {
-    Q_EMIT this->slotDataAvailable(sock, instanceId);
+    slotDataAvailable(sock, instanceId);
   }
 
 }
@@ -453,7 +454,7 @@ void SingleApplicationPrivate::slotDataAvailable(QLocalSocket *dataSocket, const
 void SingleApplicationPrivate::slotClientConnectionClosed(QLocalSocket *closedSocket, const quint32 instanceId) {
 
   if (closedSocket->bytesAvailable() > 0) {
-    Q_EMIT slotDataAvailable(closedSocket, instanceId);
+    slotDataAvailable(closedSocket, instanceId);
   }
 
 }
@@ -461,7 +462,7 @@ void SingleApplicationPrivate::slotClientConnectionClosed(QLocalSocket *closedSo
 void SingleApplicationPrivate::randomSleep() {
 
 #if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
-  QThread::msleep(QRandomGenerator::global()->bounded(8u, 18u));
+  QThread::msleep(QRandomGenerator::global()->bounded(8U, 18U));
 #else
   qsrand(QDateTime::currentMSecsSinceEpoch() % std::numeric_limits<uint>::max());
   QThread::msleep(8 + static_cast<unsigned long>(static_cast<float>(qrand()) / RAND_MAX * 10));

3rdparty/singleapplication/singleapplication_p.h

@@ -37,7 +37,7 @@
 #include <QtGlobal>
 #include <QObject>
 #include <QString>
-#include <QMap>
+#include <QHash>
 
 #include "singleapplication.h"
 
@@ -55,7 +55,7 @@ struct InstancesInfo {
 
 struct ConnectionInfo {
   explicit ConnectionInfo() : msgLen(0), instanceId(0), stage(0) {}
-  qint64 msgLen;
+  quint64 msgLen;
   quint32 instanceId;
   quint8 stage;
 };
@@ -80,18 +80,18 @@ class SingleApplicationPrivate : public QObject {
   explicit SingleApplicationPrivate(SingleApplication *ptr);
   ~SingleApplicationPrivate() override;
 
-  QString getUsername();
+  static QString getUsername();
   void genBlockServerName();
-  void initializeMemoryBlock();
+  void initializeMemoryBlock() const;
   void startPrimary();
   void startSecondary();
-  bool connectToPrimary(const int msecs, const ConnectionType connectionType);
-  quint16 blockChecksum();
-  qint64 primaryPid();
-  QString primaryUser();
+  bool connectToPrimary(const int timeout, const ConnectionType connectionType);
+  quint16 blockChecksum() const;
+  qint64 primaryPid() const;
+  QString primaryUser() const;
   void readInitMessageHeader(QLocalSocket *socket);
   void readInitMessageBody(QLocalSocket *socket);
-  void randomSleep();
+  static void randomSleep();
 
   SingleApplication *q_ptr;
   QSharedMemory *memory_;
@@ -100,7 +100,7 @@ class SingleApplicationPrivate : public QObject {
   quint32 instanceNumber_;
   QString blockServerName_;
   SingleApplication::Options options_;
-  QMap<QLocalSocket*, ConnectionInfo> connectionMap_;
+  QHash<QLocalSocket*, ConnectionInfo> connectionMap_;
 
  public slots:
   void slotConnectionEstablished();

3rdparty/singleapplication/singlecoreapplication.cpp

@@ -134,7 +134,7 @@ SingleCoreApplication::SingleCoreApplication(int &argc, char *argv[], bool allow
     }
   }
 
-  if (inst->primary == false) {
+  if (!inst->primary) {
     d->startPrimary();
     if (!d->memory_->unlock()) {
       qDebug() << "SingleCoreApplication: Unable to unlock memory after primary start.";
@@ -234,9 +234,9 @@ QString SingleCoreApplication::currentUser() {
  * Sends message to the Primary Instance.
  * @param message The message to send.
  * @param timeout the maximum timeout in milliseconds for blocking functions.
- * @return true if the message was sent successfuly, false otherwise.
+ * @return true if the message was sent successfully, false otherwise.
  */
-bool SingleCoreApplication::sendMessage(QByteArray message, int timeout) {
+bool SingleCoreApplication::sendMessage(const QByteArray &message, const int timeout) {
 
   Q_D(SingleCoreApplication);
 
@@ -244,8 +244,9 @@ bool SingleCoreApplication::sendMessage(QByteArray message, int timeout) {
   if (isPrimary()) return false;
 
   // Make sure the socket is connected
-  if (!d->connectToPrimary(timeout, SingleCoreApplicationPrivate::Reconnect))
+  if (!d->connectToPrimary(timeout, SingleCoreApplicationPrivate::Reconnect)) {
     return false;
+  }
 
   d->socket_->write(message);
   const bool dataWritten = d->socket_->waitForBytesWritten(timeout);

3rdparty/singleapplication/singlecoreapplication.h

@@ -42,7 +42,7 @@
 class SingleCoreApplicationPrivate;
 
 /**
- * @brief The SingleCoreApplication class handles multipe instances of the same Application
+ * @brief The SingleCoreApplication class handles multiple instances of the same Application
  * @see QCoreApplication
  */
 class SingleCoreApplication : public QCoreApplication {
@@ -135,7 +135,7 @@ class SingleCoreApplication : public QCoreApplication {
    * @note sendMessage() will return false if invoked from the primary
    * instance.
    */
-  bool sendMessage(QByteArray message, int timeout = 1000);
+  bool sendMessage(const QByteArray &message, const int timeout = 1000);
 
  signals:
   void instanceStarted();

3rdparty/singleapplication/singlecoreapplication_p.cpp

@@ -169,7 +169,7 @@ void SingleCoreApplicationPrivate::genBlockServerName() {
 
 }
 
-void SingleCoreApplicationPrivate::initializeMemoryBlock() {
+void SingleCoreApplicationPrivate::initializeMemoryBlock() const {
 
   InstancesInfo *inst = static_cast<InstancesInfo*>(memory_->data());
   inst->primary = false;
@@ -220,7 +220,7 @@ void SingleCoreApplicationPrivate::startSecondary() {
 
 }
 
-bool SingleCoreApplicationPrivate::connectToPrimary(int timeout, ConnectionType connectionType) {
+bool SingleCoreApplicationPrivate::connectToPrimary(const int timeout, const ConnectionType connectionType) {
 
   QElapsedTimer time;
   time.start();
@@ -237,11 +237,12 @@ bool SingleCoreApplicationPrivate::connectToPrimary(int timeout, ConnectionType
     forever {
       randomSleep();
 
-      if (socket_->state() != QLocalSocket::ConnectingState)
+      if (socket_->state() != QLocalSocket::ConnectingState) {
         socket_->connectToServer(blockServerName_);
+      }
 
       if (socket_->state() == QLocalSocket::ConnectingState) {
-        socket_->waitForConnected(timeout - time.elapsed());
+        socket_->waitForConnected(static_cast<int>(timeout - time.elapsed()));
       }
 
       // If connected break out of the loop
@@ -277,14 +278,14 @@ bool SingleCoreApplicationPrivate::connectToPrimary(int timeout, ConnectionType
 
   socket_->write(header);
   socket_->write(initMsg);
-  bool result = socket_->waitForBytesWritten(timeout - time.elapsed());
+  bool result = socket_->waitForBytesWritten(timeout - static_cast<int>(time.elapsed()));
   socket_->flush();
 
   return result;
 
 }
 
-quint16 SingleCoreApplicationPrivate::blockChecksum() {
+quint16 SingleCoreApplicationPrivate::blockChecksum() const {
 
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
   quint16 checksum = qChecksum(QByteArray(static_cast<const char*>(memory_->constData()), offsetof(InstancesInfo, checksum)));
@@ -296,7 +297,7 @@ quint16 SingleCoreApplicationPrivate::blockChecksum() {
 
 }
 
-qint64 SingleCoreApplicationPrivate::primaryPid() {
+qint64 SingleCoreApplicationPrivate::primaryPid() const {
 
   memory_->lock();
   InstancesInfo *inst = static_cast<InstancesInfo*>(memory_->data());
@@ -307,7 +308,7 @@ qint64 SingleCoreApplicationPrivate::primaryPid() {
 
 }
 
-QString SingleCoreApplicationPrivate::primaryUser() {
+QString SingleCoreApplicationPrivate::primaryUser() const {
 
   memory_->lock();
   InstancesInfo *inst = static_cast<InstancesInfo*>(memory_->data());
@@ -326,18 +327,18 @@ void SingleCoreApplicationPrivate::slotConnectionEstablished() {
   QLocalSocket *nextConnSocket = server_->nextPendingConnection();
   connectionMap_.insert(nextConnSocket, ConnectionInfo());
 
-  QObject::connect(nextConnSocket, &QLocalSocket::aboutToClose, [nextConnSocket, this]() {
-    auto &info = connectionMap_[nextConnSocket];
-    Q_EMIT this->slotClientConnectionClosed(nextConnSocket, info.instanceId);
+  QObject::connect(nextConnSocket, &QLocalSocket::aboutToClose, this, [nextConnSocket, this]() {
+    const ConnectionInfo info = connectionMap_[nextConnSocket];
+    slotClientConnectionClosed(nextConnSocket, info.instanceId);
   });
 
-  QObject::connect(nextConnSocket, &QLocalSocket::disconnected, [nextConnSocket, this]() {
+  QObject::connect(nextConnSocket, &QLocalSocket::disconnected, this, [nextConnSocket, this]() {
     connectionMap_.remove(nextConnSocket);
     nextConnSocket->deleteLater();
   });
 
-  QObject::connect(nextConnSocket, &QLocalSocket::readyRead, [nextConnSocket, this]() {
-    auto &info = connectionMap_[nextConnSocket];
+  QObject::connect(nextConnSocket, &QLocalSocket::readyRead, this, [nextConnSocket, this]() {
+    const ConnectionInfo info = connectionMap_[nextConnSocket];
     switch (info.stage) {
       case StageHeader:
         readInitMessageHeader(nextConnSocket);
@@ -346,7 +347,7 @@ void SingleCoreApplicationPrivate::slotConnectionEstablished() {
         readInitMessageBody(nextConnSocket);
         break;
       case StageConnected:
-        Q_EMIT this->slotDataAvailable(nextConnSocket, info.instanceId);
+        slotDataAvailable(nextConnSocket, info.instanceId);
         break;
       default:
         break;
@@ -438,7 +439,7 @@ void SingleCoreApplicationPrivate::readInitMessageBody(QLocalSocket *sock) {
   }
 
   if (sock->bytesAvailable() > 0) {
-    Q_EMIT this->slotDataAvailable(sock, instanceId);
+    slotDataAvailable(sock, instanceId);
   }
 
 }
@@ -453,7 +454,7 @@ void SingleCoreApplicationPrivate::slotDataAvailable(QLocalSocket *dataSocket, c
 void SingleCoreApplicationPrivate::slotClientConnectionClosed(QLocalSocket *closedSocket, const quint32 instanceId) {
 
   if (closedSocket->bytesAvailable() > 0) {
-    Q_EMIT slotDataAvailable(closedSocket, instanceId);
+    slotDataAvailable(closedSocket, instanceId);
   }
 
 }
@@ -461,7 +462,7 @@ void SingleCoreApplicationPrivate::slotClientConnectionClosed(QLocalSocket *clos
 void SingleCoreApplicationPrivate::randomSleep() {
 
 #if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
-  QThread::msleep(QRandomGenerator::global()->bounded(8u, 18u));
+  QThread::msleep(QRandomGenerator::global()->bounded(8U, 18U));
 #else
   qsrand(QDateTime::currentMSecsSinceEpoch() % std::numeric_limits<uint>::max());
   QThread::msleep(8 + static_cast<unsigned long>(static_cast<float>(qrand()) / RAND_MAX * 10));

3rdparty/singleapplication/singlecoreapplication_p.h

@@ -37,7 +37,7 @@
 #include <QtGlobal>
 #include <QObject>
 #include <QString>
-#include <QMap>
+#include <QHash>
 
 #include "singlecoreapplication.h"
 
@@ -80,18 +80,18 @@ class SingleCoreApplicationPrivate : public QObject {
   explicit SingleCoreApplicationPrivate(SingleCoreApplication *ptr);
   ~SingleCoreApplicationPrivate() override;
 
-  QString getUsername();
+  static QString getUsername();
   void genBlockServerName();
-  void initializeMemoryBlock();
+  void initializeMemoryBlock() const;
   void startPrimary();
   void startSecondary();
-  bool connectToPrimary(const int msecs, const ConnectionType connectionType);
-  quint16 blockChecksum();
-  qint64 primaryPid();
-  QString primaryUser();
+  bool connectToPrimary(const int timeout, const ConnectionType connectionType);
+  quint16 blockChecksum() const;
+  qint64 primaryPid() const;
+  QString primaryUser() const;
   void readInitMessageHeader(QLocalSocket *socket);
   void readInitMessageBody(QLocalSocket *socket);
-  void randomSleep();
+  static void randomSleep();
 
   SingleCoreApplication *q_ptr;
   QSharedMemory *memory_;
@@ -100,7 +100,7 @@ class SingleCoreApplicationPrivate : public QObject {
   quint32 instanceNumber_;
   QString blockServerName_;
   SingleCoreApplication::Options options_;
-  QMap<QLocalSocket*, ConnectionInfo> connectionMap_;
+  QHash<QLocalSocket*, ConnectionInfo> connectionMap_;
 
  public slots:
   void slotConnectionEstablished();

CMakeLists.txt

@@ -12,13 +12,13 @@ include(cmake/Summary.cmake)
 include(cmake/OptionalSource.cmake)
 include(cmake/ParseArguments.cmake)
 
-if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
   set(LINUX ON)
 endif()
-if (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
+if(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
   set(FREEBSD ON)
 endif()
-if (${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
+if(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
   set(OPENBSD ON)
 endif()
 
@@ -35,45 +35,44 @@ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-list(APPEND COMPILE_OPTIONS
-  $<$<COMPILE_LANGUAGE:C>:-std=c99>
-  $<$<COMPILE_LANGUAGE:CXX>:-std=c++17>
-  -Wall
-  -Wextra
-  -Wpedantic
-  -Wunused
-  -Wshadow
-  -Wundef
-  -Wuninitialized
-  -Wredundant-decls
-  -Wcast-align
-  -Winit-self
-  -Wmissing-include-dirs
-  -Wmissing-declarations
-  -Wstrict-overflow=2
-  -Wunused-parameter
-  -Wformat=2
-  -Wdisabled-optimization
-  $<$<COMPILE_LANGUAGE:CXX>:-Woverloaded-virtual>
-  $<$<COMPILE_LANGUAGE:CXX>:-Wno-old-style-cast>
-  $<$<COMPILE_LANGUAGE:CXX>:-fpermissive>
-)
+if(MSVC)
+  list(APPEND COMPILE_OPTIONS /std:c++17 /MP)
+else()
+  list(APPEND COMPILE_OPTIONS
+    $<$<COMPILE_LANGUAGE:C>:-std=c99>
+    $<$<COMPILE_LANGUAGE:CXX>:-std=c++17>
+    -Wall
+    -Wextra
+    -Wpedantic
+    -Wunused
+    -Wshadow
+    -Wundef
+    -Wuninitialized
+    -Wredundant-decls
+    -Wcast-align
+    -Winit-self
+    -Wmissing-include-dirs
+    -Wmissing-declarations
+    -Wstrict-overflow=2
+    -Wunused-parameter
+    -Wformat=2
+    -Wdisabled-optimization
+    $<$<COMPILE_LANGUAGE:CXX>:-Woverloaded-virtual>
+    $<$<COMPILE_LANGUAGE:CXX>:-Wno-old-style-cast>
+    $<$<COMPILE_LANGUAGE:CXX>:-fpermissive>
+  )
+endif()
 
 option(BUILD_WERROR "Build with -Werror" OFF)
 if(BUILD_WERROR)
   list(APPEND COMPILE_OPTIONS -Werror)
-endif(BUILD_WERROR)
+endif()
 
 add_compile_options(${COMPILE_OPTIONS})
 
 if(${CMAKE_BUILD_TYPE} MATCHES "Release")
   add_definitions(-DNDEBUG)
   add_definitions(-DQT_NO_DEBUG_OUTPUT)
-  #add_definitions(-DQT_NO_WARNING_OUTPUT)
-endif()
-
-if(${CMAKE_BUILD_TYPE} MATCHES "Debug")
-  set(DEBUG ON)
 endif()
 
 if(APPLE)
@@ -82,33 +81,33 @@ if(APPLE)
 endif()
 
 find_program(CCACHE_EXECUTABLE NAMES ccache)
-if (CCACHE_EXECUTABLE)
+if(CCACHE_EXECUTABLE)
   message(STATUS "ccache found: will be used for compilation and linkage")
   SET_PROPERTY(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ${CCACHE_EXECUTABLE})
   SET_PROPERTY(GLOBAL PROPERTY RULE_LAUNCH_LINK ${CCACHE_EXECUTABLE})
-endif ()
+endif()
 
 find_package(PkgConfig REQUIRED)
 find_package(Boost REQUIRED)
 find_package(Threads)
-find_package(Backtrace QUIET)
+find_package(Backtrace)
 if(Backtrace_FOUND)
   set(HAVE_BACKTRACE ON)
 endif()
-find_package(Iconv QUIET)
+find_package(Iconv)
 find_package(GnuTLS REQUIRED)
 find_package(Protobuf REQUIRED)
-if (NOT Protobuf_PROTOC_EXECUTABLE)
+if(NOT Protobuf_PROTOC_EXECUTABLE)
   message(FATAL_ERROR "Missing protobuf compiler.")
 endif()
 if(LINUX)
   find_package(ALSA REQUIRED)
   pkg_check_modules(DBUS REQUIRED dbus-1)
-else(LINUX)
+else()
   find_package(ALSA)
   pkg_check_modules(DBUS dbus-1)
-endif(LINUX)
-if (UNIX AND NOT APPLE)
+endif()
+if(UNIX AND NOT APPLE)
   find_package(X11)
   pkg_check_modules(XCB xcb)
 endif()
@@ -128,7 +127,7 @@ pkg_check_modules(GSTREAMER_PBUTILS gstreamer-pbutils-1.0)
 pkg_check_modules(LIBVLC libvlc)
 pkg_check_modules(SQLITE REQUIRED sqlite3>=3.9)
 pkg_check_modules(LIBPULSE libpulse)
-pkg_check_modules(CHROMAPRINT libchromaprint)
+pkg_check_modules(CHROMAPRINT libchromaprint>=1.4)
 pkg_check_modules(LIBGPOD libgpod-1.0>=0.7.92)
 pkg_check_modules(LIBMTP libmtp>=1.0)
 pkg_check_modules(GDK_PIXBUF gdk-pixbuf-2.0)
@@ -137,81 +136,99 @@ find_package(FFTW3)
 find_package(GTest)
 find_library(GMOCK_LIBRARY gmock)
 
-if(NOT QT_DEFAULT_MAJOR_VERSION)
-  set(QT_DEFAULT_MAJOR_VERSION 5)
-endif()
-set(QT_MAJOR_VERSION ${QT_DEFAULT_MAJOR_VERSION} CACHE STRING "Qt version to use (5 or 6), defaults to ${QT_DEFAULT_MAJOR_VERSION}")
-
-option(BUILD_WITH_QT5 "Use Qt 5" OFF)
-option(BUILD_WITH_QT6 "Use Qt 6" OFF)
+option(QT_VERSION_MAJOR "Qt version to use (5 or 6)")
+option(BUILD_WITH_QT5 "Build with Qt 5" OFF)
+option(BUILD_WITH_QT6 "Build with Qt 6" OFF)
 
 if(WITH_QT6)
   set(BUILD_WITH_QT6 ON)
 endif()
-
-if(BUILD_WITH_QT5)
-  set(QT_MAJOR_VERSION 5)
-elseif(BUILD_WITH_QT6)
-  set(QT_MAJOR_VERSION 6)
-else()
-  if(QT_MAJOR_VERSION EQUAL 5)
-    set(BUILD_WITH_QT5 ON)
-  elseif(QT_MAJOR_VERSION EQUAL 6)
-    set(BUILD_WITH_QT6 ON)
-  else()
-    set(BUILD_WITH_QT5 ON)
-    set(QT_MAJOR_VERSION 5)
-  endif()
+if(QT_MAJOR_VERSION)
+  set(QT_VERSION_MAJOR ${QT_MAJOR_VERSION})
 endif()
 
-set(QT_COMPONENTS Core Concurrent Widgets Network Sql)
-set(QT_OPTIONAL_COMPONENTS Test)
-
-if(QT_MAJOR_VERSION EQUAL 5)
-  set(QT_MIN_VERSION 5.8)
+if(QT_VERSION_MAJOR)
+  set(QT_DEFAULT_MAJOR_VERSION ${QT_VERSION_MAJOR})
 endif()
-
+set(QT_COMPONENTS Core Concurrent Gui Widgets Network Sql)
 if(DBUS_FOUND AND NOT WIN32)
   list(APPEND QT_COMPONENTS DBus)
 endif()
-if(X11_FOUND)
+set(QT_OPTIONAL_COMPONENTS Test)
+set(QT_MIN_VERSION 5.8)
+
+if(BUILD_WITH_QT6 OR QT_VERSION_MAJOR EQUAL 6)
+  set(QT_VERSION_MAJOR 6 CACHE STRING "" FORCE)
+  set(BUILD_WITH_QT6 ON CACHE BOOL "" FORCE)
+elseif(BUILD_WITH_QT5 OR QT_VERSION_MAJOR EQUAL 5)
+  set(QT_VERSION_MAJOR 5 CACHE STRING "" FORCE)
+  set(BUILD_WITH_QT5 ON CACHE BOOL "" FORCE)
+else()
+  # Automatically detect Qt version.
+  find_package(QT NAMES Qt6 Qt5 COMPONENTS ${QT_COMPONENTS} REQUIRED)
+  if(QT_FOUND AND QT_VERSION_MAJOR EQUAL 6)
+    set(BUILD_WITH_QT6 ON CACHE BOOL "" FORCE)
+    set(QT_VERSION_MAJOR 6 CACHE STRING "" FORCE)
+  elseif(QT_FOUND AND QT_VERSION_MAJOR EQUAL 5)
+    set(BUILD_WITH_QT5 ON CACHE BOOL "" FORCE)
+    set(QT_VERSION_MAJOR 5 CACHE STRING "" FORCE)
+  else()
+    message(FATAL_ERROR "Missing Qt.")
+  endif()
+endif()
+
+if(QT_VERSION_MAJOR)
+  set(QT_DEFAULT_MAJOR_VERSION ${QT_VERSION_MAJOR})
+endif()
+
+if(X11_FOUND AND BUILD_WITH_QT5)
   list(APPEND QT_OPTIONAL_COMPONENTS X11Extras)
 endif()
-if(WIN32)
-  list(APPEND QT_OPTIONAL_COMPONENTS WinExtras)
-endif()
 
-find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} REQUIRED COMPONENTS ${QT_COMPONENTS} OPTIONAL_COMPONENTS ${QT_OPTIONAL_COMPONENTS})
+find_package(Qt${QT_VERSION_MAJOR} ${QT_MIN_VERSION} REQUIRED COMPONENTS ${QT_COMPONENTS} OPTIONAL_COMPONENTS ${QT_OPTIONAL_COMPONENTS})
 
-set(QtCore_LIBRARIES Qt${QT_MAJOR_VERSION}::Core)
-set(QtConcurrent_LIBRARIES Qt${QT_MAJOR_VERSION}::Concurrent)
-set(QtGui_LIBRARIES Qt${QT_MAJOR_VERSION}::Gui)
-set(QtWidgets_LIBRARIES Qt${QT_MAJOR_VERSION}::Widgets)
-set(QtNetwork_LIBRARIES Qt${QT_MAJOR_VERSION}::Network)
-set(QtSql_LIBRARIES Qt${QT_MAJOR_VERSION}::Sql)
-set(QT_LIBRARIES Qt${QT_MAJOR_VERSION}::Core Qt${QT_MAJOR_VERSION}::Concurrent Qt${QT_MAJOR_VERSION}::Gui Qt${QT_MAJOR_VERSION}::Widgets Qt${QT_MAJOR_VERSION}::Network Qt${QT_MAJOR_VERSION}::Sql)
-if(Qt${QT_MAJOR_VERSION}DBus_FOUND)
-  set(QtDBus_LIBRARIES Qt${QT_MAJOR_VERSION}::DBus)
-  list(APPEND QT_LIBRARIES Qt${QT_MAJOR_VERSION}::DBus)
-  get_target_property(QT_DBUSXML2CPP_EXECUTABLE Qt${QT_MAJOR_VERSION}::qdbusxml2cpp LOCATION)
+set(QtCore_LIBRARIES Qt${QT_VERSION_MAJOR}::Core)
+set(QtConcurrent_LIBRARIES Qt${QT_VERSION_MAJOR}::Concurrent)
+set(QtGui_LIBRARIES Qt${QT_VERSION_MAJOR}::Gui)
+set(QtWidgets_LIBRARIES Qt${QT_VERSION_MAJOR}::Widgets)
+set(QtNetwork_LIBRARIES Qt${QT_VERSION_MAJOR}::Network)
+set(QtSql_LIBRARIES Qt${QT_VERSION_MAJOR}::Sql)
+set(QT_LIBRARIES Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Concurrent Qt${QT_VERSION_MAJOR}::Gui Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::Network Qt${QT_VERSION_MAJOR}::Sql)
+if(Qt${QT_VERSION_MAJOR}DBus_FOUND)
+  set(QtDBus_LIBRARIES Qt${QT_VERSION_MAJOR}::DBus)
+  list(APPEND QT_LIBRARIES Qt${QT_VERSION_MAJOR}::DBus)
+  get_target_property(QT_DBUSXML2CPP_EXECUTABLE Qt${QT_VERSION_MAJOR}::qdbusxml2cpp LOCATION)
 endif()
-if(Qt${QT_MAJOR_VERSION}X11Extras_FOUND)
-  set(QtX11Extras_LIBRARIES Qt${QT_MAJOR_VERSION}::X11Extras)
-  list(APPEND QT_LIBRARIES Qt${QT_MAJOR_VERSION}::X11Extras)
+if(BUILD_WITH_QT5 AND Qt5X11Extras_FOUND)
   set(HAVE_X11EXTRAS ON)
+  set(QtX11Extras_LIBRARIES Qt5::X11Extras)
+  list(APPEND QT_LIBRARIES Qt5::X11Extras)
 endif()
-if(Qt${QT_MAJOR_VERSION}WinExtras_FOUND)
-  set(QtWinExtras_LIBRARIES Qt${QT_MAJOR_VERSION}::WinExtras)
-  list(APPEND QT_LIBRARIES Qt${QT_MAJOR_VERSION}::WinExtras)
-  set(HAVE_WINEXTRAS ON)
-endif()
-if(Qt${QT_MAJOR_VERSION}Test_FOUND)
-  set(QtTest_LIBRARIES Qt${QT_MAJOR_VERSION}::Test)
+if(Qt${QT_VERSION_MAJOR}Test_FOUND)
+  set(QtTest_LIBRARIES Qt${QT_VERSION_MAJOR}::Test)
 endif()
 
-find_package(Qt${QT_MAJOR_VERSION} QUIET COMPONENTS LinguistTools CONFIG)
-if(Qt${QT_MAJOR_VERSION}LinguistTools_FOUND)
-  set(QT_LCONVERT_EXECUTABLE Qt${QT_MAJOR_VERSION}::lconvert)
+find_package(Qt${QT_VERSION_MAJOR} QUIET COMPONENTS LinguistTools CONFIG)
+if(Qt${QT_VERSION_MAJOR}LinguistTools_FOUND)
+  set(QT_LCONVERT_EXECUTABLE Qt${QT_VERSION_MAJOR}::lconvert)
+endif()
+
+if(BUILD_WITH_QT5 AND Qt5Core_VERSION VERSION_LESS 5.15.0)
+  macro(qt_add_resources)
+    qt5_add_resources(${ARGN})
+  endmacro()
+  macro(qt_wrap_cpp)
+    qt5_wrap_cpp(${ARGN})
+  endmacro()
+  macro(qt_wrap_ui)
+    qt5_wrap_ui(${ARGN})
+  endmacro()
+  macro(qt_add_dbus_adaptor)
+    qt5_add_dbus_adaptor(${ARGN})
+  endmacro()
+  macro(qt_add_dbus_interface)
+    qt5_add_dbus_interface(${ARGN})
+  endmacro()
 endif()
 
 if(X11_FOUND)
@@ -227,27 +244,46 @@ if(X11_FOUND)
   else()
     message(WARNING, "Missing X11/XF86keysym.h")
   endif()
+
+  find_path(QPA_QPLATFORMNATIVEINTERFACE_H qpa/qplatformnativeinterface.h PATHS ${Qt${QT_VERSION_MAJOR}Gui_PRIVATE_INCLUDE_DIRS})
+  if(QPA_QPLATFORMNATIVEINTERFACE_H)
+    set(HAVE_QPA_QPLATFORMNATIVEINTERFACE_H ON)
+    message(STATUS "Have qpa/qplatformnativeinterface.h header.")
+  else()
+    message(STATUS "Missing qpa/qplatformnativeinterface.h header.")
+  endif()
 endif(X11_FOUND)
 
-find_path(QPA_QPLATFORMNATIVEINTERFACE_H qpa/qplatformnativeinterface.h PATHS ${Qt${QT_MAJOR_VERSION}Gui_PRIVATE_INCLUDE_DIRS})
-if(QPA_QPLATFORMNATIVEINTERFACE_H)
-  set(HAVE_QPA_QPLATFORMNATIVEINTERFACE_H ON)
-  include_directories(${Qt${QT_MAJOR_VERSION}Gui_PRIVATE_INCLUDE_DIRS})
-  message(STATUS "Have qpa/qplatformnativeinterface.h header.")
-else()
-  message(STATUS "Missing qpa/qplatformnativeinterface.h header.")
+option(USE_TAGLIB "Build with TagLib" OFF)
+option(USE_TAGPARSER "Build with TagParser" OFF)
+
+if(NOT USE_TAGLIB AND NOT USE_TAGPARSER)
+  set(USE_TAGLIB ON)
 endif()
 
 # TAGLIB
-pkg_check_modules(TAGLIB REQUIRED taglib>=1.11.1)
-find_path(HAVE_TAGLIB_DSFFILE_H taglib/dsffile.h)
-find_path(HAVE_TAGLIB_DSDIFFFILE_H taglib/dsdifffile.h)
-if(HAVE_TAGLIB_DSFFILE_H)
-  set(HAVE_TAGLIB_DSFFILE ON)
-endif(HAVE_TAGLIB_DSFFILE_H)
-if(HAVE_TAGLIB_DSDIFFFILE_H)
-  set(HAVE_TAGLIB_DSDIFFFILE ON)
-endif(HAVE_TAGLIB_DSDIFFFILE_H)
+if(USE_TAGLIB)
+  pkg_check_modules(TAGLIB REQUIRED taglib>=1.11.1)
+  if(TAGLIB_FOUND)
+    find_path(HAVE_TAGLIB_DSFFILE_H taglib/dsffile.h)
+    find_path(HAVE_TAGLIB_DSDIFFFILE_H taglib/dsdifffile.h)
+    if(HAVE_TAGLIB_DSFFILE_H)
+      set(HAVE_TAGLIB_DSFFILE ON)
+    endif(HAVE_TAGLIB_DSFFILE_H)
+    if(HAVE_TAGLIB_DSDIFFFILE_H)
+      set(HAVE_TAGLIB_DSDIFFFILE ON)
+    endif(HAVE_TAGLIB_DSDIFFFILE_H)
+  endif()
+endif()
+
+# TAGPARSER
+if(USE_TAGPARSER)
+  pkg_check_modules(TAGPARSER REQUIRED tagparser)
+endif()
+
+if(NOT TAGLIB_FOUND AND NOT TAGPARSER_FOUND)
+  message(FATAL_ERROR "You need either TagLib or TagParser!")
+endif()
 
 # SingleApplication
 add_subdirectory(3rdparty/singleapplication)
@@ -256,11 +292,13 @@ set(SINGLEAPPLICATION_LIBRARIES singleapplication)
 set(SINGLECOREAPPLICATION_LIBRARIES singlecoreapplication)
 
 if(APPLE)
-  find_library(SPARKLE Sparkle)
+  find_library(SPARKLE Sparkle PATHS "/usr/local/opt/sparkle")
   add_subdirectory(3rdparty/SPMediaKeyTap)
   set(SPMEDIAKEYTAP_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/SPMediaKeyTap)
   set(SPMEDIAKEYTAP_LIBRARIES SPMediaKeyTap)
-endif(APPLE)
+  add_subdirectory(3rdparty/macdeployqt)
+  add_subdirectory(ext/macdeploycheck)
+endif()
 
 if(NOT SPARKLE AND (APPLE OR WIN32))
   if(BUILD_WITH_QT6)
@@ -273,23 +311,22 @@ if(NOT SPARKLE AND (APPLE OR WIN32))
   endif()
 endif()
 
-if (WIN32)
+if(WIN32 AND NOT MSVC)
   # RC compiler
   string(REPLACE "gcc" "windres" CMAKE_RC_COMPILER_INIT ${CMAKE_C_COMPILER})
   enable_language(RC)
   SET(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -O coff -o <OBJECT> <SOURCE> -I ${CMAKE_SOURCE_DIR}/dist/windows")
-endif(WIN32)
+endif()
 
-# Optional bits
 if(WIN32)
   option(ENABLE_WIN32_CONSOLE "Show the windows console even outside Debug mode" OFF)
-endif(WIN32)
+endif()
 
 optional_component(ALSA ON "ALSA integration"
   DEPENDS "alsa" ALSA_FOUND
 )
 
-optional_component(LIBPULSE ON "Pulse audio integration"
+optional_component(LIBPULSE ON "PulseAudio integration"
   DEPENDS "libpulse" LIBPULSE_FOUND
 )
 
@@ -310,11 +347,17 @@ optional_component(VLC ON "Engine: VLC backend"
   DEPENDS "libvlc" LIBVLC_FOUND
 )
 
-optional_component(CHROMAPRINT ON "Chromaprint (Tag fetching from Musicbrainz)"
+optional_component(SONGFINGERPRINTING ON "Song fingerprinting and tracking"
   DEPENDS "chromaprint" CHROMAPRINT_FOUND
+  DEPENDS "gstreamer" GSTREAMER_FOUND
 )
 
-if (X11_FOUND OR HAVE_DBUS OR APPLE OR WIN32)
+optional_component(MUSICBRAINZ ON "MusicBrainz integration"
+  DEPENDS "chromaprint" CHROMAPRINT_FOUND
+  DEPENDS "gstreamer" GSTREAMER_FOUND
+)
+
+if(X11_FOUND OR HAVE_DBUS OR APPLE OR WIN32)
   set(HAVE_GLOBALSHORTCUTS_SUPPORT ON)
 endif()
 
@@ -322,12 +365,21 @@ optional_component(GLOBALSHORTCUTS ON "Global shortcuts"
   DEPENDS "D-Bus, X11, Windows or macOS" HAVE_GLOBALSHORTCUTS_SUPPORT
 )
 
-optional_component(X11_GLOBALSHORTCUTS ON "X11 global shortcuts"
-  DEPENDS "X11Extras" Qt${QT_MAJOR_VERSION}X11Extras_FOUND
-)
+if(BUILD_WITH_QT6 AND (Qt6Core_VERSION VERSION_EQUAL 6.2.0 OR Qt6Core_VERSION VERSION_GREATER 6.2.0))
+  optional_component(X11_GLOBALSHORTCUTS ON "X11 global shortcuts" DEPENDS "X11" X11_FOUND)
+else()
+  if(HAVE_X11EXTRAS OR HAVE_QPA_QPLATFORMNATIVEINTERFACE_H)
+    set(HAVE_X11EXTRAS_OR_QPA_QPLATFORMNATIVEINTERFACE_H ON)
+  endif()
+  optional_component(X11_GLOBALSHORTCUTS ON "X11 global shortcuts"
+    DEPENDS "X11" X11_FOUND
+    DEPENDS "Qt >= 6.2, X11Extras or qpa/qplatformnativeinterface.h header" HAVE_X11EXTRAS_OR_QPA_QPLATFORMNATIVEINTERFACE_H
+  )
+endif()
 
 optional_component(AUDIOCD ON "Devices: Audio CD support"
   DEPENDS "libcdio" LIBCDIO_FOUND
+  DEPENDS "gstreamer" GSTREAMER_FOUND
 )
 
 optional_component(UDISKS2 ON "Devices: UDisks2 backend"
@@ -376,24 +428,23 @@ optional_component(MOODBAR ON "Moodbar"
   DEPENDS "gstreamer" HAVE_GSTREAMER
 )
 
-if(LINUX OR APPLE)
-  option(USE_BUNDLE "Bundle dependencies" OFF)
-elseif(WIN32)
+if(APPLE OR WIN32)
   option(USE_BUNDLE "Bundle dependencies" ON)
+else()
+  option(USE_BUNDLE "Bundle dependencies" OFF)
 endif()
 
-if (USE_BUNDLE AND NOT USE_BUNDLE_DIR)
-if(LINUX)
-  set(USE_BUNDLE_DIR "../plugins")
-endif(LINUX)
-if(APPLE)
-  set(USE_BUNDLE_DIR "../PlugIns")
-endif(APPLE)
-endif(USE_BUNDLE AND NOT USE_BUNDLE_DIR)
-
-# Check that we have sqlite3 with FTS5
+if(USE_BUNDLE AND NOT USE_BUNDLE_DIR)
+  if(LINUX)
+    set(USE_BUNDLE_DIR "../plugins")
+  endif()
+  if(APPLE)
+    set(USE_BUNDLE_DIR "../PlugIns")
+  endif()
+endif()
 
 if(NOT CMAKE_CROSSCOMPILING)
+  # Check that we have Qt with sqlite driver
   set(CMAKE_REQUIRED_FLAGS "-std=c++17")
   set(CMAKE_REQUIRED_LIBRARIES ${QtCore_LIBRARIES} ${QtSql_LIBRARIES})
   check_cxx_source_runs("
@@ -404,12 +455,29 @@ if(NOT CMAKE_CROSSCOMPILING)
       db.setDatabaseName(\":memory:\");
       if (!db.open()) { return 1; }
       QSqlQuery q(db);
-      q.prepare(\"CREATE VIRTUAL TABLE test_fts USING fts5(test, tokenize = 'unicode61 remove_diacritics 0');\");
+      q.prepare(\"CREATE TABLE test (test TEXT);\");
       if (!q.exec()) return 1;
     }
     "
-    SQLITE3_FTS5
+    QT_SQLITE_TEST
   )
+  if(QT_SQLITE_TEST)
+    # Check that we have sqlite3 with FTS5
+    check_cxx_source_runs("
+      #include <QSqlDatabase>
+      #include <QSqlQuery>
+      int main() {
+        QSqlDatabase db = QSqlDatabase::addDatabase(\"QSQLITE\");
+        db.setDatabaseName(\":memory:\");
+        if (!db.open()) { return 1; }
+        QSqlQuery q(db);
+        q.prepare(\"CREATE VIRTUAL TABLE test_fts USING fts5(test, tokenize = 'unicode61 remove_diacritics 0');\");
+        if (!q.exec()) return 1;
+      }
+      "
+      SQLITE_FTS5_TEST
+    )
+  endif()
 endif()
 
 # Set up definitions
@@ -421,6 +489,13 @@ add_definitions(-DQT_USE_QSTRINGBUILDER)
 add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
 add_definitions(-DQT_NO_CAST_TO_ASCII)
 
+if(WIN32)
+  add_definitions(-DUNICODE)
+  if(MSVC)
+    add_definitions(-DPROTOBUF_USE_DLLS)
+  endif()
+endif()
+
 # Subdirectories
 add_subdirectory(src)
 add_subdirectory(dist)
@@ -436,13 +511,9 @@ if(GTest_FOUND AND GMOCK_LIBRARY AND QtTest_LIBRARIES)
 endif()
 
 # Uninstall support
-configure_file(
-  "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
-  "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
-  IMMEDIATE @ONLY)
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" IMMEDIATE @ONLY)
 
-add_custom_target(uninstall
-  "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
+add_custom_target(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
 
 # Show a summary of what we have enabled
 summary_show()
@@ -452,10 +523,16 @@ elseif(NOT HAVE_GSTREAMER)
   message(WARNING "GStreamer is the only engine that is fully implemented. Using other engines is possible but not recommended.")
 endif()
 
-if(NOT SQLITE3_FTS5 AND NOT CMAKE_CROSSCOMPILING)
-  message(WARNING "sqlite3 must be enabled with FTS5. See: https://www.sqlite.org/fts5.html")
+if(NOT CMAKE_CROSSCOMPILING)
+  if(QT_SQLITE_TEST)
+    if(NOT SQLITE_FTS5_TEST)
+      message(WARNING "sqlite must be enabled with FTS5. See: https://www.sqlite.org/fts5.html")
+    endif()
+  else()
+    message(WARNING "The Qt sqlite driver test failed.")
+  endif()
 endif()
 
-if(NOT TAGLIB_VERSION VERSION_GREATER_EQUAL 1.12)
+if(USE_TAGLIB AND TAGLIB_FOUND AND NOT TAGLIB_VERSION VERSION_GREATER_EQUAL 1.12)
   message(WARNING "There is a critical bug in TagLib (1.11.1) that can result in corrupt Ogg files, see: https://github.com/taglib/taglib/issues/864, please consider updating TagLib to the newest version.")
 endif()

Changelog

@@ -2,6 +2,94 @@ Strawberry Music Player
 =======================
 ChangeLog
 
+1.0.0:
+
+  Bugfixes:
+    * Fix updating temporary metadata when reloading songs outside of the collection.
+    * Don't strip off "Live" from song title when sending scrobbles.
+    * Fix incorrect use of QFutureWatcher.
+    * Fix compile of Utilities::Hmac with Qt 6.2.
+    * Fix a memory leak when using right click context menu in internet search.
+    * Fix a gstreamer bus leak when adding streams and remote playlists.
+    * Fix "Source ID x was not found when attempting to remove it" error.
+    * Escape ampersands in playlist tabs.
+    * Fix analyzer with S24_32LE audio format.
+    * (macOS) Fix incorrect playlist alternating row colors with dark theme.
+    * (Windows) Fix adding songs with Japanese characters from the files tab.
+
+  Enhancements:
+    * Add replaygain fallback gain setting.
+    * Add option to turn off playlist alternating row colors.
+    * Make the default tabbbar background color lighter.
+    * Remove use of deprecated WinExtras Qt module.
+    * Add CMake test for Qt sqlite support.
+    * Automatically detect Qt version if BUILD_WITH_QT5 or BUILD_WITH_QT6 is not specified.
+    * Correct playlist tabbar favorite tooltip from "click" to "double-click".
+    * Remove scroll over icon to change track option since it does not work reliable.
+    * Improve resume playback on startup.
+    * Re-request stream URL for Tidal and QObuz when resuming playback after pausing for more than 30 seconds.
+    * Add Finnish, Ukrainian, Dutch, Japanese, Chinese, Catalan and Portuguese (Brazil).
+    * Add support for TagParser (https://github.com/Martchus/tagparser) as an alternative to TagLib.
+    * Add Subsonic option to turn off HTTP/2.
+    * Fix minor Clang-Tidy and Clazy warnings.
+    * Use higher resolution images from last.fm API.
+    * Add MD5 token authentication for Subsonic.
+    * Use 500 albums per request when receiving albums from Subsonic.
+    * Use QX11Application with Qt >= 6.2 for X11 global shortcuts.
+    * Allow fading when a ALSA PCM device is selected.
+    * Store Tidal MPEG-DASH file in data uri.
+    * Use XSPF image elements as manually set artwork.
+    * Make error dialog larger.
+    * Show error dialog for failed SQL queries.
+    * Show error dialog when failing to read or write album covers.
+    * Add module music formats (mod, s3m, xm, it) to detected filetypes.
+    * Disable gapless playback for module music formats to workaround gstreamer bug.
+    * Update directory ID and song path immediately when organizing collection songs.
+    * Add right click option to star a playlist in playlist tabs.
+    * Use seconds instead of minutes for scrobble submit delay.
+    * (macOS) Build with libgpod.
+    * (Windows) Fix compile with MSVC.
+
+  New features:
+    * Add ALSA PCM devices.
+    * Add song fingerprinting and tracking.
+    * Add support for native global shortcuts on MATE.
+    * Add radios view with channels from Radio Paradise and SomaFM.
+
+0.9.3:
+
+  Bugfixes:
+    * Fix "Show in file browser" to work with thunar.
+    * Check that the clicked rating position is to the right or left of the rectangle.
+    * Fix rescan when collection directory is removed and readded.
+    * Create GLib main event loop on non-glib systems to fix stream discoverer.
+    * (macOS) Fix intermittent abort on startup.
+    * (macOS) Fix Tidal and Qobuz search field not showing.
+    * (macOS) Add tidal URL scheme to Info.plist.
+    * (macOS) Fix Tidal OAuth authentication.
+
+  Enhancements:
+    * Allow editing playlist metadata for radio streams.
+    * Make CollectionQuery subclass QSqlQuery, avoid copying QSqlQuery.
+    * Only enable FTS3 when schema needs upgrading, since FTS5 is used for search.
+    * Add setting for configuring the color for the currently playing song.
+    * Add setting to turn on OSD Pretty fading.
+    * Add commandline option to resize window.
+    * (Windows) Show dialog with programs that needs to close in nsis installer.
+    * (macOS) Make macdeployqt work with Qt 5 too.
+    * (macOS) Show keep running option in behaviour settings.
+
+0.9.2:
+
+  Bugfixes:
+    * Fix marking songs available.
+    * Fix crash when transcoding music, or copying music to devices with transcoding.
+    * Fix copying album covers to iPod.
+    * Fix playlist tabbar close and save right click actions.
+    * Fix slow opening of cover manager.
+    * (macOS) Fix crash when opening cover manager.
+    * (macOS) Fix broken Qt plugins resulting in album covers not showing.
+
 0.9.1:
 
   Bugfixes:
@@ -9,7 +97,7 @@ ChangeLog
     * Fix overwriting existing newer last played when importing last played from last.fm.
     * Fix memory leak on song change when moodbar is disabled.
     * Fix playlist filter search for text with spaces with Qt 6.
-    * Fix 'Except between tracks on the same album' backend fade option always greyed out.
+    * Fix 'Except between tracks on the same album' backend fade option always grayed out.
     * Fix read and save vorbis comment grouping tag.
     * Fix QAtomicInteger compile error on armv.
     * Fix compile error with protobuf 3.15.0 and newer.
@@ -31,6 +119,7 @@ ChangeLog
     * Add right click actions to clear set cover, and option delete covers.
     * Show artist and album underneath the albums in the cover manager when all Artists is selected.
     * Disable unavailable right click cover actions.
+    * Remove 3rdparty TagLib now that TagLib 1.12 is available.
     * (macOS) Update and improve build deployment/bundling for Qt 6.
 
   New features:
@@ -73,8 +162,8 @@ ChangeLog
     * Add support for native global shortcuts on KDE.
     * Add track progress in system tray icon as an option.
     * Only strip problematic characters in suggested filename when saving a playlist to file.
-    * Change star/unstar playlist to doubleclick instead of singleclick.
-    * Don't edit playlist name on doubleclick in playlists view.
+    * Change star/unstar playlist to double-click instead of singleclick.
+    * Don't edit playlist name on double-click in playlists view.
     * Make context view top label text selectable.
     * Add setting to change Qt style.
     * Clear ID3v3 tags that are empty, and clear ID3v1 tags when setting ID3v3 tags.
@@ -269,7 +358,7 @@ ChangeLog
 0.6.10:
 
   Bugfixes:
-    * Fixed Subsonic album covers not working for albums with non ASCII charcters.
+    * Fixed Subsonic album covers not working for albums with non ASCII characters.
     * Fixed reading date and genre from individual tracks in CUE sheets.
     * Fixed resume playback on startup for CUE songs.
     * Fixed album cover manager not showing complete album titles in the list of album covers.
@@ -278,7 +367,7 @@ ChangeLog
     * Fixed engine and device in context using too large icons when icons were loaded from the system theme.
     * Fixed "Secure connection setup failed" problem on Windows when playing streams.
     * Fixed margin for song title text in context.
-    * Fixed UNC paths with non ASCII charcters not working.
+    * Fixed UNC paths with non ASCII characters not working.
 
   Enhancements:
     * Allowing all characters except slash and backslash when organising music unless options to strip characters is checked.
@@ -293,9 +382,9 @@ ChangeLog
     * Only showing song length in context when available.
     * Sort album cover search results by score and pick the best 3 first before trying others to improve album cover search speed.
     * Make scrobbler work for streams.
-    * Added search for lyrics as a seperate option in context.
+    * Added search for lyrics as a separate option in context.
     * Made font and font sizes in context configurable.
-    * Splitting artist and song title to the relevant metadata when artist and song title is sent as title seperated by a dash in streams.
+    * Splitting artist and song title to the relevant metadata when artist and song title is sent as title separated by a dash in streams.
     * Added label to show collection pixmap disk cache used in settings.
     * Icreased default collection pixmap disk cache to 360.
 

README.md

@@ -1,11 +1,12 @@
 :strawberry: Strawberry Music Player [![Build Status](https://github.com/strawberrymusicplayer/strawberry/workflows/C/C++%20CI/badge.svg)](https://github.com/strawberrymusicplayer/strawberry/actions)
-[![PayPal](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://paypal.me/jonaskvinge)
-[![Patreon](https://img.shields.io/badge/patreon-donate-green.svg)](https://patreon.com/jonaskvinge)
 =======================
+[![Sponsor](https://img.shields.io/badge/-Sponsor-green?logo=github)](https://github.com/sponsors/jonaski)
+[![Patreon](https://img.shields.io/badge/patreon-donate-green.svg)](https://patreon.com/jonaskvinge)
+[![PayPal](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://paypal.me/jonaskvinge)
 
 Strawberry is a music player and music collection organizer. It is a fork of Clementine released in 2018 aimed at music collectors and audiophiles. It's written in C++ using the Qt toolkit.
 
-![Browse](https://www.strawberrymusicplayer.org/pictures/screenshot-002-large.png)
+![Browse](https://raw.githubusercontent.com/strawberrymusicplayer/strawberry/master/data/screenshot/screenshot.png)
 
 Resources:
 
@@ -15,7 +16,8 @@ Resources:
   * Buildbot: https://buildbot.strawberrymusicplayer.org/
   * Latest builds: https://builds.strawberrymusicplayer.org/
   * openSUSE buildservice: https://build.opensuse.org/package/show/home:jonaski:audio/strawberry
-  * PPA: https://launchpad.net/~jonaski/+archive/ubuntu/strawberry
+  * Ubuntu PPA: https://launchpad.net/~jonaski/+archive/ubuntu/strawberry
+  * Ubuntu Unstable PPA: https://launchpad.net/~jonaski/+archive/ubuntu/strawberry-unstable
   * Translations: https://translate.zanata.org/iteration/view/strawberry/master
 
 ### :bangbang: Opening an issue:
@@ -43,14 +45,14 @@ Funding developers is a way to contribute to open source projects you appreciate
   * Playlist management
   * Smart and dynamic playlists
   * Advanced audio output and device configuration for bit-perfect playback on Linux
-  * Edit tags on music files
+  * 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 [AudD](https://audd.io/), [Genius](https://genius.com/), [Musixmatch](https://www.musixmatch.com/), [ChartLyrics](http://www.chartlyrics.com/), [lyrics.ovh](https://lyrics.ovh/) and [lololyrics.com](https://www.lololyrics.com/)
   * Support for multiple backends
   * Audio analyzer
   * Audio equalizer
-  * Transfer music to iPod, MTP or mass-storage USB player
+  * 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 and Qobuz streaming support
 
@@ -63,29 +65,28 @@ It has so far been tested to work on Linux, OpenBSD, FreeBSD, macOS and Windows.
 
 To build Strawberry from source you need the following installed on your system with the additional development packages/headers:
 
-* [CMake and Make tools](https://cmake.org/)
+* [CMake](https://cmake.org/)
+* [GNU Make](https://www.gnu.org/software/make/)
 * [GCC](https://gcc.gnu.org/) or [clang](https://clang.llvm.org/) compiler
 * [Boost](https://www.boost.org/)
-* [POSIX thread (pthread)](http://www.yolinux.com/TUTORIALS/LinuxTutorialPosixThreads.html)
 * [GLib](https://developer.gnome.org/glib/)
 * [Protobuf](https://developers.google.com/protocol-buffers/)
 * [Qt 5.8 or higher (or Qt 6) with components Core, Gui, Widgets, Concurrent, Network and Sql](https://www.qt.io/)
-* [Qt components X11Extras and D-Bus for Linux/BSD and WinExtras for Windows](https://www.qt.io/)
 * [SQLite 3.9 or newer with FTS5](https://www.sqlite.org)
-* [Chromaprint](https://acoustid.org/chromaprint)
-* [ALSA (linux)](https://www.alsa-project.org/)
-* [D-Bus (linux)](https://www.freedesktop.org/wiki/Software/dbus/)
-* [PulseAudio (linux optional)](https://www.freedesktop.org/wiki/Software/PulseAudio/?)
+* [ALSA (Linux required)](https://www.alsa-project.org/)
+* [D-Bus (Linux required)](https://www.freedesktop.org/wiki/Software/dbus/)
 * [GStreamer](https://gstreamer.freedesktop.org/) or [VLC](https://www.videolan.org)
 * [GnuTLS](https://www.gnutls.org/)
-* [TagLib](https://www.taglib.org/)
+* [TagLib 1.11.1 or higher](https://www.taglib.org/) or [TagParser](https://github.com/Martchus/tagparser)
 
 Optional dependencies:
 
+* 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/)
-* Moodbar: [fftw3](http://www.fftw.org/)
 
 Either GStreamer or VLC engine is required, but only GStreamer is fully implemented, and works best, it is therefore recommended to use GStreamer.
 You should also install the gstreamer plugins base and good, and optionally bad, ugly and libav.

cmake/Dmg.cmake

@@ -1,4 +1,5 @@
-find_program(MACDEPLOYQT_EXECUTABLE NAMES macdeployqt PATHS /usr/local/opt/qt6/bin /usr/local/opt/qt5/bin /usr/local/bin REQUIRED)
+#find_program(MACDEPLOYQT_EXECUTABLE NAMES macdeployqt PATHS /usr/local/opt/qt6/bin /usr/local/opt/qt5/bin /usr/local/bin REQUIRED)
+set(MACDEPLOYQT_EXECUTABLE "${CMAKE_BINARY_DIR}/3rdparty/macdeployqt/macdeployqt")
 if(MACDEPLOYQT_EXECUTABLE)
   message(STATUS "Found macdeployqt: ${MACDEPLOYQT_EXECUTABLE}")
 else()
@@ -12,22 +13,30 @@ else()
   message(WARNING "Missing create-dmg executable.")
 endif()
 
-execute_process(COMMAND ${CMAKE_SOURCE_DIR}/dist/macos/macversion.sh OUTPUT_VARIABLE MACOS_VERSION_PACKAGE OUTPUT_STRIP_TRAILING_WHITESPACE)
-if(NOT MACOS_VERSION_PACKAGE)
-  message(WARNING "Could not set macOS version.")
-endif()
-
-if(MACDEPLOYQT_EXECUTABLE AND CREATEDMG_EXECUTABLE AND MACOS_VERSION_PACKAGE)
-  add_custom_target(dmg
-    COMMAND ${MACDEPLOYQT_EXECUTABLE} strawberry.app -executable=${CMAKE_BINARY_DIR}/strawberry.app/Contents/PlugIns/strawberry-tagreader
-    COMMAND ${CMAKE_SOURCE_DIR}/dist/macos/macdeploy.py strawberry.app
-    COMMAND ${CREATEDMG_EXECUTABLE} --volname strawberry --background "${CMAKE_SOURCE_DIR}/dist/macos/dmg_background.png" --app-drop-link 450 218 --icon strawberry.app 150 218 --window-size 600 450 strawberry-${STRAWBERRY_VERSION_PACKAGE}-${MACOS_VERSION_PACKAGE}-${CMAKE_HOST_SYSTEM_PROCESSOR}.dmg strawberry.app
-    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+if(MACDEPLOYQT_EXECUTABLE)
+  add_custom_target(copy_gstreamer_plugins
+    #COMMAND ${CMAKE_SOURCE_DIR}/dist/macos/macgstcopy.sh strawberry.app
   )
-  add_custom_target(dmg2
-    COMMAND ${MACDEPLOYQT_EXECUTABLE} strawberry.app -executable=${CMAKE_BINARY_DIR}/strawberry.app/Contents/PlugIns/strawberry-tagreader
-    COMMAND ${CMAKE_SOURCE_DIR}/dist/macos/macdeploy.py strawberry.app
-    COMMAND ${CREATEDMG_EXECUTABLE} --skip-jenkins --volname strawberry --background "${CMAKE_SOURCE_DIR}/dist/macos/dmg_background.png" --app-drop-link 450 218 --icon strawberry.app 150 218 --window-size 600 450 strawberry-${STRAWBERRY_VERSION_PACKAGE}-${MACOS_VERSION_PACKAGE}-${CMAKE_HOST_SYSTEM_PROCESSOR}.dmg strawberry.app
+  add_custom_target(deploy
+    COMMAND mkdir -p ${CMAKE_BINARY_DIR}/strawberry.app/Contents/{Frameworks,Resources}
+    COMMAND cp -v ${CMAKE_SOURCE_DIR}/dist/macos/Info.plist ${CMAKE_BINARY_DIR}/strawberry.app/Contents/
+    COMMAND cp -v ${CMAKE_SOURCE_DIR}/dist/macos/strawberry.icns ${CMAKE_BINARY_DIR}/strawberry.app/Contents/Resources/
+    COMMAND ${MACDEPLOYQT_EXECUTABLE} strawberry.app -verbose=3
+      -executable=${CMAKE_BINARY_DIR}/strawberry.app/Contents/PlugIns/strawberry-tagreader
+      -executable=${CMAKE_BINARY_DIR}/strawberry.app/Contents/PlugIns/gio-modules/libgiognutls.so
+      #-executable=${CMAKE_BINARY_DIR}/strawberry.app/Contents/PlugIns/gst-plugin-scanner
     WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+    DEPENDS strawberry strawberry-tagreader copy_gstreamer_plugins macdeployqt
   )
+  add_custom_target(deploycheck
+    COMMAND ${CMAKE_BINARY_DIR}/ext/macdeploycheck/macdeploycheck strawberry.app
+    DEPENDS macdeploycheck
+  )
+  if(CREATEDMG_EXECUTABLE)
+    add_custom_target(dmg
+      COMMAND ${CREATEDMG_EXECUTABLE} --volname strawberry --background "${CMAKE_SOURCE_DIR}/dist/macos/dmg_background.png" --app-drop-link 450 218 --icon strawberry.app 150 218 --window-size 600 450 strawberry-${STRAWBERRY_VERSION_PACKAGE}-${CMAKE_HOST_SYSTEM_PROCESSOR}.dmg strawberry.app
+      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+      DEPENDS deploy deploycheck
+    )
+  endif()
 endif()

cmake/OptionalSource.cmake

@@ -15,11 +15,7 @@ macro(optional_source TOGGLE)
     list(APPEND OTHER_SOURCES ${OPTIONAL_SOURCE_HEADERS})
 
     set(_uic_sources)
-    if(BUILD_WITH_QT6)
-      qt6_wrap_ui(_uic_sources ${OPTIONAL_SOURCE_UI})
-    else()
-      qt5_wrap_ui(_uic_sources ${OPTIONAL_SOURCE_UI})
-    endif()
+    qt_wrap_ui(_uic_sources ${OPTIONAL_SOURCE_UI})
     list(APPEND OTHER_SOURCES ${_uic_sources})
     list(APPEND OTHER_UIC_SOURCES ${_uic_sources})
   endif(${TOGGLE})

cmake/Translations.cmake

@@ -75,10 +75,6 @@ macro(add_po outfiles po_prefix)
       file(APPEND ${_qrc} "<file>${po_prefix}${_lang}.qm</file>")
     endforeach(_lang)
     file(APPEND ${_qrc} "</qresource></RCC>")
-    if(BUILD_WITH_QT6)
-      qt6_add_resources(${outfiles} ${_qrc})
-    else()
-      qt5_add_resources(${outfiles} ${_qrc})
-    endif()
+    qt_add_resources(${outfiles} ${_qrc})
   endif()
 endmacro(add_po)

cmake/Version.cmake

@@ -1,6 +1,6 @@
-set(STRAWBERRY_VERSION_MAJOR 0)
-set(STRAWBERRY_VERSION_MINOR 9)
-set(STRAWBERRY_VERSION_PATCH 1)
+set(STRAWBERRY_VERSION_MAJOR 1)
+set(STRAWBERRY_VERSION_MINOR 0)
+set(STRAWBERRY_VERSION_PATCH 0)
 #set(STRAWBERRY_VERSION_PRERELEASE rc1)
 
 set(INCLUDE_GIT_REVISION OFF)

data/data.qrc

@@ -14,6 +14,8 @@
         <file>schema/schema-11.sql</file>
         <file>schema/schema-12.sql</file>
         <file>schema/schema-13.sql</file>
+        <file>schema/schema-14.sql</file>
+        <file>schema/schema-15.sql</file>
         <file>schema/device-schema.sql</file>
         <file>style/strawberry.css</file>
         <file>style/smartplaylistsearchterm.css</file>

data/icons.qrc

@@ -92,6 +92,9 @@
         <file>icons/128x128/tidal.png</file>
         <file>icons/128x128/qobuz.png</file>
         <file>icons/128x128/multimedia-player-ipod-standard-black.png</file>
+        <file>icons/128x128/radio.png</file>
+        <file>icons/128x128/somafm.png</file>
+        <file>icons/128x128/radioparadise.png</file>
         <file>icons/64x64/albums.png</file>
         <file>icons/64x64/alsa.png</file>
         <file>icons/64x64/application-exit.png</file>
@@ -185,6 +188,9 @@
         <file>icons/64x64/tidal.png</file>
         <file>icons/64x64/qobuz.png</file>
         <file>icons/64x64/multimedia-player-ipod-standard-black.png</file>
+        <file>icons/64x64/radio.png</file>
+        <file>icons/64x64/somafm.png</file>
+        <file>icons/64x64/radioparadise.png</file>
         <file>icons/48x48/albums.png</file>
         <file>icons/48x48/alsa.png</file>
         <file>icons/48x48/application-exit.png</file>
@@ -282,6 +288,9 @@
 	<file>icons/48x48/tidal.png</file>
 	<file>icons/48x48/qobuz.png</file>
         <file>icons/48x48/multimedia-player-ipod-standard-black.png</file>
+        <file>icons/48x48/radio.png</file>
+        <file>icons/48x48/somafm.png</file>
+        <file>icons/48x48/radioparadise.png</file>
         <file>icons/32x32/albums.png</file>
         <file>icons/32x32/alsa.png</file>
         <file>icons/32x32/application-exit.png</file>
@@ -379,6 +388,9 @@
         <file>icons/32x32/tidal.png</file>
         <file>icons/32x32/qobuz.png</file>
         <file>icons/32x32/multimedia-player-ipod-standard-black.png</file>
+        <file>icons/32x32/radio.png</file>
+        <file>icons/32x32/somafm.png</file>
+        <file>icons/32x32/radioparadise.png</file>
         <file>icons/22x22/albums.png</file>
         <file>icons/22x22/alsa.png</file>
         <file>icons/22x22/application-exit.png</file>
@@ -476,5 +488,8 @@
         <file>icons/22x22/tidal.png</file>
         <file>icons/22x22/qobuz.png</file>
         <file>icons/22x22/multimedia-player-ipod-standard-black.png</file>
+        <file>icons/22x22/radio.png</file>
+        <file>icons/22x22/somafm.png</file>
+        <file>icons/22x22/radioparadise.png</file>
     </qresource>
 </RCC>

data/schema/device-schema.sql

@@ -1,35 +1,35 @@
 CREATE TABLE device_%deviceid_directories (
-  path TEXT NOT NULL,
+  path TEXT NOT NULL DEFAULT '',
   subdirs INTEGER NOT NULL
 );
 
 CREATE TABLE device_%deviceid_subdirectories (
   directory_id INTEGER NOT NULL,
-  path TEXT NOT NULL,
+  path TEXT NOT NULL DEFAULT '',
   mtime INTEGER NOT NULL
 );
 
 CREATE TABLE device_%deviceid_songs (
 
-  title TEXT,
-  album TEXT,
-  artist TEXT,
-  albumartist TEXT,
+  title TEXT DEFAULT '',
+  album TEXT DEFAULT '',
+  artist TEXT DEFAULT '',
+  albumartist TEXT DEFAULT '',
   track INTEGER NOT NULL DEFAULT -1,
   disc INTEGER NOT NULL DEFAULT -1,
   year INTEGER NOT NULL DEFAULT -1,
   originalyear INTEGER NOT NULL DEFAULT 0,
-  genre TEXT,
+  genre TEXT DEFAULT '',
   compilation INTEGER NOT NULL DEFAULT 0,
-  composer TEXT,
-  performer TEXT,
-  grouping TEXT,
-  comment TEXT,
-  lyrics TEXT,
+  composer TEXT DEFAULT '',
+  performer TEXT DEFAULT '',
+  grouping TEXT DEFAULT '',
+  comment TEXT DEFAULT '',
+  lyrics TEXT DEFAULT '',
 
-  artist_id TEXT,
-  album_id TEXT,
-  song_id TEXT,
+  artist_id TEXT DEFAULT '',
+  album_id TEXT DEFAULT '',
+  song_id TEXT DEFAULT '',
 
   beginning INTEGER NOT NULL DEFAULT 0,
   length INTEGER NOT NULL DEFAULT 0,
@@ -40,29 +40,32 @@ CREATE TABLE device_%deviceid_songs (
 
   source INTEGER NOT NULL DEFAULT 0,
   directory_id INTEGER NOT NULL DEFAULT -1,
-  url TEXT NOT NULL,
+  url TEXT NOT NULL DEFAULT '',
   filetype INTEGER NOT NULL DEFAULT 0,
   filesize INTEGER NOT NULL DEFAULT -1,
   mtime INTEGER NOT NULL DEFAULT -1,
   ctime INTEGER NOT NULL DEFAULT -1,
   unavailable INTEGER DEFAULT 0,
 
+  fingerprint TEXT DEFAULT '',
+
   playcount INTEGER NOT NULL DEFAULT 0,
   skipcount INTEGER NOT NULL DEFAULT 0,
   lastplayed INTEGER NOT NULL DEFAULT -1,
+  lastseen INTEGER NOT NULL DEFAULT -1,
 
   compilation_detected INTEGER DEFAULT 0,
   compilation_on INTEGER NOT NULL DEFAULT 0,
   compilation_off INTEGER NOT NULL DEFAULT 0,
   compilation_effective INTEGER NOT NULL DEFAULT 0,
 
-  art_automatic TEXT,
-  art_manual TEXT,
+  art_automatic TEXT DEFAULT '',
+  art_manual TEXT DEFAULT '',
 
-  effective_albumartist TEXT,
+  effective_albumartist TEXT DEFAULT '',
   effective_originalyear INTEGER NOT NULL DEFAULT 0,
 
-  cue_path TEXT,
+  cue_path TEXT DEFAULT '',
 
   rating INTEGER DEFAULT -1
 
@@ -77,4 +80,4 @@ CREATE VIRTUAL TABLE device_%deviceid_fts USING fts5(
   tokenize = "unicode61 remove_diacritics 1"
 );
 
-UPDATE devices SET schema_version=2 WHERE ROWID=%deviceid;
+UPDATE devices SET schema_version=3 WHERE ROWID=%deviceid;

data/schema/schema-14.sql

@@ -0,0 +1,5 @@
+ALTER TABLE %allsongstables ADD COLUMN fingerprint TEXT DEFAULT '';
+
+ALTER TABLE %allsongstables ADD COLUMN lastseen INTEGER NOT NULL DEFAULT -1;
+
+UPDATE schema_version SET version=14;

data/schema/schema-15.sql

@@ -0,0 +1,8 @@
+CREATE TABLE IF NOT EXISTS radio_channels (
+  source INTEGER NOT NULL DEFAULT 0,
+  name TEXT DEFAULT '',
+  url TEXT DEFAULT '',
+  thumbnail_url TEXT DEFAULT ''
+);
+
+UPDATE schema_version SET version=15;

data/schema/schema.sql

@@ -4,40 +4,40 @@ CREATE TABLE IF NOT EXISTS schema_version (
 
 DELETE FROM schema_version;
 
-INSERT INTO schema_version (version) VALUES (13);
+INSERT INTO schema_version (version) VALUES (15);
 
 CREATE TABLE IF NOT EXISTS directories (
-  path TEXT NOT NULL,
+  path TEXT NOT NULL DEFAULT '',
   subdirs INTEGER NOT NULL
 );
 
 CREATE TABLE IF NOT EXISTS subdirectories (
   directory_id INTEGER NOT NULL,
-  path TEXT NOT NULL,
+  path TEXT NOT NULL DEFAULT '',
   mtime INTEGER NOT NULL
 );
 
 CREATE TABLE IF NOT EXISTS songs (
 
-  title TEXT,
-  album TEXT,
-  artist TEXT,
-  albumartist TEXT,
+  title TEXT DEFAULT '',
+  album TEXT DEFAULT '',
+  artist TEXT DEFAULT '',
+  albumartist TEXT DEFAULT '',
   track INTEGER NOT NULL DEFAULT -1,
   disc INTEGER NOT NULL DEFAULT -1,
   year INTEGER NOT NULL DEFAULT -1,
   originalyear INTEGER NOT NULL DEFAULT -1,
-  genre TEXT,
+  genre TEXT DEFAULT '',
   compilation INTEGER NOT NULL DEFAULT 0,
-  composer TEXT,
-  performer TEXT,
-  grouping TEXT,
-  comment TEXT,
-  lyrics TEXT,
+  composer TEXT DEFAULT '',
+  performer TEXT DEFAULT '',
+  grouping TEXT DEFAULT '',
+  comment TEXT DEFAULT '',
+  lyrics TEXT DEFAULT '',
 
-  artist_id TEXT,
-  album_id TEXT,
-  song_id TEXT,
+  artist_id TEXT DEFAULT '',
+  album_id TEXT DEFAULT '',
+  song_id TEXT DEFAULT '',
 
   beginning INTEGER NOT NULL DEFAULT 0,
   length INTEGER NOT NULL DEFAULT 0,
@@ -48,29 +48,32 @@ CREATE TABLE IF NOT EXISTS songs (
 
   source INTEGER NOT NULL DEFAULT 0,
   directory_id INTEGER NOT NULL DEFAULT -1,
-  url TEXT NOT NULL,
+  url TEXT NOT NULL DEFAULT '',
   filetype INTEGER NOT NULL DEFAULT 0,
   filesize INTEGER NOT NULL DEFAULT -1,
   mtime INTEGER NOT NULL DEFAULT -1,
   ctime INTEGER NOT NULL DEFAULT -1,
   unavailable INTEGER DEFAULT 0,
 
+  fingerprint TEXT DEFAULT '',
+
   playcount INTEGER NOT NULL DEFAULT 0,
   skipcount INTEGER NOT NULL DEFAULT 0,
   lastplayed INTEGER NOT NULL DEFAULT -1,
+  lastseen INTEGER NOT NULL DEFAULT -1,
 
   compilation_detected INTEGER DEFAULT 0,
   compilation_on INTEGER NOT NULL DEFAULT 0,
   compilation_off INTEGER NOT NULL DEFAULT 0,
   compilation_effective INTEGER NOT NULL DEFAULT 0,
 
-  art_automatic TEXT,
-  art_manual TEXT,
+  art_automatic TEXT DEFAULT '',
+  art_manual TEXT DEFAULT '',
 
-  effective_albumartist TEXT,
+  effective_albumartist TEXT DEFAULT '',
   effective_originalyear INTEGER NOT NULL DEFAULT 0,
 
-  cue_path TEXT,
+  cue_path TEXT DEFAULT '',
 
   rating INTEGER DEFAULT -1
 
@@ -78,25 +81,25 @@ CREATE TABLE IF NOT EXISTS songs (
 
 CREATE TABLE IF NOT EXISTS subsonic_songs (
 
-  title TEXT,
-  album TEXT,
-  artist TEXT,
-  albumartist TEXT,
+  title TEXT DEFAULT '',
+  album TEXT DEFAULT '',
+  artist TEXT DEFAULT '',
+  albumartist TEXT DEFAULT '',
   track INTEGER NOT NULL DEFAULT -1,
   disc INTEGER NOT NULL DEFAULT -1,
   year INTEGER NOT NULL DEFAULT -1,
   originalyear INTEGER NOT NULL DEFAULT -1,
-  genre TEXT,
+  genre TEXT DEFAULT '',
   compilation INTEGER NOT NULL DEFAULT 0,
-  composer TEXT,
-  performer TEXT,
-  grouping TEXT,
-  comment TEXT,
-  lyrics TEXT,
+  composer TEXT DEFAULT '',
+  performer TEXT DEFAULT '',
+  grouping TEXT DEFAULT '',
+  comment TEXT DEFAULT '',
+  lyrics TEXT DEFAULT '',
 
-  artist_id TEXT,
-  album_id TEXT,
-  song_id TEXT,
+  artist_id TEXT DEFAULT '',
+  album_id TEXT DEFAULT '',
+  song_id TEXT DEFAULT '',
 
   beginning INTEGER NOT NULL DEFAULT 0,
   length INTEGER NOT NULL DEFAULT 0,
@@ -107,29 +110,32 @@ CREATE TABLE IF NOT EXISTS subsonic_songs (
 
   source INTEGER NOT NULL DEFAULT 0,
   directory_id INTEGER NOT NULL DEFAULT -1,
-  url TEXT NOT NULL,
+  url TEXT NOT NULL DEFAULT '',
   filetype INTEGER NOT NULL DEFAULT 0,
   filesize INTEGER NOT NULL DEFAULT -1,
   mtime INTEGER NOT NULL DEFAULT -1,
   ctime INTEGER NOT NULL DEFAULT -1,
   unavailable INTEGER DEFAULT 0,
 
+  fingerprint TEXT DEFAULT '',
+
   playcount INTEGER NOT NULL DEFAULT 0,
   skipcount INTEGER NOT NULL DEFAULT 0,
   lastplayed INTEGER NOT NULL DEFAULT -1,
+  lastseen INTEGER NOT NULL DEFAULT -1,
 
   compilation_detected INTEGER DEFAULT 0,
   compilation_on INTEGER NOT NULL DEFAULT 0,
   compilation_off INTEGER NOT NULL DEFAULT 0,
   compilation_effective INTEGER NOT NULL DEFAULT 0,
 
-  art_automatic TEXT,
-  art_manual TEXT,
+  art_automatic TEXT DEFAULT '',
+  art_manual TEXT DEFAULT '',
 
-  effective_albumartist TEXT,
+  effective_albumartist TEXT DEFAULT '',
   effective_originalyear INTEGER NOT NULL DEFAULT 0,
 
-  cue_path TEXT,
+  cue_path TEXT DEFAULT '',
 
   rating INTEGER DEFAULT -1
 
@@ -137,25 +143,25 @@ CREATE TABLE IF NOT EXISTS subsonic_songs (
 
 CREATE TABLE IF NOT EXISTS tidal_artists_songs (
 
-  title TEXT,
-  album TEXT,
-  artist TEXT,
-  albumartist TEXT,
+  title TEXT DEFAULT '',
+  album TEXT DEFAULT '',
+  artist TEXT DEFAULT '',
+  albumartist TEXT DEFAULT '',
   track INTEGER NOT NULL DEFAULT -1,
   disc INTEGER NOT NULL DEFAULT -1,
   year INTEGER NOT NULL DEFAULT -1,
   originalyear INTEGER NOT NULL DEFAULT -1,
-  genre TEXT,
+  genre TEXT DEFAULT '',
   compilation INTEGER NOT NULL DEFAULT 0,
-  composer TEXT,
-  performer TEXT,
-  grouping TEXT,
-  comment TEXT,
-  lyrics TEXT,
+  composer TEXT DEFAULT '',
+  performer TEXT DEFAULT '',
+  grouping TEXT DEFAULT '',
+  comment TEXT DEFAULT '',
+  lyrics TEXT DEFAULT '',
 
-  artist_id TEXT,
-  album_id TEXT,
-  song_id TEXT,
+  artist_id TEXT DEFAULT '',
+  album_id TEXT DEFAULT '',
+  song_id TEXT DEFAULT '',
 
   beginning INTEGER NOT NULL DEFAULT 0,
   length INTEGER NOT NULL DEFAULT 0,
@@ -166,29 +172,32 @@ CREATE TABLE IF NOT EXISTS tidal_artists_songs (
 
   source INTEGER NOT NULL DEFAULT 0,
   directory_id INTEGER NOT NULL DEFAULT -1,
-  url TEXT NOT NULL,
+  url TEXT NOT NULL DEFAULT '',
   filetype INTEGER NOT NULL DEFAULT 0,
   filesize INTEGER NOT NULL DEFAULT -1,
   mtime INTEGER NOT NULL DEFAULT -1,
   ctime INTEGER NOT NULL DEFAULT -1,
   unavailable INTEGER DEFAULT 0,
 
+  fingerprint TEXT DEFAULT '',
+
   playcount INTEGER NOT NULL DEFAULT 0,
   skipcount INTEGER NOT NULL DEFAULT 0,
   lastplayed INTEGER NOT NULL DEFAULT -1,
+  lastseen INTEGER NOT NULL DEFAULT -1,
 
   compilation_detected INTEGER DEFAULT 0,
   compilation_on INTEGER NOT NULL DEFAULT 0,
   compilation_off INTEGER NOT NULL DEFAULT 0,
   compilation_effective INTEGER NOT NULL DEFAULT 0,
 
-  art_automatic TEXT,
-  art_manual TEXT,
+  art_automatic TEXT DEFAULT '',
+  art_manual TEXT DEFAULT '',
 
-  effective_albumartist TEXT,
+  effective_albumartist TEXT DEFAULT '',
   effective_originalyear INTEGER NOT NULL DEFAULT 0,
 
-  cue_path TEXT,
+  cue_path TEXT DEFAULT '',
 
   rating INTEGER DEFAULT -1
 
@@ -196,25 +205,25 @@ CREATE TABLE IF NOT EXISTS tidal_artists_songs (
 
 CREATE TABLE IF NOT EXISTS tidal_albums_songs (
 
-  title TEXT,
-  album TEXT,
-  artist TEXT,
-  albumartist TEXT,
+  title TEXT DEFAULT '',
+  album TEXT DEFAULT '',
+  artist TEXT DEFAULT '',
+  albumartist TEXT DEFAULT '',
   track INTEGER NOT NULL DEFAULT -1,
   disc INTEGER NOT NULL DEFAULT -1,
   year INTEGER NOT NULL DEFAULT -1,
   originalyear INTEGER NOT NULL DEFAULT -1,
-  genre TEXT,
+  genre TEXT DEFAULT '',
   compilation INTEGER NOT NULL DEFAULT 0,
-  composer TEXT,
-  performer TEXT,
-  grouping TEXT,
-  comment TEXT,
-  lyrics TEXT,
+  composer TEXT DEFAULT '',
+  performer TEXT DEFAULT '',
+  grouping TEXT DEFAULT '',
+  comment TEXT DEFAULT '',
+  lyrics TEXT DEFAULT '',
 
-  artist_id TEXT,
-  album_id TEXT,
-  song_id TEXT,
+  artist_id TEXT DEFAULT '',
+  album_id TEXT DEFAULT '',
+  song_id TEXT DEFAULT '',
 
   beginning INTEGER NOT NULL DEFAULT 0,
   length INTEGER NOT NULL DEFAULT 0,
@@ -225,29 +234,32 @@ CREATE TABLE IF NOT EXISTS tidal_albums_songs (
 
   source INTEGER NOT NULL DEFAULT 0,
   directory_id INTEGER NOT NULL DEFAULT -1,
-  url TEXT NOT NULL,
+  url TEXT NOT NULL DEFAULT '',
   filetype INTEGER NOT NULL DEFAULT 0,
   filesize INTEGER NOT NULL DEFAULT -1,
   mtime INTEGER NOT NULL DEFAULT -1,
   ctime INTEGER NOT NULL DEFAULT -1,
   unavailable INTEGER DEFAULT 0,
 
+  fingerprint TEXT DEFAULT '',
+
   playcount INTEGER NOT NULL DEFAULT 0,
   skipcount INTEGER NOT NULL DEFAULT 0,
   lastplayed INTEGER NOT NULL DEFAULT -1,
+  lastseen INTEGER NOT NULL DEFAULT -1,
 
   compilation_detected INTEGER DEFAULT 0,
   compilation_on INTEGER NOT NULL DEFAULT 0,
   compilation_off INTEGER NOT NULL DEFAULT 0,
   compilation_effective INTEGER NOT NULL DEFAULT 0,
 
-  art_automatic TEXT,
-  art_manual TEXT,
+  art_automatic TEXT DEFAULT '',
+  art_manual TEXT DEFAULT '',
 
-  effective_albumartist TEXT,
+  effective_albumartist TEXT DEFAULT '',
   effective_originalyear INTEGER NOT NULL DEFAULT 0,
 
-  cue_path TEXT,
+  cue_path TEXT DEFAULT '',
 
   rating INTEGER DEFAULT -1
 
@@ -255,25 +267,25 @@ CREATE TABLE IF NOT EXISTS tidal_albums_songs (
 
 CREATE TABLE IF NOT EXISTS tidal_songs (
 
-  title TEXT,
-  album TEXT,
-  artist TEXT,
-  albumartist TEXT,
+  title TEXT DEFAULT '',
+  album TEXT DEFAULT '',
+  artist TEXT DEFAULT '',
+  albumartist TEXT DEFAULT '',
   track INTEGER NOT NULL DEFAULT -1,
   disc INTEGER NOT NULL DEFAULT -1,
   year INTEGER NOT NULL DEFAULT -1,
   originalyear INTEGER NOT NULL DEFAULT -1,
-  genre TEXT,
+  genre TEXT DEFAULT '',
   compilation INTEGER NOT NULL DEFAULT 0,
-  composer TEXT,
-  performer TEXT,
-  grouping TEXT,
-  comment TEXT,
-  lyrics TEXT,
+  composer TEXT DEFAULT '',
+  performer TEXT DEFAULT '',
+  grouping TEXT DEFAULT '',
+  comment TEXT DEFAULT '',
+  lyrics TEXT DEFAULT '',
 
-  artist_id TEXT,
-  album_id TEXT,
-  song_id TEXT,
+  artist_id TEXT DEFAULT '',
+  album_id TEXT DEFAULT '',
+  song_id TEXT DEFAULT '',
 
   beginning INTEGER NOT NULL DEFAULT 0,
   length INTEGER NOT NULL DEFAULT 0,
@@ -284,29 +296,32 @@ CREATE TABLE IF NOT EXISTS tidal_songs (
 
   source INTEGER NOT NULL DEFAULT 0,
   directory_id INTEGER NOT NULL DEFAULT -1,
-  url TEXT NOT NULL,
+  url TEXT NOT NULL DEFAULT '',
   filetype INTEGER NOT NULL DEFAULT 0,
   filesize INTEGER NOT NULL DEFAULT -1,
   mtime INTEGER NOT NULL DEFAULT -1,
   ctime INTEGER NOT NULL DEFAULT -1,
   unavailable INTEGER DEFAULT 0,
 
+  fingerprint TEXT DEFAULT '',
+
   playcount INTEGER NOT NULL DEFAULT 0,
   skipcount INTEGER NOT NULL DEFAULT 0,
   lastplayed INTEGER NOT NULL DEFAULT -1,
+  lastseen INTEGER NOT NULL DEFAULT -1,
 
   compilation_detected INTEGER DEFAULT 0,
   compilation_on INTEGER NOT NULL DEFAULT 0,
   compilation_off INTEGER NOT NULL DEFAULT 0,
   compilation_effective INTEGER NOT NULL DEFAULT 0,
 
-  art_automatic TEXT,
-  art_manual TEXT,
+  art_automatic TEXT DEFAULT '',
+  art_manual TEXT DEFAULT '',
 
-  effective_albumartist TEXT,
+  effective_albumartist TEXT DEFAULT '',
   effective_originalyear INTEGER NOT NULL DEFAULT 0,
 
-  cue_path TEXT,
+  cue_path TEXT DEFAULT '',
 
   rating INTEGER DEFAULT -1
 
@@ -314,25 +329,25 @@ CREATE TABLE IF NOT EXISTS tidal_songs (
 
 CREATE TABLE IF NOT EXISTS qobuz_artists_songs (
 
-  title TEXT,
-  album TEXT,
-  artist TEXT,
-  albumartist TEXT,
+  title TEXT DEFAULT '',
+  album TEXT DEFAULT '',
+  artist TEXT DEFAULT '',
+  albumartist TEXT DEFAULT '',
   track INTEGER NOT NULL DEFAULT -1,
   disc INTEGER NOT NULL DEFAULT -1,
   year INTEGER NOT NULL DEFAULT -1,
   originalyear INTEGER NOT NULL DEFAULT -1,
-  genre TEXT,
+  genre TEXT DEFAULT '',
   compilation INTEGER NOT NULL DEFAULT 0,
-  composer TEXT,
-  performer TEXT,
-  grouping TEXT,
-  comment TEXT,
-  lyrics TEXT,
+  composer TEXT DEFAULT '',
+  performer TEXT DEFAULT '',
+  grouping TEXT DEFAULT '',
+  comment TEXT DEFAULT '',
+  lyrics TEXT DEFAULT '',
 
-  artist_id TEXT,
-  album_id TEXT,
-  song_id TEXT,
+  artist_id TEXT DEFAULT '',
+  album_id TEXT DEFAULT '',
+  song_id TEXT DEFAULT '',
 
   beginning INTEGER NOT NULL DEFAULT 0,
   length INTEGER NOT NULL DEFAULT 0,
@@ -343,29 +358,32 @@ CREATE TABLE IF NOT EXISTS qobuz_artists_songs (
 
   source INTEGER NOT NULL DEFAULT 0,
   directory_id INTEGER NOT NULL DEFAULT -1,
-  url TEXT NOT NULL,
+  url TEXT NOT NULL DEFAULT '',
   filetype INTEGER NOT NULL DEFAULT 0,
   filesize INTEGER NOT NULL DEFAULT -1,
   mtime INTEGER NOT NULL DEFAULT -1,
   ctime INTEGER NOT NULL DEFAULT -1,
   unavailable INTEGER DEFAULT 0,
 
+  fingerprint TEXT DEFAULT '',
+
   playcount INTEGER NOT NULL DEFAULT 0,
   skipcount INTEGER NOT NULL DEFAULT 0,
   lastplayed INTEGER NOT NULL DEFAULT -1,
+  lastseen INTEGER NOT NULL DEFAULT -1,
 
   compilation_detected INTEGER DEFAULT 0,
   compilation_on INTEGER NOT NULL DEFAULT 0,
   compilation_off INTEGER NOT NULL DEFAULT 0,
   compilation_effective INTEGER NOT NULL DEFAULT 0,
 
-  art_automatic TEXT,
-  art_manual TEXT,
+  art_automatic TEXT DEFAULT '',
+  art_manual TEXT DEFAULT '',
 
-  effective_albumartist TEXT,
+  effective_albumartist TEXT DEFAULT '',
   effective_originalyear INTEGER NOT NULL DEFAULT 0,
 
-  cue_path TEXT,
+  cue_path TEXT DEFAULT '',
 
   rating INTEGER DEFAULT -1
 
@@ -373,25 +391,25 @@ CREATE TABLE IF NOT EXISTS qobuz_artists_songs (
 
 CREATE TABLE IF NOT EXISTS qobuz_albums_songs (
 
-  title TEXT,
-  album TEXT,
-  artist TEXT,
-  albumartist TEXT,
+  title TEXT DEFAULT '',
+  album TEXT DEFAULT '',
+  artist TEXT DEFAULT '',
+  albumartist TEXT DEFAULT '',
   track INTEGER NOT NULL DEFAULT -1,
   disc INTEGER NOT NULL DEFAULT -1,
   year INTEGER NOT NULL DEFAULT -1,
   originalyear INTEGER NOT NULL DEFAULT -1,
-  genre TEXT,
+  genre TEXT DEFAULT '',
   compilation INTEGER NOT NULL DEFAULT 0,
-  composer TEXT,
-  performer TEXT,
-  grouping TEXT,
-  comment TEXT,
-  lyrics TEXT,
+  composer TEXT DEFAULT '',
+  performer TEXT DEFAULT '',
+  grouping TEXT DEFAULT '',
+  comment TEXT DEFAULT '',
+  lyrics TEXT DEFAULT '',
 
-  artist_id TEXT,
-  album_id TEXT,
-  song_id TEXT,
+  artist_id TEXT DEFAULT '',
+  album_id TEXT DEFAULT '',
+  song_id TEXT DEFAULT '',
 
   beginning INTEGER NOT NULL DEFAULT 0,
   length INTEGER NOT NULL DEFAULT 0,
@@ -402,29 +420,32 @@ CREATE TABLE IF NOT EXISTS qobuz_albums_songs (
 
   source INTEGER NOT NULL DEFAULT 0,
   directory_id INTEGER NOT NULL DEFAULT -1,
-  url TEXT NOT NULL,
+  url TEXT NOT NULL DEFAULT '',
   filetype INTEGER NOT NULL DEFAULT 0,
   filesize INTEGER NOT NULL DEFAULT -1,
   mtime INTEGER NOT NULL DEFAULT -1,
   ctime INTEGER NOT NULL DEFAULT -1,
   unavailable INTEGER DEFAULT 0,
 
+  fingerprint TEXT DEFAULT '',
+
   playcount INTEGER NOT NULL DEFAULT 0,
   skipcount INTEGER NOT NULL DEFAULT 0,
   lastplayed INTEGER NOT NULL DEFAULT -1,
+  lastseen INTEGER NOT NULL DEFAULT -1,
 
   compilation_detected INTEGER DEFAULT 0,
   compilation_on INTEGER NOT NULL DEFAULT 0,
   compilation_off INTEGER NOT NULL DEFAULT 0,
   compilation_effective INTEGER NOT NULL DEFAULT 0,
 
-  art_automatic TEXT,
-  art_manual TEXT,
+  art_automatic TEXT DEFAULT '',
+  art_manual TEXT DEFAULT '',
 
-  effective_albumartist TEXT,
+  effective_albumartist TEXT DEFAULT '',
   effective_originalyear INTEGER NOT NULL DEFAULT 0,
 
-  cue_path TEXT,
+  cue_path TEXT DEFAULT '',
 
   rating INTEGER DEFAULT -1
 
@@ -432,25 +453,25 @@ CREATE TABLE IF NOT EXISTS qobuz_albums_songs (
 
 CREATE TABLE IF NOT EXISTS qobuz_songs (
 
-  title TEXT,
-  album TEXT,
-  artist TEXT,
-  albumartist TEXT,
+  title TEXT DEFAULT '',
+  album TEXT DEFAULT '',
+  artist TEXT DEFAULT '',
+  albumartist TEXT DEFAULT '',
   track INTEGER NOT NULL DEFAULT -1,
   disc INTEGER NOT NULL DEFAULT -1,
   year INTEGER NOT NULL DEFAULT -1,
   originalyear INTEGER NOT NULL DEFAULT -1,
-  genre TEXT,
+  genre TEXT DEFAULT '',
   compilation INTEGER NOT NULL DEFAULT 0,
-  composer TEXT,
-  performer TEXT,
-  grouping TEXT,
-  comment TEXT,
-  lyrics TEXT,
+  composer TEXT DEFAULT '',
+  performer TEXT DEFAULT '',
+  grouping TEXT DEFAULT '',
+  comment TEXT DEFAULT '',
+  lyrics TEXT DEFAULT '',
 
-  artist_id TEXT,
-  album_id TEXT,
-  song_id TEXT,
+  artist_id TEXT DEFAULT '',
+  album_id TEXT DEFAULT '',
+  song_id TEXT DEFAULT '',
 
   beginning INTEGER NOT NULL DEFAULT 0,
   length INTEGER NOT NULL DEFAULT 0,
@@ -461,29 +482,32 @@ CREATE TABLE IF NOT EXISTS qobuz_songs (
 
   source INTEGER NOT NULL DEFAULT 0,
   directory_id INTEGER NOT NULL DEFAULT -1,
-  url TEXT NOT NULL,
+  url TEXT NOT NULL DEFAULT '',
   filetype INTEGER NOT NULL DEFAULT 0,
   filesize INTEGER NOT NULL DEFAULT -1,
   mtime INTEGER NOT NULL DEFAULT -1,
   ctime INTEGER NOT NULL DEFAULT -1,
   unavailable INTEGER DEFAULT 0,
 
+  fingerprint TEXT DEFAULT '',
+
   playcount INTEGER NOT NULL DEFAULT 0,
   skipcount INTEGER NOT NULL DEFAULT 0,
   lastplayed INTEGER NOT NULL DEFAULT -1,
+  lastseen INTEGER NOT NULL DEFAULT -1,
 
   compilation_detected INTEGER DEFAULT 0,
   compilation_on INTEGER NOT NULL DEFAULT 0,
   compilation_off INTEGER NOT NULL DEFAULT 0,
   compilation_effective INTEGER NOT NULL DEFAULT 0,
 
-  art_automatic TEXT,
-  art_manual TEXT,
+  art_automatic TEXT DEFAULT '',
+  art_manual TEXT DEFAULT '',
 
-  effective_albumartist TEXT,
+  effective_albumartist TEXT DEFAULT '',
   effective_originalyear INTEGER NOT NULL DEFAULT 0,
 
-  cue_path TEXT,
+  cue_path TEXT DEFAULT '',
 
   rating INTEGER DEFAULT -1
 
@@ -491,15 +515,15 @@ CREATE TABLE IF NOT EXISTS qobuz_songs (
 
 CREATE TABLE IF NOT EXISTS playlists (
 
-  name TEXT NOT NULL,
+  name TEXT NOT NULL DEFAULT '',
   last_played INTEGER NOT NULL DEFAULT -1,
   ui_order INTEGER NOT NULL DEFAULT 0,
-  special_type TEXT,
-  ui_path TEXT,
+  special_type TEXT DEFAULT '',
+  ui_path TEXT DEFAULT '',
   is_favorite INTEGER NOT NULL DEFAULT 0,
 
   dynamic_playlist_type INTEGER,
-  dynamic_playlist_backend TEXT,
+  dynamic_playlist_backend TEXT DEFAULT '',
   dynamic_playlist_data BLOB
 
 );
@@ -509,27 +533,27 @@ CREATE TABLE IF NOT EXISTS playlist_items (
   playlist INTEGER NOT NULL,
   type INTEGER NOT NULL DEFAULT 0,
   collection_id INTEGER,
-  playlist_url TEXT,
+  playlist_url TEXT DEFAULT '',
 
-  title TEXT,
-  album TEXT,
-  artist TEXT,
-  albumartist TEXT,
+  title TEXT DEFAULT '',
+  album TEXT DEFAULT '',
+  artist TEXT DEFAULT '',
+  albumartist TEXT DEFAULT '',
   track INTEGER,
   disc INTEGER,
   year INTEGER,
   originalyear INTEGER,
-  genre TEXT,
+  genre TEXT DEFAULT '',
   compilation INTEGER DEFAULT 0,
-  composer TEXT,
-  performer TEXT,
-  grouping TEXT,
-  comment TEXT,
-  lyrics TEXT,
+  composer TEXT DEFAULT '',
+  performer TEXT DEFAULT '',
+  grouping TEXT DEFAULT '',
+  comment TEXT DEFAULT '',
+  lyrics TEXT DEFAULT '',
 
-  artist_id TEXT,
-  album_id TEXT,
-  song_id TEXT,
+  artist_id TEXT DEFAULT '',
+  album_id TEXT DEFAULT '',
+  song_id TEXT DEFAULT '',
 
   beginning INTEGER,
   length INTEGER,
@@ -540,44 +564,54 @@ CREATE TABLE IF NOT EXISTS playlist_items (
 
   source INTEGER,
   directory_id INTEGER,
-  url TEXT,
+  url TEXT DEFAULT '',
   filetype INTEGER,
   filesize INTEGER,
   mtime INTEGER,
   ctime INTEGER,
   unavailable INTEGER DEFAULT 0,
 
+  fingerprint TEXT DEFAULT '',
+
   playcount INTEGER DEFAULT 0,
   skipcount INTEGER DEFAULT 0,
-  lastplayed INTEGER DEFAULT 0,
+  lastplayed INTEGER DEFAULT -1,
+  lastseen INTEGER DEFAULT -1,
 
   compilation_detected INTEGER DEFAULT 0,
   compilation_on INTEGER DEFAULT 0,
   compilation_off INTEGER DEFAULT 0,
   compilation_effective INTEGER DEFAULT 0,
 
-  art_automatic TEXT,
-  art_manual TEXT,
+  art_automatic TEXT DEFAULT '',
+  art_manual TEXT DEFAULT '',
 
-  effective_albumartist TEXT,
+  effective_albumartist TEXT DEFAULT '',
   effective_originalyear INTEGER,
 
-  cue_path TEXT,
+  cue_path TEXT DEFAULT '',
 
   rating INTEGER DEFAULT -1
 
 );
 
 CREATE TABLE IF NOT EXISTS devices (
-  unique_id TEXT NOT NULL,
-  friendly_name TEXT,
+  unique_id TEXT NOT NULL DEFAULT '',
+  friendly_name TEXT DEFAULT '',
   size INTEGER,
-  icon TEXT,
+  icon TEXT DEFAULT '',
   schema_version INTEGER NOT NULL DEFAULT 0,
   transcode_mode NOT NULL DEFAULT 3,
   transcode_format NOT NULL DEFAULT 5
 );
 
+CREATE TABLE IF NOT EXISTS radio_channels (
+  source INTEGER NOT NULL DEFAULT 0,
+  name TEXT DEFAULT '',
+  url TEXT DEFAULT '',
+  thumbnail_url TEXT DEFAULT ''
+);
+
 CREATE INDEX IF NOT EXISTS idx_url ON songs (url);
 
 CREATE INDEX IF NOT EXISTS idx_comp_artist ON songs (compilation_effective, artist);

debian/control

@@ -17,6 +17,7 @@ Build-Depends: debhelper (>= 11),
                libpulse-dev,
                libtag1-dev,
                qtbase5-dev,
+               qtbase5-private-dev,
                qtbase5-dev-tools,
                qttools5-dev,
                libqt5x11extras5-dev,
@@ -41,24 +42,26 @@ Depends: ${shlibs:Depends},
          gstreamer1.0-pulseaudio
 Homepage: http://www.strawberrymusicplayer.org/
 Description: Audio player and music collection organizer
- Strawberry is a music player aimed at music collectors, audio enthusiasts and audiophiles.
+ Strawberry is a music player aimed at music collectors and audiophiles.
  .
  Features:
   - Play and organize music
   - Supports WAV, FLAC, WavPack, Ogg Vorbis, Speex, MPC, TrueAudio, AIFF, MP4, MP3 and ASF
   - Audio CD playback
   - Native desktop notifications
+  - Playlist management
   - Playlists in multiple formats
   - Advanced audio output and device configuration for bit-perfect playback on Linux
-  - Edit tags on music files
-  - Fetch tags from MusicBrainz
+  - Edit tags on audio files
+  - Automatically retrieve tags from MusicBrainz
   - Album cover art from Last.fm, Musicbrainz, Discogs, Musixmatch, Deezer, Tidal, Qobuz and Spotify
   - Song lyrics from AudD, Genius, Musixmatch, ChartLyrics, lyrics.ovh and lololyrics.com
   - Support for multiple backends
   - Audio analyzer
   - Audio equalizer
-  - Transfer music to iPod, iPhone, MTP or mass-storage USB player
+  - Transfer music to mass-storage USB players, MTP compatible devices and iPod Nano/Classic
   - Scrobbler with support for Last.fm, Libre.fm and ListenBrainz
-  - Streaming support for Subsonic
+  - Streaming support for Subsonic-compatible servers
+  - Unofficial streaming support for Tidal and Qobuz
  .
  It is a fork of Clementine. The name is inspired by the band Strawbs.

dist/CMakeLists.txt

@@ -7,24 +7,24 @@ if(DEB_CODENAME AND DEB_DATE)
 endif(DEB_CODENAME AND DEB_DATE)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/unix/PKGBUILD.in ${CMAKE_CURRENT_SOURCE_DIR}/unix/PKGBUILD @ONLY)
 
-if (APPLE)
+if(APPLE)
   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/macos/Info.plist.in ${CMAKE_CURRENT_SOURCE_DIR}/macos/Info.plist)
-endif (APPLE)
+endif(APPLE)
 
-if (WIN32)
+if(WIN32)
   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/windows/strawberry.nsi.in ${CMAKE_CURRENT_SOURCE_DIR}/windows/strawberry.nsi @ONLY)
-endif (WIN32)
+endif(WIN32)
 
-if (UNIX AND NOT APPLE)
+if(UNIX AND NOT APPLE)
   install(FILES ../data/icons/48x48/strawberry.png DESTINATION share/icons/hicolor/48x48/apps/)
   install(FILES ../data/icons/64x64/strawberry.png DESTINATION share/icons/hicolor/64x64/apps/)
   install(FILES ../data/icons/128x128/strawberry.png DESTINATION share/icons/hicolor/128x128/apps/)
   install(FILES unix/org.strawberrymusicplayer.strawberry.desktop DESTINATION share/applications)
   install(FILES unix/org.strawberrymusicplayer.strawberry.appdata.xml DESTINATION share/metainfo)
   install(FILES unix/strawberry.1 unix/strawberry-tagreader.1 DESTINATION share/man/man1)
-endif (UNIX AND NOT APPLE)
+endif(UNIX AND NOT APPLE)
 
-if (APPLE)
-  install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../dist/macos/Info.plist" DESTINATION "${CMAKE_BINARY_DIR}/strawberry.app/Contents")
-  install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../dist/macos/strawberry.icns" DESTINATION "${CMAKE_BINARY_DIR}/strawberry.app/Contents/Resources")
-endif (APPLE)
+if(APPLE)
+  install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/macos/Info.plist" DESTINATION "${CMAKE_BINARY_DIR}/strawberry.app/Contents")
+  install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/macos/strawberry.icns" DESTINATION "${CMAKE_BINARY_DIR}/strawberry.app/Contents/Resources")
+endif()

dist/macos/Info.plist.in

@@ -38,6 +38,19 @@
   <string>https://www.strawberrymusicplayer.org/sparkle-macos</string>
   <key>SUPublicEDKey</key>
   <string>3IRScV8YtNVnx7zoeJAXvg28Kh1gN/Pyl2iPM467pG8=</string>
+  <key>CFBundleURLTypes</key>
+  <array>
+    <dict>
+      <key>CFBundleTypeRole</key>
+      <string>Viewer</string>
+      <key>CFBundleURLName</key>
+      <string>org.strawberrymusicplayer.strawberry</string>
+      <key>CFBundleURLSchemes</key>
+      <array>
+        <string>tidal</string>
+      </array>
+    </dict>
+  </array>
   <key>CFBundleDocumentTypes</key>
   <array>
     <dict>

dist/macos/macdeploy.py

@@ -1,514 +0,0 @@
-#!/usr/bin/python
-
-#  Strawberry Music Player
-#  This file was part of Clementine.
-#
-#  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/>.
-
-from distutils import spawn
-import logging
-import os
-import re
-import subprocess
-import sys
-import traceback
-
-LOGGER = logging.getLogger('macdeploy')
-
-LIBRARY_SEARCH_PATH = ['/usr/local/lib', '/usr/local/opt/icu4c/lib']
-
-FRAMEWORK_SEARCH_PATH = [
-    '/Library/Frameworks',
-    os.path.join(os.environ['HOME'], 'Library/Frameworks'),
-    '/Library/Frameworks/Sparkle.framework/Versions'
-]
-
-QT_PLUGINS = [
-    'platforms/libqcocoa.dylib',
-    'platforminputcontexts/libqtvirtualkeyboardplugin.dylib',
-    'styles/libqmacstyle.dylib',
-    'sqldrivers/libqsqlite.dylib',
-    'bearer/libqgenericbearer.dylib',
-    'iconengines/libqsvgicon.dylib',
-    'imageformats/libqgif.dylib',
-    'imageformats/libqicns.dylib',
-    'imageformats/libqico.dylib',
-    'imageformats/libqjpeg.dylib',
-    'imageformats/libqsvg.dylib',
-    'imageformats/libqtiff.dylib',
-    'printsupport/libcocoaprintersupport.dylib',
-    'virtualkeyboard/libqtvirtualkeyboard_hangul.dylib',
-    'virtualkeyboard/libqtvirtualkeyboard_openwnn.dylib',
-    'virtualkeyboard/libqtvirtualkeyboard_pinyin.dylib',
-    'virtualkeyboard/libqtvirtualkeyboard_tcime.dylib',
-    'virtualkeyboard/libqtvirtualkeyboard_thai.dylib',
-]
-
-QT_PLUGINS_SEARCH_PATH = [
-    '/usr/local/opt/qt/plugins',
-]
-
-GSTREAMER_SEARCH_PATH = [
-    '/usr/local/lib/gstreamer-1.0',
-    '/usr/local/Cellar/gstreamer',
-]
-
-GSTREAMER_PLUGINS = [
-
-    'libgstapetag.dylib',
-    'libgstapp.dylib',
-    'libgstaudioconvert.dylib',
-    'libgstaudiofx.dylib',
-    'libgstaudiomixer.dylib',
-    'libgstaudioparsers.dylib',
-    'libgstaudiorate.dylib',
-    'libgstaudioresample.dylib',
-    'libgstaudiotestsrc.dylib',
-    'libgstaudiovisualizers.dylib',
-    'libgstauparse.dylib',
-    'libgstautoconvert.dylib',
-    'libgstautodetect.dylib',
-    'libgstcoreelements.dylib',
-    'libgstequalizer.dylib',
-    'libgstgio.dylib',
-    'libgsticydemux.dylib',
-    'libgstid3demux.dylib',
-    'libgstlevel.dylib',
-    'libgstosxaudio.dylib',
-    'libgstplayback.dylib',
-    'libgstrawparse.dylib',
-    'libgstreplaygain.dylib',
-    'libgstsoup.dylib',
-    'libgstspectrum.dylib',
-    'libgsttypefindfunctions.dylib',
-    'libgstvolume.dylib',
-    'libgstxingmux.dylib',
-    'libgsttcp.dylib',
-    'libgstudp.dylib',
-    'libgstpbtypes.dylib',
-    'libgstrtp.dylib',
-    'libgstrtsp.dylib',
-
-    'libgstflac.dylib',
-    'libgstwavparse.dylib',
-    'libgstfaac.dylib',
-    'libgstfaad.dylib',
-    'libgstogg.dylib',
-    'libgstopus.dylib',
-    'libgstopusparse.dylib',
-    'libgstasf.dylib',
-    'libgstspeex.dylib',
-    'libgsttaglib.dylib',
-    'libgstvorbis.dylib',
-    'libgstisomp4.dylib',
-    'libgstlibav.dylib',
-    'libgstaiff.dylib',
-    'libgstlame.dylib',
-    'libgstmusepack.dylib',
-
-]
-
-GIO_MODULES_SEARCH_PATH = ['/usr/local/lib/gio/modules',]
-
-INSTALL_NAME_TOOL_APPLE = 'install_name_tool'
-INSTALL_NAME_TOOL_CROSS = 'x86_64-apple-darwin-%s' % INSTALL_NAME_TOOL_APPLE
-INSTALL_NAME_TOOL = INSTALL_NAME_TOOL_CROSS if spawn.find_executable(INSTALL_NAME_TOOL_CROSS) else INSTALL_NAME_TOOL_APPLE
-
-OTOOL_APPLE = 'otool'
-OTOOL_CROSS = 'x86_64-apple-darwin-%s' % OTOOL_APPLE
-OTOOL = OTOOL_CROSS if spawn.find_executable(OTOOL_CROSS) else OTOOL_APPLE
-
-
-class Error(Exception):
-  pass
-
-
-class CouldNotFindFrameworkError(Error):
-  pass
-
-class CouldNotFindGioModuleError(Error):
-  pass
-
-class CouldNotFindQtPluginError(Error):
-  pass
-
-class CouldNotParseFrameworkNameError(Error):
-  pass
-
-class InstallNameToolError(Error):
-  pass
-
-
-class CouldNotFindGstreamerPluginError(Error):
-  pass
-
-if len(sys.argv) < 2:
-  print('Usage: %s <bundle.app>' % sys.argv[0])
-
-bundle_dir = sys.argv[1]
-
-bundle_name = os.path.basename(bundle_dir).split('.')[0]
-
-commands = []
-
-frameworks_dir = os.path.join(bundle_dir, 'Contents', 'Frameworks')
-commands.append(['mkdir', '-p', frameworks_dir])
-resources_dir = os.path.join(bundle_dir, 'Contents', 'Resources')
-commands.append(['mkdir', '-p', resources_dir])
-plugins_dir = os.path.join(bundle_dir, 'Contents', 'PlugIns')
-binary = os.path.join(bundle_dir, 'Contents', 'MacOS', bundle_name)
-tagreader_binary = os.path.join(plugins_dir, bundle_name + "-tagreader")
-
-fixed_libraries = set()
-fixed_frameworks = set()
-
-
-def GetBrokenLibraries(binary):
-  #print("Checking libs for binary: %s" % binary)
-  output = subprocess.Popen([OTOOL, '-L', binary], stdout=subprocess.PIPE).communicate()[0].decode('utf-8')
-  broken_libs = {'frameworks': [], 'libs': []}
-  for line in [x.split(' ')[0].lstrip() for x in output.split('\n')[1:]]:
-    #print("Checking line: %s" % line)
-    if not line:  # skip empty lines
-      continue
-    if os.path.basename(binary) == os.path.basename(line):
-      #print("mnope %s-%s" % (os.path.basename(binary), os.path.basename(line)))
-      continue
-    if re.match(r'^\s*/System/', line):
-      #print("system framework: %s" % line)
-      continue  # System framework
-    elif re.match(r'^\s*/usr/lib/', line):
-      #print("unix style system lib: %s" % line)
-      continue  # unix style system library
-    elif re.match(r'^\s*@executable_path', line) or re.match(r'^\s*@rpath', line) or re.match(r'^\s*@loader_path', line):
-      # Potentially already fixed library
-      if line.count('/') == 1:
-        relative_path = os.path.join(*line.split('/')[1:])
-        if not os.path.exists(os.path.join(frameworks_dir, relative_path)):
-          broken_libs['libs'].append(relative_path)
-      elif line.count('/') == 2:
-        relative_path = os.path.join(*line.split('/')[2:])
-        if not os.path.exists(os.path.join(frameworks_dir, relative_path)):
-          broken_libs['libs'].append(relative_path)
-      elif line.count('/') >= 3:
-        relative_path = os.path.join(*line.split('/')[3:])
-        if not os.path.exists(os.path.join(frameworks_dir, relative_path)):
-          broken_libs['frameworks'].append(relative_path)
-      else:
-          print("GetBrokenLibraries Error: %s" % line)
-    elif re.search(r'\w+\.framework', line):
-      #print("framework: %s" % line)
-      broken_libs['frameworks'].append(line)
-    else:
-      broken_libs['libs'].append(line)
-
-  return broken_libs
-
-
-def FindFramework(path):
-  for search_path in FRAMEWORK_SEARCH_PATH:
-    abs_path = os.path.join(search_path, path)
-    if os.path.exists(abs_path):
-      LOGGER.debug("Found framework '%s' in '%s'", path, search_path)
-      return abs_path
-
-  raise CouldNotFindFrameworkError(path)
-
-
-def FindLibrary(path):
-  if os.path.exists(path):
-    return path
-  for search_path in LIBRARY_SEARCH_PATH:
-    abs_path = os.path.join(search_path, path)
-    if os.path.exists(abs_path):
-      LOGGER.debug("Found library '%s' in '%s'", path, search_path)
-      return abs_path
-    else: # try harder---look for lib name in library folders
-      newpath = os.path.join(search_path,os.path.basename(path))
-      if os.path.exists(newpath):
-        return newpath
-
-  raise CouldNotFindFrameworkError(path)
-
-
-def FixAllLibraries(broken_libs):
-  for framework in broken_libs['frameworks']:
-    FixFramework(framework)
-  for lib in broken_libs['libs']:
-    FixLibrary(lib)
-
-
-def FixFramework(path):
-  if path in fixed_frameworks:
-    return
-  else:
-    fixed_frameworks.add(path)
-  abs_path = FindFramework(path)
-  broken_libs = GetBrokenLibraries(abs_path)
-  FixAllLibraries(broken_libs)
-
-  new_path = CopyFramework(abs_path)
-  id = os.sep.join(new_path.split(os.sep)[3:])
-  FixFrameworkId(new_path, id)
-  for framework in broken_libs['frameworks']:
-    FixFrameworkInstallPath(framework, new_path)
-  for library in broken_libs['libs']:
-    FixLibraryInstallPath(library, new_path)
-
-
-def FixLibrary(path):
-
-  if path in fixed_libraries:
-    return
-
-  # Always bundle libraries provided by homebrew (/usr/local).
-  if not re.match(r'^\s*/usr/local', path) and FindSystemLibrary(os.path.basename(path)) is not None:
-    return
-
-  fixed_libraries.add(path)
-
-  abs_path = FindLibrary(path)
-  if abs_path == "":
-    print("Could not resolve %s, not fixing!" % path)
-    return
-
-  broken_libs = GetBrokenLibraries(abs_path)
-  FixAllLibraries(broken_libs)
-
-  new_path = CopyLibrary(abs_path)
-  FixLibraryId(new_path)
-  for framework in broken_libs['frameworks']:
-    FixFrameworkInstallPath(framework, new_path)
-  for library in broken_libs['libs']:
-    FixLibraryInstallPath(library, new_path)
-
-
-def FixPlugin(abs_path, subdir):
-  broken_libs = GetBrokenLibraries(abs_path)
-  FixAllLibraries(broken_libs)
-
-  new_path = CopyPlugin(abs_path, subdir)
-  for framework in broken_libs['frameworks']:
-    FixFrameworkInstallPath(framework, new_path)
-  for library in broken_libs['libs']:
-    FixLibraryInstallPath(library, new_path)
-
-
-def FixBinary(path):
-  broken_libs = GetBrokenLibraries(path)
-  FixAllLibraries(broken_libs)
-  for framework in broken_libs['frameworks']:
-    FixFrameworkInstallPath(framework, path)
-  for library in broken_libs['libs']:
-    FixLibraryInstallPath(library, path)
-
-
-def CopyLibrary(path):
-  new_path = os.path.join(frameworks_dir, os.path.basename(path))
-  #args = ['cp', path, new_path]
-  args = ['ditto', '--arch=i386', '--arch=x86_64', path, new_path]
-  commands.append(args)
-  commands.append(['chmod', '+w', new_path])
-  LOGGER.info("Copying library '%s'", path)
-  return new_path
-
-
-def CopyPlugin(path, subdir):
-  new_path = os.path.join(plugins_dir, subdir, os.path.basename(path))
-  args = ['mkdir', '-p', os.path.dirname(new_path)]
-  commands.append(args)
-  #args = ['cp', path, new_path]
-  args = ['ditto', '--arch=i386', '--arch=x86_64', path, new_path]
-  commands.append(args)
-  commands.append(['chmod', '+w', new_path])
-  LOGGER.info("Copying plugin '%s'", path)
-  return new_path
-
-def CopyFramework(path):
-  parts = path.split(os.sep)
-  for i, part in enumerate(parts):
-    if re.match(r'\w+\.framework', part):
-      full_path = os.path.join(frameworks_dir, *parts[i:-1])
-      framework_name = part.split(".framework")[0]
-      break
-
-def CopyFramework(src_binary):
-  while os.path.islink(src_binary):
-    src_binary = os.path.realpath(src_binary)
-
-  m = re.match(r'(.*/([^/]+)\.framework)/Versions/([^/]+)/.*', src_binary)
-  if not m:
-    raise CouldNotParseFrameworkNameError(src_binary)
-
-  src_base = m.group(1)
-  name = m.group(2)
-  version = m.group(3)
-
-  LOGGER.info('Copying framework %s version %s', name, version)
-
-  dest_base = os.path.join(frameworks_dir, '%s.framework' % name)
-  dest_dir = os.path.join(dest_base, 'Versions', version)
-  dest_binary = os.path.join(dest_dir, name)
-
-  commands.append(['mkdir', '-p', dest_dir])
-  commands.append(['cp', src_binary, dest_binary])
-  commands.append(['chmod', '+w', dest_binary])
-
-  # Copy special files from various places:
-  #   QtCore has Resources/qt_menu.nib (copy to app's Resources)
-  #   Sparkle has Resources/*
-  #   Qt* have Resources/Info.plist
-  resources_src = os.path.join(src_base, 'Resources')
-  menu_nib = os.path.join(resources_src, 'qt_menu.nib')
-  if os.path.exists(menu_nib):
-    LOGGER.info("Copying qt_menu.nib '%s'", menu_nib)
-    commands.append(['cp', '-r', menu_nib, resources_dir])
-  elif os.path.exists(resources_src):
-    LOGGER.info("Copying resources dir '%s'", resources_src)
-    commands.append(['cp', '-r', resources_src, dest_dir])
-
-  info_plist = os.path.join(src_base, 'Contents', 'Info.plist')
-  if os.path.exists(info_plist):
-    LOGGER.info("Copying special file '%s'", info_plist)
-    resources_dest = os.path.join(dest_dir, 'Resources')
-    commands.append(['mkdir', resources_dest])
-    commands.append(['cp', '-r', info_plist, resources_dest])
-
-  # Create symlinks in the Framework to make it look like
-  # https://developer.apple.com/library/mac/documentation/MacOSX/Conceptual/BPFrameworks/Concepts/FrameworkAnatomy.html
-  commands.append([
-      'ln', '-sf', 'Versions/Current/%s' % name, os.path.join(dest_base, name)
-  ])
-  commands.append([
-      'ln', '-sf', 'Versions/Current/Resources',
-      os.path.join(dest_base, 'Resources')
-  ])
-  commands.append(
-      ['ln', '-sf', version, os.path.join(dest_base, 'Versions/Current')])
-
-  return dest_binary
-
-
-def FixId(path, library_name):
-  id = '@executable_path/../Frameworks/%s' % library_name
-  args = [INSTALL_NAME_TOOL, '-id', id, path]
-  commands.append(args)
-
-
-def FixLibraryId(path):
-  library_name = os.path.basename(path)
-  FixId(path, library_name)
-
-
-def FixFrameworkId(path, id):
-  FixId(path, id)
-
-
-def FixInstallPath(library_path, library, new_path):
-  args = [INSTALL_NAME_TOOL, '-change', library_path, new_path, library]
-  commands.append(args)
-
-
-def FindSystemLibrary(library_name):
-  for path in ['/lib', '/usr/lib']:
-    full_path = os.path.join(path, library_name)
-    if os.path.exists(full_path):
-      return full_path
-  return None
-
-
-def FixLibraryInstallPath(library_path, library):
-  system_library = FindSystemLibrary(os.path.basename(library_path))
-  if system_library is None or re.match(r'^\s*/usr/local', library_path):
-    new_path = '@executable_path/../Frameworks/%s' % os.path.basename(library_path)
-    FixInstallPath(library_path, library, new_path)
-  else:
-    FixInstallPath(library_path, library, system_library)
-
-
-def FixFrameworkInstallPath(library_path, library):
-  parts = library_path.split(os.sep)
-  full_path = ""
-  for i, part in enumerate(parts):
-    if re.match(r'\w+\.framework', part):
-      full_path = os.path.join(*parts[i:])
-      break
-  if full_path:
-    new_path = '@executable_path/../Frameworks/%s' % full_path
-    FixInstallPath(library_path, library, new_path)
-
-
-def FindQtPlugin(name):
-  for path in QT_PLUGINS_SEARCH_PATH:
-    if os.path.exists(path):
-      if os.path.exists(os.path.join(path, name)):
-        return os.path.join(path, name)
-  raise CouldNotFindQtPluginError(name)
-
-
-def FindGstreamerPlugin(name):
-  for path in GSTREAMER_SEARCH_PATH:
-    if os.path.exists(path):
-      for dir, dirs, files in os.walk(path):
-        if name in files:
-          return os.path.join(dir, name)
-  raise CouldNotFindGstreamerPluginError(name)
-
-
-def FindGioModule(name):
-  for path in GIO_MODULES_SEARCH_PATH:
-    if os.path.exists(path):
-      for dir, dirs, files in os.walk(path):
-        if name in files:
-          return os.path.join(dir, name)
-  raise CouldNotFindGioModuleError(name)
-
-
-def main():
-  logging.basicConfig(filename='macdeploy.log', level=logging.DEBUG, format='%(asctime)s %(levelname)-8s %(message)s')
-
-  FixBinary(binary)
-  FixBinary(tagreader_binary)
-
-  # macdeployqt needs to handle strawberry-tagreader for Qt deployment, so we can't use FixPlugin() here.
-  #try:
-  #  FixPlugin('strawberry-tagreader', '.')
-  #except:
-  #  print('Failed to find blob: %s' % traceback.format_exc())
-
-  for plugin in GSTREAMER_PLUGINS:
-    FixPlugin(FindGstreamerPlugin(plugin), 'gstreamer')
-
-  FixPlugin(FindGstreamerPlugin('gst-plugin-scanner'), '.')
-  FixPlugin(FindGioModule('libgiognutls.so'), 'gio-modules')
-  #FixPlugin(FindGioModule('libgiognomeproxy.so'), 'gio-modules')
-
-  #for plugin in QT_PLUGINS:
-    #FixPlugin(FindQtPlugin(plugin), os.path.dirname(plugin))
-
-  if len(sys.argv) <= 2:
-    print('Would run %d commands:' % len(commands))
-    for command in commands:
-      print(' '.join(command))
-
-    #print('OK?')
-    #raw_input()
-
-  for command in commands:
-    p = subprocess.Popen(command)
-    os.waitpid(p.pid, 0)
-
-
-if __name__ == "__main__":
-  main()

dist/macos/macgstcopy.sh

@@ -0,0 +1,107 @@
+#!/bin/sh
+
+# Script to copy gstreamer plugins before macdeployqt is run.
+
+if [ "$1" = "" ]; then
+  echo "Usage: $0 <bundledir>"
+  exit 1
+fi
+bundledir=$1
+
+if [ "$GIO_EXTRA_MODULES" = "" ]; then
+  echo "Error: Set the GIO_EXTRA_MODULES environment variable to the path containing libgiognutls.so."
+  exit 1
+fi
+
+if [ "$GST_PLUGIN_SCANNER" = "" ]; then
+  echo "Error: Set the GST_PLUGIN_SCANNER environment variable to the gst-plugin-scanner."
+  exit 1
+fi
+
+if [ "$GST_PLUGIN_PATH" = "" ]; then
+  echo "Error: Set the GST_PLUGIN_PATH environment variable to the path containing gstreamer plugins."
+  exit 1
+fi
+
+mkdir -p "${bundledir}/Contents/PlugIns/gio-modules" || exit 1
+mkdir -p "${bundledir}/Contents/PlugIns/gstreamer" || exit 1
+
+if ! [ -f "${GIO_EXTRA_MODULES}/libgiognutls.so" ]; then
+  echo "Error: Missing ${GIO_EXTRA_MODULES}/libgiognutls.so."
+  exit 1
+fi
+cp -v -f "${GIO_EXTRA_MODULES}/libgiognutls.so" "${bundledir}/Contents/PlugIns/gio-modules/" || exit 1
+
+if ! [ -f "${GST_PLUGIN_SCANNER}" ]; then
+  echo "Error: Missing ${GST_PLUGIN_SCANNER}"
+  exit 1
+fi
+cp -v -f "${GST_PLUGIN_SCANNER}" "${bundledir}/Contents/PlugIns/" || exit 1
+
+gst_plugins="
+libgstapetag.dylib
+libgstapp.dylib
+libgstaudioconvert.dylib
+libgstaudiofx.dylib
+libgstaudiomixer.dylib
+libgstaudioparsers.dylib
+libgstaudiorate.dylib
+libgstaudioresample.dylib
+libgstaudiotestsrc.dylib
+libgstaudiovisualizers.dylib
+libgstauparse.dylib
+libgstautoconvert.dylib
+libgstautodetect.dylib
+libgstcoreelements.dylib
+libgstequalizer.dylib
+libgstgio.dylib
+libgsticydemux.dylib
+libgstid3demux.dylib
+libgstlevel.dylib
+libgstosxaudio.dylib
+libgstplayback.dylib
+libgstrawparse.dylib
+libgstreplaygain.dylib
+libgstsoup.dylib
+libgstspectrum.dylib
+libgsttypefindfunctions.dylib
+libgstvolume.dylib
+libgstxingmux.dylib
+libgsttcp.dylib
+libgstudp.dylib
+libgstpbtypes.dylib
+libgstrtp.dylib
+libgstrtsp.dylib
+libgstflac.dylib
+libgstwavparse.dylib
+libgstfaad.dylib
+libgstogg.dylib
+libgstopus.dylib
+libgstasf.dylib
+libgstspeex.dylib
+libgsttaglib.dylib
+libgstvorbis.dylib
+libgstisomp4.dylib
+libgstlibav.dylib
+libgstaiff.dylib
+libgstlame.dylib
+libgstopusparse.dylib
+libgstfaac.dylib
+libgstmusepack.dylib
+"
+
+gst_plugins=$(echo "$gst_plugins" | tr '\n' ' ' | sed -e 's/^ //g' | sed -e 's/  / /g')
+
+for gst_plugin in $gst_plugins
+do
+  if [ -f "${GST_PLUGIN_PATH}/${gst_plugin}" ]; then
+    cp -v -f "${GST_PLUGIN_PATH}/${gst_plugin}" "${bundledir}/Contents/PlugIns/gstreamer/" || exit 1
+  else
+    echo "Warning: Missing gstreamer plugin ${GST_PLUGIN_PATH}/${gst_plugin}"
+  fi
+done
+
+if [ -f "/usr/local/lib/libbrotlicommon.1.dylib" ]; then
+  mkdir -p ${bundledir}/Contents/Frameworks
+  cp -v -f "/usr/local/lib/libbrotlicommon.1.dylib" "${bundledir}/Contents/Frameworks/"
+fi

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

@@ -15,34 +15,36 @@
   ​<translation type="qt">strawberry</translation>
   <description>
     <p>
-      Strawberry is a music player and music collection organizer. It is a fork of Clementine released in 2018 aimed at music collectors, audio enthusiasts and audiophiles. The name is inspired by the band Strawbs. It's based on a heavily modified version of Clementine created in 2012-2013. It's written in C++ and Qt 5.
+      Strawberry is a music player and music collection organizer. It is aimed at music collectors and audiophiles. With Strawberry you can play and manage your digital music collection, or stream your favorite radios. It also has unofficial streaming support for Tidal and Qobuz. Strawberry is free software released under GPL. The source code is available on GitHub. It's written in C++ using the Qt toolkit and GStreamer. Strawberry is compatible with both Qt version 5 and 6.
     </p>
     <p>Features:</p>
     <ul>
       <li>Play and organize music</li>
       <li>Supports most popular audio formats and CD playback</li>
       <li>Native desktop notifications</li>
-      <li>Playlists in multiple formats</li>
+      <li>Playlist management and playlists in multiple formats</li>
+      <li>Smart and dynamic playlists</li>
       <li>Advanced audio output and device configuration for bit-perfect playback on Linux</li>
-      <li>Edit tags on music files</li>
-      <li>Fetch tags from MusicBrainz</li>
+      <li>Edit tags on audio files</li>
+      <li>Automatically retrieve tags from MusicBrainz</li>
       <li>Album cover art from Last.fm, Musicbrainz, Discogs, Musixmatch, Deezer, Tidal, Qobuz and Spotify</li>
       <li>Song lyrics from AudD, Genius, Musixmatch, ChartLyrics, lyrics.ovh and lololyrics.com</li>
       <li>Support for multiple backends</li>
       <li>Audio analyzer and equalizer</li>
-      <li>Transfer music to iPod, iPhone, MTP or mass-storage USB player</li>
+      <li>Transfer music to mass-storage USB players, MTP compatible devices and iPod Nano/Classic</li>
       <li>Scrobbler with support for Last.fm, Libre.fm and ListenBrainz</li>
-      <li>Streaming support for Subsonic</li>
+      <li>Streaming support for Subsonic-compatible servers</li>
+      <li>Unofficial streaming support for Tidal and Qobuz</li>
     </ul>
   </description>
   <screenshots>
     <screenshot type="default">
       <caption>Song playing showing context</caption>
-      <image width="1600" height="874">https://www.strawberrymusicplayer.org/pictures/appdata-screenshot-001.png</image>
+      <image width="1432" height="834">https://www.strawberrymusicplayer.org/pictures/appdata-screenshot-003.png</image>
     </screenshot>
     <screenshot>
       <caption>Collection overview</caption>
-      <image width="1600" height="874">https://www.strawberrymusicplayer.org/pictures/appdata-screenshot-002.png</image>
+      <image width="1432" height="834">https://www.strawberrymusicplayer.org/pictures/appdata-screenshot-004.png</image>
     </screenshot>
   </screenshots>
   <update_contact>eclipseo@fedoraproject.org</update_contact>

dist/unix/strawberry.1

@@ -5,7 +5,7 @@ Strawberry \- music player and music collection organizer
 .B strawberry
 [\fI\,options\/\fR] [\fI\,URL(s)\/\fR]
 .SH DESCRIPTION
-Strawberry is a music player especially aimed at audiophiles.
+Strawberry is a music player aimed at music collectors and audiophiles.
 .TP
 Features:
 .br
@@ -17,13 +17,15 @@ Features:
 .br
 - Native desktop notifications
 .br
+- Playlist management
+.br
 - Playlists in multiple formats
 .br
 - Advanced output and device options with support for bit perfect playback on Linux
 .br
-- Edit tags on music files
+- Edit tags on audio files
 .br
-- Fetch tags from MusicBrainz
+- Automatically retrieve tags from MusicBrainz
 .br
 - Album cover art from Last.fm, Musicbrainz, Discogs, Musixmatch, Deezer, Tidal, Qobuz and Spotify
 .br
@@ -33,11 +35,15 @@ Features:
 .br
 - Audio analyzer
 .br
-- Equalizer
+- Audio Equalizer
 .br
-- Transfer music to iPod, iPhone, MTP or mass-storage USB player
+- Transfer music to mass-storage USB players, MTP compatible devices and iPod Nano/Classic
 .br
-- Streaming from Subsonic
+- Scrobbler with support for Last.fm, Libre.fm and ListenBrainz
+.br
+- Streaming support for Subsonic-compatible servers
+.br
+- Unofficial streaming support for Tidal and Qobuz
 .TP
  It is a fork of Clementine. The name is inspired by the band Strawbs.
 .SH OPTIONS

dist/unix/strawberry.spec.in

@@ -49,28 +49,31 @@ BuildRequires:  pkgconfig(sqlite3) >= 3.9
 BuildRequires:  pkgconfig(taglib)
 %endif
 BuildRequires:  pkgconfig(fftw3)
-%if "@QT_MAJOR_VERSION@" == "5" && ( 0%{?fedora} || 0%{?rhel_version} || 0%{?centos} )
-BuildRequires:  pkgconfig(Qt@QT_MAJOR_VERSION@Core)
-BuildRequires:  pkgconfig(Qt@QT_MAJOR_VERSION@Gui)
-BuildRequires:  pkgconfig(Qt@QT_MAJOR_VERSION@Widgets)
-BuildRequires:  pkgconfig(Qt@QT_MAJOR_VERSION@Concurrent)
-BuildRequires:  pkgconfig(Qt@QT_MAJOR_VERSION@Network)
-BuildRequires:  pkgconfig(Qt@QT_MAJOR_VERSION@Sql)
-BuildRequires:  pkgconfig(Qt@QT_MAJOR_VERSION@X11Extras)
-BuildRequires:  pkgconfig(Qt@QT_MAJOR_VERSION@DBus)
-BuildRequires:  pkgconfig(Qt@QT_MAJOR_VERSION@Test)
+%if "@QT_VERSION_MAJOR@" == "5" && ( 0%{?fedora} || 0%{?rhel_version} || 0%{?centos} )
+BuildRequires:  pkgconfig(Qt@QT_VERSION_MAJOR@Core)
+BuildRequires:  pkgconfig(Qt@QT_VERSION_MAJOR@Gui)
+BuildRequires:  pkgconfig(Qt@QT_VERSION_MAJOR@Widgets)
+BuildRequires:  pkgconfig(Qt@QT_VERSION_MAJOR@Concurrent)
+BuildRequires:  pkgconfig(Qt@QT_VERSION_MAJOR@Network)
+BuildRequires:  pkgconfig(Qt@QT_VERSION_MAJOR@Sql)
+BuildRequires:  pkgconfig(Qt@QT_VERSION_MAJOR@DBus)
+BuildRequires:  pkgconfig(Qt@QT_VERSION_MAJOR@Test)
+BuildRequires:  pkgconfig(Qt@QT_VERSION_MAJOR@X11Extras)
 %else
-BuildRequires:  cmake(Qt@QT_MAJOR_VERSION@Core)
-BuildRequires:  cmake(Qt@QT_MAJOR_VERSION@Gui)
-BuildRequires:  cmake(Qt@QT_MAJOR_VERSION@Widgets)
-BuildRequires:  cmake(Qt@QT_MAJOR_VERSION@Concurrent)
-BuildRequires:  cmake(Qt@QT_MAJOR_VERSION@Network)
-BuildRequires:  cmake(Qt@QT_MAJOR_VERSION@Sql)
-BuildRequires:  cmake(Qt@QT_MAJOR_VERSION@DBus)
-BuildRequires:  cmake(Qt@QT_MAJOR_VERSION@Test)
+BuildRequires:  cmake(Qt@QT_VERSION_MAJOR@Core)
+BuildRequires:  cmake(Qt@QT_VERSION_MAJOR@Gui)
+BuildRequires:  cmake(Qt@QT_VERSION_MAJOR@Widgets)
+BuildRequires:  cmake(Qt@QT_VERSION_MAJOR@Concurrent)
+BuildRequires:  cmake(Qt@QT_VERSION_MAJOR@Network)
+BuildRequires:  cmake(Qt@QT_VERSION_MAJOR@Sql)
+BuildRequires:  cmake(Qt@QT_VERSION_MAJOR@DBus)
+BuildRequires:  cmake(Qt@QT_VERSION_MAJOR@Test)
+%if "@QT_VERSION_MAJOR@" == "5"
+BuildRequires:  cmake(Qt@QT_VERSION_MAJOR@X11Extras)
+%endif
 %endif
 %if 0%{?suse_version} || 0%{?fedora_version} || 0%{?mageia}
-BuildRequires:  cmake(Qt@QT_MAJOR_VERSION@LinguistTools)
+BuildRequires:  cmake(Qt@QT_VERSION_MAJOR@LinguistTools)
 %endif
 BuildRequires:  pkgconfig(gstreamer-1.0)
 BuildRequires:  pkgconfig(gstreamer-app-1.0)
@@ -89,10 +92,11 @@ BuildRequires:  pkgconfig(libvlc)
 %endif
 
 %if 0%{?suse_version}
-  %if "@QT_MAJOR_VERSION@" == "6"
+  %if "@QT_VERSION_MAJOR@" == "6"
 Requires:  qt6-sql-sqlite
+Requires:  qt6-network-tls
   %endif
-  %if "@QT_MAJOR_VERSION@" == "5"
+  %if "@QT_VERSION_MAJOR@" == "5"
 Requires:  libQt5Sql5-sqlite
   %endif
 %endif
@@ -107,18 +111,20 @@ Features:
     MPC, TrueAudio, AIFF, MP4, MP3, ASF and Monkey's Audio.
   - Audio CD playback
   - Native desktop notifications
+  - Playlist management
   - Playlists in multiple formats
   - Advanced audio output and device configuration for bit-perfect playback on Linux
-  - Edit tags on music files
-  - Fetch tags from MusicBrainz
+  - Edit tags on audio files
+  - Automatically retrieve tags from MusicBrainz
   - Album cover art from Last.fm, Musicbrainz, Discogs, Musixmatch, Deezer, Tidal, Qobuz and Spotify
   - Song lyrics from AudD, Genius, Musixmatch, ChartLyrics, lyrics.ovh and lololyrics.com
   - Support for multiple backends
   - Audio analyzer
   - Audio equalizer
-  - Transfer music to iPod, MTP or mass-storage USB player
   - Scrobbler with support for Last.fm, Libre.fm and ListenBrainz
-  - Streaming support for Subsonic
+  - 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}
 %debug_package
@@ -131,7 +137,7 @@ Features:
 %if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos}
   export CXXFLAGS="-fPIC $RPM_OPT_FLAGS"
 %endif
-%{cmake} -DCMAKE_BUILD_TYPE:STRING=Release -DQT_MAJOR_VERSION=@QT_MAJOR_VERSION@
+%{cmake} -DCMAKE_BUILD_TYPE:STRING=Release -DQT_VERSION_MAJOR=@QT_VERSION_MAJOR@
 %if 0%{?centos} || (0%{?mageia} && 0%{?mageia} <= 7)
   %make_build
 %else

dist/windows/strawberry.nsi.in

@@ -66,9 +66,10 @@
 !define CAPABILITIES_HIDE_ICONS "Command to hide icons"
 !define CAPABILITIES_SHOW_ICONS "Command to show icons"
 
+Unicode True
+
 SetCompressor /SOLID lzma
 
-!addplugindir nsisplugins
 !include "MUI2.nsh"
 !include "FileAssociation.nsh"
 !include "Capabilities.nsh"
@@ -79,14 +80,21 @@ SetCompressor /SOLID lzma
 
 !define MUI_COMPONENTSPAGE_SMALLDESC
 
+ReserveFile "${NSISDIR}/Plugins/x86-unicode/LockedList.dll"
+ReserveFile "${NSISDIR}/Plugins/LockedList64.dll"
+!define LockedListPATH	$InstallDir
+
 ; Installer pages
 !insertmacro MUI_PAGE_WELCOME
+!insertmacro MUI_PAGE_LICENSE COPYING
+Page Custom LockedListPageShow
 !insertmacro MUI_PAGE_DIRECTORY
 !insertmacro MUI_PAGE_INSTFILES
 !insertmacro MUI_PAGE_FINISH
 
 ; Uninstaller pages
 !insertmacro MUI_UNPAGE_CONFIRM
+UninstPage custom un.LockedListPageShow
 !insertmacro MUI_UNPAGE_INSTFILES
 !insertmacro MUI_UNPAGE_FINISH
 
@@ -133,7 +141,16 @@ InstallDirRegKey ${PRODUCT_UNINST_ROOT_KEY} ${PRODUCT_UNINST_KEY} "UninstallStri
 ShowInstDetails show
 ShowUnInstDetails show
 RequestExecutionLevel admin
-;RequestExecutionLevel user
+
+Function LockedListPageShow
+  LockedList::AddModule /NOUNLOAD \strawberry.exe
+  LockedList::Dialog /heading "Checking for running programs:" /noprograms "No programs need to close." /searching "Searching for running programs..."
+FunctionEnd
+
+Function un.LockedListPageShow
+  LockedList::AddModule /NOUNLOAD \strawberry.exe
+  LockedList::Dialog /heading "Checking for running programs:" /noprograms "No programs need to close." /searching "Searching for running programs..."
+FunctionEnd
 
 ; Check for previous installation, and call the uninstaller if any
 Function CheckPreviousInstall
@@ -169,30 +186,28 @@ SectionEnd
 Section "Strawberry" Strawberry
   SetOutPath "$INSTDIR"
 
-  nsExec::Exec '"$INSTDIR\killproc.exe" strawberry.exe'
-
   File "strawberry.exe"
   File "strawberry-tagreader.exe"
   File "strawberry.ico"
   File "sqlite3.exe"
   File "gst-launch-1.0.exe"
+  File "gst-discoverer-1.0.exe"
 
 !ifdef arch_x86
   File "libgcc_s_sjlj-1.dll"
-  File "libcrypto-1_1.dll"
-  File "libssl-1_1.dll"
+  File "libcrypto-3.dll"
+  File "libssl-3.dll"
 !endif
 
 !ifdef arch_x64
   File "libgcc_s_seh-1.dll"
-  File "libcrypto-1_1-x64.dll"
-  File "libssl-1_1-x64.dll"
+  File "libcrypto-3-x64.dll"
+  File "libssl-3-x64.dll"
 !endif
 
   File "avcodec-58.dll"
   File "avfilter-7.dll"
   File "avformat-58.dll"
-  File "avresample-4.dll"
   File "avutil-56.dll"
   File "libbrotlicommon.dll"
   File "libbrotlidec.dll"
@@ -214,6 +229,7 @@ Section "Strawberry" Strawberry
   File "libgobject-2.0-0.dll"
   File "libgstapp-1.0-0.dll"
   File "libgstaudio-1.0-0.dll"
+  File "libgstbadaudio-1.0-0.dll"
   File "libgstbase-1.0-0.dll"
   File "libgstfft-1.0-0.dll"
   File "libgstnet-1.0-0.dll"
@@ -235,12 +251,13 @@ Section "Strawberry" Strawberry
   File "libmp3lame-0.dll"
   File "libnettle-8.dll"
   File "libogg-0.dll"
+  File "libopenmpt-0.dll"
   File "libopus-0.dll"
   File "liborc-0.4-0.dll"
   File "libpcre-1.dll"
   File "libpcre2-16-0.dll"
   File "libpng16-16.dll"
-  File "libprotobuf-26.dll"
+  File "libprotobuf-29.dll"
   File "libpsl-5.dll"
   File "libsoup-2.4-1.dll"
   File "libspeex-1.dll"
@@ -252,6 +269,7 @@ Section "Strawberry" Strawberry
   File "libunistring-2.dll"
   File "libvorbis-0.dll"
   File "libvorbisenc-2.dll"
+  File "libvorbisfile-3.dll"
   File "libwavpack-1.dll"
   File "libwinpthread-1.dll"
   File "libxml2-2.dll"
@@ -268,7 +286,6 @@ Section "Strawberry" Strawberry
   File "Qt6Network.dll"
   File "Qt6Sql.dll"
   File "Qt6Widgets.dll"
-  ;File "Qt6WinExtras.dll"
   File "libqtsparkle-qt6.dll"
 !else
   File "Qt5Concurrent.dll"
@@ -277,7 +294,6 @@ Section "Strawberry" Strawberry
   File "Qt5Network.dll"
   File "Qt5Sql.dll"
   File "Qt5Widgets.dll"
-  File "Qt5WinExtras.dll"
   File "libqtsparkle-qt5.dll"
 !endif
 
@@ -290,8 +306,6 @@ Section "Strawberry" Strawberry
   File "libtermcap.dll"
 !endif
 
-  File "killproc.exe"
-
   ; Register Strawberry with Default Programs
   Var /GLOBAL AppIcon
   Var /GLOBAL AppExe
@@ -329,26 +343,33 @@ Section "GIO modules" gio-modules
   File "/oname=libgiognutls.dll" "gio-modules\libgiognutls.dll"
 SectionEnd
 
-Section "Qt Platforms" platforms
+Section "Qt Platform plugins" platforms
   SetOutPath "$INSTDIR\platforms"
   File "/oname=qwindows.dll" "platforms\qwindows.dll"
 SectionEnd
 
-Section "Qt SQL Drivers" sqldrivers
-  SetOutPath "$INSTDIR\sqldrivers"
-  File "/oname=qsqlite.dll" "sqldrivers\qsqlite.dll"
+Section "Qt styles" styles
+  SetOutPath "$INSTDIR\styles"
+  File "/oname=qwindowsvistastyle.dll" "styles\qwindowsvistastyle.dll"
 SectionEnd
 
-Section "Qt image format plugins" imageformats
+Section "Qt imageformats" imageformats
   SetOutPath "$INSTDIR\imageformats"
   File "/oname=qgif.dll" "imageformats\qgif.dll"
   File "/oname=qico.dll" "imageformats\qico.dll"
   File "/oname=qjpeg.dll" "imageformats\qjpeg.dll"
 SectionEnd
 
-Section "Qt style plugins" styles
-  SetOutPath "$INSTDIR\styles"
-  File "/oname=qwindowsvistastyle.dll" "styles\qwindowsvistastyle.dll"
+!ifdef with_qt6
+Section "Qt TLS plugins" tls
+  SetOutPath "$INSTDIR\tls"
+  File "/oname=qopensslbackend.dll" "tls\qopensslbackend.dll"
+SectionEnd
+!endif
+
+Section "Qt SQL Drivers" sqldrivers
+  SetOutPath "$INSTDIR\sqldrivers"
+  File "/oname=qsqlite.dll" "sqldrivers\qsqlite.dll"
 SectionEnd
 
 Section "Gstreamer plugins" gstreamer-plugins
@@ -400,6 +421,7 @@ Section "Gstreamer plugins" gstreamer-plugins
   File "/oname=libgstpbtypes.dll" "gstreamer-plugins\libgstpbtypes.dll"
   File "/oname=libgstrtp.dll" "gstreamer-plugins\libgstrtp.dll"
   File "/oname=libgstrtsp.dll" "gstreamer-plugins\libgstrtsp.dll"
+  File "/oname=libgstopenmpt.dll" "gstreamer-plugins\libgstopenmpt.dll"
 
 SectionEnd
 
@@ -436,8 +458,6 @@ SectionEnd
 
 Section "Uninstall"
 
-  nsExec::Exec '"$INSTDIR\killproc.exe" strawberry.exe'
-
   ; Delete all the files
 
   Delete "$INSTDIR\strawberry.ico"
@@ -445,23 +465,23 @@ Section "Uninstall"
   Delete "$INSTDIR\strawberry-tagreader.exe"
   Delete "$INSTDIR\sqlite3.exe"
   Delete "$INSTDIR\gst-launch-1.0.exe"
+  Delete "$INSTDIR\gst-discoverer-1.0.exe"
 
 !ifdef arch_x86
   Delete "$INSTDIR\libgcc_s_sjlj-1.dll"
-  Delete "$INSTDIR\libcrypto-1_1.dll"
-  Delete "$INSTDIR\libssl-1_1.dll"
+  Delete "$INSTDIR\libcrypto-3.dll"
+  Delete "$INSTDIR\libssl-3.dll"
 !endif
 
 !ifdef arch_x64
   Delete "$INSTDIR\libgcc_s_seh-1.dll"
-  Delete "$INSTDIR\libcrypto-1_1-x64.dll"
-  Delete "$INSTDIR\libssl-1_1-x64.dll"
+  Delete "$INSTDIR\libcrypto-3-x64.dll"
+  Delete "$INSTDIR\libssl-3-x64.dll"
 !endif
 
   Delete "$INSTDIR\avcodec-58.dll"
   Delete "$INSTDIR\avfilter-7.dll"
   Delete "$INSTDIR\avformat-58.dll"
-  Delete "$INSTDIR\avresample-4.dll"
   Delete "$INSTDIR\avutil-56.dll"
   Delete "$INSTDIR\libbrotlicommon.dll"
   Delete "$INSTDIR\libbrotlidec.dll"
@@ -483,6 +503,7 @@ Section "Uninstall"
   Delete "$INSTDIR\libgobject-2.0-0.dll"
   Delete "$INSTDIR\libgstapp-1.0-0.dll"
   Delete "$INSTDIR\libgstaudio-1.0-0.dll"
+  Delete "$INSTDIR\libgstbadaudio-1.0-0.dll"
   Delete "$INSTDIR\libgstbase-1.0-0.dll"
   Delete "$INSTDIR\libgstfft-1.0-0.dll"
   Delete "$INSTDIR\libgstnet-1.0-0.dll"
@@ -504,12 +525,13 @@ Section "Uninstall"
   Delete "$INSTDIR\libmp3lame-0.dll"
   Delete "$INSTDIR\libnettle-8.dll"
   Delete "$INSTDIR\libogg-0.dll"
+  Delete "$INSTDIR\libopenmpt-0.dll"
   Delete "$INSTDIR\libopus-0.dll"
   Delete "$INSTDIR\liborc-0.4-0.dll"
   Delete "$INSTDIR\libpcre-1.dll"
   Delete "$INSTDIR\libpcre2-16-0.dll"
   Delete "$INSTDIR\libpng16-16.dll"
-  Delete "$INSTDIR\libprotobuf-26.dll"
+  Delete "$INSTDIR\libprotobuf-29.dll"
   Delete "$INSTDIR\libpsl-5.dll"
   Delete "$INSTDIR\libqtsparkle-qt5.dll"
   Delete "$INSTDIR\libqtsparkle-qt6.dll"
@@ -523,6 +545,7 @@ Section "Uninstall"
   Delete "$INSTDIR\libunistring-2.dll"
   Delete "$INSTDIR\libvorbis-0.dll"
   Delete "$INSTDIR\libvorbisenc-2.dll"
+  Delete "$INSTDIR\libvorbisfile-3.dll"
   Delete "$INSTDIR\libwavpack-1.dll"
   Delete "$INSTDIR\libwinpthread-1.dll"
   Delete "$INSTDIR\libxml2-2.dll"
@@ -534,14 +557,12 @@ Section "Uninstall"
   Delete "$INSTDIR\Qt5Network.dll"
   Delete "$INSTDIR\Qt5Sql.dll"
   Delete "$INSTDIR\Qt5Widgets.dll"
-  Delete "$INSTDIR\Qt5WinExtras.dll"
   Delete "$INSTDIR\Qt6Concurrent.dll"
   Delete "$INSTDIR\Qt6Core.dll"
   Delete "$INSTDIR\Qt6Gui.dll"
   Delete "$INSTDIR\Qt6Network.dll"
   Delete "$INSTDIR\Qt6Sql.dll"
   Delete "$INSTDIR\Qt6Widgets.dll"
-  Delete "$INSTDIR\Qt6WinExtras.dll"
   Delete "$INSTDIR\swresample-3.dll"
   Delete "$INSTDIR\swscale-5.dll"
   Delete "$INSTDIR\zlib1.dll"
@@ -557,8 +578,11 @@ Section "Uninstall"
 
   Delete "$INSTDIR\gio-modules\libgiognutls.dll"
   Delete "$INSTDIR\platforms\qwindows.dll"
-  Delete "$INSTDIR\sqldrivers\qsqlite.dll"
   Delete "$INSTDIR\styles\qwindowsvistastyle.dll"
+!ifdef with_qt6
+  Delete "$INSTDIR\tls\qopensslbackend.dll"
+!endif
+  Delete "$INSTDIR\sqldrivers\qsqlite.dll"
 
   Delete "$INSTDIR\imageformats\qgif.dll"
   Delete "$INSTDIR\imageformats\qico.dll"
@@ -610,13 +634,14 @@ Section "Uninstall"
   Delete "$INSTDIR\gstreamer-plugins\libgstpbtypes.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstrtp.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstrtsp.dll"
+  Delete "$INSTDIR\gstreamer-plugins\libgstopenmpt.dll"
 
-  Delete "$INSTDIR\killproc.exe"
   Delete "$INSTDIR\Uninstall.exe"
 
   ; Remove the installation folders.
   RMDir "$INSTDIR\platforms"
   RMDir "$INSTDIR\styles"
+  RMDir "$INSTDIR\tls"
   RMDir "$INSTDIR\sqldrivers"
   RMDir "$INSTDIR\imageformats"
   RMDir "$INSTDIR\gio-modules"

ext/gstmoodbar/gstfastspectrum.cpp

@@ -22,6 +22,7 @@
 #include <QtGlobal>
 
 #include <cstring>
+#include <cmath>
 
 #include <glib.h>
 
@@ -74,7 +75,7 @@ static void gst_fastspectrum_class_init (GstFastSpectrumClass * klass) {
   GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
   GstBaseTransformClass *trans_class = GST_BASE_TRANSFORM_CLASS (klass);
   GstAudioFilterClass *filter_class = GST_AUDIO_FILTER_CLASS (klass);
-  GstCaps *caps;
+  GstCaps *caps = nullptr;
 
   gobject_class->set_property = gst_fastspectrum_set_property;
   gobject_class->get_property = gst_fastspectrum_get_property;
@@ -264,7 +265,7 @@ static void input_data_mixed_float(const guint8* _in, double* out, guint len, do
 
   Q_UNUSED(max_value);
 
-  guint j, ip = 0;
+  guint j = 0, ip = 0;
   const gfloat *in = reinterpret_cast<const gfloat*>(_in);
 
   for (j = 0; j < len; j++) {
@@ -278,7 +279,7 @@ static void input_data_mixed_double (const guint8 * _in, double* out, guint len,
 
   Q_UNUSED(max_value);
 
-  guint j, ip = 0;
+  guint j = 0, ip = 0;
   const gdouble *in = reinterpret_cast<const gdouble*>(_in);
 
   for (j = 0; j < len; j++) {
@@ -290,7 +291,7 @@ static void input_data_mixed_double (const guint8 * _in, double* out, guint len,
 
 static void input_data_mixed_int32_max (const guint8 * _in, double* out, guint len, double max_value, guint op, guint nfft) {
 
-  guint j, ip = 0;
+  guint j = 0, ip = 0;
   const gint32 *in = reinterpret_cast<const gint32*>(_in);
 
   for (j = 0; j < len; j++) {
@@ -302,7 +303,7 @@ static void input_data_mixed_int32_max (const guint8 * _in, double* out, guint l
 
 static void input_data_mixed_int24_max (const guint8 * _in, double* out, guint len, double max_value, guint op, guint nfft) {
 
-  guint j;
+  guint j = 0;
 
   for (j = 0; j < len; j++) {
 #if G_BYTE_ORDER == G_BIG_ENDIAN
@@ -310,8 +311,9 @@ static void input_data_mixed_int24_max (const guint8 * _in, double* out, guint l
 #else
     gint32 value = GST_READ_UINT24_LE (_in);
 #endif
-    if (value & 0x00800000)
+    if (value & 0x00800000) {
       value |= 0xff000000;
+    }
 
     out[op] = value / max_value;
     op = (op + 1) % nfft;
@@ -322,7 +324,7 @@ static void input_data_mixed_int24_max (const guint8 * _in, double* out, guint l
 
 static void input_data_mixed_int16_max (const guint8 * _in, double * out, guint len, double max_value, guint op, guint nfft) {
 
-  guint j, ip = 0;
+  guint j = 0, ip = 0;
   const gint16 *in = reinterpret_cast<const gint16*>(_in);
 
   for (j = 0; j < len; j++) {
@@ -369,17 +371,18 @@ static gboolean gst_fastspectrum_setup (GstAudioFilter * base, const GstAudioInf
 
 static void gst_fastspectrum_run_fft (GstFastSpectrum * spectrum, guint input_pos) {
 
-  guint i;
+  guint i = 0;
   guint bands = spectrum->bands;
   guint nfft = 2 * bands - 2;
 
-  for (i = 0; i < nfft; i++)
+  for (i = 0; i < nfft; i++) {
     spectrum->fft_input[i] = spectrum->input_ring_buffer[(input_pos + i) % nfft];
+  }
 
   // Should be safe to execute the same plan multiple times in parallel.
   fftw_execute(spectrum->plan);
 
-  gdouble val;
+  gdouble val = 0.0;
   /* Calculate magnitude in db */
   for (i = 0; i < bands; i++) {
     val = spectrum->fft_output[i][0] * spectrum->fft_output[i][0];
@@ -399,13 +402,13 @@ static GstFlowReturn gst_fastspectrum_transform_ip (GstBaseTransform *trans, Gst
   double max_value = (1UL << ((bps << 3) - 1)) - 1;
   guint bands = spectrum->bands;
   guint nfft = 2 * bands - 2;
-  guint input_pos;
+  guint input_pos = 0;
   GstMapInfo map;
-  const guint8 *data;
-  gsize size;
-  guint fft_todo, msg_todo, block_size;
-  gboolean have_full_interval;
-  GstFastSpectrumInputData input_data;
+  const guint8 *data = nullptr;
+  gsize size = 0;
+  guint fft_todo = 0, msg_todo = 0, block_size = 0;
+  gboolean have_full_interval = false;
+  GstFastSpectrumInputData input_data = nullptr;
 
   g_mutex_lock (&spectrum->lock);
   gst_buffer_map (buffer, &map, GST_MAP_READ);
@@ -434,8 +437,9 @@ static GstFlowReturn gst_fastspectrum_transform_ip (GstBaseTransform *trans, Gst
     /* rounding error for frames_per_interval in ns,
      * aggregated it in accumulated_error */
     spectrum->error_per_interval = (spectrum->interval * rate) % GST_SECOND;
-    if (spectrum->frames_per_interval == 0)
+    if (spectrum->frames_per_interval == 0) {
       spectrum->frames_per_interval = 1;
+    }
 
     GST_INFO_OBJECT (spectrum, "interval %" GST_TIME_FORMAT ", fpi %"
         G_GUINT64_FORMAT ", error %" GST_TIME_FORMAT,
@@ -447,8 +451,9 @@ static GstFlowReturn gst_fastspectrum_transform_ip (GstBaseTransform *trans, Gst
     gst_fastspectrum_flush (spectrum);
   }
 
-  if (spectrum->num_frames == 0)
+  if (spectrum->num_frames == 0) {
     spectrum->message_ts = GST_BUFFER_TIMESTAMP (buffer);
+  }
 
   input_pos = spectrum->input_pos;
   input_data = spectrum->input_data;
@@ -461,10 +466,12 @@ static GstFlowReturn gst_fastspectrum_transform_ip (GstBaseTransform *trans, Gst
         "message frames todo: %u, fft frames todo: %u, input frames %"
         G_GSIZE_FORMAT, msg_todo, fft_todo, (size / bpf));
     block_size = msg_todo;
-    if (block_size > (size / bpf))
+    if (block_size > (size / bpf)) {
       block_size = (size / bpf);
-    if (block_size > fft_todo)
+    }
+    if (block_size > fft_todo) {
       block_size = fft_todo;
+    }
 
     /* Move the current frames into our ringbuffers */
     input_data(data, spectrum->input_ring_buffer, block_size, max_value, input_pos, nfft);
@@ -513,8 +520,9 @@ static GstFlowReturn gst_fastspectrum_transform_ip (GstBaseTransform *trans, Gst
         memset(spectrum->spect_magnitude, 0, spectrum->bands * sizeof(double));
       }
 
-      if (GST_CLOCK_TIME_IS_VALID (spectrum->message_ts))
+      if (GST_CLOCK_TIME_IS_VALID (spectrum->message_ts)) {
         spectrum->message_ts += gst_util_uint64_scale (spectrum->num_frames, GST_SECOND, rate);
+      }
 
       spectrum->num_frames = 0;
       spectrum->num_fft = 0;

ext/gstmoodbar/gstmoodbarplugin.cpp

@@ -23,7 +23,7 @@
 
 namespace {
 
-static gboolean gst_moodbar_plugin_init(GstPlugin* plugin) {
+static gboolean gst_moodbar_plugin_init(GstPlugin *plugin) {
 
   if (!gst_element_register(plugin, "fastspectrum", GST_RANK_NONE, GST_TYPE_FASTSPECTRUM)) {
     return FALSE;

ext/libstrawberry-common/CMakeLists.txt

@@ -8,38 +8,29 @@ set(SOURCES
 )
 
 set(HEADERS
+  core/logging.h
   core/messagehandler.h
   core/messagereply.h
   core/workerpool.h
 )
 
-if(APPLE)
-  list(APPEND SOURCES core/scoped_nsautorelease_pool.mm)
-endif(APPLE)
+qt_wrap_cpp(MOC ${HEADERS})
 
-if(BUILD_WITH_QT6)
-  qt6_wrap_cpp(MOC ${HEADERS})
-else()
-  qt5_wrap_cpp(MOC ${HEADERS})
-endif()
-
-link_directories(
-  ${GLIB_LIBRARY_DIRS}
-)
+link_directories(${GLIB_LIBRARY_DIRS})
 
 add_library(libstrawberry-common STATIC ${SOURCES} ${MOC})
 
-target_include_directories(libstrawberry-common SYSTEM PRIVATE
-  ${GLIB_INCLUDE_DIRS}
-)
-
+target_include_directories(libstrawberry-common SYSTEM PRIVATE ${GLIB_INCLUDE_DIRS})
 target_include_directories(libstrawberry-common PRIVATE
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/src
   ${CMAKE_BINARY_DIR}/src
 )
 
+if(Backtrace_FOUND)
+  target_include_directories(libstrawberry-common SYSTEM PRIVATE ${Backtrace_INCLUDE_DIRS})
+endif()
+
 target_link_libraries(libstrawberry-common PRIVATE
   ${CMAKE_THREAD_LIBS_INIT}
   ${GLIB_LIBRARIES}
@@ -48,6 +39,5 @@ target_link_libraries(libstrawberry-common PRIVATE
 )
 
 if(Backtrace_FOUND)
-  target_include_directories(libstrawberry-common PRIVATE ${Backtrace_INCLUDE_DIRS})
   target_link_libraries(libstrawberry-common PRIVATE ${Backtrace_LIBRARIES})
-endif(Backtrace_FOUND)
+endif()

ext/libstrawberry-common/core/logging.cpp

@@ -1,5 +1,6 @@
 /* This file is part of Strawberry.
    Copyright 2011, David Sansome <me@davidsansome.com>
+   Copyright 2018-2021, Jonas Kvinge <jonas@jkvinge.net>
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -23,7 +24,9 @@
 #include <cstring>
 #include <iostream>
 #include <memory>
-#include <cxxabi.h>
+#ifndef _MSC_VER
+#  include <cxxabi.h>
+#endif
 #include <glib.h>
 
 #ifdef HAVE_BACKTRACE
@@ -53,10 +56,10 @@ static QMap<QString, Level>* sClassLevels = nullptr;
 static QIODevice *sNullDevice = nullptr;
 
 //const char* kDefaultLogLevels = "*:3";
-const char* kDefaultLogLevels = "GstEnginePipeline:2,*:3";
+const char *kDefaultLogLevels = "GstEnginePipeline:2,*:3";
 
 static const char *kMessageHandlerMagic = "__logging_message__";
-static const int kMessageHandlerMagicLength = strlen(kMessageHandlerMagic);
+static const size_t kMessageHandlerMagicLength = strlen(kMessageHandlerMagic);
 static QtMessageHandler sOriginalMessageHandler = nullptr;
 
 template <class T>
@@ -98,7 +101,7 @@ class DebugBase : public QDebug {
 // Debug message will be stored in a buffer.
 class BufferedDebug : public DebugBase<BufferedDebug> {
  public:
-  BufferedDebug() {}
+  BufferedDebug() = default;
   explicit BufferedDebug(QtMsgType) : buf_(new QBuffer, later_deleter) {
     buf_->open(QIODevice::WriteOnly);
 
@@ -117,7 +120,7 @@ class BufferedDebug : public DebugBase<BufferedDebug> {
 // Debug message will be logged immediately.
 class LoggedDebug : public DebugBase<LoggedDebug> {
  public:
-  LoggedDebug() {}
+  LoggedDebug() = default;
   explicit LoggedDebug(QtMsgType t) : DebugBase(t) { nospace() << kMessageHandlerMagic; }
 };
 
@@ -177,7 +180,7 @@ void SetLevels(const QString &levels) {
 
   if (!sClassLevels) return;
 
-  for (const QString& item : levels.split(',')) {
+  for (const QString &item : levels.split(',')) {
     const QStringList class_level = item.split(':');
 
     QString class_name;
@@ -223,7 +226,7 @@ static QString ParsePrettyFunction(const char *pretty_function) {
 
   const int space = class_name.lastIndexOf(' ');
   if (space != -1) {
-    class_name = class_name.mid(space+1);
+    class_name = class_name.mid(space + 1);
   }
 
   return class_name;
@@ -274,12 +277,12 @@ static T CreateLogger(Level level, const QString &class_name, int line, const ch
   return ret.space();
 }
 
+#ifdef Q_OS_UNIX
 QString CXXDemangle(const QString &mangled_function);
-
 QString CXXDemangle(const QString &mangled_function) {
 
-  int status;
-  char* demangled_function = abi::__cxa_demangle(mangled_function.toLatin1().constData(), nullptr, nullptr, &status);
+  int status = 0;
+  char *demangled_function = abi::__cxa_demangle(mangled_function.toLatin1().constData(), nullptr, nullptr, &status);
   if (status == 0) {
     QString ret = QString::fromLatin1(demangled_function);
     free(demangled_function);
@@ -288,9 +291,24 @@ QString CXXDemangle(const QString &mangled_function) {
   return mangled_function;  // Probably not a C++ function.
 
 }
+#endif  // Q_OS_UNIX
 
+#ifdef Q_OS_LINUX
+QString LinuxDemangle(const QString &symbol);
+QString LinuxDemangle(const QString &symbol) {
+
+  QRegularExpression regex("\\(([^+]+)");
+  QRegularExpressionMatch match = regex.match(symbol);
+  if (!match.hasMatch()) {
+    return symbol;
+  }
+  QString mangled_function = match.captured(1);
+  return CXXDemangle(mangled_function);
+}
+#endif  // Q_OS_LINUX
+
+#ifdef Q_OS_MACOS
 QString DarwinDemangle(const QString &symbol);
-
 QString DarwinDemangle(const QString &symbol) {
 
 #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
@@ -302,23 +320,9 @@ QString DarwinDemangle(const QString &symbol) {
   return CXXDemangle(mangled_function);
 
 }
-
-QString LinuxDemangle(const QString &symbol);
-
-QString LinuxDemangle(const QString &symbol) {
-
-  QRegularExpression regex("\\(([^+]+)");
-  QRegularExpressionMatch match = regex.match(symbol);
-  if (!match.hasMatch()) {
-    return symbol;
-  }
-  QString mangled_function = match.captured(1);
-  return CXXDemangle(mangled_function);
-
-}
+#endif  // Q_OS_MACOS
 
 QString DemangleSymbol(const QString &symbol);
-
 QString DemangleSymbol(const QString &symbol) {
 #ifdef Q_OS_MACOS
   return DarwinDemangle(symbol);
@@ -331,9 +335,9 @@ QString DemangleSymbol(const QString &symbol) {
 
 void DumpStackTrace() {
 #ifdef HAVE_BACKTRACE
-  void* callstack[128];
+  void *callstack[128];
   int callstack_size = backtrace(reinterpret_cast<void**>(&callstack), sizeof(callstack));
-  char** symbols = backtrace_symbols(reinterpret_cast<void**>(&callstack), callstack_size);
+  char **symbols = backtrace_symbols(reinterpret_cast<void**>(&callstack), callstack_size);
   // Start from 1 to skip ourself.
   for (int i = 1; i < callstack_size; ++i) {
     std::cerr << DemangleSymbol(QString::fromLatin1(symbols[i])).toStdString() << std::endl;
@@ -349,9 +353,9 @@ void DumpStackTrace() {
 // doesn't override any behavior that should be needed after return.
 #define qCreateLogger(line, pretty_function, category, level) logging::CreateLogger<LoggedDebug>(logging::Level_##level, logging::ParsePrettyFunction(pretty_function), line, category)
 
-QDebug CreateLoggerInfo(int line, const char *pretty_function, const char* category) { return qCreateLogger(line, pretty_function, category, Info); }
-QDebug CreateLoggerFatal(int line, const char *pretty_function, const char* category) { return qCreateLogger(line, pretty_function, category, Fatal); }
-QDebug CreateLoggerError(int line, const char *pretty_function, const char* category) { return qCreateLogger(line, pretty_function, category, Error); }
+QDebug CreateLoggerInfo(int line, const char *pretty_function, const char *category) { return qCreateLogger(line, pretty_function, category, Info); }
+QDebug CreateLoggerFatal(int line, const char *pretty_function, const char *category) { return qCreateLogger(line, pretty_function, category, Fatal); }
+QDebug CreateLoggerError(int line, const char *pretty_function, const char *category) { return qCreateLogger(line, pretty_function, category, Error); }
 
 #ifdef QT_NO_WARNING_OUTPUT
   QNoDebug CreateLoggerWarning(int, const char*, const char*) { return QNoDebug(); }
@@ -370,7 +374,7 @@ QDebug CreateLoggerError(int line, const char *pretty_function, const char* cate
 namespace {
 
 template <typename T>
-QString print_duration(T duration, const std::string& unit) {
+QString print_duration(T duration, const std::string &unit) {
   return QString("%1%2").arg(duration.count()).arg(unit.c_str());
 }
 

ext/libstrawberry-common/core/logging.h

@@ -1,5 +1,6 @@
 /* This file is part of Strawberry.
    Copyright 2011, David Sansome <me@davidsansome.com>
+   Copyright 2018-2021, Jonas Kvinge <jonas@jkvinge.net>
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -28,18 +29,31 @@
 #  define qLog(level) while (false) QNoDebug()
 #  define qLogCat(level, category) while (false) QNoDebug()
 #else
-#  define qLog(level) logging::CreateLogger##level(__LINE__, __PRETTY_FUNCTION__, nullptr)
+#  ifdef _MSC_VER
+#    define qLog(level) logging::CreateLogger##level(__LINE__, __FUNCSIG__, nullptr)
+#  else
+#    define qLog(level) logging::CreateLogger##level(__LINE__, __PRETTY_FUNCTION__, nullptr)
+#  endif  // _MSC_VER
 
 // This macro specifies a separate category for message filtering.
 // The default qLog will use the class name extracted from the function name for this purpose.
 // The category is also printed in the message along with the class name.
-#  define qLogCat(level, category) logging::CreateLogger##level(__LINE__, __PRETTY_FUNCTION__, category)
+#  ifdef _MSC_VER
+#    define qLogCat(level, category) logging::CreateLogger##level(__LINE__, __FUNCSIG__, category)
+#  else
+#    define qLogCat(level, category) logging::CreateLogger##level(__LINE__, __PRETTY_FUNCTION__, category)
+#  endif  // _MSC_VER
 
 #endif  // QT_NO_DEBUG_STREAM
 
 namespace logging {
 
 class NullDevice : public QIODevice {
+  Q_OBJECT
+
+ public:
+  NullDevice(QObject *parent = nullptr) : QIODevice(parent) {}
+
  protected:
   qint64 readData(char*, qint64) override { return -1; }
   qint64 writeData(const char*, qint64 len) override { return len; }

ext/libstrawberry-common/core/messagehandler.cpp

@@ -1,5 +1,6 @@
 /* This file is part of Strawberry.
    Copyright 2011, David Sansome <me@davidsansome.com>
+   Copyright 2018-2021, Jonas Kvinge <jonas@jkvinge.net>
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -63,7 +64,7 @@ void _MessageHandlerBase::SetDevice(QIODevice *device) {
 
 void _MessageHandlerBase::DeviceReadyRead() {
 
-  while (device_->bytesAvailable()) {
+  while (device_->bytesAvailable() > 0) {
     if (!reading_protobuf_) {
       // Read the length of the next message
       QDataStream s(device_);

ext/libstrawberry-common/core/messagehandler.h

@@ -1,5 +1,6 @@
 /* This file is part of Strawberry.
    Copyright 2011, David Sansome <me@davidsansome.com>
+   Copyright 2018-2021, Jonas Kvinge <jonas@jkvinge.net>
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -82,7 +83,7 @@ template <typename MT>
 class AbstractMessageHandler : public _MessageHandlerBase {
  public:
   AbstractMessageHandler(QIODevice *device, QObject *parent);
-  ~AbstractMessageHandler() override { AbortAll(); }
+  ~AbstractMessageHandler() override { AbstractMessageHandler::AbortAll(); }
 
   typedef MT MessageType;
   typedef MessageReply<MT> ReplyType;
@@ -129,7 +130,7 @@ void AbstractMessageHandler<MT>::SendMessage(const MessageType &message) {
 template <typename MT>
 void AbstractMessageHandler<MT>::SendMessageAsync(const MessageType &message) {
   std::string data = message.SerializeAsString();
-  metaObject()->invokeMethod(this, "WriteMessage", Qt::QueuedConnection, Q_ARG(QByteArray, QByteArray(data.data(), data.size())));
+  QMetaObject::invokeMethod(this, "WriteMessage", Qt::QueuedConnection, Q_ARG(QByteArray, QByteArray(data.data(), data.size())));
 }
 
 template<typename MT>

ext/libstrawberry-common/core/messagereply.cpp

@@ -1,5 +1,6 @@
 /* This file is part of Strawberry.
    Copyright 2011, David Sansome <me@davidsansome.com>
+   Copyright 2018-2021, Jonas Kvinge <jonas@jkvinge.net>
 
    Strawberry is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

ext/libstrawberry-common/core/messagereply.h

@@ -1,5 +1,6 @@
 /* This file is part of Strawberry.
    Copyright 2011, David Sansome <me@davidsansome.com>
+   Copyright 2018-2021, Jonas Kvinge <jonas@jkvinge.net>
 
    Strawberry is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

ext/libstrawberry-common/core/workerpool.cpp

@@ -1,5 +1,6 @@
 /* This file is part of Strawberry.
    Copyright 2011, David Sansome <me@davidsansome.com>
+   Copyright 2018-2021, Jonas Kvinge <jonas@jkvinge.net>
 
    Strawberry is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

ext/libstrawberry-common/core/workerpool.h

@@ -1,5 +1,6 @@
 /* This file is part of Strawberry.
    Copyright 2011, David Sansome <me@davidsansome.com>
+   Copyright 2018-2021, Jonas Kvinge <jonas@jkvinge.net>
 
    Strawberry is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -163,8 +164,9 @@ WorkerPool<HandlerType>::WorkerPool(QObject *parent)
   worker_count_ = qBound(1, QThread::idealThreadCount() / 2, 4);
   local_server_name_ = qApp->applicationName().toLower();
 
-  if (local_server_name_.isEmpty())
+  if (local_server_name_.isEmpty()) {
     local_server_name_ = "workerpool";
+  }
 
 }
 
@@ -217,7 +219,7 @@ void WorkerPool<HandlerType>::SetExecutableName(const QString &executable_name)
 
 template <typename HandlerType>
 void WorkerPool<HandlerType>::Start() {
-  metaObject()->invokeMethod(this, "DoStart");
+  QMetaObject::invokeMethod(this, "DoStart");
 }
 
 template <typename HandlerType>
@@ -231,9 +233,9 @@ void WorkerPool<HandlerType>::DoStart() {
   executable_path_ = executable_name_;
 
   QStringList search_path;
-  search_path << qApp->applicationDirPath();
+  search_path << QCoreApplication::applicationDirPath();
 #if defined(Q_OS_MACOS) && defined(USE_BUNDLE)
-  search_path << qApp->applicationDirPath() + "/" + USE_BUNDLE_DIR;
+  search_path << QCoreApplication::applicationDirPath() + "/" + USE_BUNDLE_DIR;
 #endif
 
   for (const QString &path_prefix : search_path) {
@@ -278,9 +280,9 @@ void WorkerPool<HandlerType>::StartOneWorker(Worker *worker) {
   // Create a server, find an unused name and start listening
   forever {
 #if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
-    const int unique_number = QRandomGenerator::global()->bounded((int)(quint64(this) & 0xFFFFFFFF));
+    const quint32 unique_number = QRandomGenerator::global()->bounded(static_cast<quint32>(quint64(this) & 0xFFFFFFFF));
 #else
-    const int unique_number = qrand() ^ ((int)(quint64(this) & 0xFFFFFFFF));
+    const quint32 unique_number = qrand() ^ (static_cast<quint32>(quint64(this) & 0xFFFFFFFF));
 #endif
     const QString name = QString("%1_%2").arg(local_server_name_).arg(unique_number);
 
@@ -380,7 +382,7 @@ WorkerPool<HandlerType>::SendMessageWithReply(MessageType *message) {
   }
 
   // Wake up the main thread
-  metaObject()->invokeMethod(this, "SendQueuedMessages", Qt::QueuedConnection);
+  QMetaObject::invokeMethod(this, "SendQueuedMessages", Qt::QueuedConnection);
 
   return reply;
 

ext/libstrawberry-tagreader/CMakeLists.txt

@@ -1,16 +1,31 @@
 cmake_minimum_required(VERSION 3.0)
 
 set(MESSAGES tagreadermessages.proto)
-set(SOURCES tagreader.cpp)
+set(SOURCES tagreaderbase.cpp)
+
+if(USE_TAGLIB AND TAGLIB_FOUND)
+  list(APPEND SOURCES tagreadertaglib.cpp)
+endif()
+
+if(USE_TAGPARSER AND TAGPARSER_FOUND)
+  list(APPEND SOURCES tagreadertagparser.cpp)
+endif()
 
 protobuf_generate_cpp(PROTO_SOURCES PROTO_HEADERS ${MESSAGES})
 
 link_directories(
   ${GLIB_LIBRARY_DIRS}
   ${PROTOBUF_LIBRARY_DIRS}
-  ${TAGLIB_LIBRARY_DIRS}
 )
 
+if(USE_TAGLIB AND TAGLIB_FOUND)
+  link_directories(${TAGLIB_LIBRARY_DIRS})
+endif()
+
+if(USE_TAGPARSER AND TAGPARSER_FOUND)
+  link_directories(${TAGPARSER_LIBRARY_DIRS})
+endif()
+
 add_library(libstrawberry-tagreader STATIC ${PROTO_SOURCES} ${SOURCES})
 
 target_include_directories(libstrawberry-tagreader SYSTEM PRIVATE
@@ -19,7 +34,6 @@ target_include_directories(libstrawberry-tagreader SYSTEM PRIVATE
 )
 
 target_include_directories(libstrawberry-tagreader PRIVATE
-  ${TAGLIB_INCLUDE_DIRS}
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_SOURCE_DIR}/ext/libstrawberry-common
@@ -30,8 +44,17 @@ target_include_directories(libstrawberry-tagreader PRIVATE
 target_link_libraries(libstrawberry-tagreader PRIVATE
   ${GLIB_LIBRARIES}
   ${PROTOBUF_LIBRARY}
-  ${TAGLIB_LIBRARIES}
   ${QtCore_LIBRARIES}
   ${QtNetwork_LIBRARIES}
   libstrawberry-common
 )
+
+if(USE_TAGLIB AND TAGLIB_FOUND)
+  target_include_directories(libstrawberry-tagreader SYSTEM PRIVATE ${TAGLIB_INCLUDE_DIRS})
+  target_link_libraries(libstrawberry-tagreader PRIVATE ${TAGLIB_LIBRARIES})
+endif()
+
+if(USE_TAGPARSER AND TAGPARSER_FOUND)
+  target_include_directories(libstrawberry-tagreader SYSTEM PRIVATE ${TAGPARSER_INCLUDE_DIRS})
+  target_link_libraries(libstrawberry-tagreader PRIVATE ${TAGPARSER_LIBRARIES})
+endif()

ext/libstrawberry-tagreader/tagreaderbase.cpp

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

ext/libstrawberry-tagreader/tagreaderbase.h

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

ext/libstrawberry-tagreader/tagreadermessages.proto

@@ -23,6 +23,10 @@ message SongMetadata {
     DSDIFF = 15;
     PCM = 16;
     APE = 17;
+    MOD = 18;
+    S3M = 19;
+    XM = 20;
+    IT = 21;
     CDDA = 90;
     STREAM = 91;
   }
@@ -60,10 +64,11 @@ message SongMetadata {
 
   optional int32 playcount = 27;
   optional int32 skipcount = 28;
-  optional int32 lastplayed = 29;
+  optional int64 lastplayed = 29;
+  optional int64 lastseen = 30;
 
-  optional bool suspicious_tags = 30;
-  optional string art_automatic = 31;
+  optional bool suspicious_tags = 31;
+  optional string art_automatic = 32;
 
 }
 

ext/libstrawberry-tagreader/tagreadertaglib.cpp

@@ -1,6 +1,6 @@
 /* This file is part of Strawberry.
    Copyright 2013, David Sansome <me@davidsansome.com>
-   Copyright 2018, 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
@@ -18,11 +18,10 @@
 
 #include "config.h"
 
-#include "tagreader.h"
+#include "tagreadertaglib.h"
 
+#include <string>
 #include <memory>
-#include <list>
-#include <map>
 #include <sys/stat.h>
 
 #include <taglib/taglib.h>
@@ -68,6 +67,10 @@
 #include <taglib/opusfile.h>
 #include <taglib/trueaudiofile.h>
 #include <taglib/apefile.h>
+#include <taglib/modfile.h>
+#include <taglib/s3mfile.h>
+#include <taglib/xmfile.h>
+#include <taglib/itfile.h>
 #ifdef HAVE_TAGLIB_DSFFILE
 #  include <taglib/dsffile.h>
 #endif
@@ -78,13 +81,11 @@
 #include <QtGlobal>
 #include <QFile>
 #include <QFileInfo>
-#include <QList>
 #include <QVector>
 #include <QByteArray>
-#include <QDateTime>
-#include <QVariant>
 #include <QString>
 #include <QUrl>
+#include <QDateTime>
 #include <QtDebug>
 
 #include "core/logging.h"
@@ -93,12 +94,17 @@
 
 class FileRefFactory {
  public:
-  virtual ~FileRefFactory() {}
+  FileRefFactory() = default;
+  virtual ~FileRefFactory() = default;
   virtual TagLib::FileRef *GetFileRef(const QString &filename) = 0;
+
+ private:
+  Q_DISABLE_COPY(FileRefFactory)
 };
 
 class TagLibFileRefFactory : public FileRefFactory {
  public:
+  TagLibFileRefFactory() = default;
   TagLib::FileRef *GetFileRef(const QString &filename) override {
 #ifdef Q_OS_WIN32
     return new TagLib::FileRef(filename.toStdWString().c_str());
@@ -106,6 +112,8 @@ class TagLibFileRefFactory : public FileRefFactory {
     return new TagLib::FileRef(QFile::encodeName(filename).constData());
 #endif
   }
+ private:
+  Q_DISABLE_COPY(TagLibFileRefFactory)
 };
 
 namespace {
@@ -128,25 +136,22 @@ const char *kASF_OriginalYear_ID = "WM/OriginalReleaseYear";
 }  // namespace
 
 
-TagReader::TagReader() :
-  factory_(new TagLibFileRefFactory),
-  kEmbeddedCover("(embedded)") {
-}
+TagReaderTagLib::TagReaderTagLib() : factory_(new TagLibFileRefFactory) {}
 
-TagReader::~TagReader() {
+TagReaderTagLib::~TagReaderTagLib() {
   delete factory_;
 }
 
-bool TagReader::IsMediaFile(const QString &filename) const {
+bool TagReaderTagLib::IsMediaFile(const QString &filename) const {
 
   qLog(Debug) << "Checking for valid file" << filename;
 
   std::unique_ptr<TagLib::FileRef> fileref(factory_->GetFileRef(filename));
-  return !fileref->isNull() && fileref->tag();
+  return fileref && !fileref->isNull() && fileref->file() && fileref->tag();
 
 }
 
-spb::tagreader::SongMetadata_FileType TagReader::GuessFileType(TagLib::FileRef *fileref) const {
+spb::tagreader::SongMetadata_FileType TagReaderTagLib::GuessFileType(TagLib::FileRef *fileref) const {
 
   if (dynamic_cast<TagLib::RIFF::WAV::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_WAV;
   if (dynamic_cast<TagLib::FLAC::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_FLAC;
@@ -162,6 +167,10 @@ spb::tagreader::SongMetadata_FileType TagReader::GuessFileType(TagLib::FileRef *
   if (dynamic_cast<TagLib::MPC::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_MPC;
   if (dynamic_cast<TagLib::TrueAudio::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_TRUEAUDIO;
   if (dynamic_cast<TagLib::APE::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_APE;
+  if (dynamic_cast<TagLib::Mod::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_MOD;
+  if (dynamic_cast<TagLib::S3M::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_S3M;
+  if (dynamic_cast<TagLib::XM::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_XM;
+  if (dynamic_cast<TagLib::IT::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_IT;
 #ifdef HAVE_TAGLIB_DSFFILE
   if (dynamic_cast<TagLib::DSF::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_DSF;
 #endif
@@ -173,7 +182,7 @@ spb::tagreader::SongMetadata_FileType TagReader::GuessFileType(TagLib::FileRef *
 
 }
 
-void TagReader::ReadFile(const QString &filename, spb::tagreader::SongMetadata *song) const {
+void TagReaderTagLib::ReadFile(const QString &filename, spb::tagreader::SongMetadata *song) const {
 
   const QByteArray url(QUrl::fromLocalFile(filename).toEncoded());
   const QFileInfo info(filename);
@@ -189,6 +198,7 @@ void TagReader::ReadFile(const QString &filename, spb::tagreader::SongMetadata *
 #else
   song->set_ctime(info.created().toSecsSinceEpoch());
 #endif
+  song->set_lastseen(QDateTime::currentDateTime().toSecsSinceEpoch());
 
   std::unique_ptr<TagLib::FileRef> fileref(factory_->GetFileRef(filename));
   if (fileref->isNull()) {
@@ -399,7 +409,7 @@ void TagReader::ReadFile(const QString &filename, spb::tagreader::SongMetadata *
 
   if (compilation.isEmpty()) {
     // well, it wasn't set, but if the artist is VA assume it's a compilation
-    if (QStringFromStdString(song->artist()).toLower() == "various artists" || QStringFromStdString(song->albumartist()).toLower() == "various artists") {
+    if (QStringFromStdString(song->artist()).compare("various artists") == 0 || QStringFromStdString(song->albumartist()).compare("various artists") == 0) {
       song->set_compilation(true);
     }
   }
@@ -414,6 +424,7 @@ void TagReader::ReadFile(const QString &filename, spb::tagreader::SongMetadata *
   SetDefault(track);
   SetDefault(disc);
   SetDefault(year);
+  SetDefault(originalyear);
   SetDefault(bitrate);
   SetDefault(samplerate);
   SetDefault(bitdepth);
@@ -422,20 +433,20 @@ void TagReader::ReadFile(const QString &filename, spb::tagreader::SongMetadata *
 
 }
 
-void TagReader::Decode(const TagLib::String &tag, std::string *output) {
+void TagReaderTagLib::Decode(const TagLib::String &tag, std::string *output) {
 
   QString tmp = TStringToQString(tag).trimmed();
   output->assign(DataCommaSizeFromQString(tmp));
 
 }
 
-void TagReader::Decode(const QString &tag, std::string *output) {
+void TagReaderTagLib::Decode(const QString &tag, std::string *output) {
 
   output->assign(DataCommaSizeFromQString(tag));
 
 }
 
-void TagReader::ParseOggTag(const TagLib::Ogg::FieldListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const {
+void TagReaderTagLib::ParseOggTag(const TagLib::Ogg::FieldListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const {
 
   if (!map["COMPOSER"].isEmpty()) Decode(map["COMPOSER"].front(), song->mutable_composer());
   if (!map["PERFORMER"].isEmpty()) Decode(map["PERFORMER"].front(), song->mutable_performer());
@@ -460,7 +471,7 @@ void TagReader::ParseOggTag(const TagLib::Ogg::FieldListMap &map, QString *disc,
 
 }
 
-void TagReader::ParseAPETag(const TagLib::APE::ItemListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const {
+void TagReaderTagLib::ParseAPETag(const TagLib::APE::ItemListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const {
 
   TagLib::APE::ItemListMap::ConstIterator it = map.find("ALBUM ARTIST");
   if (it != map.end()) {
@@ -504,7 +515,7 @@ void TagReader::ParseAPETag(const TagLib::APE::ItemListMap &map, QString *disc,
 
 }
 
-void TagReader::SetVorbisComments(TagLib::Ogg::XiphComment *vorbis_comments, const spb::tagreader::SongMetadata &song) const {
+void TagReaderTagLib::SetVorbisComments(TagLib::Ogg::XiphComment *vorbis_comments, const spb::tagreader::SongMetadata &song) const {
 
   vorbis_comments->addField("COMPOSER", StdStringToTaglibString(song.composer()), true);
   vorbis_comments->addField("PERFORMER", StdStringToTaglibString(song.performer()), true);
@@ -522,7 +533,7 @@ void TagReader::SetVorbisComments(TagLib::Ogg::XiphComment *vorbis_comments, con
 
 }
 
-bool TagReader::SaveFile(const QString &filename, const spb::tagreader::SongMetadata &song) const {
+bool TagReaderTagLib::SaveFile(const QString &filename, const spb::tagreader::SongMetadata &song) const {
 
   if (filename.isEmpty()) return false;
 
@@ -603,7 +614,7 @@ bool TagReader::SaveFile(const QString &filename, const spb::tagreader::SongMeta
   return result;
 }
 
-void TagReader::SaveAPETag(TagLib::APE::Tag *tag, const spb::tagreader::SongMetadata &song) const {
+void TagReaderTagLib::SaveAPETag(TagLib::APE::Tag *tag, const spb::tagreader::SongMetadata &song) const {
 
   tag->setItem("album artist", TagLib::APE::Item("album artist", TagLib::StringList(song.albumartist().c_str())));
   tag->addValue("disc", QStringToTaglibString(song.disc() <= 0 ? QString() : QString::number(song.disc())), true);
@@ -615,14 +626,14 @@ void TagReader::SaveAPETag(TagLib::APE::Tag *tag, const spb::tagreader::SongMeta
 
 }
 
-void TagReader::SetTextFrame(const char *id, const QString &value, TagLib::ID3v2::Tag *tag) const {
+void TagReaderTagLib::SetTextFrame(const char *id, const QString &value, TagLib::ID3v2::Tag *tag) const {
 
   const QByteArray utf8(value.toUtf8());
   SetTextFrame(id, std::string(utf8.constData(), utf8.length()), tag);
 
 }
 
-void TagReader::SetTextFrame(const char *id, const std::string &value, TagLib::ID3v2::Tag *tag) const {
+void TagReaderTagLib::SetTextFrame(const char *id, const std::string &value, TagLib::ID3v2::Tag *tag) const {
 
   TagLib::ByteVector id_vector(id);
   QVector<TagLib::ByteVector> frames_buffer;
@@ -653,7 +664,7 @@ void TagReader::SetTextFrame(const char *id, const std::string &value, TagLib::I
 
 }
 
-void TagReader::SetUnsyncLyricsFrame(const std::string &value, TagLib::ID3v2::Tag *tag) const {
+void TagReaderTagLib::SetUnsyncLyricsFrame(const std::string &value, TagLib::ID3v2::Tag *tag) const {
 
   TagLib::ByteVector id_vector("USLT");
   QVector<TagLib::ByteVector> frames_buffer;
@@ -685,7 +696,7 @@ void TagReader::SetUnsyncLyricsFrame(const std::string &value, TagLib::ID3v2::Ta
 
 }
 
-QByteArray TagReader::LoadEmbeddedArt(const QString &filename) const {
+QByteArray TagReaderTagLib::LoadEmbeddedArt(const QString &filename) const {
 
   if (filename.isEmpty()) return QByteArray();
 
@@ -786,7 +797,7 @@ QByteArray TagReader::LoadEmbeddedArt(const QString &filename) const {
 
 }
 
-QByteArray TagReader::LoadEmbeddedAPEArt(const TagLib::APE::ItemListMap &map) const {
+QByteArray TagReaderTagLib::LoadEmbeddedAPEArt(const TagLib::APE::ItemListMap &map) const {
 
   QByteArray ret;
 
@@ -804,7 +815,7 @@ QByteArray TagReader::LoadEmbeddedAPEArt(const TagLib::APE::ItemListMap &map) co
 
 }
 
-bool TagReader::SaveEmbeddedArt(const QString &filename, const QByteArray &data) {
+bool TagReaderTagLib::SaveEmbeddedArt(const QString &filename, const QByteArray &data) {
 
   if (filename.isEmpty()) return false;
 

ext/libstrawberry-tagreader/tagreadertaglib.h

@@ -1,6 +1,6 @@
 /* This file is part of Strawberry.
    Copyright 2013, David Sansome <me@davidsansome.com>
-   Copyright 2018, 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
@@ -16,8 +16,8 @@
    along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef TAGREADER_H
-#define TAGREADER_H
+#ifndef TAGREADERTAGLIB_H
+#define TAGREADERTAGLIB_H
 
 #include "config.h"
 
@@ -33,29 +33,31 @@
 #include <taglib/apefile.h>
 #include <taglib/id3v2tag.h>
 
+#include "tagreaderbase.h"
 #include "tagreadermessages.pb.h"
 
 class FileRefFactory;
 
-/**
+/*
  * This class holds all useful methods to read and write tags from/to files.
  * You should not use it directly in the main process but rather use a TagReaderWorker process (using TagReaderClient)
  */
-class TagReader {
+class TagReaderTagLib : public TagReaderBase {
  public:
-  explicit TagReader();
-  ~TagReader();
+  explicit TagReaderTagLib();
+  ~TagReaderTagLib();
 
-  bool IsMediaFile(const QString &filename) const;
+  bool IsMediaFile(const QString &filename) const override;
+
+  void ReadFile(const QString &filename, spb::tagreader::SongMetadata *song) const override;
+  bool SaveFile(const QString &filename, const spb::tagreader::SongMetadata &song) const override;
+
+  QByteArray LoadEmbeddedArt(const QString &filename) const override;
+  bool SaveEmbeddedArt(const QString &filename, const QByteArray &data) override;
+
+ private:
   spb::tagreader::SongMetadata_FileType GuessFileType(TagLib::FileRef *fileref) const;
 
-  void ReadFile(const QString &filename, spb::tagreader::SongMetadata *song) const;
-  bool SaveFile(const QString &filename, const spb::tagreader::SongMetadata &song) const;
-
-  QByteArray LoadEmbeddedArt(const QString &filename) const;
-  QByteArray LoadEmbeddedAPEArt(const TagLib::APE::ItemListMap &map) const;
-  bool SaveEmbeddedArt(const QString &filename, const QByteArray &data);
-
   static void Decode(const TagLib::String &tag, std::string *output);
   static void Decode(const QString &tag, std::string *output);
 
@@ -69,10 +71,12 @@ class TagReader {
   void SetTextFrame(const char *id, const std::string &value, TagLib::ID3v2::Tag *tag) const;
   void SetUnsyncLyricsFrame(const std::string& value, TagLib::ID3v2::Tag* tag) const;
 
+  QByteArray LoadEmbeddedAPEArt(const TagLib::APE::ItemListMap &map) const;
+
  private:
   FileRefFactory *factory_;
 
-  const std::string kEmbeddedCover;
+  Q_DISABLE_COPY(TagReaderTagLib)
 };
 
-#endif  // TAGREADER_H
+#endif  // TAGREADERTAGLIB_H

ext/libstrawberry-tagreader/tagreadertagparser.cpp

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

ext/libstrawberry-tagreader/tagreadertagparser.h

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

ext/macdeploycheck/CMakeLists.txt

@@ -0,0 +1,15 @@
+qt_wrap_cpp(MACDEPLOYCHECK_MOC ${CMAKE_SOURCE_DIR}/ext/libstrawberry-common/core/logging.h)
+link_directories(${GLIB_LIBRARY_DIRS})
+add_executable(macdeploycheck macdeploycheck.cpp ${CMAKE_SOURCE_DIR}/ext/libstrawberry-common/core/logging.cpp ${MACDEPLOYCHECK_MOC})
+target_include_directories(macdeploycheck PUBLIC SYSTEM
+  ${GLIB_INCLUDE_DIRS}
+)
+target_include_directories(macdeploycheck PUBLIC
+  ${CMAKE_SOURCE_DIR}/ext/libstrawberry-common
+  ${CMAKE_BINARY_DIR}/src
+)
+target_link_libraries(macdeploycheck PUBLIC
+  "-framework AppKit"
+  ${GLIB_LIBRARIES}
+  ${QtCore_LIBRARIES}
+)

ext/macdeploycheck/macdeploycheck.cpp

@@ -0,0 +1,150 @@
+/* This file is part of Strawberry.
+   Copyright 2021, Jonas Kvinge <jonas@jkvinge.net>
+
+   Strawberry is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   Strawberry is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <QCoreApplication>
+#include <QString>
+#include <QStringList>
+#include <QFile>
+#include <QFileInfo>
+#include <QDir>
+#include <QDirIterator>
+#include <QProcess>
+#include <QRegularExpression>
+#include <QRegularExpressionMatch>
+
+#include "core/logging.h"
+
+int main(int argc, char **argv);
+int main(int argc, char **argv) {
+
+  QCoreApplication app(argc, argv);
+
+  logging::Init();
+
+  qLog(Info) << "Running macdeploycheck";
+
+  if (argc < 1) {
+    qLog(Error) << "Usage: macdeploycheck <bundledir>";
+    return 1;
+  }
+  QString bundle_path = QString::fromLocal8Bit(argv[1]);
+
+  bool success = true;
+
+  QDirIterator iter(bundle_path, QDir::Files | QDir::NoSymLinks, QDirIterator::Subdirectories);
+  while (iter.hasNext()) {
+
+    iter.next();
+
+    QString filepath = iter.fileInfo().filePath();
+
+    // Ignore these files.
+    if (filepath.endsWith(".plist") ||
+        filepath.endsWith(".icns") ||
+        filepath.endsWith(".prl") ||
+        filepath.endsWith(".conf") ||
+        filepath.endsWith(".h") ||
+        filepath.endsWith(".nib") ||
+        filepath.endsWith(".strings") ||
+        filepath.endsWith(".css") ||
+        filepath.endsWith("CodeResources") ||
+        filepath.endsWith("PkgInfo") ||
+        filepath.endsWith(".modulemap")) {
+      continue;
+    }
+
+    QProcess otool;
+    otool.start("otool", QStringList() << "-L" << filepath);
+    otool.waitForFinished();
+    if (otool.exitStatus() != QProcess::NormalExit || otool.exitCode() != 0) {
+      qLog(Error) << "otool failed for" << filepath << ":" << otool.readAllStandardError();
+      success = false;
+      continue;
+    }
+    QString output = otool.readAllStandardOutput();
+    QStringList output_lines = output.split("\n", Qt::SkipEmptyParts);
+    if (output_lines.size() < 2) {
+      qLog(Error) << "Could not parse otool output:" << output;
+      success = false;
+      continue;
+    }
+    QString first_line = output_lines.first();
+    if (first_line.endsWith(':')) first_line.chop(1);
+    if (first_line == filepath) {
+      output_lines.removeFirst();
+    }
+    else {
+      qLog(Error) << "First line" << first_line << "does not match" << filepath;
+      success = false;
+    }
+    QRegularExpression regexp(QStringLiteral("^\\t(.+) \\(compatibility version (\\d+\\.\\d+\\.\\d+), current version (\\d+\\.\\d+\\.\\d+)(, weak)?\\)$"));
+    for (const QString &output_line : output_lines) {
+
+      //qDebug() << "Final check on" << filepath << output_line;
+
+      QRegularExpressionMatch match = regexp.match(output_line);
+      if (match.hasMatch()) {
+        QString library = match.captured(1);
+        if (QFileInfo(library).fileName() == QFileInfo(filepath).fileName()) { // It's this.
+          continue;
+        }
+        else if (library.startsWith("@executable_path")) {
+          QString real_path = library;
+          real_path = real_path.replace("@executable_path", bundle_path + "/Contents/MacOS");
+          if (!QFile(real_path).exists()) {
+            qLog(Error) << real_path << "does not exist for" << filepath;
+            success = false;
+          }
+        }
+        else if (library.startsWith("@rpath")) {
+          QString real_path = library;
+          real_path = real_path.replace("@rpath", bundle_path + "/Contents/Frameworks");
+          if (!QFile(real_path).exists() && !real_path.endsWith("QtSvg")) { // FIXME: Ignore broken svg image plugin.
+            qLog(Error) << real_path << "does not exist for" << filepath;
+            success = false;
+          }
+        }
+        else if (library.startsWith("@loader_path")) {
+          QString loader_path = QFileInfo(filepath).path();
+          QString real_path = library;
+          real_path = real_path.replace("@loader_path", loader_path);
+          if (!QFile(real_path).exists()) {
+            qLog(Error) << real_path << "does not exist for" << filepath;
+            success = false;
+          }
+        }
+        else if (library.startsWith("/System/Library/") || library.startsWith("/usr/lib/")) { // System library
+          continue;
+        }
+        else if (library.endsWith("libgcc_s.1.dylib")) {  // fftw points to it for some reason.
+          continue;
+        }
+        else {
+          qLog(Error) << "File" << filepath << "points to" << library;
+          success = false;
+        }
+      }
+      else {
+        qLog(Error) << "Could not parse otool output line:" << output_line;
+        success = false;
+      }
+    }
+  }
+
+  return success ? 0 : 1;
+
+}

ext/strawberry-tagreader/CMakeLists.txt

@@ -3,19 +3,19 @@ cmake_minimum_required(VERSION 3.0)
 set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR})
 
 set(SOURCES main.cpp tagreaderworker.cpp)
+set(HEADERS tagreaderworker.h)
 
-if(BUILD_WITH_QT6)
-  qt6_wrap_cpp(MOC ${HEADERS})
-  qt6_add_resources(QRC data/data.qrc)
-else()
-  qt5_wrap_cpp(MOC ${HEADERS})
-  qt5_add_resources(QRC data/data.qrc)
+qt_wrap_cpp(MOC ${HEADERS})
+
+link_directories(${GLIB_LIBRARY_DIRS})
+
+if(USE_TAGLIB AND TAGLIB_FOUND)
+  link_directories(${TAGLIB_LIBRARY_DIRS})
 endif()
 
-link_directories(
-  ${GLIB_LIBRARY_DIRS}
-  ${TAGLIB_LIBRARY_DIRS}
-)
+if(USE_TAGPARSER AND TAGPARSER_FOUND)
+  link_directories(${TAGPARSER_LIBRARY_DIRS})
+endif()
 
 add_executable(strawberry-tagreader ${SOURCES} ${MOC} ${QRC})
 
@@ -25,7 +25,6 @@ target_include_directories(strawberry-tagreader SYSTEM PRIVATE
 )
 
 target_include_directories(strawberry-tagreader PRIVATE
-  ${TAGLIB_INCLUDE_DIRS}
   ${CMAKE_SOURCE_DIR}/ext/libstrawberry-common
   ${CMAKE_SOURCE_DIR}/ext/libstrawberry-tagreader
   ${CMAKE_BINARY_DIR}/ext/libstrawberry-tagreader
@@ -34,20 +33,29 @@ target_include_directories(strawberry-tagreader PRIVATE
 
 target_link_libraries(strawberry-tagreader PRIVATE
   ${GLIB_LIBRARIES}
-  ${TAGLIB_LIBRARIES}
   ${QtCore_LIBRARIES}
   ${QtNetwork_LIBRARIES}
   libstrawberry-common
   libstrawberry-tagreader
 )
 
-if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+if(USE_TAGLIB AND TAGLIB_FOUND)
+  target_include_directories(strawberry-tagreader SYSTEM PRIVATE ${TAGLIB_INCLUDE_DIRS})
+  target_link_libraries(strawberry-tagreader PRIVATE ${TAGLIB_LIBRARIES})
+endif()
+
+if(USE_TAGPARSER AND TAGPARSER_FOUND)
+  target_include_directories(strawberry-tagreader SYSTEM PRIVATE ${TAGPARSER_INCLUDE_DIRS})
+  target_link_libraries(strawberry-tagreader PRIVATE ${TAGPARSER_LIBRARIES})
+endif()
+
+if(FREEBSD)
   target_link_libraries(strawberry-tagreader PRIVATE execinfo)
-endif(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+endif()
 
 if(APPLE)
   target_link_libraries(strawberry-tagreader PRIVATE /System/Library/Frameworks/Foundation.framework)
-endif(APPLE)
+endif()
 
 if(APPLE)
   install(TARGETS strawberry-tagreader DESTINATION ${CMAKE_BINARY_DIR}/strawberry.app/Contents/PlugIns)

ext/strawberry-tagreader/data/data.qrc

@@ -1,5 +0,0 @@
-<RCC>
-  <qresource prefix="/certs">
-    <file>godaddy-root.pem</file>
-  </qresource>
-</RCC>

ext/strawberry-tagreader/data/godaddy-root.pem

@@ -1,24 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEADCCAuigAwIBAgIBADANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEh
-MB8GA1UEChMYVGhlIEdvIERhZGR5IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBE
-YWRkeSBDbGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA0MDYyOTE3
-MDYyMFoXDTM0MDYyOTE3MDYyMFowYzELMAkGA1UEBhMCVVMxITAfBgNVBAoTGFRo
-ZSBHbyBEYWRkeSBHcm91cCwgSW5jLjExMC8GA1UECxMoR28gRGFkZHkgQ2xhc3Mg
-MiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASAwDQYJKoZIhvcNAQEBBQADggEN
-ADCCAQgCggEBAN6d1+pXGEmhW+vXX0iG6r7d/+TvZxz0ZWizV3GgXne77ZtJ6XCA
-PVYYYwhv2vLM0D9/AlQiVBDYsoHUwHU9S3/Hd8M+eKsaA7Ugay9qK7HFiH7Eux6w
-wdhFJ2+qN1j3hybX2C32qRe3H3I2TqYXP2WYktsqbl2i/ojgC95/5Y0V4evLOtXi
-EqITLdiOr18SPaAIBQi2XKVlOARFmR6jYGB0xUGlcmIbYsUfb18aQr4CUWWoriMY
-avx4A6lNf4DD+qta/KFApMoZFv6yyO9ecw3ud72a9nmYvLEHZ6IVDd2gWMZEewo+
-YihfukEHU1jPEX44dMX4/7VpkI+EdOqXG68CAQOjgcAwgb0wHQYDVR0OBBYEFNLE
-sNKR1EwRcbNhyz2h/t2oatTjMIGNBgNVHSMEgYUwgYKAFNLEsNKR1EwRcbNhyz2h
-/t2oatTjoWekZTBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYVGhlIEdvIERhZGR5
-IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRpZmlj
-YXRpb24gQXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
-ggEBADJL87LKPpH8EsahB4yOd6AzBhRckB4Y9wimPQoZ+YeAEW5p5JYXMP80kWNy
-OO7MHAGjHZQopDH2esRU1/blMVgDoszOYtuURXO1v0XJJLXVggKtI3lpjbi2Tc7P
-TMozI+gciKqdi0FuFskg5YmezTvacPd+mSYgFFQlq25zheabIZ0KbIIOqPjCDPoQ
-HmyW74cNxA9hi63ugyuV+I6ShHI56yDqg+2DzZduCLzrTia2cyvk0/ZM/iZx4mER
-dEr/VxqHD3VILs9RaRegAhJhldXRQLIQTO7ErBBDpqWeCtWVYpoNz4iCxTIM5Cuf
-ReYNnyicsbkqWletNw+vHX/bvZ8=
------END CERTIFICATE-----

ext/strawberry-tagreader/main.cpp

@@ -1,5 +1,6 @@
 /* This file is part of Strawberry.
    Copyright 2011, David Sansome <me@davidsansome.com>
+   Copyright 2018-2021, Jonas Kvinge <jonas@jkvinge.net>
 
    Strawberry is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,18 +18,18 @@
 
 #include "config.h"
 
+#include <QtGlobal>
+
+#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0)
 #include <sys/time.h>
+#endif
 #include <iostream>
 
-#include <QtGlobal>
 #include <QCoreApplication>
 #include <QList>
-#include <QLocalSocket>
-#include <QSsl>
-#include <QSslCertificate>
-#include <QSslSocket>
+#include <QString>
 #include <QStringList>
-#include <QtDebug>
+#include <QLocalSocket>
 
 #include "core/logging.h"
 #include "tagreaderworker.h"
@@ -63,10 +64,6 @@ int main(int argc, char **argv) {
     return 1;
   }
 
-#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
-  QSslSocket::addDefaultCaCertificates(QSslCertificate::fromPath(":/certs/godaddy-root.pem", QSsl::Pem));
-#endif
-
   TagReaderWorker worker(&socket);
 
   return a.exec();

ext/strawberry-tagreader/tagreaderworker.cpp

@@ -1,5 +1,6 @@
 /* This file is part of Strawberry.
    Copyright 2011, David Sansome <me@davidsansome.com>
+   Copyright 2018-2021, Jonas Kvinge <jonas@jkvinge.net>
 
    Strawberry is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -58,5 +59,5 @@ void TagReaderWorker::MessageArrived(const spb::tagreader::Message &message) {
 void TagReaderWorker::DeviceClosed() {
   AbstractMessageHandler<spb::tagreader::Message>::DeviceClosed();
 
-  qApp->exit();
+  QCoreApplication::exit();
 }

ext/strawberry-tagreader/tagreaderworker.h

@@ -1,5 +1,6 @@
 /* This file is part of Strawberry.
    Copyright 2011, David Sansome <me@davidsansome.com>
+   Copyright 2018-2021, Jonas Kvinge <jonas@jkvinge.net>
 
    Strawberry is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -23,12 +24,18 @@
 #include <QObject>
 
 #include "core/messagehandler.h"
-#include "tagreader.h"
+#if defined(USE_TAGLIB)
+#  include "tagreadertaglib.h"
+#elif defined(USE_TAGPARSER)
+#  include "tagreadertagparser.h"
+#endif
 #include "tagreadermessages.pb.h"
 
 class QIODevice;
 
 class TagReaderWorker : public AbstractMessageHandler<spb::tagreader::Message> {
+  Q_OBJECT
+
  public:
   explicit TagReaderWorker(QIODevice *socket, QObject *parent = nullptr);
 
@@ -37,7 +44,11 @@ class TagReaderWorker : public AbstractMessageHandler<spb::tagreader::Message> {
   void DeviceClosed() override;
 
  private:
-  TagReader tag_reader_;
+#if defined(USE_TAGLIB)
+  TagReaderTagLib tag_reader_;
+#elif defined(USE_TAGPARSER)
+  TagReaderTagParser tag_reader_;
+#endif
 };
 
 #endif  // TAGREADERWORKER_H

src/CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.0)
 
 if(HAVE_TRANSLATIONS)
   include(../cmake/Translations.cmake)
-endif(HAVE_TRANSLATIONS)
+endif()
 
 set(SOURCES
   core/mainwindow.cpp
@@ -11,6 +11,7 @@ set(SOURCES
   core/player.cpp
   core/commandlineoptions.cpp
   core/database.cpp
+  core/sqlquery.cpp
   core/metatypes.cpp
   core/deletefiles.cpp
   core/filesystemmusicstorage.cpp
@@ -36,11 +37,10 @@ set(SOURCES
   core/utilities.cpp
   core/imageutils.cpp
   core/iconloader.cpp
-  core/qtsystemtrayicon.cpp
   core/standarditemiconloader.cpp
-  core/systemtrayicon.cpp
   core/scopedtransaction.cpp
   core/translations.cpp
+  core/systemtrayicon.cpp
 
   engine/enginetype.cpp
   engine/enginebase.cpp
@@ -76,6 +76,7 @@ set(SOURCES
   collection/sqlrow.cpp
   collection/savedgroupingmanager.cpp
   collection/groupbydialog.cpp
+  collection/collectiontask.cpp
 
   playlist/playlist.cpp
   playlist/playlistbackend.cpp
@@ -215,9 +216,6 @@ set(SOURCES
   osd/osdbase.cpp
   osd/osdpretty.cpp
 
-  musicbrainz/acoustidclient.cpp
-  musicbrainz/musicbrainzclient.cpp
-
   internet/internetservices.cpp
   internet/internetservice.cpp
   internet/internetplaylistitem.cpp
@@ -232,6 +230,17 @@ set(SOURCES
   internet/internetcollectionviewcontainer.cpp
   internet/internetsearchview.cpp
 
+  radios/radioservices.cpp
+  radios/radiobackend.cpp
+  radios/radiomodel.cpp
+  radios/radioview.cpp
+  radios/radioviewcontainer.cpp
+  radios/radioservice.cpp
+  radios/radioplaylistitem.cpp
+  radios/radiochannel.cpp
+  radios/somafmservice.cpp
+  radios/radioparadiseservice.cpp
+
   scrobbler/audioscrobbler.cpp
   scrobbler/scrobblerservices.cpp
   scrobbler/scrobblerservice.cpp
@@ -253,11 +262,13 @@ set(SOURCES
 set(HEADERS
   core/mainwindow.h
   core/application.h
+  core/appearance.h
   core/player.h
   core/database.h
   core/deletefiles.h
   core/filesystemwatcherinterface.h
   core/mergedproxymodel.h
+  core/multisortfilterproxy.h
   core/networkaccessmanager.h
   core/threadsafenetworkdiskcache.h
   core/networktimeouts.h
@@ -265,10 +276,11 @@ set(HEADERS
   core/songloader.h
   core/tagreaderclient.h
   core/taskmanager.h
+  core/thread.h
   core/urlhandler.h
-  core/qtsystemtrayicon.h
   core/standarditemiconloader.h
-  core/systemtrayicon.h
+  core/translations.h
+  core/potranslator.h
   core/mimedata.h
   core/stylesheetloader.h
 
@@ -310,6 +322,7 @@ set(HEADERS
   playlist/playlistlistcontainer.h
   playlist/playlistlistmodel.h
   playlist/playlistlistview.h
+  playlist/playlistlistsortfiltermodel.h
   playlist/playlistmanager.h
   playlist/playlistsaveoptionsdialog.h
   playlist/playlistsequence.h
@@ -330,10 +343,13 @@ set(HEADERS
   playlistparsers/parserbase.h
   playlistparsers/playlistparser.h
   playlistparsers/plsparser.h
+  playlistparsers/wplparser.h
+  playlistparsers/xmlparser.h
   playlistparsers/xspfparser.h
 
   smartplaylists/playlistgenerator.h
   smartplaylists/playlistgeneratorinserter.h
+  smartplaylists/playlistquerygenerator.h
   smartplaylists/playlistgeneratormimedata.h
   smartplaylists/smartplaylistquerywizardplugin.h
   smartplaylists/smartplaylistsearchpreview.h
@@ -428,24 +444,33 @@ set(HEADERS
   widgets/loginstatewidget.h
   widgets/qsearchfield.h
   widgets/ratingwidget.h
+  widgets/forcescrollperpixel.h
 
   osd/osdbase.h
   osd/osdpretty.h
 
-  musicbrainz/acoustidclient.h
-  musicbrainz/musicbrainzclient.h
-
   internet/internetservices.h
   internet/internetservice.h
   internet/internetsongmimedata.h
-  internet/internetsearchview.h
   internet/internetsearchmodel.h
+  internet/internetsearchsortmodel.h
+  internet/internetsearchitemdelegate.h
+  internet/internetsearchview.h
   internet/localredirectserver.h
   internet/internetsongsview.h
   internet/internettabsview.h
   internet/internetcollectionview.h
   internet/internetcollectionviewcontainer.h
-  internet/internetsearchview.h
+
+  radios/radioservices.h
+  radios/radiobackend.h
+  radios/radiomodel.h
+  radios/radioview.h
+  radios/radioviewcontainer.h
+  radios/radioservice.h
+  radios/radiomimedata.h
+  radios/somafmservice.h
+  radios/radioparadiseservice.h
 
   scrobbler/audioscrobbler.h
   scrobbler/scrobblerservices.h
@@ -530,6 +555,8 @@ set(UI
   internet/internetcollectionviewcontainer.ui
   internet/internetsearchview.ui
 
+  radios/radioviewcontainer.ui
+
   organize/organizedialog.ui
   organize/organizeerrordialog.ui
 
@@ -542,7 +569,7 @@ option(USE_INSTALL_PREFIX "Look for data in CMAKE_INSTALL_PREFIX" ON)
 
 if(NOT APPLE)
   set(NOT_APPLE ON)
-  optional_source(NOT_APPLE SOURCES widgets/qsearchfield_nonmac.cpp)
+  optional_source(NOT_APPLE SOURCES widgets/qsearchfield_nonmac.cpp core/qtsystemtrayicon.cpp HEADERS core/qtsystemtrayicon.h)
 endif()
 
 if(HAVE_GLOBALSHORTCUTS)
@@ -551,137 +578,62 @@ if(HAVE_GLOBALSHORTCUTS)
     HEADERS globalshortcuts/globalshortcutsmanager.h globalshortcuts/globalshortcutsbackend.h globalshortcuts/globalshortcutgrabber.h settings/globalshortcutssettingspage.h
     UI globalshortcuts/globalshortcutgrabber.ui settings/globalshortcutssettingspage.ui
   )
-  if(HAVE_X11EXTRAS OR WIN32)
-    set(X11_OR_WIN ON)
-  endif()
-  optional_source(X11_OR_WIN
-    SOURCES globalshortcuts/globalshortcutsbackend-system.cpp globalshortcuts/globalshortcut.cpp
-    HEADERS globalshortcuts/globalshortcutsbackend-system.h globalshortcuts/globalshortcut.h
-  )
-  optional_source(HAVE_X11EXTRAS
-    SOURCES globalshortcuts/globalshortcut-x11.cpp
-  )
   optional_source(HAVE_DBUS
-    SOURCES globalshortcuts/globalshortcutsbackend-gsd.cpp globalshortcuts/globalshortcutsbackend-kde.cpp
-    HEADERS globalshortcuts/globalshortcutsbackend-gsd.h globalshortcuts/globalshortcutsbackend-kde.h
+    SOURCES globalshortcuts/globalshortcutsbackend-kde.cpp globalshortcuts/globalshortcutsbackend-gnome.cpp globalshortcuts/globalshortcutsbackend-mate.cpp
+    HEADERS globalshortcuts/globalshortcutsbackend-kde.h globalshortcuts/globalshortcutsbackend-gnome.h globalshortcuts/globalshortcutsbackend-mate.h
+  )
+  optional_source(HAVE_X11_GLOBALSHORTCUTS
+    SOURCES globalshortcuts/globalshortcutsbackend-x11.cpp globalshortcuts/globalshortcut.cpp globalshortcuts/globalshortcut-x11.cpp
+    HEADERS globalshortcuts/globalshortcutsbackend-x11.h globalshortcuts/globalshortcut.h
   )
   optional_source(WIN32
-    SOURCES globalshortcuts/globalshortcut-win.cpp
+    SOURCES globalshortcuts/globalshortcutsbackend-win.cpp globalshortcuts/globalshortcut.cpp globalshortcuts/globalshortcut-win.cpp
+    HEADERS globalshortcuts/globalshortcutsbackend-win.h globalshortcuts/globalshortcut.h
   )
 endif(HAVE_GLOBALSHORTCUTS)
 
 # ALSA
-optional_source(HAVE_ALSA
-  SOURCES
-    engine/alsadevicefinder.cpp
-)
+optional_source(HAVE_ALSA SOURCES engine/alsadevicefinder.cpp engine/alsapcmdevicefinder.cpp)
 
 # DBUS
-optional_source(HAVE_DBUS
- SOURCES
-   osd/osddbus.cpp
- HEADERS
-   osd/osddbus.h
-)
+optional_source(HAVE_DBUS SOURCES osd/osddbus.cpp HEADERS osd/osddbus.h)
 
 # GStreamer
 optional_source(HAVE_GSTREAMER
-  SOURCES engine/gststartup.cpp engine/gstengine.cpp engine/gstenginepipeline.cpp engine/gstelementdeleter.cpp
-  HEADERS engine/gststartup.h engine/gstengine.h engine/gstenginepipeline.h engine/gstelementdeleter.h
+  SOURCES engine/gststartup.cpp engine/gstengine.cpp engine/gstenginepipeline.cpp
+  HEADERS engine/gststartup.h engine/gstengine.h engine/gstenginepipeline.h
 )
 
 # VLC
-optional_source(HAVE_VLC
-  SOURCES engine/vlcengine.cpp
-  HEADERS engine/vlcengine.h
-)
+optional_source(HAVE_VLC SOURCES engine/vlcengine.cpp HEADERS engine/vlcengine.h)
 
 # DBUS and MPRIS - Unix specific
 if(UNIX AND HAVE_DBUS)
   file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/dbus)
 
-  optional_source(HAVE_DBUS
-    SOURCES core/mpris.cpp core/mpris2.cpp
-    HEADERS core/mpris.h core/mpris2.h
-  )
-  optional_source(HAVE_UDISKS2
-    SOURCES device/udisks2lister.cpp
-    HEADERS device/udisks2lister.h
-  )
+  optional_source(HAVE_DBUS SOURCES core/mpris2.cpp HEADERS core/mpris2.h)
+  optional_source(HAVE_UDISKS2 SOURCES device/udisks2lister.cpp HEADERS device/udisks2lister.h)
 
-  if (BUILD_WITH_QT6)
+  # MPRIS 2.0 DBUS interfaces
+  qt_add_dbus_adaptor(SOURCES dbus/org.mpris.MediaPlayer2.Player.xml core/mpris2.h mpris::Mpris2 core/mpris2_player Mpris2Player)
+  qt_add_dbus_adaptor(SOURCES dbus/org.mpris.MediaPlayer2.xml core/mpris2.h mpris::Mpris2 core/mpris2_root Mpris2Root)
+  qt_add_dbus_adaptor(SOURCES dbus/org.mpris.MediaPlayer2.TrackList.xml core/mpris2.h mpris::Mpris2 core/mpris2_tracklist Mpris2TrackList)
 
-    # MPRIS 2.0 DBUS interfaces
-    qt6_add_dbus_adaptor(SOURCES
-        dbus/org.mpris.MediaPlayer2.Player.xml
-        core/mpris2.h mpris::Mpris2 core/mpris2_player Mpris2Player)
-    qt6_add_dbus_adaptor(SOURCES
-        dbus/org.mpris.MediaPlayer2.xml
-        core/mpris2.h mpris::Mpris2 core/mpris2_root Mpris2Root)
-    qt6_add_dbus_adaptor(SOURCES
-        dbus/org.mpris.MediaPlayer2.TrackList.xml
-        core/mpris2.h mpris::Mpris2 core/mpris2_tracklist Mpris2TrackList)
+  # MPRIS 2.1 DBUS interfaces
+  qt_add_dbus_adaptor(SOURCES dbus/org.mpris.MediaPlayer2.Playlists.xml core/mpris2.h mpris::Mpris2 core/mpris2_playlists Mpris2Playlists)
 
-    # MPRIS 2.1 DBUS interfaces
-    qt6_add_dbus_adaptor(SOURCES
-        dbus/org.mpris.MediaPlayer2.Playlists.xml
-        core/mpris2.h mpris::Mpris2 core/mpris2_playlists Mpris2Playlists)
+  # org.freedesktop.Notifications DBUS interface
+  qt_add_dbus_interface(SOURCES dbus/org.freedesktop.Notifications.xml dbus/notification)
 
-    # org.freedesktop.Notifications DBUS interface
-    qt6_add_dbus_interface(SOURCES
-        dbus/org.freedesktop.Notifications.xml
-        dbus/notification)
+  # org.gnome.SettingsDaemon interface
+  qt_add_dbus_interface(SOURCES dbus/org.gnome.SettingsDaemon.MediaKeys.xml dbus/gnomesettingsdaemon)
 
-    # org.gnome.SettingsDaemon interface
-    qt6_add_dbus_interface(SOURCES
-        dbus/org.gnome.SettingsDaemon.MediaKeys.xml
-        dbus/gnomesettingsdaemon)
+  # org.mate.SettingsDaemon interface
+  qt_add_dbus_interface(SOURCES dbus/org.mate.SettingsDaemon.MediaKeys.xml dbus/matesettingsdaemon)
 
-    # org.kde.KGlobalAccel interface
-    qt6_add_dbus_interface(SOURCES
-        dbus/org.kde.KGlobalAccel.xml
-        dbus/kglobalaccel)
-    qt6_add_dbus_interface(SOURCES
-        dbus/org.kde.KGlobalAccel.Component.xml
-        dbus/kglobalaccelcomponent)
-
-  else()
-
-    # MPRIS 2.0 DBUS interfaces
-    qt5_add_dbus_adaptor(SOURCES
-        dbus/org.mpris.MediaPlayer2.Player.xml
-        core/mpris2.h mpris::Mpris2 core/mpris2_player Mpris2Player)
-    qt5_add_dbus_adaptor(SOURCES
-        dbus/org.mpris.MediaPlayer2.xml
-        core/mpris2.h mpris::Mpris2 core/mpris2_root Mpris2Root)
-    qt5_add_dbus_adaptor(SOURCES
-        dbus/org.mpris.MediaPlayer2.TrackList.xml
-        core/mpris2.h mpris::Mpris2 core/mpris2_tracklist Mpris2TrackList)
-
-    # MPRIS 2.1 DBUS interfaces
-    qt5_add_dbus_adaptor(SOURCES
-        dbus/org.mpris.MediaPlayer2.Playlists.xml
-        core/mpris2.h mpris::Mpris2 core/mpris2_playlists Mpris2Playlists)
-
-    # org.freedesktop.Notifications DBUS interface
-    qt5_add_dbus_interface(SOURCES
-        dbus/org.freedesktop.Notifications.xml
-        dbus/notification)
-
-    # org.gnome.SettingsDaemon interface
-    qt5_add_dbus_interface(SOURCES
-        dbus/org.gnome.SettingsDaemon.MediaKeys.xml
-        dbus/gnomesettingsdaemon)
-
-    # org.kde.KGlobalAccel interface
-    qt5_add_dbus_interface(SOURCES
-        dbus/org.kde.KGlobalAccel.xml
-        dbus/kglobalaccel)
-    qt5_add_dbus_interface(SOURCES
-        dbus/org.kde.KGlobalAccel.Component.xml
-        dbus/kglobalaccelcomponent)
-
-  endif()
+  # org.kde.KGlobalAccel interface
+  qt_add_dbus_interface(SOURCES dbus/org.kde.KGlobalAccel.xml dbus/kglobalaccel)
+  qt_add_dbus_interface(SOURCES dbus/org.kde.KGlobalAccel.Component.xml dbus/kglobalaccelcomponent)
 
   # org.freedesktop.Avahi.Server interface
   add_custom_command(
@@ -712,50 +664,17 @@ if(UNIX AND HAVE_DBUS)
   list(APPEND SOURCES ${CMAKE_CURRENT_BINARY_DIR}/dbus/avahientrygroup.cpp)
 
   if(HAVE_UDISKS2)
-       set_source_files_properties(dbus/org.freedesktop.DBus.ObjectManager.xml
-           PROPERTIES NO_NAMESPACE dbus/objectmanager INCLUDE dbus/metatypes.h)
-       set_source_files_properties(dbus/org.freedesktop.UDisks2.Filesystem.xml
-           PROPERTIES NO_NAMESPACE dbus/udisks2filesystem INCLUDE dbus/metatypes.h)
-       set_source_files_properties(dbus/org.freedesktop.UDisks2.Block.xml
-           PROPERTIES NO_NAMESPACE dbus/udisks2block INCLUDE dbus/metatypes.h)
-       set_source_files_properties(dbus/org.freedesktop.UDisks2.Drive.xml
-           PROPERTIES NO_NAMESPACE dbus/udisks2drive INCLUDE dbus/metatypes.h)
-       set_source_files_properties(dbus/org.freedesktop.UDisks2.Job.xml
-           PROPERTIES NO_NAMESPACE dbus/udisks2job INCLUDE dbus/metatypes.h)
-       if(BUILD_WITH_QT6)
-         qt6_add_dbus_interface(SOURCES
-             dbus/org.freedesktop.DBus.ObjectManager.xml
-             dbus/objectmanager)
-         qt6_add_dbus_interface(SOURCES
-             dbus/org.freedesktop.UDisks2.Filesystem.xml
-             dbus/udisks2filesystem)
-         qt6_add_dbus_interface(SOURCES
-             dbus/org.freedesktop.UDisks2.Block.xml
-             dbus/udisks2block)
-         qt6_add_dbus_interface(SOURCES
-             dbus/org.freedesktop.UDisks2.Drive.xml
-             dbus/udisks2drive)
-         qt6_add_dbus_interface(SOURCES
-             dbus/org.freedesktop.UDisks2.Job.xml
-             dbus/udisks2job)
-       else()
-         qt5_add_dbus_interface(SOURCES
-             dbus/org.freedesktop.DBus.ObjectManager.xml
-             dbus/objectmanager)
-         qt5_add_dbus_interface(SOURCES
-             dbus/org.freedesktop.UDisks2.Filesystem.xml
-             dbus/udisks2filesystem)
-         qt5_add_dbus_interface(SOURCES
-             dbus/org.freedesktop.UDisks2.Block.xml
-             dbus/udisks2block)
-         qt5_add_dbus_interface(SOURCES
-             dbus/org.freedesktop.UDisks2.Drive.xml
-             dbus/udisks2drive)
-         qt5_add_dbus_interface(SOURCES
-             dbus/org.freedesktop.UDisks2.Job.xml
-             dbus/udisks2job)
-         endif()
-   endif(HAVE_UDISKS2)
+    set_source_files_properties(dbus/org.freedesktop.DBus.ObjectManager.xml PROPERTIES NO_NAMESPACE dbus/objectmanager INCLUDE dbus/metatypes.h)
+    set_source_files_properties(dbus/org.freedesktop.UDisks2.Filesystem.xml PROPERTIES NO_NAMESPACE dbus/udisks2filesystem INCLUDE dbus/metatypes.h)
+    set_source_files_properties(dbus/org.freedesktop.UDisks2.Block.xml PROPERTIES NO_NAMESPACE dbus/udisks2block INCLUDE dbus/metatypes.h)
+    set_source_files_properties(dbus/org.freedesktop.UDisks2.Drive.xml PROPERTIES NO_NAMESPACE dbus/udisks2drive INCLUDE dbus/metatypes.h)
+    set_source_files_properties(dbus/org.freedesktop.UDisks2.Job.xml PROPERTIES NO_NAMESPACE dbus/udisks2job INCLUDE dbus/metatypes.h)
+    qt_add_dbus_interface(SOURCES dbus/org.freedesktop.DBus.ObjectManager.xml dbus/objectmanager)
+    qt_add_dbus_interface(SOURCES dbus/org.freedesktop.UDisks2.Filesystem.xml dbus/udisks2filesystem)
+    qt_add_dbus_interface(SOURCES dbus/org.freedesktop.UDisks2.Block.xml dbus/udisks2block)
+    qt_add_dbus_interface(SOURCES dbus/org.freedesktop.UDisks2.Drive.xml dbus/udisks2drive)
+    qt_add_dbus_interface(SOURCES dbus/org.freedesktop.UDisks2.Job.xml dbus/udisks2job)
+  endif(HAVE_UDISKS2)
 
 endif(UNIX AND HAVE_DBUS)
 
@@ -797,29 +716,24 @@ optional_source(HAVE_LIBGPOD
 )
 
 # GIO device backend
-optional_source(HAVE_GIO
-  SOURCES device/giolister.cpp
-  HEADERS device/giolister.h
-)
+optional_source(HAVE_GIO SOURCES device/giolister.cpp HEADERS device/giolister.h)
 
-# mtp device
+# MTP device
 optional_source(HAVE_LIBMTP
   SOURCES
     device/mtpconnection.cpp
     device/mtpdevice.cpp
     device/mtploader.cpp
   HEADERS
+    device/mtpconnection.h
     device/mtpdevice.h
     device/mtploader.h
 )
 
 # Pulse audio integration
-optional_source(HAVE_LIBPULSE
-  SOURCES
-    engine/pulsedevicefinder.cpp
-)
+optional_source(HAVE_LIBPULSE SOURCES engine/pulsedevicefinder.cpp)
 
-# MusicBrainz and transcoder require GStreamer
+# Transcoder require GStreamer
 optional_source(HAVE_GSTREAMER
 SOURCES
   transcoder/transcoder.cpp
@@ -838,6 +752,14 @@ HEADERS
   transcoder/transcoder.h
   transcoder/transcodedialog.h
   transcoder/transcoderoptionsdialog.h
+  transcoder/transcoderoptionsinterface.h
+  transcoder/transcoderoptionsflac.h
+  transcoder/transcoderoptionswavpack.h
+  transcoder/transcoderoptionsvorbis.h
+  transcoder/transcoderoptionsopus.h
+  transcoder/transcoderoptionsspeex.h
+  transcoder/transcoderoptionsaac.h
+  transcoder/transcoderoptionsasf.h
   transcoder/transcoderoptionsmp3.h
   settings/transcodersettingspage.h
 UI
@@ -855,30 +777,39 @@ UI
   settings/transcodersettingspage.ui
 )
 
-# CDIO backend and device
-if(HAVE_GSTREAMER)
-  optional_source(HAVE_CHROMAPRINT
-    SOURCES
-      musicbrainz/chromaprinter.cpp
-      musicbrainz/tagfetcher.cpp
-    HEADERS
-      musicbrainz/tagfetcher.h
-  )
-  optional_source(HAVE_AUDIOCD
-    SOURCES
-      device/cddadevice.cpp
-      device/cddalister.cpp
-      device/cddasongloader.cpp
-    HEADERS
-      device/cddadevice.h
-      device/cddalister.h
-      device/cddasongloader.h
-  )
+# CHROMAPRINT
+if(HAVE_SONGFINGERPRINTING OR HAVE_MUSICBRAINZ)
+  optional_source(CHROMAPRINT_FOUND SOURCES engine/chromaprinter.cpp)
 endif()
 
+# MusicBrainz
+optional_source(HAVE_MUSICBRAINZ
+  SOURCES
+    musicbrainz/acoustidclient.cpp
+    musicbrainz/musicbrainzclient.cpp
+    musicbrainz/tagfetcher.cpp
+  HEADERS
+    musicbrainz/acoustidclient.h
+    musicbrainz/musicbrainzclient.h
+    musicbrainz/tagfetcher.h
+)
+
+# CDIO backend and device
+optional_source(HAVE_AUDIOCD
+  SOURCES
+    device/cddadevice.cpp
+    device/cddalister.cpp
+    device/cddasongloader.cpp
+  HEADERS
+    device/cddadevice.h
+    device/cddalister.h
+    device/cddasongloader.h
+)
+
 # Platform specific - macOS
 optional_source(APPLE
   SOURCES
+    core/scoped_nsautorelease_pool.mm
     core/mac_utilities.mm
     core/mac_startup.mm
     core/macsystemtrayicon.mm
@@ -888,22 +819,15 @@ optional_source(APPLE
     engine/macosdevicefinder.cpp
     globalshortcuts/globalshortcutsbackend-macos.mm
     globalshortcuts/globalshortcutgrabber.mm
+    device/macosdevicelister.mm
   HEADERS
     core/macsystemtrayicon.h
     core/macfslistener.h
     osd/osdmac.h
     globalshortcuts/globalshortcutsbackend-macos.h
+    device/macosdevicelister.h
 )
 
-if (APPLE)
-  optional_source(HAVE_LIBMTP
-   SOURCES
-      device/macosdevicelister.mm
-    HEADERS
-      device/macosdevicelister.h
-  )
-endif()
-
 # Platform specific - Windows
 optional_source(WIN32
   SOURCES
@@ -1004,33 +928,27 @@ optional_source(HAVE_MOODBAR
 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)
 
-if(BUILD_WITH_QT6)
-  qt6_wrap_cpp(MOC ${HEADERS})
-  qt6_wrap_ui(UIC ${UI})
-  qt6_add_resources(QRC ${RESOURCES})
-else()
-  qt5_wrap_cpp(MOC ${HEADERS})
-  qt5_wrap_ui(UIC ${UI})
-  qt5_add_resources(QRC ${RESOURCES})
-endif()
+qt_wrap_cpp(MOC ${HEADERS})
+qt_wrap_ui(UIC ${UI})
+qt_add_resources(QRC ${RESOURCES})
 
 if(HAVE_TRANSLATIONS)
 
   set(LINGUAS "All" CACHE STRING "A space-seperated list of translations to compile in to Strawberry, or \"None\".")
-  if (LINGUAS STREQUAL "All")
+  if(LINGUAS STREQUAL "All")
     # build LANGUAGES from all existing .po files
     file(GLOB pofiles translations/*.po)
     foreach(pofile ${pofiles})
       get_filename_component(lang ${pofile} NAME_WE)
       list(APPEND LANGUAGES ${lang})
     endforeach(pofile)
-  else (LINGUAS STREQUAL "All")
-    if (NOT LINGUAS OR LINGUAS STREQUAL "None")
-      set (LANGUAGES "")
-    else (NOT LINGUAS OR LINGUAS STREQUAL "None")
+  else(LINGUAS STREQUAL "All")
+    if(NOT LINGUAS OR LINGUAS STREQUAL "None")
+      set(LANGUAGES "")
+    else(NOT LINGUAS OR LINGUAS STREQUAL "None")
       string(REGEX MATCHALL [a-zA-Z_@]+ LANGUAGES ${LINGUAS})
-    endif (NOT LINGUAS OR LINGUAS STREQUAL "None")
-  endif (LINGUAS STREQUAL "All")
+    endif(NOT LINGUAS OR LINGUAS STREQUAL "None")
+  endif(LINGUAS STREQUAL "All")
 
   add_pot(POT
     ${CMAKE_CURRENT_SOURCE_DIR}/translations/header
@@ -1051,7 +969,6 @@ link_directories(
   ${GOBJECT_LIBRARY_DIRS}
   ${GNUTLS_LIBRARY_DIRS}
   ${SQLITE_LIBRARY_DIRS}
-  ${TAGLIB_LIBRARY_DIRS}
   ${SINGLEAPPLICATION_LIBRARY_DIRS}
   ${SINGLECOREAPPLICATION_LIBRARY_DIRS}
   ${QTSPARKLE_LIBRARY_DIRS}
@@ -1060,7 +977,7 @@ link_directories(
 
 if(HAVE_ALSA)
   link_directories(${ALSA_LIBRARY_DIRS})
-endif(HAVE_ALSA)
+endif()
 
 if(HAVE_LIBPULSE)
   link_directories(${LIBPULSE_LIBRARY_DIRS})
@@ -1075,40 +992,47 @@ if(HAVE_GSTREAMER)
     ${GSTREAMER_TAG_LIBRARY_DIRS}
     ${GSTREAMER_PBUTILS_LIBRARY_DIRS}
   )
-endif(HAVE_GSTREAMER)
+endif()
 
 if(HAVE_VLC)
   link_directories(${LIBVLC_LIBRARY_DIRS})
 endif()
 
-if(HAVE_CHROMAPRINT)
+if(HAVE_SONGFINGERPRINTING OR HAVE_MUSICBRAINZ)
   link_directories(${CHROMAPRINT_LIBRARY_DIRS})
-endif(HAVE_CHROMAPRINT)
+endif()
 
 if(X11_FOUND)
   link_directories(${X11_LIBRARY_DIRS})
-endif(X11_FOUND)
+endif()
 
 if(XCB_FOUND)
   link_directories(${XCB_LIBRARY_DIRS})
-endif(XCB_FOUND)
+endif()
 
 if(HAVE_GIO)
   link_directories(${GIO_LIBRARY_DIRS})
-endif(HAVE_GIO)
+endif()
 
 if(HAVE_AUDIOCD)
   link_directories(${LIBCDIO_LIBRARY_DIRS})
-endif(HAVE_AUDIOCD)
+endif()
 
 if(HAVE_LIBGPOD)
-  link_directories(${LIBGPOD_LIBRARY_DIRS})
-  link_directories(${GDK_PIXBUF_LIBRARY_DIRS})
-endif(HAVE_LIBGPOD)
+  link_directories(${LIBGPOD_LIBRARY_DIRS} ${GDK_PIXBUF_LIBRARY_DIRS})
+endif()
 
 if(HAVE_LIBMTP)
   link_directories(${LIBMTP_LIBRARY_DIRS})
-endif(HAVE_LIBMTP)
+endif()
+
+if(USE_TAGLIB AND TAGLIB_FOUND)
+  link_directories(${TAGLIB_LIBRARY_DIRS})
+endif()
+
+if(USE_TAGPARSER AND TAGPARSER_FOUND)
+  link_directories(${TAGPARSER_LIBRARY_DIRS})
+endif()
 
 add_library(strawberry_lib STATIC
   ${SOURCES}
@@ -1128,6 +1052,10 @@ target_include_directories(strawberry_lib SYSTEM PUBLIC
   ${SQLITE_INCLUDE_DIRS}
 )
 
+if(HAVE_QPA_QPLATFORMNATIVEINTERFACE_H)
+  target_include_directories(strawberry_lib SYSTEM PUBLIC ${Qt${QT_VERSION_MAJOR}Gui_PRIVATE_INCLUDE_DIRS})
+endif()
+
 target_include_directories(strawberry_lib PUBLIC
   ${CMAKE_SOURCE_DIR}
   ${CMAKE_BINARY_DIR}
@@ -1138,7 +1066,6 @@ target_include_directories(strawberry_lib PUBLIC
   ${CMAKE_BINARY_DIR}/ext/libstrawberry-tagreader
   ${SINGLEAPPLICATION_INCLUDE_DIRS}
   ${SINGLECOREAPPLICATION_INCLUDE_DIRS}
-  ${TAGLIB_INCLUDE_DIRS}
 )
 
 target_link_libraries(strawberry_lib PUBLIC
@@ -1147,12 +1074,11 @@ target_link_libraries(strawberry_lib PUBLIC
   ${GOBJECT_LIBRARIES}
   ${GNUTLS_LIBRARIES}
   ${SQLITE_LIBRARIES}
-  ${TAGLIB_LIBRARIES}
   ${QT_LIBRARIES}
   ${SINGLEAPPLICATION_LIBRARIES}
   ${SINGLECOREAPPLICATION_LIBRARIES}
   ${QTSPARKLE_LIBRARIES}
-  ${Iconv_LIBRARY}
+  ${Iconv_LIBRARIES}
   libstrawberry-common
   libstrawberry-tagreader
 )
@@ -1160,7 +1086,7 @@ target_link_libraries(strawberry_lib PUBLIC
 if(HAVE_ALSA)
   target_include_directories(strawberry_lib SYSTEM PRIVATE ${ALSA_INCLUDE_DIRS})
   target_link_libraries(strawberry_lib PRIVATE ${ALSA_LIBRARIES})
-endif(HAVE_ALSA)
+endif()
 
 if(HAVE_LIBPULSE)
   target_include_directories(strawberry_lib SYSTEM PRIVATE ${LIBPULSE_INCLUDE_DIRS})
@@ -1184,7 +1110,7 @@ if(HAVE_GSTREAMER)
     ${GSTREAMER_TAG_LIBRARIES}
     ${GSTREAMER_PBUTILS_LIBRARIES}
   )
-endif(HAVE_GSTREAMER)
+endif()
 
 if(HAVE_MOODBAR)
   target_link_libraries(strawberry_lib PRIVATE gstmoodbar)
@@ -1195,41 +1121,44 @@ if(HAVE_VLC)
   target_link_libraries(strawberry_lib PRIVATE ${LIBVLC_LIBRARIES})
 endif()
 
-if(HAVE_CHROMAPRINT)
+if(HAVE_SONGFINGERPRINTING OR HAVE_MUSICBRAINZ)
   target_include_directories(strawberry_lib SYSTEM PRIVATE ${CHROMAPRINT_INCLUDE_DIRS})
   target_link_libraries(strawberry_lib PRIVATE ${CHROMAPRINT_LIBRARIES})
-endif(HAVE_CHROMAPRINT)
+endif()
 
 if(X11_FOUND)
   target_include_directories(strawberry_lib SYSTEM PRIVATE ${X11_INCLUDE_DIR})
   target_link_libraries(strawberry_lib PRIVATE ${X11_LIBRARIES})
-endif(X11_FOUND)
+endif()
 
 if(XCB_FOUND)
   target_include_directories(strawberry_lib SYSTEM PRIVATE ${XCB_INCLUDE_DIR})
   target_link_libraries(strawberry_lib PRIVATE ${XCB_LIBRARIES})
-endif(XCB_FOUND)
+endif()
 
 if(HAVE_GIO)
   target_include_directories(strawberry_lib SYSTEM PRIVATE ${GIO_INCLUDE_DIRS})
   target_link_libraries(strawberry_lib PRIVATE ${GIO_LIBRARIES})
-endif(HAVE_GIO)
+endif()
 
 if(HAVE_AUDIOCD)
   target_include_directories(strawberry_lib SYSTEM PRIVATE ${LIBCDIO_INCLUDE_DIRS})
   target_link_libraries(strawberry_lib PRIVATE ${LIBCDIO_LIBRARIES})
-endif(HAVE_AUDIOCD)
+endif()
 
 if(HAVE_LIBGPOD)
   target_include_directories(strawberry_lib SYSTEM PRIVATE ${LIBGPOD_INCLUDE_DIRS} ${GDK_PIXBUF_INCLUDE_DIRS})
   target_link_libraries(strawberry_lib PRIVATE ${LIBGPOD_LIBRARIES} ${GDK_PIXBUF_LIBRARIES})
-endif(HAVE_LIBGPOD)
+endif()
 
 if(HAVE_LIBMTP)
   target_include_directories(strawberry_lib SYSTEM PRIVATE ${LIBMTP_INCLUDE_DIRS})
   target_link_libraries(strawberry_lib PRIVATE ${LIBMTP_LIBRARIES})
-endif(HAVE_LIBMTP)
+endif()
 
+if(FREEBSD)
+  target_link_libraries(strawberry_lib PRIVATE iconv)
+endif()
 
 if(APPLE)
   target_link_libraries(strawberry_lib PRIVATE
@@ -1245,24 +1174,17 @@ if(APPLE)
   if(HAVE_SPARKLE)
     target_include_directories(strawberry_lib SYSTEM PRIVATE ${SPARKLE}/Headers)
     target_link_libraries(strawberry_lib PRIVATE ${SPARKLE})
-  endif(HAVE_SPARKLE)
-endif(APPLE)
-
-if(WIN32)
-  target_link_libraries(strawberry_lib PRIVATE dsound)
-endif(WIN32)
-
-if(X11_FOUND)
-  # Hack: the Gold linker pays attention to the order that libraries are specified on the link line.
-  # -lX11 and -ldl are provided earlier in the link command but they're actually used by libraries that appear after them, so they end up getting ignored.
-  # This appends them to the very end of the link line, ensuring they're always used.
-  if(FREEBSD)
-    target_link_libraries(strawberry_lib PRIVATE ${X11_X11_LIB})
-  else()
-    target_link_libraries(strawberry_lib PRIVATE ${X11_X11_LIB} ${CMAKE_DL_LIBS})
   endif()
 endif()
 
+if(WIN32)
+  target_link_libraries(strawberry_lib PRIVATE dsound dwmapi)
+  if(MSVC)
+    target_link_libraries(strawberry_lib PRIVATE sqlite3)
+  endif()
+endif()
+
+
 ###############################################################################
 
 set(EXECUTABLE_OUTPUT_PATH ..)
@@ -1270,13 +1192,13 @@ set(EXECUTABLE_OUTPUT_PATH ..)
 # Show the console window in debug mode on Windows
 if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug" AND NOT ENABLE_WIN32_CONSOLE)
   set(STRAWBERRY-WIN32-FLAG WIN32)
-endif(NOT CMAKE_BUILD_TYPE STREQUAL "Debug" AND NOT ENABLE_WIN32_CONSOLE)
+endif()
 
 # Resource file for windows
 if(WIN32)
   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../dist/windows/windres.rc.in ${CMAKE_CURRENT_BINARY_DIR}/windres.rc)
   set(STRAWBERRY-WIN32-RESOURCES windres.rc)
-endif(WIN32)
+endif()
 
 add_executable(strawberry
   MACOSX_BUNDLE
@@ -1304,4 +1226,4 @@ endif()
 
 if(APPLE)
   set_target_properties(strawberry PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/../dist/macos/Info.plist")
-endif (APPLE)
+endif()

src/analyzer/analyzerbase.cpp

@@ -56,7 +56,7 @@
 template class Analyzer::Base<QWidget>;
 #endif
 
-Analyzer::Base::Base(QWidget *parent, uint scopeSize)
+Analyzer::Base::Base(QWidget *parent, const uint scopeSize)
     : QWidget(parent),
       timeout_(40),
       fht_(new FHT(scopeSize)),
@@ -69,10 +69,10 @@ void Analyzer::Base::hideEvent(QHideEvent*) { timer_.stop(); }
 
 void Analyzer::Base::showEvent(QShowEvent*) { timer_.start(timeout(), this); }
 
-void Analyzer::Base::transform(Scope& scope) {
+void Analyzer::Base::transform(Scope &scope) {
 
   QVector<float> aux(fht_->size());
-  if (static_cast<long unsigned int>(aux.size()) >= scope.size()) {
+  if (static_cast<unsigned long int>(aux.size()) >= scope.size()) {
     std::copy(scope.begin(), scope.end(), aux.begin());
   }
   else {
@@ -93,12 +93,12 @@ void Analyzer::Base::paintEvent(QPaintEvent *e) {
 
   switch (engine_->state()) {
     case Engine::Playing: {
-      const Engine::Scope& thescope = engine_->scope(timeout_);
+      const Engine::Scope &thescope = engine_->scope(timeout_);
       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) {
-        lastscope_[x] = double(thescope[i] + thescope[i + 1]) / (2 * (1 << 15));
+        lastscope_[x] = static_cast<float>(thescope[i] + thescope[i + 1]) / (2 * (1U << 15U));
         i += 2;
       }
 
@@ -126,10 +126,12 @@ void Analyzer::Base::paintEvent(QPaintEvent *e) {
 
 int Analyzer::Base::resizeExponent(int exp) {
 
-  if (exp < 3)
+  if (exp < 3) {
     exp = 3;
-  else if (exp > 9)
+  }
+  else if (exp > 9) {
     exp = 9;
+  }
 
   if (exp != fht_->sizeExp()) {
     delete fht_;
@@ -139,43 +141,53 @@ int Analyzer::Base::resizeExponent(int exp) {
 
 }
 
-int Analyzer::Base::resizeForBands(int bands) {
+int Analyzer::Base::resizeForBands(const int bands) {
 
-  int exp;
-  if (bands <= 8)
+  int exp = 0;
+  if (bands <= 8) {
     exp = 4;
-  else if (bands <= 16)
+  }
+  else if (bands <= 16) {
     exp = 5;
-  else if (bands <= 32)
+  }
+  else if (bands <= 32) {
     exp = 6;
-  else if (bands <= 64)
+  }
+  else if (bands <= 64) {
     exp = 7;
-  else if (bands <= 128)
+  }
+  else if (bands <= 128) {
     exp = 8;
-  else
+  }
+  else {
     exp = 9;
+}
 
   resizeExponent(exp);
   return fht_->size() / 2;
 
 }
 
-void Analyzer::Base::demo(QPainter& p) {
+void Analyzer::Base::demo(QPainter &p) {
 
   static int t = 201;  // FIXME make static to namespace perhaps
 
-  if (t > 999) t = 1;  // 0 = wasted calculations
+  if (t > 999) {
+    t = 1;  // 0 = wasted calculations
+  }
   if (t < 201) {
     Scope s(32);
 
-    const double dt = double(t) / 200;
-    for (uint i = 0; i < s.size(); ++i)
+    const double dt = static_cast<double>(t) / 200;
+    for (uint i = 0; i < s.size(); ++i) {
       s[i] = dt * (sin(M_PI + (i * M_PI) / s.size()) + 1.0);
+    }
 
     analyze(p, s, new_frame_);
   }
-  else
+  else {
     analyze(p, Scope(32, 0), new_frame_);
+  }
 
   ++t;
 
@@ -185,7 +197,7 @@ void Analyzer::Base::polishEvent() {
   init();
 }
 
-void Analyzer::interpolate(const Scope& inVec, Scope& outVec) {
+void Analyzer::interpolate(const Scope &inVec, Scope &outVec) {
 
   double pos = 0.0;
   const double step = static_cast<double>(inVec.size()) / outVec.size();
@@ -196,18 +208,22 @@ void Analyzer::interpolate(const Scope& inVec, Scope& outVec) {
 
     uint64_t indexLeft = offset + 0;
 
-    if (indexLeft >= inVec.size()) indexLeft = inVec.size() - 1;
+    if (indexLeft >= inVec.size()) {
+      indexLeft = inVec.size() - 1;
+    }
 
     uint64_t indexRight = offset + 1;
 
-    if (indexRight >= inVec.size()) indexRight = inVec.size() - 1;
+    if (indexRight >= inVec.size()) {
+      indexRight = inVec.size() - 1;
+    }
 
     outVec[i] = inVec[indexLeft] * (1.0 - error) + inVec[indexRight] * error;
   }
 
 }
 
-void Analyzer::initSin(Scope& v, const uint size) {
+void Analyzer::initSin(Scope &v, const uint size) {
 
   double step = (M_PI * 2) / size;
   double radian = 0;
@@ -222,7 +238,9 @@ void Analyzer::initSin(Scope& v, const uint size) {
 void Analyzer::Base::timerEvent(QTimerEvent *e) {
 
   QWidget::timerEvent(e);
-  if (e->timerId() != timer_.timerId()) return;
+  if (e->timerId() != timer_.timerId()) {
+    return;
+  }
 
   new_frame_ = true;
   update();

src/analyzer/analyzerbase.h

@@ -57,11 +57,11 @@ class Base : public QWidget {
  public:
   ~Base() override { delete fht_; }
 
-  uint timeout() const { return timeout_; }
+  int timeout() const { return timeout_; }
 
   void set_engine(EngineBase *engine) { engine_ = engine; }
 
-  void changeTimeout(uint newTimeout) {
+  void changeTimeout(int newTimeout) {
     timeout_ = newTimeout;
     if (timer_.isActive()) {
       timer_.stop();
@@ -72,7 +72,7 @@ class Base : public QWidget {
   virtual void framerateChanged() {}
 
  protected:
-  explicit Base(QWidget*, uint scopeSize = 7);
+  explicit Base(QWidget*, const uint scopeSize = 7);
 
   void hideEvent(QHideEvent*) override;
   void showEvent(QShowEvent*) override;
@@ -82,15 +82,15 @@ class Base : public QWidget {
   void polishEvent();
 
   int resizeExponent(int);
-  int resizeForBands(int);
+  int resizeForBands(const int);
   virtual void init() {}
   virtual void transform(Scope&);
-  virtual void analyze(QPainter& p, const Scope&, bool new_frame) = 0;
-  virtual void demo(QPainter& p);
+  virtual void analyze(QPainter &p, const Scope&, const bool new_frame) = 0;
+  virtual void demo(QPainter &p);
 
  protected:
   QBasicTimer timer_;
-  uint timeout_;
+  int timeout_;
   FHT *fht_;
   EngineBase *engine_;
   Scope lastscope_;

src/analyzer/analyzercontainer.cpp

@@ -19,6 +19,8 @@
 
 #include "config.h"
 
+#include <chrono>
+
 #include <QObject>
 #include <QWidget>
 #include <QVariant>
@@ -44,6 +46,8 @@
 #include "engine/enginebase.h"
 #include "engine/enginetype.h"
 
+using namespace std::chrono_literals;
+
 const char *AnalyzerContainer::kSettingsGroup = "Analyzer";
 const char *AnalyzerContainer::kSettingsFramerate = "framerate";
 
@@ -90,7 +94,7 @@ AnalyzerContainer::AnalyzerContainer(QWidget *parent)
   context_menu_->addSeparator();
 
   double_click_timer_->setSingleShot(true);
-  double_click_timer_->setInterval(250);
+  double_click_timer_->setInterval(250ms);
   QObject::connect(double_click_timer_, &QTimer::timeout, this, &AnalyzerContainer::ShowPopupMenu);
 
   Load();
@@ -99,7 +103,9 @@ AnalyzerContainer::AnalyzerContainer(QWidget *parent)
 
 void AnalyzerContainer::mouseReleaseEvent(QMouseEvent *e) {
 
-  if (engine_->type() != Engine::EngineType::GStreamer) return;
+  if (engine_->type() != Engine::EngineType::GStreamer) {
+    return;
+  }
 
   if (e->button() == Qt::RightButton) {
 #if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
@@ -120,8 +126,10 @@ void AnalyzerContainer::wheelEvent(QWheelEvent *e) {
 }
 
 void AnalyzerContainer::SetEngine(EngineBase *engine) {
+
   if (current_analyzer_) current_analyzer_->set_engine(engine);
   engine_ = engine;
+
 }
 
 void AnalyzerContainer::DisableAnalyzer() {
@@ -191,10 +199,11 @@ void AnalyzerContainer::Load() {
   }
 
   // Framerate
+  QList<QAction*> actions = group_framerate_->actions();
   for (int i = 0; i < framerate_list_.count(); ++i) {
     if (current_framerate_ == framerate_list_[i]) {
       ChangeFramerate(current_framerate_);
-      group_framerate_->actions()[i]->setChecked(true);
+      actions[i]->setChecked(true);
       break;
     }
   }
@@ -221,12 +230,12 @@ void AnalyzerContainer::Save() {
 
 }
 
-void AnalyzerContainer::AddFramerate(const QString& name, const int framerate) {
+void AnalyzerContainer::AddFramerate(const QString &name, const int framerate) {
 
   QAction *action = context_menu_framerate_->addAction(name);
   group_framerate_->addAction(action);
   framerate_list_ << framerate;
   action->setCheckable(true);
-  QObject::connect(action, &QAction::triggered, [this, framerate]() { ChangeFramerate(framerate); } );
+  QObject::connect(action, &QAction::triggered, this, [this, framerate]() { ChangeFramerate(framerate); } );
 
 }

src/analyzer/analyzercontainer.h

@@ -76,7 +76,7 @@ class AnalyzerContainer : public QWidget {
   void SaveFramerate(const int framerate);
   template <typename T>
   void AddAnalyzerType();
-  void AddFramerate(const QString& name, const int framerate);
+  void AddFramerate(const QString &name, const int framerate);
 
  private:
   int current_framerate_;  // fps
@@ -94,7 +94,7 @@ class AnalyzerContainer : public QWidget {
   QPoint last_click_pos_;
   bool ignore_next_click_;
 
-  Analyzer::Base* current_analyzer_;
+  Analyzer::Base *current_analyzer_;
   EngineBase *engine_;
 
 };

src/analyzer/blockanalyzer.cpp

@@ -24,6 +24,7 @@
 #include "blockanalyzer.h"
 
 #include <cstdlib>
+#include <algorithm>
 #include <cmath>
 
 #include <QWidget>
@@ -35,12 +36,12 @@
 #include "analyzerbase.h"
 #include "fht.h"
 
-const uint BlockAnalyzer::kHeight = 2;
-const uint BlockAnalyzer::kWidth = 4;
-const uint BlockAnalyzer::kMinRows = 3;       // arbituary
-const uint BlockAnalyzer::kMinColumns = 32;   // arbituary
-const uint BlockAnalyzer::kMaxColumns = 256;  // must be 2**n
-const uint BlockAnalyzer::kFadeSize = 90;
+const int BlockAnalyzer::kHeight = 2;
+const int BlockAnalyzer::kWidth = 4;
+const int BlockAnalyzer::kMinRows = 3;       // arbitrary
+const int BlockAnalyzer::kMinColumns = 32;   // arbitrary
+const int BlockAnalyzer::kMaxColumns = 256;  // must be 2**n
+const int BlockAnalyzer::kFadeSize = 90;
 
 const char *BlockAnalyzer::kName = QT_TRANSLATE_NOOP("AnalyzerContainer", "Block analyzer");
 
@@ -56,14 +57,13 @@ BlockAnalyzer::BlockAnalyzer(QWidget *parent)
       fade_bars_(kFadeSize),
       fade_pos_(1 << 8, 50),
       fade_intensity_(1 << 8, 32),
-      step_(0)
-      {
+      step_(0) {
 
   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
-  for (uint i = 0; i < kFadeSize; ++i) fade_bars_[i] = QPixmap(1, 1);
+  std::fill(fade_bars_.begin(), fade_bars_.end(),  QPixmap(1, 1));
 
 }
 
@@ -74,12 +74,12 @@ void BlockAnalyzer::resizeEvent(QResizeEvent *e) {
   background_ = QPixmap(size());
   canvas_ = QPixmap(size());
 
-  const uint oldRows = rows_;
+  const int oldRows = rows_;
 
   // all is explained in analyze()..
   // +1 to counter -1 in maxSizes, trust me we need this!
-  columns_ = qMin(static_cast<uint>(static_cast<double>(width() + 1) / (kWidth + 1)) + 1, kMaxColumns);
-  rows_ = static_cast<uint>(static_cast<double>(height() + 1) / (kHeight + 1));
+  columns_ = qMin(static_cast<int>(static_cast<double>(width() + 1) / (kWidth + 1)) + 1, kMaxColumns);
+  rows_ = static_cast<int>(static_cast<double>(height() + 1) / (kHeight + 1));
 
   // this is the y-offset for drawing from the top of the widget
   y_ = (height() - (rows_ * (kHeight + 1)) + 2) / 2;
@@ -89,15 +89,15 @@ void BlockAnalyzer::resizeEvent(QResizeEvent *e) {
   if (rows_ != oldRows) {
     barpixmap_ = QPixmap(kWidth, rows_ * (kHeight + 1));
 
-    for (uint i = 0; i < kFadeSize; ++i)
-      fade_bars_[i] = QPixmap(kWidth, rows_ * (kHeight + 1));
+    std::fill(fade_bars_.begin(), fade_bars_.end(),  QPixmap(kWidth, rows_ * (kHeight + 1)));
 
     yscale_.resize(rows_ + 1);
 
-    const uint PRE = 1, PRO = 1;  // PRE and PRO allow us to restrict the range somewhat
+    const int PRE = 1, PRO = 1;  // PRE and PRO allow us to restrict the range somewhat
 
-    for (uint z = 0; z < rows_; ++z)
+    for (int z = 0; z < rows_; ++z) {
       yscale_[z] = 1 - (log10(PRE + z) / log10(PRE + rows_ + PRO));
+    }
 
     yscale_[rows_] = 0;
 
@@ -115,9 +115,9 @@ void BlockAnalyzer::determineStep() {
   // I calculated the value 30 based on some trial and error
 
   // the fall time of 30 is too slow on framerates above 50fps
-  const double fallTime = timeout() < 20 ? 20 * rows_ : 30 * rows_;
+  const double fallTime = static_cast<double>(timeout() < 20 ? 20 * rows_ : 30 * rows_);
 
-  step_ = double(rows_ * timeout()) / fallTime;
+  step_ = static_cast<double>(rows_ * timeout()) / fallTime;
 
 }
 
@@ -164,15 +164,17 @@ void BlockAnalyzer::analyze(QPainter &p, const Analyzer::Scope &s, bool new_fram
   // Paint the background
   canvas_painter.drawPixmap(0, 0, background_);
 
-  for (uint y, x = 0; x < scope_.size(); ++x) {
+  for (int x = 0, y = 0; x < static_cast<int>(scope_.size()); ++x) {
     // determine y
     for (y = 0; scope_[x] < yscale_[y]; ++y) continue;
 
     // This is opposite to what you'd think, higher than y means the bar is lower than y (physically)
-    if (static_cast<float>(y) > store_[x])
+    if (static_cast<double>(y) > store_[x]) {
       y = static_cast<int>(store_[x] += step_);
-    else
+    }
+    else {
       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
@@ -182,8 +184,8 @@ void BlockAnalyzer::analyze(QPainter &p, const Analyzer::Scope &s, bool new_fram
     }
 
     if (fade_intensity_[x] > 0) {
-      const uint offset = --fade_intensity_[x];
-      const uint y2 = y_ + (fade_pos_[x] * (kHeight + 1));
+      const int offset = --fade_intensity_[x];
+      const int y2 = y_ + (fade_pos_[x] * (kHeight + 1));
       canvas_painter.drawPixmap(x * (kWidth + 1), y2, fade_bars_[offset], 0, 0, kWidth, height() - y2);
     }
 
@@ -193,14 +195,15 @@ void BlockAnalyzer::analyze(QPainter &p, const Analyzer::Scope &s, bool new_fram
     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)
+  for (int x = 0; x < store_.size(); ++x) {
     canvas_painter.drawPixmap(x * (kWidth + 1), static_cast<int>(store_[x]) * (kHeight + 1) + y_, topbarpixmap_);
+  }
 
   p.drawPixmap(0, 0, canvas_);
 
 }
 
-static inline void adjustToLimits(int &b, int &f, uint &amount) {
+static inline void adjustToLimits(const int b, int &f, int &amount) {
 
   // with a range of 0-255 and maximum adjustment of amount, maximise the difference between f and b
 
@@ -235,25 +238,27 @@ static inline void adjustToLimits(int &b, int &f, uint &amount) {
  * It won't modify the hue of fg unless absolutely necessary
  * @return the adjusted form of fg
  */
-QColor ensureContrast(const QColor &bg, const QColor &fg, uint amount = 150);
-QColor ensureContrast(const QColor &bg, const QColor &fg, uint amount) {
+QColor ensureContrast(const QColor &bg, const QColor &fg, int amount = 150);
+QColor ensureContrast(const QColor &bg, const QColor &fg, int amount) {
 
   class OutputOnExit {
    public:
     explicit OutputOnExit(const QColor &color) : c(color) {}
     ~OutputOnExit() {
-      int h, s, v;
+      int h = 0, s = 0, v = 0;
       c.getHsv(&h, &s, &v);
     }
 
    private:
     const QColor &c;
+
+    Q_DISABLE_COPY(OutputOnExit)
   };
 
   OutputOnExit allocateOnTheStack(fg);
 
-  int bh, bs, bv;
-  int fh, fs, fv;
+  int bh = 0, bs = 0, bv = 0;
+  int fh = 0, fs = 0, fv = 0;
 
   bg.getHsv(&bh, &bs, &bv);
   fg.getHsv(&fh, &fs, &fv);
@@ -278,28 +283,32 @@ QColor ensureContrast(const QColor &bg, const QColor &fg, uint amount) {
 
     // check the saturation for the two colours is sufficient that hue alone can
     // provide sufficient contrast
-    if (ds > static_cast<int>(amount) / 2 && (bs > 125 && fs > 125))
+    if (ds > amount / 2 && (bs > 125 && fs > 125)) {
       return fg;
-    else if (dv > static_cast<int>(amount) / 2 && (bv > 125 && fv > 125))
+    }
+    else if (dv > amount / 2 && (bv > 125 && fv > 125)) {
       return fg;
+    }
   }
 
   if (fs < 50 && ds < 40) {
     // low saturation on a low saturation is sad
     const int tmp = 50 - fs;
     fs = 50;
-    if (static_cast<int>(amount) > tmp)
+    if (static_cast<int>(amount) > tmp) {
       amount -= tmp;
-    else
+    }
+    else {
       amount = 0;
+    }
   }
 
   // test that there is available value to honor our contrast requirement
-  if (255 - dv < static_cast<int>(amount)) {
+  if (255 - dv < amount) {
     // we have to modify the value and saturation of fg
     // adjustToLimits( bv, fv, amount );
     // see if we need to adjust the saturation
-    if (static_cast<int>(amount) > 0) adjustToLimits(bs, fs, amount);
+    if (amount > 0) adjustToLimits(bs, fs, amount);
 
     // see if we need to adjust the hue
     if (static_cast<int>(amount) > 0)
@@ -308,19 +317,24 @@ QColor ensureContrast(const QColor &bg, const QColor &fg, uint amount) {
     return QColor::fromHsv(fh, fs, fv);
   }
 
-  if (fv > bv && bv > static_cast<int>(amount))
+  if (fv > bv && bv > static_cast<int>(amount)) {
     return QColor::fromHsv(fh, fs, bv - static_cast<int>(amount));
+  }
 
-  if (fv < bv && fv > static_cast<int>(amount))
-    return QColor::fromHsv(fh, fs, fv - static_cast<int>(amount));
+  if (fv < bv && fv > static_cast<int>(amount)) {
+    return QColor::fromHsv(fh, fs, fv - amount);
+  }
 
-  if (fv > bv && (255 - fv > static_cast<int>(amount)))
-    return QColor::fromHsv(fh, fs, fv + static_cast<int>(amount));
+  if (fv > bv && (255 - fv > static_cast<int>(amount))) {
+    return QColor::fromHsv(fh, fs, fv + amount);
+  }
 
-  if (fv < bv && (255 - bv > static_cast<int>(amount)))
-    return QColor::fromHsv(fh, fs, bv + static_cast<int>(amount));
+  if (fv < bv && (255 - bv > static_cast<int>(amount))) {
+    return QColor::fromHsv(fh, fs, bv + amount);
+  }
 
   return Qt::blue;
+
 }
 
 void BlockAnalyzer::paletteChange(const QPalette&) {
@@ -338,16 +352,17 @@ void BlockAnalyzer::paletteChange(const QPalette&) {
   bar()->fill(bg);
 
   QPainter p(bar());
-  for (int y = 0; static_cast<uint>(y) < rows_; ++y)
+  for (int y = 0; y < rows_; ++y) {
     // graduate the fg color
     p.fillRect(0, y * (kHeight + 1), kWidth, kHeight, QColor(r + static_cast<int>(dr * y), g + static_cast<int>(dg * y), b + static_cast<int>(db * y)));
+  }
 
   {
     const QColor bg2 = palette().color(QPalette::Window).darker(112);
 
     // make a complimentary fadebar colour
     // TODO dark is not always correct, dumbo!
-    int h, s, v;
+    int h = 0, s = 0, v = 0;
     palette().color(QPalette::Window).darker(150).getHsv(&h, &s, &v);
     const QColor fg2(QColor::fromHsv(h + 120, s, v));
 
@@ -357,10 +372,10 @@ void BlockAnalyzer::paletteChange(const QPalette&) {
     const int r2 = bg2.red(), g2 = bg2.green(), b2 = bg2.blue();
 
     // Precalculate all fade-bar pixmaps
-    for (uint y = 0; y < kFadeSize; ++y) {
+    for (int y = 0; y < kFadeSize; ++y) {
       fade_bars_[y].fill(palette().color(QPalette::Window));
       QPainter f(&fade_bars_[y]);
-      for (int z = 0; static_cast<uint>(z) < rows_; ++z) {
+      for (int z = 0; z < rows_; ++z) {
         const double Y = 1.0 - (log10(kFadeSize - y) / log10(kFadeSize));
         f.fillRect(0, z * (kHeight + 1), kWidth, kHeight, QColor(r2 + static_cast<int>(dr2 * Y), g2 + static_cast<int>(dg2 * Y), b2 + static_cast<int>(db2 * Y)));
       }
@@ -386,8 +401,10 @@ void BlockAnalyzer::drawBackground() {
 
   if (!p.paintEngine()) return;
 
-  for (int x = 0; static_cast<uint>(x) < columns_; ++x)
-    for (int y = 0; static_cast<uint>(y) < rows_; ++y)
+  for (int x = 0; x < columns_; ++x) {
+    for (int y = 0; y < rows_; ++y) {
       p.fillRect(x * (kWidth + 1), y * (kHeight + 1) + y_, kWidth, kHeight, bgdark);
+    }
+  }
 
 }

src/analyzer/blockanalyzer.h

@@ -43,12 +43,12 @@ class BlockAnalyzer : public Analyzer::Base {
  public:
   Q_INVOKABLE explicit BlockAnalyzer(QWidget*);
 
-  static const uint kHeight;
-  static const uint kWidth;
-  static const uint kMinRows;
-  static const uint kMinColumns;
-  static const uint kMaxColumns;
-  static const uint kFadeSize;
+  static const int kHeight;
+  static const int kWidth;
+  static const int kMinRows;
+  static const int kMinColumns;
+  static const int kMaxColumns;
+  static const int kFadeSize;
 
   static const char *kName;
 
@@ -65,21 +65,21 @@ class BlockAnalyzer : public Analyzer::Base {
  private:
   QPixmap *bar() { return &barpixmap_; }
 
-  uint columns_, rows_;      // number of rows and columns of blocks
-  uint y_;                   // y-offset from top of widget
+  int columns_, rows_;      // number of rows and columns of blocks
+  int y_;                   // y-offset from top of widget
   QPixmap barpixmap_;
   QPixmap topbarpixmap_;
   QPixmap background_;
   QPixmap canvas_;
   Analyzer::Scope scope_;    // so we don't create a vector every frame
-  QVector<float> store_;     // current bar heights
-  QVector<float> yscale_;
+  QVector<double> store_;     // current bar heights
+  QVector<double> yscale_;
 
   QVector<QPixmap> fade_bars_;
-  QVector<uint> fade_pos_;
+  QVector<int> fade_pos_;
   QVector<int> fade_intensity_;
 
-  float step_;  // rows to fall per frame
+  double step_;  // rows to fall per frame
 };
 
 #endif  // BLOCKANALYZER_H

src/analyzer/boomanalyzer.cpp

@@ -39,21 +39,19 @@
 
 using Analyzer::Scope;
 
-const uint BoomAnalyzer::kColumnWidth = 4;
-const uint BoomAnalyzer::kMaxBandCount = 256;
-const uint BoomAnalyzer::kMinBandCount = 32;
+const int BoomAnalyzer::kColumnWidth = 4;
+const int BoomAnalyzer::kMaxBandCount = 256;
+const int BoomAnalyzer::kMinBandCount = 32;
 
-const char* BoomAnalyzer::kName = QT_TRANSLATE_NOOP("AnalyzerContainer", "Boom analyzer");
+const char *BoomAnalyzer::kName = QT_TRANSLATE_NOOP("AnalyzerContainer", "Boom analyzer");
 
-BoomAnalyzer::BoomAnalyzer(QWidget* parent)
+BoomAnalyzer::BoomAnalyzer(QWidget *parent)
     : Analyzer::Base(parent, 9),
       bands_(0),
       scope_(kMinBandCount),
       fg_(palette().color(QPalette::Highlight)),
-      K_barHeight_(1.271)  // 1.471
-      ,
-      F_peakSpeed_(1.103)  // 1.122
-      ,
+      K_barHeight_(1.271),  // 1.471
+      F_peakSpeed_(1.103),  // 1.122
       F_(1.0),
       bar_height_(kMaxBandCount, 0),
       peak_height_(kMaxBandCount, 0),
@@ -65,25 +63,25 @@ BoomAnalyzer::BoomAnalyzer(QWidget* parent)
 
 }
 
-void BoomAnalyzer::changeK_barHeight(int newValue) {
+void BoomAnalyzer::changeK_barHeight(const int newValue) {
   K_barHeight_ = static_cast<double>(newValue) / 1000;
 }
 
-void BoomAnalyzer::changeF_peakSpeed(int newValue) {
+void BoomAnalyzer::changeF_peakSpeed(const int newValue) {
   F_peakSpeed_ = static_cast<double>(newValue) / 1000;
 }
 
-void BoomAnalyzer::resizeEvent(QResizeEvent* e) {
+void BoomAnalyzer::resizeEvent(QResizeEvent *e) {
 
   QWidget::resizeEvent(e);
 
   const uint HEIGHT = height() - 2;
   const double h = 1.2 / HEIGHT;
 
-  bands_ = qMin(static_cast<uint>(static_cast<double>(width() + 1) / (kColumnWidth + 1)) + 1, kMaxBandCount);
+  bands_ = qMin(static_cast<int>(static_cast<double>(width() + 1) / (kColumnWidth + 1)) + 1, kMaxBandCount);
   scope_.resize(bands_);
 
-  F_ = static_cast<double>(HEIGHT) / (log10(256) * 1.1 /*<- max. amplitude*/);
+  F_ = static_cast<double>(HEIGHT) / (log10(256) * static_cast<double>(1.1) /*<- max. amplitude*/);
 
   barPixmap_ = QPixmap(kColumnWidth - 2, HEIGHT);
   canvas_ = QPixmap(size());
@@ -101,22 +99,22 @@ void BoomAnalyzer::resizeEvent(QResizeEvent* e) {
 
 }
 
-void BoomAnalyzer::transform(Scope& s) {
+void BoomAnalyzer::transform(Scope &s) {
 
   fht_->spectrum(s.data());
   fht_->scale(s.data(), 1.0 / 50);
 
-  s.resize(scope_.size() <= kMaxBandCount / 2 ? kMaxBandCount / 2 : scope_.size());
+  s.resize(scope_.size() <= static_cast<quint64>(kMaxBandCount) / 2 ? kMaxBandCount / 2 : scope_.size());
 
 }
 
-void BoomAnalyzer::analyze(QPainter& p, const Scope& scope, bool new_frame) {
+void BoomAnalyzer::analyze(QPainter &p, const Scope &scope, const bool new_frame) {
 
   if (!new_frame || engine_->state() == Engine::Paused) {
     p.drawPixmap(0, 0, canvas_);
     return;
   }
-  float h;
+  double h = 0.0;
   const uint MAX_HEIGHT = height() - 1;
 
   QPainter canvas_painter(&canvas_);
@@ -124,7 +122,7 @@ void BoomAnalyzer::analyze(QPainter& p, const Scope& scope, bool new_frame) {
 
   Analyzer::interpolate(scope, scope_);
 
-  for (uint i = 0, x = 0, y; i < bands_; ++i, x += kColumnWidth + 1) {
+  for (int i = 0, x = 0, y = 0; i < bands_; ++i, x += kColumnWidth + 1) {
     h = log10(scope_[i] * 256.0) * F_;
 
     if (h > MAX_HEIGHT) h = MAX_HEIGHT;
@@ -157,13 +155,14 @@ void BoomAnalyzer::analyze(QPainter& p, const Scope& scope, bool new_frame) {
       }
     }
 
-    y = height() - uint(bar_height_[i]);
+    y = height() - static_cast<int>(bar_height_[i]);
     canvas_painter.drawPixmap(x + 1, y, barPixmap_, 0, y, -1, -1);
     canvas_painter.setPen(fg_);
-    if (bar_height_[i] > 0)
+    if (bar_height_[i] > 0) {
       canvas_painter.drawRect(x, y, kColumnWidth - 1, height() - y - 1);
+    }
 
-    y = height() - uint(peak_height_[i]);
+    y = height() - static_cast<int>(peak_height_[i]);
     canvas_painter.setPen(palette().color(QPalette::Midlight));
     canvas_painter.drawLine(x, y, x + kColumnWidth - 1, y);
   }

src/analyzer/boomanalyzer.h

@@ -42,10 +42,10 @@ class BoomAnalyzer : public Analyzer::Base {
  public:
   Q_INVOKABLE explicit BoomAnalyzer(QWidget*);
 
-  static const char* kName;
+  static const char *kName;
 
   void transform(Analyzer::Scope &s) override;
-  void analyze(QPainter &p, const Analyzer::Scope&, bool new_frame) override;
+  void analyze(QPainter &p, const Analyzer::Scope&, const bool new_frame) override;
 
  public slots:
   void changeK_barHeight(int);
@@ -54,19 +54,19 @@ class BoomAnalyzer : public Analyzer::Base {
  protected:
   void resizeEvent(QResizeEvent *e) override;
 
-  static const uint kColumnWidth;
-  static const uint kMaxBandCount;
-  static const uint kMinBandCount;
+  static const int kColumnWidth;
+  static const int kMaxBandCount;
+  static const int kMinBandCount;
 
-  uint bands_;
+  int bands_;
   Analyzer::Scope scope_;
   QColor fg_;
 
   double K_barHeight_, F_peakSpeed_, F_;
 
-  std::vector<float> bar_height_;
-  std::vector<float> peak_height_;
-  std::vector<float> peak_speed_;
+  std::vector<double> bar_height_;
+  std::vector<double> peak_height_;
+  std::vector<double> peak_speed_;
 
   QPixmap barPixmap_;
   QPixmap canvas_;

src/analyzer/fht.cpp

@@ -26,49 +26,54 @@
 #include <cmath>
 
 #include <QVector>
+#include <QtMath>
+
+FHT::FHT(uint n) : num_((n < 3) ? 0 : 1 << n), exp2_((n < 3) ? static_cast<int>(-1) : static_cast<int>(n)) {
 
-FHT::FHT(int n) : num_((n < 3) ? 0 : 1 << n), exp2_((n < 3) ? -1 : n) {
   if (n > 3) {
     buf_vector_.resize(num_);
     tab_vector_.resize(num_ * 2);
     makeCasTable();
   }
+
 }
 
-FHT::~FHT() {}
+FHT::~FHT() = default;
 
 int FHT::sizeExp() const { return exp2_; }
 int FHT::size() const { return num_; }
 
-float* FHT::buf_() { return buf_vector_.data(); }
-float* FHT::tab_() { return tab_vector_.data(); }
-int* FHT::log_() { return log_vector_.data(); }
+float *FHT::buf_() { return buf_vector_.data(); }
+float *FHT::tab_() { return tab_vector_.data(); }
+int *FHT::log_() { return log_vector_.data(); }
 
 void FHT::makeCasTable(void) {
-  float* costab = tab_();
-  float* sintab = tab_() + num_ / 2 + 1;
+
+  float *costab = tab_();
+  float *sintab = tab_() + num_ / 2 + 1;
 
   for (int ul = 0; ul < num_; ul++) {
-    float d = M_PI * ul / (num_ / 2);
+    float d = M_PI * ul / (num_ / 2);  // NOLINT(bugprone-integer-division)
     *costab = *sintab = cos(d);
 
     costab += 2;
     sintab += 2;
     if (sintab > tab_() + num_ * 2) sintab = tab_() + 1;
   }
+
 }
 
-void FHT::scale(float* p, float d) {
+void FHT::scale(float *p, float d) const {
   for (int i = 0; i < (num_ / 2); i++) *p++ *= d;
 }
 
-void FHT::ewma(float* d, float* s, float w) {
+void FHT::ewma(float *d, float *s, float w) const {
   for (int i = 0; i < (num_ / 2); i++, d++, s++) *d = *d * w + *s * (1 - w);
 }
 
-void FHT::logSpectrum(float* out, float* p) {
+void FHT::logSpectrum(float *out, float *p) {
 
-  int n = num_ / 2, i, j, k, *r;
+  int n = num_ / 2, i = 0, j = 0, k = 0, *r = nullptr;
   if (log_vector_.size() < n) {
     log_vector_.resize(n);
     float f = n / log10(static_cast<double>(n));
@@ -93,50 +98,63 @@ void FHT::logSpectrum(float* out, float* p) {
 
 }
 
-void FHT::semiLogSpectrum(float* p) {
+void FHT::semiLogSpectrum(float *p) {
+
   power2(p);
   for (int i = 0; i < (num_ / 2); i++, p++) {
     float e = 10.0 * log10(sqrt(*p / 2));
     *p = e < 0 ? 0 : e;
   }
+
 }
 
-void FHT::spectrum(float* p) {
+void FHT::spectrum(float *p) {
+
   power2(p);
-  for (int i = 0; i < (num_ / 2); i++, p++)
+  for (int i = 0; i < (num_ / 2); i++, p++) {
     *p = static_cast<float>(sqrt(*p / 2));
+  }
+
 }
 
-void FHT::power(float* p) {
+void FHT::power(float *p) {
+
   power2(p);
   for (int i = 0; i < (num_ / 2); i++) *p++ /= 2;
+
 }
 
-void FHT::power2(float* p) {
+void FHT::power2(float *p) {
+
   _transform(p, num_, 0);
 
   *p = static_cast<float>(2 * pow(*p, 2));
   p++;
 
-  float* q = p + num_ - 2;
+  float *q = p + num_ - 2;
   for (int i = 1; i < (num_ / 2); i++) {
     *p = static_cast<float>(pow(*p, 2) + pow(*q, 2));
     p++;
     q--;
   }
+
 }
 
-void FHT::transform(float* p) {
-  if (num_ == 8)
+void FHT::transform(float *p) {
+
+  if (num_ == 8) {
     transform8(p);
-  else
+  }
+  else {
     _transform(p, num_, 0);
+  }
+
 }
 
-void FHT::transform8(float* p) {
+void FHT::transform8(float *p) {
 
-  float a, b, c, d, e, f, g, h, b_f2, d_h2;
-  float a_c_eg, a_ce_g, ac_e_g, aceg, b_df_h, bdfh;
+  float a = 0.0, b = 0.0, c = 0.0, d = 0.0, e = 0.0, f = 0.0, g = 0.0, h = 0.0, b_f2 = 0.0, d_h2 = 0.0;
+  float a_c_eg = 0.0, a_ce_g = 0.0, ac_e_g = 0.0, aceg = 0.0, b_df_h = 0.0, bdfh = 0.0;
 
   a = *p++, b = *p++, c = *p++, d = *p++;
   e = *p++, f = *p++, g = *p++, h = *p;
@@ -162,15 +180,15 @@ void FHT::transform8(float* p) {
 
 }
 
-void FHT::_transform(float* p, int n, int k) {
+void FHT::_transform(float *p, int n, int k) {
 
   if (n == 8) {
     transform8(p + k);
     return;
   }
 
-  int i, j, ndiv2 = n / 2;
-  float a, *t1, *t2, *t3, *t4, *ptab, *pp;
+  int i = 0, j = 0, ndiv2 = n / 2;
+  float a = 0.0, *t1 = nullptr, *t2 = nullptr, *t3 = nullptr, *t4 = nullptr, *ptab = nullptr, *pp = nullptr;
 
   for (i = 0, t1 = buf_(), t2 = buf_() + ndiv2, pp = &p[k]; i < ndiv2; i++)
     *t1++ = *pp++, *t2++ = *pp++;

src/analyzer/fht.h

@@ -41,9 +41,9 @@ class FHT {
   QVector<float> tab_vector_;
   QVector<int> log_vector_;
 
-  float* buf_();
-  float* tab_();
-  int* log_();
+  float *buf_();
+  float *tab_();
+  int *log_();
 
   /**
    * Create a table of "cas" (cosine and sine) values.
@@ -63,12 +63,12 @@ class FHT {
   * should be at least 3. Values of more than 3 need a trigonometry table.
   * @see makeCasTable()
   */
-  explicit FHT(int);
+  explicit FHT(uint);
 
   ~FHT();
   int sizeExp() const;
   int size() const;
-  void scale(float*, float);
+  void scale(float*, float) const;
 
   /**
    * Exponentially Weighted Moving Average (EWMA) filter.
@@ -76,7 +76,7 @@ class FHT {
    * @param s is fresh input.
    * @param w is the weighting factor.
    */
-  void ewma(float* d, float* s, float w);
+  void ewma(float *d, float *s, float w) const;
 
   /**
    * Logarithmic audio spectrum. Maps semi-logarithmic spectrum
@@ -85,7 +85,7 @@ class FHT {
    * @param p is the input array.
    * @param out is the spectrum.
    */
-  void logSpectrum(float* out, float* p);
+  void logSpectrum(float *out, float *p);
 
   /**
    * Semi-logarithmic audio spectrum.
@@ -117,7 +117,7 @@ class FHT {
   /**
    * Discrete Hartley transform of data sets with 8 values.
    */
-  void transform8(float*);
+  static void transform8(float*);
 
   void transform(float*);
 };

src/analyzer/rainbowanalyzer.cpp

@@ -50,13 +50,13 @@ const int Rainbow::RainbowAnalyzer::kRainbowHeight[] = {21, 16};
 const int Rainbow::RainbowAnalyzer::kRainbowOverlap[] = {13, 15};
 const int Rainbow::RainbowAnalyzer::kSleepingHeight[] = {24, 33};
 
-const char* Rainbow::NyanCatAnalyzer::kName = "Nyanalyzer Cat";
-const char* Rainbow::RainbowDashAnalyzer::kName = "Rainbow Dash";
-const float Rainbow::RainbowAnalyzer::kPixelScale = 0.02f;
+const char *Rainbow::NyanCatAnalyzer::kName = "Nyanalyzer Cat";
+const char *Rainbow::RainbowDashAnalyzer::kName = "Rainbow Dash";
+const float Rainbow::RainbowAnalyzer::kPixelScale = 0.02F;
 
 Rainbow::RainbowAnalyzer::RainbowType Rainbow::RainbowAnalyzer::rainbowtype;
 
-Rainbow::RainbowAnalyzer::RainbowAnalyzer(const RainbowType& rbtype, QWidget* parent)
+Rainbow::RainbowAnalyzer::RainbowAnalyzer(const RainbowType rbtype, QWidget *parent)
     : Analyzer::Base(parent, 9),
       timer_id_(startTimer(kFrameIntervalMs)),
       frame_(0),
@@ -64,8 +64,7 @@ Rainbow::RainbowAnalyzer::RainbowAnalyzer(const RainbowType& rbtype, QWidget* pa
       available_rainbow_width_(0),
       px_per_frame_(0),
       x_offset_(0),
-      background_brush_(QColor(0x0f, 0x43, 0x73))
-      {
+      background_brush_(QColor(0x0f, 0x43, 0x73)) {
 
   rainbowtype = rbtype;
   cat_dash_[0] = QPixmap(":/pictures/nyancat.png");
@@ -73,7 +72,7 @@ Rainbow::RainbowAnalyzer::RainbowAnalyzer(const RainbowType& rbtype, QWidget* pa
   memset(history_, 0, sizeof(history_));
 
   for (int i = 0; i < kRainbowBands; ++i) {
-    colors_[i] = QPen(QColor::fromHsv(i * 255 / kRainbowBands, 255, 255), kRainbowHeight[rainbowtype] / kRainbowBands, Qt::SolidLine, Qt::FlatCap, Qt::RoundJoin);
+    colors_[i] = QPen(QColor::fromHsv(i * 255 / kRainbowBands, 255, 255), kRainbowHeight[rainbowtype] / kRainbowBands, Qt::SolidLine, Qt::FlatCap, Qt::RoundJoin);  // NOLINT(bugprone-integer-division)
 
     // pow constants computed so that
     // | band_scale(0) | ~= .5 and | band_scale(5) | ~= 32
@@ -82,9 +81,9 @@ Rainbow::RainbowAnalyzer::RainbowAnalyzer(const RainbowType& rbtype, QWidget* pa
 
 }
 
-void Rainbow::RainbowAnalyzer::transform(Scope& s) { fht_->spectrum(s.data()); }
+void Rainbow::RainbowAnalyzer::transform(Scope &s) { fht_->spectrum(s.data()); }
 
-void Rainbow::RainbowAnalyzer::timerEvent(QTimerEvent* e) {
+void Rainbow::RainbowAnalyzer::timerEvent(QTimerEvent *e) {
 
   if (e->timerId() == timer_id_) {
     frame_ = (frame_ + 1) % kFrameCount[rainbowtype];
@@ -95,7 +94,7 @@ void Rainbow::RainbowAnalyzer::timerEvent(QTimerEvent* e) {
 
 }
 
-void Rainbow::RainbowAnalyzer::resizeEvent(QResizeEvent* e) {
+void Rainbow::RainbowAnalyzer::resizeEvent(QResizeEvent *e) {
 
   Q_UNUSED(e);
 
@@ -109,15 +108,15 @@ void Rainbow::RainbowAnalyzer::resizeEvent(QResizeEvent* e) {
 
 }
 
-void Rainbow::RainbowAnalyzer::analyze(QPainter& p, const Analyzer::Scope& s, bool new_frame) {
+void Rainbow::RainbowAnalyzer::analyze(QPainter &p, const Analyzer::Scope &s, bool new_frame) {
 
   // Discard the second half of the transform
-  const int scope_size = s.size() / 2;
+  const int scope_size = static_cast<int>(s.size() / 2);
 
   if ((new_frame && is_playing_) || (buffer_[0].isNull() && buffer_[1].isNull())) {
     // Transform the music into rainbows!
     for (int band = 0; band < kRainbowBands; ++band) {
-      float* band_start = history_ + band * kHistorySize;
+      float *band_start = history_ + band * kHistorySize;
 
       // Move the history of each band across by 1 frame.
       memmove(band_start, band_start + 1, (kHistorySize - 1) * sizeof(float));
@@ -139,8 +138,8 @@ void Rainbow::RainbowAnalyzer::analyze(QPainter& p, const Analyzer::Scope& s, bo
 
     // Create polylines for the rainbows.
     QPointF polyline[kRainbowBands * kHistorySize];
-    QPointF* dest = polyline;
-    float* source = history_;
+    QPointF *dest = polyline;
+    float *source = history_;
 
     const float top_of = static_cast<float>(height()) / 2 - static_cast<float>(kRainbowHeight[rainbowtype]) / 2;
     for (int band = 0; band < kRainbowBands; ++band) {
@@ -204,8 +203,8 @@ void Rainbow::RainbowAnalyzer::analyze(QPainter& p, const Analyzer::Scope& s, bo
 
 }
 
-Rainbow::NyanCatAnalyzer::NyanCatAnalyzer(QWidget* parent)
+Rainbow::NyanCatAnalyzer::NyanCatAnalyzer(QWidget *parent)
     : RainbowAnalyzer(Rainbow::RainbowAnalyzer::Nyancat, parent) {}
 
-Rainbow::RainbowDashAnalyzer::RainbowDashAnalyzer(QWidget* parent)
+Rainbow::RainbowDashAnalyzer::RainbowDashAnalyzer(QWidget *parent)
     : RainbowAnalyzer(Rainbow::RainbowAnalyzer::Dash, parent) {}

src/analyzer/rainbowanalyzer.h

@@ -47,10 +47,10 @@ class RainbowAnalyzer : public Analyzer::Base {
  public:
   enum RainbowType {
     Nyancat = 0,
-    Dash = 1 
+    Dash = 1
   };
 
-  RainbowAnalyzer(const RainbowType &rbtype, QWidget *parent);
+  RainbowAnalyzer(const RainbowType rbtype, QWidget *parent);
 
  protected:
   void transform(Analyzer::Scope&) override;
@@ -93,7 +93,7 @@ class RainbowAnalyzer : public Analyzer::Base {
 
  private:
   // "constants" that get initialized in the constructor
-  float band_scale_[kRainbowBands];
+  float band_scale_[kRainbowBands]{};
   QPen colors_[kRainbowBands];
 
   // Rainbow Nyancat & Dash
@@ -104,9 +104,9 @@ class RainbowAnalyzer : public Analyzer::Base {
   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, 
+  // A cache of the last frame's rainbow,
   // so it can be used in the next frame.
   QPixmap buffer_[2];
   int current_buffer_;
@@ -118,7 +118,7 @@ class RainbowAnalyzer : public Analyzer::Base {
   // X spacing between each point in the polyline.
   int px_per_frame_;
 
-  // Amount the buffer_ is shifted to the left (off the edge of the widget) 
+  // Amount the buffer_ is shifted to the left (off the edge of the widget)
   // to make the rainbow extend from 0 to available_rainbow_width_.
   int x_offset_;
 
@@ -129,18 +129,18 @@ class NyanCatAnalyzer : public RainbowAnalyzer {
   Q_OBJECT
 
  public:
-  Q_INVOKABLE explicit NyanCatAnalyzer(QWidget* parent);
-  
-  static const char* kName;
+  Q_INVOKABLE explicit NyanCatAnalyzer(QWidget *parent);
+
+  static const char *kName;
 };
 
 class RainbowDashAnalyzer : public RainbowAnalyzer {
   Q_OBJECT
 
  public:
-  Q_INVOKABLE explicit RainbowDashAnalyzer(QWidget* parent);
+  Q_INVOKABLE explicit RainbowDashAnalyzer(QWidget *parent);
 
-  static const char* kName;
+  static const char *kName;
 };
 }
 

src/collection/collection.cpp

@@ -2,7 +2,7 @@
  * Strawberry Music Player
  * This file was part of Clementine.
  * Copyright 2010, David Sansome <me@davidsansome.com>
- * Copyright 2018-2019, 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
@@ -43,9 +43,9 @@
 #include "scrobbler/lastfmimport.h"
 
 const char *SCollection::kSongsTable = "songs";
+const char *SCollection::kFtsTable = "songs_fts";
 const char *SCollection::kDirsTable = "directories";
 const char *SCollection::kSubdirsTable = "subdirectories";
-const char *SCollection::kFtsTable = "songs_fts";
 
 SCollection::SCollection(Application *app, QObject *parent)
     : QObject(parent),
@@ -62,7 +62,7 @@ SCollection::SCollection(Application *app, QObject *parent)
   backend()->moveToThread(app->database()->thread());
   qLog(Debug) << backend_ << "moved to thread" << app->database()->thread();
 
-  backend_->Init(app->database(), Song::Source_Collection, kSongsTable, kDirsTable, kSubdirsTable, kFtsTable);
+  backend_->Init(app->database(), app->task_manager(), Song::Source_Collection, kSongsTable, kFtsTable, kDirsTable, kSubdirsTable);
 
   model_ = new CollectionModel(backend_, app_, this);
 
@@ -78,7 +78,7 @@ SCollection::~SCollection() {
   }
   if (watcher_thread_) {
     watcher_thread_->exit();
-    watcher_thread_->wait(5000 /* five seconds */);
+    watcher_thread_->wait(5000);
   }
   backend_->deleteLater();
 
@@ -97,6 +97,7 @@ void SCollection::Init() {
   watcher_->set_backend(backend_);
   watcher_->set_task_manager(app_->task_manager());
 
+  QObject::connect(backend_, &CollectionBackend::Error, this, &SCollection::Error);
   QObject::connect(backend_, &CollectionBackend::DirectoryDiscovered, watcher_, &CollectionWatcher::AddDirectory);
   QObject::connect(backend_, &CollectionBackend::DirectoryDeleted, watcher_, &CollectionWatcher::RemoveDirectory);
   QObject::connect(watcher_, &CollectionWatcher::NewOrUpdatedSongs, backend_, &CollectionBackend::AddOrUpdateSongs);
@@ -107,6 +108,7 @@ void SCollection::Init() {
   QObject::connect(watcher_, &CollectionWatcher::SubdirsDiscovered, backend_, &CollectionBackend::AddOrUpdateSubdirs);
   QObject::connect(watcher_, &CollectionWatcher::SubdirsMTimeUpdated, backend_, &CollectionBackend::AddOrUpdateSubdirs);
   QObject::connect(watcher_, &CollectionWatcher::CompilationsNeedUpdating, backend_, &CollectionBackend::CompilationsNeedUpdating);
+  QObject::connect(watcher_, &CollectionWatcher::UpdateLastSeen, backend_, &CollectionBackend::UpdateLastSeen);
 
   QObject::connect(app_->lastfm_import(), &LastFMImport::UpdateLastPlayed, backend_, &CollectionBackend::UpdateLastPlayed);
   QObject::connect(app_->lastfm_import(), &LastFMImport::UpdatePlayCount, backend_, &CollectionBackend::UpdatePlayCount);
@@ -132,7 +134,7 @@ void SCollection::Exit() {
 
 void SCollection::ExitReceived() {
 
-  QObject *obj = qobject_cast<QObject*>(sender());
+  QObject *obj = sender();
   QObject::disconnect(obj, nullptr, this, nullptr);
   qLog(Debug) << obj << "successfully exited.";
   wait_for_exit_.removeAll(obj);
@@ -148,8 +150,8 @@ void SCollection::AbortScan() { watcher_->Stop(); }
 
 void SCollection::Rescan(const SongList &songs) {
 
-    qLog(Debug) << "Rescan" << songs.size() << "songs";
-    if (!songs.isEmpty()) watcher_->RescanTracksAsync(songs);
+  qLog(Debug) << "Rescan" << songs.size() << "songs";
+  if (!songs.isEmpty()) watcher_->RescanTracksAsync(songs);
 
 }