Release 0.6.9

Fixes #373

.circleci/config.yml

@@ -0,0 +1,541 @@
+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/rpm/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
+            rpmdevtools
+            git
+            tar
+            make
+            cmake
+            gcc
+            gcc-c++
+            pkg-config
+            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
+            libxine-devel
+            vlc-devel
+            taglib-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
+            libplist-devel
+            libmtp-devel
+            libusbmuxd-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-devel
+            qt5-qtbase-devel
+            qt5-qtx11extras-devel
+            qt5-qttools-devel
+            gstreamer1-devel
+            gstreamer1-plugins-base-devel
+            taglib-devel
+            libcdio-devel
+            libgpod-devel
+            libplist-devel
+            libusbmuxd-devel
+            libmtp-devel
+            libchromaprint-devel
+            fftw-devel
+            desktop-file-utils
+            libappstream-glib
+            hicolor-icon-theme
+
+
+  install_mageia_dependencies:
+    description: Install Mageia dependencies
+    steps:
+      - run:
+          name: Add extra media
+          command: urpmi.addmedia --distrib http://www.mirrorservice.org/sites/mageia.org/pub/mageia/distrib/7/x86_64
+      - run:
+          name: Update packages
+          command: urpmi.update -a
+      - run:
+          name: Configure auto update
+          command: urpmi --auto-update
+      - run:
+          name: Install dependencies
+          command: >
+            urpmi --force
+            urpmi-debuginfo-install
+            git
+            tar
+            rpmdevtools
+            make
+            cmake
+            glibc
+            binutils
+            gcc-c++
+            man
+            gettext
+            notification-daemon
+            dbus-devel
+            libgnutls-devel
+            lib64boost-devel
+            lib64protobuf-devel
+            protobuf-compiler
+            lib64sqlite3-devel
+            lib64alsa2-devel
+            lib64pulseaudio-devel
+            lib64notify-devel
+            lib64qt5core-devel
+            lib64qt5gui-devel
+            lib64qt5widgets-devel
+            lib64qt5network-devel
+            lib64qt5concurrent-devel
+            lib64qt5sql-devel
+            lib64qt5dbus-devel
+            lib64qt5x11extras-devel
+            lib64qt5help-devel
+            libqt5test-devel
+            lib64gstreamer1.0-devel
+            lib64gstreamer-plugins-base1.0-devel
+            lib64cdio-devel
+            lib64gpod-devel
+            lib64plist-devel
+            lib64usbmuxd-devel
+            lib64mtp-devel
+            lib64raw1394-devel
+            lib64chromaprint-devel
+            libfftw-devel
+            desktop-file-utils
+            appstream-util
+            libappstream-glib8
+            hicolor-icon-theme
+            qt5ct
+            lib64mesaegl1
+
+
+  install_debian_dependencies:
+    description: Install Debian dependencies
+    steps:
+      - run:
+          name: Install Debian dependencies
+          command: >
+            apt-get update && apt-get install -y
+            build-essential
+            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
+            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
+            libimobiledevice-dev
+            libplist-dev
+            libusbmuxd-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
+            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
+            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
+            libimobiledevice-dev
+            libplist-dev
+            libusbmuxd-dev
+
+
+jobs:
+
+  build_source:
+    docker:
+      - image: opensuse/tumbleweed
+    steps:
+      - install_opensuse_dependencies
+      - checkout
+      - cmake
+      - build_source
+
+
+  build_opensuse_tumbleweed:
+    docker:
+      - image: opensuse/tumbleweed
+    environment:
+      RPM_BUILD_NCPUS: "2"
+    steps:
+      - install_opensuse_dependencies
+      - checkout
+      - cmake
+      - build_source
+      - build_rpm
+
+  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_30:
+    docker:
+      - image: fedora:30
+    environment:
+      RPM_BUILD_NCPUS: "2"
+    steps:
+      - install_fedora_dependencies
+      - checkout
+      - cmake
+      - build_source
+      - build_rpm
+
+  build_fedora_31:
+    docker:
+      - image: fedora:31
+    environment:
+      RPM_BUILD_NCPUS: "2"
+    steps:
+      - install_fedora_dependencies
+      - checkout
+      - cmake
+      - build_source
+      - build_rpm
+
+
+  build_mageia_7:
+    docker:
+      - image: mageia:7
+    environment:
+      RPM_BUILD_NCPUS: "2"
+    steps:
+      - install_mageia_dependencies
+      - checkout
+      - cmake
+      - build_source
+      - build_rpm
+
+
+  build_debian_stretch:
+    docker:
+      - image: debian:stretch
+    steps:
+      - install_debian_dependencies
+      - checkout
+      - cmake
+      - build_deb
+
+  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_eoan:
+    docker:
+      - image: ubuntu:eoan
+    steps:
+      - install_ubuntu_dependencies
+      - checkout
+      - cmake
+      - build_deb
+
+  build_ubuntu_focal:
+    docker:
+      - image: ubuntu:focal
+    steps:
+      - install_ubuntu_dependencies
+      - checkout
+      - cmake
+      - build_deb
+
+workflows:
+  version: 2
+  build_all:
+    jobs:
+
+      - build_source:
+          filters:
+            tags:
+              only: /.*/
+
+
+      - build_opensuse_tumbleweed:
+          filters:
+            tags:
+              only: /.*/
+      - build_opensuse_lp151:
+          filters:
+            tags:
+              only: /.*/
+      - build_opensuse_lp152:
+          filters:
+            tags:
+              only: /.*/
+
+
+      - build_fedora_30:
+          filters:
+            tags:
+              only: /.*/
+      - build_fedora_31:
+          filters:
+            tags:
+              only: /.*/
+
+
+      - build_mageia_7:
+          filters:
+            tags:
+              only: /.*/
+
+
+      - build_debian_stretch:
+          filters:
+            tags:
+              only: /.*/
+      - build_debian_buster:
+          filters:
+            tags:
+              only: /.*/
+      - build_debian_bullseye:
+          filters:
+            tags:
+              only: /.*/
+
+
+      - build_ubuntu_eoan:
+          filters:
+            tags:
+              only: /.*/
+      - build_ubuntu_bionic:
+          filters:
+            tags:
+              only: /.*/
+      - build_ubuntu_focal:
+          filters:
+            tags:
+              only: /.*/

.github/ISSUE_TEMPLATE/bug_report.md

@@ -7,6 +7,8 @@ assignees: ''
 
 ---
 
+For general technical questions and help with technical issues please use the forum on https://forum.strawberrymusicplayer.org/
+
 **Describe the bug**
 A clear and concise description of what the bug is.
 

.github/workflows/ccpp.yml

@@ -5,21 +5,22 @@ jobs:
 
   build-linux:
     runs-on: ubuntu-latest
+    container:
+      image: opensuse/tumbleweed
     steps:
     - uses: actions/checkout@v1
     - name: Update Packages
-      run: sudo apt-get update -y
+      run: zypper ref
     - name: Install Packages
-      run:
-        sudo apt-get install -y git make cmake g++ gettext libglib2.0-dev libdbus-1-dev libboost-dev libprotobuf-dev protobuf-compiler libsqlite3-dev sqlite3 libgnutls28-dev libasound2-dev libpulse-dev qtbase5-dev qtbase5-dev-tools qtbase5-private-dev libqt5core5a libqt5gui5 libqt5widgets5 libqt5concurrent5 libqt5network5 libqt5sql5 libqt5x11extras5-dev libqt5dbus5 qttools5-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libgstreamer-plugins-good1.0-dev gstreamer1.0-alsa gstreamer1.0-pulseaudio libgstreamer1.0-0 libgstreamer-plugins-base1.0-0 libgstreamer-plugins-good1.0-0 libgstreamer-plugins-bad1.0-0 libchromaprint-dev libfftw3-dev libcdio-dev libmtp-dev libgpod-dev libimobiledevice-dev libplist-dev libusbmuxd-dev libxine2-dev libvlc-dev
+      run: zypper --non-interactive --gpg-auto-import-keys install lsb-release rpm-build rpmdevtools git tar make cmake gcc gcc-c++ pkg-config 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 libxine-devel vlc-devel taglib-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 libplist-devel libmtp-devel libusbmuxd-devel libchromaprint-devel desktop-file-utils update-desktop-files appstream-glib hicolor-icon-theme
     - name: Create Build Environment
-      run: cmake -E make_directory ${{runner.workspace}}/build
+      run: mkdir -p build
     - name: Configure CMake
-      working-directory: ${{runner.workspace}}/build
+      working-directory: build
       shell: bash
       run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE
     - name: Build
-      working-directory: ${{runner.workspace}}/build
+      working-directory: build
       shell: bash
       run: cmake --build . --config $BUILD_TYPE
 
@@ -27,8 +28,6 @@ jobs:
     runs-on: macos-latest
     steps:
     - uses: actions/checkout@v1
-    - name: Update HomeBrew
-      run: brew update
     - name: Unlink python
       run: brew unlink python@2
     - name: Install Packages

.gitignore

@@ -73,6 +73,11 @@ CMakeLists.txt.user*
 target_wrapper.*
 compile_commands.json
 
+*.kdev4
+*.vscode
+*.code-workspace
+*.sublime-workspace
+
 # Temporary files
 *~
 *.autosave

.travis.yml

@@ -1,7 +1,6 @@
 sudo: required
 language: C++
 os:
-  - linux
   - osx
 services:
   - docker
@@ -16,21 +15,20 @@ before_install:
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
       docker build -f Dockerfile -t strawberry-build . || travis_terminate 1;
       docker run --name build -itd strawberry-build /bin/bash || travis_terminate 1;
-      docker exec build git clone https://github.com/jonaski/strawberry;
+      docker exec build git clone https://github.com/strawberrymusicplayer/strawberry;
     fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
       git fetch --unshallow || travis_terminate 1;
       git pull || travis_terminate 1;
-      brew update || travis_terminate 1;
-      brew unlink python || travis_terminate 1;
-      brew install glib pkgconfig libffi protobuf protobuf-c qt gettext gnutls fftw sqlite chromaprint;
+      brew unlink python@2 || travis_terminate 1;
+      brew install glib pkgconfig libffi protobuf protobuf-c qt gettext gnutls fftw sqlite chromaprint zlib;
       brew install gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav;
       brew install libcdio libmtp libimobiledevice libplist;
       brew install create-dmg;
       export Qt5_DIR=/usr/local/opt/qt5/lib/cmake;
       export Qt5LinguistTools_DIR=/usr/local/opt/qt5/lib/cmake/Qt5LinguistTools;
       export PATH="/usr/local/opt/gettext/bin:$PATH";
-      export PKG_CONFIG_PATH=/usr/local/opt/libffi/lib/pkgconfig/:$PKG_CONFIG_PATH;
+      export PKG_CONFIG_PATH="/usr/local/opt/libffi/lib/pkgconfig/:/usr/local/opt/zlib/lib/pkgconfig:$PKG_CONFIG_PATH";
       ls /usr/local/lib/gstreamer-1.0;
     fi
 before_script:
@@ -49,7 +47,7 @@ after_success:
       if [[ "$TRAVIS_BRANCH" == "master" ]]; then
         rsync -e "ssh -o StrictHostKeyChecking=no" -va strawberry*.dmg travis@echoes.jkvinge.net:/home/travis/builds/macos;
       elif [[ "$TRAVIS_BRANCH" == "macos" ]]; then
-        rsync -e "ssh -o StrictHostKeyChecking=no" -va strawberry*.dmg travis@echoes.jkvinge.net:/home/travis/builds/macos-test;
+        rsync -e "ssh -o StrictHostKeyChecking=no" -va strawberry*.dmg travis@echoes.jkvinge.net:/home/travis/builds/macos;
       fi
     fi
 

3rdparty/singleapplication/singleapplication.cpp

@@ -31,13 +31,18 @@
 //
 //
 
+#include <stdlib.h>
+#include <limits>
+
 #include <QtGlobal>
 #include <QCoreApplication>
 #include <QThread>
 #include <QSharedMemory>
+#include <QLocalSocket>
 #include <QByteArray>
 #include <QDateTime>
 #include <QElapsedTimer>
+#include <QtDebug>
 
 #include "singleapplication.h"
 #include "singleapplication_p.h"
