Release 1.0.1

Fixes #795

.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,46 +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) /usr/local/opt/sparkle
-  - 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
-  - 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/macdeployqt/main.cpp

@@ -64,7 +64,6 @@ int main(int argc, char **argv)
         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() << "   -plugins-dir=<path>           : Set plugins directory";
         qDebug() << "";
         qDebug() << "macdeployqt takes an application bundle as input and makes it";
         qDebug() << "self-contained by copying in the Qt frameworks and plugins that";
@@ -88,7 +87,7 @@ int main(int argc, char **argv)
 
     appBundlePath = QDir::cleanPath(appBundlePath);
 
-    if (QDir().exists(appBundlePath) == false) {
+    if (!QDir(appBundlePath).exists()) {
         qDebug() << "Error: Could not find app bundle" << appBundlePath;
         return 1;
     }
@@ -110,7 +109,6 @@ int main(int argc, char **argv)
     extern bool appstoreCompliant;
     extern bool deployFramework;
     extern bool secureTimestamp;
-    QString plugin_dir;
 
     for (int i = 2; i < argc; ++i) {
         QByteArray argument = QByteArray(argv[i]);
@@ -198,7 +196,7 @@ int main(int argc, char **argv)
             LogDebug() << "Argument found:" << argument;
             appstoreCompliant = true;
 
-        // Undocumented option, may not work as intented
+        // Undocumented option, may not work as intended
         } else if (argument == QByteArray("-deploy-framework")) {
             LogDebug() << "Argument found:" << argument;
             deployFramework = true;
@@ -210,13 +208,6 @@ int main(int argc, char **argv)
                 LogError() << "Missing filesystem type";
             else
                 filesystem = argument.mid(index+1);
-        } else if (argument.startsWith(QByteArray("-plugins-dir"))) {
-            LogDebug() << "Argument found:" << argument;
-            int index = argument.indexOf('=');
-            if (index == -1)
-                LogError() << "Missing filesystem type";
-            else
-                plugin_dir = argument.mid(index+1);
         } else if (argument.startsWith("-")) {
             LogError() << "Unknown argument" << argument << "\n";
             return 1;
@@ -231,7 +222,7 @@ int main(int argc, char **argv)
     if (deployFramework && deploymentInfo.isFramework)
         fixupFramework(appBundlePath);
 
-    // Convenience: Look for .qml files in the current directoty if no -qmldir specified.
+    // 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()) {
@@ -252,36 +243,37 @@ int main(int argc, char **argv)
                           deploymentInfo.deployedFrameworks.end()).values();
     }
 
+    // Handle plugins
     if (plugins) {
-      if (plugin_dir.isEmpty()) {
+        // Set the plugins search directory
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
         deploymentInfo.pluginPath = QLibraryInfo::path(QLibraryInfo::PluginsPath);
-      }
+#else
-      else {
+        deploymentInfo.pluginPath = QLibraryInfo::location(QLibraryInfo::PluginsPath);
-        deploymentInfo.pluginPath = plugin_dir;
+#endif
-      }
+        // Sanity checks
-      if (deploymentInfo.pluginPath.isEmpty()) {
+        if (deploymentInfo.pluginPath.isEmpty()) {
-        LogError() << "Missing Qt plugins path\n";
+            LogError() << "Missing Qt plugins path\n";
-        return 1;
+            return 1;
-      }
+        }
-      if (!QDir(deploymentInfo.pluginPath).exists()) {
+
-        LogError() << "Plugins path does not exist\n" << deploymentInfo.pluginPath;
+        if (!QDir(deploymentInfo.pluginPath).exists()) {
-        return 1;
+            LogError() << "Plugins path does not exist" << deploymentInfo.pluginPath << "\n";
-      }
+            return 1;
-      Q_ASSERT(!deploymentInfo.pluginPath.isEmpty());
+        }
-      if (!deploymentInfo.pluginPath.isEmpty()) {
+
-        LogNormal();
+        // Deploy plugins
-        deployPlugins(appBundlePath, deploymentInfo, useDebugLibs);
+        Q_ASSERT(!deploymentInfo.pluginPath.isEmpty());
-        createQtConf(appBundlePath);
+        if (!deploymentInfo.pluginPath.isEmpty()) {
-      }
+            LogNormal();
+            deployPlugins(appBundlePath, deploymentInfo, useDebugLibs);
+            createQtConf(appBundlePath);
+        }
     }
 
     if (runStripEnabled)
         stripAppBinary(appBundlePath);
 
-    if (!FinalCheck(appBundlePath)) {
-        return 1;
-    }
-
     if (runCodesign)
         codesign(codesignIdentiy, appBundlePath);
 

3rdparty/macdeployqt/shared.cpp

@@ -35,9 +35,11 @@
 #include <QStringList>
 #include <QDebug>
 #include <iostream>
+#include <utility>
 #include <QProcess>
 #include <QDir>
 #include <QSet>
+#include <QList>
 #include <QStack>
 #include <QDirIterator>
 #include <QLibraryInfo>
