Release 0.6.12

Fixes #449

.circleci/config.yml

@@ -0,0 +1,664 @@
+version: 2.1
+commands:
+
+  cmake:
+    description: Configure build
+    steps:
+      - run:
+          name: Configure build
+          command: cmake ..
+          working_directory: build
+
+
+  build_source:
+    description: Create source tarball
+    steps:
+      - run:
+          name: Create source tarball
+          command: ../dist/scripts/maketarball.sh
+          working_directory: build
+
+
+  build_rpm:
+    description: Build RPM
+    steps:
+      - run:
+          name: Create RPM build sources directories
+          command: mkdir -p ~/rpmbuild/SOURCES /usr/src/packages/SOURCES
+      - run:
+          name: Copy source tarball 1
+          command: cp strawberry-*.tar.xz ~/rpmbuild/SOURCES/
+          working_directory: build
+      - run:
+          name: Copy source tarball 2
+          command: cp strawberry-*.tar.xz /usr/src/packages/SOURCES/
+          working_directory: build
+      - run:
+          name: Build RPM
+          command: rpmbuild -ba ../dist/unix/strawberry.spec
+          working_directory: build
+
+
+  build_deb:
+    description: Build Deb
+    steps:
+      - run:
+          name: make deb
+          command: dpkg-buildpackage -b -d -uc -us -nc -j2
+
+
+  install_opensuse_dependencies:
+    description: Install openSUSE dependencies
+    steps:
+      - run:
+          name: Update packages
+          command: zypper --non-interactive --gpg-auto-import-keys ref
+      - run:
+          name: Install openSUSE dependencies
+          command: >
+            zypper --non-interactive --gpg-auto-import-keys install
+            lsb-release
+            rpm-build
+            git
+            tar
+            make
+            cmake
+            gcc
+            gcc-c++
+            gettext-tools
+            glibc-devel
+            libboost_headers-devel
+            boost-devel
+            glib2-devel
+            glib2-tools
+            dbus-1-devel
+            alsa-devel
+            libnotify-devel
+            libgnutls-devel
+            protobuf-devel
+            sqlite3-devel
+            libpulse-devel
+            gstreamer-devel
+            gstreamer-plugins-base-devel
+            libxine-devel
+            vlc-devel
+            libQt5Core-devel
+            libQt5Gui-devel
+            libQt5Widgets-devel
+            libQt5Concurrent-devel
+            libQt5Network-devel
+            libQt5Sql-devel
+            libQt5DBus-devel
+            libQt5Test-devel
+            libqt5-qtx11extras-devel
+            libqt5-qtbase-common-devel
+            libQt5Sql5-sqlite
+            libqt5-linguist-devel
+            libcdio-devel
+            libgpod-devel
+            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-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_centos_dependencies:
+    description: Install CentOS dependencies
+    steps:
+      - run:
+          name: Install epel-release
+          command: dnf install -y epel-release
+      - run:
+          name: Install epel-release-latest-8.noarch.rpm
+          command: dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
+      - run:
+          name: Install config-manager
+          command: dnf install -y 'dnf-command(config-manager)'
+      - run:
+          name: PowerTools
+          command: dnf config-manager --set-enabled PowerTools
+      - run:
+          name: DNF Clean All
+          command: dnf clean all
+      - run:
+          name: Update packages
+          command: dnf update -y
+      - run:
+          name: Install CentOS dependencies
+          command: >
+            dnf install -y
+            glibc
+            gcc-c++
+            make
+            libtool
+            cmake3
+            rpmdevtools
+            redhat-lsb-core
+            git
+            man
+            tar
+            gettext
+            boost-devel
+            fuse-devel
+            dbus-devel
+            libnotify-devel
+            gnutls-devel
+            sqlite-devel
+            protobuf-devel
+            protobuf-compiler
+            alsa-lib-devel
+            pulseaudio-libs-devel
+            qt5-devel
+            qt5-qtbase-devel
+            qt5-qtx11extras-devel
+            qt5-qttools-devel
+            fftw-devel
+            libchromaprint-devel
+            libcdio-devel
+            libgpod-devel
+            libplist-devel
+            libusbmuxd-devel
+            libmtp-devel
+            libjpeg-devel
+            cairo-devel
+            dbus-x11
+            xorg-x11-server-Xvfb
+            xorg-x11-xauth
+            vim-common
+            desktop-file-utils
+            libappstream-glib
+            appstream-data
+            hicolor-icon-theme
+            python3-pip
+            python3-devel
+            gstreamer1-devel
+            gstreamer1-plugins-base-devel
+
+
+  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/leap:15.1
+    steps:
+      - install_opensuse_dependencies
+      - checkout
+      - cmake
+      - build_source
+
+
+  build_opensuse_tumbleweed:
+    docker:
+      - image: opensuse/tumbleweed
+    environment:
+      RPM_BUILD_NCPUS: "2"
+    steps:
+      - run:
+          name: Update packages
+          command: zypper --non-interactive --gpg-auto-import-keys ref
+      - run:
+          name: Upgrade packages
+          command: zypper --non-interactive --gpg-auto-import-keys dup
+      - 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_31:
+    docker:
+      - image: fedora:31
+    environment:
+      RPM_BUILD_NCPUS: "2"
+    steps:
+      - install_fedora_dependencies
+      - checkout
+      - cmake
+      - build_source
+      - build_rpm
+
+  build_fedora_32:
+    docker:
+      - image: fedora:32
+    environment:
+      RPM_BUILD_NCPUS: "2"
+    steps:
+      - install_fedora_dependencies
+      - checkout
+      - cmake
+      - build_source
+      - build_rpm
+
+  build_fedora_33:
+    docker:
+      - image: fedora:33
+    environment:
+      RPM_BUILD_NCPUS: "2"
+    steps:
+      - install_fedora_dependencies
+      - checkout
+      - cmake
+      - build_source
+      - build_rpm
+
+
+  build_centos_8:
+    docker:
+      - image: centos:8
+    environment:
+      RPM_BUILD_NCPUS: "2"
+    steps:
+      - install_centos_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
+
+  build_ubuntu_groovy:
+    docker:
+      - image: ubuntu:groovy
+    steps:
+      - install_ubuntu_dependencies
+      - checkout
+      - cmake
+      - build_deb
+
+workflows:
+  version: 2
+  build_all:
+    jobs:
+
+      - build_source:
+          filters:
+            tags:
+              only: /.*/
+
+
+      - build_opensuse_tumbleweed:
+          filters:
+            tags:
+              only: /.*/
+      - build_opensuse_lp151:
+          filters:
+            tags:
+              only: /.*/
+      - build_opensuse_lp152:
+          filters:
+            tags:
+              only: /.*/
+
+
+      - build_fedora_31:
+          filters:
+            tags:
+              only: /.*/
+      - build_fedora_32:
+          filters:
+            tags:
+              only: /.*/
+      - build_fedora_33:
+          filters:
+            tags:
+              only: /.*/
+
+
+      - build_mageia_7:
+          filters:
+            tags:
+              only: /.*/
+
+
+      - build_centos_8:
+          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: /.*/
+      - build_ubuntu_groovy:
+          filters:
+            tags:
+              only: /.*/

.github/FUNDING.yml

@@ -1 +1 @@
-custom: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=FRJUYV5QP6HW8
+github: jonaski

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

.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,13 +1,11 @@
 sudo: required
 language: C++
 os:
-  - linux
   - osx
 services:
   - docker
 compiler:
   - gcc
-  - clang
 
 before_install:
   - if ! [ "$DEPLOY_KEY_ENC" == "" ]; then
@@ -17,32 +15,31 @@ 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 taglib;
       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:
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker exec build cmake -Hstrawberry -Bbuild ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then mkdir build; cd build; cmake .. -DUSE_BUNDLE=ON ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then mkdir build; cd build; cmake .. -DUSE_BUNDLE=ON -DUSE_SYSTEM_TAGLIB=ON ; fi
 script:
 - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker exec build make -C build -j8 ; fi
 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
       make -j8 || travis_terminate 1;
       make install || travis_terminate 1;
-      sudo make dmg;
+      make dmg;
   fi
 after_success:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ls -lh strawberry*.dmg; fi
@@ -50,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/CMakeLists.txt

@@ -1,16 +1,8 @@
-cmake_minimum_required(VERSION 2.8.11)
+cmake_minimum_required(VERSION 3.0)
 
 include(CheckIncludeFiles)
 include(CheckFunctionExists)
 
-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 -Woverloaded-virtual -Wno-sign-compare -fpermissive")
-
-if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wextra -Wpedantic")
-endif()
-
 if(CMAKE_VERSION VERSION_GREATER 3.0)
   check_function_exists(geteuid HAVE_GETEUID)
   check_function_exists(getpwuid HAVE_GETPWUID)
@@ -19,14 +11,15 @@ endif()
 set(SINGLEAPP-SOURCES singleapplication.cpp singleapplication_p.cpp)
 set(SINGLEAPP-MOC-HEADERS singleapplication.h singleapplication_p.h)
 QT5_WRAP_CPP(SINGLEAPP-SOURCES-MOC ${SINGLEAPP-MOC-HEADERS})
-ADD_LIBRARY(singleapplication STATIC ${SINGLEAPP-SOURCES} ${SINGLEAPP-SOURCES-MOC})
+add_library(singleapplication STATIC ${SINGLEAPP-SOURCES} ${SINGLEAPP-SOURCES-MOC})
 target_link_libraries(singleapplication Qt5::Core Qt5::Widgets Qt5::Network)
 
 set(SINGLECOREAPP-SOURCES singlecoreapplication.cpp singlecoreapplication_p.cpp)
 set(SINGLECOREAPP-MOC-HEADERS singlecoreapplication.h singlecoreapplication_p.h)
 QT5_WRAP_CPP(SINGLECOREAPP-SOURCES-MOC ${SINGLECOREAPP-MOC-HEADERS})
-ADD_LIBRARY(singlecoreapplication STATIC ${SINGLECOREAPP-SOURCES} ${SINGLECOREAPP-SOURCES-MOC})
+add_library(singlecoreapplication STATIC ${SINGLECOREAPP-SOURCES} ${SINGLECOREAPP-SOURCES-MOC})
 target_link_libraries(singlecoreapplication Qt5::Core Qt5::Widgets Qt5::Network)
 
 configure_file(config.h.in "${CMAKE_CURRENT_BINARY_DIR}/config.h")
+
 include_directories(${CMAKE_CURRENT_BINARY_DIR})

3rdparty/singleapplication/singleapplication.cpp

@@ -31,13 +31,22 @@
 //
 //
 
+#include <stdlib.h>
+#include <limits>
+
 #include <QtGlobal>
 #include <QCoreApplication>
 #include <QThread>
 #include <QSharedMemory>
+#include <QLocalSocket>
 #include <QByteArray>
-#include <QDateTime>
-#include <QTime>
+#include <QElapsedTimer>
+#include <QtDebug>
+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
+#  include <QRandomGenerator>
+#else
+#  include <QDateTime>
+#endif
 
 #include "singleapplication.h"
 #include "singleapplication_p.h"