@@ -174,7 +179,7 @@ bool SingleApplication::sendMessage(QByteArray message, int timeout) {
   if (isPrimary()) return false;
 
   // Make sure the socket is connected
-  d->connectToPrimary(timeout,  SingleApplicationPrivate::Reconnect);
+  d->connectToPrimary(timeout, SingleApplicationPrivate::Reconnect);
 
   d->socket->write(message);
   bool dataWritten = d->socket->waitForBytesWritten(timeout);

3rdparty/singleapplication/singleapplication.h

@@ -36,7 +36,8 @@
 
 #include <QtGlobal>
 #include <QApplication>
-#include <QLocalSocket>
+#include <QFlags>
+#include <QByteArray>
 
 class SingleApplicationPrivate;
 

3rdparty/singleapplication/singleapplication_p.cpp

@@ -44,12 +44,14 @@
 #  include <pwd.h>
 #endif
 
-#include <QDir>
+#include <QIODevice>
+#include <QSharedMemory>
 #include <QByteArray>
 #include <QDataStream>
 #include <QCryptographicHash>
 #include <QLocalServer>
 #include <QLocalSocket>
+#include <QDir>
 
 #include "singleapplication.h"
 #include "singleapplication_p.h"
@@ -212,9 +214,7 @@ void SingleApplicationPrivate::connectToPrimary(int msecs, ConnectionType connec
     QByteArray initMsg;
     QDataStream writeStream(&initMsg, QIODevice::WriteOnly);
 
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
     writeStream.setVersion(QDataStream::Qt_5_6);
-#endif
 
     writeStream << blockServerName.toLatin1();
     writeStream << static_cast<quint8>(connectionType);
@@ -226,9 +226,8 @@ void SingleApplicationPrivate::connectToPrimary(int msecs, ConnectionType connec
     QByteArray header;
     QDataStream headerStream(&header, QIODevice::WriteOnly);
 
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
     headerStream.setVersion(QDataStream::Qt_5_6);
-#endif
+
     headerStream << static_cast <quint64>(initMsg.length());
 
     socket->write(header);
@@ -313,9 +312,7 @@ void SingleApplicationPrivate::readInitMessageHeader(QLocalSocket *sock) {
 
   QDataStream headerStream(sock);
 
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
   headerStream.setVersion(QDataStream::Qt_5_6);
-#endif
 
   // Read the header to know the message length
   quint64 msgLen = 0;
@@ -347,9 +344,7 @@ void SingleApplicationPrivate::readInitMessageBody(QLocalSocket *sock) {
   QByteArray msgBytes = sock->read(info.msgLen);
   QDataStream readStream(msgBytes);
 
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
   readStream.setVersion(QDataStream::Qt_5_6);
-#endif
 
   // server name
   QByteArray latin1Name;

3rdparty/singleapplication/singleapplication_p.h

@@ -35,13 +35,15 @@
 #define SINGLEAPPLICATION_P_H
 
 #include <QtGlobal>
-#include <QLocalSocket>
-#include <QLocalServer>
-#include <QSharedMemory>
+#include <QObject>
 #include <QMap>
 
 #include "singleapplication.h"
 
+class QLocalServer;
+class QLocalSocket;
+class QSharedMemory;
+
 struct InstancesInfo {
   bool primary;
   quint32 secondary;

3rdparty/singleapplication/singlecoreapplication.cpp

@@ -31,13 +31,18 @@
 //
 //
 
+#include <stdlib.h>
+#include <limits>
+
 #include <QtGlobal>
 #include <QCoreApplication>
 #include <QThread>
 #include <QSharedMemory>
+#include <QLocalSocket>
 #include <QByteArray>
 #include <QDateTime>
 #include <QElapsedTimer>
+#include <QtDebug>
 
 #include "singlecoreapplication.h"
 #include "singlecoreapplication_p.h"
@@ -175,7 +180,7 @@ bool SingleCoreApplication::sendMessage(QByteArray message, int timeout) {
   if(isPrimary()) return false;
 
   // Make sure the socket is connected
-  d->connectToPrimary(timeout,  SingleCoreApplicationPrivate::Reconnect);
+  d->connectToPrimary(timeout, SingleCoreApplicationPrivate::Reconnect);
 
   d->socket->write(message);
   bool dataWritten = d->socket->waitForBytesWritten(timeout);

3rdparty/singleapplication/singlecoreapplication.h

@@ -36,7 +36,8 @@
 
 #include <QtGlobal>
 #include <QCoreApplication>
-#include <QLocalSocket>
+#include <QFlags>
+#include <QByteArray>
 
 class SingleCoreApplicationPrivate;
 

3rdparty/singleapplication/singlecoreapplication_p.cpp

@@ -44,12 +44,14 @@
 #  include <pwd.h>
 #endif
 
-#include <QDir>
+#include <QIODevice>
+#include <QSharedMemory>
 #include <QByteArray>
 #include <QDataStream>
 #include <QCryptographicHash>
 #include <QLocalServer>
 #include <QLocalSocket>
+#include <QDir>
 
 #include "singlecoreapplication.h"
 #include "singlecoreapplication_p.h"
@@ -212,9 +214,7 @@ void SingleCoreApplicationPrivate::connectToPrimary(int msecs, ConnectionType co
     QByteArray initMsg;
     QDataStream writeStream(&initMsg, QIODevice::WriteOnly);
 
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
     writeStream.setVersion(QDataStream::Qt_5_6);
-#endif
 
     writeStream << blockServerName.toLatin1();
     writeStream << static_cast<quint8>(connectionType);
@@ -226,9 +226,8 @@ void SingleCoreApplicationPrivate::connectToPrimary(int msecs, ConnectionType co
     QByteArray header;
     QDataStream headerStream(&header, QIODevice::WriteOnly);
 
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
     headerStream.setVersion(QDataStream::Qt_5_6);
-#endif
+
     headerStream << static_cast <quint64>(initMsg.length());
 
     socket->write(header);
@@ -313,9 +312,7 @@ void SingleCoreApplicationPrivate::readInitMessageHeader(QLocalSocket *sock) {
 
   QDataStream headerStream(sock);
 
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
   headerStream.setVersion(QDataStream::Qt_5_6);
-#endif
 
   // Read the header to know the message length
   quint64 msgLen = 0;
@@ -347,9 +344,7 @@ void SingleCoreApplicationPrivate::readInitMessageBody(QLocalSocket *sock) {
   QByteArray msgBytes = sock->read(info.msgLen);
   QDataStream readStream(msgBytes);
 
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
   readStream.setVersion(QDataStream::Qt_5_6);
-#endif
 
   // server name
   QByteArray latin1Name;

3rdparty/singleapplication/singlecoreapplication_p.h

@@ -35,13 +35,15 @@
 #define SINGLECOREAPPLICATION_P_H
 
 #include <QtGlobal>
-#include <QLocalSocket>
-#include <QLocalServer>
-#include <QSharedMemory>
+#include <QObject>
 #include <QMap>
 
 #include "singlecoreapplication.h"
 
+class QLocalServer;
+class QLocalSocket;
+class QSharedMemory;
+
 struct InstancesInfo {
   bool primary;
   quint32 secondary;

3rdparty/taglib/ape/apefile.cpp

@@ -91,8 +91,11 @@ bool APE::File::isSupported(IOStream *stream)
 {
   // An APE file has an ID "MAC " somewhere. An ID3v2 tag may precede.
 
-  const ByteVector buffer = Utils::readHeader(stream, bufferSize(), true);
-  return (buffer.find("MAC ") >= 0);
+  // FIXME:
+  //const ByteVector buffer = Utils::readHeader(stream, bufferSize(), true);
+  //return (buffer.find("MAC ") >= 0);
+
+  return false;
 }
 
 ////////////////////////////////////////////////////////////////////////////////

CMakeLists.txt

@@ -24,7 +24,6 @@ include(CheckCXXCompilerFlag)
 include(CheckCXXSourceRuns)
 include(CheckIncludeFiles)
 include(FindPkgConfig)
-include(cmake/C++11Compat.cmake)
 include(cmake/Version.cmake)
 include(cmake/Summary.cmake)
 include(cmake/OptionalSource.cmake)
@@ -66,6 +65,10 @@ endif ()
 find_package(PkgConfig REQUIRED)
 find_package(Boost REQUIRED)
 find_package(Threads)
+find_package(Backtrace QUIET)
+if(Backtrace_FOUND)
+  set(HAVE_BACKTRACE ON)
+endif()
 find_package(GnuTLS)
 find_package(Protobuf REQUIRED)
 find_library(PROTOBUF_STATIC_LIBRARY libprotobuf.a libprotobuf)
@@ -108,7 +111,7 @@ find_package(Gettext)
 find_package(FFTW3)
 
 # QT
-set(QT_MIN_VERSION 5.5)
+set(QT_MIN_VERSION 5.6)
 set(QT_COMPONENTS Core Concurrent Widgets Network Sql)
 
 if(X11_FOUND)
@@ -172,13 +175,13 @@ pkg_check_modules(TAGLIB taglib)
 # - Audio file detection by content.
 # - DSF and DSDIFF support
 #
-if (TAGLIB_VERSION VERSION_GREATER 1.11.1 OR WIN32)
+if (TAGLIB_VERSION VERSION_GREATER 1.11.1)
   option(USE_SYSTEM_TAGLIB "Use system taglib" ON)
 else()
   option(USE_SYSTEM_TAGLIB "Use system taglib" OFF)
 endif()
 if (TAGLIB_FOUND AND USE_SYSTEM_TAGLIB)
-  if (TAGLIB_VERSION VERSION_GREATER 1.11.1 OR WIN32)
+  if (TAGLIB_VERSION VERSION_GREATER 1.11.1)
     message(STATUS "Using system taglib library")
   else()
     message(WARNING "Using system taglib library. Version 1.11.1 or less has a bug corrupting Ogg files, make sure your systems version has been patched!")
@@ -195,6 +198,7 @@ else()
   add_subdirectory(3rdparty/utf8-cpp)
   add_subdirectory(3rdparty/taglib)
   set(HAVE_TAGLIB_DSFFILE ON)
+  add_definitions(-DTAGLIB_STATIC)
 endif()
 
 # SingleApplication
@@ -325,8 +329,6 @@ optional_component(TRANSLATIONS ON "Translations"
   DEPENDS "Qt5LinguistTools" Qt5LinguistTools_FOUND
 )
 
-optional_component(TIDAL ON "Tidal support")
-optional_component(QOBUZ ON "Qobuz support")
 optional_component(SUBSONIC ON "Subsonic support")
 
 optional_component(MOODBAR ON "Moodbar"

Changelog

@@ -2,17 +2,50 @@ Strawberry Music Player
 =======================
 ChangeLog
 
+Version 0.6.9:
+
+  BugFixes:
+    * Fixed playlist metadata updating interfering with manual tag editing.
+    * Fixed order of tabs in all windows.
+    * Fixed playlist right click using wrong songs for determining menu options when playlist was filtered.
+    * Fixed possible crashes on playlist right click.
+    * Fixed possible null pointer crash in OSD pretty.
+    * Fixed track and title in playlist not being movable.
+    * Fixed Subsonic support to handle numeric Json values like track and disc both as strings and integers.
+    * Fixed Subsonic compatibility with LMS (Lightweight Music Server).
+    * Disabled "open Audio CD" from menu on Windows where CD support is currently not supported.
+    * Fixed files containing "MAC" being detected as Monkey's Audio.
+
+  Enhancements:
+    * Improved support for High DPI displays.
+    * Added CMake check for backtrace() to fix compilation with musl libc.
+    * Made album cover in context adjust to width.
+    * Made settings, cover manager, organise dialog and transcode music dialog center on the same display where the mainwindow is located.
+    * Removing empty directories when organizing music.
+    * Made file selection work in "Show file in browser" for Dolphin and Nautilus.
+    * Implemented disk caching of album thumbnails in collection tree.
+    * Use a shorter playlist name when songs are added from file view.
+    * Disabled optical drives in copy to device menu.
+    * Added better error handling for CDDA loading.
+    * Added Polish, Hungarian and Korean translations.
+
+  Removed features:
+    * Chartlyrics support (Unstable API).
+    * Tidal support (No agreement).
+    * QObuz support (No agreement).
+
 Version 0.6.8:
 
     * Fixed stuck tabbar and collection GUI with some themes.
     * Fixed possible crashes related to QProxyStyle.
     * Fixed a bug where metadata in the playlist was not updated when editing metadata for the current playing track.
     * Fixed crash when deleting a folder with playlists.
+    * Fixed restoring to correct screen when maximized.
     * Increased lyrics score if lyrics text is larger than 60 characters to avoid using "no lyrics available" text.
     * Made context title and summary changeable.
     * Added option to disable playlist clear button.
     * Added confirmation dialog before clearing playlists with more than 500 songs.
-    * Added German, French and Indonesian translations.
+    * Added German, French, Italian and Indonesian translations.
     * Added StartupWMClass to desktop file.
     * Replaced use of Qt deprecated functionality as of 5.14.
     * (macOS) Fixed filesystem watcher to correctly pick up changed collection directories.

README.md

@@ -1,13 +1,26 @@
-:strawberry: Strawberry Music Player [![Build Status](https://travis-ci.org/jonaski/strawberry.svg?branch=master)](https://travis-ci.org/jonaski/strawberry)
+:strawberry: Strawberry Music Player [![Build Status](https://github.com/strawberrymusicplayer/strawberry/workflows/C/C++%20CI/badge.svg)](https://github.com/strawberrymusicplayer/strawberry/actions)
 [![Donate](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, 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 a fork of Clementine released in 2018 aimed at music collectors and audiophiles. It's written in C++ using the Qt 5 framework.
+
+![Browse](https://www.strawberrymusicplayer.org/pictures/screenshot-002-large.png)
+
+Resources:
 
   * Website: https://www.strawberrymusicplayer.org/
-  * Github: https://github.com/jonaski/strawberry
-  * Buildbot: http://buildbot.strawberrymusicplayer.org/
+  * Forum: https://forum.strawberrymusicplayer.org/
+  * Github: https://github.com/strawberrymusicplayer/strawberry
+  * 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
+  * Translations: https://translate.zanata.org/iteration/view/strawberry/master
+
+The program is free software, released under GPL. If you like this program and can make use of it, consider sponsoring or donating to help funding the project.
+To sponsor, visit [my GitHub sponsors profile](https://github.com/sponsors/jonaski).
+Funding developers through GitHub Sponsors is one more way to contribute to open source projects you appreciate, it helps developers get the resources they need, and recognize contributors working behind the scenes to make open source better for everyone.
+You can also make a one-time payment through [paypal.me/jonaskvinge](https://paypal.me/jonaskvinge)
 
 ### :heavy_check_mark: Features:
 
@@ -19,21 +32,19 @@ Strawberry is a music player and music collection organizer. It is a fork of Cle
   * Advanced audio output and device configuration for bit-perfect playback on Linux
   * Edit tags on music files
   * Fetch tags from MusicBrainz
-  * Album cover art from [Last.fm](https://www.last.fm/), [Musicbrainz](https://musicbrainz.org/), [Discogs](https://www.discogs.com/), [Deezer](https://www.deezer.com/) and [Tidal](https://tidal.com/)
-  * Song lyrics from [AudD](https://audd.io/), [ChartLyrics](http://www.chartlyrics.com/), [lyrics.ovh](https://lyrics.ovh/) and [lololyrics.com](https://www.lololyrics.com/)
+  * Album cover art from [Last.fm](https://www.last.fm/), [Musicbrainz](https://musicbrainz.org/), [Discogs](https://www.discogs.com/) and [Deezer](https://www.deezer.com/)
+  * Song lyrics from [AudD](https://audd.io/), [lyrics.ovh](https://lyrics.ovh/) and [lololyrics.com](https://www.lololyrics.com/)
   * Support for multiple backends
   * Audio analyzer
   * Audio equalizer
   * Transfer music to iPod, iPhone, MTP or mass-storage USB player
-  * Subsonic streaming support
-  * Unofficial streaming support for [Tidal](https://tidal.com/) and [Qobuz](https://www.qobuz.com/)
   * Scrobbler with support for [Last.fm](https://www.last.fm/), [Libre.fm](https://libre.fm/) and [ListenBrainz](https://listenbrainz.org/)
-  
-**Tidal and Qobuz streaming in Strawberry is unofficial. You need an official API token (or App ID/Secret) to use it, we can not provide API tokens, or help getting them. Tidal will not work with Tidal Masters (MQA), because MQA is a proprietary format in lossy quality without an open source decoder, we can't support it.**
+  * Subsonic streaming support
 
-It has so far been tested to work on Linux, OpenBSD, macOS and Windows.
 
-**We do not provide releases for macOS, only experimental builds, they may have issues. There currently isn't any macOS developers actively working on this project.**
+It has so far been tested to work on Linux, OpenBSD and Windows.
+
+**We currently do not provide releases for macOS because there aren't any macOS developers actively working on this project. It is still possible to compile by following the instructions in the Wiki**
 
 ### :heavy_exclamation_mark: Requirements
 
@@ -45,7 +56,7 @@ To build Strawberry from source you need the following installed on your system
 * [POSIX thread (pthread)](http://www.yolinux.com/TUTORIALS/LinuxTutorialPosixThreads.html)
 * [GLib](https://developer.gnome.org/glib/)
 * [Protobuf library and compiler](https://developers.google.com/protocol-buffers/)
-* [Qt 5.5 or higher with components Core, Gui, Widgets, Concurrent, Network and Sql](https://www.qt.io/)
+* [Qt 5.6 or higher with components Core, Gui, Widgets, Concurrent, Network and Sql](https://www.qt.io/)
 * [Qt 5 components X11Extras and DBus for Linux/BSD, MacExtras for macOS and WinExtras for Windows](https://www.qt.io/)
 * [SQLite 3.9 or newer with FTS5](https://www.sqlite.org)
 * [Chromaprint library](https://acoustid.org/chromaprint)
@@ -70,7 +81,7 @@ You should also install the gstreamer plugins base and good, and optionally bad
 
 ### Get the code:
 
-    git clone https://github.com/jonaski/strawberry
+    git clone https://github.com/strawberrymusicplayer/strawberry
 
 ### Compile and install:
 
@@ -84,11 +95,3 @@ You should also install the gstreamer plugins base and good, and optionally bad
 
 [![Packaging status](https://repology.org/badge/vertical-allrepos/strawberry.svg)](https://repology.org/metapackage/strawberry/versions)
 
-### :computer:	Screenshot
-
-
-![Browse](https://www.strawberrymusicplayer.org/pictures/screenshot-002-large.png)
-
-### :moneybag: Donate
-
-[![paypal](https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif)](https://paypal.me/jonaskvinge)

cmake/C++11Compat.cmake

@@ -1,9 +0,0 @@
-# Hacky stuff to make C++11 features work with old compilers.
-
-if (CMAKE_COMPILER_IS_GNUCC)
-  execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion
-                  OUTPUT_VARIABLE GCC_VERSION)
-  if (GCC_VERSION VERSION_LESS 4.7)
-    add_definitions(-Doverride=)
-  endif()
-endif()

cmake/Deb.cmake

@@ -1,5 +1,20 @@
-add_custom_target(deb
-  COMMAND cp -r -p ${CMAKE_SOURCE_DIR}/debian ${CMAKE_BINARY_DIR}/
-  COMMAND dpkg-buildpackage -b -d -uc -us
-  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-)
+find_program(LSB_RELEASE_EXEC lsb_release)
+find_program(DPKG_BUILDPACKAGE dpkg-buildpackage)
+
+if (LSB_RELEASE_EXEC AND DPKG_BUILDPACKAGE)
+  execute_process(COMMAND env LC_ALL=C date "+%a, %-d %b %Y %H:%M:%S %z" OUTPUT_VARIABLE DEB_DATE OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+  execute_process(COMMAND /bin/sh "-c" "${LSB_RELEASE_EXEC} -cs"
+    OUTPUT_VARIABLE DEB_CODENAME
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+  )
+
+  if (DEB_CODENAME)
+    configure_file(${CMAKE_SOURCE_DIR}/debian/changelog.in ${CMAKE_SOURCE_DIR}/debian/changelog)
+    add_custom_target(deb
+      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+      COMMAND ${DPKG_BUILDPACKAGE} -b -d -uc -us
+    )
+  endif()
+
+endif()

cmake/Rpm.cmake

@@ -2,6 +2,8 @@ find_program(LSB_RELEASE_EXEC lsb_release)
 find_program(RPMBUILD_EXEC rpmbuild)
 
 if (LSB_RELEASE_EXEC AND RPMBUILD_EXEC)
+  execute_process(COMMAND env LC_ALL="en_US.utf8" date "+%a %b %d %Y" OUTPUT_VARIABLE RPM_DATE OUTPUT_STRIP_TRAILING_WHITESPACE)
+
   execute_process(COMMAND /bin/sh "-c" "${LSB_RELEASE_EXEC} -is | tr '[:upper:]' '[:lower:]' | cut -d' ' -f1"
     OUTPUT_VARIABLE DIST_NAME
     OUTPUT_STRIP_TRAILING_WHITESPACE
@@ -22,7 +24,6 @@ if (LSB_RELEASE_EXEC AND RPMBUILD_EXEC)
     if (DIST_VERSION)
       message(STATUS "Distro Version: ${DIST_VERSION}")
     endif()
-    set(RPM_ARCH x86_64 CACHE STRING "Architecture of the rpm file")
     set(RPMBUILD_DIR ~/rpmbuild CACHE STRING "Rpmbuild directory, for the rpm target")
     if (${DIST_NAME} STREQUAL "opensuse")
       if (DIST_RELEASE)
@@ -56,6 +57,7 @@ if (LSB_RELEASE_EXEC AND RPMBUILD_EXEC)
       set(RPM_DISTRO ${DIST_NAME} CACHE STRING "Suffix of the rpm file")
     endif()
     message(STATUS "RPM Suffix: ${RPM_DISTRO}")
+    configure_file(${CMAKE_SOURCE_DIR}/dist/rpm/strawberry.spec.in ${CMAKE_SOURCE_DIR}/dist/rpm/strawberry.spec @ONLY)
     add_custom_target(rpm
       COMMAND ${CMAKE_SOURCE_DIR}/dist/scripts/maketarball.sh
       COMMAND ${CMAKE_COMMAND} -E copy strawberry-${STRAWBERRY_VERSION_PACKAGE}.tar.xz ${RPMBUILD_DIR}/SOURCES/

cmake/Version.cmake

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

data/data.qrc

@@ -10,6 +10,7 @@
         <file>schema/schema-7.sql</file>
         <file>schema/schema-8.sql</file>
         <file>schema/schema-9.sql</file>
+        <file>schema/schema-10.sql</file>
         <file>schema/device-schema.sql</file>
         <file>style/strawberry.css</file>
         <file>html/playing-tooltip-plain.html</file>

data/icons.qrc

@@ -89,8 +89,6 @@
         <file>icons/128x128/moodbar.png</file>
         <file>icons/128x128/love.png</file>
         <file>icons/128x128/subsonic.png</file>
-        <file>icons/128x128/tidal.png</file>
-        <file>icons/128x128/qobuz.png</file>
         <file>icons/64x64/albums.png</file>
         <file>icons/64x64/alsa.png</file>
         <file>icons/64x64/application-exit.png</file>
@@ -181,8 +179,6 @@
         <file>icons/64x64/moodbar.png</file>
         <file>icons/64x64/love.png</file>
         <file>icons/64x64/subsonic.png</file>
-        <file>icons/64x64/tidal.png</file>
-        <file>icons/64x64/qobuz.png</file>
         <file>icons/48x48/albums.png</file>
         <file>icons/48x48/alsa.png</file>
         <file>icons/48x48/application-exit.png</file>
@@ -276,8 +272,6 @@
         <file>icons/48x48/moodbar.png</file>
         <file>icons/48x48/love.png</file>
         <file>icons/48x48/subsonic.png</file>
-	<file>icons/48x48/tidal.png</file>
-	<file>icons/48x48/qobuz.png</file>
         <file>icons/32x32/albums.png</file>
         <file>icons/32x32/alsa.png</file>
         <file>icons/32x32/application-exit.png</file>
@@ -371,8 +365,6 @@
         <file>icons/32x32/moodbar.png</file>
         <file>icons/32x32/love.png</file>
         <file>icons/32x32/subsonic.png</file>
-        <file>icons/32x32/tidal.png</file>
-        <file>icons/32x32/qobuz.png</file>
         <file>icons/22x22/albums.png</file>
         <file>icons/22x22/alsa.png</file>
         <file>icons/22x22/application-exit.png</file>
@@ -466,7 +458,5 @@
         <file>icons/22x22/moodbar.png</file>
         <file>icons/22x22/love.png</file>
         <file>icons/22x22/subsonic.png</file>
-        <file>icons/22x22/tidal.png</file>
-        <file>icons/22x22/qobuz.png</file>
     </qresource>
 </RCC>

data/schema/schema-10.sql

@@ -0,0 +1,25 @@
+DROP TABLE IF EXISTS tidal_artists_songs;
+
+DROP TABLE IF EXISTS tidal_albums_songs;
+
+DROP TABLE IF EXISTS tidal_songs;
+
+DROP TABLE IF EXISTS qobuz_artists_songs;
+
+DROP TABLE IF EXISTS qobuz_albums_songs;
+
+DROP TABLE IF EXISTS qobuz_songs;
+
+DROP TABLE IF EXISTS tidal_artists_songs_fts;
+
+DROP TABLE IF EXISTS tidal_albums_songs_fts;
+
+DROP TABLE IF EXISTS tidal_songs_fts;
+
+DROP TABLE IF EXISTS qobuz_artists_songs_fts;
+
+DROP TABLE IF EXISTS qobuz_albums_songs_fts;
+
+DROP TABLE IF EXISTS qobuz_songs_fts;
+
+UPDATE schema_version SET version=10;

data/schema/schema.sql

@@ -4,7 +4,7 @@ CREATE TABLE IF NOT EXISTS schema_version (
 
 DELETE FROM schema_version;
 
-INSERT INTO schema_version (version) VALUES (9);
+INSERT INTO schema_version (version) VALUES (10);
 
 CREATE TABLE IF NOT EXISTS directories (
   path TEXT NOT NULL,
@@ -74,177 +74,6 @@ CREATE TABLE IF NOT EXISTS songs (
 
 );
 
-CREATE TABLE IF NOT EXISTS tidal_artists_songs (
-
-  title TEXT NOT NULL,
-  album TEXT NOT NULL,
-  artist TEXT NOT NULL,
-  albumartist TEXT NOT NULL,
-  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 NOT NULL,
-  compilation INTEGER NOT NULL DEFAULT -1,
-  composer TEXT NOT NULL,
-  performer TEXT NOT NULL,
-  grouping TEXT NOT NULL,
-  comment TEXT NOT NULL,
-  lyrics TEXT NOT NULL,
-
-  artist_id INTEGER NOT NULL DEFAULT -1,
-  album_id TEXT NOT NULL,
-  song_id INTEGER NOT NULL DEFAULT -1,
-
-  beginning INTEGER NOT NULL DEFAULT 0,
-  length INTEGER NOT NULL DEFAULT 0,
-
-  bitrate INTEGER NOT NULL DEFAULT -1,
-  samplerate INTEGER NOT NULL DEFAULT -1,
-  bitdepth INTEGER NOT NULL DEFAULT -1,
-
-  source INTEGER NOT NULL DEFAULT 0,
-  directory_id INTEGER NOT NULL DEFAULT -1,
-  url TEXT NOT NULL,
-  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,
-
-  playcount INTEGER NOT NULL DEFAULT 0,
-  skipcount INTEGER NOT NULL DEFAULT 0,
-  lastplayed INTEGER NOT NULL DEFAULT -1,
-
-  compilation_detected INTEGER DEFAULT 0,
-  compilation_on INTEGER NOT NULL DEFAULT 0,
-  compilation_off INTEGER NOT NULL DEFAULT 0,
-  compilation_effective INTEGER NOT NULL DEFAULT 0,
-
-  art_automatic TEXT,
-  art_manual TEXT,
-
-  effective_albumartist TEXT,
-  effective_originalyear INTEGER NOT NULL DEFAULT 0,
-
-  cue_path TEXT
-
-);
-
-CREATE TABLE IF NOT EXISTS tidal_albums_songs (
-
-  title TEXT NOT NULL,
-  album TEXT NOT NULL,
-  artist TEXT NOT NULL,
-  albumartist TEXT NOT NULL,
-  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 NOT NULL,
-  compilation INTEGER NOT NULL DEFAULT -1,
-  composer TEXT NOT NULL,
-  performer TEXT NOT NULL,
-  grouping TEXT NOT NULL,
-  comment TEXT NOT NULL,
-  lyrics TEXT NOT NULL,
-
-  artist_id INTEGER NOT NULL DEFAULT -1,
-  album_id TEXT NOT NULL,
-  song_id INTEGER NOT NULL DEFAULT -1,
-
-  beginning INTEGER NOT NULL DEFAULT 0,
-  length INTEGER NOT NULL DEFAULT 0,
-
-  bitrate INTEGER NOT NULL DEFAULT -1,
-  samplerate INTEGER NOT NULL DEFAULT -1,
-  bitdepth INTEGER NOT NULL DEFAULT -1,
-
-  source INTEGER NOT NULL DEFAULT 0,
-  directory_id INTEGER NOT NULL DEFAULT -1,
-  url TEXT NOT NULL,
-  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,
-
-  playcount INTEGER NOT NULL DEFAULT 0,
-  skipcount INTEGER NOT NULL DEFAULT 0,
-  lastplayed INTEGER NOT NULL DEFAULT -1,
-
-  compilation_detected INTEGER DEFAULT 0,
-  compilation_on INTEGER NOT NULL DEFAULT 0,
-  compilation_off INTEGER NOT NULL DEFAULT 0,
-  compilation_effective INTEGER NOT NULL DEFAULT 0,
-
-  art_automatic TEXT,
-  art_manual TEXT,
-
-  effective_albumartist TEXT,
-  effective_originalyear INTEGER NOT NULL DEFAULT 0,
-
-  cue_path TEXT
-
-);
-
-CREATE TABLE IF NOT EXISTS tidal_songs (
-
-  title TEXT NOT NULL,
-  album TEXT NOT NULL,
-  artist TEXT NOT NULL,
-  albumartist TEXT NOT NULL,
-  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 NOT NULL,
-  compilation INTEGER NOT NULL DEFAULT -1,
-  composer TEXT NOT NULL,
-  performer TEXT NOT NULL,
-  grouping TEXT NOT NULL,
-  comment TEXT NOT NULL,
-  lyrics TEXT NOT NULL,
-
-  artist_id INTEGER NOT NULL DEFAULT -1,
-  album_id TEXT NOT NULL,
-  song_id INTEGER NOT NULL DEFAULT -1,
-
-  beginning INTEGER NOT NULL DEFAULT 0,
-  length INTEGER NOT NULL DEFAULT 0,
-
-  bitrate INTEGER NOT NULL DEFAULT -1,
-  samplerate INTEGER NOT NULL DEFAULT -1,
-  bitdepth INTEGER NOT NULL DEFAULT -1,
-
-  source INTEGER NOT NULL DEFAULT 0,
-  directory_id INTEGER NOT NULL DEFAULT -1,
-  url TEXT NOT NULL,
-  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,
-
-  playcount INTEGER NOT NULL DEFAULT 0,
-  skipcount INTEGER NOT NULL DEFAULT 0,
-  lastplayed INTEGER NOT NULL DEFAULT -1,
-
-  compilation_detected INTEGER DEFAULT 0,
-  compilation_on INTEGER NOT NULL DEFAULT 0,
-  compilation_off INTEGER NOT NULL DEFAULT 0,
-  compilation_effective INTEGER NOT NULL DEFAULT 0,
-
-  art_automatic TEXT,
-  art_manual TEXT,
-
-  effective_albumartist TEXT,
-  effective_originalyear INTEGER NOT NULL DEFAULT 0,
-
-  cue_path TEXT
-
-);
-
 CREATE TABLE IF NOT EXISTS subsonic_songs (
 
   title TEXT NOT NULL,
@@ -302,177 +131,6 @@ CREATE TABLE IF NOT EXISTS subsonic_songs (
 
 );
 
-CREATE TABLE IF NOT EXISTS qobuz_artists_songs (
-
-  title TEXT NOT NULL,
-  album TEXT NOT NULL,
-  artist TEXT NOT NULL,
-  albumartist TEXT NOT NULL,
-  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 NOT NULL,
-  compilation INTEGER NOT NULL DEFAULT -1,
-  composer TEXT NOT NULL,
-  performer TEXT NOT NULL,
-  grouping TEXT NOT NULL,
-  comment TEXT NOT NULL,
-  lyrics TEXT NOT NULL,
-
-  artist_id INTEGER NOT NULL DEFAULT -1,
-  album_id TEXT NOT NULL,
-  song_id INTEGER NOT NULL DEFAULT -1,
-
-  beginning INTEGER NOT NULL DEFAULT 0,
-  length INTEGER NOT NULL DEFAULT 0,
-
-  bitrate INTEGER NOT NULL DEFAULT -1,
-  samplerate INTEGER NOT NULL DEFAULT -1,
-  bitdepth INTEGER NOT NULL DEFAULT -1,
-
-  source INTEGER NOT NULL DEFAULT 0,
-  directory_id INTEGER NOT NULL DEFAULT -1,
-  url TEXT NOT NULL,
-  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,
-
-  playcount INTEGER NOT NULL DEFAULT 0,
-  skipcount INTEGER NOT NULL DEFAULT 0,
-  lastplayed INTEGER NOT NULL DEFAULT -1,
-
-  compilation_detected INTEGER DEFAULT 0,
-  compilation_on INTEGER NOT NULL DEFAULT 0,
-  compilation_off INTEGER NOT NULL DEFAULT 0,
-  compilation_effective INTEGER NOT NULL DEFAULT 0,
-
-  art_automatic TEXT,
-  art_manual TEXT,
-
-  effective_albumartist TEXT,
-  effective_originalyear INTEGER NOT NULL DEFAULT 0,
-
-  cue_path TEXT
-
-);
-
-CREATE TABLE IF NOT EXISTS qobuz_albums_songs (
-
-  title TEXT NOT NULL,
-  album TEXT NOT NULL,
-  artist TEXT NOT NULL,
-  albumartist TEXT NOT NULL,
-  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 NOT NULL,
-  compilation INTEGER NOT NULL DEFAULT -1,
-  composer TEXT NOT NULL,
-  performer TEXT NOT NULL,
-  grouping TEXT NOT NULL,
-  comment TEXT NOT NULL,
-  lyrics TEXT NOT NULL,
-
-  artist_id INTEGER NOT NULL DEFAULT -1,
-  album_id TEXT NOT NULL,
-  song_id INTEGER NOT NULL DEFAULT -1,
-
-  beginning INTEGER NOT NULL DEFAULT 0,
-  length INTEGER NOT NULL DEFAULT 0,
-
-  bitrate INTEGER NOT NULL DEFAULT -1,
-  samplerate INTEGER NOT NULL DEFAULT -1,
-  bitdepth INTEGER NOT NULL DEFAULT -1,
-
-  source INTEGER NOT NULL DEFAULT 0,
-  directory_id INTEGER NOT NULL DEFAULT -1,
-  url TEXT NOT NULL,
-  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,
-
-  playcount INTEGER NOT NULL DEFAULT 0,
-  skipcount INTEGER NOT NULL DEFAULT 0,
-  lastplayed INTEGER NOT NULL DEFAULT -1,
-
-  compilation_detected INTEGER DEFAULT 0,
-  compilation_on INTEGER NOT NULL DEFAULT 0,
-  compilation_off INTEGER NOT NULL DEFAULT 0,
-  compilation_effective INTEGER NOT NULL DEFAULT 0,
-
-  art_automatic TEXT,
-  art_manual TEXT,
-
-  effective_albumartist TEXT,
-  effective_originalyear INTEGER NOT NULL DEFAULT 0,
-
-  cue_path TEXT
-
-);
-
-CREATE TABLE IF NOT EXISTS qobuz_songs (
-
-  title TEXT NOT NULL,
-  album TEXT NOT NULL,
-  artist TEXT NOT NULL,
-  albumartist TEXT NOT NULL,
-  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 NOT NULL,
-  compilation INTEGER NOT NULL DEFAULT -1,
-  composer TEXT NOT NULL,
-  performer TEXT NOT NULL,
-  grouping TEXT NOT NULL,
-  comment TEXT NOT NULL,
-  lyrics TEXT NOT NULL,
-
-  artist_id INTEGER NOT NULL DEFAULT -1,
-  album_id TEXT NOT NULL,
-  song_id INTEGER NOT NULL DEFAULT -1,
-
-  beginning INTEGER NOT NULL DEFAULT 0,
-  length INTEGER NOT NULL DEFAULT 0,
-
-  bitrate INTEGER NOT NULL DEFAULT -1,
-  samplerate INTEGER NOT NULL DEFAULT -1,
-  bitdepth INTEGER NOT NULL DEFAULT -1,
-
-  source INTEGER NOT NULL DEFAULT 0,
-  directory_id INTEGER NOT NULL DEFAULT -1,
-  url TEXT NOT NULL,
-  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,
-
-  playcount INTEGER NOT NULL DEFAULT 0,
-  skipcount INTEGER NOT NULL DEFAULT 0,
-  lastplayed INTEGER NOT NULL DEFAULT -1,
-
-  compilation_detected INTEGER DEFAULT 0,
-  compilation_on INTEGER NOT NULL DEFAULT 0,
-  compilation_off INTEGER NOT NULL DEFAULT 0,
-  compilation_effective INTEGER NOT NULL DEFAULT 0,
-
-  art_automatic TEXT,
-  art_manual TEXT,
-
-  effective_albumartist TEXT,
-  effective_originalyear INTEGER NOT NULL DEFAULT 0,
-
-  cue_path TEXT
-
-);
-
 CREATE TABLE IF NOT EXISTS playlists (
 
   name TEXT NOT NULL,
@@ -585,51 +243,6 @@ CREATE VIRTUAL TABLE IF NOT EXISTS songs_fts USING fts5(
 
 );
 
-CREATE VIRTUAL TABLE IF NOT EXISTS tidal_artists_songs_fts USING fts5(
-
-  ftstitle,
-  ftsalbum,
-  ftsartist,
-  ftsalbumartist,
-  ftscomposer,
-  ftsperformer,
-  ftsgrouping,
-  ftsgenre,
-  ftscomment,
-  tokenize = "unicode61 remove_diacritics 0"
-
-);
-
-CREATE VIRTUAL TABLE IF NOT EXISTS tidal_albums_songs_fts USING fts5(
-
-  ftstitle,
-  ftsalbum,
-  ftsartist,
-  ftsalbumartist,
-  ftscomposer,
-  ftsperformer,
-  ftsgrouping,
-  ftsgenre,
-  ftscomment,
-  tokenize = "unicode61 remove_diacritics 0"
-
-);
-
-CREATE VIRTUAL TABLE IF NOT EXISTS tidal_songs_fts USING fts5(
-
-  ftstitle,
-  ftsalbum,
-  ftsartist,
-  ftsalbumartist,
-  ftscomposer,
-  ftsperformer,
-  ftsgrouping,
-  ftsgenre,
-  ftscomment,
-  tokenize = "unicode61 remove_diacritics 0"
-
-);
-
 CREATE VIRTUAL TABLE IF NOT EXISTS subsonic_songs_fts USING fts5(
 
   ftstitle,
@@ -645,51 +258,6 @@ CREATE VIRTUAL TABLE IF NOT EXISTS subsonic_songs_fts USING fts5(
 
 );
 
-CREATE VIRTUAL TABLE IF NOT EXISTS qobuz_artists_songs_fts USING fts5(
-
-  ftstitle,
-  ftsalbum,
-  ftsartist,
-  ftsalbumartist,
-  ftscomposer,
-  ftsperformer,
-  ftsgrouping,
-  ftsgenre,
-  ftscomment,
-  tokenize = "unicode61 remove_diacritics 0"
-
-);
-
-CREATE VIRTUAL TABLE IF NOT EXISTS qobuz_albums_songs_fts USING fts5(
-
-  ftstitle,
-  ftsalbum,
-  ftsartist,
-  ftsalbumartist,
-  ftscomposer,
-  ftsperformer,
-  ftsgrouping,
-  ftsgenre,
-  ftscomment,
-  tokenize = "unicode61 remove_diacritics 0"
-
-);
-
-CREATE VIRTUAL TABLE IF NOT EXISTS qobuz_songs_fts USING fts5(
-
-  ftstitle,
-  ftsalbum,
-  ftsartist,
-  ftsalbumartist,
-  ftscomposer,
-  ftsperformer,
-  ftsgrouping,
-  ftsgenre,
-  ftscomment,
-  tokenize = "unicode61 remove_diacritics 0"
-
-);
-
 CREATE VIRTUAL TABLE IF NOT EXISTS playlist_items_fts_ USING fts5(
 
   ftstitle,

data/style/strawberry.css

@@ -52,19 +52,14 @@ macos QMenu {
   font-size: 13pt;
 }
 
-#scrollarea_play {
+#context-layout-container {
   background-color: %palette-base;
-  font: 11pt;
 }
 
-#scrollarea_stop {
+#context-widget-scrollarea {
   background-color: %palette-base;
-  font: 11pt;
 }
 
-#scrollAreaWidgetContents_stop {
-  background-color: %palette-base;
-}
-#scrollAreaWidgetContents_play {
+#context-layout-scrollarea {
   background-color: %palette-base;
 }

debian/changelog.in

@@ -1,4 +1,4 @@
-strawberry (${STRAWBERRY_VERSION_DISPLAY}) unstable; urgency=low
+strawberry (${STRAWBERRY_VERSION_DISPLAY}-${DEB_CODENAME}) ${DEB_CODENAME}; urgency=low
 
   * Version ${STRAWBERRY_VERSION_DISPLAY}
 

debian/compat

@@ -1 +1 @@
-9
+11

debian/control

@@ -2,7 +2,7 @@ Source: strawberry
 Section: sound
 Priority: optional
 Maintainer: Jonas Kvinge <jonas@jkvinge.net>
-Build-Depends: debhelper (>= 7),
+Build-Depends: debhelper (>= 11),
                make,
                cmake,
                gcc,
@@ -16,10 +16,8 @@ Build-Depends: debhelper (>= 7),
                libasound2-dev,
                libpulse-dev,
                libtag1-dev,
-               libqt5-dev,
                qtbase5-dev,
                qtbase5-dev-tools,
-               qtbase5-private-dev,
                qttools5-dev,
                libqt5x11extras5-dev,
                libgstreamer1.0-dev,
@@ -32,7 +30,7 @@ Build-Depends: debhelper (>= 7),
                libusbmuxd-dev,
                libchromaprint-dev,
                libfftw3-dev
-Standards-Version: 3.9.8
+Standards-Version: 4.2.1
 
 Package: strawberry
 Architecture: any
@@ -57,13 +55,13 @@ Description: Audio player and music collection organizer
   - Advanced audio output and device configuration for bit-perfect playback on Linux
   - Edit tags on music files
   - Fetch tags from MusicBrainz
-  - Album cover art from Lastfm, Musicbrainz, Discogs, Deezer and Tidal
-  - Song lyrics from AudD, ChartLyrics, lyrics.ovh and lololyrics.com
+  - Album cover art from Lastfm, Musicbrainz, Discogs and Deezer
+  - Song lyrics from AudD, lyrics.ovh and lololyrics.com
   - Support for multiple backends
   - Audio analyzer
   - Audio equalizer
   - Transfer music to iPod, iPhone, MTP or mass-storage USB player
-  - Streaming support for Tidal, Qobuz and Subsonic
   - Scrobbler with support for Last.fm, Libre.fm and ListenBrainz
+  - Streaming support for Subsonic
  .
  It is a fork of Clementine. The name is inspired by the band Strawbs.

debian/copyright

@@ -44,14 +44,10 @@ Files: src/core/main.h
        src/settings/backendsettingspage.h
        src/settings/scrobblersettingspage.cpp
        src/settings/scrobblersettingspage.h
-       src/settings/tidalsettingspage.cpp
-       src/settings/tidalsettingspage.h
        src/covermanager/lastfmcoverprovider.cpp
        src/covermanager/lastfmcoverprovider.h
        src/covermanager/musicbrainzcoverprovider.cpp
        src/covermanager/musicbrainzcoverprovider.h
-       src/covermanager/tidalcoverprovider.cpp
-       src/covermanager/tidalcoverprovider.h
        src/covermanager/deezercoverprovider.cpp
        src/covermanager/deezercoverprovider.h
        src/globalshortcuts/globalshortcutbackend-system.cpp
@@ -64,8 +60,6 @@ Files: src/core/main.h
        src/globalshortcuts/keymapper_win.h
        src/lyrics/*
        src/scrobbler/*
-       src/tidal/*
-       src/qobuz/*
        src/subsonic/*
        src/transcoder/transcoderoptionswavpack.cpp
        src/transcoder/transcoderoptionswavpack.h

debian/copyright-scan-patterns.yml

@@ -11,7 +11,9 @@ ignore:
   - /cmake/
   - /data/
   - /dist/
+  - /snap/
 
   suffixes:
   - jpg
   - png
+  - gif

debian/rules

@@ -1,61 +1,19 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
 
-MY_MAKEFLAGS=
-ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-  NUMJOBS=$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-  MY_MAKEFLAGS=-j$(NUMJOBS)
-endif
+%:
+	dh $@ --buildsystem=cmake -builddirectory=build
 
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	cmake .. \
-	  -DCMAKE_INSTALL_PREFIX=$(CURDIR)/debian/strawberry/usr
-	touch configure-stamp
+override_dh_auto_clean:
+	rm -f dist/macos/Info.plist
+	rm -f dist/macos/create-dmg.sh
+	rm -f dist/pacman/PKGBUILD
+	rm -f dist/rpm/strawberry.spec
+	rm -f dist/scripts/maketarball.sh
+	rm -f dist/windows/strawberry.nsi
+	rm -f src/translations/translations.pot
+	dh_auto_clean
 
-build: build-stamp
-build-stamp: configure-stamp
-	dh_testdir
-	make $(MY_MAKEFLAGS)
-	touch $@
+override_dh_installchangelogs:
+	dh_installchangelogs Changelog
 
-clean: 
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-
-	-make clean
-	-rm Makefile src/Makefile
-
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep  
-	dh_installdirs
-
-	make install
-
-binary-indep: install
-
-binary-arch: install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs 
-	dh_installmenu
-	dh_installdocs
-	dh_gconf
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+override_dh_auto_test:

dist/CMakeLists.txt

@@ -1,15 +1,14 @@
-execute_process(COMMAND env LC_ALL="en_US.utf8" date "+%a %b %d %Y" OUTPUT_VARIABLE RPM_DATE OUTPUT_STRIP_TRAILING_WHITESPACE)
-execute_process(COMMAND env LC_ALL=C date "+%a, %-d %b %Y %H:%M:%S %z" OUTPUT_VARIABLE DEB_DATE OUTPUT_STRIP_TRAILING_WHITESPACE)
-
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/scripts/maketarball.sh.in ${CMAKE_CURRENT_SOURCE_DIR}/scripts/maketarball.sh @ONLY)
-if (RPM_DISTRO)
-  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/rpm/strawberry.spec.in ${CMAKE_CURRENT_SOURCE_DIR}/rpm/strawberry.spec @ONLY)
-endif()
-configure_file(${CMAKE_SOURCE_DIR}/debian/changelog.in ${CMAKE_SOURCE_DIR}/debian/changelog)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/pacman/PKGBUILD.in ${CMAKE_CURRENT_SOURCE_DIR}/pacman/PKGBUILD @ONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/macos/Info.plist.in ${CMAKE_CURRENT_SOURCE_DIR}/macos/Info.plist)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/macos/create-dmg.sh.in ${CMAKE_CURRENT_SOURCE_DIR}/macos/create-dmg.sh)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/windows/strawberry.nsi.in ${CMAKE_CURRENT_SOURCE_DIR}/windows/strawberry.nsi @ONLY)
+
+if (APPLE)
+  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/macos/Info.plist.in ${CMAKE_CURRENT_SOURCE_DIR}/macos/Info.plist)
+  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/macos/create-dmg.sh.in ${CMAKE_CURRENT_SOURCE_DIR}/macos/create-dmg.sh)
+endif (APPLE)
+
+if (WIN32)
+  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/windows/strawberry.nsi.in ${CMAKE_CURRENT_SOURCE_DIR}/windows/strawberry.nsi @ONLY)
+endif (WIN32)
 
 if (UNIX AND NOT APPLE)
   install(FILES ../data/icons/48x48/strawberry.png DESTINATION share/icons/hicolor/48x48/apps/)
@@ -18,7 +17,7 @@ if (UNIX AND NOT APPLE)
   install(FILES unix/org.strawberrymusicplayer.strawberry.desktop DESTINATION share/applications)
   install(FILES unix/org.strawberrymusicplayer.strawberry.appdata.xml DESTINATION share/metainfo)
   install(FILES man/strawberry.1 man/strawberry-tagreader.1 DESTINATION share/man/man1)
-endif()
+endif (UNIX AND NOT APPLE)
 
 if (APPLE)
   install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../dist/macos/Info.plist" DESTINATION "${CMAKE_BINARY_DIR}/strawberry.app/Contents")

dist/macos/macdeploy.py

@@ -471,7 +471,7 @@ def FindGioModule(name):
 def main():
   logging.basicConfig(filename='macdeploy.log', level=logging.DEBUG, format='%(asctime)s %(levelname)-8s %(message)s')
 
-  #FixBinary(binary)
+  FixBinary(binary)
 
   try:
     FixPlugin('strawberry-tagreader', '.')

dist/man/strawberry.1

@@ -25,9 +25,9 @@ Features:
 .br
 - Fetch tags from MusicBrainz
 .br
-- Album cover art from Lastfm, Musicbrainz, Discogs, Deezer and Tidal
+- Album cover art from Lastfm, Musicbrainz, Discogs and Deezer
 .br
-- Song lyrics from AudD, ChartLyrics, lyrics.ovh and lololyrics.com 
+- Song lyrics from AudD, lyrics.ovh and lololyrics.com
 .br
 - Support for multiple backends
 .br
@@ -37,7 +37,7 @@ Features:
 .br
 - Transfer music to iPod, iPhone, MTP or mass-storage USB player
 .br
-- Streaming from Tidal, Qobuz and Subsonic
+- Streaming from Subsonic
 .TP
  It is a fork of Clementine. The name is inspired by the band Strawbs.
 .SH OPTIONS

dist/rpm/strawberry.spec.in

@@ -104,14 +104,14 @@ Features:
   - Advanced audio output and device configuration for bit-perfect playback on Linux
   - Edit tags on music files
   - Fetch tags from MusicBrainz
-  - Album cover art from Last.fm, Musicbrainz, Discogs, Deezer and Tidal
-  - Song lyrics from AudD, ChartLyrics, lyrics.ovh and lololyrics.com
+  - Album cover art from Last.fm, Musicbrainz, Discogs and Deezer
+  - Song lyrics from AudD, lyrics.ovh and lololyrics.com
   - Support for multiple backends
   - Audio analyzer
   - Audio equalizer
   - Transfer music to iPod, iPhone, MTP or mass-storage USB player
-  - Streaming support for Tidal, Qobuz and Subsonic
   - Scrobbler with support for Last.fm, Libre.fm and ListenBrainz
+  - Streaming support for Subsonic
 
 %prep
 %setup -qn %{name}-@STRAWBERRY_VERSION_PACKAGE@
@@ -194,5 +194,5 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.strawberrymusicpl
 %{_mandir}/man1/%{name}-tagreader.1.*
 
 %changelog
-* @RPM_DATE@ Jonas Kvinge <jonas@strawbs.net> - @STRAWBERRY_VERSION_RPM_V@
+* @RPM_DATE@ Jonas Kvinge <jonas@jkvinge.net> - @STRAWBERRY_VERSION_RPM_V@
 - Version @STRAWBERRY_VERSION_PACKAGE@

dist/scripts/maketarball.sh.in

@@ -16,17 +16,20 @@ echo "Creating $name-$version.tar.xz..."
 rm -f "$name-$version.tar.xz"
 tar -cJf $name-$version.tar.xz \
     --transform "s,^$rootnoslash,$name-$version," $exclude_vcs \
+    --exclude=".directory" \
     --exclude="*.tar" \
     --exclude="*.tar.*" \
     --exclude="*.bz" \
     --exclude="*.bz2" \
     --exclude="*.xz" \
-    --exclude=".directory" \
     --exclude="*.spec" \
     --exclude="*.nsi" \
+    --exclude="*.kdev4" \
+    --exclude=".vscode" \
     --exclude="$root/.github" \
-    --exclude="$root/Dockerfile" \
     --exclude="$root/.travis.yml" \
+    --exclude="$root/.circleci" \
+    --exclude="$root/Dockerfile" \
     --exclude="$root/CMakeLists.txt.user" \
     --exclude="$root/build" \
     --exclude="$root/zanata.xml" \

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

@@ -11,7 +11,7 @@
   <name>Strawberry Music Player</name>
   <summary>A music player and collection organizer</summary>
   <url type="homepage">https://www.strawberrymusicplayer.org/</url>
-  <url type="bugtracker">https://github.com/jonaski/strawberry/</url>
+  <url type="bugtracker">https://github.com/strawberrymusicplayer/strawberry/</url>
   ​<translation type="qt">strawberry</translation>
   <description>
     <p>
@@ -31,8 +31,8 @@
       <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>Streaming support for Tidal, Qobuz and Subsonic</li>
       <li>Scrobbler with support for Last.fm, Libre.fm and ListenBrainz</li>
+      <li>Streaming support for Subsonic</li>
     </ul>
   </description>
   <screenshots>

dist/unix/org.strawberrymusicplayer.strawberry.desktop

@@ -10,5 +10,5 @@ Icon=strawberry
 Terminal=false
 Categories=AudioVideo;Player;Qt;Audio;
 StartupNotify=false
-MimeType=x-content/audio-player;application/ogg;application/x-ogg;application/x-ogm-audio;audio/flac;audio/ogg;audio/vorbis;audio/aac;audio/mp4;audio/mpeg;audio/mpegurl;audio/vnd.rn-realaudio;audio/x-flac;audio/x-oggflac;audio/x-vorbis;audio/x-vorbis+ogg;audio/x-speex;audio/x-wav;audio/x-wavpack;audio/x-ape;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-ms-wma;audio/x-musepack;audio/x-pn-realaudio;audio/x-scpls;video/x-ms-asf;x-scheme-handler/tidal;
+MimeType=x-content/audio-player;application/ogg;application/x-ogg;application/x-ogm-audio;audio/flac;audio/ogg;audio/vorbis;audio/aac;audio/mp4;audio/mpeg;audio/mpegurl;audio/vnd.rn-realaudio;audio/x-flac;audio/x-oggflac;audio/x-vorbis;audio/x-vorbis+ogg;audio/x-speex;audio/x-wav;audio/x-wavpack;audio/x-ape;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-ms-wma;audio/x-musepack;audio/x-pn-realaudio;audio/x-scpls;video/x-ms-asf
 StartupWMClass=strawberry

dist/windows/strawberry.nsi.in

@@ -159,7 +159,7 @@ Section "Strawberry" Strawberry
   File "libcdio-19.dll"
   File "libchromaprint.dll"
   File "libfaad-2.dll"
-  File "libffi-6.dll"
+  File "libffi-7.dll"
   File "libfftw3-3.dll"
   File "libFLAC-8.dll"
   File "libfreetype-6.dll"
@@ -201,7 +201,7 @@ Section "Strawberry" Strawberry
   File "libspeex-1.dll"
   File "libsqlite3-0.dll"
   File "libstdc++-6.dll"
-  File "libtag.dll"
+  ;File "libtag.dll"
   File "libunistring-2.dll"
   File "libvorbis-0.dll"
   File "libvorbisenc-2.dll"
@@ -296,6 +296,11 @@ Section "Qt image format plugins" imageformats
   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"
 
@@ -317,7 +322,7 @@ Section "Gstreamer plugins" gstreamer-plugins
   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=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"
@@ -418,7 +423,7 @@ Section "Uninstall"
   Delete "$INSTDIR\libcdio-19.dll"
   Delete "$INSTDIR\libchromaprint.dll"
   Delete "$INSTDIR\libfaad-2.dll"
-  Delete "$INSTDIR\libffi-6.dll"
+  Delete "$INSTDIR\libffi-7.dll"
   Delete "$INSTDIR\libfftw3-3.dll"
   Delete "$INSTDIR\libFLAC-8.dll"
   Delete "$INSTDIR\libfreetype-6.dll"
@@ -502,6 +507,7 @@ 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\imageformats\qgif.dll"
   Delete "$INSTDIR\imageformats\qico.dll"

ext/gstmoodbar/gstfastspectrum.cpp

@@ -19,14 +19,16 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#include <QtGlobal>
+
 #include <cstring>
-#include <cmath>
+
+#include <glib.h>
 
 #include <gst/gst.h>
 #include <gst/audio/gstaudiofilter.h>
 
 #include <QMutex>
-#include <QMutexLocker>
 
 #include "gstfastspectrum.h"
 

ext/gstmoodbar/gstmoodbarplugin.cpp

@@ -15,6 +15,7 @@
    along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <glib.h>
 #include <gst/gst.h>
 
 #include "gstfastspectrum.h"

ext/libstrawberry-common/CMakeLists.txt

@@ -1,8 +1,3 @@
-include_directories(${PROTOBUF_INCLUDE_DIRS})
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${CMAKE_SOURCE_DIR}/src)
-
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11 -U__STRICT_ANSI__ -Wall -Wextra -Wpedantic -Woverloaded-virtual -fpermissive")
@@ -11,6 +6,19 @@ if(APPLE)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-parameter")
 endif()
 
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+
+include_directories(${CMAKE_SOURCE_DIR})
+include_directories(${CMAKE_SOURCE_DIR}/src)
+include_directories(${CMAKE_BINARY_DIR}/src)
+
+if (Backtrace_FOUND)
+  include_directories(${Backtrace_INCLUDE_DIRS})
+endif(Backtrace_FOUND)
+
+include_directories(${PROTOBUF_INCLUDE_DIRS})
+
 set(SOURCES
   core/closure.cpp
   core/logging.cpp
@@ -38,8 +46,11 @@ add_library(libstrawberry-common STATIC
   ${MOC}
 )
 
+if (Backtrace_FOUND)
+  target_link_libraries(libstrawberry-common ${Backtrace_LIBRARIES})
+endif (Backtrace_FOUND)
+
 target_link_libraries(libstrawberry-common
-  #${PROTOBUF_LIBRARY}
   ${TAGLIB_LIBRARIES}
   ${CMAKE_THREAD_LIBS_INIT}
 )

ext/libstrawberry-common/core/closure.cpp

@@ -22,7 +22,6 @@
 
 #include "closure.h"
 
-#include "core/logging.h"
 #include "core/timeconstants.h"
 
 namespace _detail {

ext/libstrawberry-common/core/logging.cpp

@@ -15,6 +15,21 @@
 */
 
 #include <QtGlobal>
+
+#include "config.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string>
+#include <iostream>
+#include <memory>
+#include <cxxabi.h>
+#include <glib.h>
+
+#ifdef HAVE_BACKTRACE
+#  include <execinfo.h>
+#endif
+
 #include <QByteArray>
 #include <QList>
 #include <QMap>
@@ -23,18 +38,10 @@
 #include <QRegExp>
 #include <QDateTime>
 #include <QIODevice>
+#include <QBuffer>
 #include <QtMessageHandler>
 #include <QMessageLogContext>
-
-#include <cxxabi.h>
-#include <glib.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string>
-#include <iostream>
-#ifdef Q_OS_UNIX
-  #include <execinfo.h>
-#endif
+#include <QDebug>
 
 #include "logging.h"
 
@@ -51,28 +58,69 @@ static const char *kMessageHandlerMagic = "__logging_message__";
 static const int kMessageHandlerMagicLength = strlen(kMessageHandlerMagic);
 static QtMessageHandler sOriginalMessageHandler = nullptr;
 
-void GLog(const char *domain, int level, const char *message, void *user_data) {
+template <class T>
+static T CreateLogger(Level level, const QString& class_name, int line, const char* category);
 
-  Q_UNUSED(domain);
-  Q_UNUSED(user_data);
+void GLog(const char *domain, int level, const char *message, void*) {
 
   switch (level) {
     case G_LOG_FLAG_RECURSION:
     case G_LOG_FLAG_FATAL:
     case G_LOG_LEVEL_ERROR:
-    case G_LOG_LEVEL_CRITICAL: qLog(Error)   << message; break;
-    case G_LOG_LEVEL_WARNING:  qLog(Warning) << message; break;
+    case G_LOG_LEVEL_CRITICAL:
+      qLogCat(Error, domain) << message;
+      break;
+    case G_LOG_LEVEL_WARNING:
+      qLogCat(Warning, domain) << message;
+      break;
     case G_LOG_LEVEL_MESSAGE:
-    case G_LOG_LEVEL_INFO:     qLog(Info)    << message; break;
+    case G_LOG_LEVEL_INFO:
+      qLogCat(Info, domain) << message;
+      break;
     case G_LOG_LEVEL_DEBUG:
-    default:                   qLog(Debug)   << message; break;
+    default:
+      qLogCat(Debug, domain) << message;
+      break;
   }
 
 }
 
-static void MessageHandler(QtMsgType type, const QMessageLogContext &context, const QString &message) {
+template <class T>
+class DebugBase : public QDebug {
+ public:
+  DebugBase() : QDebug(sNullDevice) {}
+  DebugBase(QtMsgType t) : QDebug(t) {}
+  T& space() { return static_cast<T&>(QDebug::space()); }
+  T& noSpace() { return static_cast<T&>(QDebug::nospace()); }
+};
 
-  Q_UNUSED(context);
+// Debug message will be stored in a buffer.
+class BufferedDebug : public DebugBase<BufferedDebug> {
+ public:
+  BufferedDebug() : DebugBase() {}
+  BufferedDebug(QtMsgType) : DebugBase(), buf_(new QBuffer, later_deleter) {
+    buf_->open(QIODevice::WriteOnly);
+
+    // QDebug doesn't have a method to set a new io device, but swap() allows the devices to be swapped between two instances.
+    QDebug other(buf_.get());
+    swap(other);
+  }
+
+  // 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(); }
+
+  std::shared_ptr<QBuffer> buf_;
+};
+
+// Debug message will be logged immediately.
+class LoggedDebug : public DebugBase<LoggedDebug> {
+ public:
+  LoggedDebug() : DebugBase() {}
+  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) {
     fprintf(stderr, "%s\n", message.toLocal8Bit().data() + kMessageHandlerMagicLength);
@@ -82,14 +130,25 @@ static void MessageHandler(QtMsgType type, const QMessageLogContext &context, co
   Level level = Level_Debug;
   switch (type) {
     case QtFatalMsg:
-    case QtCriticalMsg: level = Level_Error;   break;
-    case QtWarningMsg:  level = Level_Warning; break;
+    case QtCriticalMsg:
+      level = Level_Error;
+      break;
+    case QtWarningMsg:
+      level = Level_Warning;
+      break;
     case QtDebugMsg:
-    default:            level = Level_Debug;   break;
+    default:
+      level = Level_Debug;
+      break;
   }
 
-  for (const QString &line : message.split('\n')) {
-    CreateLogger(level, "unknown", -1) << line.toLocal8Bit().constData();
+  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());
+    }
   }
 
   if (type == QtFatalMsg) {
@@ -146,7 +205,7 @@ void SetLevels(const QString &levels) {
 
 }
 
-QString ParsePrettyFunction(const char *pretty_function) {
+static QString ParsePrettyFunction(const char *pretty_function) {
 
   // Get the class name out of the function name.
   QString class_name = pretty_function;
@@ -169,7 +228,8 @@ QString ParsePrettyFunction(const char *pretty_function) {
   return class_name;
 }
 
-QDebug CreateLogger(Level level, const QString &class_name, int line) {
+template <class T>
+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;
@@ -181,32 +241,33 @@ QDebug CreateLogger(Level level, const QString &class_name, int line) {
     case Level_Fatal:   level_name = " FATAL "; break;
   }
 
+  QString filter_category = (category != nullptr) ? category : class_name;
   // Check the settings to see if we're meant to show or hide this message.
   Level threshold_level = sDefaultLevel;
-  if (sClassLevels && sClassLevels->contains(class_name)) {
-    threshold_level = sClassLevels->value(class_name);
+  if (sClassLevels && sClassLevels->contains(filter_category)) {
+    threshold_level = sClassLevels->value(filter_category);
   }
 
   if (level > threshold_level) {
-    return QDebug(sNullDevice);
+    return T();
   }
 
   QString function_line = class_name;
   if (line != -1) {
     function_line += ":" + QString::number(line);
   }
+  if (category) {
+    function_line += "(" + QString(category) + ")";
+  }
 
   QtMsgType type = QtDebugMsg;
   if (level == Level_Fatal) {
     type = QtFatalMsg;
   }
 
-  QDebug ret(type);
-  ret.nospace() << kMessageHandlerMagic
-                << QDateTime::currentDateTime()
-                       .toString("hh:mm:ss.zzz")
-                       .toLatin1()
-                       .constData() << level_name
+  T ret(type);
+  ret.nospace() << QDateTime::currentDateTime().toString("hh:mm:ss.zzz").toLatin1().constData()
+                << level_name
                 << function_line.leftJustified(32).toLatin1().constData();
 
   return ret.space();
@@ -255,7 +316,7 @@ QString DemangleSymbol(const QString &symbol) {
 }
 
 void DumpStackTrace() {
-#ifdef Q_OS_UNIX
+#ifdef HAVE_BACKTRACE
   void* callstack[128];
   int callstack_size = backtrace(reinterpret_cast<void**>(&callstack), sizeof(callstack));
   char** symbols = backtrace_symbols(reinterpret_cast<void**>(&callstack), callstack_size);
@@ -269,21 +330,26 @@ void DumpStackTrace() {
 #endif
 }
 
-QDebug CreateLoggerFatal(int line, const char *class_name) { return qCreateLogger(line, class_name, Fatal); }
-QDebug CreateLoggerError(int line, const char *class_name) { return qCreateLogger(line, class_name, Error); }
+// These are the functions that create loggers for the rest of Clementine.
+// 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.
+#define qCreateLogger(line, pretty_function, category, level) logging::CreateLogger<LoggedDebug>(logging::Level_##level, logging::ParsePrettyFunction(pretty_function), line, category)
+
+QDebug CreateLoggerFatal(int line, const char *pretty_function, const char* category) { return qCreateLogger(line, pretty_function, category, Fatal); }
+QDebug CreateLoggerError(int line, const char *pretty_function, const char* category) { return qCreateLogger(line, pretty_function, category, Error); }
 
 #ifdef QT_NO_WARNING_OUTPUT
-QNoDebug CreateLoggerWarning(int, const char*) { return QNoDebug(); }
+  QNoDebug CreateLoggerWarning(int, const char*, const char*) { return QNoDebug(); }
 #else
-QDebug CreateLoggerWarning(int line, const char *class_name) { return qCreateLogger(line, class_name, 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 CreateLoggerInfo(int, const char*) { return QNoDebug(); }
-QNoDebug CreateLoggerDebug(int, const char*) { return QNoDebug(); }
+  QNoDebug CreateLoggerInfo(int, const char*, const char*) { return QNoDebug(); }
+  QNoDebug CreateLoggerDebug(int, const char*, const char*) { return QNoDebug(); }
 #else
-QDebug CreateLoggerInfo(int line, const char *class_name) { return qCreateLogger(line, class_name, Info); }
-QDebug CreateLoggerDebug(int line, const char *class_name) { return qCreateLogger(line, class_name, Debug); }
+  QDebug CreateLoggerInfo(int line, const char *pretty_function, const char* category) { return qCreateLogger(line, pretty_function, category, Info); }
+  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

ext/libstrawberry-common/core/logging.h

@@ -26,14 +26,20 @@
 
 #ifdef QT_NO_DEBUG_STREAM
 #  define qLog(level) while (false) QNoDebug()
+#  define qLogCat(level, category) while (false) QNoDebug()
 #else
-#define qLog(level) logging::CreateLogger##level(__LINE__, __PRETTY_FUNCTION__)
+#  define qLog(level) logging::CreateLogger##level(__LINE__, __PRETTY_FUNCTION__, nullptr)
 
-#define qCreateLogger(line, class_name, level) logging::CreateLogger(logging::Level_##level, logging::ParsePrettyFunction(class_name), line)
-#endif // QT_NO_DEBUG_STREAM
+// 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)
+
+#endif  // QT_NO_DEBUG_STREAM
 
 namespace logging {
-  class NullDevice : public QIODevice {
+
+class NullDevice : public QIODevice {
  protected:
   qint64 readData(char*, qint64) { return -1; }
   qint64 writeData(const char*, qint64 len) { return len; }
@@ -52,33 +58,30 @@ enum Level {
 
   void DumpStackTrace();
 
-  QString ParsePrettyFunction(const char *pretty_function);
-  QDebug CreateLogger(Level level, const QString &class_name, int line);
-
-QDebug CreateLoggerFatal(int line, const char *class_name);
-QDebug CreateLoggerError(int line, const char *class_name);
+QDebug CreateLoggerFatal(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*);
+  QNoDebug CreateLoggerWarning(int, const char*, const char*);
 #else
-QDebug CreateLoggerWarning(int line, const char *class_name);
+  QDebug CreateLoggerWarning(int line, const char *pretty_function, const char* category);
 #endif // QT_NO_WARNING_OUTPUT
 
 #ifdef QT_NO_DEBUG_OUTPUT
-QNoDebug CreateLoggerInfo(int, const char*);
-QNoDebug CreateLoggerDebug(int, const char*);
+  QNoDebug CreateLoggerInfo(int, const char*, const char*);
+  QNoDebug CreateLoggerDebug(int, const char*, const char*);
 #else
-QDebug CreateLoggerInfo(int line, const char *class_name);
-QDebug CreateLoggerDebug(int line, const char *class_name);
-#endif // QT_NO_DEBUG_OUTPUT
+  QDebug CreateLoggerInfo(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;
-}
+
+}  // namespace logging
 
 QDebug operator<<(QDebug debug, std::chrono::seconds secs);
 
 #endif  // LOGGING_H
-

ext/libstrawberry-common/core/messagehandler.h

@@ -23,7 +23,6 @@
 #include <QtGlobal>
 #include <QObject>
 #include <QThread>
-#include <QIODevice>
 #include <QBuffer>
 #include <QByteArray>
 #include <QMap>
@@ -33,6 +32,8 @@
 
 #include "core/messagereply.h"
 
+class QIODevice;
+
 #define QStringFromStdString(x) QString::fromUtf8(x.data(), x.size())
 #define DataCommaSizeFromQString(x) x.toUtf8().constData(), x.toUtf8().length()
 

ext/libstrawberry-common/core/workerpool.h

@@ -25,12 +25,11 @@
 #include <QCoreApplication>
 #include <QThread>
 #include <QMutex>
+#include <QLocalServer>
 #include <QProcess>
-#include <QQueue>
 #include <QFile>
 #include <QList>
-#include <QLocalServer>
-#include <QLocalSocket>
+#include <QQueue>
 #include <QString>
 #include <QStringList>
 #include <QAtomicInt>
@@ -39,7 +38,6 @@
 
 class QLocalSocket;
 
-
 // Base class containing signals and slots - required because moc doesn't do templated objects.
 class _WorkerPoolBase : public QObject {
   Q_OBJECT

ext/libstrawberry-tagreader/CMakeLists.txt

@@ -1,10 +1,3 @@
-include_directories(${PROTOBUF_INCLUDE_DIRS})
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-include_directories(${CMAKE_SOURCE_DIR}/ext/libstrawberry-common)
-include_directories(${CMAKE_SOURCE_DIR}/src)
-include_directories(${CMAKE_BINARY_DIR}/src)
-
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11 -U__STRICT_ANSI__ -Wall -Wextra -Wpedantic -Woverloaded-virtual -fpermissive")
@@ -13,6 +6,14 @@ if(APPLE)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-parameter")
 endif()
 
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+include_directories(${CMAKE_SOURCE_DIR}/ext/libstrawberry-common)
+include_directories(${CMAKE_SOURCE_DIR}/src)
+include_directories(${CMAKE_BINARY_DIR}/src)
+
+include_directories(${PROTOBUF_INCLUDE_DIRS})
+
 set(MESSAGES
   tagreadermessages.proto
 )

ext/libstrawberry-tagreader/fmpsparser.cpp

@@ -22,6 +22,7 @@
 #include <QList>
 #include <QVariant>
 #include <QString>
+#include <QChar>
 
 #include "fmpsparser.h"
 

ext/libstrawberry-tagreader/fmpsparser.h

@@ -22,10 +22,11 @@
 
 #include <QList>
 #include <QMetaType>
-#include <QVariant>
 #include <QString>
 #include <QRegExp>
 
+class QVariant;
+
 class FMPSParser {
 public:
   FMPSParser();

ext/libstrawberry-tagreader/tagreader.cpp

@@ -23,7 +23,6 @@
 #include <memory>
 #include <list>
 #include <map>
-#include <utility>
 #include <sys/stat.h>
 
 #include <taglib/taglib.h>
@@ -42,6 +41,8 @@
 #include <taglib/commentsframe.h>
 #include <taglib/tag.h>
 #include <taglib/apetag.h>
+#include <taglib/apeitem.h>
+#include <taglib/apeproperties.h>
 #include <taglib/id3v2tag.h>
 #include <taglib/id3v2frame.h>
 #include <taglib/flacfile.h>
@@ -52,6 +53,7 @@
 #include <taglib/speexfile.h>
 #include <taglib/wavfile.h>
 #include <taglib/wavpackfile.h>
+#include <taglib/wavpackproperties.h>
 #include <taglib/aifffile.h>
 #include <taglib/asffile.h>
 #include <taglib/asftag.h>
@@ -91,10 +93,6 @@
 #include "fmpsparser.h"
 #include "core/timeconstants.h"
 
-#ifndef USE_SYSTEM_TAGLIB
-using namespace Strawberry_TagLib;
-#endif
-
 class FileRefFactory {
  public:
   virtual ~FileRefFactory() {}

ext/libstrawberry-tagreader/tagreader.h

@@ -25,7 +25,6 @@
 
 #include <QByteArray>
 #include <QString>
-#include <QTextCodec>
 
 #include <taglib/xiphcomment.h>
 #include <taglib/apetag.h>
@@ -33,6 +32,8 @@
 
 #include "tagreadermessages.pb.h"
 
+class QTextCodec;
+
 #ifndef USE_SYSTEM_TAGLIB
 namespace Strawberry_TagLib {
 #endif

ext/strawberry-tagreader/tagreaderworker.h

@@ -20,15 +20,14 @@
 
 #include "config.h"
 
-#include <stddef.h>
-
 #include <QObject>
-#include <QIODevice>
 
 #include "core/messagehandler.h"
 #include "tagreader.h"
 #include "tagreadermessages.pb.h"
 
+class QIODevice;
+
 class TagReaderWorker : public AbstractMessageHandler<pb::tagreader::Message> {
 public:
   TagReaderWorker(QIODevice *socket, QObject *parent = nullptr);

snap/snapcraft.yaml

@@ -38,11 +38,12 @@ parts:
       - adwaita-icon-theme
       - oxygen-icon-theme
       - breeze-icon-theme
+      - qtwayland5
       - try: [appmenu-qt5]
 
   alsa-lib:
     plugin: autotools
-    source: https://www.alsa-project.org/files/pub/lib/alsa-lib-1.1.5.tar.bz2
+    source: https://www.alsa-project.org/files/pub/lib/alsa-lib-1.2.1.2.tar.bz2
     configflags:
       - --prefix=/usr
       - --sysconfdir=/etc
@@ -66,7 +67,7 @@ parts:
   strawberry:
     plugin: cmake
     source-type: git
-    source: https://github.com/jonaski/strawberry
+    source: https://github.com/strawberrymusicplayer/strawberry
     after:
       - alsa-lib
       - desktop-qt5
@@ -170,6 +171,7 @@ apps:
     environment:
       ALSA_CONFIG_PATH: /snap/$SNAPCRAFT_PROJECT_NAME/current/usr/share/alsa/alsa.conf
       LD_LIBRARY_PATH: $LD_LIBRARY_PATH:$SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/pulseaudio
+      DISABLE_WAYLAND: 1
     plugs:
       - home
       - udisks2

src/CMakeLists.txt

@@ -154,6 +154,7 @@ set(SOURCES
   equalizer/equalizerslider.cpp
 
   context/contextview.cpp
+  context/contextalbum.cpp
   context/contextalbumsmodel.cpp
   context/contextalbumsview.cpp
 
@@ -235,7 +236,6 @@ set(SOURCES
   lyrics/auddlyricsprovider.cpp
   lyrics/ovhlyricsprovider.cpp
   lyrics/lololyricsprovider.cpp
-  lyrics/chartlyricsprovider.cpp
 
   settings/settingsdialog.cpp
   settings/settingspage.cpp
@@ -348,6 +348,7 @@ set(HEADERS
   equalizer/equalizerslider.h
 
   context/contextview.h
+  context/contextalbum.h
   context/contextalbumsmodel.h
   context/contextalbumsview.h
 
@@ -421,7 +422,6 @@ set(HEADERS
   lyrics/auddlyricsprovider.h
   lyrics/ovhlyricsprovider.h
   lyrics/lololyricsprovider.h
-  lyrics/chartlyricsprovider.h
 
   settings/settingsdialog.h
   settings/settingspage.h
@@ -502,8 +502,6 @@ set(UI
 
   core/mainwindow.ui
 
-  context/contextviewcontainer.ui
-
   collection/groupbydialog.ui
   collection/collectionfilterwidget.ui
   collection/collectionviewcontainer.ui
@@ -908,50 +906,6 @@ optional_source(WIN32
     core/windows7thumbbar.h
 )
 
-optional_source(HAVE_TIDAL
-  SOURCES
-    tidal/tidalservice.cpp
-    tidal/tidalurlhandler.cpp
-    tidal/tidalbaserequest.cpp
-    tidal/tidalrequest.cpp
-    tidal/tidalstreamurlrequest.cpp
-    tidal/tidalfavoriterequest.cpp
-    settings/tidalsettingspage.cpp
-    covermanager/tidalcoverprovider.cpp
-  HEADERS
-    tidal/tidalservice.h
-    tidal/tidalurlhandler.h
-    tidal/tidalbaserequest.h
-    tidal/tidalrequest.h
-    tidal/tidalstreamurlrequest.h
-    tidal/tidalfavoriterequest.h
-    settings/tidalsettingspage.h
-    covermanager/tidalcoverprovider.h
-  UI
-    settings/tidalsettingspage.ui
-)
-
-optional_source(HAVE_QOBUZ
-  SOURCES
-    qobuz/qobuzservice.cpp
-    qobuz/qobuzurlhandler.cpp
-    qobuz/qobuzbaserequest.cpp
-    qobuz/qobuzrequest.cpp
-    qobuz/qobuzstreamurlrequest.cpp
-    qobuz/qobuzfavoriterequest.cpp
-    settings/qobuzsettingspage.cpp
-  HEADERS
-    qobuz/qobuzservice.h
-    qobuz/qobuzurlhandler.h
-    qobuz/qobuzbaserequest.h
-    qobuz/qobuzrequest.h
-    qobuz/qobuzstreamurlrequest.h
-    qobuz/qobuzfavoriterequest.h
-    settings/qobuzsettingspage.h
-  UI
-    settings/qobuzsettingspage.ui
-)
-
 optional_source(HAVE_SUBSONIC
   SOURCES
     subsonic/subsonicservice.cpp

src/analyzer/analyzerbase.h

@@ -37,7 +37,6 @@
 #include <QBasicTimer>
 #include <QString>
 #include <QPainter>
-#include <QtEvents>
 
 #include "analyzer/fht.h"
 #include "engine/engine_fwd.h"

src/analyzer/analyzercontainer.cpp

@@ -41,6 +41,7 @@
 #include "rainbowanalyzer.h"
 
 #include "core/logging.h"
+#include "engine/enginebase.h"
 #include "engine/enginetype.h"
 
 const char *AnalyzerContainer::kSettingsGroup = "Analyzer";

src/analyzer/analyzercontainer.h

@@ -22,18 +22,17 @@
 
 #include "config.h"
 
-
 #include <QWidget>
 #include <QList>
 #include <QString>
 #include <QPoint>
 #include <QMenu>
 #include <QAction>
-#include <QActionGroup>
 
 #include "engine/engine_fwd.h"
 
 class QTimer;
+class QActionGroup;
 class QMouseEvent;
 class QWheelEvent;
 

src/analyzer/blockanalyzer.cpp

@@ -31,7 +31,6 @@
 #include <QPainter>
 #include <QPalette>
 #include <QColor>
-#include <QtEvents>
 
 #include "analyzerbase.h"
 #include "fht.h"

src/analyzer/blockanalyzer.h

@@ -24,20 +24,17 @@
 #ifndef BLOCKANALYZER_H
 #define BLOCKANALYZER_H
 
-#include <vector>
-
 #include <QtGlobal>
 #include <QObject>
-#include <QWidget>
 #include <QVector>
 #include <QString>
 #include <QPixmap>
 #include <QPainter>
 #include <QPalette>
-#include <QtEvents>
 
 #include "analyzerbase.h"
 
+class QWidget;
 class QResizeEvent;
 
 class BlockAnalyzer : public Analyzer::Base {

src/analyzer/boomanalyzer.cpp

@@ -26,12 +26,17 @@
 
 #include <cmath>
 
-#include <QObject>
 #include <QWidget>
 #include <QPixmap>
 #include <QPainter>
+#include <QPalette>
 #include <QColor>
 
+#include "engine/engine_fwd.h"
+#include "engine/enginebase.h"
+#include "fht.h"
+#include "analyzerbase.h"
+
 using Analyzer::Scope;
 
 const uint BoomAnalyzer::kColumnWidth = 4;

src/analyzer/boomanalyzer.h

@@ -27,12 +27,13 @@
 
 #include "analyzerbase.h"
 
+#include <QtGlobal>
 #include <QObject>
-#include <QWidget>
 #include <QPixmap>
 #include <QPainter>
 #include <QColor>
 
+class QWidget;
 class QResizeEvent;
 
 class BoomAnalyzer : public Analyzer::Base {

src/analyzer/rainbowanalyzer.cpp

@@ -27,17 +27,19 @@
 
 #include <cmath>
 
-#include <QObject>
+#include <QtGlobal>
 #include <QWidget>
 #include <QPixmap>
 #include <QPainter>
 #include <QColor>
 #include <QBrush>
 #include <QPen>
+#include <QPoint>
+#include <QSize>
 #include <QTimerEvent>
 
-#include "core/arraysize.h"
-#include "core/logging.h"
+#include "fht.h"
+#include "analyzerbase.h"
 
 using Analyzer::Scope;
 

src/analyzer/rainbowanalyzer.h

@@ -30,9 +30,15 @@
 
 #include <QObject>
 #include <QWidget>
-#include <QDateTime>
+#include <QPixmap>
 #include <QPainter>
 #include <QPen>
+#include <QBrush>
+#include <QRect>
+
+class QWidget;
+class QTimerEvent;
+class QResizeEvent;
 
 namespace Rainbow {
 class RainbowAnalyzer : public Analyzer::Base {

src/collection/collection.cpp

@@ -21,11 +21,11 @@
 
 #include "config.h"
 
-#include <unistd.h>
-
+#include <QtGlobal>
 #include <QObject>
 #include <QThread>
 #include <QList>
+#include <QtDebug>
 
 #include "core/application.h"
 #include "core/database.h"
@@ -34,6 +34,7 @@
 #include "core/thread.h"
 #include "core/utilities.h"
 #include "core/song.h"
+#include "core/logging.h"
 #include "collection.h"
 #include "collectionwatcher.h"
 #include "collectionbackend.h"
@@ -158,6 +159,7 @@ void SCollection::ResumeWatcher() { watcher_->SetRescanPausedAsync(false); }
 void SCollection::ReloadSettings() {
 
   watcher_->ReloadSettingsAsync();
+  model_->ReloadSettings();
 
 }
 

src/collection/collection.h

@@ -25,12 +25,14 @@
 #include "config.h"
 
 #include <QObject>
+#include <QList>
 #include <QHash>
 #include <QString>
-#include <QUrl>
 
 #include "core/song.h"
 
+class QThread;
+
 class Application;
 class Thread;
 class CollectionBackend;
@@ -41,7 +43,7 @@ class SCollection : public QObject {
   Q_OBJECT
 
  public:
-  SCollection(Application *app, QObject *parent);
+  explicit SCollection(Application *app, QObject *parent);
   ~SCollection();
 
   static const char *kSongsTable;

src/collection/collectionbackend.cpp

@@ -30,23 +30,20 @@
 #include <QMutex>
 #include <QSet>
 #include <QMap>
-#include <QByteArray>
-#include <QFileInfo>
-#include <QDateTime>
+#include <QVector>
 #include <QVariant>
+#include <QByteArray>
 #include <QString>
 #include <QStringList>
-#include <QRegExp>
 #include <QUrl>
+#include <QFileInfo>
+#include <QDateTime>
+#include <QRegExp>
 #include <QSqlDatabase>
 #include <QSqlQuery>
-#include <QtDebug>
 
-#include "core/application.h"
 #include "core/database.h"
-#include "core/logging.h"
 #include "core/scopedtransaction.h"
-#include "core/utilities.h"
 
 #include "directory.h"
 #include "collectionbackend.h"
@@ -899,6 +896,10 @@ SongList CollectionBackend::GetCompilationSongs(const QString &album, const Quer
 
 }
 
+Song::Source CollectionBackend::Source() const {
+  return source_;
+}
+
 void CollectionBackend::UpdateCompilations() {
 
   QMutexLocker l(db_->Mutex());

src/collection/collectionbackend.h

@@ -24,13 +24,10 @@
 
 #include "config.h"
 
-
 #include <QtGlobal>
 #include <QObject>
 #include <QFileInfo>
 #include <QList>
-#include <QVector>
-#include <QSet>
 #include <QString>
 #include <QStringList>
 #include <QUrl>
@@ -48,7 +45,7 @@ class CollectionBackendInterface : public QObject {
   Q_OBJECT
 
  public:
-  CollectionBackendInterface(QObject *parent = nullptr) : QObject(parent) {}
+  explicit CollectionBackendInterface(QObject *parent = nullptr) : QObject(parent) {}
   virtual ~CollectionBackendInterface() {}
 
   struct Album {
@@ -188,6 +185,8 @@ class CollectionBackend : public CollectionBackendInterface {
   SongList GetSongsBySongId(const QList<int> &song_ids);
   SongList GetSongsBySongId(const QStringList &song_ids);
 
+  Song::Source Source() const;
+
  public slots:
   void Exit();
   void LoadDirectories();

src/collection/collectiondirectorymodel.cpp

@@ -25,9 +25,7 @@
 #include <QAbstractItemModel>
 #include <QVariant>
 #include <QString>
-#include <QUrl>
 
-#include "core/application.h"
 #include "core/filesystemmusicstorage.h"
 #include "core/iconloader.h"
 #include "core/musicstorage.h"

src/collection/collectiondirectorymodel.h

@@ -42,7 +42,7 @@ class CollectionDirectoryModel : public QStandardItemModel {
   Q_OBJECT
 
  public:
-  CollectionDirectoryModel(CollectionBackend* backend, QObject *parent = nullptr);
+  explicit CollectionDirectoryModel(CollectionBackend* backend, QObject *parent = nullptr);
   ~CollectionDirectoryModel();
 
   // To be called by GUIs

src/collection/collectionfilterwidget.cpp

@@ -49,6 +49,7 @@
 #include "collectionfilterwidget.h"
 #include "groupbydialog.h"
 #include "ui_collectionfilterwidget.h"
+#include "widgets/qsearchfield.h"
 
 CollectionFilterWidget::CollectionFilterWidget(QWidget *parent)
     : QWidget(parent),

src/collection/collectionfilterwidget.h

@@ -29,7 +29,6 @@
 #include <QObject>
 #include <QMap>
 #include <QString>
-#include <QtEvents>
 
 #include "collectionquery.h"
 #include "collectionmodel.h"
@@ -44,13 +43,12 @@ class GroupByDialog;
 class SavedGroupingManager;
 class SettingsDialog;
 class Ui_CollectionFilterWidget;
-struct QueryOptions;
 
 class CollectionFilterWidget : public QWidget {
   Q_OBJECT
 
  public:
-  CollectionFilterWidget(QWidget *parent = nullptr);
+  explicit CollectionFilterWidget(QWidget *parent = nullptr);
   ~CollectionFilterWidget();
 
   static const int kFilterDelay = 500;  // msec

src/collection/collectionitem.h

@@ -37,12 +37,12 @@ class CollectionItem : public SimpleTreeItem<CollectionItem> {
     Type_LoadingIndicator,
   };
 
-  CollectionItem(SimpleTreeModel<CollectionItem> *model)
+  explicit CollectionItem(SimpleTreeModel<CollectionItem> *model)
       : SimpleTreeItem<CollectionItem>(Type_Root, model),
         container_level(-1),
         compilation_artist_node_(nullptr) {}
 
-  CollectionItem(Type type, CollectionItem *parent = nullptr)
+  explicit CollectionItem(Type type, CollectionItem *parent = nullptr)
       : SimpleTreeItem<CollectionItem>(type, parent),
         container_level(-1),
         compilation_artist_node_(nullptr) {}

src/collection/collectionitemdelegate.cpp

@@ -21,11 +21,14 @@
 #include "config.h"
 
 #include <QtGlobal>
+#include <QAbstractItemModel>
 #include <QAbstractItemView>
 #include <QStyleOptionViewItem>
 #include <QVariant>
 #include <QString>
 #include <QLocale>
+#include <QPixmap>
+#include <QIcon>
 #include <QPainter>
 #include <QPalette>
 #include <QPen>
@@ -34,8 +37,7 @@
 #include <QBrush>
 #include <QColor>
 #include <QFont>
-#include <QPixmap>
-#include <QIcon>
+#include <QPoint>
 #include <QLinearGradient>
 #include <QToolTip>
 #include <QWhatsThis>

src/collection/collectionitemdelegate.h

@@ -23,19 +23,20 @@
 
 #include "config.h"
 
-
+#include <QObject>
 #include <QStyledItemDelegate>
-#include <QAbstractItemView>
-#include <QPainter>
+#include <QStyleOption>
 #include <QStyleOptionViewItem>
 
+class QAbstractItemView;
+class QPainter;
 class QHelpEvent;
 
 class CollectionItemDelegate : public QStyledItemDelegate {
   Q_OBJECT
 
  public:
-  CollectionItemDelegate(QObject *parent);
+  explicit CollectionItemDelegate(QObject *parent);
   void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const;
 
  public slots:

src/collection/collectionmodel.cpp

@@ -21,31 +21,34 @@
 
 #include "config.h"
 
+#include <memory>
 #include <functional>
 #include <algorithm>
 
 #include <QObject>
 #include <QtGlobal>
 #include <QtConcurrentRun>
-#include <QtAlgorithms>
+#include <QThread>
 #include <QMutex>
 #include <QFuture>
 #include <QDataStream>
 #include <QMimeData>
 #include <QIODevice>
-#include <QByteArray>
-#include <QVariant>
 #include <QList>
 #include <QSet>
 #include <QMap>
-#include <QChar>
-#include <QRegExp>
+#include <QVariant>
+#include <QByteArray>
 #include <QString>
 #include <QStringList>
 #include <QUrl>
 #include <QImage>
+#include <QChar>
+#include <QRegExp>
 #include <QPixmapCache>
+#include <QNetworkDiskCache>
 #include <QSettings>
+#include <QStandardPaths>
 #include <QtDebug>
 
 #include "core/application.h"
@@ -63,6 +66,7 @@
 #include "playlist/playlistmanager.h"
 #include "playlist/songmimedata.h"
 #include "covermanager/albumcoverloader.h"
+#include "settings/collectionsettingspage.h"
 
 using std::bind;
 using std::sort;
@@ -71,7 +75,9 @@ using std::placeholders::_2;
 
 const char *CollectionModel::kSavedGroupingsSettingsGroup = "SavedGroupings";
 const int CollectionModel::kPrettyCoverSize = 32;
-const int CollectionModel::kPixmapCacheLimit = QPixmapCache::cacheLimit() * 8;
+const char *CollectionModel::kPixmapDiskCacheDir = "/pixmapcache";
+
+QNetworkDiskCache *CollectionModel::sIconCache = nullptr;
 
 static bool IsArtistGroupBy(const CollectionModel::GroupBy by) {
   return by == CollectionModel::GroupBy_Artist || by == CollectionModel::GroupBy_AlbumArtist;
@@ -96,7 +102,8 @@ CollectionModel::CollectionModel(CollectionBackend *backend, Application *app, Q
       playlist_icon_(IconLoader::Load("albums")),
       init_task_id_(-1),
       use_pretty_covers_(false),
-      show_dividers_(true) {
+      show_dividers_(true),
+      use_disk_cache_(false) {
 
   root_->lazy_loaded = true;
 
@@ -115,6 +122,11 @@ CollectionModel::CollectionModel(CollectionBackend *backend, Application *app, Q
   no_cover_icon_ = nocover.pixmap(nocover.availableSizes().last()).scaled(kPrettyCoverSize, kPrettyCoverSize, Qt::KeepAspectRatio, Qt::SmoothTransformation);
   //no_cover_icon_ = QPixmap(":/pictures/noalbumart.png").scaled(kPrettyCoverSize, kPrettyCoverSize, Qt::KeepAspectRatio, Qt::SmoothTransformation);
 
+  // When running under gdb, all calls to this constructor came from the same thread.
+  // If this ever changes, these two lines might need to be protected by a mutex.
+  if (sIconCache == nullptr)
+    sIconCache = new QNetworkDiskCache(this);
+
   connect(backend_, SIGNAL(SongsDiscovered(SongList)), SLOT(SongsDiscovered(SongList)));
   connect(backend_, SIGNAL(SongsDeleted(SongList)), SLOT(SongsDeleted(SongList)));
   connect(backend_, SIGNAL(DatabaseReset()), SLOT(Reset()));
@@ -127,7 +139,9 @@ CollectionModel::CollectionModel(CollectionBackend *backend, Application *app, Q
   backend_->UpdateTotalArtistCountAsync();
   backend_->UpdateTotalAlbumCountAsync();
 
-  QPixmapCache::setCacheLimit(kPixmapCacheLimit);
+  connect(app_, SIGNAL(ClearPixmapDiskCache()), SLOT(ClearDiskCache()));
+
+  ReloadSettings();
 
 }
 
@@ -165,6 +179,26 @@ void CollectionModel::SaveGrouping(QString name) {
 
 }
 
+void CollectionModel::ReloadSettings() {
+
+  QSettings s;
+
+  s.beginGroup(CollectionSettingsPage::kSettingsGroup);
+
+  use_disk_cache_ = s.value(CollectionSettingsPage::kSettingsDiskCacheEnable, false).toBool();
+
+  if (!use_disk_cache_) {
+    sIconCache->clear();
+  }
+
+  sIconCache->setCacheDirectory(QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + kPixmapDiskCacheDir);
+  sIconCache->setMaximumCacheSize(MaximumCacheSize(&s, CollectionSettingsPage::kSettingsDiskCacheSize, CollectionSettingsPage::kSettingsDiskCacheSizeUnit));
+
+  QPixmapCache::setCacheLimit(MaximumCacheSize(&s, CollectionSettingsPage::kSettingsCacheSize, CollectionSettingsPage::kSettingsCacheSizeUnit) / 1024);
+
+  s.endGroup();
+}
+
 void CollectionModel::Init(bool async) {
 
   if (async) {
@@ -476,6 +510,7 @@ void CollectionModel::SongsDeleted(const SongList &songs) {
       // Remove from pixmap cache
       const QString cache_key = AlbumIconPixmapCacheKey(ItemToIndex(node));
       QPixmapCache::remove(cache_key);
+      if (use_disk_cache_) sIconCache->remove(QUrl(cache_key));
       if (pending_cache_keys_.contains(cache_key)) {
         pending_cache_keys_.remove(cache_key);
       }
@@ -532,7 +567,7 @@ QString CollectionModel::AlbumIconPixmapCacheKey(const QModelIndex &idx) const {
     idx_copy = idx_copy.parent();
   }
 
-  return "collectionart:" + path.join("/");
+  return Song::TextForSource(backend_->Source()) + path.join("/");
 
 }
 
@@ -549,6 +584,18 @@ QVariant CollectionModel::AlbumIcon(const QModelIndex &idx) {
     return cached_pixmap;
   }
 
+  // Try to load it from the disk cache
+  if (use_disk_cache_) {
+    std::unique_ptr<QIODevice> cache(sIconCache->data(QUrl(cache_key)));
+    if (cache) {
+      QImage cached_pixmap;
+      if (cached_pixmap.load(cache.get(), "XPM")) {
+        QPixmapCache::insert(cache_key, QPixmap::fromImage(cached_pixmap));
+        return QPixmap::fromImage(cached_pixmap);
+      }
+    }
+  }
+
   // Maybe we're loading a pixmap already?
   if (pending_cache_keys_.contains(cache_key)) {
     return no_cover_icon_;
@@ -591,6 +638,21 @@ void CollectionModel::AlbumCoverLoaded(const quint64 id, const QUrl &cover_url,
     QPixmapCache::insert(cache_key, image_pixmap);
   }
 
+  // If we have a valid cover not already in the disk cache
+  if (use_disk_cache_) {
+    std::unique_ptr<QIODevice> cached_img(sIconCache->data(QUrl(cache_key)));
+    if (!cached_img && !image.isNull()) {
+      QNetworkCacheMetaData item_metadata;
+      item_metadata.setSaveToDisk(true);
+      item_metadata.setUrl(QUrl(cache_key));
+      QIODevice* cache = sIconCache->prepare(item_metadata);
+      if (cache) {
+        image.save(cache, "XPM");
+        sIconCache->insert(cache);
+      }
+    }
+  }
+
   const QModelIndex idx = ItemToIndex(item);
   if (!idx.isValid()) return;
 
@@ -1479,6 +1541,19 @@ bool CollectionModel::CompareItems(const CollectionItem *a, const CollectionItem
 
 }
 
+int CollectionModel::MaximumCacheSize(QSettings *s, const char *size_id, const char *size_unit_id) const {
+
+  int size = s->value(size_id, 80).toInt();
+  int unit = s->value(size_unit_id, CollectionSettingsPage::CacheSizeUnit::CacheSizeUnit_MB).toInt() + 1;
+
+  do {
+    size *= 1024;
+    unit -= 1;
+  } while (unit > 0);
+
+  return size;
+}
+
 void CollectionModel::GetChildSongs(CollectionItem *item, QList<QUrl> *urls, SongList *songs, QSet<int> *song_ids) const {
 
   switch (item->type) {
@@ -1606,6 +1681,10 @@ void CollectionModel::TotalAlbumCountUpdatedSlot(int count) {
 
 }
 
+void CollectionModel::ClearDiskCache() {
+  sIconCache->clear();
+}
+
 QDataStream &operator<<(QDataStream &s, const CollectionModel::Grouping &g) {
   s << quint32(g.first) << quint32(g.second) << quint32(g.third);
   return s;

src/collection/collectionmodel.h

@@ -24,18 +24,16 @@
 
 #include "config.h"
 
-
 #include <QtGlobal>
 #include <QObject>
 #include <QAbstractItemModel>
 #include <QFuture>
 #include <QDataStream>
-#include <QList>
-#include <QMap>
 #include <QMetaType>
-#include <QMimeData>
 #include <QPair>
 #include <QSet>
+#include <QList>
+#include <QMap>
 #include <QVariant>
 #include <QString>
 #include <QStringList>
@@ -43,7 +41,6 @@
 #include <QImage>
 #include <QIcon>
 #include <QPixmap>
-#include <QSettings>
 
 #include "core/simpletreemodel.h"
 #include "core/song.h"
@@ -52,10 +49,12 @@
 #include "sqlrow.h"
 #include "covermanager/albumcoverloaderoptions.h"
 
+class QSettings;
+class QNetworkDiskCache;
+
 class Application;
 class CollectionBackend;
 class CollectionDirectoryModel;
-class CollectionItem;
 
 class CollectionModel : public SimpleTreeModel<CollectionItem> {
   Q_OBJECT
@@ -63,13 +62,13 @@ class CollectionModel : public SimpleTreeModel<CollectionItem> {
   Q_ENUMS(GroupBy)
 
  public:
-  CollectionModel(CollectionBackend *backend, Application *app, QObject *parent = nullptr);
+  explicit CollectionModel(CollectionBackend *backend, Application *app, QObject *parent = nullptr);
   ~CollectionModel();
 
   static const char *kSavedGroupingsSettingsGroup;
 
   static const int kPrettyCoverSize;
-  static const int kPixmapCacheLimit;
+  static const char *kPixmapDiskCacheDir;
 
   enum Role {
     Role_Type = Qt::UserRole + 1,
@@ -162,6 +161,9 @@ class CollectionModel : public SimpleTreeModel<CollectionItem> {
   // Save the current grouping
   void SaveGrouping(QString name);
 
+  // Reload settings.
+  void ReloadSettings();
+
   // Utility functions for manipulating text
   static QString TextOrUnknown(const QString &text);
   static QString PrettyYearAlbum(const int year, const QString &album);
@@ -203,6 +205,7 @@ signals:
   void TotalSongCountUpdatedSlot(int count);
   void TotalArtistCountUpdatedSlot(int count);
   void TotalAlbumCountUpdatedSlot(int count);
+  void ClearDiskCache();
 
   // Called after ResetAsync
   void ResetAsyncQueryFinished(QFuture<CollectionModel::QueryResult> future);
@@ -244,6 +247,7 @@ signals:
   QVariant AlbumIcon(const QModelIndex &idx);
   QVariant data(const CollectionItem *item, int role) const;
   bool CompareItems(const CollectionItem *a, const CollectionItem *b) const;
+  int MaximumCacheSize(QSettings *s, const char *size_id, const char *size_unit_id) const;
 
  private:
   CollectionBackend *backend_;
@@ -274,10 +278,13 @@ signals:
   QIcon playlists_dir_icon_;
   QIcon playlist_icon_;
 
+  static QNetworkDiskCache *sIconCache;
+
   int init_task_id_;
 
   bool use_pretty_covers_;
   bool show_dividers_;
+  bool use_disk_cache_;
 
   AlbumCoverLoaderOptions cover_loader_options_;
 

src/collection/collectionplaylistitem.cpp

@@ -21,7 +21,6 @@
 #include "config.h"
 
 #include <QVariant>
-#include <QString>
 #include <QUrl>
 
 #include "collectionplaylistitem.h"

src/collection/collectionplaylistitem.h

@@ -23,9 +23,7 @@
 
 #include "config.h"
 
-
 #include <QVariant>
-#include <QString>
 #include <QUrl>
 
 #include "core/song.h"
@@ -35,8 +33,8 @@ class SqlRow;
 
 class CollectionPlaylistItem : public PlaylistItem {
  public:
-  CollectionPlaylistItem();
-  CollectionPlaylistItem(const Song &song);
+  explicit CollectionPlaylistItem();
+  explicit CollectionPlaylistItem(const Song &song);
 
   bool InitFromQuery(const SqlRow &query);
   void Reload();

src/collection/collectionquery.cpp

@@ -31,7 +31,6 @@
 #include <QSqlQuery>
 
 #include "collectionquery.h"
-#include "core/logging.h"
 #include "core/song.h"
 
 QueryOptions::QueryOptions() : max_age_(-1), query_mode_(QueryMode_All) {}

src/collection/collectionquery.h

@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-
 #include <QMetaType>
 #include <QVariant>
 #include <QString>
@@ -32,7 +31,6 @@
 #include <QSqlQuery>
 
 class Song;
-class CollectionBackend;
 
 // This structure let's you customize behaviour of any CollectionQuery.
 struct QueryOptions {
@@ -74,7 +72,7 @@ struct QueryOptions {
 
 class CollectionQuery {
  public:
-  CollectionQuery(const QueryOptions &options = QueryOptions());
+  explicit CollectionQuery(const QueryOptions &options = QueryOptions());
 
   // Sets contents of SELECT clause on the query (list of columns to get).
   void SetColumnSpec(const QString &spec) { column_spec_ = spec; }

src/collection/collectionview.cpp

@@ -22,37 +22,25 @@
 
 #include <QtGlobal>
 #include <QWidget>
+#include <QAbstractItemView>
+#include <QTreeView>
 #include <QItemSelectionModel>
 #include <QSortFilterProxyModel>
-#include <QAbstractItemView>
-#include <QStyleOptionViewItem>
-#include <QAction>
+#include <QMimeData>
+#include <QSet>
+#include <QList>
+#include <QMap>
 #include <QVariant>
 #include <QString>
 #include <QUrl>
-#include <QList>
-#include <QLocale>
-#include <QMap>
-#include <QMessageBox>
-#include <QMenu>
-#include <QMimeData>
+#include <QPixmap>
 #include <QPainter>
-#include <QPalette>
-#include <QPen>
-#include <QPoint>
 #include <QRect>
-#include <QSet>
-#include <QSize>
-#include <QToolTip>
-#include <QTreeView>
-#include <QWhatsThis>
-#include <QBrush>
-#include <QColor>
 #include <QFont>
 #include <QFontMetrics>
-#include <QPixmap>
-#include <QIcon>
-#include <QLinearGradient>
+#include <QMenu>
+#include <QAction>
+#include <QMessageBox>
 #include <QSettings>
 #include <QtEvents>
 
@@ -546,7 +534,7 @@ SongList CollectionView::GetSelectedSongs() const {
 void CollectionView::Organise() {
 
   if (!organise_dialog_)
-    organise_dialog_.reset(new OrganiseDialog(app_->task_manager(), app_->collection_backend()));
+    organise_dialog_.reset(new OrganiseDialog(app_->task_manager(), app_->collection_backend(), this));
 
   organise_dialog_->SetDestinationModel(app_->collection_model()->directory_model());
   organise_dialog_->SetCopy(false);
@@ -580,15 +568,17 @@ void CollectionView::RescanSongs() {
 }
 
 void CollectionView::CopyToDevice() {
+
 #ifndef Q_OS_WIN
   if (!organise_dialog_)
-    organise_dialog_.reset(new OrganiseDialog(app_->task_manager()));
+    organise_dialog_.reset(new OrganiseDialog(app_->task_manager(), nullptr, this));
 
   organise_dialog_->SetDestinationModel(app_->device_manager()->connected_devices_model(), true);
   organise_dialog_->SetCopy(true);
   organise_dialog_->SetSongs(GetSelectedSongs());
   organise_dialog_->show();
 #endif
+
 }
 
 void CollectionView::FilterReturnPressed() {

src/collection/collectionview.h

@@ -26,25 +26,19 @@
 #include <memory>
 
 #include <QObject>
-#include <QWidget>
 #include <QAbstractItemModel>
 #include <QAbstractItemView>
 #include <QString>
 #include <QPixmap>
-#include <QPainter>
 #include <QSet>
-#include <QStyleOption>
-#include <QStyledItemDelegate>
-#include <QStyleOptionViewItem>
-#include <QAction>
-#include <QMenu>
-#include <QtEvents>
 
 #include "core/song.h"
 #include "widgets/autoexpandingtreeview.h"
 
+class QWidget;
+class QMenu;
+class QAction;
 class QContextMenuEvent;
-class QHelpEvent;
 class QMouseEvent;
 class QPaintEvent;
 
@@ -59,7 +53,7 @@ class CollectionView : public AutoExpandingTreeView {
   Q_OBJECT
 
  public:
-  CollectionView(QWidget *parent = nullptr);
+  explicit CollectionView(QWidget *parent = nullptr);
   ~CollectionView();
 
   // Returns Songs currently selected in the collection view.

src/collection/collectionviewcontainer.h

@@ -34,7 +34,7 @@ class CollectionViewContainer : public QWidget {
   Q_OBJECT
 
  public:
-  CollectionViewContainer(QWidget *parent = nullptr);
+  explicit CollectionViewContainer(QWidget *parent = nullptr);
   ~CollectionViewContainer();
 
   CollectionFilterWidget *filter() const;

src/collection/collectionwatcher.cpp

@@ -24,7 +24,6 @@
 #include <assert.h>
 
 #include <QObject>
-#include <QApplication>
 #include <QThread>
 #include <QIODevice>
 #include <QDir>
@@ -50,7 +49,6 @@
 #include "core/logging.h"
 #include "core/tagreaderclient.h"
 #include "core/taskmanager.h"
-#include "core/utilities.h"
 #include "directory.h"
 #include "collectionbackend.h"
 #include "collectionwatcher.h"

src/collection/collectionwatcher.h

@@ -24,7 +24,6 @@
 
 #include "config.h"
 
-
 #include <QtGlobal>
 #include <QObject>
 #include <QHash>
@@ -32,11 +31,14 @@
 #include <QSet>
 #include <QString>
 #include <QStringList>
-#include <QTimer>
+#include <QUrl>
 
 #include "directory.h"
 #include "core/song.h"
 
+class QThread;
+class QTimer;
+
 class CollectionBackend;
 class FileSystemWatcherInterface;
 class TaskManager;
@@ -46,7 +48,7 @@ class CollectionWatcher : public QObject {
   Q_OBJECT
 
  public:
-  CollectionWatcher(Song::Source source, QObject *parent = nullptr);
+  explicit CollectionWatcher(Song::Source source, QObject *parent = nullptr);
 
   void set_backend(CollectionBackend *backend) { backend_ = backend; }
   void set_task_manager(TaskManager *task_manager) { task_manager_ = task_manager; }
@@ -62,7 +64,7 @@ class CollectionWatcher : public QObject {
 
   void ExitAsync();
 
-signals:
+ signals:
   void NewOrUpdatedSongs(const SongList &songs);
   void SongsMTimeUpdated(const SongList &songs);
   void SongsDeleted(const SongList &songs);

src/collection/groupbydialog.cpp

@@ -23,10 +23,10 @@
 #include <functional>
 
 #include <QDialog>
+#include <QWidget>
 #include <QComboBox>
 #include <QDialogButtonBox>
 #include <QPushButton>
-#include <QWidget>
 
 #include "collectionmodel.h"
 #include "groupbydialog.h"