@@ -102,7 +104,7 @@ inline QDebug operator<<(QDebug debug, const ApplicationBundleInfo &info)
 
 bool copyFilePrintStatus(const QString &from, const QString &to)
 {
-    if (QFile(to).exists()) {
+    if (QFile::exists(to)) {
         if (alwaysOwerwriteEnabled) {
             QFile(to).remove();
         } else {
@@ -139,7 +141,7 @@ bool copyFilePrintStatus(const QString &from, const QString &to)
 
 bool linkFilePrintStatus(const QString &file, const QString &link)
 {
-    if (QFile(link).exists()) {
+    if (QFile::exists(link)) {
         if (QFile(link).symLinkTarget().isEmpty())
             LogError() << link << "exists but it's a file.";
         else
@@ -200,13 +202,19 @@ OtoolInfo findDependencyInfo(const QString &binaryPath)
     if (binaryPath.contains(".framework/") || binaryPath.endsWith(".dylib")) {
         const auto match = regexp.match(outputLines.first());
         if (match.hasMatch()) {
-            info.installName = match.captured(1);
+            QString installname = match.captured(1);
-            info.compatibilityVersion = QVersionNumber::fromString(match.captured(2));
+            if (QFileInfo(binaryPath).fileName() == QFileInfo(installname).fileName()) {
-            info.currentVersion = QVersionNumber::fromString(match.captured(3));
+                info.installName = installname;
+                info.compatibilityVersion = QVersionNumber::fromString(match.captured(2));
+                info.currentVersion = QVersionNumber::fromString(match.captured(3));
+                outputLines.removeFirst();
+            } else {
+                info.installName = binaryPath;
+            }
         } else {
             LogError() << "Could not parse otool output line:" << outputLines.first();
+            outputLines.removeFirst();
         }
-        //outputLines.removeFirst();
     }
 
     for (const QString &outputLine : outputLines) {
@@ -225,7 +233,7 @@ OtoolInfo findDependencyInfo(const QString &binaryPath)
     return info;
 }
 
-FrameworkInfo parseOtoolLibraryLine(const QString &line, const QString &appBundlePath, const QSet<QString> &rpaths, bool useDebugLibs)
+FrameworkInfo parseOtoolLibraryLine(const QString &line, const QString &appBundlePath, const QList<QString> &rpaths, bool useDebugLibs)
 {
     FrameworkInfo info;
     QString trimmed = line.trimmed();
@@ -243,7 +251,7 @@ FrameworkInfo parseOtoolLibraryLine(const QString &line, const QString &appBundl
     if (trimmed.startsWith("@rpath/")) {
         QString rpathRelativePath = trimmed.mid(QStringLiteral("@rpath/").length());
         bool foundInsideBundle = false;
-        foreach (const QString &rpath, rpaths) {
+        for (const QString &rpath : std::as_const(rpaths)) {
             QString path = QDir::cleanPath(rpath + "/" + rpathRelativePath);
             // Skip paths already inside the bundle.
             if (!appBundlePath.isEmpty()) {
@@ -284,7 +292,7 @@ FrameworkInfo parseOtoolLibraryLine(const QString &line, const QString &appBundl
     // Split the line into [Qt-path]/lib/qt[Module].framework/Versions/[Version]/
     QStringList parts = trimmed.split("/");
     while (part < parts.count()) {
-        const QString currentPart = parts.at(part).simplified() ;
+        const QString currentPart = parts.at(part).simplified();
         ++part;
         if (currentPart == "")
             continue;
@@ -302,7 +310,7 @@ FrameworkInfo parseOtoolLibraryLine(const QString &line, const QString &appBundl
             } else if (trimmed.startsWith("/") == false) {      // If the line does not contain a full path, the app is using a binary Qt package.
                 QStringList partsCopy = parts;
                 partsCopy.removeLast();
-                foreach (QString path, librarySearchPath) {
+                for (QString &path : librarySearchPath) {
                     if (!path.endsWith("/"))
                         path += '/';
                     QString nameInPath = path + parts.join(QLatin1Char('/'));
@@ -496,7 +504,7 @@ QString findEntitlementsFile(const QString& path)
     return QString();
 }
 
-QList<FrameworkInfo> getQtFrameworks(const QList<DylibInfo> &dependencies, const QString &appBundlePath, const QSet<QString> &rpaths, bool useDebugLibs)
+QList<FrameworkInfo> getQtFrameworks(const QList<DylibInfo> &dependencies, const QString &appBundlePath, const QList<QString> &rpaths, bool useDebugLibs)
 {
     QList<FrameworkInfo> libraries;
     for (const DylibInfo &dylibInfo : dependencies) {
@@ -536,9 +544,9 @@ QString resolveDyldPrefix(const QString &path, const QString &loaderPath, const
     return path;
 }
 
-QSet<QString> getBinaryRPaths(const QString &path, bool resolve = true, QString executablePath = QString())
+QList<QString> getBinaryRPaths(const QString &path, bool resolve = true, QString executablePath = QString())
 {
-    QSet<QString> rpaths;
+    QList<QString> rpaths;
 
     QProcess otool;
     otool.start("otool", QStringList() << "-l" << path);
@@ -575,18 +583,20 @@ QSet<QString> getBinaryRPaths(const QString &path, bool resolve = true, QString
     return rpaths;
 }
 
-QList<FrameworkInfo> getQtFrameworks(const QString &path, const QString &appBundlePath, const QSet<QString> &rpaths, bool useDebugLibs)
+QList<FrameworkInfo> getQtFrameworks(const QString &path, const QString &appBundlePath, const QList<QString> &rpaths, bool useDebugLibs)
 {
     const OtoolInfo info = findDependencyInfo(path);
-    return getQtFrameworks(info.dependencies, appBundlePath, rpaths + getBinaryRPaths(path), useDebugLibs);
+    QList<QString> allRPaths = rpaths + getBinaryRPaths(path);
+    allRPaths.removeDuplicates();
+    return getQtFrameworks(info.dependencies, appBundlePath, allRPaths, useDebugLibs);
 }
 
-QList<FrameworkInfo> getQtFrameworksForPaths(const QStringList &paths, const QString &appBundlePath, const QSet<QString> &rpaths, bool useDebugLibs)
+QList<FrameworkInfo> getQtFrameworksForPaths(const QStringList &paths, const QString &appBundlePath, const QList<QString> &rpaths, bool useDebugLibs)
 {
     QList<FrameworkInfo> result;
     QSet<QString> existing;
-    foreach (const QString &path, paths) {
+    for (const QString &path : paths) {
-        foreach (const FrameworkInfo &info, getQtFrameworks(path, appBundlePath, rpaths, useDebugLibs)) {
+        for (const FrameworkInfo &info : getQtFrameworks(path, appBundlePath, rpaths, useDebugLibs)) {
             if (!existing.contains(info.frameworkPath)) { // avoid duplicates
                 existing.insert(info.frameworkPath);
                 result << info;
@@ -605,10 +615,10 @@ QStringList getBinaryDependencies(const QString executablePath,
     const auto dependencies = findDependencyInfo(path).dependencies;
 
     bool rpathsLoaded = false;
-    QSet<QString> rpaths;
+    QList<QString> rpaths;
 
     // return bundle-local dependencies. (those starting with @executable_path)
-    foreach (const DylibInfo &info, dependencies) {
+    for (const DylibInfo &info : dependencies) {
         QString trimmedLine = info.binaryPath;
         if (trimmedLine.startsWith("@executable_path/")) {
             QString binary = QDir::cleanPath(executablePath + trimmedLine.mid(QStringLiteral("@executable_path/").length()));
@@ -617,14 +627,14 @@ QStringList getBinaryDependencies(const QString executablePath,
         } else if (trimmedLine.startsWith("@rpath/")) {
             if (!rpathsLoaded) {
                 rpaths = getBinaryRPaths(path, true, executablePath);
-                foreach (const QString &binaryPath, additionalBinariesContainingRpaths) {
+                for (const QString &binaryPath : additionalBinariesContainingRpaths) {
-                    QSet<QString> binaryRpaths = getBinaryRPaths(binaryPath, true);
+                    rpaths += getBinaryRPaths(binaryPath, true);
-                    rpaths += binaryRpaths;
                 }
+                rpaths.removeDuplicates();
                 rpathsLoaded = true;
             }
             bool resolved = false;
-            foreach (const QString &rpath, rpaths) {
+            for (const QString &rpath : std::as_const(rpaths)) {
                 QString binary = QDir::cleanPath(rpath + "/" + trimmedLine.mid(QStringLiteral("@rpath/").length()));
                 LogDebug() << "Checking for" << binary;
                 if (QFile::exists(binary)) {
@@ -653,20 +663,20 @@ bool recursiveCopy(const QString &sourcePath, const QString &destinationPath)
     LogNormal() << "copy:" << sourcePath << destinationPath;
 
     QStringList files = QDir(sourcePath).entryList(QStringList() << "*", QDir::Files | QDir::NoDotAndDotDot);
-    foreach (QString file, files) {
+    for (const QString &file : files) {
         const QString fileSourcePath = sourcePath + "/" + file;
         const QString fileDestinationPath = destinationPath + "/" + file;
         copyFilePrintStatus(fileSourcePath, fileDestinationPath);
     }
 
     QStringList subdirs = QDir(sourcePath).entryList(QStringList() << "*", QDir::Dirs | QDir::NoDotAndDotDot);
-    foreach (QString dir, subdirs) {
+    for (const QString &dir : subdirs) {
         recursiveCopy(sourcePath + "/" + dir, destinationPath + "/" + dir);
     }
     return true;
 }
 
-void recursiveCopyAndDeploy(const QString &appBundlePath, const QSet<QString> &rpaths, const QString &sourcePath, const QString &destinationPath)
+void recursiveCopyAndDeploy(const QString &appBundlePath, const QList<QString> &rpaths, const QString &sourcePath, const QString &destinationPath)
 {
     QDir().mkpath(destinationPath);
 
@@ -674,7 +684,7 @@ void recursiveCopyAndDeploy(const QString &appBundlePath, const QSet<QString> &r
     const bool isDwarfPath = sourcePath.endsWith("DWARF");
 
     QStringList files = QDir(sourcePath).entryList(QStringList() << QStringLiteral("*"), QDir::Files | QDir::NoDotAndDotDot);
-    foreach (QString file, files) {
+    for (const QString &file : files) {
         const QString fileSourcePath = sourcePath + QLatin1Char('/') + file;
 
         if (file.endsWith("_debug.dylib")) {
@@ -720,7 +730,7 @@ void recursiveCopyAndDeploy(const QString &appBundlePath, const QSet<QString> &r
     }
 
     QStringList subdirs = QDir(sourcePath).entryList(QStringList() << QStringLiteral("*"), QDir::Dirs | QDir::NoDotAndDotDot);
-    foreach (QString dir, subdirs) {
+    for (const QString &dir : subdirs) {
         recursiveCopyAndDeploy(appBundlePath, rpaths, sourcePath + QLatin1Char('/') + dir, destinationPath + QLatin1Char('/') + dir);
     }
 }
@@ -743,8 +753,8 @@ QString copyDylib(const FrameworkInfo &framework, const QString path)
         return QString();
     }
 
-    // Retrun if the dylib has aleardy been deployed
+    // Return if the dylib has already been deployed
-    if (QFileInfo(dylibDestinationBinaryPath).exists() && !alwaysOwerwriteEnabled)
+    if (QFileInfo::exists(dylibDestinationBinaryPath) && !alwaysOwerwriteEnabled)
         return dylibDestinationBinaryPath;
 
     // Copy dylib binary
@@ -777,13 +787,13 @@ QString copyFramework(const FrameworkInfo &framework, const QString path)
 
     // Now copy the framework. Some parts should be left out (headers/, .prl files).
     // Some parts should be included (Resources/, symlink structure). We want this
-    // function to make as few assumtions about the framework as possible while at
+    // function to make as few assumptions about the framework as possible while at
     // the same time producing a codesign-compatible framework.
 
     // Copy framework binary
     copyFilePrintStatus(framework.sourceFilePath, frameworkDestinationBinaryPath);
 
-    // Copy Resouces/, Libraries/ and Helpers/
+    // Copy Resources/, Libraries/ and Helpers/
     const QString resourcesSourcePath = framework.frameworkPath + "/Resources";
     const QString resourcesDestianationPath = frameworkDestinationDirectory + "/Versions/" + framework.version + "/Resources";
     recursiveCopy(resourcesSourcePath, resourcesDestianationPath);
@@ -811,7 +821,7 @@ QString copyFramework(const FrameworkInfo &framework, const QString path)
     // Contents/Info.plist should be Versions/5/Resources/Info.plist
     const QString legacyInfoPlistPath = framework.frameworkPath + "/Contents/Info.plist";
     const QString correctInfoPlistPath = frameworkDestinationDirectory + "/Resources/Info.plist";
-    if (QFile(legacyInfoPlistPath).exists()) {
+    if (QFile::exists(legacyInfoPlistPath)) {
         copyFilePrintStatus(legacyInfoPlistPath, correctInfoPlistPath);
         patch_debugInInfoPlist(correctInfoPlistPath);
     }
@@ -841,7 +851,7 @@ void changeIdentification(const QString &id, const QString &binaryPath)
 void changeInstallName(const QString &bundlePath, const FrameworkInfo &framework, const QStringList &binaryPaths, bool useLoaderPath)
 {
     const QString absBundlePath = QFileInfo(bundlePath).absoluteFilePath();
-    foreach (const QString &binary, binaryPaths) {
+    for (const QString &binary : binaryPaths) {
         QString deployedInstallName;
         if (useLoaderPath) {
             deployedInstallName = QLatin1String("@loader_path/")
@@ -849,17 +859,11 @@ void changeInstallName(const QString &bundlePath, const FrameworkInfo &framework
         } else {
             deployedInstallName = framework.deployedInstallName;
         }
-        changeInstallName(framework.installName, deployedInstallName, binary);
+        if (!framework.sourceFilePath.isEmpty()) {
-        // Workaround for the case when the library ID name is a symlink, while the dependencies
+            changeInstallName(framework.sourceFilePath, deployedInstallName, binary);
-        // specified using the canonical path to the library (QTBUG-56814)
-        QString canonicalInstallName = QFileInfo(framework.installName).canonicalFilePath();
-        if (!canonicalInstallName.isEmpty() && canonicalInstallName != framework.installName) {
-            changeInstallName(canonicalInstallName, deployedInstallName, binary);
         }
-        // Homebrew workaround, resolve symlink /usr/local/opt/library to /usr/local/Cellar/library
+        if (!framework.installName.isEmpty() && framework.installName != framework.sourceFilePath) {
-        if (framework.installName.startsWith("/usr/local/opt/") && framework.installName.count('/') >= 5) {
+            changeInstallName(framework.installName, deployedInstallName, binary);
-            canonicalInstallName = QFileInfo(framework.installName.section('/', 0, 4)).canonicalFilePath() + "/" + framework.installName.section('/', 5);
-            changeInstallName(canonicalInstallName, deployedInstallName, binary);
         }
     }
 }
@@ -869,7 +873,7 @@ void addRPath(const QString &rpath, const QString &binaryPath)
     runInstallNameTool(QStringList() << "-add_rpath" << rpath << binaryPath);
 }
 
-void deployRPaths(const QString &bundlePath, const QSet<QString> &rpaths, const QString &binaryPath, bool useLoaderPath)
+void deployRPaths(const QString &bundlePath, const QList<QString> &rpaths, const QString &binaryPath, bool useLoaderPath)
 {
     const QString absFrameworksPath = QFileInfo(bundlePath).absoluteFilePath()
             + QLatin1String("/Contents/Frameworks");
@@ -877,7 +881,8 @@ void deployRPaths(const QString &bundlePath, const QSet<QString> &rpaths, const
     const QString loaderPathToFrameworks = QLatin1String("@loader_path/") + relativeFrameworkPath;
     bool rpathToFrameworksFound = false;
     QStringList args;
-    foreach (const QString &rpath, getBinaryRPaths(binaryPath, false)) {
+    QList<QString> binaryRPaths = getBinaryRPaths(binaryPath, false);
+    for (const QString &rpath : std::as_const(binaryRPaths)) {
         if (rpath == "@executable_path/../Frameworks" ||
                 rpath == loaderPathToFrameworks) {
             rpathToFrameworksFound = true;
@@ -903,9 +908,9 @@ void deployRPaths(const QString &bundlePath, const QSet<QString> &rpaths, const
     runInstallNameTool(QStringList() << args << binaryPath);
 }
 
-void deployRPaths(const QString &bundlePath, const QSet<QString> &rpaths, const QStringList &binaryPaths, bool useLoaderPath)
+void deployRPaths(const QString &bundlePath, const QList<QString> &rpaths, const QStringList &binaryPaths, bool useLoaderPath)
 {
-    foreach (const QString &binary, binaryPaths) {
+    for (const QString &binary : binaryPaths) {
         deployRPaths(bundlePath, rpaths, binary, useLoaderPath);
     }
 }
@@ -971,7 +976,7 @@ DeploymentInfo deployQtFrameworks(QList<FrameworkInfo> frameworks,
     deploymentInfo.useLoaderPath = useLoaderPath;
     deploymentInfo.isFramework = bundlePath.contains(".framework");
     deploymentInfo.isDebug = false;
-    QSet<QString> rpathsUsed;
+    QList<QString> rpathsUsed;
 
     while (frameworks.isEmpty() == false) {
         const FrameworkInfo framework = frameworks.takeFirst();
@@ -983,16 +988,22 @@ DeploymentInfo deployQtFrameworks(QList<FrameworkInfo> frameworks,
         if (framework.isDebugLibrary())
             deploymentInfo.isDebug = true;
 
-        if (deploymentInfo.qtPath.isNull())
+        if (deploymentInfo.qtPath.isNull()) {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
             deploymentInfo.qtPath = QLibraryInfo::path(QLibraryInfo::PrefixPath);
+#else
+            deploymentInfo.qtPath = QLibraryInfo::location(QLibraryInfo::PrefixPath);
+#endif
+        }
 
         if (framework.frameworkDirectory.startsWith(bundlePath)) {
             LogError()  << framework.frameworkName << "already deployed, skipping.";
             continue;
         }
 
-        if (!framework.rpathUsed.isEmpty())
+        if (!framework.rpathUsed.isEmpty() && !rpathsUsed.contains(framework.rpathUsed)) {
-            rpathsUsed << framework.rpathUsed;
+            rpathsUsed.append(framework.rpathUsed);
+        }
 
         // Copy the framework/dylib to the app bundle.
         const QString deployedBinaryPath = framework.isDylib ? copyDylib(framework, bundlePath)
@@ -1015,11 +1026,11 @@ DeploymentInfo deployQtFrameworks(QList<FrameworkInfo> frameworks,
         // Check for framework dependencies
         QList<FrameworkInfo> dependencies = getQtFrameworks(deployedBinaryPath, bundlePath, rpathsUsed, useDebugLibs);
 
-        foreach (FrameworkInfo dependency, dependencies) {
+        for (const FrameworkInfo &dependency : dependencies) {
             if (dependency.rpathUsed.isEmpty()) {
                 changeInstallName(bundlePath, dependency, QStringList() << deployedBinaryPath, useLoaderPath);
             } else {
-                rpathsUsed << dependency.rpathUsed;
+                rpathsUsed.append(dependency.rpathUsed);
             }
 
             // Deploy framework if necessary.
@@ -1031,6 +1042,7 @@ DeploymentInfo deployQtFrameworks(QList<FrameworkInfo> frameworks,
     deploymentInfo.deployedFrameworks = copiedFrameworks;
     deployRPaths(bundlePath, rpathsUsed, binaryPaths, useLoaderPath);
     deploymentInfo.rpathsUsed += rpathsUsed;
+    deploymentInfo.rpathsUsed.removeDuplicates();
     return deploymentInfo;
 }
 
@@ -1042,8 +1054,14 @@ DeploymentInfo deployQtFrameworks(const QString &appBundlePath, const QStringLis
    applicationBundle.libraryPaths = findAppLibraries(appBundlePath);
    QStringList allBinaryPaths = QStringList() << applicationBundle.binaryPath << applicationBundle.libraryPaths
                                                  << additionalExecutables;
-   QSet<QString> allLibraryPaths = getBinaryRPaths(applicationBundle.binaryPath, true);
+   QList<QString> allLibraryPaths = getBinaryRPaths(applicationBundle.binaryPath, true);
-   allLibraryPaths.insert(QLibraryInfo::path(QLibraryInfo::LibrariesPath));
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+   allLibraryPaths.append(QLibraryInfo::path(QLibraryInfo::LibrariesPath));
+#else
+   allLibraryPaths.append(QLibraryInfo::location(QLibraryInfo::LibrariesPath));
+#endif
+   allLibraryPaths.removeDuplicates();
+
    QList<FrameworkInfo> frameworks = getQtFrameworksForPaths(allBinaryPaths, appBundlePath, allLibraryPaths, useDebugLibs);
    if (frameworks.isEmpty() && !alwaysOwerwriteEnabled) {
         LogWarning();
@@ -1059,7 +1077,7 @@ DeploymentInfo deployQtFrameworks(const QString &appBundlePath, const QStringLis
 QString getLibInfix(const QStringList &deployedFrameworks)
 {
     QString libInfix;
-    foreach (const QString &framework, deployedFrameworks) {
+    for (const QString &framework : deployedFrameworks) {
         if (framework.startsWith(QStringLiteral("QtCore")) && framework.endsWith(QStringLiteral(".framework"))) {
             Q_ASSERT(framework.length() >= 16);
             // 16 == "QtCore" + ".framework"
@@ -1114,7 +1132,7 @@ void deployPlugins(const ApplicationBundleInfo &appBundleInfo, const QString &pl
 
     // Network
     if (deploymentInfo.containsModule("Network", libInfix))
-        addPlugins(QStringLiteral("bearer"));
+        addPlugins(QStringLiteral("tls"));
 
     // All image formats (svg if QtSvg is used)
     const bool usesSvg = deploymentInfo.containsModule("Svg", libInfix);
@@ -1181,7 +1199,7 @@ void deployPlugins(const ApplicationBundleInfo &appBundleInfo, const QString &pl
         }
     }
 
-    foreach (const QString &plugin, pluginList) {
+    for (const QString &plugin : pluginList) {
         QString sourcePath = pluginSourcePath + "/" + plugin;
         const QString destinationPath = pluginDestinationPath + "/" + plugin;
         QDir dir;
@@ -1198,7 +1216,15 @@ void deployPlugins(const ApplicationBundleInfo &appBundleInfo, const QString &pl
     {
       QString sourcePath = qgetenv("GIO_EXTRA_MODULES");
       if (sourcePath.isEmpty()) {
-        sourcePath = "/usr/local/lib/gio/modules/libgiognutls.so";
+        if (QFileInfo::exists("/usr/local/lib/gio/modules/libgiognutls.so")) {
+          sourcePath = "/usr/local/lib/gio/modules/libgiognutls.so";
+        }
+        else if (QFileInfo::exists("/opt/local/lib/gio/modules/libgiognutls.so")) {
+          sourcePath = "/opt/local/lib/gio/modules/libgiognutls.so";
+        }
+        else {
+          qFatal("Missing GIO_EXTRA_MODULES");
+        }
       }
       else {
         sourcePath = sourcePath + "/libgiognutls.so";
@@ -1216,7 +1242,15 @@ void deployPlugins(const ApplicationBundleInfo &appBundleInfo, const QString &pl
     {
       QString sourcePath = qgetenv("GST_PLUGIN_SCANNER");
       if (sourcePath.isEmpty()) {
-        sourcePath = "/usr/local/opt/gstreamer/libexec/gstreamer-1.0/gst-plugin-scanner";
+        if (QFileInfo::exists("/usr/local/opt/gstreamer/libexec/gstreamer-1.0/gst-plugin-scanner")) {
+          sourcePath = "/usr/local/opt/gstreamer/libexec/gstreamer-1.0/gst-plugin-scanner";
+        }
+        else if (QFileInfo::exists("/opt/local/libexec/gstreamer-1.0/gst-plugin-scanner")) {
+          sourcePath = "/opt/local/libexec/gstreamer-1.0/gst-plugin-scanner";
+        }
+        else {
+          qFatal("Missing GST_PLUGIN_SCANNER.");
+        }
       }
       const QString destinationPath = appBundleInfo.path + "/" + "Contents/PlugIns/gst-plugin-scanner";
       QDir dir;
@@ -1263,11 +1297,9 @@ void deployPlugins(const ApplicationBundleInfo &appBundleInfo, const QString &pl
                                                   << "libgstrtsp.dylib"
                                                   << "libgstflac.dylib"
                                                   << "libgstwavparse.dylib"
-                                                  << "libgstfaac.dylib"
                                                   << "libgstfaad.dylib"
                                                   << "libgstogg.dylib"
                                                   << "libgstopus.dylib"
-                                                  << "libgstopusparse.dylib"
                                                   << "libgstasf.dylib"
                                                   << "libgstspeex.dylib"
                                                   << "libgsttaglib.dylib"
@@ -1275,22 +1307,59 @@ void deployPlugins(const ApplicationBundleInfo &appBundleInfo, const QString &pl
                                                   << "libgstisomp4.dylib"
                                                   << "libgstlibav.dylib"
                                                   << "libgstaiff.dylib"
-                                                  << "libgstlame.dylib"
+                                                  << "libgstlame.dylib";
-                                                  << "libgstmusepack.dylib";
 
-   QString gstreamer_plugins_dir = qgetenv("GST_PLUGIN_PATH");
+    // macports does not have these.
-   if (gstreamer_plugins_dir.isEmpty()) {
+    QStringList gstreamer_plugins_optional = QStringList() << "libgstopusparse.dylib"
-     gstreamer_plugins_dir = "/usr/local/lib/gstreamer-1.0";
+                                                           << "libgstfaac.dylib"
-   }
+                                                           << "libgstmusepack.dylib";
+
+    QString gstreamer_plugins_dir = qgetenv("GST_PLUGIN_PATH");
+    if (gstreamer_plugins_dir.isEmpty()) {
+      if (QDir().exists("/usr/local/lib/gstreamer-1.0")) {
+        gstreamer_plugins_dir = "/usr/local/lib/gstreamer-1.0";
+      }
+      else if (QDir().exists("/opt/local/lib/gstreamer-1.0")) {
+        gstreamer_plugins_dir = "/opt/local/lib/gstreamer-1.0";
+      }
+      else {
+        qFatal("Missing GST_PLUGIN_PATH.");
+      }
+    }
 
     for (const QString &plugin : gstreamer_plugins) {
-        const QString sourcePath = gstreamer_plugins_dir + "/" + plugin;
+        QFileInfo info(gstreamer_plugins_dir + "/" + plugin);
-        const QString destinationPath = appBundleInfo.path + "/Contents/PlugIns/gstreamer/" + plugin;
+        if (!info.exists()) {
-        QDir dir;
+            info.setFile(gstreamer_plugins_dir + "/" + info.baseName() + QString(".so"));
-        if (dir.mkpath(QFileInfo(destinationPath).path()) && copyFilePrintStatus(sourcePath, destinationPath)) {
+            if (!info.exists()) {
-          runStrip(destinationPath);
+                LogError() << "Missing gstreamer plugin" << info.baseName();
-          QList<FrameworkInfo> frameworks = getQtFrameworks(destinationPath, appBundleInfo.path, deploymentInfo.rpathsUsed, useDebugLibs);
+                qFatal("Missing %s", info.baseName().toUtf8().constData());
-          deployQtFrameworks(frameworks, appBundleInfo.path, QStringList() << destinationPath, useDebugLibs, deploymentInfo.useLoaderPath);
+            }
+        }
+        const QString &sourcePath = info.filePath();
+        const QString destinationPath = appBundleInfo.path + "/Contents/PlugIns/gstreamer/" + info.fileName();
+        if (QDir().mkpath(QFileInfo(destinationPath).path()) && copyFilePrintStatus(sourcePath, destinationPath)) {
+            runStrip(destinationPath);
+            QList<FrameworkInfo> frameworks = getQtFrameworks(destinationPath, appBundleInfo.path, deploymentInfo.rpathsUsed, useDebugLibs);
+            deployQtFrameworks(frameworks, appBundleInfo.path, QStringList() << destinationPath, useDebugLibs, deploymentInfo.useLoaderPath);
+        }
+    }
+
+    for (const QString &plugin : gstreamer_plugins_optional) {
+        QFileInfo info(gstreamer_plugins_dir + "/" + plugin);
+        if (!info.exists()) {
+            info.setFile(gstreamer_plugins_dir + "/" + info.baseName() + QString(".so"));
+            if (!info.exists()) {
+                LogWarning() << "Skip missing gstreamer plugin" << info.baseName();
+                continue;
+            }
+        }
+        const QString &sourcePath = info.filePath();
+        const QString destinationPath = appBundleInfo.path + "/Contents/PlugIns/gstreamer/" + info.fileName();
+        if (QDir().mkpath(QFileInfo(destinationPath).path()) && copyFilePrintStatus(sourcePath, destinationPath)) {
+            runStrip(destinationPath);
+            QList<FrameworkInfo> frameworks = getQtFrameworks(destinationPath, appBundleInfo.path, deploymentInfo.rpathsUsed, useDebugLibs);
+            deployQtFrameworks(frameworks, appBundleInfo.path, QStringList() << destinationPath, useDebugLibs, deploymentInfo.useLoaderPath);
         }
     }
 
@@ -1337,7 +1406,7 @@ void deployPlugins(const QString &appBundlePath, DeploymentInfo deploymentInfo,
     deployPlugins(applicationBundle, deploymentInfo.pluginPath, pluginDestinationPath, deploymentInfo, useDebugLibs);
 }
 
-void deployQmlImport(const QString &appBundlePath, const QSet<QString> &rpaths, const QString &importSourcePath, const QString &importName)
+void deployQmlImport(const QString &appBundlePath, const QList<QString> &rpaths, const QString &importSourcePath, const QString &importName)
 {
     QString importDestinationPath = appBundlePath + "/Contents/Resources/qml/" + importName;
 
@@ -1366,15 +1435,19 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf
     LogNormal() << "Application QML file path(s) is" << qmlDirs;
     LogNormal() << "QML module search path(s) is" << qmlImportPaths;
 
-    // Use qmlimportscanner from QLibraryInfo::BinariesPath
+    // Use qmlimportscanner from QLibraryInfo::LibraryExecutablesPath
-    QString qmlImportScannerPath = QDir::cleanPath(QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlimportscanner");
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    QString qmlImportScannerPath = QDir::cleanPath(QLibraryInfo::path(QLibraryInfo::LibraryExecutablesPath) + "/qmlimportscanner");
+#else
+    QString qmlImportScannerPath = QDir::cleanPath(QLibraryInfo::location(QLibraryInfo::LibraryExecutablesPath) + "/qmlimportscanner");
+#endif
 
     // Fallback: Look relative to the macdeployqt binary
-    if (!QFile(qmlImportScannerPath).exists())
+    if (!QFile::exists(qmlImportScannerPath))
         qmlImportScannerPath = QCoreApplication::applicationDirPath() + "/qmlimportscanner";
 
     // Verify that we found a qmlimportscanner binary
-    if (!QFile(qmlImportScannerPath).exists()) {
+    if (!QFile::exists(qmlImportScannerPath)) {
         LogError() << "qmlimportscanner not found at" << qmlImportScannerPath;
         LogError() << "Rebuild qtdeclarative/tools/qmlimportscanner";
         return false;
@@ -1383,13 +1456,17 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf
     // build argument list for qmlimportsanner: "-rootPath foo/ -rootPath bar/ -importPath path/to/qt/qml"
     // ("rootPath" points to a directory containing app qml, "importPath" is where the Qt imports are installed)
     QStringList argumentList;
-    foreach (const QString &qmlDir, qmlDirs) {
+    for (const QString &qmlDir : qmlDirs) {
         argumentList.append("-rootPath");
         argumentList.append(qmlDir);
     }
     for (const QString &importPath : qmlImportPaths)
         argumentList << "-importPath" << importPath;
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
     QString qmlImportsPath = QLibraryInfo::path(QLibraryInfo::Qml2ImportsPath);
+#else
+    QString qmlImportsPath = QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath);
+#endif
     argumentList.append( "-importPath");
     argumentList.append(qmlImportsPath);
 
@@ -1427,7 +1504,7 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf
     std::sort(array.begin(), array.end(), importLessThan);
 
     // deploy each import
-    foreach (const QVariant &importValue, array) {
+    for (const QVariant &importValue : array) {
         QVariantMap import = importValue.toMap();
         QString name = import["name"].toString();
         QString path = import["path"].toString();
@@ -1524,7 +1601,7 @@ QSet<QString> codesignBundle(const QString &identity,
     QString appBundleAbsolutePath = QFileInfo(appBundlePath).absoluteFilePath();
     QString rootBinariesPath = appBundleAbsolutePath + "/Contents/MacOS/";
     QStringList foundRootBinaries = QDir(rootBinariesPath).entryList(QStringList() << "*", QDir::Files);
-    foreach (const QString &binary, foundRootBinaries) {
+    for (const QString &binary : foundRootBinaries) {
         QString binaryPath = rootBinariesPath + binary;
         pendingBinaries.push(binaryPath);
         pendingBinariesSet.insert(binaryPath);
@@ -1533,14 +1610,14 @@ QSet<QString> codesignBundle(const QString &identity,
 
     bool getAbsoltuePath = true;
     QStringList foundPluginBinaries = findAppBundleFiles(appBundlePath + "/Contents/PlugIns/", getAbsoltuePath);
-    foreach (const QString &binary, foundPluginBinaries) {
+    for (const QString &binary : foundPluginBinaries) {
          pendingBinaries.push(binary);
          pendingBinariesSet.insert(binary);
     }
 
     // Add frameworks for processing.
     QStringList frameworkPaths = findAppFrameworkPaths(appBundlePath);
-    foreach (const QString &frameworkPath, frameworkPaths) {
+    for (const QString &frameworkPath : frameworkPaths) {
 
         // Prioritise first to sign any additional inner bundles found in the Helpers folder (e.g
         // used by QtWebEngine).
@@ -1549,7 +1626,7 @@ QSet<QString> codesignBundle(const QString &identity,
             helpersIterator.next();
             QString helpersPath = helpersIterator.filePath();
             QStringList innerBundleNames = QDir(helpersPath).entryList(QStringList() << "*.app", QDir::Dirs);
-            foreach (const QString &innerBundleName, innerBundleNames)
+            for (const QString &innerBundleName : innerBundleNames)
                 signedBinaries += codesignBundle(identity,
                                                  helpersPath + "/" + innerBundleName,
                                                  additionalBinariesContainingRpaths);
@@ -1562,7 +1639,7 @@ QSet<QString> codesignBundle(const QString &identity,
             librariesIterator.next();
             QString librariesPath = librariesIterator.filePath();
             QStringList bundleFiles = findAppBundleFiles(librariesPath, getAbsoltuePath);
-            foreach (const QString &binary, bundleFiles) {
+            for (const QString &binary : bundleFiles) {
                 pendingBinaries.push(binary);
                 pendingBinariesSet.insert(binary);
             }
@@ -1587,7 +1664,7 @@ QSet<QString> codesignBundle(const QString &identity,
             pendingBinaries.push(binary);
             pendingBinariesSet.insert(binary);
             int dependenciesSkipped = 0;
-            foreach (const QString &dependency, dependencies) {
+            for (const QString &dependency : std::as_const(dependencies)) {
                 // Skip dependencies that are outside the current app bundle, because this might
                 // cause a codesign error if the current bundle is part of the dependency (e.g.
                 // a bundle is part of a framework helper, and depends on that framework).
@@ -1698,109 +1775,3 @@ void fixupFramework(const QString &frameworkName)
     addRPath("@loader_path/../../Contents/Frameworks/", frameworkBinary);
 }
 
-bool FinalCheck(const QString &appBundlePath) {
-
-  bool success = true;
-
-  QDirIterator iter(appBundlePath, QDir::Files | QDir::NoSymLinks, QDirIterator::Subdirectories);
-  while (iter.hasNext()) {
-    iter.next();
-    QString filepath = iter.fileInfo().filePath();
-
-    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;
-    }
-
-    //qDebug() << "Final check on" << filepath;
-
-    QProcess otool;
-    otool.start("otool", QStringList() << "-L" << filepath);
-    otool.waitForFinished();
-    if (otool.exitStatus() != QProcess::NormalExit || otool.exitCode() != 0) {
-      LogError() << otool.readAllStandardError();
-      success = false;
-      continue;
-    }
-    QString output = otool.readAllStandardOutput();
-    QStringList output_lines = output.split("\n", Qt::SkipEmptyParts);
-    if (output_lines.size() < 2) {
-      LogError() << "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 {
-      LogError() << "First line" << first_line << "does not match" << filepath;
-      success = false;
-    }
-    static const 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;
-
-      const auto 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", appBundlePath + "/Contents/MacOS");
-          if (!QFile(real_path).exists()) {
-            LogError() << real_path << "does not exist for" << filepath;
-            success = false;
-          }
-        }
-        else if (library.startsWith("@rpath")) {
-          QString real_path = library;
-          real_path = real_path.replace("@rpath", appBundlePath + "/Contents/Frameworks");
-          if (!QFile(real_path).exists() && !real_path.endsWith("QtSvg")) { // FIXME: Ignore broken svg image plugin.
-            LogError() << 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()) {
-            LogError() << 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 {
-          LogError() << "File" << filepath << "points to" << library;
-          success = false;
-        }
-      }
-      else {
-        LogError() << "Could not parse otool output line:" << output_line;
-        success = false;
-      }
-    }
-  }
-
-  return success;
-
-}

3rdparty/macdeployqt/shared.h

@@ -62,7 +62,7 @@ public:
 
     bool isDebugLibrary() const
     {
-        return binaryName.contains(QLatin1String("_debug"));
+        return binaryName.endsWith(QStringLiteral("_debug"));
     }
 };
 
@@ -101,7 +101,7 @@ public:
     QString qtPath;
     QString pluginPath;
     QStringList deployedFrameworks;
-    QSet<QString> rpathsUsed;
+    QList<QString> rpathsUsed;
     bool useLoaderPath;
     bool isFramework;
     bool isDebug;
@@ -112,10 +112,10 @@ public:
 inline QDebug operator<<(QDebug debug, const ApplicationBundleInfo &info);
 
 OtoolInfo findDependencyInfo(const QString &binaryPath);
-FrameworkInfo parseOtoolLibraryLine(const QString &line, const QString &appBundlePath, const QSet<QString> &rpaths, bool useDebugLibs);
+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 QSet<QString> &rpaths, bool useDebugLibs);
+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 QSet<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);
@@ -136,6 +136,6 @@ QSet<QString> codesignBundle(const QString &identity,
 void codesign(const QString &identity, const QString &appBundlePath);
 void createDiskImage(const QString &appBundlePath, const QString &filesystemType);
 void fixupFramework(const QString &appBundlePath);
-bool FinalCheck(const QString &appBundlePath);
+
 
 #endif

3rdparty/singleapplication/CMakeLists.txt

@@ -3,18 +3,12 @@ cmake_minimum_required(VERSION 3.0)
 include(CheckIncludeFiles)
 include(CheckFunctionExists)
 
-if(CMAKE_VERSION VERSION_GREATER 3.0)
+check_function_exists(geteuid HAVE_GETEUID)
-  check_function_exists(geteuid HAVE_GETEUID)
+check_function_exists(getpwuid HAVE_GETPWUID)
-  check_function_exists(getpwuid HAVE_GETPWUID)
-endif()
 
 set(SINGLEAPP-SOURCES singleapplication.cpp singleapplication_p.cpp)
 set(SINGLEAPP-MOC-HEADERS singleapplication.h singleapplication_p.h)
-if(BUILD_WITH_QT6)
+qt_wrap_cpp(SINGLEAPP-SOURCES-MOC ${SINGLEAPP-MOC-HEADERS})
-  qt6_wrap_cpp(SINGLEAPP-SOURCES-MOC ${SINGLEAPP-MOC-HEADERS})
-else()
-  qt5_wrap_cpp(SINGLEAPP-SOURCES-MOC ${SINGLEAPP-MOC-HEADERS})
-endif()
 add_library(singleapplication STATIC ${SINGLEAPP-SOURCES} ${SINGLEAPP-SOURCES-MOC})
 target_include_directories(singleapplication PRIVATE
   ${CMAKE_CURRENT_SOURCE_DIR}
@@ -28,11 +22,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)
+qt_wrap_cpp(SINGLECOREAPP-SOURCES-MOC ${SINGLECOREAPP-MOC-HEADERS})
-  qt6_wrap_cpp(SINGLECOREAPP-SOURCES-MOC ${SINGLECOREAPP-MOC-HEADERS})
-else()
-  qt5_wrap_cpp(SINGLECOREAPP-SOURCES-MOC ${SINGLECOREAPP-MOC-HEADERS})
-endif()
 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;
@@ -237,8 +237,9 @@ bool SingleApplicationPrivate::connectToPrimary(const int timeout, const Connect
     forever {
       randomSleep();
 
-      if (socket_->state() != QLocalSocket::ConnectingState)
+      if (socket_->state() != QLocalSocket::ConnectingState) {
         socket_->connectToServer(blockServerName_);
+      }
 
       if (socket_->state() == QLocalSocket::ConnectingState) {
         socket_->waitForConnected(static_cast<int>(timeout - time.elapsed()));
@@ -284,7 +285,7 @@ bool SingleApplicationPrivate::connectToPrimary(const int timeout, const Connect
 
 }
 
-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());
@@ -327,7 +328,7 @@ void SingleApplicationPrivate::slotConnectionEstablished() {
   connectionMap_.insert(nextConnSocket, ConnectionInfo());
 
   QObject::connect(nextConnSocket, &QLocalSocket::aboutToClose, this, [nextConnSocket, this]() {
-    auto &info = connectionMap_[nextConnSocket];
+    const ConnectionInfo info = connectionMap_[nextConnSocket];
     slotClientConnectionClosed(nextConnSocket, info.instanceId);
   });
 
@@ -337,7 +338,7 @@ void SingleApplicationPrivate::slotConnectionEstablished() {
   });
 
   QObject::connect(nextConnSocket, &QLocalSocket::readyRead, this, [nextConnSocket, this]() {
-    auto &info = connectionMap_[nextConnSocket];
+    const ConnectionInfo info = connectionMap_[nextConnSocket];
     switch (info.stage) {
       case StageHeader:
         readInitMessageHeader(nextConnSocket);
@@ -395,7 +396,7 @@ void SingleApplicationPrivate::readInitMessageBody(QLocalSocket *sock) {
   }
 
   // Read the message body
-  QByteArray msgBytes = sock->read(info.msgLen);
+  QByteArray msgBytes = sock->read(static_cast<qint64>(info.msgLen));
   QDataStream readStream(msgBytes);
   readStream.setVersion(QDataStream::Qt_5_8);
 
@@ -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 timeout, const ConnectionType connectionType);
-  quint16 blockChecksum();
+  quint16 blockChecksum() const;
-  qint64 primaryPid();
+  qint64 primaryPid() const;
-  QString primaryUser();
+  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;
@@ -237,8 +237,9 @@ bool SingleCoreApplicationPrivate::connectToPrimary(const int timeout, const Con
     forever {
       randomSleep();
 
-      if (socket_->state() != QLocalSocket::ConnectingState)
+      if (socket_->state() != QLocalSocket::ConnectingState) {
         socket_->connectToServer(blockServerName_);
+      }
 
       if (socket_->state() == QLocalSocket::ConnectingState) {
         socket_->waitForConnected(static_cast<int>(timeout - time.elapsed()));
@@ -284,7 +285,7 @@ bool SingleCoreApplicationPrivate::connectToPrimary(const int timeout, const Con
 
 }
 
-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());
@@ -327,7 +328,7 @@ void SingleCoreApplicationPrivate::slotConnectionEstablished() {
   connectionMap_.insert(nextConnSocket, ConnectionInfo());
 
   QObject::connect(nextConnSocket, &QLocalSocket::aboutToClose, this, [nextConnSocket, this]() {
-    auto &info = connectionMap_[nextConnSocket];
+    const ConnectionInfo info = connectionMap_[nextConnSocket];
     slotClientConnectionClosed(nextConnSocket, info.instanceId);
   });
 
@@ -337,7 +338,7 @@ void SingleCoreApplicationPrivate::slotConnectionEstablished() {
   });
 
   QObject::connect(nextConnSocket, &QLocalSocket::readyRead, this, [nextConnSocket, this]() {
-    auto &info = connectionMap_[nextConnSocket];
+    const ConnectionInfo info = connectionMap_[nextConnSocket];
     switch (info.stage) {
       case StageHeader:
         readInitMessageHeader(nextConnSocket);
@@ -395,7 +396,7 @@ void SingleCoreApplicationPrivate::readInitMessageBody(QLocalSocket *sock) {
   }
 
   // Read the message body
-  QByteArray msgBytes = sock->read(info.msgLen);
+  QByteArray msgBytes = sock->read(static_cast<qint64>(info.msgLen));
   QDataStream readStream(msgBytes);
   readStream.setVersion(QDataStream::Qt_5_8);
 
@@ -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"
 
@@ -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 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 timeout, const ConnectionType connectionType);
-  quint16 blockChecksum();
+  quint16 blockChecksum() const;
-  qint64 primaryPid();
+  qint64 primaryPid() const;
-  QString primaryUser();
+  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,34 +35,38 @@ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-list(APPEND COMPILE_OPTIONS
+if(MSVC)
-  $<$<COMPILE_LANGUAGE:C>:-std=c99>
+  list(APPEND COMPILE_OPTIONS /std:c++17 /MP)
-  $<$<COMPILE_LANGUAGE:CXX>:-std=c++17>
+else()
-  -Wall
+  list(APPEND COMPILE_OPTIONS
-  -Wextra
+    $<$<COMPILE_LANGUAGE:C>:-std=c99>
-  -Wpedantic
+    $<$<COMPILE_LANGUAGE:CXX>:-std=c++17>
-  -Wunused
+    -Wall
-  -Wshadow
+    -Wextra
-  -Wundef
+    -Wpedantic
-  -Wuninitialized
+    -Wunused
-  -Wredundant-decls
+    -Wshadow
-  -Wcast-align
+    -Wundef
-  -Winit-self
+    -Wuninitialized
-  -Wmissing-include-dirs
+    -Wredundant-decls
-  -Wmissing-declarations
+    -Wcast-align
-  -Wstrict-overflow=2
+    -Winit-self
-  -Wunused-parameter
+    -Wmissing-include-dirs
-  -Wformat=2
+    -Wmissing-declarations
-  -Wdisabled-optimization
+    -Wstrict-overflow=2
-  $<$<COMPILE_LANGUAGE:CXX>:-Woverloaded-virtual>
+    -Wunused-parameter
-  $<$<COMPILE_LANGUAGE:CXX>:-Wno-old-style-cast>
+    -Wformat=2
-  $<$<COMPILE_LANGUAGE:CXX>:-fpermissive>
+    -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})
 
@@ -77,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)
+endif()
-if (UNIX AND NOT APPLE)
+if(UNIX AND NOT APPLE)
   find_package(X11)
   pkg_check_modules(XCB xcb)
 endif()
@@ -123,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)
@@ -132,81 +136,99 @@ find_package(FFTW3)
 find_package(GTest)
 find_library(GMOCK_LIBRARY gmock)
 
-if(NOT QT_DEFAULT_MAJOR_VERSION)
+option(QT_VERSION_MAJOR "Qt version to use (5 or 6)")
-  set(QT_DEFAULT_MAJOR_VERSION 5)
+option(BUILD_WITH_QT5 "Build with Qt 5" OFF)
-endif()
+option(BUILD_WITH_QT6 "Build with Qt 6" OFF)
-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)
 
 if(WITH_QT6)
   set(BUILD_WITH_QT6 ON)
 endif()
-
+if(QT_MAJOR_VERSION)
-if(BUILD_WITH_QT5)
+  set(QT_VERSION_MAJOR ${QT_MAJOR_VERSION})
-  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()
 endif()
 
-set(QT_COMPONENTS Core Concurrent Widgets Network Sql)
+if(QT_VERSION_MAJOR)
-set(QT_OPTIONAL_COMPONENTS Test)
+  set(QT_DEFAULT_MAJOR_VERSION ${QT_VERSION_MAJOR})
-
-if(QT_MAJOR_VERSION EQUAL 5)
-  set(QT_MIN_VERSION 5.8)
 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(QtCore_LIBRARIES Qt${QT_VERSION_MAJOR}::Core)
-set(QtConcurrent_LIBRARIES Qt${QT_MAJOR_VERSION}::Concurrent)
+set(QtConcurrent_LIBRARIES Qt${QT_VERSION_MAJOR}::Concurrent)
-set(QtGui_LIBRARIES Qt${QT_MAJOR_VERSION}::Gui)
+set(QtGui_LIBRARIES Qt${QT_VERSION_MAJOR}::Gui)
-set(QtWidgets_LIBRARIES Qt${QT_MAJOR_VERSION}::Widgets)
+set(QtWidgets_LIBRARIES Qt${QT_VERSION_MAJOR}::Widgets)
-set(QtNetwork_LIBRARIES Qt${QT_MAJOR_VERSION}::Network)
+set(QtNetwork_LIBRARIES Qt${QT_VERSION_MAJOR}::Network)
-set(QtSql_LIBRARIES Qt${QT_MAJOR_VERSION}::Sql)
+set(QtSql_LIBRARIES Qt${QT_VERSION_MAJOR}::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)
+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_MAJOR_VERSION}DBus_FOUND)
+if(Qt${QT_VERSION_MAJOR}DBus_FOUND)
-  set(QtDBus_LIBRARIES Qt${QT_MAJOR_VERSION}::DBus)
+  set(QtDBus_LIBRARIES Qt${QT_VERSION_MAJOR}::DBus)
-  list(APPEND QT_LIBRARIES Qt${QT_MAJOR_VERSION}::DBus)
+  list(APPEND QT_LIBRARIES Qt${QT_VERSION_MAJOR}::DBus)
-  get_target_property(QT_DBUSXML2CPP_EXECUTABLE Qt${QT_MAJOR_VERSION}::qdbusxml2cpp LOCATION)
+  get_target_property(QT_DBUSXML2CPP_EXECUTABLE Qt${QT_VERSION_MAJOR}::qdbusxml2cpp LOCATION)
 endif()
-if(Qt${QT_MAJOR_VERSION}X11Extras_FOUND)
+if(BUILD_WITH_QT5 AND Qt5X11Extras_FOUND)
-  set(QtX11Extras_LIBRARIES Qt${QT_MAJOR_VERSION}::X11Extras)
-  list(APPEND QT_LIBRARIES Qt${QT_MAJOR_VERSION}::X11Extras)
   set(HAVE_X11EXTRAS ON)
+  set(QtX11Extras_LIBRARIES Qt5::X11Extras)
+  list(APPEND QT_LIBRARIES Qt5::X11Extras)
 endif()
-if(Qt${QT_MAJOR_VERSION}WinExtras_FOUND)
+if(Qt${QT_VERSION_MAJOR}Test_FOUND)
-  set(QtWinExtras_LIBRARIES Qt${QT_MAJOR_VERSION}::WinExtras)
+  set(QtTest_LIBRARIES Qt${QT_VERSION_MAJOR}::Test)
-  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)
 endif()
 
-find_package(Qt${QT_MAJOR_VERSION} QUIET COMPONENTS LinguistTools CONFIG)
+find_package(Qt${QT_VERSION_MAJOR} QUIET COMPONENTS LinguistTools CONFIG)
-if(Qt${QT_MAJOR_VERSION}LinguistTools_FOUND)
+if(Qt${QT_VERSION_MAJOR}LinguistTools_FOUND)
-  set(QT_LCONVERT_EXECUTABLE Qt${QT_MAJOR_VERSION}::lconvert)
+  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)
@@ -222,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})
+option(USE_TAGLIB "Build with TagLib" OFF)
-if(QPA_QPLATFORMNATIVEINTERFACE_H)
+option(USE_TAGPARSER "Build with TagParser" OFF)
-  set(HAVE_QPA_QPLATFORMNATIVEINTERFACE_H ON)
+
-  include_directories(${Qt${QT_MAJOR_VERSION}Gui_PRIVATE_INCLUDE_DIRS})
+if(NOT USE_TAGLIB AND NOT USE_TAGPARSER)
-  message(STATUS "Have qpa/qplatformnativeinterface.h header.")
+  set(USE_TAGLIB ON)
-else()
-  message(STATUS "Missing qpa/qplatformnativeinterface.h header.")
 endif()
 
 # TAGLIB
-pkg_check_modules(TAGLIB REQUIRED taglib>=1.11.1)
+if(USE_TAGLIB)
-find_path(HAVE_TAGLIB_DSFFILE_H taglib/dsffile.h)
+  pkg_check_modules(TAGLIB REQUIRED taglib>=1.11.1)
-find_path(HAVE_TAGLIB_DSDIFFFILE_H taglib/dsdifffile.h)
+  if(TAGLIB_FOUND)
-if(HAVE_TAGLIB_DSFFILE_H)
+    find_path(HAVE_TAGLIB_DSFFILE_H taglib/dsffile.h)
-  set(HAVE_TAGLIB_DSFFILE ON)
+    find_path(HAVE_TAGLIB_DSDIFFFILE_H taglib/dsdifffile.h)
-endif(HAVE_TAGLIB_DSFFILE_H)
+    if(HAVE_TAGLIB_DSFFILE_H)
-if(HAVE_TAGLIB_DSDIFFFILE_H)
+      set(HAVE_TAGLIB_DSFFILE ON)
-  set(HAVE_TAGLIB_DSDIFFFILE ON)
+    endif(HAVE_TAGLIB_DSFFILE_H)
-endif(HAVE_TAGLIB_DSDIFFFILE_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)
@@ -252,11 +293,12 @@ set(SINGLECOREAPPLICATION_LIBRARIES singlecoreapplication)
 
 if(APPLE)
   find_library(SPARKLE Sparkle PATHS "/usr/local/opt/sparkle")
-  add_subdirectory(3rdparty/macdeployqt)
   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)
@@ -269,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
 )
 
@@ -306,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()
 
@@ -318,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"
+if(BUILD_WITH_QT6 AND (Qt6Core_VERSION VERSION_EQUAL 6.2.0 OR Qt6Core_VERSION VERSION_GREATER 6.2.0))
-  DEPENDS "X11Extras" Qt${QT_MAJOR_VERSION}X11Extras_FOUND
+  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"
@@ -372,24 +428,23 @@ optional_component(MOODBAR ON "Moodbar"
   DEPENDS "gstreamer" HAVE_GSTREAMER
 )
 
-if(LINUX OR APPLE)
+if(APPLE OR WIN32)
-  option(USE_BUNDLE "Bundle dependencies" OFF)
-elseif(WIN32)
   option(USE_BUNDLE "Bundle dependencies" ON)
+else()
+  option(USE_BUNDLE "Bundle dependencies" OFF)
 endif()
 
-if (USE_BUNDLE AND NOT USE_BUNDLE_DIR)
+if(USE_BUNDLE AND NOT USE_BUNDLE_DIR)
-if(LINUX)
+  if(LINUX)
-  set(USE_BUNDLE_DIR "../plugins")
+    set(USE_BUNDLE_DIR "../plugins")
-endif(LINUX)
+  endif()
-if(APPLE)
+  if(APPLE)
-  set(USE_BUNDLE_DIR "../PlugIns")
+    set(USE_BUNDLE_DIR "../PlugIns")
-endif(APPLE)
+  endif()
-endif(USE_BUNDLE AND NOT USE_BUNDLE_DIR)
+endif()
-
-# Check that we have sqlite3 with FTS5
 
 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("
@@ -400,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
@@ -417,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)
@@ -432,13 +511,9 @@ if(GTest_FOUND AND GMOCK_LIBRARY AND QtTest_LIBRARIES)
 endif()
 
 # Uninstall support
-configure_file(
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" IMMEDIATE @ONLY)
-  "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
-  "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
-  IMMEDIATE @ONLY)
 
-add_custom_target(uninstall
+add_custom_target(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
-  "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
 
 # Show a summary of what we have enabled
 summary_show()
@@ -448,10 +523,20 @@ 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)
+if(QT_VERSION_MAJOR EQUAL 5)
-  message(WARNING "sqlite3 must be enabled with FTS5. See: https://www.sqlite.org/fts5.html")
+  message(WARNING "It is detected that Strawberry is being built with Qt 5.  There are no bugfix releases for the latest minor LTS version of Qt 5 available to open-source users, only commercial users.  Therefore Strawberry should be built with Qt 6 when possible. Building with Qt 6 will also take advantage of improvements and new features not available in Qt 5.  To build with Qt 6 specify -DBUILD_WITH_QT6=ON to automatically detect Qt 6, or for example -DCMAKE_PREFIX_PATH=/usr/local/lib64/cmake to manually specify the Qt 6 directory.")
 endif()
 
-if(NOT TAGLIB_VERSION VERSION_GREATER_EQUAL 1.12)
+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(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,7 +2,124 @@ Strawberry Music Player
 =======================
 ChangeLog
 
-0.9.2:
+Version 1.0.1 (2022.01.08)
+
+  Bugfixes:
+    * Fixed collection and internet search filter tool button menu arrow overlap (#796).
+    * Fixed stop after this track button with Qt 6 (#795).
+    * Fixed not updating the URL when songs were moved on disk when the fingerprinting feature is enabled.
+    * Fixed SQL query error for songs with an invalid modification time (#815).
+    * Fixed blocky rendering of the currently playing track with high resolution screens (#794).
+    * Fixed incorrect playlist column filesize for radio streams.
+    * Fixed deleting embedded album cover from Ogg songs.
+    * Fixed parsing of Cue tracks with 1-digit minutes (#836).
+    * Fixed updating of playlist summary after reloading items when adding songs from files outside of the collection (#848).
+    * Fixed always saving metadata when saving playlists for Tidal, Qobuz and Subsonic songs independent of playlist setting (#851).
+    * Fixed setting media shortcuts when using kglobalaccel (#849).
+    * Fixed parsing of Genius lyrics when they are sometimes received in a different HTML format.
+    * Fixed saving MP4 specific tags as UTF-8 (#830).
+    * Fixed clearing "manually set" cover when saving album covers embedded from outside of the tag editor (#858).
+    * Fixed aborting collection scan when Strawberry exists to avoid hang on exit.
+    * Fixed resuming collection scan when adding a new directory after collection scan was aborted.
+    * Fixed excluding hidden songs from the collection.
+    * Disabled moodbar for CUE songs since they can not be supported properly (#865).
+    * (Windows) Added gstreamer gstxingmux plugin to fix transcoding to MP3 (#856).
+
+  Enhancements:
+    * Made playlist header column text elided (#801).
+    * Added support for reading and writing playcounts and ratings from/to tags.
+    * Added support for setting rating using the edit tag dialog.
+    * Added setting to enable/disable playlist toolbar (#809).
+    * Added component type, content_rating type and releases to AppStream data file (#806).
+    * Removed unused "mark as listened" option in organize dialog.
+    * Fixed some clazy warnings and narrowing conversions in the source code.
+    * Replaced uses of macros in the source code.
+    * Added a more user-friendly error message when receiving encrypted streams from Tidal (#824).
+    * Added support for port-pattern entered in the device textbox when using Jack as output (#828).
+    * Added Spanish (Spain) translation.
+    * Added support for more CUE filenames (#835).
+    * (Windows) Add gstreamer dash plugin.
+
+Version 1.0.0 (2021.10.14)
+
+  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.
+
+
+Version 0.9.3 (2021.04.18)
+
+  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.
+
+
+Version 0.9.2 (2021.03.25)
 
   Bugfixes:
     * Fix marking songs available.
@@ -13,7 +130,8 @@ ChangeLog
     * (macOS) Fix crash when opening cover manager.
     * (macOS) Fix broken Qt plugins resulting in album covers not showing.
 
-0.9.1:
+
+Version 0.9.1 (2021.03.13)
 
   Bugfixes:
     * Fix duplicating songs in the DB when organizing songs between 2 different collection directories.
@@ -48,7 +166,8 @@ ChangeLog
   New features:
     * Add option and support for saving embedded covers for FLAC, Ogg Vorbis, MP3 and MP4/AAC.
 
-0.8.5:
+
+Version 0.8.5 (2020.12.19)
 
   Bugfixes:
     * Fix return type of SmartPlaylistQueryWizardPlugin::type().
@@ -67,7 +186,8 @@ ChangeLog
     * Add command line option to play a playlist based on name.
     * Change double-click behaviour in cover manager to open fullsize cover.
 
-0.8.4:
+
+Version 0.8.4 (2020.11.15)
 
   Bugfixes:
     * Fix preventing session logout when window is maxmimized.
@@ -85,15 +205,16 @@ 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.
+    * Change star/unstar playlist to double-click instead of singleclick.
-    * Don't edit playlist name on doubleclick in playlists view.
+    * 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.
     * Remove remaining uses of QTextCodec.
     * Remove Core5Compat dependency.
 
-0.8.3:
+
+Version 0.8.3 (2020.10.24)
 
   Bugfixes:
     * Fixed updating playing widget song details in small cover mode.
@@ -108,7 +229,8 @@ ChangeLog
   Enhancements:
     * (Windows) Added WASAPI plugin.
 
-0.8.2:
+
+Version 0.8.2 (2020.10.13)
 
   Bugfixes:
     * Fixed broken transition to next song for CUE files with certain audio formats (regression since version 0.6.13).
@@ -120,7 +242,8 @@ ChangeLog
     * Removed use of HTML in system tray icon tooltip for all desktop environments instead of just KDE and Cinnamon.
     * (Windows) Ignore "IDirectSoundBuffer_GetStatus The operation completed successfully" false error when switching device while playing.
 
-0.8.1:
+
+Version 0.8.1 (2020.10.09)
 
   Bugfixes:
     * Fixed engine selection in backend settings with Qt 6.
@@ -167,14 +290,15 @@ ChangeLog
     * Added Subsonic server side scrobbling support.
     * Load thumbnails from iPods to show under device collection.
 
-0.7.2:
+Version 0.7.2 (2020.08.15)
 
   Bugfixes:
     * Fixed installation directory for translations.
     * Fixed collection sorting for non-ASCII characters.
     * Fixed closing connected devices on exit.
 
-0.7.1:
+
+Version 0.7.1 (2020.08.15)
 
   Bugfixes:
     * Fixed incorrectly mapped global shortcuts keys "2" and "3".
@@ -213,7 +337,8 @@ ChangeLog
     * Removed Xine engine support.
     * Removed broken imobiledevice (iPhone) support.
 
-0.6.13:
+
+Version 0.6.13 (2020.07.13)
 
   Bugfixes:
     * Fixed cut-off text in about dialog.
@@ -239,7 +364,8 @@ ChangeLog
     * Fixed unit test for testing playlist model.
     * Added new unit tests for tagreader.
 
-0.6.12:
+
+Version 0.6.12 (2020.06.07)
 
   Bugfixes:
     * Fixed height of about dialog.
@@ -252,7 +378,8 @@ ChangeLog
     * Sort folders added from file view.
     * Changed default collection grouping to album - disc.
 
-0.6.11:
+
+Version 0.6.11 (2020.05.16)
 
   Bugfixes:
     * Fixed MPRIS missing art url when playing albums with embedded cover.
@@ -278,10 +405,11 @@ ChangeLog
     * Added album covers from Musixmatch and Spotify.
     * Added lyrics from Genius, Musixmatch and ChartLyrics.
 
-0.6.10:
+
+Version 0.6.10 (2020.05.01)
 
   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.
@@ -290,7 +418,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.
@@ -305,9 +433,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.
 
@@ -318,7 +446,8 @@ ChangeLog
   Removed features:
     * Removed Phonon engine support.
 
-Version 0.6.9:
+
+Version 0.6.9 (2020.03.09)
 
   BugFixes:
     * Fixed playlist metadata updating interfering with manual tag editing.
@@ -350,7 +479,8 @@ Version 0.6.9:
     * Tidal support (No agreement).
     * QObuz support (No agreement).
 
-Version 0.6.8:
+
+Version 0.6.8 (2020.01.05)
 
     * Fixed stuck tabbar and collection GUI with some themes.
     * Fixed possible crashes related to QProxyStyle.
@@ -367,7 +497,8 @@ Version 0.6.8:
     * (macOS) Fixed filesystem watcher to correctly pick up changed collection directories.
     * (Windows) Fixed translations not being included.
 
-Version 0.6.7:
+
+Version 0.6.7 (2019.11.27)
 
     * Fixed crash when cancelling scrobbler authentication
     * Fixed "Double clicking a song in the playlist" behaviour setting
@@ -384,7 +515,8 @@ Version 0.6.7:
     * Removed left click on analyzer to popup menu
     * (Windows) Added killproc executable to terminate running process before uninstalling
 
-Version 0.6.6:
+
+Version 0.6.6 (2019.11.09)
 
     * Fixed lowercased album artist in playlist column
     * Fixed compiling with different optional features turned off
@@ -402,7 +534,8 @@ Version 0.6.6:
     * Added option to automatically select current playing track
     * (Windows) Added support for WASAPI
 
-Version 0.6.5:
+
+Version 0.6.5 (2019.09.30)
 
     * Fixed scrobbler not to send scrobbles multiple times when metadata is updated
     * Fixed Listenbrainz scrobbler not don't send "various artists" as album artist
@@ -411,7 +544,8 @@ Version 0.6.5:
     * Fixed OSD pretty positioning on Windows on screens with negative geometry
     * Fixed appdata file to pass full validation
 
-Version 0.6.4:
+
+Version 0.6.4 (2019.09.25)
 
     * Added setting for fancy tabbar background color
     * Added setting to make marking songs unavailable optional
@@ -438,18 +572,21 @@ Version 0.6.4:
     * Fixed restoring to original window size when restoring from system tray
     * Updated 3rdparty taglib
 
-Version 0.6.3:
+
+Version 0.6.3 (2019.08.05)
 
     * Fixed crash when using internet services.
     * Fixed musicbrainz tagfetcher only showing 1 result per song.
     * Fixed collection watcher to unwatch deleted directories.
     * Added "album - disc" grouping.
 
-Version 0.6.2:
+
+Version 0.6.2 (2019.08.03)
 
     * Disabled fatal error for FTS5 cmake test.
 
-Version 0.6.1:
+
+Version 0.6.1 (2019.08.03)
 
     * Compare artist and album case-insensitive when generating score for album covers.
     * Fixed broken return value of sendMessage() in SingleApplication causing application to be started twice.
@@ -495,11 +632,13 @@ Version 0.6.1:
     * Fixed certain cases where the playing widget gets stuck when switching fast between context and other widgets.
     * Removed ChartLyrics provider (service have been down for a long time).
 
-Version 0.5.5:
+
+Version 0.5.5 (2019.05.05)
 
     * Fixed Tidal API url
 
-Version 0.5.4:
+
+Version 0.5.4 (2019.05.05)
 
     * Changed description for offline mode scrobbling for less confusion
     * Fixed scrobbler to not send "playing now" when in offline mode
@@ -530,7 +669,8 @@ Version 0.5.4:
     * Fixed and improved snap including upgrading to core18 and adding proper alsa support
     * Fixed resume playback on startup not working for other than the first playlist
 
-Version 0.5.3:
+
+Version 0.5.3 (2019.03.02)
 
     * Changed default tagging to albumartist in organise dialog
     * Removed support for older taglib in tagreader
@@ -570,7 +710,8 @@ Version 0.5.3:
     * Added group by format
     * Fixed gstreamer leaks
 
-Version 0.5.2:
+
+Version 0.5.2 (2019.01.26)
 
     * Added error handling and message for URL handler
     * Added SingleCoreApplication secondary check
@@ -587,7 +728,8 @@ Version 0.5.2:
     * Added option to copy album cover in organise dialog (filesystem and libgpod devices)
     * Added raise() to make sure window is on top when strawberry is started twice
 
-Version 0.5.1:
+
+Version 0.5.1 (2019.01.12)
 
     * Added scrobbler with support for Last.fm, Libre.fm and ListenBrainz
     * Fixed key up causing playback to reset
@@ -618,7 +760,8 @@ Version 0.5.1:
     * Added debian copyright file
     * Fixed some compile errors
 
-Version 0.4.2:
+
+Version 0.4.2 (2018.11.28)
 
     * Updated AppStream data file to newer specifications
     * Fixed Deezer engine to use quality setting
@@ -632,7 +775,8 @@ Version 0.4.2:
     * (Windows) Corrected uninstalled files on x64 installer
     * (macOS) Fixed poor performance
 
-Version 0.4.1:
+
+Version 0.4.1 (2018.11.01)
 
     * Fixed crash in analyzer
     * Fixed trying to use systray even if the desktop had no systray
@@ -650,11 +794,13 @@ Version 0.4.1:
     * Added AppStream data file
     * Fixed compiling with Qt 5 versions of system QtSingleApplication and Qxt library
 
-Version 0.3.3:
+
+Version 0.3.3 (2018.09.24)
 
     * Fixed Tidal login
 
-Version 0.3.2:
+
+Version 0.3.2 (2018.09.24)
 
     * Fixed search error not shown in Tidal search
     * Added URL handler for Tidal, now retrieving URL's when playing instead of when searching
@@ -666,7 +812,8 @@ Version 0.3.2:
     * Added encoding of Tidal token in the source code
     * Added encoding of Tidal password in the configuration
 
-Version 0.3.1:
+
+Version 0.3.1 (2018.09.15)
 
     * Added new lyrics provider with lyrics from AudD and API Seeds
     * New improved context widget with albums and lyrics
@@ -688,7 +835,8 @@ Version 0.3.1:
     * Added support for reading/writing lyrics to tags
     * Fixed saving tags (APE) for WavPack files
 
-Version 0.2.1:
+
+Version 0.2.1 (2018.07.05)
 
     * Fixed crash with newer Qt
     * Fixed setting output/device for Xine and VLC backend
@@ -698,19 +846,23 @@ Version 0.2.1:
     * Fixed device selection on macOS
     * Added xine on to windows build
 
-Version 0.1.6:
+
+Version 0.1.6 (2018.06.07)
     * Fixed crash on exit caused by NVIDIA driver
     * Fixed PulseAudio device selection
     * Improvements to device selection
 
-Version 0.1.5:
+
+Version 0.1.5 (2018.05.16)
     * Makefile fixes for building
 
-Version 0.1.4:
+
+Version 0.1.4 (2018.05.14)
     * Fixed compliation with clang compiler
     * This release is mainly to get it working on openbsd and freebsd.
 
-Version 0.1.3:
+
+Version 0.1.3 (2018.05.12)
     * Audio file detection by content
     * Added builtin taglib to 3rdparty to support detecting audio by content instead of just file extension
     * Removed unneeded qsqlite from 3rdparty
@@ -718,7 +870,8 @@ Version 0.1.3:
     * Replaced incorrect DLL libgstdirectsoundsink.dll (from gst 1.12.4) instead of libgstdirectsound.dll (from gst 1.14.0) for windows build
     * Fixed git versioning
 
-Version 0.1.2:
+
+Version 0.1.2 (2018.05.02)
     * Fixed playback of WavPack files
     * Fixed musicbrainz tagfetcher
     * Use common regex (Song::kCoverRemoveDisc) for removing Disc/CD from album
@@ -728,5 +881,6 @@ Version 0.1.2:
     * Fixed problems with windows build missing some DLL's, only supplying required gstreamer-plugins now
     * Removed redundant code
 
-Version 0.1.1:
+
+Version 0.1.1 (2018.04.07)
     * Initial release

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 required)](https://www.alsa-project.org/)
-* [ALSA (linux)](https://www.alsa-project.org/)
+* [D-Bus (Linux required)](https://www.freedesktop.org/wiki/Software/dbus/)
-* [D-Bus (linux)](https://www.freedesktop.org/wiki/Software/dbus/)
-* [PulseAudio (linux optional)](https://www.freedesktop.org/wiki/Software/PulseAudio/?)
 * [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,11 +1,10 @@
 #find_program(MACDEPLOYQT_EXECUTABLE NAMES macdeployqt PATHS /usr/local/opt/qt6/bin /usr/local/opt/qt5/bin /usr/local/bin REQUIRED)
-#if(MACDEPLOYQT_EXECUTABLE)
-#  message(STATUS "Found macdeployqt: ${MACDEPLOYQT_EXECUTABLE}")
-#else()
-#  message(WARNING "Missing macdeployqt executable.")
-#endif()
-
 set(MACDEPLOYQT_EXECUTABLE "${CMAKE_BINARY_DIR}/3rdparty/macdeployqt/macdeployqt")
+if(MACDEPLOYQT_EXECUTABLE)
+  message(STATUS "Found macdeployqt: ${MACDEPLOYQT_EXECUTABLE}")
+else()
+  message(WARNING "Missing macdeployqt executable.")
+endif()
 
 find_program(CREATEDMG_EXECUTABLE NAMES create-dmg REQUIRED)
 if(CREATEDMG_EXECUTABLE)
@@ -14,24 +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(MACDEPLOYQT_EXECUTABLE)
-if(NOT MACOS_VERSION_PACKAGE)
+  add_custom_target(copy_gstreamer_plugins
-  message(WARNING "Could not set macOS version.")
+    #COMMAND ${CMAKE_SOURCE_DIR}/dist/macos/macgstcopy.sh strawberry.app
-endif()
-
-if(MACDEPLOYQT_EXECUTABLE AND CREATEDMG_EXECUTABLE AND MACOS_VERSION_PACKAGE)
-  add_custom_target(dmg
-    COMMAND mkdir -p ${CMAKE_BINARY_DIR}/strawberry.app/Contents/Frameworks/
-    COMMAND cp -r /usr/local/opt/sparkle/Sparkle.framework ${CMAKE_BINARY_DIR}/strawberry.app/Contents/Frameworks/
-    COMMAND ${MACDEPLOYQT_EXECUTABLE} strawberry.app -verbose=3 -executable=${CMAKE_BINARY_DIR}/strawberry.app/Contents/PlugIns/strawberry-tagreader
-    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}
   )
-  add_custom_target(dmg2
+  add_custom_target(deploy
-    COMMAND mkdir -p ${CMAKE_BINARY_DIR}/strawberry.app/Contents/Frameworks/
+    COMMAND mkdir -p ${CMAKE_BINARY_DIR}/strawberry.app/Contents/{Frameworks,Resources}
-    COMMAND cp -r /usr/local/opt/sparkle/Sparkle.framework ${CMAKE_BINARY_DIR}/strawberry.app/Contents/Frameworks/
+    COMMAND cp -v ${CMAKE_SOURCE_DIR}/dist/macos/Info.plist ${CMAKE_BINARY_DIR}/strawberry.app/Contents/
-    COMMAND ${MACDEPLOYQT_EXECUTABLE} strawberry.app -verbose=3 -executable=${CMAKE_BINARY_DIR}/strawberry.app/Contents/PlugIns/strawberry-tagreader
+    COMMAND cp -v ${CMAKE_SOURCE_DIR}/dist/macos/strawberry.icns ${CMAKE_BINARY_DIR}/strawberry.app/Contents/Resources/
-    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
+    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)
+    qt_wrap_ui(_uic_sources ${OPTIONAL_SOURCE_UI})
-      qt6_wrap_ui(_uic_sources ${OPTIONAL_SOURCE_UI})
-    else()
-      qt5_wrap_ui(_uic_sources ${OPTIONAL_SOURCE_UI})
-    endif()
     list(APPEND OTHER_SOURCES ${_uic_sources})
     list(APPEND OTHER_UIC_SOURCES ${_uic_sources})
   endif(${TOGGLE})

cmake/Summary.cmake

@@ -24,7 +24,7 @@ macro(summary_show)
   list(SORT summary_willbuild)
   list(SORT summary_willnotbuild)
   message("")
-  message("Building strawberry version: ${STRAWBERRY_VERSION_DISPLAY}")
+  message("Building strawberry version: ${STRAWBERRY_VERSION_DISPLAY}, Qt version ${Qt${QT_VERSION_MAJOR}Core_VERSION}")
   summary_show_part(summary_willbuild "The following components will be built:")
   summary_show_part(summary_willnotbuild "The following components WILL NOT be built:")
   message("")

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)
+    qt_add_resources(${outfiles} ${_qrc})
-      qt6_add_resources(${outfiles} ${_qrc})
-    else()
-      qt5_add_resources(${outfiles} ${_qrc})
-    endif()
   endif()
 endmacro(add_po)

cmake/Version.cmake

@@ -1,6 +1,6 @@
-set(STRAWBERRY_VERSION_MAJOR 0)
+set(STRAWBERRY_VERSION_MAJOR 1)
-set(STRAWBERRY_VERSION_MINOR 9)
+set(STRAWBERRY_VERSION_MINOR 0)
-set(STRAWBERRY_VERSION_PATCH 2)
+set(STRAWBERRY_VERSION_PATCH 1)
 #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,10 @@
         <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/128x128/musicbrainz.png</file>
         <file>icons/64x64/albums.png</file>
         <file>icons/64x64/alsa.png</file>
         <file>icons/64x64/application-exit.png</file>
@@ -185,6 +189,10 @@
         <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/64x64/musicbrainz.png</file>
         <file>icons/48x48/albums.png</file>
         <file>icons/48x48/alsa.png</file>
         <file>icons/48x48/application-exit.png</file>
@@ -282,6 +290,10 @@
 	<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/48x48/musicbrainz.png</file>
         <file>icons/32x32/albums.png</file>
         <file>icons/32x32/alsa.png</file>
         <file>icons/32x32/application-exit.png</file>
@@ -379,6 +391,10 @@
         <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/32x32/musicbrainz.png</file>
         <file>icons/22x22/albums.png</file>
         <file>icons/22x22/alsa.png</file>
         <file>icons/22x22/application-exit.png</file>
@@ -476,5 +492,9 @@
         <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>
+        <file>icons/22x22/musicbrainz.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,
+  title TEXT DEFAULT '',
-  album TEXT,
+  album TEXT DEFAULT '',
-  artist TEXT,
+  artist TEXT DEFAULT '',
-  albumartist TEXT,
+  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,
+  composer TEXT DEFAULT '',
-  performer TEXT,
+  performer TEXT DEFAULT '',
-  grouping TEXT,
+  grouping TEXT DEFAULT '',
-  comment TEXT,
+  comment TEXT DEFAULT '',
-  lyrics TEXT,
+  lyrics TEXT DEFAULT '',
 
-  artist_id TEXT,
+  artist_id TEXT DEFAULT '',
-  album_id TEXT,
+  album_id TEXT DEFAULT '',
-  song_id TEXT,
+  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_automatic TEXT DEFAULT '',
-  art_manual TEXT,
+  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,
+  title TEXT DEFAULT '',
-  album TEXT,
+  album TEXT DEFAULT '',
-  artist TEXT,
+  artist TEXT DEFAULT '',
-  albumartist TEXT,
+  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,
+  composer TEXT DEFAULT '',
-  performer TEXT,
+  performer TEXT DEFAULT '',
-  grouping TEXT,
+  grouping TEXT DEFAULT '',
-  comment TEXT,
+  comment TEXT DEFAULT '',
-  lyrics TEXT,
+  lyrics TEXT DEFAULT '',
 
-  artist_id TEXT,
+  artist_id TEXT DEFAULT '',
-  album_id TEXT,
+  album_id TEXT DEFAULT '',
-  song_id TEXT,
+  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_automatic TEXT DEFAULT '',
-  art_manual TEXT,
+  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,
+  title TEXT DEFAULT '',
-  album TEXT,
+  album TEXT DEFAULT '',
-  artist TEXT,
+  artist TEXT DEFAULT '',
-  albumartist TEXT,
+  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,
+  composer TEXT DEFAULT '',
-  performer TEXT,
+  performer TEXT DEFAULT '',
-  grouping TEXT,
+  grouping TEXT DEFAULT '',
-  comment TEXT,
+  comment TEXT DEFAULT '',
-  lyrics TEXT,
+  lyrics TEXT DEFAULT '',
 
-  artist_id TEXT,
+  artist_id TEXT DEFAULT '',
-  album_id TEXT,
+  album_id TEXT DEFAULT '',
-  song_id TEXT,
+  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_automatic TEXT DEFAULT '',
-  art_manual TEXT,
+  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,
+  title TEXT DEFAULT '',
-  album TEXT,
+  album TEXT DEFAULT '',
-  artist TEXT,
+  artist TEXT DEFAULT '',
-  albumartist TEXT,
+  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,
+  composer TEXT DEFAULT '',
-  performer TEXT,
+  performer TEXT DEFAULT '',
-  grouping TEXT,
+  grouping TEXT DEFAULT '',
-  comment TEXT,
+  comment TEXT DEFAULT '',
-  lyrics TEXT,
+  lyrics TEXT DEFAULT '',
 
-  artist_id TEXT,
+  artist_id TEXT DEFAULT '',
-  album_id TEXT,
+  album_id TEXT DEFAULT '',
-  song_id TEXT,
+  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_automatic TEXT DEFAULT '',
-  art_manual TEXT,
+  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,
+  title TEXT DEFAULT '',
-  album TEXT,
+  album TEXT DEFAULT '',
-  artist TEXT,
+  artist TEXT DEFAULT '',
-  albumartist TEXT,
+  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,
+  composer TEXT DEFAULT '',
-  performer TEXT,
+  performer TEXT DEFAULT '',
-  grouping TEXT,
+  grouping TEXT DEFAULT '',
-  comment TEXT,
+  comment TEXT DEFAULT '',
-  lyrics TEXT,
+  lyrics TEXT DEFAULT '',
 
-  artist_id TEXT,
+  artist_id TEXT DEFAULT '',
-  album_id TEXT,
+  album_id TEXT DEFAULT '',
-  song_id TEXT,
+  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_automatic TEXT DEFAULT '',
-  art_manual TEXT,
+  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,
+  title TEXT DEFAULT '',
-  album TEXT,
+  album TEXT DEFAULT '',
-  artist TEXT,
+  artist TEXT DEFAULT '',
-  albumartist TEXT,
+  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,
+  composer TEXT DEFAULT '',
-  performer TEXT,
+  performer TEXT DEFAULT '',
-  grouping TEXT,
+  grouping TEXT DEFAULT '',
-  comment TEXT,
+  comment TEXT DEFAULT '',
-  lyrics TEXT,
+  lyrics TEXT DEFAULT '',
 
-  artist_id TEXT,
+  artist_id TEXT DEFAULT '',
-  album_id TEXT,
+  album_id TEXT DEFAULT '',
-  song_id TEXT,
+  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_automatic TEXT DEFAULT '',
-  art_manual TEXT,
+  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,
+  title TEXT DEFAULT '',
-  album TEXT,
+  album TEXT DEFAULT '',
-  artist TEXT,
+  artist TEXT DEFAULT '',
-  albumartist TEXT,
+  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,
+  composer TEXT DEFAULT '',
-  performer TEXT,
+  performer TEXT DEFAULT '',
-  grouping TEXT,
+  grouping TEXT DEFAULT '',
-  comment TEXT,
+  comment TEXT DEFAULT '',
-  lyrics TEXT,
+  lyrics TEXT DEFAULT '',
 
-  artist_id TEXT,
+  artist_id TEXT DEFAULT '',
-  album_id TEXT,
+  album_id TEXT DEFAULT '',
-  song_id TEXT,
+  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_automatic TEXT DEFAULT '',
-  art_manual TEXT,
+  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,
+  title TEXT DEFAULT '',
-  album TEXT,
+  album TEXT DEFAULT '',
-  artist TEXT,
+  artist TEXT DEFAULT '',
-  albumartist TEXT,
+  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,
+  composer TEXT DEFAULT '',
-  performer TEXT,
+  performer TEXT DEFAULT '',
-  grouping TEXT,
+  grouping TEXT DEFAULT '',
-  comment TEXT,
+  comment TEXT DEFAULT '',
-  lyrics TEXT,
+  lyrics TEXT DEFAULT '',
 
-  artist_id TEXT,
+  artist_id TEXT DEFAULT '',
-  album_id TEXT,
+  album_id TEXT DEFAULT '',
-  song_id TEXT,
+  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_automatic TEXT DEFAULT '',
-  art_manual TEXT,
+  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,
+  title TEXT DEFAULT '',
-  album TEXT,
+  album TEXT DEFAULT '',
-  artist TEXT,
+  artist TEXT DEFAULT '',
-  albumartist TEXT,
+  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,
+  composer TEXT DEFAULT '',
-  performer TEXT,
+  performer TEXT DEFAULT '',
-  grouping TEXT,
+  grouping TEXT DEFAULT '',
-  comment TEXT,
+  comment TEXT DEFAULT '',
-  lyrics TEXT,
+  lyrics TEXT DEFAULT '',
 
-  artist_id TEXT,
+  artist_id TEXT DEFAULT '',
-  album_id TEXT,
+  album_id TEXT DEFAULT '',
-  song_id TEXT,
+  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_automatic TEXT DEFAULT '',
-  art_manual TEXT,
+  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,
+  special_type TEXT DEFAULT '',
-  ui_path TEXT,
+  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,
+  title TEXT DEFAULT '',
-  album TEXT,
+  album TEXT DEFAULT '',
-  artist TEXT,
+  artist TEXT DEFAULT '',
-  albumartist TEXT,
+  albumartist TEXT DEFAULT '',
   track INTEGER,
   disc INTEGER,
   year INTEGER,
   originalyear INTEGER,
-  genre TEXT,
+  genre TEXT DEFAULT '',
   compilation INTEGER DEFAULT 0,
-  composer TEXT,
+  composer TEXT DEFAULT '',
-  performer TEXT,
+  performer TEXT DEFAULT '',
-  grouping TEXT,
+  grouping TEXT DEFAULT '',
-  comment TEXT,
+  comment TEXT DEFAULT '',
-  lyrics TEXT,
+  lyrics TEXT DEFAULT '',
 
-  artist_id TEXT,
+  artist_id TEXT DEFAULT '',
-  album_id TEXT,
+  album_id TEXT DEFAULT '',
-  song_id TEXT,
+  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_automatic TEXT DEFAULT '',
-  art_manual TEXT,
+  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,
+  unique_id TEXT NOT NULL DEFAULT '',
-  friendly_name TEXT,
+  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);

data/style/strawberry.css

@@ -19,6 +19,18 @@
   background-clip: content;
 }
 
+#context-layout-container {
+  background-color: %palette-base;
+}
+
+#context-widget-scrollarea {
+  background-color: %palette-base;
+}
+
+#context-layout-scrollarea {
+  background-color: %palette-base;
+}
+
 QToolButton {
   border: 2px solid transparent;
   border-radius: 3px;
@@ -60,14 +72,3 @@ macos QMenu {
   font-size: 13pt;
 }
 
-#context-layout-container {
-  background-color: %palette-base;
-}
-
-#context-widget-scrollarea {
-  background-color: %palette-base;
-}
-
-#context-layout-scrollarea {
-  background-color: %palette-base;
-}

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
+  - Edit tags on audio files
-  - Fetch tags from MusicBrainz
+  - 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)
+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}/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")
+  install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/macos/strawberry.icns" DESTINATION "${CMAKE_BINARY_DIR}/strawberry.app/Contents/Resources")
-endif (APPLE)
+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/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/scripts/import-from-clementine.sh

@@ -0,0 +1,179 @@
+#!/usr/bin/env bash
+
+# Strawberry Music Player
+# Copyright 2020, Jonas Kvinge <jonas@jkvinge.net>
+# 2021 Alexey Vazhnov
+#
+# Strawberry is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# 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/>.
+# SPDX-License-Identifier: GPL-3.0-only
+
+
+# Based on https://github.com/strawberrymusicplayer/strawberry/wiki/Import-collection-library-and-playlists-data-from-Clementine
+
+set -o nounset
+set -o errexit
+set -o pipefail
+shopt -s dotglob
+
+# Use hardcoded path if no parameters. No need in quotes here! See `man bash`, "Parameter Expansion":
+FILE_SRC=${1:-~/.config/Clementine/clementine.db}
+FILE_DST=${2:-~/.local/share/strawberry/strawberry/strawberry.db}
+
+test -f "$FILE_SRC" || { echo "No such file: $FILE_SRC"; exit 1; }
+test -f "$FILE_DST" || { echo "No such file: $FILE_DST"; exit 1; }
+
+echo "Will try to copy information from $FILE_SRC to $FILE_DST."
+echo
+echo 'This script will **delete all information** from Strawberry database!'
+read -r -p 'Do you want to continue? (the only YES is accepted) ' answer
+if [ "$answer" != "YES" ]; then exit 1; fi
+
+# 'heredoc' with substitution of variables, see `man bash`, "Here Documents":
+sqlite3 -batch << EOF
+.echo on
+ATTACH '$FILE_DST' AS strawberry;
+ATTACH '$FILE_SRC' AS clementine;
+.bail on
+.databases
+
+/* This must be done when importing all data from Clementine because playlists are based on ROWIDs */
+
+DELETE FROM strawberry.directories;
+DELETE FROM strawberry.subdirectories;
+DELETE FROM strawberry.songs;
+DELETE FROM strawberry.playlists;
+DELETE FROM strawberry.playlist_items;
+
+/* Import all data from the collection library songs */
+
+INSERT INTO strawberry.directories (path, subdirs) SELECT path, subdirs FROM clementine.directories;
+INSERT INTO strawberry.subdirectories (directory_id, path, mtime) SELECT directory, path, mtime FROM clementine.subdirectories;
+INSERT INTO strawberry.songs (ROWID, title, album, artist, albumartist, track, disc, year, originalyear, genre, compilation, composer, performer, grouping, comment, lyrics, beginning, length, bitrate, samplerate, directory_id, url, filetype, filesize, mtime, ctime, unavailable, playcount, skipcount, lastplayed, compilation_detected, compilation_on, compilation_off, compilation_effective, art_automatic, art_manual, effective_albumartist, effective_originalyear, cue_path, rating)
+SELECT ROWID, title, album, artist, albumartist, track, disc, year, originalyear, genre, compilation, composer, performer, grouping, comment, lyrics, beginning, length, bitrate, samplerate, directory, filename, filetype, filesize, mtime, ctime, unavailable, playcount, skipcount, lastplayed, sampler, forced_compilation_on, forced_compilation_off, effective_compilation, art_automatic, art_manual, effective_albumartist, effective_originalyear, cue_path, rating FROM clementine.songs WHERE unavailable = 0;
+UPDATE strawberry.songs SET source = 2;
+UPDATE strawberry.songs SET artist_id = "";
+UPDATE strawberry.songs SET album_id = "";
+UPDATE strawberry.songs SET song_id = "";
+
+/* Import playlists */
+
+INSERT INTO strawberry.playlists (ROWID, name, last_played, special_type, ui_path, is_favorite, dynamic_playlist_type, dynamic_playlist_data, dynamic_playlist_backend)
+SELECT ROWID, name, last_played, special_type, ui_path, is_favorite, dynamic_playlist_type, dynamic_playlist_data, dynamic_playlist_backend FROM clementine.playlists WHERE dynamic_playlist_type ISNULL;
+
+/* Import playlist items */
+
+INSERT INTO strawberry.playlist_items
+(ROWID,
+playlist,
+collection_id,
+title,
+album,
+artist,
+albumartist,
+track,
+disc,
+year,
+originalyear,
+genre,
+compilation,
+composer,
+performer,
+grouping,
+comment,
+lyrics,
+beginning,
+length,
+bitrate,
+samplerate,
+directory_id,
+url,
+filetype,
+filesize,
+mtime,
+ctime,
+unavailable,
+playcount,
+skipcount,
+lastplayed,
+compilation_detected,
+compilation_on,
+compilation_off,
+compilation_effective,
+art_automatic,
+art_manual,
+effective_albumartist,
+effective_originalyear,
+cue_path,
+rating
+)
+SELECT ROWID,
+   playlist,
+   library_id,
+   title,
+   album,
+   artist,
+   albumartist,
+   track,
+   disc,
+   year,
+   originalyear,
+   genre,
+   compilation,
+   composer,
+   performer,
+   grouping,
+   comment,
+   lyrics,
+   beginning,
+   length,
+   bitrate,
+   samplerate,
+   directory,
+   filename,
+   filetype,
+   filesize,
+   mtime,
+   ctime,
+   unavailable,
+   playcount,
+   skipcount,
+   lastplayed,
+   sampler,
+   forced_compilation_on,
+   forced_compilation_off,
+   effective_compilation,
+   art_automatic,
+   art_manual,
+   effective_albumartist,
+   effective_originalyear,
+   cue_path,
+   rating FROM clementine.playlist_items WHERE type = 'Library';
+
+UPDATE strawberry.playlist_items SET source = 2;
+UPDATE strawberry.playlist_items SET type = 2;
+UPDATE strawberry.playlist_items SET artist_id = "";
+UPDATE strawberry.playlist_items SET album_id = "";
+UPDATE strawberry.playlist_items SET song_id = "";
+
+/* Recreate the FTS tables */
+
+DELETE FROM strawberry.songs_fts;
+INSERT INTO strawberry.songs_fts (ROWID, ftstitle, ftsalbum, ftsartist, ftsalbumartist, ftscomposer, ftsperformer, ftsgrouping, ftsgenre, ftscomment)
+SELECT ROWID, title, album, artist, albumartist, composer, performer, grouping, genre, comment
+FROM strawberry.songs;
+
+EOF
+
+# To be sure script didn't exit because of any error (because we use `set -o errexit`):
+echo "Script finished"

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<component>
+<component type="desktop-application">
   <id>org.strawberrymusicplayer.strawberry</id>
   <launchable type="desktop-id">org.strawberrymusicplayer.strawberry.desktop</launchable>
   <metadata_license>CC0-1.0</metadata_license>
@@ -13,37 +13,43 @@
   <url type="homepage">https://www.strawberrymusicplayer.org/</url>
   <url type="bugtracker">https://github.com/strawberrymusicplayer/strawberry/</url>
   ​<translation type="qt">strawberry</translation>
+  <content_rating type="oars-1.1" />
   <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>Edit tags on audio files</li>
-      <li>Fetch tags from MusicBrainz</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>
+    <releases>
+        <release version="1.0.0" date="2021-10-16"/>
+    </releases>
 </component>

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} )
+%if "@QT_VERSION_MAJOR@" == "5" && ( 0%{?fedora} || 0%{?rhel_version} || 0%{?centos} )
-BuildRequires:  pkgconfig(Qt@QT_MAJOR_VERSION@Core)
+BuildRequires:  pkgconfig(Qt@QT_VERSION_MAJOR@Core)
-BuildRequires:  pkgconfig(Qt@QT_MAJOR_VERSION@Gui)
+BuildRequires:  pkgconfig(Qt@QT_VERSION_MAJOR@Gui)
-BuildRequires:  pkgconfig(Qt@QT_MAJOR_VERSION@Widgets)
+BuildRequires:  pkgconfig(Qt@QT_VERSION_MAJOR@Widgets)
-BuildRequires:  pkgconfig(Qt@QT_MAJOR_VERSION@Concurrent)
+BuildRequires:  pkgconfig(Qt@QT_VERSION_MAJOR@Concurrent)
-BuildRequires:  pkgconfig(Qt@QT_MAJOR_VERSION@Network)
+BuildRequires:  pkgconfig(Qt@QT_VERSION_MAJOR@Network)
-BuildRequires:  pkgconfig(Qt@QT_MAJOR_VERSION@Sql)
+BuildRequires:  pkgconfig(Qt@QT_VERSION_MAJOR@Sql)
-BuildRequires:  pkgconfig(Qt@QT_MAJOR_VERSION@X11Extras)
+BuildRequires:  pkgconfig(Qt@QT_VERSION_MAJOR@DBus)
-BuildRequires:  pkgconfig(Qt@QT_MAJOR_VERSION@DBus)
+BuildRequires:  pkgconfig(Qt@QT_VERSION_MAJOR@Test)
-BuildRequires:  pkgconfig(Qt@QT_MAJOR_VERSION@Test)
+BuildRequires:  pkgconfig(Qt@QT_VERSION_MAJOR@X11Extras)
 %else
-BuildRequires:  cmake(Qt@QT_MAJOR_VERSION@Core)
+BuildRequires:  cmake(Qt@QT_VERSION_MAJOR@Core)
-BuildRequires:  cmake(Qt@QT_MAJOR_VERSION@Gui)
+BuildRequires:  cmake(Qt@QT_VERSION_MAJOR@Gui)
-BuildRequires:  cmake(Qt@QT_MAJOR_VERSION@Widgets)
+BuildRequires:  cmake(Qt@QT_VERSION_MAJOR@Widgets)
-BuildRequires:  cmake(Qt@QT_MAJOR_VERSION@Concurrent)
+BuildRequires:  cmake(Qt@QT_VERSION_MAJOR@Concurrent)
-BuildRequires:  cmake(Qt@QT_MAJOR_VERSION@Network)
+BuildRequires:  cmake(Qt@QT_VERSION_MAJOR@Network)
-BuildRequires:  cmake(Qt@QT_MAJOR_VERSION@Sql)
+BuildRequires:  cmake(Qt@QT_VERSION_MAJOR@Sql)
-BuildRequires:  cmake(Qt@QT_MAJOR_VERSION@DBus)
+BuildRequires:  cmake(Qt@QT_VERSION_MAJOR@DBus)
-BuildRequires:  cmake(Qt@QT_MAJOR_VERSION@Test)
+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
+  - Edit tags on audio files
-  - Fetch tags from MusicBrainz
+  - 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} -DQT_VERSION_MAJOR=@QT_VERSION_MAJOR@
 %if 0%{?centos} || (0%{?mageia} && 0%{?mageia} <= 7)
   %make_build
 %else

dist/windows/strawberry.nsi.in

@@ -18,10 +18,6 @@
   !define debug
 !endif
 
-!if "@BUILD_WITH_QT6@" == "ON"
-  !define with_qt6
-!endif
-
 !ifdef debug
   !define PRODUCT_NAME "Strawberry Music Player Debug"
   !define PRODUCT_NAME_SHORT "Strawberry"
@@ -66,9 +62,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 +76,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
 
@@ -95,33 +99,17 @@ SetCompressor /SOLID lzma
 Name "${PRODUCT_NAME}"
 !ifdef arch_x86
   !ifdef debug
-    !ifdef with_qt6
+    OutFile "${PRODUCT_NAME_SHORT}Setup-${PRODUCT_DISPLAY_VERSION}-Debug-x86.exe"
-      OutFile "${PRODUCT_NAME_SHORT}Setup-${PRODUCT_DISPLAY_VERSION}-Qt6-Debug-x86.exe"
-    !else
-      OutFile "${PRODUCT_NAME_SHORT}Setup-${PRODUCT_DISPLAY_VERSION}-Qt5-Debug-x86.exe"
-    !endif
   !else
-    !ifdef with_qt6
+    OutFile "${PRODUCT_NAME_SHORT}Setup-${PRODUCT_DISPLAY_VERSION}-x86.exe"
-      OutFile "${PRODUCT_NAME_SHORT}Setup-${PRODUCT_DISPLAY_VERSION}-Qt6-x86.exe"
-    !else
-      OutFile "${PRODUCT_NAME_SHORT}Setup-${PRODUCT_DISPLAY_VERSION}-Qt5-x86.exe"
-    !endif
   !endif
 !endif
 
 !ifdef arch_x64
   !ifdef debug
-    !ifdef with_qt6
+    OutFile "${PRODUCT_NAME_SHORT}Setup-${PRODUCT_DISPLAY_VERSION}-Debug-x64.exe"
-      OutFile "${PRODUCT_NAME_SHORT}Setup-${PRODUCT_DISPLAY_VERSION}-Qt6-Debug-x64.exe"
-    !else
-      OutFile "${PRODUCT_NAME_SHORT}Setup-${PRODUCT_DISPLAY_VERSION}-Qt5-Debug-x64.exe"
-    !endif
   !else
-    !ifdef with_qt6
+    OutFile "${PRODUCT_NAME_SHORT}Setup-${PRODUCT_DISPLAY_VERSION}-x64.exe"
-      OutFile "${PRODUCT_NAME_SHORT}Setup-${PRODUCT_DISPLAY_VERSION}-Qt6-x64.exe"
-    !else
-      OutFile "${PRODUCT_NAME_SHORT}Setup-${PRODUCT_DISPLAY_VERSION}-Qt5-x64.exe"
-    !endif
   !endif
 !endif
 
@@ -133,7 +121,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 +166,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 "libcrypto-3.dll"
-  File "libssl-1_1.dll"
+  File "libssl-3.dll"
 !endif
 
 !ifdef arch_x64
   File "libgcc_s_seh-1.dll"
-  File "libcrypto-1_1-x64.dll"
+  File "libcrypto-3-x64.dll"
-  File "libssl-1_1-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"
@@ -200,22 +195,25 @@ Section "Strawberry" Strawberry
   File "libcdio-19.dll"
   File "libchromaprint.dll"
   File "libdl.dll"
-  File "libfaac-0.dll"
+  File "libffi-8.dll"
-  File "libfaad-2.dll"
-  File "libffi-7.dll"
   File "libfftw3-3.dll"
   File "libFLAC-8.dll"
   File "libfreetype-6.dll"
+  File "libfaac-0.dll"
+  File "libfaad-2.dll"
   File "libgio-2.0-0.dll"
   File "libglib-2.0-0.dll"
   File "libgmodule-2.0-0.dll"
   File "libgmp-10.dll"
   File "libgnutls-30.dll"
   File "libgobject-2.0-0.dll"
+  File "libgstadaptivedemux-1.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 "libgstisoff-1.0-0.dll"
   File "libgstnet-1.0-0.dll"
   File "libgstpbutils-1.0-0.dll"
   File "libgstreamer-1.0-0.dll"
@@ -224,6 +222,7 @@ Section "Strawberry" Strawberry
   File "libgstrtsp-1.0-0.dll"
   File "libgstsdp-1.0-0.dll"
   File "libgsttag-1.0-0.dll"
+  File "libgsturidownloader-1.0-0.dll"
   File "libgstvideo-1.0-0.dll"
   File "libharfbuzz-0.dll"
   File "libhogweed-6.dll"
@@ -235,51 +234,40 @@ 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 "libpsl-5.dll"
-  File "libsoup-2.4-1.dll"
+  File "libprotobuf-30.dll"
+  File "libqtsparkle-qt6.dll"
   File "libspeex-1.dll"
   File "libsqlite3-0.dll"
   File "libssp-0.dll"
   File "libstdc++-6.dll"
+  File "libsoup-2.4-1.dll"
   File "libtag.dll"
   File "libtasn1-6.dll"
   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"
   File "libzstd.dll"
   File "postproc-55.dll"
-  File "swresample-3.dll"
-  File "swscale-5.dll"
-  File "zlib1.dll"
-
-!ifdef with_qt6
   File "Qt6Concurrent.dll"
   File "Qt6Core.dll"
   File "Qt6Gui.dll"
   File "Qt6Network.dll"
   File "Qt6Sql.dll"
   File "Qt6Widgets.dll"
-  ;File "Qt6WinExtras.dll"
+  File "swresample-3.dll"
-  File "libqtsparkle-qt6.dll"
+  File "swscale-5.dll"
-!else
+  File "zlib1.dll"
-  File "Qt5Concurrent.dll"
-  File "Qt5Core.dll"
-  File "Qt5Gui.dll"
-  File "Qt5Network.dll"
-  File "Qt5Sql.dll"
-  File "Qt5Widgets.dll"
-  File "Qt5WinExtras.dll"
-  File "libqtsparkle-qt5.dll"
-!endif
 
 !ifdef debug
   File "gdb.exe"
@@ -290,8 +278,6 @@ Section "Strawberry" Strawberry
   File "libtermcap.dll"
 !endif
 
-  File "killproc.exe"
-
   ; Register Strawberry with Default Programs
   Var /GLOBAL AppIcon
   Var /GLOBAL AppExe
@@ -329,33 +315,41 @@ 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 styles" styles
+  SetOutPath "$INSTDIR\styles"
+  File "/oname=qwindowsvistastyle.dll" "styles\qwindowsvistastyle.dll"
+SectionEnd
+
+Section "Qt TLS plugins" tls
+  SetOutPath "$INSTDIR\tls"
+  File "/oname=qopensslbackend.dll" "tls\qopensslbackend.dll"
+SectionEnd
+
 Section "Qt SQL Drivers" sqldrivers
   SetOutPath "$INSTDIR\sqldrivers"
   File "/oname=qsqlite.dll" "sqldrivers\qsqlite.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"
-SectionEnd
-
 Section "Gstreamer plugins" gstreamer-plugins
   SetOutPath "$INSTDIR\gstreamer-plugins"
 
+  File "/oname=libgstaiff.dll" "gstreamer-plugins\libgstaiff.dll"
+  File "/oname=libgstapetag.dll" "gstreamer-plugins\libgstapetag.dll"
   File "/oname=libgstapp.dll" "gstreamer-plugins\libgstapp.dll"
-  File "/oname=libgstcoreelements.dll" "gstreamer-plugins\libgstcoreelements.dll"
+  File "/oname=libgstasf.dll" "gstreamer-plugins\libgstasf.dll"
+  File "/oname=libgstasfmux.dll" "gstreamer-plugins\libgstasfmux.dll"
   File "/oname=libgstaudioconvert.dll" "gstreamer-plugins\libgstaudioconvert.dll"
   File "/oname=libgstaudiofx.dll" "gstreamer-plugins\libgstaudiofx.dll"
   File "/oname=libgstaudiomixer.dll" "gstreamer-plugins\libgstaudiomixer.dll"
@@ -364,42 +358,42 @@ Section "Gstreamer plugins" gstreamer-plugins
   File "/oname=libgstaudioresample.dll" "gstreamer-plugins\libgstaudioresample.dll"
   File "/oname=libgstaudiotestsrc.dll" "gstreamer-plugins\libgstaudiotestsrc.dll"
   File "/oname=libgstautodetect.dll" "gstreamer-plugins\libgstautodetect.dll"
-  File "/oname=libgstplayback.dll" "gstreamer-plugins\libgstplayback.dll"
-  File "/oname=libgstvolume.dll" "gstreamer-plugins\libgstvolume.dll"
-  File "/oname=libgstspectrum.dll" "gstreamer-plugins\libgstspectrum.dll"
-  File "/oname=libgstequalizer.dll" "gstreamer-plugins\libgstequalizer.dll"
-  File "/oname=libgstreplaygain.dll" "gstreamer-plugins\libgstreplaygain.dll"
-  File "/oname=libgsttypefindfunctions.dll" "gstreamer-plugins\libgsttypefindfunctions.dll"
-  File "/oname=libgstgio.dll" "gstreamer-plugins\libgstgio.dll"
-  File "/oname=libgstdirectsound.dll" "gstreamer-plugins\libgstdirectsound.dll"
-  File "/oname=libgstwasapi.dll" "gstreamer-plugins\libgstwasapi.dll"
-  File "/oname=libgstapetag.dll" "gstreamer-plugins\libgstapetag.dll"
-  File "/oname=libgsticydemux.dll" "gstreamer-plugins\libgsticydemux.dll"
-  File "/oname=libgstid3demux.dll" "gstreamer-plugins\libgstid3demux.dll"
-  File "/oname=libgsttaglib.dll" "gstreamer-plugins\libgsttaglib.dll"
-  File "/oname=libgsttcp.dll" "gstreamer-plugins\libgsttcp.dll"
-  File "/oname=libgstudp.dll" "gstreamer-plugins\libgstudp.dll"
-  File "/oname=libgstsoup.dll" "gstreamer-plugins\libgstsoup.dll"
   File "/oname=libgstcdio.dll" "gstreamer-plugins\libgstcdio.dll"
+  File "/oname=libgstcoreelements.dll" "gstreamer-plugins\libgstcoreelements.dll"
+  File "/oname=libgstdash.dll" "gstreamer-plugins\libgstdash.dll"
+  File "/oname=libgstdirectsound.dll" "gstreamer-plugins\libgstdirectsound.dll"
+  File "/oname=libgstequalizer.dll" "gstreamer-plugins\libgstequalizer.dll"
   File "/oname=libgstflac.dll" "gstreamer-plugins\libgstflac.dll"
-  File "/oname=libgstwavparse.dll" "gstreamer-plugins\libgstwavparse.dll"
-  File "/oname=libgstwavpack.dll" "gstreamer-plugins\libgstwavpack.dll"
-  File "/oname=libgstogg.dll" "gstreamer-plugins\libgstogg.dll"
-  File "/oname=libgstvorbis.dll" "gstreamer-plugins\libgstvorbis.dll"
-  File "/oname=libgstopus.dll" "gstreamer-plugins\libgstopus.dll"
-  File "/oname=libgstopusparse.dll" "gstreamer-plugins\libgstopusparse.dll"
-  File "/oname=libgstspeex.dll" "gstreamer-plugins\libgstspeex.dll"
-  File "/oname=libgstlame.dll" "gstreamer-plugins\libgstlame.dll"
-  File "/oname=libgstaiff.dll" "gstreamer-plugins\libgstaiff.dll"
   File "/oname=libgstfaac.dll" "gstreamer-plugins\libgstfaac.dll"
   File "/oname=libgstfaad.dll" "gstreamer-plugins\libgstfaad.dll"
+  File "/oname=libgstgio.dll" "gstreamer-plugins\libgstgio.dll"
+  File "/oname=libgsticydemux.dll" "gstreamer-plugins\libgsticydemux.dll"
+  File "/oname=libgstid3demux.dll" "gstreamer-plugins\libgstid3demux.dll"
   File "/oname=libgstisomp4.dll" "gstreamer-plugins\libgstisomp4.dll"
-  File "/oname=libgstasf.dll" "gstreamer-plugins\libgstasf.dll"
+  File "/oname=libgstlame.dll" "gstreamer-plugins\libgstlame.dll"
-  File "/oname=libgstasfmux.dll" "gstreamer-plugins\libgstasfmux.dll"
   File "/oname=libgstlibav.dll" "gstreamer-plugins\libgstlibav.dll"
+  File "/oname=libgstogg.dll" "gstreamer-plugins\libgstogg.dll"
+  File "/oname=libgstopenmpt.dll" "gstreamer-plugins\libgstopenmpt.dll"
+  File "/oname=libgstopus.dll" "gstreamer-plugins\libgstopus.dll"
+  File "/oname=libgstopusparse.dll" "gstreamer-plugins\libgstopusparse.dll"
   File "/oname=libgstpbtypes.dll" "gstreamer-plugins\libgstpbtypes.dll"
+  File "/oname=libgstplayback.dll" "gstreamer-plugins\libgstplayback.dll"
+  File "/oname=libgstreplaygain.dll" "gstreamer-plugins\libgstreplaygain.dll"
   File "/oname=libgstrtp.dll" "gstreamer-plugins\libgstrtp.dll"
   File "/oname=libgstrtsp.dll" "gstreamer-plugins\libgstrtsp.dll"
+  File "/oname=libgstsoup.dll" "gstreamer-plugins\libgstsoup.dll"
+  File "/oname=libgstspectrum.dll" "gstreamer-plugins\libgstspectrum.dll"
+  File "/oname=libgstspeex.dll" "gstreamer-plugins\libgstspeex.dll"
+  File "/oname=libgsttaglib.dll" "gstreamer-plugins\libgsttaglib.dll"
+  File "/oname=libgsttcp.dll" "gstreamer-plugins\libgsttcp.dll"
+  File "/oname=libgsttypefindfunctions.dll" "gstreamer-plugins\libgsttypefindfunctions.dll"
+  File "/oname=libgstudp.dll" "gstreamer-plugins\libgstudp.dll"
+  File "/oname=libgstvolume.dll" "gstreamer-plugins\libgstvolume.dll"
+  File "/oname=libgstvorbis.dll" "gstreamer-plugins\libgstvorbis.dll"
+  File "/oname=libgstwasapi.dll" "gstreamer-plugins\libgstwasapi.dll"
+  File "/oname=libgstwavpack.dll" "gstreamer-plugins\libgstwavpack.dll"
+  File "/oname=libgstwavparse.dll" "gstreamer-plugins\libgstwavparse.dll"
+  File "/oname=libgstxingmux.dll" "gstreamer-plugins\libgstxingmux.dll"
 
 SectionEnd
 
@@ -436,32 +430,30 @@ SectionEnd
 
 Section "Uninstall"
 
-  nsExec::Exec '"$INSTDIR\killproc.exe" strawberry.exe'
-
   ; Delete all the files
 
-  Delete "$INSTDIR\strawberry.ico"
   Delete "$INSTDIR\strawberry.exe"
   Delete "$INSTDIR\strawberry-tagreader.exe"
+  Delete "$INSTDIR\strawberry.ico"
   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\libcrypto-3.dll"
-  Delete "$INSTDIR\libssl-1_1.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\libcrypto-3-x64.dll"
-  Delete "$INSTDIR\libssl-1_1-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"
@@ -469,22 +461,25 @@ Section "Uninstall"
   Delete "$INSTDIR\libcdio-19.dll"
   Delete "$INSTDIR\libchromaprint.dll"
   Delete "$INSTDIR\libdl.dll"
-  Delete "$INSTDIR\libfaac-0.dll"
+  Delete "$INSTDIR\libffi-8.dll"
-  Delete "$INSTDIR\libfaad-2.dll"
-  Delete "$INSTDIR\libffi-7.dll"
   Delete "$INSTDIR\libfftw3-3.dll"
   Delete "$INSTDIR\libFLAC-8.dll"
   Delete "$INSTDIR\libfreetype-6.dll"
+  Delete "$INSTDIR\libfaac-0.dll"
+  Delete "$INSTDIR\libfaad-2.dll"
   Delete "$INSTDIR\libgio-2.0-0.dll"
   Delete "$INSTDIR\libglib-2.0-0.dll"
   Delete "$INSTDIR\libgmodule-2.0-0.dll"
   Delete "$INSTDIR\libgmp-10.dll"
   Delete "$INSTDIR\libgnutls-30.dll"
   Delete "$INSTDIR\libgobject-2.0-0.dll"
+  Delete "$INSTDIR\libgstadaptivedemux-1.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\libgstisoff-1.0-0.dll"
   Delete "$INSTDIR\libgstnet-1.0-0.dll"
   Delete "$INSTDIR\libgstpbutils-1.0-0.dll"
   Delete "$INSTDIR\libgstreamer-1.0-0.dll"
@@ -493,6 +488,7 @@ Section "Uninstall"
   Delete "$INSTDIR\libgstrtsp-1.0-0.dll"
   Delete "$INSTDIR\libgstsdp-1.0-0.dll"
   Delete "$INSTDIR\libgsttag-1.0-0.dll"
+  Delete "$INSTDIR\libgsturidownloader-1.0-0.dll"
   Delete "$INSTDIR\libgstvideo-1.0-0.dll"
   Delete "$INSTDIR\libharfbuzz-0.dll"
   Delete "$INSTDIR\libhogweed-6.dll"
@@ -504,44 +500,37 @@ 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\libpsl-5.dll"
-  Delete "$INSTDIR\libqtsparkle-qt5.dll"
+  Delete "$INSTDIR\libprotobuf-30.dll"
   Delete "$INSTDIR\libqtsparkle-qt6.dll"
-  Delete "$INSTDIR\libsoup-2.4-1.dll"
   Delete "$INSTDIR\libspeex-1.dll"
   Delete "$INSTDIR\libsqlite3-0.dll"
   Delete "$INSTDIR\libssp-0.dll"
   Delete "$INSTDIR\libstdc++-6.dll"
+  Delete "$INSTDIR\libsoup-2.4-1.dll"
   Delete "$INSTDIR\libtag.dll"
   Delete "$INSTDIR\libtasn1-6.dll"
   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"
   Delete "$INSTDIR\libzstd.dll"
   Delete "$INSTDIR\postproc-55.dll"
-  Delete "$INSTDIR\Qt5Concurrent.dll"
-  Delete "$INSTDIR\Qt5Core.dll"
-  Delete "$INSTDIR\Qt5Gui.dll"
-  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,66 +546,70 @@ Section "Uninstall"
 
   Delete "$INSTDIR\gio-modules\libgiognutls.dll"
   Delete "$INSTDIR\platforms\qwindows.dll"
-  Delete "$INSTDIR\sqldrivers\qsqlite.dll"
   Delete "$INSTDIR\styles\qwindowsvistastyle.dll"
+  Delete "$INSTDIR\tls\qopensslbackend.dll"
+  Delete "$INSTDIR\sqldrivers\qsqlite.dll"
 
   Delete "$INSTDIR\imageformats\qgif.dll"
   Delete "$INSTDIR\imageformats\qico.dll"
   Delete "$INSTDIR\imageformats\qjpeg.dll"
 
-  Delete "$INSTDIR\gstreamer-plugins\libgstapp.dll"
+  Delete $INSTDIR\gstreamer-plugins\libgstaiff.dll"
-  Delete "$INSTDIR\gstreamer-plugins\libgstcoreelements.dll"
+  Delete $INSTDIR\gstreamer-plugins\libgstapetag.dll"
-  Delete "$INSTDIR\gstreamer-plugins\libgstaudioconvert.dll"
+  Delete $INSTDIR\gstreamer-plugins\libgstapp.dll"
-  Delete "$INSTDIR\gstreamer-plugins\libgstaudiofx.dll"
+  Delete $INSTDIR\gstreamer-plugins\libgstasf.dll"
-  Delete "$INSTDIR\gstreamer-plugins\libgstaudiomixer.dll"
+  Delete $INSTDIR\gstreamer-plugins\libgstasfmux.dll"
-  Delete "$INSTDIR\gstreamer-plugins\libgstaudioparsers.dll"
+  Delete $INSTDIR\gstreamer-plugins\libgstaudioconvert.dll"
-  Delete "$INSTDIR\gstreamer-plugins\libgstaudiorate.dll"
+  Delete $INSTDIR\gstreamer-plugins\libgstaudiofx.dll"
-  Delete "$INSTDIR\gstreamer-plugins\libgstaudioresample.dll"
+  Delete $INSTDIR\gstreamer-plugins\libgstaudiomixer.dll"
-  Delete "$INSTDIR\gstreamer-plugins\libgstaudiotestsrc.dll"
+  Delete $INSTDIR\gstreamer-plugins\libgstaudioparsers.dll"
-  Delete "$INSTDIR\gstreamer-plugins\libgstautodetect.dll"
+  Delete $INSTDIR\gstreamer-plugins\libgstaudiorate.dll"
-  Delete "$INSTDIR\gstreamer-plugins\libgstplayback.dll"
+  Delete $INSTDIR\gstreamer-plugins\libgstaudioresample.dll"
-  Delete "$INSTDIR\gstreamer-plugins\libgstvolume.dll"
+  Delete $INSTDIR\gstreamer-plugins\libgstaudiotestsrc.dll"
-  Delete "$INSTDIR\gstreamer-plugins\libgstspectrum.dll"
+  Delete $INSTDIR\gstreamer-plugins\libgstautodetect.dll"
-  Delete "$INSTDIR\gstreamer-plugins\libgstequalizer.dll"
+  Delete $INSTDIR\gstreamer-plugins\libgstcdio.dll"
-  Delete "$INSTDIR\gstreamer-plugins\libgstreplaygain.dll"
+  Delete $INSTDIR\gstreamer-plugins\libgstcoreelements.dll"
-  Delete "$INSTDIR\gstreamer-plugins\libgsttypefindfunctions.dll"
+  Delete $INSTDIR\gstreamer-plugins\libgstdash.dll"
-  Delete "$INSTDIR\gstreamer-plugins\libgstgio.dll"
+  Delete $INSTDIR\gstreamer-plugins\libgstdirectsound.dll"
-  Delete "$INSTDIR\gstreamer-plugins\libgstdirectsound.dll"
+  Delete $INSTDIR\gstreamer-plugins\libgstequalizer.dll"
-  Delete "$INSTDIR\gstreamer-plugins\libgstwasapi.dll"
+  Delete $INSTDIR\gstreamer-plugins\libgstflac.dll"
-  Delete "$INSTDIR\gstreamer-plugins\libgstapetag.dll"
+  Delete $INSTDIR\gstreamer-plugins\libgstfaac.dll"
-  Delete "$INSTDIR\gstreamer-plugins\libgsticydemux.dll"
+  Delete $INSTDIR\gstreamer-plugins\libgstfaad.dll"
-  Delete "$INSTDIR\gstreamer-plugins\libgstid3demux.dll"
+  Delete $INSTDIR\gstreamer-plugins\libgstgio.dll"
-  Delete "$INSTDIR\gstreamer-plugins\libgsttaglib.dll"
+  Delete $INSTDIR\gstreamer-plugins\libgsticydemux.dll"
-  Delete "$INSTDIR\gstreamer-plugins\libgsttcp.dll"
+  Delete $INSTDIR\gstreamer-plugins\libgstid3demux.dll"
-  Delete "$INSTDIR\gstreamer-plugins\libgstudp.dll"
+  Delete $INSTDIR\gstreamer-plugins\libgstisomp4.dll"
-  Delete "$INSTDIR\gstreamer-plugins\libgstsoup.dll"
+  Delete $INSTDIR\gstreamer-plugins\libgstlame.dll"
-  Delete "$INSTDIR\gstreamer-plugins\libgstcdio.dll"
+  Delete $INSTDIR\gstreamer-plugins\libgstlibav.dll"
-  Delete "$INSTDIR\gstreamer-plugins\libgstflac.dll"
+  Delete $INSTDIR\gstreamer-plugins\libgstogg.dll"
-  Delete "$INSTDIR\gstreamer-plugins\libgstwavparse.dll"
+  Delete $INSTDIR\gstreamer-plugins\libgstopenmpt.dll"
-  Delete "$INSTDIR\gstreamer-plugins\libgstwavpack.dll"
+  Delete $INSTDIR\gstreamer-plugins\libgstopus.dll"
-  Delete "$INSTDIR\gstreamer-plugins\libgstogg.dll"
+  Delete $INSTDIR\gstreamer-plugins\libgstopusparse.dll"
-  Delete "$INSTDIR\gstreamer-plugins\libgstvorbis.dll"
+  Delete $INSTDIR\gstreamer-plugins\libgstpbtypes.dll"
-  Delete "$INSTDIR\gstreamer-plugins\libgstopus.dll"
+  Delete $INSTDIR\gstreamer-plugins\libgstplayback.dll"
-  Delete "$INSTDIR\gstreamer-plugins\libgstopusparse.dll"
+  Delete $INSTDIR\gstreamer-plugins\libgstreplaygain.dll"
-  Delete "$INSTDIR\gstreamer-plugins\libgstspeex.dll"
+  Delete $INSTDIR\gstreamer-plugins\libgstrtp.dll"
-  Delete "$INSTDIR\gstreamer-plugins\libgstlame.dll"
+  Delete $INSTDIR\gstreamer-plugins\libgstrtsp.dll"
-  Delete "$INSTDIR\gstreamer-plugins\libgstaiff.dll"
+  Delete $INSTDIR\gstreamer-plugins\libgstsoup.dll"
-  Delete "$INSTDIR\gstreamer-plugins\libgstfaac.dll"
+  Delete $INSTDIR\gstreamer-plugins\libgstspectrum.dll"
-  Delete "$INSTDIR\gstreamer-plugins\libgstfaad.dll"
+  Delete $INSTDIR\gstreamer-plugins\libgstspeex.dll"
-  Delete "$INSTDIR\gstreamer-plugins\libgstisomp4.dll"
+  Delete $INSTDIR\gstreamer-plugins\libgsttaglib.dll"
-  Delete "$INSTDIR\gstreamer-plugins\libgstasf.dll"
+  Delete $INSTDIR\gstreamer-plugins\libgsttcp.dll"
-  Delete "$INSTDIR\gstreamer-plugins\libgstasfmux.dll"
+  Delete $INSTDIR\gstreamer-plugins\libgsttypefindfunctions.dll"
-  Delete "$INSTDIR\gstreamer-plugins\libgstlibav.dll"
+  Delete $INSTDIR\gstreamer-plugins\libgstudp.dll"
-  Delete "$INSTDIR\gstreamer-plugins\libgstpbtypes.dll"
+  Delete $INSTDIR\gstreamer-plugins\libgstvolume.dll"
-  Delete "$INSTDIR\gstreamer-plugins\libgstrtp.dll"
+  Delete $INSTDIR\gstreamer-plugins\libgstvorbis.dll"
-  Delete "$INSTDIR\gstreamer-plugins\libgstrtsp.dll"
+  Delete $INSTDIR\gstreamer-plugins\libgstwasapi.dll"
+  Delete $INSTDIR\gstreamer-plugins\libgstwavpack.dll"
+  Delete $INSTDIR\gstreamer-plugins\libgstwavparse.dll"
+  Delete $INSTDIR\gstreamer-plugins\libgstxingmux.dll"
 
-  Delete "$INSTDIR\killproc.exe"
+  Delete $INSTDIR\Uninstall.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>
 
@@ -32,24 +33,13 @@
 
 #include "gstfastspectrum.h"
 
-GST_DEBUG_CATEGORY_STATIC (gst_fastspectrum_debug);
+GST_DEBUG_CATEGORY_STATIC(gst_fastspectrum_debug);
-#define GST_CAT_DEFAULT gst_fastspectrum_debug
 
-/* elementfactory information */
+namespace {
-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
-# define FORMATS "{ S16LE, S24LE, S32LE, F32LE, F64LE }"
-#else
-# define FORMATS "{ S16BE, S24BE, S32BE, F32BE, F64BE }"
-#endif
 
-#define ALLOWED_CAPS \
+// Spectrum properties
-  GST_AUDIO_CAPS_MAKE (FORMATS) ", " \
+constexpr auto DEFAULT_INTERVAL = (GST_SECOND / 10);
-  "layout = (string) interleaved, " \
+constexpr auto DEFAULT_BANDS = 128;
-  "channels = 1"
-
-/* Spectrum properties */
-#define DEFAULT_INTERVAL		(GST_SECOND / 10)
-#define DEFAULT_BANDS			128
 
 enum {
   PROP_0,
@@ -57,93 +47,97 @@ enum {
   PROP_BANDS
 };
 
+}  // namespace
+
 #define gst_fastspectrum_parent_class parent_class
-G_DEFINE_TYPE (GstFastSpectrum, gst_fastspectrum, GST_TYPE_AUDIO_FILTER)
+G_DEFINE_TYPE(GstFastSpectrum, gst_fastspectrum, GST_TYPE_AUDIO_FILTER)
 
-static void gst_fastspectrum_finalize (GObject * object);
+static void gst_fastspectrum_finalize(GObject *object);
-static void gst_fastspectrum_set_property (GObject * object, guint prop_id, const GValue * value, GParamSpec * pspec);
+static void gst_fastspectrum_set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
-static void gst_fastspectrum_get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspec);
+static void gst_fastspectrum_get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
-static gboolean gst_fastspectrum_start (GstBaseTransform * trans);
+static gboolean gst_fastspectrum_start(GstBaseTransform *trans);
-static gboolean gst_fastspectrum_stop (GstBaseTransform * trans);
+static gboolean gst_fastspectrum_stop(GstBaseTransform *trans);
-static GstFlowReturn gst_fastspectrum_transform_ip (GstBaseTransform *trans, GstBuffer *buffer);
+static GstFlowReturn gst_fastspectrum_transform_ip(GstBaseTransform *trans, GstBuffer *buffer);
-static gboolean gst_fastspectrum_setup (GstAudioFilter * base, const GstAudioInfo * info);
+static gboolean gst_fastspectrum_setup(GstAudioFilter *base, const GstAudioInfo *info);
 
-static void gst_fastspectrum_class_init (GstFastSpectrumClass * klass) {
+static void gst_fastspectrum_class_init(GstFastSpectrumClass *klass) {
 
-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+  GObjectClass *gobject_class = G_OBJECT_CLASS(klass);
-  GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
+  GstElementClass *element_class = GST_ELEMENT_CLASS(klass);
-  GstBaseTransformClass *trans_class = GST_BASE_TRANSFORM_CLASS (klass);
+  GstBaseTransformClass *trans_class = GST_BASE_TRANSFORM_CLASS(klass);
-  GstAudioFilterClass *filter_class = GST_AUDIO_FILTER_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;
   gobject_class->finalize = gst_fastspectrum_finalize;
 
-  trans_class->start = GST_DEBUG_FUNCPTR (gst_fastspectrum_start);
+  trans_class->start = GST_DEBUG_FUNCPTR(gst_fastspectrum_start);
-  trans_class->stop = GST_DEBUG_FUNCPTR (gst_fastspectrum_stop);
+  trans_class->stop = GST_DEBUG_FUNCPTR(gst_fastspectrum_stop);
-  trans_class->transform_ip = GST_DEBUG_FUNCPTR (gst_fastspectrum_transform_ip);
+  trans_class->transform_ip = GST_DEBUG_FUNCPTR(gst_fastspectrum_transform_ip);
   trans_class->passthrough_on_same_caps = TRUE;
 
-  filter_class->setup = GST_DEBUG_FUNCPTR (gst_fastspectrum_setup);
+  filter_class->setup = GST_DEBUG_FUNCPTR(gst_fastspectrum_setup);
 
-  g_object_class_install_property (gobject_class, PROP_INTERVAL,
+  g_object_class_install_property(gobject_class, PROP_INTERVAL, g_param_spec_uint64("interval", "Interval", "Interval of time between message posts (in nanoseconds)", 1, G_MAXUINT64, DEFAULT_INTERVAL, GParamFlags(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
-      g_param_spec_uint64 ("interval", "Interval", "Interval of time between message posts (in nanoseconds)", 1, G_MAXUINT64, DEFAULT_INTERVAL, GParamFlags(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
 
-  g_object_class_install_property (gobject_class, PROP_BANDS, g_param_spec_uint ("bands", "Bands", "Number of frequency bands", 0, G_MAXUINT, DEFAULT_BANDS, GParamFlags(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+  g_object_class_install_property(gobject_class, PROP_BANDS, g_param_spec_uint("bands", "Bands", "Number of frequency bands", 0, G_MAXUINT, DEFAULT_BANDS, GParamFlags(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
 
-  GST_DEBUG_CATEGORY_INIT (gst_fastspectrum_debug, "spectrum", 0,
+  GST_DEBUG_CATEGORY_INIT(gst_fastspectrum_debug, "spectrum", 0, "audio spectrum analyser element");
-      "audio spectrum analyser element");
 
-  gst_element_class_set_static_metadata (element_class, "Spectrum analyzer",
+  gst_element_class_set_static_metadata(element_class, "Spectrum analyzer",
-      "Filter/Analyzer/Audio",
+    "Filter/Analyzer/Audio",
-      "Run an FFT on the audio signal, output spectrum data",
+    "Run an FFT on the audio signal, output spectrum data",
-      "Erik Walthinsen <omega@cse.ogi.edu>, "
+    "Erik Walthinsen <omega@cse.ogi.edu>, "
-      "Stefan Kost <ensonic@users.sf.net>, "
+    "Stefan Kost <ensonic@users.sf.net>, "
-      "Sebastian Dröge <sebastian.droege@collabora.co.uk>");
+    "Sebastian Dröge <sebastian.droege@collabora.co.uk>");
 
-  caps = gst_caps_from_string (ALLOWED_CAPS);
+#if G_BYTE_ORDER == G_LITTLE_ENDIAN
-  gst_audio_filter_class_add_pad_templates (filter_class, caps);
+  caps = gst_caps_from_string(GST_AUDIO_CAPS_MAKE("{ S16LE, S24LE, S32LE, F32LE, F64LE }") ", layout = (string) interleaved, channels = 1");
-  gst_caps_unref (caps);
+#else
+  caps = gst_caps_from_string(GST_AUDIO_CAPS_MAKE("{ S16BE, S24BE, S32BE, F32BE, F64BE }") ", layout = (string) interleaved, channels = 1");
+#endif
+
+  gst_audio_filter_class_add_pad_templates(filter_class, caps);
+  gst_caps_unref(caps);
 
   klass->fftw_lock = new QMutex;
-
 }
 
-static void gst_fastspectrum_init (GstFastSpectrum * spectrum) {
+static void gst_fastspectrum_init(GstFastSpectrum *spectrum) {
 
   spectrum->interval = DEFAULT_INTERVAL;
   spectrum->bands = DEFAULT_BANDS;
 
   spectrum->channel_data_initialized = false;
 
-  g_mutex_init (&spectrum->lock);
+  g_mutex_init(&spectrum->lock);
 
 }
 
-static void gst_fastspectrum_alloc_channel_data (GstFastSpectrum * spectrum) {
+static void gst_fastspectrum_alloc_channel_data(GstFastSpectrum *spectrum) {
 
   guint bands = spectrum->bands;
   guint nfft = 2 * bands - 2;
 
   spectrum->input_ring_buffer = new double[nfft];
-  spectrum->fft_input = reinterpret_cast<double*>( fftw_malloc(sizeof(double) * nfft));
+  spectrum->fft_input = reinterpret_cast<double*>(fftw_malloc(sizeof(double) * nfft));
-  spectrum->fft_output =reinterpret_cast<fftw_complex*>( fftw_malloc(sizeof(fftw_complex) * (nfft/2+1)));
+  spectrum->fft_output = reinterpret_cast<fftw_complex*>(fftw_malloc(sizeof(fftw_complex) * (nfft / 2 + 1)));
 
-  spectrum->spect_magnitude = new double[bands]{};
+  spectrum->spect_magnitude = new double[bands] {};
 
-  GstFastSpectrumClass* klass = reinterpret_cast<GstFastSpectrumClass*>(G_OBJECT_GET_CLASS(spectrum));
+  GstFastSpectrumClass *klass = reinterpret_cast<GstFastSpectrumClass*>(G_OBJECT_GET_CLASS(spectrum));
   {
     QMutexLocker l(klass->fftw_lock);
-    spectrum->plan = fftw_plan_dft_r2c_1d(nfft, spectrum->fft_input, spectrum->fft_output, FFTW_ESTIMATE);
+    spectrum->plan = fftw_plan_dft_r2c_1d(static_cast<int>(nfft), spectrum->fft_input, spectrum->fft_output, FFTW_ESTIMATE);
   }
   spectrum->channel_data_initialized = true;
 
 }
 
-static void gst_fastspectrum_free_channel_data (GstFastSpectrum * spectrum) {
+static void gst_fastspectrum_free_channel_data(GstFastSpectrum *spectrum) {
 
-  GstFastSpectrumClass* klass = reinterpret_cast<GstFastSpectrumClass*>(G_OBJECT_GET_CLASS(spectrum));
+  GstFastSpectrumClass *klass = reinterpret_cast<GstFastSpectrumClass*>(G_OBJECT_GET_CLASS(spectrum));
   if (spectrum->channel_data_initialized) {
     {
       QMutexLocker l(klass->fftw_lock);
@@ -159,7 +153,7 @@ static void gst_fastspectrum_free_channel_data (GstFastSpectrum * spectrum) {
 
 }
 
-static void gst_fastspectrum_flush (GstFastSpectrum * spectrum) {
+static void gst_fastspectrum_flush(GstFastSpectrum *spectrum) {
 
   spectrum->num_frames = 0;
   spectrum->num_fft = 0;
@@ -168,150 +162,149 @@ static void gst_fastspectrum_flush (GstFastSpectrum * spectrum) {
 
 }
 
-static void gst_fastspectrum_reset_state (GstFastSpectrum * spectrum) {
+static void gst_fastspectrum_reset_state(GstFastSpectrum *spectrum) {
 
-  GST_DEBUG_OBJECT (spectrum, "resetting state");
+  GST_DEBUG_OBJECT(spectrum, "resetting state");
 
-  gst_fastspectrum_free_channel_data (spectrum);
+  gst_fastspectrum_free_channel_data(spectrum);
-  gst_fastspectrum_flush (spectrum);
+  gst_fastspectrum_flush(spectrum);
 
 }
 
-static void gst_fastspectrum_finalize (GObject * object) {
+static void gst_fastspectrum_finalize(GObject *object) {
 
   GstFastSpectrum *spectrum = reinterpret_cast<GstFastSpectrum*>(object);
 
-  gst_fastspectrum_reset_state (spectrum);
+  gst_fastspectrum_reset_state(spectrum);
-  g_mutex_clear (&spectrum->lock);
+  g_mutex_clear(&spectrum->lock);
 
-  G_OBJECT_CLASS (parent_class)->finalize (object);
+  G_OBJECT_CLASS(parent_class)->finalize(object);
 
 }
 
-static void gst_fastspectrum_set_property (GObject * object, guint prop_id, const GValue * value, GParamSpec * pspec) {
+static void gst_fastspectrum_set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) {
 
   GstFastSpectrum *filter = reinterpret_cast<GstFastSpectrum*>(object);
 
   switch (prop_id) {
-    case PROP_INTERVAL:{
+    case PROP_INTERVAL: {
-      guint64 interval = g_value_get_uint64 (value);
+      guint64 interval = g_value_get_uint64(value);
-      g_mutex_lock (&filter->lock);
+      g_mutex_lock(&filter->lock);
       if (filter->interval != interval) {
         filter->interval = interval;
-        gst_fastspectrum_reset_state (filter);
+        gst_fastspectrum_reset_state(filter);
       }
-      g_mutex_unlock (&filter->lock);
+      g_mutex_unlock(&filter->lock);
       break;
     }
-    case PROP_BANDS:{
+    case PROP_BANDS: {
-      guint bands = g_value_get_uint (value);
+      guint bands = g_value_get_uint(value);
-      g_mutex_lock (&filter->lock);
+      g_mutex_lock(&filter->lock);
       if (filter->bands != bands) {
         filter->bands = bands;
-        gst_fastspectrum_reset_state (filter);
+        gst_fastspectrum_reset_state(filter);
       }
-      g_mutex_unlock (&filter->lock);
+      g_mutex_unlock(&filter->lock);
       break;
     }
     default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
       break;
   }
 
 }
 
-static void gst_fastspectrum_get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspec) {
+static void gst_fastspectrum_get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) {
 
   GstFastSpectrum *filter = reinterpret_cast<GstFastSpectrum*>(object);
 
   switch (prop_id) {
     case PROP_INTERVAL:
-      g_value_set_uint64 (value, filter->interval);
+      g_value_set_uint64(value, filter->interval);
       break;
     case PROP_BANDS:
-      g_value_set_uint (value, filter->bands);
+      g_value_set_uint(value, filter->bands);
       break;
     default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
       break;
   }
 
 }
 
-static gboolean gst_fastspectrum_start (GstBaseTransform * trans) {
+static gboolean gst_fastspectrum_start(GstBaseTransform *trans) {
 
   GstFastSpectrum *spectrum = reinterpret_cast<GstFastSpectrum*>(trans);
 
-  gst_fastspectrum_reset_state (spectrum);
+  gst_fastspectrum_reset_state(spectrum);
 
   return TRUE;
 
 }
 
-static gboolean gst_fastspectrum_stop (GstBaseTransform * trans) {
+static gboolean gst_fastspectrum_stop(GstBaseTransform *trans) {
 
   GstFastSpectrum *spectrum = reinterpret_cast<GstFastSpectrum*>(trans);
 
-  gst_fastspectrum_reset_state (spectrum);
+  gst_fastspectrum_reset_state(spectrum);
 
   return TRUE;
 
 }
 
-/* mixing data readers */
+// Mixing data readers
 
-static void input_data_mixed_float(const guint8* _in, double* out, guint len, double max_value, guint op, guint nfft) {
+static void input_data_mixed_float(const guint8 *_in, double *out, guint len, double max_value, guint op, guint nfft) {
 
   Q_UNUSED(max_value);
 
-  guint j, ip = 0;
   const gfloat *in = reinterpret_cast<const gfloat*>(_in);
+  guint ip = 0;
 
-  for (j = 0; j < len; j++) {
+  for (guint j = 0; j < len; j++) {
     out[op] = in[ip++];
     op = (op + 1) % nfft;
   }
 
 }
 
-static void input_data_mixed_double (const guint8 * _in, double* out, guint len, double max_value, guint op, guint nfft) {
+static void input_data_mixed_double(const guint8 *_in, double *out, guint len, double max_value, guint op, guint nfft) {
 
   Q_UNUSED(max_value);
 
-  guint j, ip = 0;
   const gdouble *in = reinterpret_cast<const gdouble*>(_in);
+  guint ip = 0;
 
-  for (j = 0; j < len; j++) {
+  for (guint j = 0; j < len; j++) {
     out[op] = in[ip++];
     op = (op + 1) % nfft;
   }
 
 }
 
-static void input_data_mixed_int32_max (const guint8 * _in, double* out, guint len, double max_value, guint op, guint nfft) {
+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;
   const gint32 *in = reinterpret_cast<const gint32*>(_in);
+  guint ip = 0;
 
-  for (j = 0; j < len; j++) {
+  for (guint j = 0; j < len; j++) {
     out[op] = in[ip++] / max_value;
     op = (op + 1) % nfft;
   }
 
 }
 
-static void input_data_mixed_int24_max (const guint8 * _in, double* out, guint len, double max_value, guint op, guint nfft) {
+static void input_data_mixed_int24_max(const guint8 *_in, double *out, guint len, double max_value, guint op, guint nfft) {
 
-  guint j;
+  for (guint j = 0; j < len; j++) {
-
-  for (j = 0; j < len; j++) {
 #if G_BYTE_ORDER == G_BIG_ENDIAN
-    gint32 value = GST_READ_UINT24_BE (_in);
+    guint32 value = GST_READ_UINT24_BE(_in);
 #else
-    gint32 value = GST_READ_UINT24_LE (_in);
+    guint32 value = GST_READ_UINT24_LE(_in);
 #endif
-    if (value & 0x00800000)
+    if (value & 0x00800000) {
       value |= 0xff000000;
+    }
 
     out[op] = value / max_value;
     op = (op + 1) % nfft;
@@ -320,25 +313,25 @@ 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) {
+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;
   const gint16 *in = reinterpret_cast<const gint16*>(_in);
+  guint ip = 0;
 
-  for (j = 0; j < len; j++) {
+  for (guint j = 0; j < len; j++) {
     out[op] = in[ip++] / max_value;
     op = (op + 1) % nfft;
   }
 
 }
 
-static gboolean gst_fastspectrum_setup (GstAudioFilter * base, const GstAudioInfo * info) {
+static gboolean gst_fastspectrum_setup(GstAudioFilter *base, const GstAudioInfo *info) {
 
   GstFastSpectrum *spectrum = reinterpret_cast<GstFastSpectrum*>(base);
   GstFastSpectrumInputData input_data = nullptr;
 
-  g_mutex_lock (&spectrum->lock);
+  g_mutex_lock(&spectrum->lock);
-  switch (GST_AUDIO_INFO_FORMAT (info)) {
+  switch (GST_AUDIO_INFO_FORMAT(info)) {
     case GST_AUDIO_FORMAT_S16:
       input_data = input_data_mixed_int16_max;
       break;
@@ -355,34 +348,33 @@ static gboolean gst_fastspectrum_setup (GstAudioFilter * base, const GstAudioInf
       input_data = input_data_mixed_double;
       break;
     default:
-      g_assert_not_reached ();
+      g_assert_not_reached();
       break;
   }
   spectrum->input_data = input_data;
 
-  gst_fastspectrum_reset_state (spectrum);
+  gst_fastspectrum_reset_state(spectrum);
-  g_mutex_unlock (&spectrum->lock);
+  g_mutex_unlock(&spectrum->lock);
 
   return TRUE;
 
 }
 
-static void gst_fastspectrum_run_fft (GstFastSpectrum * spectrum, guint input_pos) {
+static void gst_fastspectrum_run_fft(GstFastSpectrum *spectrum, guint input_pos) {
 
-  guint i;
   guint bands = spectrum->bands;
   guint nfft = 2 * bands - 2;
 
-  for (i = 0; i < nfft; i++)
+  for (guint 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;
+  // Calculate magnitude in db
-  /* Calculate magnitude in db */
+  for (guint i = 0; i < bands; i++) {
-  for (i = 0; i < bands; i++) {
+    gdouble val = spectrum->fft_output[i][0] * spectrum->fft_output[i][0];
-    val = spectrum->fft_output[i][0] * spectrum->fft_output[i][0];
     val += spectrum->fft_output[i][1] * spectrum->fft_output[i][1];
     val /= nfft * nfft;
     spectrum->spect_magnitude[i] += val;
@@ -390,83 +382,76 @@ static void gst_fastspectrum_run_fft (GstFastSpectrum * spectrum, guint input_po
 
 }
 
-static GstFlowReturn gst_fastspectrum_transform_ip (GstBaseTransform *trans, GstBuffer *buffer) {
+static GstFlowReturn gst_fastspectrum_transform_ip(GstBaseTransform *trans, GstBuffer *buffer) {
 
   GstFastSpectrum *spectrum = reinterpret_cast<GstFastSpectrum*>(trans);
-  guint rate = GST_AUDIO_FILTER_RATE (spectrum);
+  guint rate = GST_AUDIO_FILTER_RATE(spectrum);
-  guint bps = GST_AUDIO_FILTER_BPS (spectrum);
+  guint bps = GST_AUDIO_FILTER_BPS(spectrum);
-  guint bpf = GST_AUDIO_FILTER_BPF (spectrum);
+  guint bpf = GST_AUDIO_FILTER_BPF(spectrum);
-  double max_value = (1UL << ((bps << 3) - 1)) - 1;
+  double max_value = static_cast<double>((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;
+  const guint8 *data = nullptr;
-  gsize size;
+  gsize size = 0;
-  guint fft_todo, msg_todo, block_size;
+  GstFastSpectrumInputData input_data = nullptr;
-  gboolean have_full_interval;
-  GstFastSpectrumInputData input_data;
 
-  g_mutex_lock (&spectrum->lock);
+  g_mutex_lock(&spectrum->lock);
-  gst_buffer_map (buffer, &map, GST_MAP_READ);
+  gst_buffer_map(buffer, &map, GST_MAP_READ);
   data = map.data;
   size = map.size;
 
-  GST_LOG_OBJECT (spectrum, "input size: %" G_GSIZE_FORMAT " bytes", size);
+  GST_LOG_OBJECT(spectrum, "input size: %" G_GSIZE_FORMAT " bytes", size);
 
-  if (GST_BUFFER_IS_DISCONT (buffer)) {
+  if (GST_BUFFER_IS_DISCONT(buffer)) {
-    GST_DEBUG_OBJECT (spectrum, "Discontinuity detected -- flushing");
+    GST_DEBUG_OBJECT(spectrum, "Discontinuity detected -- flushing");
-    gst_fastspectrum_flush (spectrum);
+    gst_fastspectrum_flush(spectrum);
   }
 
-  /* If we don't have a FFT context yet (or it was reset due to parameter
+  // If we don't have a FFT context yet (or it was reset due to parameter changes) get one and allocate memory for everything
-   * changes) get one and allocate memory for everything
-   */
   if (!spectrum->channel_data_initialized) {
-    GST_DEBUG_OBJECT (spectrum, "allocating for bands %u", bands);
+    GST_DEBUG_OBJECT(spectrum, "allocating for bands %u", bands);
 
-    gst_fastspectrum_alloc_channel_data (spectrum);
+    gst_fastspectrum_alloc_channel_data(spectrum);
 
-    /* number of sample frames we process before posting a message
+    // Number of sample frames we process before posting a message interval is in ns
-     * interval is in ns */
+    spectrum->frames_per_interval = gst_util_uint64_scale(spectrum->interval, rate, GST_SECOND);
-    spectrum->frames_per_interval = gst_util_uint64_scale (spectrum->interval, rate, GST_SECOND);
     spectrum->frames_todo = spectrum->frames_per_interval;
-    /* rounding error for frames_per_interval in ns,
+    // Rounding error for frames_per_interval in ns, aggregated it in accumulated_error
-     * 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 %"
+    GST_INFO_OBJECT(spectrum, "interval %" GST_TIME_FORMAT ", fpi %" G_GUINT64_FORMAT ", error %" GST_TIME_FORMAT, GST_TIME_ARGS(spectrum->interval), spectrum->frames_per_interval, GST_TIME_ARGS(spectrum->error_per_interval));
-        G_GUINT64_FORMAT ", error %" GST_TIME_FORMAT,
-        GST_TIME_ARGS (spectrum->interval), spectrum->frames_per_interval,
-        GST_TIME_ARGS (spectrum->error_per_interval));
 
     spectrum->input_pos = 0;
 
-    gst_fastspectrum_flush (spectrum);
+    gst_fastspectrum_flush(spectrum);
   }
 
-  if (spectrum->num_frames == 0)
+  if (spectrum->num_frames == 0) {
-    spectrum->message_ts = GST_BUFFER_TIMESTAMP (buffer);
+    spectrum->message_ts = GST_BUFFER_TIMESTAMP(buffer);
+  }
 
   input_pos = spectrum->input_pos;
   input_data = spectrum->input_data;
 
   while (size >= bpf) {
-    /* run input_data for a chunk of data */
+    // Run input_data for a chunk of data
-    fft_todo = nfft - (spectrum->num_frames % nfft);
+    guint fft_todo = nfft - (spectrum->num_frames % nfft);
-    msg_todo = spectrum->frames_todo - spectrum->num_frames;
+    guint msg_todo = spectrum->frames_todo - spectrum->num_frames;
-    GST_LOG_OBJECT (spectrum,
+    GST_LOG_OBJECT(spectrum, "message frames todo: %u, fft frames todo: %u, input frames %" G_GSIZE_FORMAT, msg_todo, fft_todo, (size / bpf));
-        "message frames todo: %u, fft frames todo: %u, input frames %"
+    guint block_size = msg_todo;
-        G_GSIZE_FORMAT, msg_todo, fft_todo, (size / bpf));
+    if (block_size > (size / bpf)) {
-    block_size = msg_todo;
-    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 */
+    // Move the current frames into our ringbuffers
     input_data(data, spectrum->input_ring_buffer, block_size, max_value, input_pos, nfft);
 
     data += block_size * bpf;
@@ -474,25 +459,19 @@ static GstFlowReturn gst_fastspectrum_transform_ip (GstBaseTransform *trans, Gst
     input_pos = (input_pos + block_size) % nfft;
     spectrum->num_frames += block_size;
 
-    have_full_interval = (spectrum->num_frames == spectrum->frames_todo);
+    gboolean have_full_interval = (spectrum->num_frames == spectrum->frames_todo);
 
-    GST_LOG_OBJECT (spectrum,
+    GST_LOG_OBJECT(spectrum, "size: %" G_GSIZE_FORMAT ", do-fft = %d, do-message = %d", size, (spectrum->num_frames % nfft == 0), have_full_interval);
-        "size: %" G_GSIZE_FORMAT ", do-fft = %d, do-message = %d", size,
-        (spectrum->num_frames % nfft == 0), have_full_interval);
 
-    /* If we have enough frames for an FFT or we have all frames required for
+    // If we have enough frames for an FFT or we have all frames required for the interval and we haven't run a FFT, then run an FFT
-     * the interval and we haven't run a FFT, then run an FFT */
     if ((spectrum->num_frames % nfft == 0) || (have_full_interval && !spectrum->num_fft)) {
-      gst_fastspectrum_run_fft (spectrum, input_pos);
+      gst_fastspectrum_run_fft(spectrum, input_pos);
       spectrum->num_fft++;
     }
 
-    /* Do we have the FFTs for one interval? */
+    // Do we have the FFTs for one interval?
     if (have_full_interval) {
-      GST_DEBUG_OBJECT (spectrum, "nfft: %u frames: %" G_GUINT64_FORMAT
+      GST_DEBUG_OBJECT(spectrum, "nfft: %u frames: %" G_GUINT64_FORMAT " fpi: %" G_GUINT64_FORMAT " error: %" GST_TIME_FORMAT, nfft, spectrum->num_frames, spectrum->frames_per_interval, GST_TIME_ARGS(spectrum->accumulated_error));
-          " fpi: %" G_GUINT64_FORMAT " error: %" GST_TIME_FORMAT, nfft,
-          spectrum->num_frames, spectrum->frames_per_interval,
-          GST_TIME_ARGS (spectrum->accumulated_error));
 
       spectrum->frames_todo = spectrum->frames_per_interval;
       if (spectrum->accumulated_error >= GST_SECOND) {
@@ -504,17 +483,18 @@ static GstFlowReturn gst_fastspectrum_transform_ip (GstBaseTransform *trans, Gst
       if (spectrum->output_callback) {
         // Calculate average
         for (guint i = 0; i < spectrum->bands; i++) {
-          spectrum->spect_magnitude[i] /= spectrum->num_fft;
+          spectrum->spect_magnitude[i] /= static_cast<double>(spectrum->num_fft);
         }
 
-        spectrum->output_callback(spectrum->spect_magnitude, spectrum->bands);
+        spectrum->output_callback(spectrum->spect_magnitude, static_cast<int>(spectrum->bands));
 
         // Reset spectrum accumulators
         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->message_ts += gst_util_uint64_scale(spectrum->num_frames, GST_SECOND, rate);
+      }
 
       spectrum->num_frames = 0;
       spectrum->num_fft = 0;
@@ -523,10 +503,10 @@ static GstFlowReturn gst_fastspectrum_transform_ip (GstBaseTransform *trans, Gst
 
   spectrum->input_pos = input_pos;
 
-  gst_buffer_unmap (buffer, &map);
+  gst_buffer_unmap(buffer, &map);
-  g_mutex_unlock (&spectrum->lock);
+  g_mutex_unlock(&spectrum->lock);
 
-  g_assert (size == 0);
+  g_assert(size == 0);
 
   return GST_FLOW_OK;
 

ext/gstmoodbar/gstfastspectrum.h

@@ -38,38 +38,37 @@
 G_BEGIN_DECLS
 
 #define GST_TYPE_FASTSPECTRUM            (gst_fastspectrum_get_type())
-#define GST_FASTSPECTRUM(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_FASTSPECTRUM,GstFastSpectrum))
+#define GST_FASTSPECTRUM(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), GST_TYPE_FASTSPECTRUM, GstFastSpectrum))
-#define GST_IS_FASTSPECTRUM(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_FASTSPECTRUM))
+#define GST_IS_FASTSPECTRUM(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), GST_TYPE_FASTSPECTRUM))
-#define GST_FASTSPECTRUM_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_FASTSPECTRUM,GstFastSpectrumClass))
+#define GST_FASTSPECTRUM_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_FASTSPECTRUM, GstFastSpectrumClass))
 #define GST_IS_FASTSPECTRUM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GST_TYPE_FASTSPECTRUM))
 
 class QMutex;
 
-typedef void (*GstFastSpectrumInputData)(const guint8* in, double* out, guint len, double max_value, guint op, guint nfft);
+typedef void (*GstFastSpectrumInputData)(const guint8 *in, double *out, guint len, double max_value, guint op, guint nfft);
 
-typedef std::function<void(double* magnitudes, int size)> OutputCallback;
+typedef std::function<void(double *magnitudes, int size)> OutputCallback;
 
 struct GstFastSpectrum {
   GstAudioFilter parent;
 
-  /* properties */
+  // Properties
-  guint64 interval;             /* how many nanoseconds between emits */
+  guint64 interval;            // How many nanoseconds between emits
-  guint64 frames_per_interval;  /* how many frames per interval */
+  guint64 frames_per_interval; // How many frames per interval
   guint64 frames_todo;
-  guint bands;                  /* number of spectrum bands */
+  guint bands;                 // Number of spectrum bands
-  gboolean multi_channel;       /* send separate channel results */
+  gboolean multi_channel;      // Send separate channel results
 
-  guint64 num_frames;           /* frame count (1 sample per channel)
+  guint64 num_frames;          // Frame count (1 sample per channel) since last emit
-                                 * since last emit */
+  guint64 num_fft;             // Number of FFTs since last emit
-  guint64 num_fft;              /* number of FFTs since last emit */
+  GstClockTime message_ts;     // Starttime for next message
-  GstClockTime message_ts;      /* starttime for next message */
 
-  /* <private> */
+  // <private>
   bool channel_data_initialized;
-  double* input_ring_buffer;
+  double *input_ring_buffer;
-  double* fft_input;
+  double *fft_input;
-  fftw_complex* fft_output;
+  fftw_complex *fft_output;
-  double* spect_magnitude;
+  double *spect_magnitude;
   fftw_plan plan;
 
   guint input_pos;
@@ -87,11 +86,11 @@ struct GstFastSpectrumClass {
   GstAudioFilterClass parent_class;
 
   // Static lock for creating & destroying FFTW plans.
-  QMutex* fftw_lock;
+  QMutex *fftw_lock;
 };
 
-GType gst_fastspectrum_get_type (void);
+GType gst_fastspectrum_get_type(void);
 
 G_END_DECLS
 
-#endif // GST_MOODBAR_FASTSPECTRUM_H
+#endif  // GST_MOODBAR_FASTSPECTRUM_H

ext/gstmoodbar/gstmoodbarplugin.cpp

@@ -23,14 +23,13 @@
 
 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;
   }
 
   return TRUE;
-
 }
 
 }  // namespace

ext/gstmoodbar/gstmoodbarplugin.h

@@ -19,7 +19,7 @@
 #define GST_MOODBAR_PLUGIN_H
 
 extern "C" {
-  int gstfastspectrum_register_static();
+int gstfastspectrum_register_static();
 }
 
 #endif  // GST_MOODBAR_PLUGIN_H

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)
+qt_wrap_cpp(MOC ${HEADERS})
-  list(APPEND SOURCES core/scoped_nsautorelease_pool.mm)
-endif(APPLE)
 
-if(BUILD_WITH_QT6)
+link_directories(${GLIB_LIBRARY_DIRS})
-  qt6_wrap_cpp(MOC ${HEADERS})
-else()
-  qt5_wrap_cpp(MOC ${HEADERS})
-endif()
-
-link_directories(
-  ${GLIB_LIBRARY_DIRS}
-)
 
 add_library(libstrawberry-common STATIC ${SOURCES} ${MOC})
 
-target_include_directories(libstrawberry-common SYSTEM PRIVATE
+target_include_directories(libstrawberry-common SYSTEM PRIVATE ${GLIB_INCLUDE_DIRS})
-  ${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
@@ -49,18 +52,17 @@
 namespace logging {
 
 static Level sDefaultLevel = Level_Debug;
-static QMap<QString, Level>* sClassLevels = nullptr;
+static QMap<QString, Level> *sClassLevels = nullptr;
 static QIODevice *sNullDevice = nullptr;
 
-//const char* kDefaultLogLevels = "*:3";
+const char *kDefaultLogLevels = "*: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>
-static T CreateLogger(Level level, const QString& class_name, int line, const char* category);
+static T CreateLogger(Level level, const QString &class_name, int line, const char *category);
 
 void GLog(const char *domain, int level, const char *message, void*) {
 
@@ -91,14 +93,14 @@ class DebugBase : public QDebug {
  public:
   DebugBase() : QDebug(sNullDevice) {}
   explicit DebugBase(QtMsgType t) : QDebug(t) {}
-  T& space() { return static_cast<T&>(QDebug::space()); }
+  T &space() { return static_cast<T&>(QDebug::space()); }
-  T& noSpace() { return static_cast<T&>(QDebug::nospace()); }
+  T &nospace() { return static_cast<T&>(QDebug::nospace()); }
 };
 
 // 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);
 
@@ -109,7 +111,7 @@ class BufferedDebug : public DebugBase<BufferedDebug> {
 
   // Delete function for the buffer. Since a base class is holding a reference to the raw pointer,
   // it shouldn't be deleted until after the deletion of this object is complete.
-  static void later_deleter(QBuffer* b) { b->deleteLater(); }
+  static void later_deleter(QBuffer *b) { b->deleteLater(); }
 
   std::shared_ptr<QBuffer> buf_;
 };
@@ -117,14 +119,15 @@ 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; }
 };
 
 static void MessageHandler(QtMsgType type, const QMessageLogContext&, const QString &message) {
 
-  if (strncmp(kMessageHandlerMagic, message.toLocal8Bit().data(), kMessageHandlerMagicLength) == 0) {
+  if (message.startsWith(kMessageHandlerMagic)) {
-    fprintf(stderr, "%s\n", message.toLocal8Bit().data() + kMessageHandlerMagicLength);
+    fprintf(type == QtCriticalMsg || type == QtFatalMsg ? stderr : stdout, "%s\n", message.toUtf8().data() + kMessageHandlerMagicLength);
+    fflush(type == QtCriticalMsg || type == QtFatalMsg ? stderr : stdout);
     return;
   }
 
@@ -143,12 +146,13 @@ static void MessageHandler(QtMsgType type, const QMessageLogContext&, const QStr
       break;
   }
 
-  for (const QString& line : message.split('\n')) {
+  for (const QString &line : message.split('\n')) {
     BufferedDebug d = CreateLogger<BufferedDebug>(level, "unknown", -1, nullptr);
     d << line.toLocal8Bit().constData();
     if (d.buf_) {
       d.buf_->close();
-      fprintf(stderr, "%s\n", d.buf_->buffer().data());
+      fprintf(type == QtCriticalMsg || type == QtFatalMsg ? stderr : stdout, "%s\n", d.buf_->buffer().data());
+      fflush(type == QtCriticalMsg || type == QtFatalMsg ? stderr : stdout);
     }
   }
 
@@ -171,13 +175,14 @@ void Init() {
   if (!sOriginalMessageHandler) {
     sOriginalMessageHandler = qInstallMessageHandler(MessageHandler);
   }
+
 }
 
 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;
@@ -210,9 +215,9 @@ static QString ParsePrettyFunction(const char *pretty_function) {
 
   // Get the class name out of the function name.
   QString class_name = pretty_function;
-  const int paren = class_name.indexOf('(');
+  const qint64 paren = class_name.indexOf('(');
   if (paren != -1) {
-    const int colons = class_name.lastIndexOf("::", paren);
+    const qint64 colons = class_name.lastIndexOf("::", paren);
     if (colons != -1) {
       class_name = class_name.left(colons);
     }
@@ -221,16 +226,17 @@ static QString ParsePrettyFunction(const char *pretty_function) {
     }
   }
 
-  const int space = class_name.lastIndexOf(' ');
+  const qint64 space = class_name.lastIndexOf(' ');
   if (space != -1) {
-    class_name = class_name.mid(space+1);
+    class_name = class_name.mid(space + 1);
   }
 
   return class_name;
+
 }
 
 template <class T>
-static T CreateLogger(Level level, const QString &class_name, int line, const char* category) {
+static T CreateLogger(Level level, const QString &class_name, int line, const char *category) {
 
   // Map the level to a string
   const char *level_name = nullptr;
@@ -267,19 +273,18 @@ static T CreateLogger(Level level, const QString &class_name, int line, const ch
   }
 
   T ret(type);
-  ret.nospace() << QDateTime::currentDateTime().toString("hh:mm:ss.zzz").toLatin1().constData()
+  ret.nospace() << QDateTime::currentDateTime().toString("hh:mm:ss.zzz").toLatin1().constData() << level_name << function_line.leftJustified(32).toLatin1().constData();
-                << level_name
-                << function_line.leftJustified(32).toLatin1().constData();
 
   return ret.space();
+
 }
 
+#ifdef Q_OS_UNIX
 QString CXXDemangle(const QString &mangled_function);
-
 QString CXXDemangle(const QString &mangled_function) {
 
-  int status;
+  int status = 0;
-  char* demangled_function = abi::__cxa_demangle(mangled_function.toLatin1().constData(), nullptr, nullptr, &status);
+  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,23 +293,10 @@ QString CXXDemangle(const QString &mangled_function) {
   return mangled_function;  // Probably not a C++ function.
 
 }
+#endif  // Q_OS_UNIX
 
-QString DarwinDemangle(const QString &symbol);
+#ifdef Q_OS_LINUX
-
-QString DarwinDemangle(const QString &symbol) {
-
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-  QStringList split = symbol.split(' ', Qt::SkipEmptyParts);
-#else
-  QStringList split = symbol.split(' ', QString::SkipEmptyParts);
-#endif
-  QString mangled_function = split[3];
-  return CXXDemangle(mangled_function);
-
-}
-
 QString LinuxDemangle(const QString &symbol);
-
 QString LinuxDemangle(const QString &symbol) {
 
   QRegularExpression regex("\\(([^+]+)");
@@ -316,10 +308,26 @@ QString LinuxDemangle(const QString &symbol) {
   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)
+  QStringList split = symbol.split(' ', Qt::SkipEmptyParts);
+#else
+  QStringList split = symbol.split(' ', QString::SkipEmptyParts);
+#endif
+  QString mangled_function = split[3];
+  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);
 #elif defined(Q_OS_LINUX)
@@ -327,13 +335,15 @@ QString DemangleSymbol(const QString &symbol) {
 #else
   return symbol;
 #endif
+
 }
 
 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;
@@ -342,27 +352,27 @@ void DumpStackTrace() {
 #else
   qLog(Debug) << "FIXME: Implement printing stack traces on this platform";
 #endif
+
 }
 
-// These are the functions that create loggers for the rest of Clementine.
+// These are the functions that create loggers for the rest of Strawberry.
-// It's okay that the LoggedDebug instance is copied to a QDebug in these. It
+// It's okay that the LoggedDebug instance is copied to a QDebug in these. It doesn't override any behavior that should be needed after return.
-// 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 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 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 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(); }
 #else
-  QDebug CreateLoggerWarning(int line, const char *pretty_function, const char* category) { return qCreateLogger(line, pretty_function, category, Warning); }
+  QDebug CreateLoggerWarning(int line, const char *pretty_function, const char *category) { return qCreateLogger(line, pretty_function, category, Warning); }
 #endif // QT_NO_WARNING_OUTPUT
 
 #ifdef QT_NO_DEBUG_OUTPUT
   QNoDebug CreateLoggerDebug(int, const char*, const char*) { return QNoDebug(); }
 #else
-  QDebug CreateLoggerDebug(int line, const char *pretty_function, const char* category) { return qCreateLogger(line, pretty_function, category, Debug); }
+  QDebug CreateLoggerDebug(int line, const char *pretty_function, const char *category) { return qCreateLogger(line, pretty_function, category, Debug); }
 #endif // QT_NO_DEBUG_OUTPUT
 
 }  // namespace logging
@@ -370,7 +380,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());
 }
 
@@ -380,4 +390,3 @@ QDebug operator<<(QDebug dbg, std::chrono::seconds secs) {
   dbg.nospace() << print_duration(secs, "s");
   return dbg.space();
 }
-

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; }
@@ -54,28 +68,27 @@ enum Level {
 };
 
   void Init();
-  void SetLevels(const QString& levels);
+  void SetLevels(const QString &levels);
 
   void DumpStackTrace();
 
-QDebug CreateLoggerInfo(int line, const char *pretty_function, const char* category);
+QDebug CreateLoggerInfo(int line, const char *pretty_function, const char *category);
-QDebug CreateLoggerFatal(int line, const char *pretty_function, const char* category);
+QDebug CreateLoggerFatal(int line, const char *pretty_function, const char *category);
-QDebug CreateLoggerError(int line, const char *pretty_function, const char* category);
+QDebug CreateLoggerError(int line, const char *pretty_function, const char *category);
 
 #ifdef QT_NO_WARNING_OUTPUT
   QNoDebug CreateLoggerWarning(int, const char*, const char*);
 #else
-  QDebug CreateLoggerWarning(int line, const char *pretty_function, const char* category);
+  QDebug CreateLoggerWarning(int line, const char *pretty_function, const char *category);
 #endif // QT_NO_WARNING_OUTPUT
 
 #ifdef QT_NO_DEBUG_OUTPUT
   QNoDebug CreateLoggerDebug(int, const char*, const char*);
 #else
-  QDebug CreateLoggerDebug(int line, const char *pretty_function, const char* category);
+  QDebug CreateLoggerDebug(int line, const char *pretty_function, const char *category);
 #endif  // QT_NO_DEBUG_OUTPUT
 
-
+void GLog(const char *domain, int level, const char *message, void *user_data);
-void GLog(const char* domain, int level, const char* message, void* user_data);
 
 extern const char *kDefaultLogLevels;
 

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_);
@@ -98,7 +99,7 @@ void _MessageHandlerBase::WriteMessage(const QByteArray &data) {
 
   QDataStream s(device_);
   s << quint32(data.length());
-  s.writeRawData(data.data(), data.length());
+  s.writeRawData(data.data(), static_cast<int>(data.length()));
 
   // Sorry.
   if (flush_abstract_socket_) {

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.
@@ -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
@@ -18,6 +19,9 @@
 #ifndef WORKERPOOL_H
 #define WORKERPOOL_H
 
+#include "config.h"
+
+#include <cstdio>
 #include <cstddef>
 
 #include <QtGlobal>
@@ -55,6 +59,8 @@ class _WorkerPoolBase : public QObject {
  protected slots:
   virtual void DoStart() {}
   virtual void NewConnection() {}
+  virtual void ProcessReadyReadStandardOutput() {}
+  virtual void ProcessReadyReadStandardError() {}
   virtual void ProcessError(QProcess::ProcessError) {}
   virtual void SendQueuedMessages() {}
 };
@@ -97,6 +103,8 @@ class WorkerPool : public _WorkerPoolBase {
   // These are all reimplemented slots, they are called on the WorkerPool's thread.
   void DoStart() override;
   void NewConnection() override;
+  void ProcessReadyReadStandardOutput() override;
+  void ProcessReadyReadStandardError() override;
   void ProcessError(QProcess::ProcessError error) override;
   void SendQueuedMessages() override;
 
@@ -163,8 +171,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";
+  }
 
 }
 
@@ -174,6 +183,8 @@ WorkerPool<HandlerType>::~WorkerPool() {
   for (const Worker &worker : workers_) {
     if (worker.local_socket_ && worker.process_) {
       QObject::disconnect(worker.process_, &QProcess::errorOccurred, this, &WorkerPool::ProcessError);
+      QObject::disconnect(worker.process_, &QProcess::readyReadStandardOutput, this, &WorkerPool::ProcessReadyReadStandardOutput);
+      QObject::disconnect(worker.process_, &QProcess::readyReadStandardError, this, &WorkerPool::ProcessReadyReadStandardError);
 
       // The worker is connected.  Close his socket and wait for him to exit.
       qLog(Debug) << "Closing worker socket";
@@ -217,7 +228,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 +242,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) {
@@ -274,13 +285,15 @@ void WorkerPool<HandlerType>::StartOneWorker(Worker *worker) {
 
   QObject::connect(worker->local_server_, &QLocalServer::newConnection, this, &WorkerPool::NewConnection);
   QObject::connect(worker->process_, &QProcess::errorOccurred, this, &WorkerPool::ProcessError);
+  QObject::connect(worker->process_, &QProcess::readyReadStandardOutput, this, &WorkerPool::ProcessReadyReadStandardOutput);
+  QObject::connect(worker->process_, &QProcess::readyReadStandardError, this, &WorkerPool::ProcessReadyReadStandardError);
 
   // Create a server, find an unused name and start listening
   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);
 
@@ -291,12 +304,12 @@ void WorkerPool<HandlerType>::StartOneWorker(Worker *worker) {
 
   qLog(Debug) << "Starting worker" << worker << executable_path_ << worker->local_server_->fullServerName();
 
-  // Start the process
+#ifdef Q_OS_WIN32
-#if defined(Q_OS_WIN32) && defined(QT_NO_DEBUG_OUTPUT) && !defined(ENABLE_WIN32_CONSOLE)
   worker->process_->setProcessChannelMode(QProcess::SeparateChannels);
 #else
   worker->process_->setProcessChannelMode(QProcess::ForwardedChannels);
 #endif
+
   worker->process_->start(executable_path_, QStringList() << worker->local_server_->fullServerName());
 
 }
@@ -326,6 +339,7 @@ void WorkerPool<HandlerType>::NewConnection() {
   worker->handler_ = new HandlerType(worker->local_socket_, this);
 
   SendQueuedMessages();
+
 }
 
 template <typename HandlerType>
@@ -356,6 +370,32 @@ void WorkerPool<HandlerType>::ProcessError(QProcess::ProcessError error) {
 
 }
 
+template <typename HandlerType>
+void WorkerPool<HandlerType>::ProcessReadyReadStandardOutput() {
+
+  Q_ASSERT(QThread::currentThread() == thread());
+
+  QProcess *process = qobject_cast<QProcess*>(sender());
+  QByteArray data = process->readAllStandardOutput();
+
+  fprintf(stdout, "%s", data.data());
+  fflush(stdout);
+
+}
+
+template <typename HandlerType>
+void WorkerPool<HandlerType>::ProcessReadyReadStandardError() {
+
+  Q_ASSERT(QThread::currentThread() == thread());
+
+  QProcess *process = qobject_cast<QProcess*>(sender());
+  QByteArray data = process->readAllStandardError();
+
+  fprintf(stderr, "%s", data.data());
+  fflush(stderr);
+
+}
+
 template <typename HandlerType>
 typename WorkerPool<HandlerType>::ReplyType*
 WorkerPool<HandlerType>::NewReply(MessageType *message) {
@@ -380,7 +420,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,56 @@
+/* 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;
+
+  virtual bool SaveSongPlaycountToFile(const QString &filename, const spb::tagreader::SongMetadata &song) const = 0;
+  virtual bool SaveSongRatingToFile(const QString &filename, const spb::tagreader::SongMetadata &song) const = 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;
   }
@@ -54,17 +58,21 @@ message SongMetadata {
   optional string url = 21;
   optional string basefilename = 22;
   optional FileType filetype = 23;
-  optional int32 filesize = 24;
+  optional int64 filesize = 24;
   optional int64 mtime = 25;
   optional int64 ctime = 26;
 
-  optional int32 playcount = 27;
+  optional uint32 playcount = 27;
-  optional int32 skipcount = 28;
+  optional uint32 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 float rating = 32;
+
+  optional bool suspicious_tags = 40;
+
 }
 
 message ReadFileRequest {
@@ -109,6 +117,24 @@ message SaveEmbeddedArtResponse {
   optional bool success = 1;
 }
 
+message SaveSongPlaycountToFileRequest {
+  optional string filename = 1;
+  optional SongMetadata metadata = 2;
+}
+
+message SaveSongPlaycountToFileResponse {
+  optional bool success = 1;
+}
+
+message SaveSongRatingToFileRequest {
+  optional string filename = 1;
+  optional SongMetadata metadata = 2;
+}
+
+message SaveSongRatingToFileResponse {
+  optional bool success = 1;
+}
+
 message Message {
   optional int32 id = 1;
 
@@ -127,4 +153,10 @@ message Message {
   optional SaveEmbeddedArtRequest save_embedded_art_request = 10;
   optional SaveEmbeddedArtResponse save_embedded_art_response = 11;
 
+  optional SaveSongPlaycountToFileRequest save_song_playcount_to_file_request = 12;
+  optional SaveSongPlaycountToFileResponse save_song_playcount_to_file_response = 13;
+
+  optional SaveSongRatingToFileRequest save_song_rating_to_file_request = 14;
+  optional SaveSongRatingToFileResponse save_song_rating_to_file_response = 15;
+
 }

ext/libstrawberry-tagreader/tagreadertaglib.h

@@ -1,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
+#ifndef TAGREADERTAGLIB_H
-#define TAGREADER_H
+#define TAGREADERTAGLIB_H
 
 #include "config.h"
 
@@ -32,30 +32,36 @@
 #include <taglib/apetag.h>
 #include <taglib/apefile.h>
 #include <taglib/id3v2tag.h>
+#include <taglib/popularimeterframe.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();
+  explicit TagReaderTagLib();
-  ~TagReader();
+  ~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;
+
+  bool SaveSongPlaycountToFile(const QString &filename, const spb::tagreader::SongMetadata &song) const override;
+  bool SaveSongRatingToFile(const QString &filename, const spb::tagreader::SongMetadata &song) const 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);
 
@@ -67,12 +73,20 @@ class TagReader {
 
   void SetTextFrame(const char *id, const QString &value, TagLib::ID3v2::Tag *tag) const;
   void SetTextFrame(const char *id, const std::string &value, TagLib::ID3v2::Tag *tag) const;
+  void SetUserTextFrame(const QString &description, const QString &value, TagLib::ID3v2::Tag *tag) const;
+  void SetUserTextFrame(const std::string &description, const std::string &value, TagLib::ID3v2::Tag *tag) const;
   void SetUnsyncLyricsFrame(const std::string& value, TagLib::ID3v2::Tag* tag) const;
 
+  QByteArray LoadEmbeddedAPEArt(const TagLib::APE::ItemListMap &map) const;
+
+  static float ConvertPOPMRating(const int POPM_rating);
+  static int ConvertToPOPMRating(const float rating);
+  static TagLib::ID3v2::PopularimeterFrame *GetPOPMFrameFromTag(TagLib::ID3v2::Tag* tag);
+
  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,482 @@
+/* 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().isValid() ? fileinfo.lastModified().toSecsSinceEpoch() : 0);
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0))
+  song->set_ctime(fileinfo.birthTime().isValid() ? fileinfo.birthTime().toSecsSinceEpoch() : fileinfo.lastModified().isValid() ? fileinfo.lastModified().toSecsSinceEpoch() : 0);
+#else
+  song->set_ctime(fileinfo.created().isValid() ? fileinfo.created().toSecsSinceEpoch() : fileinfo.lastModified().isValid() ? fileinfo.lastModified().toSecsSinceEpoch() : 0);
+#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
+    if (song->track() <= 0) { song->set_track(-1); }
+    if (song->disc() <= 0) { song->set_disc(-1); }
+    if (song->year() <= 0) { song->set_year(-1); }
+    if (song->originalyear() <= 0) { song->set_originalyear(-1); }
+    if (song->samplerate() <= 0) { song->set_samplerate(-1); }
+    if (song->bitdepth() <= 0) { song->set_bitdepth(-1); }
+    if (song->bitrate() <= 0) { song->set_bitrate(-1); }
+    if (song->lastplayed() <= 0) { song->set_lastplayed(-1); }
+
+    song->set_valid(true);
+
+    taginfo.close();
+
+  }
+  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;
+
+}
+
+bool TagReaderTagParser::SaveSongPlaycountToFile(const QString&, const spb::tagreader::SongMetadata&) const { return false; }
+
+bool TagReaderTagParser::SaveSongRatingToFile(const QString &filename, const spb::tagreader::SongMetadata &song) const {
+
+    if (filename.isEmpty()) return false;
+
+    qLog(Debug) << "Saving song rating to" << filename;
+
+    try {
+      TagParser::MediaFileInfo taginfo;
+      TagParser::Diagnostics diag;
+      TagParser::AbortableProgressFeedback progress;
+  #ifdef Q_OS_WIN32
+      taginfo.setPath(filename.toStdWString().toStdString());
+  #else
+      taginfo.setPath(QFile::encodeName(filename).toStdString());
+  #endif
+      taginfo.open(false);
+
+      taginfo.parseContainerFormat(diag, progress);
+      if (progress.isAborted()) {
+        taginfo.close();
+        return 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::Rating, TagParser::TagValue(song.rating()));
+      }
+      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,54 @@
+/* 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;
+
+  bool SaveSongPlaycountToFile(const QString &filename, const spb::tagreader::SongMetadata &song) const override;
+  bool SaveSongRatingToFile(const QString &filename, const spb::tagreader::SongMetadata &song) const 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)
+qt_wrap_cpp(MOC ${HEADERS})
-  qt6_wrap_cpp(MOC ${HEADERS})
+
-  qt6_add_resources(QRC data/data.qrc)
+link_directories(${GLIB_LIBRARY_DIRS})
-else()
+
-  qt5_wrap_cpp(MOC ${HEADERS})
+if(USE_TAGLIB AND TAGLIB_FOUND)
-  qt5_add_resources(QRC data/data.qrc)
+  link_directories(${TAGLIB_LIBRARY_DIRS})
 endif()
 
-link_directories(
+if(USE_TAGPARSER AND TAGPARSER_FOUND)
-  ${GLIB_LIBRARY_DIRS}
+  link_directories(${TAGPARSER_LIBRARY_DIRS})
-  ${TAGLIB_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 <QString>
-#include <QSsl>
-#include <QSslCertificate>
-#include <QSslSocket>
 #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
@@ -33,22 +34,28 @@ void TagReaderWorker::MessageArrived(const spb::tagreader::Message &message) {
 
   spb::tagreader::Message reply;
 
-  if (message.has_read_file_request()) {
+  if (message.has_is_media_file_request()) {
+    reply.mutable_is_media_file_response()->set_success(tag_reader_.IsMediaFile(QStringFromStdString(message.is_media_file_request().filename())));
+  }
+  else if (message.has_read_file_request()) {
     tag_reader_.ReadFile(QStringFromStdString(message.read_file_request().filename()), reply.mutable_read_file_response()->mutable_metadata());
   }
   else if (message.has_save_file_request()) {
     reply.mutable_save_file_response()->set_success(tag_reader_.SaveFile(QStringFromStdString(message.save_file_request().filename()), message.save_file_request().metadata()));
   }
-
-  else if (message.has_is_media_file_request()) {
-    reply.mutable_is_media_file_response()->set_success(tag_reader_.IsMediaFile(QStringFromStdString(message.is_media_file_request().filename())));
-  }
   else if (message.has_load_embedded_art_request()) {
     QByteArray data = tag_reader_.LoadEmbeddedArt(QStringFromStdString(message.load_embedded_art_request().filename()));
     reply.mutable_load_embedded_art_response()->set_data(data.constData(), data.size());
   }
   else if (message.has_save_embedded_art_request()) {
-    reply.mutable_save_embedded_art_response()->set_success(tag_reader_.SaveEmbeddedArt(QStringFromStdString(message.save_embedded_art_request().filename()), QByteArray(message.save_embedded_art_request().data().data(), message.save_embedded_art_request().data().size())));
+    reply.mutable_save_embedded_art_response()->set_success(tag_reader_.SaveEmbeddedArt(QStringFromStdString(message.save_embedded_art_request().filename()), QByteArray(message.save_embedded_art_request().data().data(), static_cast<qint64>(message.save_embedded_art_request().data().size()))));
+  }
+
+  else if (message.has_save_song_playcount_to_file_request()) {
+    reply.mutable_save_song_playcount_to_file_response()->set_success(tag_reader_.SaveSongPlaycountToFile(QStringFromStdString(message.save_song_playcount_to_file_request().filename()), message.save_song_playcount_to_file_request().metadata()));
+  }
+  else if (message.has_save_song_rating_to_file_request()) {
+    reply.mutable_save_song_rating_to_file_response()->set_success(tag_reader_.SaveSongRatingToFile(QStringFromStdString(message.save_song_rating_to_file_request().filename()), message.save_song_rating_to_file_request().metadata()));
   }
 
   SendReply(message, &reply);
@@ -58,5 +65,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,211 +578,75 @@ 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
+    SOURCES globalshortcuts/globalshortcutsbackend-kde.cpp globalshortcuts/globalshortcutsbackend-gnome.cpp globalshortcuts/globalshortcutsbackend-mate.cpp
-    HEADERS globalshortcuts/globalshortcutsbackend-gsd.h globalshortcuts/globalshortcutsbackend-kde.h
+    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
+optional_source(HAVE_ALSA SOURCES engine/alsadevicefinder.cpp engine/alsapcmdevicefinder.cpp)
-  SOURCES
-    engine/alsadevicefinder.cpp
-)
 
 # DBUS
-optional_source(HAVE_DBUS
+optional_source(HAVE_DBUS SOURCES osd/osddbus.cpp HEADERS osd/osddbus.h)
- 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
+  SOURCES engine/gststartup.cpp engine/gstengine.cpp engine/gstenginepipeline.cpp
-  HEADERS engine/gststartup.h engine/gstengine.h engine/gstenginepipeline.h engine/gstelementdeleter.h
+  HEADERS engine/gststartup.h engine/gstengine.h engine/gstenginepipeline.h
 )
 
 # VLC
-optional_source(HAVE_VLC
+optional_source(HAVE_VLC SOURCES engine/vlcengine.cpp HEADERS engine/vlcengine.h)
-  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
+  optional_source(HAVE_DBUS SOURCES core/mpris2.cpp HEADERS core/mpris2.h)
-    SOURCES core/mpris.cpp core/mpris2.cpp
+  optional_source(HAVE_UDISKS2 SOURCES device/udisks2lister.cpp HEADERS device/udisks2lister.h)
-    HEADERS core/mpris.h 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
+  # MPRIS 2.1 DBUS interfaces
-    qt6_add_dbus_adaptor(SOURCES
+  qt_add_dbus_adaptor(SOURCES dbus/org.mpris.MediaPlayer2.Playlists.xml core/mpris2.h mpris::Mpris2 core/mpris2_playlists Mpris2Playlists)
-        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
+  # org.freedesktop.Notifications DBUS interface
-    qt6_add_dbus_adaptor(SOURCES
+  qt_add_dbus_interface(SOURCES dbus/org.freedesktop.Notifications.xml dbus/notification)
-        dbus/org.mpris.MediaPlayer2.Playlists.xml
-        core/mpris2.h mpris::Mpris2 core/mpris2_playlists Mpris2Playlists)
 
-    # org.freedesktop.Notifications DBUS interface
+  # org.gnome.SettingsDaemon interface
-    qt6_add_dbus_interface(SOURCES
+  qt_add_dbus_interface(SOURCES dbus/org.gnome.SettingsDaemon.MediaKeys.xml dbus/gnomesettingsdaemon)
-        dbus/org.freedesktop.Notifications.xml
-        dbus/notification)
 
-    # org.gnome.SettingsDaemon interface
+  # org.mate.SettingsDaemon interface
-    qt6_add_dbus_interface(SOURCES
+  qt_add_dbus_interface(SOURCES dbus/org.mate.SettingsDaemon.MediaKeys.xml dbus/matesettingsdaemon)
-        dbus/org.gnome.SettingsDaemon.MediaKeys.xml
-        dbus/gnomesettingsdaemon)
 
-    # org.kde.KGlobalAccel interface
+  # org.kde.KGlobalAccel interface
-    qt6_add_dbus_interface(SOURCES
+  qt_add_dbus_interface(SOURCES dbus/org.kde.KGlobalAccel.xml dbus/kglobalaccel)
-        dbus/org.kde.KGlobalAccel.xml
+  qt_add_dbus_interface(SOURCES dbus/org.kde.KGlobalAccel.Component.xml dbus/kglobalaccelcomponent)
-        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.freedesktop.Avahi.Server interface
-  add_custom_command(
-      OUTPUT
-      ${CMAKE_CURRENT_BINARY_DIR}/dbus/avahiserver.cpp
-      ${CMAKE_CURRENT_BINARY_DIR}/dbus/avahiserver.h
-      COMMAND ${QT_DBUSXML2CPP_EXECUTABLE}
-      dbus/org.freedesktop.Avahi.Server.xml
-      -p ${CMAKE_CURRENT_BINARY_DIR}/dbus/avahiserver
-      -i dbus/metatypes.h
-      DEPENDS dbus/org.freedesktop.Avahi.Server.xml
-      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
-  list(APPEND HEADERS ${CMAKE_CURRENT_BINARY_DIR}/dbus/avahiserver.h)
-  list(APPEND SOURCES ${CMAKE_CURRENT_BINARY_DIR}/dbus/avahiserver.cpp)
-
-  # org.freedesktop.Avahi.EntryGroup interface
-  add_custom_command(
-      OUTPUT
-      ${CMAKE_CURRENT_BINARY_DIR}/dbus/avahientrygroup.cpp
-      ${CMAKE_CURRENT_BINARY_DIR}/dbus/avahientrygroup.h
-      COMMAND ${QT_DBUSXML2CPP_EXECUTABLE}
-      dbus/org.freedesktop.Avahi.EntryGroup.xml
-      -p ${CMAKE_CURRENT_BINARY_DIR}/dbus/avahientrygroup
-      -i dbus/metatypes.h
-      DEPENDS dbus/org.freedesktop.Avahi.EntryGroup.xml
-      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
-  list(APPEND HEADERS ${CMAKE_CURRENT_BINARY_DIR}/dbus/avahientrygroup.h)
-  list(APPEND SOURCES ${CMAKE_CURRENT_BINARY_DIR}/dbus/avahientrygroup.cpp)
 
   if(HAVE_UDISKS2)
-       set_source_files_properties(dbus/org.freedesktop.DBus.ObjectManager.xml
+    set_source_files_properties(dbus/org.freedesktop.DBus.ObjectManager.xml PROPERTIES NO_NAMESPACE dbus/objectmanager INCLUDE dbus/metatypes.h)
-           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.Filesystem.xml
+    set_source_files_properties(dbus/org.freedesktop.UDisks2.Block.xml PROPERTIES NO_NAMESPACE dbus/udisks2block INCLUDE dbus/metatypes.h)
-           PROPERTIES NO_NAMESPACE dbus/udisks2filesystem 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.Block.xml
+    set_source_files_properties(dbus/org.freedesktop.UDisks2.Job.xml PROPERTIES NO_NAMESPACE dbus/udisks2job INCLUDE dbus/metatypes.h)
-           PROPERTIES NO_NAMESPACE dbus/udisks2block INCLUDE dbus/metatypes.h)
+    qt_add_dbus_interface(SOURCES dbus/org.freedesktop.DBus.ObjectManager.xml dbus/objectmanager)
-       set_source_files_properties(dbus/org.freedesktop.UDisks2.Drive.xml
+    qt_add_dbus_interface(SOURCES dbus/org.freedesktop.UDisks2.Filesystem.xml dbus/udisks2filesystem)
-           PROPERTIES NO_NAMESPACE dbus/udisks2drive INCLUDE dbus/metatypes.h)
+    qt_add_dbus_interface(SOURCES dbus/org.freedesktop.UDisks2.Block.xml dbus/udisks2block)
-       set_source_files_properties(dbus/org.freedesktop.UDisks2.Job.xml
+    qt_add_dbus_interface(SOURCES dbus/org.freedesktop.UDisks2.Drive.xml dbus/udisks2drive)
-           PROPERTIES NO_NAMESPACE dbus/udisks2job INCLUDE dbus/metatypes.h)
+    qt_add_dbus_interface(SOURCES dbus/org.freedesktop.UDisks2.Job.xml dbus/udisks2job)
-       if(BUILD_WITH_QT6)
+  endif(HAVE_UDISKS2)
-         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)
 
 endif(UNIX AND HAVE_DBUS)
 
@@ -797,29 +688,24 @@ optional_source(HAVE_LIBGPOD
 )
 
 # GIO device backend
-optional_source(HAVE_GIO
+optional_source(HAVE_GIO SOURCES device/giolister.cpp HEADERS device/giolister.h)
-  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
+optional_source(HAVE_LIBPULSE SOURCES engine/pulsedevicefinder.cpp)
-  SOURCES
-    engine/pulsedevicefinder.cpp
-)
 
-# MusicBrainz and transcoder require GStreamer
+# Transcoder require GStreamer
 optional_source(HAVE_GSTREAMER
 SOURCES
   transcoder/transcoder.cpp
@@ -838,6 +724,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 +749,39 @@ UI
   settings/transcodersettingspage.ui
 )
 
-# CDIO backend and device
+# CHROMAPRINT
-if(HAVE_GSTREAMER)
+if(HAVE_SONGFINGERPRINTING OR HAVE_MUSICBRAINZ)
-  optional_source(HAVE_CHROMAPRINT
+  optional_source(CHROMAPRINT_FOUND SOURCES engine/chromaprinter.cpp)
-    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
-  )
 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 +791,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 +900,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)
+qt_wrap_cpp(MOC ${HEADERS})
-  qt6_wrap_cpp(MOC ${HEADERS})
+qt_wrap_ui(UIC ${UI})
-  qt6_wrap_ui(UIC ${UI})
+qt_add_resources(QRC ${RESOURCES})
-  qt6_add_resources(QRC ${RESOURCES})
-else()
-  qt5_wrap_cpp(MOC ${HEADERS})
-  qt5_wrap_ui(UIC ${UI})
-  qt5_add_resources(QRC ${RESOURCES})
-endif()
 
 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")
+  else(LINGUAS STREQUAL "All")
-    if (NOT LINGUAS OR LINGUAS STREQUAL "None")
+    if(NOT LINGUAS OR LINGUAS STREQUAL "None")
-      set (LANGUAGES "")
+      set(LANGUAGES "")
-    else (NOT LINGUAS OR LINGUAS STREQUAL "None")
+    else(NOT LINGUAS OR LINGUAS STREQUAL "None")
       string(REGEX MATCHALL [a-zA-Z_@]+ LANGUAGES ${LINGUAS})
-    endif (NOT LINGUAS OR LINGUAS STREQUAL "None")
+    endif(NOT LINGUAS OR LINGUAS STREQUAL "None")
-  endif (LINGUAS STREQUAL "All")
+  endif(LINGUAS STREQUAL "All")
 
   add_pot(POT
     ${CMAKE_CURRENT_SOURCE_DIR}/translations/header
@@ -1051,7 +941,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 +949,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 +964,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(${LIBGPOD_LIBRARY_DIRS} ${GDK_PIXBUF_LIBRARY_DIRS})
-  link_directories(${GDK_PIXBUF_LIBRARY_DIRS})
+endif()
-endif(HAVE_LIBGPOD)
 
 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 +1024,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 +1038,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 +1046,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 +1058,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 +1082,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 +1093,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 +1146,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 +1164,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 +1198,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;
+  int exp = 0;
-  if (bands <= 8)
+  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;
+    const double dt = static_cast<double>(t) / 200;
-    for (uint i = 0; i < s.size(); ++i)
+    for (uint i = 0; i < s.size(); ++i) {
-      s[i] = dt * (sin(M_PI + (i * M_PI) / s.size()) + 1.0);
+      s[i] = static_cast<float>(dt * (sin(M_PI + (i * M_PI) / static_cast<double>(s.size())) + 1.0));
+    }
 
     analyze(p, s, new_frame_);
   }
-  else
+  else {
     analyze(p, Scope(32, 0), new_frame_);
+  }
 
   ++t;
 
@@ -185,10 +197,10 @@ 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();
+  const double step = static_cast<double>(inVec.size()) / static_cast<double>(outVec.size());
 
   for (uint i = 0; i < outVec.size(); ++i, pos += step) {
     const double error = pos - std::floor(pos);
@@ -196,24 +208,28 @@ 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;
+    outVec[i] = inVec[indexLeft] * (1.0F - static_cast<float>(error)) + inVec[indexRight] * static_cast<float>(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;
 
   for (uint i = 0; i < size; i++) {
-    v.push_back(sin(radian));
+    v.push_back(static_cast<float>(sin(radian)));
     radian += step;
   }
 
@@ -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 analyze(QPainter &p, const Scope&, const bool new_frame) = 0;
-  virtual void demo(QPainter& p);
+  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() {
@@ -222,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>
@@ -37,8 +38,8 @@
 
 const int BlockAnalyzer::kHeight = 2;
 const int BlockAnalyzer::kWidth = 4;
-const int BlockAnalyzer::kMinRows = 3;       // arbituary
+const int BlockAnalyzer::kMinRows = 3;       // arbitrary
-const int BlockAnalyzer::kMinColumns = 32;   // arbituary
+const int BlockAnalyzer::kMinColumns = 32;   // arbitrary
 const int BlockAnalyzer::kMaxColumns = 256;  // must be 2**n
 const int BlockAnalyzer::kFadeSize = 90;
 
@@ -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));
 
 }
 
@@ -79,7 +79,7 @@ void BlockAnalyzer::resizeEvent(QResizeEvent *e) {
   // all is explained in analyze()..
   // +1 to counter -1 in maxSizes, trust me we need this!
   columns_ = qMin(static_cast<int>(static_cast<double>(width() + 1) / (kWidth + 1)) + 1, kMaxColumns);
-  rows_ = static_cast<uint>(static_cast<double>(height() + 1) / (kHeight + 1));
+  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)
+    std::fill(fade_bars_.begin(), fade_bars_.end(),  QPixmap(kWidth, rows_ * (kHeight + 1)));
-      fade_bars_[i] = QPixmap(kWidth, rows_ * (kHeight + 1));
 
     yscale_.resize(rows_ + 1);
 
     const int PRE = 1, PRO = 1;  // PRE and PRO allow us to restrict the range somewhat
 
-    for (int 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;
 
@@ -117,7 +117,7 @@ void BlockAnalyzer::determineStep() {
   // the fall time of 30 is too slow on framerates above 50fps
   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 (int y, x = 0; x < static_cast<int>(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<double>(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
@@ -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, int &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
 
@@ -242,18 +245,20 @@ QColor ensureContrast(const QColor &bg, const QColor &fg, int amount) {
    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 bh = 0, bs = 0, bv = 0;
-  int fh, fs, fv;
+  int fh = 0, fs = 0, fv = 0;
 
   bg.getHsv(&bh, &bs, &bv);
   fg.getHsv(&fh, &fs, &fv);
@@ -278,20 +283,24 @@ QColor ensureContrast(const QColor &bg, const QColor &fg, int amount) {
 
     // check the saturation for the two colours is sufficient that hue alone can
     // provide sufficient contrast
-    if (ds > amount / 2 && (bs > 125 && fs > 125))
+    if (ds > amount / 2 && (bs > 125 && fs > 125)) {
       return fg;
-    else if (dv > 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
@@ -308,19 +317,24 @@ QColor ensureContrast(const QColor &bg, const QColor &fg, int 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))
+  if (fv < bv && fv > static_cast<int>(amount)) {
     return QColor::fromHsv(fh, fs, fv - amount);
+  }
 
-  if (fv > bv && (255 - 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)))
+  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; 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,7 +372,7 @@ 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; z < rows_; ++z) {
@@ -386,8 +401,10 @@ void BlockAnalyzer::drawBackground() {
 
   if (!p.paintEngine()) return;
 
-  for (int x = 0; x < columns_; ++x)
+  for (int x = 0; x < columns_; ++x) {
-    for (int y = 0; y < rows_; ++y)
+    for (int y = 0; y < rows_; ++y) {
       p.fillRect(x * (kWidth + 1), y * (kHeight + 1) + y_, kWidth, kHeight, bgdark);
+    }
+  }
 
 }