@@ -88,7 +97,7 @@ SingleApplication::SingleApplication(int &argc, char *argv[], bool allowSecondar
   }
 
   InstancesInfo* inst = static_cast<InstancesInfo*>(d->memory->data());
-  QTime time;
+  QElapsedTimer time;
   time.start();
 
   // Make sure the shared memory block is initialised and in consistent state
@@ -105,8 +114,12 @@ SingleApplication::SingleApplication(int &argc, char *argv[], bool allowSecondar
     d->memory->unlock();
 
     // Random sleep here limits the probability of a collision between two racing apps
+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
+    QThread::sleep(QRandomGenerator::global()->bounded(8u, 18u));
+#else
     qsrand(QDateTime::currentMSecsSinceEpoch() % std::numeric_limits<uint>::max());
-    QThread::sleep(8 + static_cast <unsigned long>(static_cast <float>(qrand()) / RAND_MAX * 10));
+    QThread::sleep(8 + static_cast<unsigned long>(static_cast <float>(qrand()) / RAND_MAX * 10));
+#endif
   }
 
   if (inst->primary == false) {
@@ -174,7 +187,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"
@@ -59,8 +61,8 @@
 #  include <lmcons.h>
 #endif
 
-SingleApplicationPrivate::SingleApplicationPrivate(SingleApplication *q_ptr)
-  : q_ptr(q_ptr),
+SingleApplicationPrivate::SingleApplicationPrivate(SingleApplication *_q_ptr)
+  : q_ptr(_q_ptr),
     memory(nullptr),
     socket(nullptr),
     server(nullptr),
@@ -114,12 +116,9 @@ void SingleApplicationPrivate::genBlockServerName() {
 #ifdef Q_OS_UNIX
     QByteArray username;
 #if defined(HAVE_GETEUID) && defined(HAVE_GETPWUID)
-    uid_t uid = geteuid();
-    if (uid != -1) {
-      struct passwd *pw = getpwuid(uid);
-      if (pw) {
-        username = pw->pw_name;
-      }
+    struct passwd *pw = getpwuid(geteuid());
+    if (pw) {
+      username = pw->pw_name;
     }
 #endif
     if (username.isEmpty()) username = qgetenv("USER");
@@ -187,7 +186,7 @@ void SingleApplicationPrivate::startPrimary() {
 
 void SingleApplicationPrivate::startSecondary() {}
 
-void SingleApplicationPrivate::connectToPrimary(int msecs, ConnectionType connectionType) {
+void SingleApplicationPrivate::connectToPrimary(const int msecs, const ConnectionType connectionType) {
 
   // Connect to the Local Server of the Primary Instance if not already connected.
   if (socket == nullptr) {
@@ -215,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);
@@ -229,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);
@@ -316,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;
@@ -350,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;
@@ -394,14 +386,14 @@ void SingleApplicationPrivate::readInitMessageBody(QLocalSocket *sock) {
 
 }
 
-void SingleApplicationPrivate::slotDataAvailable(QLocalSocket *dataSocket, quint32 instanceId) {
+void SingleApplicationPrivate::slotDataAvailable(QLocalSocket *dataSocket, const quint32 instanceId) {
 
   Q_Q(SingleApplication);
   Q_EMIT q->receivedMessage(instanceId, dataSocket->readAll());
 
 }
 
-void SingleApplicationPrivate::slotClientConnectionClosed(QLocalSocket *closedSocket, quint32 instanceId) {
+void SingleApplicationPrivate::slotClientConnectionClosed(QLocalSocket *closedSocket, const quint32 instanceId) {
 
   if (closedSocket->bytesAvailable() > 0)
     Q_EMIT slotDataAvailable(closedSocket, instanceId);

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;
@@ -72,14 +74,14 @@ class SingleApplicationPrivate : public QObject {
   };
   Q_DECLARE_PUBLIC(SingleApplication)
 
-  SingleApplicationPrivate( SingleApplication *q_ptr );
+  SingleApplicationPrivate(SingleApplication *_q_ptr);
   ~SingleApplicationPrivate();
 
   void genBlockServerName();
   void initializeMemoryBlock();
   void startPrimary();
   void startSecondary();
-  void connectToPrimary(int msecs, ConnectionType connectionType );
+  void connectToPrimary(const int msecs, const ConnectionType connectionType);
   quint16 blockChecksum();
   qint64 primaryPid();
   void readInitMessageHeader(QLocalSocket *socket);
@@ -96,8 +98,8 @@ class SingleApplicationPrivate : public QObject {
 
  public slots:
   void slotConnectionEstablished();
-  void slotDataAvailable(QLocalSocket*, quint32);
-  void slotClientConnectionClosed(QLocalSocket*, quint32);
+  void slotDataAvailable(QLocalSocket*, const quint32);
+  void slotClientConnectionClosed(QLocalSocket*, const quint32);
 };
 
 #endif  // SINGLEAPPLICATION_P_H

3rdparty/singleapplication/singlecoreapplication.cpp

@@ -31,13 +31,22 @@
 //
 //
 
+#include <stdlib.h>
+#include <limits>
+
 #include <QtGlobal>
 #include <QCoreApplication>
 #include <QThread>
 #include <QSharedMemory>
+#include <QLocalSocket>
 #include <QByteArray>
-#include <QDateTime>
-#include <QTime>
+#include <QElapsedTimer>
+#include <QtDebug>
+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
+#  include <QRandomGenerator>
+#else
+#  include <QDateTime>
+#endif
 
 #include "singlecoreapplication.h"
 #include "singlecoreapplication_p.h"
@@ -57,8 +66,7 @@ SingleCoreApplication::SingleCoreApplication(int &argc, char *argv[], bool allow
   // Store the current mode of the program
   d->options = options;
 
-  // Generating an application ID used for identifying the shared memory
-  // block and QLocalServer
+  // Generating an application ID used for identifying the shared memory block and QLocalServer
   d->genBlockServerName();
 
 #ifdef Q_OS_UNIX
@@ -89,7 +97,7 @@ SingleCoreApplication::SingleCoreApplication(int &argc, char *argv[], bool allow
   }
 
   InstancesInfo* inst = static_cast<InstancesInfo*>(d->memory->data());
-  QTime time;
+  QElapsedTimer time;
   time.start();
 
   // Make sure the shared memory block is initialised and in consistent state
@@ -106,8 +114,12 @@ SingleCoreApplication::SingleCoreApplication(int &argc, char *argv[], bool allow
     d->memory->unlock();
 
     // Random sleep here limits the probability of a collision between two racing apps
+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
+    QThread::sleep(QRandomGenerator::global()->bounded(8u, 18u));
+#else
     qsrand(QDateTime::currentMSecsSinceEpoch() % std::numeric_limits<uint>::max());
-    QThread::sleep(8 + static_cast <unsigned long>(static_cast <float>(qrand()) / RAND_MAX * 10));
+    QThread::sleep(8 + static_cast<unsigned long>(static_cast <float>(qrand()) / RAND_MAX * 10));
+#endif
   }
 
   if (inst->primary == false) {
@@ -175,7 +187,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"
@@ -59,8 +61,8 @@
 #  include <lmcons.h>
 #endif
 
-SingleCoreApplicationPrivate::SingleCoreApplicationPrivate(SingleCoreApplication *q_ptr)
-  : q_ptr(q_ptr),
+SingleCoreApplicationPrivate::SingleCoreApplicationPrivate(SingleCoreApplication *_q_ptr)
+  : q_ptr(_q_ptr),
     memory(nullptr),
     socket(nullptr),
     server(nullptr),
@@ -114,12 +116,9 @@ void SingleCoreApplicationPrivate::genBlockServerName() {
 #ifdef Q_OS_UNIX
     QByteArray username;
 #if defined(HAVE_GETEUID) && defined(HAVE_GETPWUID)
-    uid_t uid = geteuid();
-    if (uid != -1) {
-      struct passwd *pw = getpwuid(uid);
-      if (pw) {
-        username = pw->pw_name;
-      }
+    struct passwd *pw = getpwuid(geteuid());
+    if (pw) {
+      username = pw->pw_name;
     }
 #endif
     if (username.isEmpty()) username = qgetenv("USER");
@@ -187,7 +186,7 @@ void SingleCoreApplicationPrivate::startPrimary() {
 
 void SingleCoreApplicationPrivate::startSecondary() {}
 
-void SingleCoreApplicationPrivate::connectToPrimary(int msecs, ConnectionType connectionType) {
+void SingleCoreApplicationPrivate::connectToPrimary(const int msecs, const ConnectionType connectionType) {
 
   // Connect to the Local Server of the Primary Instance if not already connected.
   if (socket == nullptr) {
@@ -215,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);
@@ -229,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);
@@ -316,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;
@@ -350,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;
@@ -394,14 +386,14 @@ void SingleCoreApplicationPrivate::readInitMessageBody(QLocalSocket *sock) {
 
 }
 
-void SingleCoreApplicationPrivate::slotDataAvailable(QLocalSocket *dataSocket, quint32 instanceId) {
+void SingleCoreApplicationPrivate::slotDataAvailable(QLocalSocket *dataSocket, const quint32 instanceId) {
 
   Q_Q(SingleCoreApplication);
   Q_EMIT q->receivedMessage(instanceId, dataSocket->readAll());
 
 }
 
-void SingleCoreApplicationPrivate::slotClientConnectionClosed(QLocalSocket *closedSocket, quint32 instanceId) {
+void SingleCoreApplicationPrivate::slotClientConnectionClosed(QLocalSocket *closedSocket, const quint32 instanceId) {
 
   if (closedSocket->bytesAvailable() > 0)
     Q_EMIT slotDataAvailable(closedSocket, instanceId);

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;
@@ -72,14 +74,14 @@ class SingleCoreApplicationPrivate : public QObject {
   };
   Q_DECLARE_PUBLIC(SingleCoreApplication)
 
-  SingleCoreApplicationPrivate( SingleCoreApplication *q_ptr );
+  SingleCoreApplicationPrivate(SingleCoreApplication *_q_ptr);
   ~SingleCoreApplicationPrivate();
 
   void genBlockServerName();
   void initializeMemoryBlock();
   void startPrimary();
   void startSecondary();
-  void connectToPrimary(int msecs, ConnectionType connectionType );
+  void connectToPrimary(const int msecs, const ConnectionType connectionType);
   quint16 blockChecksum();
   qint64 primaryPid();
   void readInitMessageHeader(QLocalSocket *socket);
@@ -96,8 +98,8 @@ class SingleCoreApplicationPrivate : public QObject {
 
  public slots:
   void slotConnectionEstablished();
-  void slotDataAvailable(QLocalSocket*, quint32);
-  void slotClientConnectionClosed(QLocalSocket*, quint32);
+  void slotDataAvailable(QLocalSocket*, const quint32);
+  void slotClientConnectionClosed(QLocalSocket*, const quint32);
 };
 
 #endif  // SINGLECOREAPPLICATION_P_H

3rdparty/taglib/CMakeLists.txt

@@ -1,8 +1,4 @@
-cmake_minimum_required(VERSION 2.8.11)
-
-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__ -fpermissive -Wall -Woverloaded-virtual -Wno-sign-compare -Wno-delete-non-virtual-dtor")
+cmake_minimum_required(VERSION 3.0)
 
 set(TAGLIB_SOVERSION_CURRENT  17)
 set(TAGLIB_SOVERSION_REVISION 0)

3rdparty/taglib/ape/apefile.cpp

@@ -87,12 +87,15 @@ public:
 // static members
 ////////////////////////////////////////////////////////////////////////////////
 
-bool APE::File::isSupported(IOStream *stream)
+bool APE::File::isSupported(IOStream*)
 {
   // 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;
 }
 
 ////////////////////////////////////////////////////////////////////////////////

3rdparty/taglib/asf/asfattribute.cpp

@@ -264,6 +264,7 @@ int ASF::Attribute::dataSize() const
   case BytesType:
     if(d->pictureValue.isValid())
       return d->pictureValue.dataSize();
+    break;
   case GuidType:
     return d->byteVectorValue.size();
   }
@@ -305,6 +306,7 @@ ByteVector ASF::Attribute::render(const String &name, int kind) const
       data.append(d->pictureValue.render());
       break;
     }
+    break;
   case GuidType:
     data.append(d->byteVectorValue);
     break;

3rdparty/taglib/dsdiff/dsdifffile.cpp

@@ -51,7 +51,7 @@ namespace
 
   int chunkIndex(const ChunkList &chunks, const ByteVector &id)
   {
-    for(int i = 0; i < chunks.size(); i++) {
+    for (unsigned long int i = 0 ; i < chunks.size() ; i++) {
       if(chunks[i].name == id)
         return i;
     }
@@ -64,8 +64,8 @@ namespace
     if(name.size() != 4)
       return false;
 
-    for(int i = 0; i < 4; i++) {
-      if(name[i] < 32 || name[i] > 127)
+    for (int i = 0 ; i < 4 ; i++) {
+      if (name[i] < 32)
         return false;
     }
 
@@ -227,7 +227,7 @@ bool DSDIFF::File::save()
   return save(AllTags);
 }
 
-bool DSDIFF::File::save(TagTypes tags, StripTags strip, ID3v2::Version version)
+bool DSDIFF::File::save(TagTypes tags, StripTags, ID3v2::Version version)
 {
   if(readOnly()) {
     debug("DSDIFF::File::save() -- File is read only.");

3rdparty/taglib/dsf/dsffile.cpp

@@ -180,7 +180,7 @@ bool DSF::File::save()
 ////////////////////////////////////////////////////////////////////////////////
 
 
-void DSF::File::read(bool readProperties, Properties::ReadStyle propertiesStyle)
+void DSF::File::read(bool, Properties::ReadStyle propertiesStyle)
 {
   // A DSF file consists of four chunks: DSD chunk, format chunk, data chunk, and metadata chunk
   // The file format is not chunked in the sense of a RIFF File, though

3rdparty/taglib/fileref.cpp

@@ -228,10 +228,10 @@ namespace
       return new Ogg::Vorbis::File(fileName, readAudioProperties, audioPropertiesStyle);
     if(ext == "OGA") {
       /* .oga can be any audio in the Ogg container. First try FLAC, then Vorbis. */
-      File *file = new Ogg::FLAC::File(fileName, readAudioProperties, audioPropertiesStyle);
-      if(file->isValid())
-        return file;
-      delete file;
+      File *file_flac = new Ogg::FLAC::File(fileName, readAudioProperties, audioPropertiesStyle);
+      if (file_flac->isValid())
+        return file_flac;
+      delete file_flac;
       return new Ogg::Vorbis::File(fileName, readAudioProperties, audioPropertiesStyle);
     }
     if(ext == "FLAC")

3rdparty/taglib/fileref.h

@@ -92,8 +92,8 @@ namespace TagLib {
 
     class TAGLIB_EXPORT FileTypeResolver
     {
-      TAGLIB_IGNORE_MISSING_DESTRUCTOR
     public:
+      virtual ~FileTypeResolver();
       /*!
        * This method must be overridden to provide an additional file type
        * resolver.  If the resolver is able to determine the file type it should
@@ -286,4 +286,4 @@ namespace TagLib {
 }
 } // namespace Strawberry_TagLib::TagLib
 
-#endif
+#endif  // TAGLIB_FILEREF_H

3rdparty/taglib/mod/modfilebase.cpp

@@ -60,9 +60,9 @@ bool Mod::FileBase::readString(String &s, unsigned long size)
   return true;
 }
 
-void Mod::FileBase::writeByte(unsigned char byte)
+void Mod::FileBase::writeByte(unsigned char _byte)
 {
-  ByteVector data(1, byte);
+  ByteVector data(1, _byte);
   writeBlock(data);
 }
 
@@ -86,11 +86,11 @@ void Mod::FileBase::writeU32B(unsigned long number)
   writeBlock(ByteVector::fromUInt(number, true));
 }
 
-bool Mod::FileBase::readByte(unsigned char &byte)
+bool Mod::FileBase::readByte(unsigned char &_byte)
 {
   ByteVector data(readBlock(1));
   if(data.size() < 1) return false;
-  byte = data[0];
+  _byte = data[0];
   return true;
 }
 

3rdparty/taglib/mp4/mp4atom.cpp

@@ -122,15 +122,15 @@ MP4::Atom::find(const char *name1, const char *name2, const char *name3, const c
 }
 
 MP4::AtomList
-MP4::Atom::findall(const char *name, bool recursive)
+MP4::Atom::findall(const char *_name, bool recursive)
 {
   MP4::AtomList result;
   for(AtomList::ConstIterator it = children.begin(); it != children.end(); ++it) {
-    if((*it)->name == name) {
+    if((*it)->name == _name) {
       result.append(*it);
     }
     if(recursive) {
-      result.append((*it)->findall(name, recursive));
+      result.append((*it)->findall(_name, recursive));
     }
   }
   return result;

3rdparty/taglib/mp4/mp4atom.h

@@ -67,7 +67,7 @@ namespace TagLib {
     };
 
     struct AtomData {
-      AtomData(AtomDataType type, ByteVector data) : type(type), locale(0), data(data) {}
+      AtomData(AtomDataType _type, ByteVector _data) : type(_type), locale(0), data(_data) {}
       AtomDataType type;
       int locale;
       ByteVector data;

3rdparty/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp

@@ -334,14 +334,14 @@ ByteVector TableOfContentsFrame::renderFields() const
   data.append(flags);
   data.append((char)(entryCount()));
   ByteVectorList::ConstIterator it = d->childElements.begin();
-  while(it != d->childElements.end()) {
+  while (it != d->childElements.end()) {
     data.append(*it);
     data.append('\0');
     it++;
   }
   FrameList l = d->embeddedFrameList;
-  for(FrameList::ConstIterator it = l.begin(); it != l.end(); ++it)
-    data.append((*it)->render());
+  for (FrameList::ConstIterator it2 = l.begin(); it2 != l.end(); ++it2)
+    data.append((*it2)->render());
 
   return data;
 }

3rdparty/taglib/mpeg/id3v2/id3v2frame.cpp

@@ -417,7 +417,7 @@ namespace
     {"TYER", "TDRC"}, // 2.3 -> 2.4
     {"TIME", "TDRC"}, // 2.3 -> 2.4
   };
-  const size_t deprecatedFramesSize = sizeof(deprecatedFrames) / sizeof(deprecatedFrames[0]);;
+  const size_t deprecatedFramesSize = sizeof(deprecatedFrames) / sizeof(deprecatedFrames[0]);
 }
 
 String Frame::frameIDToKey(const ByteVector &id)

3rdparty/taglib/mpeg/mpegheader.cpp

@@ -69,7 +69,7 @@ public:
 // public members
 ////////////////////////////////////////////////////////////////////////////////
 
-MPEG::Header::Header(const ByteVector &data) :
+MPEG::Header::Header(const ByteVector&) :
   d(new HeaderPrivate())
 {
   debug("MPEG::Header::Header() - This constructor is no longer used.");

3rdparty/taglib/ogg/oggfile.cpp

@@ -296,10 +296,10 @@ void Ogg::File::writePacket(unsigned int i, const ByteVector &packet)
         break;
 
       page.setPageSequenceNumber(page.pageSequenceNumber() + numberOfNewPages);
-      const ByteVector data = page.render();
+      const ByteVector data2 = page.render();
 
       seek(pageOffset + 18);
-      writeBlock(data.mid(18, 8));
+      writeBlock(data2.mid(18, 8));
 
       if(page.header()->lastPageOfStream())
         break;

3rdparty/taglib/ogg/xiphcomment.cpp

@@ -379,8 +379,7 @@ ByteVector Ogg::XiphComment::render(bool addFramingBit) const
   // std::pair<String, StringList> where the first String is the field name and
   // the StringList is the values associated with that field.
 
-  FieldListMap::ConstIterator it = d->fieldListMap.begin();
-  for(; it != d->fieldListMap.end(); ++it) {
+  for(FieldListMap::ConstIterator it = d->fieldListMap.begin() ; it != d->fieldListMap.end() ; ++it) {
 
     // And now iterate over the values of the current list.
 
@@ -398,7 +397,7 @@ ByteVector Ogg::XiphComment::render(bool addFramingBit) const
     }
   }
 
-  for(PictureConstIterator it = d->pictureList.begin(); it != d->pictureList.end(); ++it) {
+  for (PictureConstIterator it = d->pictureList.begin(); it != d->pictureList.end(); ++it) {
     ByteVector picture = (*it)->render().toBase64();
     data.append(ByteVector::fromUInt(picture.size() + 23, false));
     data.append("METADATA_BLOCK_PICTURE=");

3rdparty/taglib/riff/rifffile.cpp

@@ -46,8 +46,8 @@ struct Chunk
 class RIFF::File::FilePrivate
 {
 public:
-  explicit FilePrivate(Endianness endianness) :
-    endianness(endianness),
+  explicit FilePrivate(Endianness _endianness) :
+    endianness(_endianness),
     size(0),
     sizeOffset(0) {}
 

3rdparty/taglib/toolkit/tbytevectorlist.cpp

@@ -77,11 +77,6 @@ ByteVectorList::ByteVectorList() :
 
 }
 
-ByteVectorList::ByteVectorList(const ByteVectorList &l) : List<ByteVector>(l)
-{
-
-}
-
 ByteVectorList::~ByteVectorList()
 {
 

3rdparty/taglib/toolkit/tbytevectorlist.h

@@ -53,13 +53,6 @@ namespace TagLib {
      */
     virtual ~ByteVectorList();
 
-    /*!
-     * Make a shallow, implicitly shared, copy of \a l.  Because this is
-     * implicitly shared, this method is lightweight and suitable for
-     * pass-by-value usage.
-     */
-    ByteVectorList(const ByteVectorList &l);
-
     /*!
      * Convert the ByteVectorList to a ByteVector separated by \a separator.  By
      * default a space is used.

3rdparty/taglib/toolkit/tbytevectorstream.cpp

@@ -43,8 +43,8 @@ public:
   long position;
 };
 
-ByteVectorStream::ByteVectorStreamPrivate::ByteVectorStreamPrivate(const ByteVector &data) :
-  data(data),
+ByteVectorStream::ByteVectorStreamPrivate::ByteVectorStreamPrivate(const ByteVector &_data) :
+  data(_data),
   position(0)
 {
 }

3rdparty/taglib/toolkit/tfile.cpp

@@ -71,9 +71,9 @@ using namespace Strawberry_TagLib::TagLib;
 class File::FilePrivate
 {
 public:
-  FilePrivate(IOStream *stream, bool owner) :
-    stream(stream),
-    streamOwner(owner),
+  FilePrivate(IOStream *_stream, bool _owner) :
+    stream(_stream),
+    streamOwner(_owner),
     valid(true) {}
 
   ~FilePrivate()

3rdparty/taglib/toolkit/tfilestream.cpp

@@ -58,7 +58,7 @@ namespace
 #endif
   }
 
-  FileHandle openFile(const int fileDescriptor, bool readOnly)
+  FileHandle openFile(const int, bool)
   {
     return InvalidFileHandle;
   }

3rdparty/taglib/toolkit/tpropertymap.cpp

@@ -28,16 +28,10 @@
 using namespace Strawberry_TagLib::TagLib;
 
 
-PropertyMap::PropertyMap() : SimplePropertyMap()
-{
-}
+PropertyMap::PropertyMap() : SimplePropertyMap() {}
 
-PropertyMap::PropertyMap(const PropertyMap &m) : SimplePropertyMap(m), unsupported(m.unsupported)
-{
-}
+PropertyMap::PropertyMap(const SimplePropertyMap &m) {
 
-PropertyMap::PropertyMap(const SimplePropertyMap &m)
-{
   for(SimplePropertyMap::ConstIterator it = m.begin(); it != m.end(); ++it){
     String key = it->first.upper();
     if(!key.isEmpty())
@@ -45,14 +39,13 @@ PropertyMap::PropertyMap(const SimplePropertyMap &m)
     else
       unsupported.append(it->first);
   }
+
 }
 
-PropertyMap::~PropertyMap()
-{
-}
+PropertyMap::~PropertyMap() {}
+
+bool PropertyMap::insert(const String &key, const StringList &values) {
 
-bool PropertyMap::insert(const String &key, const StringList &values)
-{
   String realKey = key.upper();
   Iterator result = SimplePropertyMap::find(realKey);
   if(result == end())
@@ -60,6 +53,7 @@ bool PropertyMap::insert(const String &key, const StringList &values)
   else
     SimplePropertyMap::operator[](realKey).append(values);
   return true;
+
 }
 
 bool PropertyMap::replace(const String &key, const StringList &values)

3rdparty/taglib/toolkit/tpropertymap.h

@@ -115,8 +115,6 @@ namespace TagLib {
 
     PropertyMap();
 
-    PropertyMap(const PropertyMap &m);
-
     /*!
      * Creates a PropertyMap initialized from a SimplePropertyMap. Copies all
      * entries from \a m that have valid keys.

3rdparty/taglib/toolkit/tstringlist.cpp

@@ -62,13 +62,6 @@ StringList::StringList() :
 
 }
 
-StringList::StringList(const StringList &l) :
-  List<String>(l),
-  d(nullptr)
-{
-
-}
-
 StringList::StringList(const String &s) :
   List<String>(),
   d(nullptr)

3rdparty/taglib/toolkit/tstringlist.h

@@ -57,7 +57,7 @@ namespace TagLib {
      * implicitly shared, this method is lightweight and suitable for
      * pass-by-value usage.
      */
-    StringList(const StringList &l);
+    StringList(const StringList &l) = default;
 
     /*!
      * Constructs a StringList with \a s as a member.

3rdparty/taglib/toolkit/tutils.h

@@ -193,7 +193,7 @@ namespace TagLib
         // The last resort. May cause a buffer overflow.
 
         length = vsprintf(buf, format, args);
-        if(length >= BufferSize) {
+        if(length >= (int)BufferSize) {
           debug("Utils::formatString() - Buffer overflow! Returning an empty string.");
           length = -1;
         }

3rdparty/taglib/xm/xmfile.cpp

@@ -110,7 +110,7 @@ template<typename T>
 class ValueReader : public Reader
 {
 public:
-  explicit ValueReader(T &value) : value(value)
+  explicit ValueReader(T &_value) : value(_value)
   {
   }
 
@@ -151,7 +151,7 @@ private:
 class ByteReader : public ValueReader<unsigned char>
 {
 public:
-  explicit ByteReader(unsigned char &byte) : ValueReader<unsigned char>(byte) {}
+  explicit ByteReader(unsigned char &_byte) : ValueReader<unsigned char>(_byte) {}
 
   unsigned int read(Strawberry_TagLib::TagLib::File &file, unsigned int limit)
   {
@@ -172,8 +172,8 @@ template<typename T>
 class NumberReader : public ValueReader<T>
 {
 public:
-  NumberReader(T &value, bool bigEndian) :
-    ValueReader<T>(value), bigEndian(bigEndian)
+  NumberReader(T &_value, bool _bigEndian) :
+    ValueReader<T>(_value), bigEndian(_bigEndian)
   {
   }
 
@@ -184,8 +184,8 @@ protected:
 class U16Reader : public NumberReader<unsigned short>
 {
 public:
-  U16Reader(unsigned short &value, bool bigEndian)
-  : NumberReader<unsigned short>(value, bigEndian) {}
+  U16Reader(unsigned short &_value, bool _bigEndian)
+  : NumberReader<unsigned short>(_value, _bigEndian) {}
 
   unsigned int read(Strawberry_TagLib::TagLib::File &file, unsigned int limit)
   {
@@ -203,8 +203,8 @@ public:
 class U32Reader : public NumberReader<unsigned long>
 {
 public:
-  U32Reader(unsigned long &value, bool bigEndian = true) :
-    NumberReader<unsigned long>(value, bigEndian)
+  U32Reader(unsigned long &_value, bool _bigEndian = true) :
+    NumberReader<unsigned long>(_value, _bigEndian)
   {
   }
 
@@ -479,11 +479,11 @@ bool XM::File::save()
 
         if(sampleHeaderSize > 18U) {
           seek(pos + 18);
-          const unsigned int len = std::min(sampleHeaderSize - 18U, 22UL);
+          const unsigned int len2 = std::min(sampleHeaderSize - 18U, 22UL);
           if(sampleNameIndex >= lines.size())
-            writeString(String(), len);
+            writeString(String(), len2);
           else
-            writeString(lines[sampleNameIndex ++], len);
+            writeString(lines[sampleNameIndex ++], len2);
         }
       }
       pos += sampleHeaderSize;
@@ -560,10 +560,10 @@ void XM::File::read(bool)
     StructReader pattern;
     pattern.byte(packingType).u16L(rowCount).u16L(dataSize);
 
-    unsigned int count = pattern.read(*this, patternHeaderLength - 4U);
-    READ_ASSERT(count == std::min(patternHeaderLength - 4U, (unsigned long)pattern.size()));
+    unsigned int count2 = pattern.read(*this, patternHeaderLength - 4U);
+    READ_ASSERT(count2 == std::min(patternHeaderLength - 4U, (unsigned long)pattern.size()));
 
-    seek(patternHeaderLength - (4 + count) + dataSize, Current);
+    seek(patternHeaderLength - (4 + count2) + dataSize, Current);
   }
 
   StringList intrumentNames;
@@ -583,17 +583,17 @@ void XM::File::read(bool)
     instrument.string(instrumentName, 22).byte(instrumentType).u16L(sampleCount);
 
     // 4 for instrumentHeaderSize
-    unsigned int count = 4 + instrument.read(*this, instrumentHeaderSize - 4U);
-    READ_ASSERT(count == std::min(instrumentHeaderSize, (unsigned long)instrument.size() + 4));
+    unsigned int count2 = 4 + instrument.read(*this, instrumentHeaderSize - 4U);
+    READ_ASSERT(count2 == std::min(instrumentHeaderSize, (unsigned long)instrument.size() + 4));
 
     long offset = 0;
     if(sampleCount > 0) {
       unsigned long sampleHeaderSize = 0;
       sumSampleCount += sampleCount;
       // wouldn't know which header size to assume otherwise:
-      READ_ASSERT(instrumentHeaderSize >= count + 4 && readU32L(sampleHeaderSize));
+      READ_ASSERT(instrumentHeaderSize >= count2 + 4 && readU32L(sampleHeaderSize));
       // skip unhandled header proportion:
-      seek(instrumentHeaderSize - count - 4, Current);
+      seek(instrumentHeaderSize - count2 - 4, Current);
 
       for(unsigned short j = 0; j < sampleCount; ++ j) {
         unsigned long sampleLength = 0;
@@ -618,17 +618,17 @@ void XM::File::read(bool)
               .byte(compression)
               .string(sampleName, 22);
 
-        unsigned int count = sample.read(*this, sampleHeaderSize);
-        READ_ASSERT(count == std::min(sampleHeaderSize, (unsigned long)sample.size()));
+        unsigned int count3 = sample.read(*this, sampleHeaderSize);
+        READ_ASSERT(count3 == std::min(sampleHeaderSize, (unsigned long)sample.size()));
         // skip unhandled header proportion:
-        seek(sampleHeaderSize - count, Current);
+        seek(sampleHeaderSize - count3, Current);
 
         offset += sampleLength;
         sampleNames.append(sampleName);
       }
     }
     else {
-      offset = instrumentHeaderSize - count;
+      offset = instrumentHeaderSize - count2;
     }
     intrumentNames.append(instrumentName);
     seek(offset, Current);

CMakeLists.txt

@@ -1,30 +1,12 @@
-# Strawberry Music Player
-# Copyright 2013, Jonas Kvinge <jonas@strawbs.net>
-#
-# Strawberry is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Strawberry is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
-
 project(strawberry)
-cmake_minimum_required(VERSION 2.8.11)
-if(CMAKE_VERSION VERSION_GREATER 3.0)
-  cmake_policy(SET CMP0054 NEW)
-endif()
+
+cmake_minimum_required(VERSION 3.0)
+cmake_policy(SET CMP0054 NEW)
 
 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)
@@ -33,6 +15,8 @@ include(cmake/Rpm.cmake)
 include(cmake/Deb.cmake)
 include(cmake/Dmg.cmake)
 
+set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
+
 if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
   set(LINUX ON)
 endif()
@@ -43,8 +27,46 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
   set(OPENBSD ON)
 endif()
 
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
 set(CMAKE_CXX_STANDARD 11)
-set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+list(APPEND COMPILE_OPTIONS
+  $<$<COMPILE_LANGUAGE:C>:--std=c99>
+  $<$<COMPILE_LANGUAGE:CXX>:--std=c++11>
+  -U__STRICT_ANSI__
+  -Wall
+  -Wextra
+  -Wpedantic
+  -Wunused
+  -Wshadow
+  -Wundef
+  -Wuninitialized
+  -Wredundant-decls
+  -Wcast-align
+  -Winit-self
+  -Wmissing-include-dirs
+  -Wmissing-declarations
+  -Wstrict-overflow=2
+  -Wunused-parameter
+  -Wformat=2
+  -Wdisabled-optimization
+  -Wno-sign-conversion
+  $<$<COMPILE_LANGUAGE:CXX>:-Woverloaded-virtual>
+  $<$<COMPILE_LANGUAGE:CXX>:-Wno-old-style-cast>
+  $<$<COMPILE_LANGUAGE:CXX>:-fpermissive>
+)
+
+if(APPLE)
+  list(APPEND COMPILE_OPTIONS -Wno-unused-parameter)
+endif()
+
+option(BUILD_WERROR "Build with -Werror" OFF)
+if(BUILD_WERROR)
+  list(APPEND COMPILE_OPTIONS -Werror)
+endif(BUILD_WERROR)
+
+add_compile_options(${COMPILE_OPTIONS})
 
 if(${CMAKE_BUILD_TYPE} MATCHES "Release")
   add_definitions(-DNDEBUG)
@@ -56,32 +78,21 @@ if(${CMAKE_BUILD_TYPE} MATCHES "Debug")
   set(DEBUG ON)
 endif()
 
-if (CMAKE_CXX_COMPILER MATCHES ".*clang")
-  set(CMAKE_COMPILER_IS_CLANGXX 1)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-uninitialized")
-endif()
-
-if (APPLE)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --stdlib=libc++")
-endif(APPLE)
-
 find_program(CCACHE_EXECUTABLE NAMES ccache)
 if (CCACHE_EXECUTABLE)
   message(STATUS "ccache found: will be used for compilation and linkage")
   SET_PROPERTY(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ${CCACHE_EXECUTABLE})
   SET_PROPERTY(GLOBAL PROPERTY RULE_LAUNCH_LINK ${CCACHE_EXECUTABLE})
 endif ()
-find_program(QT_LCONVERT_EXECUTABLE NAMES lconvert lconvert-qt5 PATHS ${QT_BINARY_DIR} NO_DEFAULT_PATH)
-find_program(QT_LCONVERT_EXECUTABLE NAMES lconvert lconvert-qt5)
 
 find_package(PkgConfig REQUIRED)
-pkg_check_modules(GLIB REQUIRED glib-2.0)
-pkg_check_modules(GIO REQUIRED gio-2.0)
-pkg_check_modules(GOBJECT REQUIRED gobject-2.0)
-pkg_check_modules(CDIO libcdio)
-find_package(Threads)
-find_package(GnuTLS)
 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)
 if(LINUX)
@@ -98,6 +109,10 @@ endif()
 if(X11_FOUND)
   set(HAVE_X11 ON)
 endif()
+pkg_check_modules(GLIB REQUIRED glib-2.0)
+pkg_check_modules(GIO REQUIRED gio-2.0)
+pkg_check_modules(GOBJECT REQUIRED gobject-2.0)
+pkg_check_modules(LIBCDIO libcdio)
 pkg_check_modules(GSTREAMER gstreamer-1.0)
 pkg_check_modules(GSTREAMER_BASE gstreamer-base-1.0)
 pkg_check_modules(GSTREAMER_AUDIO gstreamer-audio-1.0)
@@ -106,7 +121,6 @@ pkg_check_modules(GSTREAMER_TAG gstreamer-tag-1.0)
 pkg_check_modules(GSTREAMER_PBUTILS gstreamer-pbutils-1.0)
 pkg_check_modules(LIBXINE libxine)
 pkg_check_modules(LIBVLC libvlc)
-pkg_check_modules(PHONON phonon4qt5)
 pkg_check_modules(SQLITE REQUIRED sqlite3>=3.9)
 pkg_check_modules(LIBPULSE libpulse)
 pkg_check_modules(CHROMAPRINT libchromaprint)
@@ -118,12 +132,8 @@ pkg_check_modules(LIBPLIST libplist)
 find_package(Gettext)
 find_package(FFTW3)
 
-if(WIN32)
-  find_package(ZLIB REQUIRED)
-endif(WIN32)
-
 # QT
-set(QT_MIN_VERSION 5.5)
+set(QT_MIN_VERSION 5.6)
 set(QT_COMPONENTS Core Concurrent Widgets Network Sql)
 
 if(X11_FOUND)
@@ -139,7 +149,7 @@ if(WIN32)
   list(APPEND QT_COMPONENTS WinExtras)
 endif()
 
-find_package(Qt5 ${QT_MIN_VERSION} REQUIRED ${QT_COMPONENTS})
+find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS ${QT_COMPONENTS})
 
 set(QT_LIBRARIES ${Qt5Core_LIBRARIES} ${Qt5Concurrent_LIBRARIES} ${Qt5Widgets_LIBRARIES} ${Qt5Network_LIBRARIES} ${Qt5Sql_LIBRARIES})
 
@@ -157,7 +167,7 @@ if(Qt5WinExtras_FOUND)
   list(APPEND QT_LIBRARIES ${Qt5WinExtras_LIBRARIES})
 endif()
 
-find_package(Qt5LinguistTools CONFIG)
+find_package(Qt5 ${QT_MIN_VERSION} QUIET COMPONENTS LinguistTools CONFIG)
 if (Qt5LinguistTools_FOUND)
   set(QT_LCONVERT_EXECUTABLE Qt5::lconvert)
 endif()
@@ -187,13 +197,12 @@ pkg_check_modules(TAGLIB taglib)
 # - Audio file detection by content.
 # - DSF and DSDIFF support
 #
-if (TAGLIB_VERSION VERSION_GREATER 1.11.1 OR WIN32)
-  option(USE_SYSTEM_TAGLIB "Use system taglib" ON)
-else()
-  option(USE_SYSTEM_TAGLIB "Use system taglib" OFF)
-endif()
+# Some distros create their own version numbers for taglib so versions are not reliable anymore.
+# Force to use our own copy of taglib unless USE_SYSTEM_TAGLIB is set.
+
+option(USE_SYSTEM_TAGLIB "Use system taglib" OFF)
 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!")
@@ -210,6 +219,7 @@ else()
   add_subdirectory(3rdparty/utf8-cpp)
   add_subdirectory(3rdparty/taglib)
   set(HAVE_TAGLIB_DSFFILE ON)
+  add_definitions(-DTAGLIB_STATIC)
 endif()
 
 # SingleApplication
@@ -286,10 +296,6 @@ optional_component(VLC ON "Engine: VLC backend"
   DEPENDS "libvlc" LIBVLC_FOUND
 )
 
-optional_component(PHONON OFF "Engine: Phonon backend (UNSTABLE)"
-  DEPENDS "phonon4qt5" PHONON_FOUND
-)
-
 optional_component(CHROMAPRINT ON "Chromaprint (Tag fetching from Musicbrainz)"
   DEPENDS "chromaprint" CHROMAPRINT_FOUND
 )
@@ -303,7 +309,7 @@ optional_component(GLOBALSHORTCUTS ON "Global shortcuts"
 )
 
 optional_component(AUDIOCD ON "Devices: Audio CD support"
-  DEPENDS "libcdio" CDIO_FOUND
+  DEPENDS "libcdio" LIBCDIO_FOUND
 )
 
 optional_component(UDISKS2 ON "Devices: UDisks2 backend"
@@ -327,7 +333,7 @@ optional_component(IMOBILEDEVICE ON "Devices: iPhone, iPod Touch, iPad and Apple
   DEPENDS "libimobiledevice" LIBIMOBILEDEVICE_FOUND
   DEPENDS "libplist" LIBPLIST_FOUND
   DEPENDS "libusbmuxd" LIBUSBMUXD_FOUND
-  DEPENDS "libgpod" LIBGPOD_FOUND
+  DEPENDS "libgpod" HAVE_LIBGPOD
 )
 
 optional_component(SPARKLE ON "Sparkle integration"
@@ -340,9 +346,8 @@ 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(TIDAL ON "Tidal support")
 
 optional_component(MOODBAR ON "Moodbar"
   DEPENDS "fftw3" FFTW3_FOUND
@@ -400,17 +405,14 @@ if(HAVE_XINE)
   XINE_ANALYZER)
 endif()
 
-# Set up definitions and paths
+# Set up definitions
 
 add_definitions(-DBOOST_BIND_NO_PLACEHOLDERS)
 add_definitions(${QT_DEFINITIONS})
+add_definitions(-DQT_STRICT_ITERATORS)
 add_definitions(-DQT_USE_QSTRINGBUILDER)
 add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
-add_definitions(-DQT_NO_CAST_TO_ASCII -DQT_STRICT_ITERATORS)
-
-include_directories(${GLIB_INCLUDE_DIRS})
-include_directories(${GLIBCONFIG_INCLUDE_DIRS})
-include_directories(${TAGLIB_INCLUDE_DIRS})
+add_definitions(-DQT_NO_CAST_TO_ASCII)
 
 # Subdirectories
 add_subdirectory(src)
@@ -434,8 +436,8 @@ add_custom_target(uninstall
 
 # Show a summary of what we have enabled
 summary_show()
-if(NOT HAVE_GSTREAMER AND NOT HAVE_XINE AND NOT HAVE_VLC AND NOT HAVE_PHONON)
-  message(FATAL_ERROR "You need to have either GStreamer, Xine, VLC or Phonon to compile!")
+if(NOT HAVE_GSTREAMER AND NOT HAVE_XINE AND NOT HAVE_VLC)
+  message(FATAL_ERROR "You need to have either GStreamer, Xine or VLC to compile!")
 elseif(NOT HAVE_GSTREAMER)
   message(WARNING "GStreamer is the only engine that is fully implemented. Using other engines is possible but not recommended.")
 endif()

Changelog

@@ -2,6 +2,169 @@ Strawberry Music Player
 =======================
 ChangeLog
 
+0.6.12:
+
+  Bugfixes:
+    * Fixed height of about dialog.
+
+  Enhancements:
+    * Only save settings for pages that actually has been changed.
+    * Replaced use of deprecated Qt functionality as of 5.15.
+    * Made scrobbler show error dialog for all errors when show error dialog option is on.
+    * Dont append disc to album titles for Subsonic and Tidal.
+    * Sort folders added from file view.
+    * Changed default collection grouping to album - disc.
+
+0.6.11:
+
+  Bugfixes:
+    * Fixed MPRIS missing art url when playing albums with embedded cover.
+    * Fixed updating local non collection songs when manually unsetting cover.
+    * Fixed infinite loop and preceding crash when CSS background-color was set in qt5ct.
+    * Fixed UI freeze when updating the database from a large Subsonic or Tidal collection.
+    * Fixed crash when CD loading fails in devices.
+    * Fixed CD devices showing up with having 0 songs after loading.
+    * Fixed the album cover loading indicator being stuck if no cover providers were available.
+    * Fixed the playing widget not updating artist, album or title after metadata has changed for a song when no album cover was loaded.
+
+  Enhancements:
+    * Sort songs in collection by song title instead of track if previous grouping is not the album.
+    * Added option to switch on/off automatically searching for album covers to context settings.
+    * Reset last played song when playlist is finished.
+    * Checking content type of received HTTP request for image when receiving album covers.
+    * Added option to scrobbler setting for turning off login error popup.
+    * Made MusicBrainz and Discogs cover providers respect rate limiting.
+
+  New features:
+    * Added option to show/hide sidebar.
+    * Added settings for selecting album cover and lyrics providers.
+    * Added album covers from Musixmatch and Spotify.
+    * Added lyrics from Genius, Musixmatch and ChartLyrics.
+
+0.6.10:
+
+  Bugfixes:
+    * Fixed Subsonic album covers not working for albums with non ASCII charcters.
+    * Fixed reading date and genre from individual tracks in CUE sheets.
+    * Fixed resume playback on startup for CUE songs.
+    * Fixed album cover manager not showing complete album titles in the list of album covers.
+    * Fixed save album cover to file saving "no cover" image instead of actual album cover.
+    * Fixed device state text color in devices not being visible when using a dark theme.
+    * Fixed engine and device in context using too large icons when icons were loaded from the system theme.
+    * Fixed "Secure connection setup failed" problem on Windows when playing streams.
+    * Fixed margin for song title text in context.
+    * Fixed UNC paths with non ASCII charcters not working.
+
+  Enhancements:
+    * Allowing all characters except slash and backslash when organising music unless options to strip characters is checked.
+    * New option in organising music to remove problematic filename characters that removes less characters than the FAT option.
+    * General improvements to the album cover loader and album cover providers code.
+    * Fixed loading album cover images from album directory for songs added to the playlist from outside of the collection.
+    * Made automatic album cover search work for songs outside of the collection and for streams.
+    * Made album cover search work based on artist + title if album title is not present for providers supporting song/track search.
+    * Update art manual in playlist for local files, devices and CDDA to avoid loading covers multiple times.
+    * Made lyrics search work for streams.
+    * Added "add stream" to menu.
+    * Only showing song length in context when available.
+    * Sort album cover search results by score and pick the best 3 first before trying others to improve album cover search speed.
+    * Make scrobbler work for streams.
+    * Added search for lyrics as a seperate option in context.
+    * Made font and font sizes in context configurable.
+    * Splitting artist and song title to the relevant metadata when artist and song title is sent as title seperated by a dash in streams.
+    * Added label to show collection pixmap disk cache used in settings.
+    * Icreased default collection pixmap disk cache to 360.
+
+  New features:
+    * Added back Tidal streaming support.
+    * Added Qobuz album cover provider.
+
+  Removed features:
+    * Removed Phonon engine support.
+
+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, 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.
+    * (Windows) Fixed translations not being included.
+
+Version 0.6.7:
+
+    * Fixed crash when cancelling scrobbler authentication
+    * Fixed "Double clicking a song in the playlist" behaviour setting
+    * Fixed "Pressing Previous in player" behaviour setting
+    * Fixed updating compilations where there are spaces or special characters in filenames
+    * Fixed cases where songs were stuck in "Various Artists" because not all songs in
+      the same compilation was removed from the model before readded with actual artist.
+    * Fixed a bug when importing playlists where metadata was reset
+    * Fixed scrobbler to also scrobble songs without album title
+    * Fixed text for replay gain setting not loading in backend setting
+    * Added back lyrics from Chartlyrics
+    * Added ability to show fullsize cover on double-click in playing widget
+    * Added separator between "unset cover" and "show fullsize" in popup menu
+    * Removed left click on analyzer to popup menu
+    * (Windows) Added killproc executable to terminate running process before uninstalling
+
+Version 0.6.6:
+
+    * Fixed lowercased album artist in playlist column
+    * Fixed compiling with different optional features turned off
+    * Fixed hang in stream discoverer with certain formats
+    * Fixed Subsonic to correctly read disc
+    * Fixed preventing system logoff or shutdown
+    * Fixed correctly updating compilations
+    * Simplified gstreamer pipeline code
+    * Disabled showing analyzer for bit depths not supported by the analyzer
+    * Made stereo balancer independent from equalizer
+    * Added option to prefer album artist when sending scrobbles
+    * Removed lines in settings
+    * Added limit for number of tagreader processes to 2
+    * Improved system theme icon option to better pick correct icons
+    * Added option to automatically select current playing track
+    * (Windows) Added support for WASAPI
+
 Version 0.6.5:
 
     * Fixed scrobbler not to send scrobbles multiple times when metadata is updated

Dockerfile

@@ -1,4 +1,4 @@
-from jonaski/opensuse:tumbleweed
+from jonaski/opensuse:lp151
 
 run mkdir -p /usr/src/app
 workdir /usr/src/app

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)
-[![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=FRJUYV5QP6HW8)
+: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 fund 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,18 +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, Musicbrainz, Discogs, Deezer and Tidal
-  * Song lyrics from AudD, lyrics.ovh and lololyrics.com
+  * Album cover art from [Last.fm](https://www.last.fm/), [Musicbrainz](https://musicbrainz.org/), [Discogs](https://www.discogs.com/), [Musixmatch](https://www.musixmatch.com/), [Deezer](https://www.deezer.com/), [Tidal](https://www.tidal.com/), [Qobuz](https://www.qobuz.com/) and [Spotify](https://www.spotify.com/)
+  * Song lyrics from [AudD](https://audd.io/), [Genius](https://genius.com/), [Musixmatch](https://www.musixmatch.com/), [ChartLyrics](http://www.chartlyrics.com/), [lyrics.ovh](https://lyrics.ovh/) and [lololyrics.com](https://www.lololyrics.com/)
   * Support for multiple backends
   * Audio analyzer
   * Audio equalizer
   * Transfer music to iPod, iPhone, MTP or mass-storage USB player
-  * Streaming support for Tidal, Qobuz and Subsonic
-  * Scrobbler with support for Last.fm, Libre.fm and ListenBrainz
+  * Scrobbler with support for [Last.fm](https://www.last.fm/), [Libre.fm](https://libre.fm/) and [ListenBrainz](https://listenbrainz.org/)
+  * Subsonic and Tidal 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. Development builds are available**
 
 ### :heavy_exclamation_mark: Requirements
 
@@ -42,14 +56,14 @@ 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)
 * [ALSA library (linux)](https://www.alsa-project.org/)
 * [DBus (linux)](https://www.freedesktop.org/wiki/Software/dbus/)
 * [PulseAudio (linux optional)](https://www.freedesktop.org/wiki/Software/PulseAudio/?)
-* [GStreamer](https://gstreamer.freedesktop.org/), [Xine](https://www.xine-project.org), [VLC](https://www.videolan.org) or [Phonon](https://techbase.kde.org/Phonon)
+* [GStreamer](https://gstreamer.freedesktop.org/), [Xine](https://www.xine-project.org) or [VLC](https://www.videolan.org)
 * [GnuTLS](https://www.gnutls.org/)
 
 Optional dependencies:
@@ -60,14 +74,14 @@ Optional dependencies:
 * iPhone, iPod Touch, iPad and Apple TV devices: [libimobiledevice, libplist and libusbmuxd](https://www.libimobiledevice.org/)
 * Moodbar: [fftw3](http://www.fftw.org/)
 
-Either GStreamer, Xine, VLC or Phonon engine is required, but only GStreamer is fully implemented so far.
+Either GStreamer, Xine or VLC engine is required, but only GStreamer is fully implemented so far.
 You should also install the gstreamer plugins base and good, and optionally bad and ugly.
 
 ### :wrench:	Compiling from source
 
 ### Get the code:
 
-    git clone https://github.com/jonaski/strawberry
+    git clone https://github.com/strawberrymusicplayer/strawberry
 
 ### Compile and install:
 
@@ -81,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://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=FRJUYV5QP6HW8)

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/Dmg.cmake

@@ -1,6 +1,6 @@
 add_custom_target(dmg
-  COMMAND sudo /usr/local/opt/qt5/bin/macdeployqt strawberry.app
-  COMMAND sudo ${CMAKE_SOURCE_DIR}/dist/macos/macdeploy.py strawberry.app
-  COMMAND sudo ${CMAKE_SOURCE_DIR}/dist/macos/create-dmg.sh strawberry.app
+  COMMAND /usr/local/opt/qt5/bin/macdeployqt strawberry.app
+  COMMAND ${CMAKE_SOURCE_DIR}/dist/macos/macdeploy.py strawberry.app
+  COMMAND ${CMAKE_SOURCE_DIR}/dist/macos/create-dmg.sh strawberry.app
   WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
 )

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,11 +57,12 @@ 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/unix/strawberry.spec.in ${CMAKE_SOURCE_DIR}/dist/unix/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/
-      COMMAND ${RPMBUILD_EXEC} -bs ${CMAKE_SOURCE_DIR}/dist/rpm/strawberry.spec
-      COMMAND ${RPMBUILD_EXEC} -bb ${CMAKE_SOURCE_DIR}/dist/rpm/strawberry.spec
+      COMMAND ${RPMBUILD_EXEC} -bs ${CMAKE_SOURCE_DIR}/dist/unix/strawberry.spec
+      COMMAND ${RPMBUILD_EXEC} -bb ${CMAKE_SOURCE_DIR}/dist/unix/strawberry.spec
     )
   endif()
 endif()

cmake/Toolchain-i686-w64-mingw32-shared.cmake

@@ -0,0 +1,9 @@
+SET(CMAKE_SYSTEM_NAME Windows)
+SET(HOME "$ENV{HOME}")
+SET(CMAKE_C_COMPILER "${HOME}/mxe-shared/usr/bin/i686-w64-mingw32.shared-gcc")
+SET(CMAKE_CXX_COMPILER "${HOME}/mxe-shared/usr/bin/i686-w64-mingw32.shared-g++")
+SET(CMAKE_RC_COMPILER "${HOME}/mxe-shared/usr/bin/i686-w64-mingw32.shared-windres")
+SET(CMAKE_FIND_ROOT_PATH "${HOME}/mxe-shared/usr/i686-w64-mingw32.shared/")
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)

cmake/Toolchain-x86_64-w64-mingw32-shared.cmake

@@ -0,0 +1,9 @@
+SET(CMAKE_SYSTEM_NAME Windows)
+SET(HOME "$ENV{HOME}")
+SET(CMAKE_C_COMPILER "${HOME}/mxe-shared/usr/bin/x86_64-w64-mingw32.shared-gcc")
+SET(CMAKE_CXX_COMPILER "${HOME}/mxe-shared/usr/bin/x86_64-w64-mingw32.shared-g++")
+SET(CMAKE_RC_COMPILER "${HOME}/mxe-shared/usr/bin/x86_64-w64-mingw32.shared-windres")
+SET(CMAKE_FIND_ROOT_PATH "${HOME}/mxe-shared/usr/x86_64-w64-mingw32.shared/")
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)

cmake/Version.cmake

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

data/data.qrc

@@ -10,6 +10,9 @@
         <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/schema-11.sql</file>
+        <file>schema/schema-12.sql</file>
         <file>schema/device-schema.sql</file>
         <file>style/strawberry.css</file>
         <file>html/playing-tooltip-plain.html</file>
@@ -39,5 +42,6 @@
         <file>pictures/rainbowdash.png</file>
         <file>fonts/HumongousofEternitySt.ttf</file>
         <file>mood/sample.mood</file>
+        <file>text/ghosts.txt</file>
     </qresource>
 </RCC>

data/icons.qrc

@@ -6,7 +6,7 @@
         <file>icons/128x128/applications-internet.png</file>
         <file>icons/128x128/bluetooth.png</file>
         <file>icons/128x128/cdcase.png</file>
-        <file>icons/128x128/cd.png</file>
+        <file>icons/128x128/media-optical.png</file>
         <file>icons/128x128/configure.png</file>
         <file>icons/128x128/device-ipod-nano.png</file>
         <file>icons/128x128/device-ipod.png</file>
@@ -57,9 +57,9 @@
         <file>icons/128x128/mcintosh-player.png</file>
         <file>icons/128x128/mcintosh-text.png</file>
         <file>icons/128x128/media-eject.png</file>
-        <file>icons/128x128/media-pause.png</file>
-        <file>icons/128x128/media-play.png</file>
-        <file>icons/128x128/media-stop.png</file>
+        <file>icons/128x128/media-playback-pause.png</file>
+        <file>icons/128x128/media-playback-start.png</file>
+        <file>icons/128x128/media-playback-stop.png</file>
         <file>icons/128x128/media-skip-forward.png</file>
         <file>icons/128x128/media-skip-backward.png</file>
         <file>icons/128x128/media-seek-forward.png</file>
@@ -79,7 +79,7 @@
         <file>icons/128x128/view-media-playlist.png</file>
         <file>icons/128x128/view-media-visualization.png</file>
         <file>icons/128x128/view-refresh.png</file>
-        <file>icons/128x128/vinyl.png</file>
+        <file>icons/128x128/library-music.png</file>
         <file>icons/128x128/vlc.png</file>
         <file>icons/128x128/xine.png</file>
         <file>icons/128x128/zoom-in.png</file>
@@ -90,14 +90,13 @@
         <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>
         <file>icons/64x64/applications-internet.png</file>
         <file>icons/64x64/bluetooth.png</file>
         <file>icons/64x64/cdcase.png</file>
-        <file>icons/64x64/cd.png</file>
+        <file>icons/64x64/media-optical.png</file>
         <file>icons/64x64/configure.png</file>
         <file>icons/64x64/device-ipod-nano.png</file>
         <file>icons/64x64/device-ipod.png</file>
@@ -148,9 +147,9 @@
         <file>icons/64x64/mcintosh-player.png</file>
         <file>icons/64x64/mcintosh-text.png</file>
         <file>icons/64x64/media-eject.png</file>
-        <file>icons/64x64/media-pause.png</file>
-        <file>icons/64x64/media-play.png</file>
-        <file>icons/64x64/media-stop.png</file>
+        <file>icons/64x64/media-playback-pause.png</file>
+        <file>icons/64x64/media-playback-start.png</file>
+        <file>icons/64x64/media-playback-stop.png</file>
         <file>icons/64x64/media-skip-forward.png</file>
         <file>icons/64x64/media-skip-backward.png</file>
         <file>icons/64x64/media-seek-forward.png</file>
@@ -171,7 +170,7 @@
         <file>icons/64x64/view-media-playlist.png</file>
         <file>icons/64x64/view-media-visualization.png</file>
         <file>icons/64x64/view-refresh.png</file>
-        <file>icons/64x64/vinyl.png</file>
+        <file>icons/64x64/library-music.png</file>
         <file>icons/64x64/vlc.png</file>
         <file>icons/64x64/xine.png</file>
         <file>icons/64x64/zoom-in.png</file>
@@ -182,14 +181,13 @@
         <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>
         <file>icons/48x48/applications-internet.png</file>
         <file>icons/48x48/bluetooth.png</file>
         <file>icons/48x48/cdcase.png</file>
-        <file>icons/48x48/cd.png</file>
+        <file>icons/48x48/media-optical.png</file>
         <file>icons/48x48/configure.png</file>
         <file>icons/48x48/device-ipod-nano.png</file>
         <file>icons/48x48/device-ipod.png</file>
@@ -205,6 +203,7 @@
         <file>icons/48x48/document-download.png</file>
         <file>icons/48x48/document-new.png</file>
         <file>icons/48x48/document-open-folder.png</file>
+        <file>icons/48x48/document-open-remote.png</file>
         <file>icons/48x48/document-open.png</file>
         <file>icons/48x48/document-save.png</file>
         <file>icons/48x48/document-search.png</file>
@@ -241,11 +240,11 @@
         <file>icons/48x48/mcintosh.png</file>
         <file>icons/48x48/mcintosh-text.png</file>
         <file>icons/48x48/media-eject.png</file>
-        <file>icons/48x48/media-pause.png</file>
+        <file>icons/48x48/media-playback-pause.png</file>
         <file>icons/48x48/media-playlist-repeat.png</file>
         <file>icons/48x48/media-playlist-shuffle.png</file>
-        <file>icons/48x48/media-play.png</file>
-        <file>icons/48x48/media-stop.png</file>
+        <file>icons/48x48/media-playback-start.png</file>
+        <file>icons/48x48/media-playback-stop.png</file>
         <file>icons/48x48/media-skip-forward.png</file>
         <file>icons/48x48/media-skip-backward.png</file>
         <file>icons/48x48/media-seek-forward.png</file>
@@ -266,7 +265,7 @@
         <file>icons/48x48/view-media-playlist.png</file>
         <file>icons/48x48/view-media-visualization.png</file>
         <file>icons/48x48/view-refresh.png</file>
-        <file>icons/48x48/vinyl.png</file>
+        <file>icons/48x48/library-music.png</file>
         <file>icons/48x48/vlc.png</file>
         <file>icons/48x48/xine.png</file>
         <file>icons/48x48/zoom-in.png</file>
@@ -277,14 +276,13 @@
         <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>
         <file>icons/32x32/applications-internet.png</file>
         <file>icons/32x32/bluetooth.png</file>
         <file>icons/32x32/cdcase.png</file>
-        <file>icons/32x32/cd.png</file>
+        <file>icons/32x32/media-optical.png</file>
         <file>icons/32x32/configure.png</file>
         <file>icons/32x32/device-ipod-nano.png</file>
         <file>icons/32x32/device-ipod.png</file>
@@ -300,6 +298,7 @@
         <file>icons/32x32/document-download.png</file>
         <file>icons/32x32/document-new.png</file>
         <file>icons/32x32/document-open-folder.png</file>
+        <file>icons/32x32/document-open-remote.png</file>
         <file>icons/32x32/document-open.png</file>
         <file>icons/32x32/document-save.png</file>
         <file>icons/32x32/document-search.png</file>
@@ -336,11 +335,11 @@
         <file>icons/32x32/mcintosh.png</file>
         <file>icons/32x32/mcintosh-text.png</file>
         <file>icons/32x32/media-eject.png</file>
-        <file>icons/32x32/media-pause.png</file>
+        <file>icons/32x32/media-playback-pause.png</file>
         <file>icons/32x32/media-playlist-repeat.png</file>
         <file>icons/32x32/media-playlist-shuffle.png</file>
-        <file>icons/32x32/media-play.png</file>
-        <file>icons/32x32/media-stop.png</file>
+        <file>icons/32x32/media-playback-start.png</file>
+        <file>icons/32x32/media-playback-stop.png</file>
         <file>icons/32x32/media-skip-forward.png</file>
         <file>icons/32x32/media-skip-backward.png</file>
         <file>icons/32x32/media-seek-forward.png</file>
@@ -361,7 +360,7 @@
         <file>icons/32x32/view-media-playlist.png</file>
         <file>icons/32x32/view-media-visualization.png</file>
         <file>icons/32x32/view-refresh.png</file>
-        <file>icons/32x32/vinyl.png</file>
+        <file>icons/32x32/library-music.png</file>
         <file>icons/32x32/vlc.png</file>
         <file>icons/32x32/xine.png</file>
         <file>icons/32x32/zoom-in.png</file>
@@ -372,14 +371,13 @@
         <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>
         <file>icons/22x22/applications-internet.png</file>
         <file>icons/22x22/bluetooth.png</file>
         <file>icons/22x22/cdcase.png</file>
-        <file>icons/22x22/cd.png</file>
+        <file>icons/22x22/media-optical.png</file>
         <file>icons/22x22/configure.png</file>
         <file>icons/22x22/device-ipod-nano.png</file>
         <file>icons/22x22/device-ipod.png</file>
@@ -395,6 +393,7 @@
         <file>icons/22x22/document-download.png</file>
         <file>icons/22x22/document-new.png</file>
         <file>icons/22x22/document-open-folder.png</file>
+        <file>icons/22x22/document-open-remote.png</file>
         <file>icons/22x22/document-open.png</file>
         <file>icons/22x22/document-save.png</file>
         <file>icons/22x22/document-search.png</file>
@@ -431,11 +430,11 @@
         <file>icons/22x22/mcintosh.png</file>
         <file>icons/22x22/mcintosh-text.png</file>
         <file>icons/22x22/media-eject.png</file>
-        <file>icons/22x22/media-pause.png</file>
+        <file>icons/22x22/media-playback-pause.png</file>
         <file>icons/22x22/media-playlist-repeat.png</file>
         <file>icons/22x22/media-playlist-shuffle.png</file>
-        <file>icons/22x22/media-play.png</file>
-        <file>icons/22x22/media-stop.png</file>
+        <file>icons/22x22/media-playback-start.png</file>
+        <file>icons/22x22/media-playback-stop.png</file>
         <file>icons/22x22/media-skip-forward.png</file>
         <file>icons/22x22/media-skip-backward.png</file>
         <file>icons/22x22/media-seek-forward.png</file>
@@ -456,7 +455,7 @@
         <file>icons/22x22/view-media-playlist.png</file>
         <file>icons/22x22/view-media-visualization.png</file>
         <file>icons/22x22/view-refresh.png</file>
-        <file>icons/22x22/vinyl.png</file>
+        <file>icons/22x22/library-music.png</file>
         <file>icons/22x22/vlc.png</file>
         <file>icons/22x22/xine.png</file>
         <file>icons/22x22/zoom-in.png</file>
@@ -467,6 +466,5 @@
         <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/device-schema.sql

@@ -11,25 +11,25 @@ CREATE TABLE device_%deviceid_subdirectories (
 
 CREATE TABLE device_%deviceid_songs (
 
-  title TEXT NOT NULL,
-  album TEXT NOT NULL,
-  artist TEXT NOT NULL,
-  albumartist TEXT NOT NULL,
+  title TEXT,
+  album TEXT,
+  artist TEXT,
+  albumartist TEXT,
   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,
+  genre TEXT,
+  compilation INTEGER NOT NULL DEFAULT 0,
+  composer TEXT,
+  performer TEXT,
+  grouping TEXT,
+  comment TEXT,
+  lyrics TEXT,
 
-  artist_id INTEGER NOT NULL DEFAULT -1,
-  album_id TEXT NOT NULL,
-  song_id INTEGER NOT NULL DEFAULT -1,
+  artist_id TEXT,
+  album_id TEXT,
+  song_id TEXT,
 
   beginning INTEGER NOT NULL DEFAULT 0,
   length INTEGER NOT NULL DEFAULT 0,

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-11.sql

@@ -0,0 +1,247 @@
+DROP VIEW IF EXISTS duplicated_songs;
+
+DROP INDEX IF EXISTS idx_url;
+
+DROP INDEX IF EXISTS idx_comp_artist;
+
+DROP INDEX IF EXISTS idx_albumartist;
+
+DROP INDEX IF EXISTS idx_artist;
+
+DROP INDEX IF EXISTS idx_album;
+
+DROP INDEX IF EXISTS idx_title;
+
+ALTER TABLE songs RENAME TO songs_old;
+
+ALTER TABLE subsonic_songs RENAME TO subsonic_songs_old;
+
+ALTER TABLE playlist_items RENAME TO playlist_items_old;
+
+CREATE TABLE songs (
+
+  title TEXT,
+  album TEXT,
+  artist TEXT,
+  albumartist TEXT,
+  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,
+  compilation INTEGER NOT NULL DEFAULT 0,
+  composer TEXT,
+  performer TEXT,
+  grouping TEXT,
+  comment TEXT,
+  lyrics TEXT,
+
+  artist_id TEXT,
+  album_id TEXT,
+  song_id TEXT,
+
+  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 INDEX IF NOT EXISTS idx_url ON songs (url);
+
+CREATE INDEX IF NOT EXISTS idx_comp_artist ON songs (compilation_effective, artist);
+
+CREATE INDEX IF NOT EXISTS idx_albumartist ON songs (albumartist);
+
+CREATE INDEX IF NOT EXISTS idx_artist ON songs (artist);
+
+CREATE INDEX IF NOT EXISTS idx_album ON songs (album);
+
+CREATE INDEX IF NOT EXISTS idx_title ON songs (title);
+
+CREATE VIEW duplicated_songs as select artist dup_artist, album dup_album, title dup_title from songs as inner_songs where artist != '' and album != '' and title != '' and unavailable = 0 group by artist, album , title having count(*) > 1;
+
+CREATE TABLE subsonic_songs (
+
+  title TEXT,
+  album TEXT,
+  artist TEXT,
+  albumartist TEXT,
+  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,
+  compilation INTEGER NOT NULL DEFAULT 0,
+  composer TEXT,
+  performer TEXT,
+  grouping TEXT,
+  comment TEXT,
+  lyrics TEXT,
+
+  artist_id TEXT,
+  album_id TEXT,
+  song_id TEXT,
+
+  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
+
+);
+
+INSERT INTO songs (ROWID, title, album, artist, albumartist, track, disc, year, originalyear, genre, compilation, composer, performer, grouping, comment, lyrics, artist_id, album_id, song_id, beginning, length, bitrate, samplerate, bitdepth, source, directory_id, url, filetype, filesize, mtime, ctime, unavailable, playcount, skipcount, lastplayed, compilation_detected, compilation_on, compilation_off, compilation_effective, art_automatic, art_manual, effective_albumartist, effective_originalyear, cue_path)
+SELECT ROWID, title, album, artist, albumartist, track, disc, year, originalyear, genre, compilation, composer, performer, grouping, comment, lyrics, artist_id, album_id, song_id, beginning, length, bitrate, samplerate, bitdepth, source, directory_id, url, filetype, filesize, mtime, ctime, unavailable, playcount, skipcount, lastplayed, compilation_detected, compilation_on, compilation_off, compilation_effective, art_automatic, art_manual, effective_albumartist, effective_originalyear, cue_path
+FROM songs_old;
+
+DROP TABLE songs_old;
+
+DELETE FROM songs_fts;
+
+INSERT INTO songs_fts (ROWID, ftstitle, ftsalbum, ftsartist, ftsalbumartist, ftscomposer, ftsperformer, ftsgrouping, ftsgenre, ftscomment)
+SELECT ROWID, title, album, artist, albumartist, composer, performer, grouping, genre, comment
+FROM songs;
+
+INSERT INTO subsonic_songs (ROWID, title, album, artist, albumartist, track, disc, year, originalyear, genre, compilation, composer, performer, grouping, comment, lyrics, artist_id, album_id, song_id, beginning, length, bitrate, samplerate, bitdepth, source, directory_id, url, filetype, filesize, mtime, ctime, unavailable, playcount, skipcount, lastplayed, compilation_detected, compilation_on, compilation_off, compilation_effective, art_automatic, art_manual, effective_albumartist, effective_originalyear, cue_path)
+SELECT ROWID, title, album, artist, albumartist, track, disc, year, originalyear, genre, compilation, composer, performer, grouping, comment, lyrics, artist_id, album_id, song_id, beginning, length, bitrate, samplerate, bitdepth, source, directory_id, url, filetype, filesize, mtime, ctime, unavailable, playcount, skipcount, lastplayed, compilation_detected, compilation_on, compilation_off, compilation_effective, art_automatic, art_manual, effective_albumartist, effective_originalyear, cue_path
+FROM subsonic_songs_old;
+
+DROP TABLE subsonic_songs_old;
+
+DELETE FROM subsonic_songs_fts;
+
+INSERT INTO subsonic_songs_fts (ROWID, ftstitle, ftsalbum, ftsartist, ftsalbumartist, ftscomposer, ftsperformer, ftsgrouping, ftsgenre, ftscomment)
+SELECT ROWID, title, album, artist, albumartist, composer, performer, grouping, genre, comment
+FROM subsonic_songs;
+
+CREATE TABLE playlist_items (
+
+  playlist INTEGER NOT NULL,
+  type INTEGER NOT NULL DEFAULT 0,
+  collection_id INTEGER,
+  playlist_url TEXT,
+
+  title TEXT,
+  album TEXT,
+  artist TEXT,
+  albumartist TEXT,
+  track INTEGER,
+  disc INTEGER,
+  year INTEGER,
+  originalyear INTEGER,
+  genre TEXT,
+  compilation INTEGER DEFAULT 0,
+  composer TEXT,
+  performer TEXT,
+  grouping TEXT,
+  comment TEXT,
+  lyrics TEXT,
+
+  artist_id TEXT,
+  album_id TEXT,
+  song_id TEXT,
+
+  beginning INTEGER,
+  length INTEGER,
+
+  bitrate INTEGER,
+  samplerate INTEGER,
+  bitdepth INTEGER,
+
+  source INTEGER,
+  directory_id INTEGER,
+  url TEXT,
+  filetype INTEGER,
+  filesize INTEGER,
+  mtime INTEGER,
+  ctime INTEGER,
+  unavailable INTEGER DEFAULT 0,
+
+  playcount INTEGER DEFAULT 0,
+  skipcount INTEGER DEFAULT 0,
+  lastplayed INTEGER DEFAULT 0,
+
+  compilation_detected INTEGER DEFAULT 0,
+  compilation_on INTEGER DEFAULT 0,
+  compilation_off INTEGER DEFAULT 0,
+  compilation_effective INTEGER DEFAULT 0,
+
+  art_automatic TEXT,
+  art_manual TEXT,
+
+  effective_albumartist TEXT,
+  effective_originalyear INTEGER,
+
+  cue_path TEXT
+
+);
+
+INSERT INTO playlist_items (ROWID, playlist, type, collection_id, playlist_url, title, album, artist, albumartist, track, disc, year, originalyear, genre, compilation, composer, performer, grouping, comment, lyrics, artist_id, album_id, song_id, beginning, length, bitrate, samplerate, bitdepth, source, directory_id, url, filetype, filesize, mtime, ctime, unavailable, playcount, skipcount, lastplayed, compilation_detected, compilation_on, compilation_off, compilation_effective, art_automatic, art_manual, effective_albumartist, effective_originalyear, cue_path)
+SELECT ROWID, playlist, type, collection_id, playlist_url, title, album, artist, albumartist, track, disc, year, originalyear, genre, compilation, composer, performer, grouping, comment, lyrics, artist_id, album_id, song_id, beginning, length, bitrate, samplerate, bitdepth, source, directory_id, url, filetype, filesize, mtime, ctime, unavailable, playcount, skipcount, lastplayed, compilation_detected, compilation_on, compilation_off, compilation_effective, art_automatic, art_manual, effective_albumartist, effective_originalyear, cue_path
+FROM playlist_items_old;
+
+DROP TABLE playlist_items_old;
+
+DELETE FROM playlist_items_fts_;
+
+INSERT INTO playlist_items_fts_ (ROWID, ftstitle, ftsalbum, ftsartist, ftsalbumartist, ftscomposer, ftsperformer, ftsgrouping, ftsgenre, ftscomment)
+SELECT ROWID, title, album, artist, albumartist, composer, performer, grouping, genre, comment
+FROM playlist_items;
+
+UPDATE schema_version SET version=11;

data/schema/schema-12.sql

@@ -0,0 +1,217 @@
+CREATE TABLE IF NOT EXISTS tidal_artists_songs (
+
+  title TEXT,
+  album TEXT,
+  artist TEXT,
+  albumartist TEXT,
+  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,
+  compilation INTEGER NOT NULL DEFAULT 0,
+  composer TEXT,
+  performer TEXT,
+  grouping TEXT,
+  comment TEXT,
+  lyrics TEXT,
+
+  artist_id TEXT,
+  album_id TEXT,
+  song_id TEXT,
+
+  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,
+  album TEXT,
+  artist TEXT,
+  albumartist TEXT,
+  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,
+  compilation INTEGER NOT NULL DEFAULT 0,
+  composer TEXT,
+  performer TEXT,
+  grouping TEXT,
+  comment TEXT,
+  lyrics TEXT,
+
+  artist_id TEXT,
+  album_id TEXT,
+  song_id TEXT,
+
+  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,
+  album TEXT,
+  artist TEXT,
+  albumartist TEXT,
+  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,
+  compilation INTEGER NOT NULL DEFAULT 0,
+  composer TEXT,
+  performer TEXT,
+  grouping TEXT,
+  comment TEXT,
+  lyrics TEXT,
+
+  artist_id TEXT,
+  album_id TEXT,
+  song_id TEXT,
+
+  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 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"
+
+);
+
+UPDATE schema_version SET version=12;