Release 1.0.5

Fixes #972

.circleci/config.yml

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

.github/FUNDING.yml

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

.github/ISSUE_TEMPLATE.md

@@ -7,7 +7,8 @@ assignees: ''
 
 ---
 
-For technical issues, questions and feature suggestions/requests please use the forum on https://forum.strawberrymusicplayer.org/
+For technical issues, questions and discussion please use the forum on https://forum.strawberrymusicplayer.org/
+Any issues related to feature requests will be closed. See the README for more details.
 
 Check the Changelog to see if the issue is already fixed:
 https://github.com/strawberrymusicplayer/strawberry/blob/master/Changelog

.gitignore

@@ -105,7 +105,6 @@ Thumbs.db
 # Stuff in dist
 maketarball.sh
 changelog
-PKGBUILD
 
 # Translations
 translations.pot
@@ -119,3 +118,8 @@ stage/
 *.snap
 /snap/.snapcraft/
 /*_source.tar.bz2
+
+# MSVC
+CMakeSettings.json
+/.vs/
+/out/

.travis.yml

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

3rdparty/README.md

@@ -23,3 +23,8 @@ macdeployqt
 A modified version of Qt's official macdeployqt utility that fixes some issues,
 this version also deploys gstreamer plugins.
 Can safely be deleted on other platforms.
+
+
+getopt
+------
+getopt included only when compiling with MSVC on Windows.

3rdparty/getopt/CMakeLists.txt

@@ -0,0 +1,2 @@
+add_library(getopt STATIC getopt.c)
+target_include_directories(getopt PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})

3rdparty/getopt/getopt.c

@@ -0,0 +1,562 @@
+/*	$OpenBSD: getopt_long.c,v 1.23 2007/10/31 12:34:57 chl Exp $	*/
+/*	$NetBSD: getopt_long.c,v 1.15 2002/01/31 22:43:40 tv Exp $	*/
+
+/*
+ * Copyright (c) 2002 Todd C. Miller <Todd.Miller@courtesan.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Sponsored in part by the Defense Advanced Research Projects
+ * Agency (DARPA) and Air Force Research Laboratory, Air Force
+ * Materiel Command, USAF, under agreement number F39502-99-1-0512.
+ */
+/*-
+ * Copyright (c) 2000 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Dieter Baron and Thomas Klausner.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <getopt.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <windows.h>
+
+#define	REPLACE_GETOPT		/* use this getopt as the system getopt(3) */
+
+#ifdef REPLACE_GETOPT
+int	opterr = 1;		/* if error message should be printed */
+int	optind = 1;		/* index into parent argv vector */
+int	optopt = '?';		/* character checked for validity */
+#undef	optreset		/* see getopt.h */
+#define	optreset		__mingw_optreset
+int	optreset;		/* reset getopt */
+char    *optarg;		/* argument associated with option */
+#endif
+
+#define PRINT_ERROR	((opterr) && (*options != ':'))
+
+#define FLAG_PERMUTE	0x01	/* permute non-options to the end of argv */
+#define FLAG_ALLARGS	0x02	/* treat non-options as args to option "-1" */
+#define FLAG_LONGONLY	0x04	/* operate as getopt_long_only */
+
+/* return values */
+#define	BADCH		(int)'?'
+#define	BADARG		((*options == ':') ? (int)':' : (int)'?')
+#define	INORDER 	(int)1
+
+#ifndef __CYGWIN__
+#define __progname __argv[0]
+#else
+extern char __declspec(dllimport) *__progname;
+#endif
+
+#ifdef __CYGWIN__
+static char EMSG[] = "";
+#else
+#define	EMSG		""
+#endif
+
+static int getopt_internal(int, char * const *, const char *,
+			   const struct option *, int *, int);
+static int parse_long_options(char * const *, const char *,
+			      const struct option *, int *, int);
+static int gcd(int, int);
+static void permute_args(int, int, int, char * const *);
+
+static char *place = EMSG; /* option letter processing */
+
+/* XXX: set optreset to 1 rather than these two */
+static int nonopt_start = -1; /* first non option argument (for permute) */
+static int nonopt_end = -1;   /* first option after non options (for permute) */
+
+/* Error messages */
+static const char recargchar[] = "option requires an argument -- %c";
+static const char recargstring[] = "option requires an argument -- %s";
+static const char ambig[] = "ambiguous option -- %.*s";
+static const char noarg[] = "option doesn't take an argument -- %.*s";
+static const char illoptchar[] = "unknown option -- %c";
+static const char illoptstring[] = "unknown option -- %s";
+
+static void
+_vwarnx(const char *fmt,va_list ap)
+{
+  (void)fprintf(stderr,"%s: ",__progname);
+  if (fmt != NULL)
+    (void)vfprintf(stderr,fmt,ap);
+  (void)fprintf(stderr,"\n");
+}
+
+static void
+warnx(const char *fmt,...)
+{
+  va_list ap;
+  va_start(ap,fmt);
+  _vwarnx(fmt,ap);
+  va_end(ap);
+}
+
+/*
+ * Compute the greatest common divisor of a and b.
+ */
+static int
+gcd(int a, int b)
+{
+	int c;
+
+	c = a % b;
+	while (c != 0) {
+		a = b;
+		b = c;
+		c = a % b;
+	}
+
+	return (b);
+}
+
+/*
+ * Exchange the block from nonopt_start to nonopt_end with the block
+ * from nonopt_end to opt_end (keeping the same order of arguments
+ * in each block).
+ */
+static void
+permute_args(int panonopt_start, int panonopt_end, int opt_end,
+	char * const *nargv)
+{
+	int cstart, cyclelen, i, j, ncycle, nnonopts, nopts, pos;
+	char *swap;
+
+	/*
+	 * compute lengths of blocks and number and size of cycles
+	 */
+	nnonopts = panonopt_end - panonopt_start;
+	nopts = opt_end - panonopt_end;
+	ncycle = gcd(nnonopts, nopts);
+	cyclelen = (opt_end - panonopt_start) / ncycle;
+
+	for (i = 0; i < ncycle; i++) {
+		cstart = panonopt_end+i;
+		pos = cstart;
+		for (j = 0; j < cyclelen; j++) {
+			if (pos >= panonopt_end)
+				pos -= nnonopts;
+			else
+				pos += nopts;
+			swap = nargv[pos];
+			/* LINTED const cast */
+			((char **) nargv)[pos] = nargv[cstart];
+			/* LINTED const cast */
+			((char **)nargv)[cstart] = swap;
+		}
+	}
+}
+
+/*
+ * parse_long_options --
+ *	Parse long options in argc/argv argument vector.
+ * Returns -1 if short_too is set and the option does not match long_options.
+ */
+static int
+parse_long_options(char * const *nargv, const char *options,
+	const struct option *long_options, int *idx, int short_too)
+{
+	char *current_argv, *has_equal;
+	size_t current_argv_len;
+	int i, ambiguous, match;
+
+#define IDENTICAL_INTERPRETATION(_x, _y)                                \
+	(long_options[(_x)].has_arg == long_options[(_y)].has_arg &&    \
+	 long_options[(_x)].flag == long_options[(_y)].flag &&          \
+	 long_options[(_x)].val == long_options[(_y)].val)
+
+	current_argv = place;
+	match = -1;
+	ambiguous = 0;
+
+	optind++;
+
+	if ((has_equal = strchr(current_argv, '=')) != NULL) {
+		/* argument found (--option=arg) */
+		current_argv_len = has_equal - current_argv;
+		has_equal++;
+	} else
+		current_argv_len = strlen(current_argv);
+
+	for (i = 0; long_options[i].name; i++) {
+		/* find matching long option */
+		if (strncmp(current_argv, long_options[i].name,
+		    current_argv_len))
+			continue;
+
+		if (strlen(long_options[i].name) == current_argv_len) {
+			/* exact match */
+			match = i;
+			ambiguous = 0;
+			break;
+		}
+		/*
+		 * If this is a known short option, don't allow
+		 * a partial match of a single character.
+		 */
+		if (short_too && current_argv_len == 1)
+			continue;
+
+		if (match == -1)	/* partial match */
+			match = i;
+		else if (!IDENTICAL_INTERPRETATION(i, match))
+			ambiguous = 1;
+	}
+	if (ambiguous) {
+		/* ambiguous abbreviation */
+		if (PRINT_ERROR)
+			warnx(ambig, (int)current_argv_len,
+			     current_argv);
+		optopt = 0;
+		return (BADCH);
+	}
+	if (match != -1) {		/* option found */
+		if (long_options[match].has_arg == no_argument
+		    && has_equal) {
+			if (PRINT_ERROR)
+				warnx(noarg, (int)current_argv_len,
+				     current_argv);
+			/*
+			 * XXX: GNU sets optopt to val regardless of flag
+			 */
+			if (long_options[match].flag == NULL)
+				optopt = long_options[match].val;
+			else
+				optopt = 0;
+			return (BADARG);
+		}
+		if (long_options[match].has_arg == required_argument ||
+		    long_options[match].has_arg == optional_argument) {
+			if (has_equal)
+				optarg = has_equal;
+			else if (long_options[match].has_arg ==
+			    required_argument) {
+				/*
+				 * optional argument doesn't use next nargv
+				 */
+				optarg = nargv[optind++];
+			}
+		}
+		if ((long_options[match].has_arg == required_argument)
+		    && (optarg == NULL)) {
+			/*
+			 * Missing argument; leading ':' indicates no error
+			 * should be generated.
+			 */
+			if (PRINT_ERROR)
+				warnx(recargstring,
+				    current_argv);
+			/*
+			 * XXX: GNU sets optopt to val regardless of flag
+			 */
+			if (long_options[match].flag == NULL)
+				optopt = long_options[match].val;
+			else
+				optopt = 0;
+			--optind;
+			return (BADARG);
+		}
+	} else {			/* unknown option */
+		if (short_too) {
+			--optind;
+			return (-1);
+		}
+		if (PRINT_ERROR)
+			warnx(illoptstring, current_argv);
+		optopt = 0;
+		return (BADCH);
+	}
+	if (idx)
+		*idx = match;
+	if (long_options[match].flag) {
+		*long_options[match].flag = long_options[match].val;
+		return (0);
+	} else
+		return (long_options[match].val);
+#undef IDENTICAL_INTERPRETATION
+}
+
+/*
+ * getopt_internal --
+ *	Parse argc/argv argument vector.  Called by user level routines.
+ */
+static int
+getopt_internal(int nargc, char * const *nargv, const char *options,
+	const struct option *long_options, int *idx, int flags)
+{
+	char *oli;				/* option letter list index */
+	int optchar, short_too;
+	static int posixly_correct = -1;
+
+	if (options == NULL)
+		return (-1);
+
+	/*
+	 * XXX Some GNU programs (like cvs) set optind to 0 instead of
+	 * XXX using optreset.  Work around this braindamage.
+	 */
+	if (optind == 0)
+		optind = optreset = 1;
+
+	/*
+	 * Disable GNU extensions if POSIXLY_CORRECT is set or options
+	 * string begins with a '+'.
+	 *
+	 * CV, 2009-12-14: Check POSIXLY_CORRECT anew if optind == 0 or
+	 *                 optreset != 0 for GNU compatibility.
+	 */
+	if (posixly_correct == -1 || optreset != 0)
+		posixly_correct = (GetEnvironmentVariableW(L"POSIXLY_CORRECT", NULL, 0) != 0);
+	if (*options == '-')
+		flags |= FLAG_ALLARGS;
+	else if (posixly_correct || *options == '+')
+		flags &= ~FLAG_PERMUTE;
+	if (*options == '+' || *options == '-')
+		options++;
+
+	optarg = NULL;
+	if (optreset)
+		nonopt_start = nonopt_end = -1;
+start:
+	if (optreset || !*place) {		/* update scanning pointer */
+		optreset = 0;
+		if (optind >= nargc) {          /* end of argument vector */
+			place = EMSG;
+			if (nonopt_end != -1) {
+				/* do permutation, if we have to */
+				permute_args(nonopt_start, nonopt_end,
+				    optind, nargv);
+				optind -= nonopt_end - nonopt_start;
+			}
+			else if (nonopt_start != -1) {
+				/*
+				 * If we skipped non-options, set optind
+				 * to the first of them.
+				 */
+				optind = nonopt_start;
+			}
+			nonopt_start = nonopt_end = -1;
+			return (-1);
+		}
+		if (*(place = nargv[optind]) != '-' ||
+		    (place[1] == '\0' && strchr(options, '-') == NULL)) {
+			place = EMSG;		/* found non-option */
+			if (flags & FLAG_ALLARGS) {
+				/*
+				 * GNU extension:
+				 * return non-option as argument to option 1
+				 */
+				optarg = nargv[optind++];
+				return (INORDER);
+			}
+			if (!(flags & FLAG_PERMUTE)) {
+				/*
+				 * If no permutation wanted, stop parsing
+				 * at first non-option.
+				 */
+				return (-1);
+			}
+			/* do permutation */
+			if (nonopt_start == -1)
+				nonopt_start = optind;
+			else if (nonopt_end != -1) {
+				permute_args(nonopt_start, nonopt_end,
+				    optind, nargv);
+				nonopt_start = optind -
+				    (nonopt_end - nonopt_start);
+				nonopt_end = -1;
+			}
+			optind++;
+			/* process next argument */
+			goto start;
+		}
+		if (nonopt_start != -1 && nonopt_end == -1)
+			nonopt_end = optind;
+
+		/*
+		 * If we have "-" do nothing, if "--" we are done.
+		 */
+		if (place[1] != '\0' && *++place == '-' && place[1] == '\0') {
+			optind++;
+			place = EMSG;
+			/*
+			 * We found an option (--), so if we skipped
+			 * non-options, we have to permute.
+			 */
+			if (nonopt_end != -1) {
+				permute_args(nonopt_start, nonopt_end,
+				    optind, nargv);
+				optind -= nonopt_end - nonopt_start;
+			}
+			nonopt_start = nonopt_end = -1;
+			return (-1);
+		}
+	}
+
+	/*
+	 * Check long options if:
+	 *  1) we were passed some
+	 *  2) the arg is not just "-"
+	 *  3) either the arg starts with -- we are getopt_long_only()
+	 */
+	if (long_options != NULL && place != nargv[optind] &&
+	    (*place == '-' || (flags & FLAG_LONGONLY))) {
+		short_too = 0;
+		if (*place == '-')
+			place++;		/* --foo long option */
+		else if (*place != ':' && strchr(options, *place) != NULL)
+			short_too = 1;		/* could be short option too */
+
+		optchar = parse_long_options(nargv, options, long_options,
+		    idx, short_too);
+		if (optchar != -1) {
+			place = EMSG;
+			return (optchar);
+		}
+	}
+
+	if ((optchar = (int)*place++) == (int)':' ||
+	    (optchar == (int)'-' && *place != '\0') ||
+	    (oli = strchr(options, optchar)) == NULL) {
+		/*
+		 * If the user specified "-" and  '-' isn't listed in
+		 * options, return -1 (non-option) as per POSIX.
+		 * Otherwise, it is an unknown option character (or ':').
+		 */
+		if (optchar == (int)'-' && *place == '\0')
+			return (-1);
+		if (!*place)
+			++optind;
+		if (PRINT_ERROR)
+			warnx(illoptchar, optchar);
+		optopt = optchar;
+		return (BADCH);
+	}
+	if (long_options != NULL && optchar == 'W' && oli[1] == ';') {
+		/* -W long-option */
+		if (*place)			/* no space */
+			/* NOTHING */;
+		else if (++optind >= nargc) {	/* no arg */
+			place = EMSG;
+			if (PRINT_ERROR)
+				warnx(recargchar, optchar);
+			optopt = optchar;
+			return (BADARG);
+		} else				/* white space */
+			place = nargv[optind];
+		optchar = parse_long_options(nargv, options, long_options,
+		    idx, 0);
+		place = EMSG;
+		return (optchar);
+	}
+	if (*++oli != ':') {			/* doesn't take argument */
+		if (!*place)
+			++optind;
+	} else {				/* takes (optional) argument */
+		optarg = NULL;
+		if (*place)			/* no white space */
+			optarg = place;
+		else if (oli[1] != ':') {	/* arg not optional */
+			if (++optind >= nargc) {	/* no arg */
+				place = EMSG;
+				if (PRINT_ERROR)
+					warnx(recargchar, optchar);
+				optopt = optchar;
+				return (BADARG);
+			} else
+				optarg = nargv[optind];
+		}
+		place = EMSG;
+		++optind;
+	}
+	/* dump back option letter */
+	return (optchar);
+}
+
+#ifdef REPLACE_GETOPT
+/*
+ * getopt --
+ *	Parse argc/argv argument vector.
+ *
+ * [eventually this will replace the BSD getopt]
+ */
+int
+getopt(int nargc, char * const *nargv, const char *options)
+{
+
+	/*
+	 * We don't pass FLAG_PERMUTE to getopt_internal() since
+	 * the BSD getopt(3) (unlike GNU) has never done this.
+	 *
+	 * Furthermore, since many privileged programs call getopt()
+	 * before dropping privileges it makes sense to keep things
+	 * as simple (and bug-free) as possible.
+	 */
+	return (getopt_internal(nargc, nargv, options, NULL, NULL, 0));
+}
+#endif /* REPLACE_GETOPT */
+
+/*
+ * getopt_long --
+ *	Parse argc/argv argument vector.
+ */
+int
+getopt_long(int nargc, char * const *nargv, const char *options,
+    const struct option *long_options, int *idx)
+{
+
+	return (getopt_internal(nargc, nargv, options, long_options, idx,
+	    FLAG_PERMUTE));
+}
+
+/*
+ * getopt_long_only --
+ *	Parse argc/argv argument vector.
+ */
+int
+getopt_long_only(int nargc, char * const *nargv, const char *options,
+    const struct option *long_options, int *idx)
+{
+
+	return (getopt_internal(nargc, nargv, options, long_options, idx,
+	    FLAG_PERMUTE|FLAG_LONGONLY));
+}

3rdparty/getopt/getopt.h

@@ -0,0 +1,95 @@
+#ifndef __GETOPT_H__
+/**
+ * DISCLAIMER
+ * This file has no copyright assigned and is placed in the Public Domain.
+ * This file is part of the mingw-w64 runtime package.
+ *
+ * The mingw-w64 runtime package and its code is distributed in the hope that it 
+ * will be useful but WITHOUT ANY WARRANTY.  ALL WARRANTIES, EXPRESSED OR 
+ * IMPLIED ARE HEREBY DISCLAIMED.  This includes but is not limited to 
+ * warranties of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+#define __GETOPT_H__
+
+/* All the headers include this file. */
+#include <crtdefs.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern int optind;		/* index of first non-option in argv      */
+extern int optopt;		/* single option character, as parsed     */
+extern int opterr;		/* flag to enable built-in diagnostics... */
+				/* (user may set to zero, to suppress)    */
+
+extern char *optarg;		/* pointer to argument of current option  */
+
+extern int getopt(int nargc, char * const *nargv, const char *options);
+
+#ifdef _BSD_SOURCE
+/*
+ * BSD adds the non-standard `optreset' feature, for reinitialisation
+ * of `getopt' parsing.  We support this feature, for applications which
+ * proclaim their BSD heritage, before including this header; however,
+ * to maintain portability, developers are advised to avoid it.
+ */
+# define optreset  __mingw_optreset
+extern int optreset;
+#endif
+#ifdef __cplusplus
+}
+#endif
+/*
+ * POSIX requires the `getopt' API to be specified in `unistd.h';
+ * thus, `unistd.h' includes this header.  However, we do not want
+ * to expose the `getopt_long' or `getopt_long_only' APIs, when
+ * included in this manner.  Thus, close the standard __GETOPT_H__
+ * declarations block, and open an additional __GETOPT_LONG_H__
+ * specific block, only when *not* __UNISTD_H_SOURCED__, in which
+ * to declare the extended API.
+ */
+#endif /* !defined(__GETOPT_H__) */
+
+#if !defined(__UNISTD_H_SOURCED__) && !defined(__GETOPT_LONG_H__)
+#define __GETOPT_LONG_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct option		/* specification for a long form option...	*/
+{
+  const char *name;		/* option name, without leading hyphens */
+  int         has_arg;		/* does it take an argument?		*/
+  int        *flag;		/* where to save its status, or NULL	*/
+  int         val;		/* its associated status value		*/
+};
+
+enum    		/* permitted values for its `has_arg' field...	*/
+{
+  no_argument = 0,      	/* option never takes an argument	*/
+  required_argument,		/* option always requires an argument	*/
+  optional_argument		/* option may take an argument		*/
+};
+
+extern int getopt_long(int nargc, char * const *nargv, const char *options,
+    const struct option *long_options, int *idx);
+extern int getopt_long_only(int nargc, char * const *nargv, const char *options,
+    const struct option *long_options, int *idx);
+/*
+ * Previous MinGW implementation had...
+ */
+#ifndef HAVE_DECL_GETOPT
+/*
+ * ...for the long form API only; keep this for compatibility.
+ */
+# define HAVE_DECL_GETOPT	1
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* !defined(__UNISTD_H_SOURCED__) && !defined(__GETOPT_LONG_H__) */

3rdparty/macdeployqt/main.cpp

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

3rdparty/macdeployqt/shared.cpp

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

3rdparty/macdeployqt/shared.h

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

3rdparty/singleapplication/CMakeLists.txt

@@ -3,18 +3,12 @@ cmake_minimum_required(VERSION 3.0)
 include(CheckIncludeFiles)
 include(CheckFunctionExists)
 
-if(CMAKE_VERSION VERSION_GREATER 3.0)
-  check_function_exists(geteuid HAVE_GETEUID)
-  check_function_exists(getpwuid HAVE_GETPWUID)
-endif()
+check_function_exists(geteuid HAVE_GETEUID)
+check_function_exists(getpwuid HAVE_GETPWUID)
 
 set(SINGLEAPP-SOURCES singleapplication.cpp singleapplication_p.cpp)
 set(SINGLEAPP-MOC-HEADERS singleapplication.h singleapplication_p.h)
-if(BUILD_WITH_QT6)
-  qt6_wrap_cpp(SINGLEAPP-SOURCES-MOC ${SINGLEAPP-MOC-HEADERS})
-else()
-  qt5_wrap_cpp(SINGLEAPP-SOURCES-MOC ${SINGLEAPP-MOC-HEADERS})
-endif()
+qt_wrap_cpp(SINGLEAPP-SOURCES-MOC ${SINGLEAPP-MOC-HEADERS})
 add_library(singleapplication STATIC ${SINGLEAPP-SOURCES} ${SINGLEAPP-SOURCES-MOC})
 target_include_directories(singleapplication PRIVATE
   ${CMAKE_CURRENT_SOURCE_DIR}
@@ -28,11 +22,7 @@ target_link_libraries(singleapplication PRIVATE
 
 set(SINGLECOREAPP-SOURCES singlecoreapplication.cpp singlecoreapplication_p.cpp)
 set(SINGLECOREAPP-MOC-HEADERS singlecoreapplication.h singlecoreapplication_p.h)
-if(BUILD_WITH_QT6)
-  qt6_wrap_cpp(SINGLECOREAPP-SOURCES-MOC ${SINGLECOREAPP-MOC-HEADERS})
-else()
-  qt5_wrap_cpp(SINGLECOREAPP-SOURCES-MOC ${SINGLECOREAPP-MOC-HEADERS})
-endif()
+qt_wrap_cpp(SINGLECOREAPP-SOURCES-MOC ${SINGLECOREAPP-MOC-HEADERS})
 add_library(singlecoreapplication STATIC ${SINGLECOREAPP-SOURCES} ${SINGLECOREAPP-SOURCES-MOC})
 target_include_directories(singlecoreapplication PRIVATE
   ${CMAKE_CURRENT_SOURCE_DIR}

3rdparty/singleapplication/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) Itay Grudev 2015 - 2016
+Copyright (c) Itay Grudev 2015 - 2020
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

3rdparty/singleapplication/README.md

@@ -1,7 +1,8 @@
 SingleApplication
 =================
+[![CI](https://github.com/itay-grudev/SingleApplication/workflows/CI:%20Build%20Test/badge.svg)](https://github.com/itay-grudev/SingleApplication/actions)
 
-This is a replacement of the QtSingleApplication for `Qt5`.
+This is a replacement of the QtSingleApplication for `Qt5` and `Qt6`.
 
 Keeps the Primary Instance of your Application and kills each subsequent
 instances. It can (if enabled) spawn secondary (non-related to the primary)
@@ -15,18 +16,6 @@ class you specify via the `QAPPLICATION_CLASS` macro (`QCoreApplication` is the
 default). Further usage is similar to the use of the `Q[Core|Gui]Application`
 classes.
 
-The library sets up a `QLocalServer` and a `QSharedMemory` block. The first
-instance of your Application is your Primary Instance. It would check if the
-shared memory block exists and if not it will start a `QLocalServer` and listen
-for connections. Each subsequent instance of your application would check if the
-shared memory block exists and if it does, it will connect to the QLocalServer
-to notify the primary instance that a new instance had been started, after which
-it would terminate with status code `0`. In the Primary Instance
-`SingleApplication` would emit the `instanceStarted()` signal upon detecting
-that a new instance had been started.
-
-The library uses `stdlib` to terminate the program with the `exit()` function.
-
 You can use the library as if you use any other `QCoreApplication` derived
 class:
 
@@ -43,24 +32,49 @@ int main( int argc, char* argv[] )
 ```
 
 To include the library files I would recommend that you add it as a git
-submodule to your project and include it's contents with a `.pri` file. Here is
-how:
+submodule to your project. Here is how:
 
 ```bash
-git submodule add git@github.com:itay-grudev/SingleApplication.git singleapplication
+git submodule add https://github.com/itay-grudev/SingleApplication.git singleapplication
 ```
 
-Then include the `singleapplication.pri` file in your `.pro` project file. Also
-don't forget to specify which `QCoreApplication` class your app is using if it
-is not `QCoreApplication`.
+**Qmake:**
+
+Then include the `singleapplication.pri` file in your `.pro` project file.
 
 ```qmake
 include(singleapplication/singleapplication.pri)
 DEFINES += QAPPLICATION_CLASS=QApplication
 ```
 
+**CMake:**
+
+Then include the subdirectory in your `CMakeLists.txt` project file.
+
+```cmake
+set(QAPPLICATION_CLASS QApplication CACHE STRING "Inheritance class for SingleApplication")
+add_subdirectory(src/third-party/singleapplication)
+target_link_libraries(${PROJECT_NAME} SingleApplication::SingleApplication)
+```
+
+
+The library sets up a `QLocalServer` and a `QSharedMemory` block. The first
+instance of your Application is your Primary Instance. It would check if the
+shared memory block exists and if not it will start a `QLocalServer` and listen
+for connections. Each subsequent instance of your application would check if the
+shared memory block exists and if it does, it will connect to the QLocalServer
+to notify the primary instance that a new instance had been started, after which
+it would terminate with status code `0`. In the Primary Instance
+`SingleApplication` would emit the `instanceStarted()` signal upon detecting
+that a new instance had been started.
+
+The library uses `stdlib` to terminate the program with the `exit()` function.
+
+Also don't forget to specify which `QCoreApplication` class your app is using if it
+is not `QCoreApplication` as in examples above.
+
 The `Instance Started` signal
-------------------------
+-----------------------------
 
 The SingleApplication class implements a `instanceStarted()` signal. You can
 bind to that signal to raise your application's window when a new instance had
@@ -125,13 +139,22 @@ app.isSecondary();
 *__Note:__ If your Primary Instance is terminated a newly launched instance
 will replace the Primary one even if the Secondary flag has been set.*
 
+Examples
+--------
+
+There are three examples provided in this repository:
+
+* Basic example that prevents a secondary instance from starting [`examples/basic`](https://github.com/itay-grudev/SingleApplication/tree/master/examples/basic)
+* An example of a graphical application raising it's parent window [`examples/calculator`](https://github.com/itay-grudev/SingleApplication/tree/master/examples/calculator)
+* A console application sending the primary instance it's command line parameters [`examples/sending_arguments`](https://github.com/itay-grudev/SingleApplication/tree/master/examples/sending_arguments)
+
 API
 ---
 
 ### Members
 
 ```cpp
-SingleApplication::SingleApplication( int &argc, char *argv[], bool allowSecondary = false, Options options = Mode::User, int timeout = 100 )
+SingleApplication::SingleApplication( int &argc, char *argv[], bool allowSecondary = false, Options options = Mode::User, int timeout = 100, QString userData = QString() )
 ```
 
 Depending on whether `allowSecondary` is set, this constructor may terminate
@@ -140,7 +163,7 @@ can be specified to set whether the SingleApplication block should work
 user-wide or system-wide. Additionally the `Mode::SecondaryNotification` may be
 used to notify the primary instance whenever a secondary instance had been
 started (disabled by default). `timeout` specifies the maximum time in
-milliseconds to wait for blocking operations.
+milliseconds to wait for blocking operations. Setting `userData` provides additional data that will isolate this instance from other instances that do not have the same (or any) user data set.
 
 *__Note:__ `argc` and `argv` may be changed as Qt removes arguments that it
 recognizes.*
@@ -159,7 +182,8 @@ bool SingleApplication::sendMessage( QByteArray message, int timeout = 100 )
 ```
 
 Sends `message` to the Primary Instance. Uses `timeout` as a the maximum timeout
-in milliseconds for blocking functions
+in milliseconds for blocking functions. Returns `true` if the message has been sent
+successfully. If the message can't be sent or the function timeouts - returns `false`.
 
 ---
 
@@ -192,6 +216,22 @@ qint64 SingleApplication::primaryPid()
 
 Returns the process ID (PID) of the primary instance.
 
+---
+
+```cpp
+QString SingleApplication::primaryUser()
+```
+
+Returns the username the primary instance is running as.
+
+---
+
+```cpp
+QString SingleApplication::currentUser()
+```
+
+Returns the username the current instance is running as.
+
 ### Signals
 
 ```cpp

3rdparty/singleapplication/singleapplication.cpp

@@ -54,7 +54,7 @@
  * @param options Optional flags to toggle specific behaviour
  * @param timeout Maximum time blocking functions are allowed during app load
  */
-SingleApplication::SingleApplication(int &argc, char *argv[], bool allowSecondary, Options options, int timeout)
+SingleApplication::SingleApplication(int &argc, char *argv[], const bool allowSecondary, const Options options, const int timeout)
     : app_t(argc, argv),
       d_ptr(new SingleApplicationPrivate(this)) {
 
@@ -67,7 +67,7 @@ SingleApplication::SingleApplication(int &argc, char *argv[], bool allowSecondar
   d->genBlockServerName();
 
   // To mitigate QSharedMemory issues with large amount of processes attempting to attach at the same time
-  d->randomSleep();
+  SingleApplicationPrivate::randomSleep();
 
 #ifdef Q_OS_UNIX
   // By explicitly attaching it and then deleting it we make sure that the memory is deleted even after the process has crashed on Unix.
@@ -106,14 +106,14 @@ SingleApplication::SingleApplication(int &argc, char *argv[], bool allowSecondar
     }
   }
 
-  InstancesInfo *inst = static_cast<InstancesInfo*>(d->memory_->data());
+  InstancesInfo *instance = static_cast<InstancesInfo*>(d->memory_->data());
   QElapsedTimer time;
   time.start();
 
   // Make sure the shared memory block is initialised and in consistent state
   forever {
     // If the shared memory block's checksum is valid continue
-    if (d->blockChecksum() == inst->checksum) break;
+    if (d->blockChecksum() == instance->checksum) break;
 
     // If more than 5s have elapsed, assume the primary instance crashed and assume it's position
     if (time.elapsed() > 5000) {
@@ -127,14 +127,14 @@ SingleApplication::SingleApplication(int &argc, char *argv[], bool allowSecondar
       qDebug() << "SingleApplication: Unable to unlock memory for random wait.";
       qDebug() << d->memory_->errorString();
     }
-    d->randomSleep();
+    SingleApplicationPrivate::randomSleep();
     if (!d->memory_->lock()) {
       qCritical() << "SingleApplication: Unable to lock memory after random wait.";
       abortSafely();
     }
   }
 
-  if (inst->primary == false) {
+  if (!instance->primary) {
     d->startPrimary();
     if (!d->memory_->unlock()) {
       qDebug() << "SingleApplication: Unable to unlock memory after primary start.";
@@ -178,8 +178,8 @@ SingleApplication::~SingleApplication() {
  * Checks if the current application instance is primary.
  * @return Returns true if the instance is primary, false otherwise.
  */
-bool SingleApplication::isPrimary() {
-  Q_D(SingleApplication);
+bool SingleApplication::isPrimary() const {
+  Q_D(const SingleApplication);
   return d->server_ != nullptr;
 }
 
@@ -187,8 +187,8 @@ bool SingleApplication::isPrimary() {
  * Checks if the current application instance is secondary.
  * @return Returns true if the instance is secondary, false otherwise.
  */
-bool SingleApplication::isSecondary() {
-  Q_D(SingleApplication);
+bool SingleApplication::isSecondary() const {
+  Q_D(const SingleApplication);
   return d->server_ == nullptr;
 }
 
@@ -197,8 +197,8 @@ bool SingleApplication::isSecondary() {
  * It is reset when the first (primary) instance of your app starts and only incremented afterwards.
  * @return Returns a unique instance id.
  */
-quint32 SingleApplication::instanceId() {
-  Q_D(SingleApplication);
+quint32 SingleApplication::instanceId() const {
+  Q_D(const SingleApplication);
   return d->instanceNumber_;
 }
 
@@ -207,8 +207,8 @@ quint32 SingleApplication::instanceId() {
  * Especially useful when SingleApplication is coupled with OS. specific APIs.
  * @return Returns the primary instance PID.
  */
-qint64 SingleApplication::primaryPid() {
-  Q_D(SingleApplication);
+qint64 SingleApplication::primaryPid() const {
+  Q_D(const SingleApplication);
   return d->primaryPid();
 }
 
@@ -216,8 +216,8 @@ qint64 SingleApplication::primaryPid() {
  * Returns the username the primary instance is running as.
  * @return Returns the username the primary instance is running as.
  */
-QString SingleApplication::primaryUser() {
-  Q_D(SingleApplication);
+QString SingleApplication::primaryUser() const {
+  Q_D(const SingleApplication);
   return d->primaryUser();
 }
 
@@ -225,18 +225,17 @@ QString SingleApplication::primaryUser() {
  * Returns the username the current instance is running as.
  * @return Returns the username the current instance is running as.
  */
-QString SingleApplication::currentUser() {
-  Q_D(SingleApplication);
-  return d->getUsername();
+QString SingleApplication::currentUser() const {
+  return SingleApplicationPrivate::getUsername();
 }
 
 /**
  * Sends message to the Primary Instance.
  * @param message The message to send.
  * @param timeout the maximum timeout in milliseconds for blocking functions.
- * @return true if the message was sent successfuly, false otherwise.
+ * @return true if the message was sent successfully, false otherwise.
  */
-bool SingleApplication::sendMessage(QByteArray message, int timeout) {
+bool SingleApplication::sendMessage(const QByteArray &message, const int timeout) {
 
   Q_D(SingleApplication);
 
@@ -244,14 +243,11 @@ bool SingleApplication::sendMessage(QByteArray message, int timeout) {
   if (isPrimary()) return false;
 
   // Make sure the socket is connected
-  if (!d->connectToPrimary(timeout, SingleApplicationPrivate::Reconnect))
+  if (!d->connectToPrimary(timeout, SingleApplicationPrivate::Reconnect)) {
     return false;
+  }
 
-  d->socket_->write(message);
-  const bool dataWritten = d->socket_->waitForBytesWritten(timeout);
-  d->socket_->flush();
-  return dataWritten;
-
+  return d->writeConfirmedMessage(timeout, message);
 }
 
 /**
@@ -264,6 +260,7 @@ void SingleApplication::abortSafely() {
 
   qCritical() << "SingleApplication: " << d->memory_->error() << d->memory_->errorString();
   delete d;
+
   ::exit(EXIT_FAILURE);
 
 }

3rdparty/singleapplication/singleapplication.h

@@ -42,13 +42,13 @@
 class SingleApplicationPrivate;
 
 /**
- * @brief The SingleApplication class handles multipe instances of the same Application
+ * @brief The SingleApplication class handles multiple instances of the same Application
  * @see QApplication
  */
-class SingleApplication : public QApplication {
+class SingleApplication : public QApplication {  // clazy:exclude=ctor-missing-parent-argument
   Q_OBJECT
 
-  typedef QApplication app_t;
+  using app_t = QApplication;
 
  public:
   /**
@@ -88,46 +88,45 @@ class SingleApplication : public QApplication {
    * operations. It does not guarantee that the SingleApplication
    * initialisation will be completed in given time, though is a good hint.
    * Usually 4*timeout would be the worst case (fail) scenario.
-   * @see See the corresponding QAPPLICATION_CLASS constructor for reference
    */
-  explicit SingleApplication(int &argc, char *argv[], bool allowSecondary = false, Options options = Mode::User, int timeout = 1000);
+  explicit SingleApplication(int &argc, char *argv[], const bool allowSecondary = false, const Options options = Mode::User, const int timeout = 1000);
   ~SingleApplication() override;
 
   /**
    * @brief Returns if the instance is the primary instance
    * @returns {bool}
    */
-  bool isPrimary();
+  bool isPrimary() const;
 
   /**
    * @brief Returns if the instance is a secondary instance
    * @returns {bool}
    */
-  bool isSecondary();
+  bool isSecondary() const;
 
   /**
    * @brief Returns a unique identifier for the current instance
    * @returns {qint32}
    */
-  quint32 instanceId();
+  quint32 instanceId() const;
 
   /**
    * @brief Returns the process ID (PID) of the primary instance
    * @returns {qint64}
    */
-  qint64 primaryPid();
+  qint64 primaryPid() const;
 
   /**
    * @brief Returns the username of the user running the primary instance
    * @returns {QString}
    */
-  QString primaryUser();
+  QString primaryUser() const;
 
   /**
    * @brief Returns the username of the current user
    * @returns {QString}
    */
-  QString currentUser();
+  QString currentUser() const;
 
   /**
    * @brief Sends a message to the primary instance. Returns true on success.
@@ -136,7 +135,7 @@ class SingleApplication : public QApplication {
    * @note sendMessage() will return false if invoked from the primary
    * instance.
    */
-  bool sendMessage(QByteArray message, int timeout = 1000);
+  bool sendMessage(const QByteArray &message, const int timeout = 1000);
 
  signals:
   void instanceStarted();

3rdparty/singleapplication/singleapplication_p.cpp

@@ -44,6 +44,14 @@
 #  include <pwd.h>
 #endif
 
+#ifdef Q_OS_WIN
+#  ifndef NOMINMAX
+#    define NOMINMAX 1
+#  endif
+#  include <windows.h>
+#  include <lmcons.h>
+#endif
+
 #include <QObject>
 #include <QThread>
 #include <QIODevice>
@@ -53,7 +61,6 @@
 #include <QCryptographicHash>
 #include <QLocalServer>
 #include <QLocalSocket>
-#include <QDir>
 #include <QElapsedTimer>
 #if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
 #  include <QRandomGenerator>
@@ -64,11 +71,6 @@
 #include "singleapplication.h"
 #include "singleapplication_p.h"
 
-#ifdef Q_OS_WIN
-#  include <windows.h>
-#  include <lmcons.h>
-#endif
-
 SingleApplicationPrivate::SingleApplicationPrivate(SingleApplication *ptr)
     : q_ptr(ptr),
       memory_(nullptr),
@@ -86,14 +88,14 @@ SingleApplicationPrivate::~SingleApplicationPrivate() {
 
   if (memory_ != nullptr) {
     memory_->lock();
-    InstancesInfo *inst = static_cast<InstancesInfo*>(memory_->data());
+    InstancesInfo *instance = static_cast<InstancesInfo*>(memory_->data());
     if (server_ != nullptr) {
       server_->close();
       delete server_;
-      inst->primary = false;
-      inst->primaryPid = -1;
-      inst->primaryUser[0] = '\0';
-      inst->checksum = blockChecksum();
+      instance->primary = false;
+      instance->primaryPid = -1;
+      instance->primaryUser[0] = '\0';
+      instance->checksum = blockChecksum();
     }
     memory_->unlock();
 
@@ -142,7 +144,7 @@ QString SingleApplicationPrivate::getUsername() {
 void SingleApplicationPrivate::genBlockServerName() {
 
   QCryptographicHash appData(QCryptographicHash::Sha256);
-  appData.addData("SingleApplication", 17);
+  appData.addData("SingleApplication");
   appData.addData(SingleApplication::app_t::applicationName().toUtf8());
   appData.addData(SingleApplication::app_t::organizationName().toUtf8());
   appData.addData(SingleApplication::app_t::organizationDomain().toUtf8());
@@ -152,7 +154,15 @@ void SingleApplicationPrivate::genBlockServerName() {
   }
 
   if (!(options_ & SingleApplication::Mode::ExcludeAppPath)) {
-#ifdef Q_OS_WIN
+#if defined(Q_OS_UNIX)
+    const QByteArray appImagePath = qgetenv("APPIMAGE");
+    if (appImagePath.isEmpty()) {
+      appData.addData(SingleApplication::app_t::applicationFilePath().toUtf8());
+    }
+    else {
+      appData.addData(appImagePath);
+    };
+#elif defined(Q_OS_WIN)
     appData.addData(SingleApplication::app_t::applicationFilePath().toLower().toUtf8());
 #else
     appData.addData(SingleApplication::app_t::applicationFilePath().toUtf8());
@@ -169,28 +179,26 @@ void SingleApplicationPrivate::genBlockServerName() {
 
 }
 
-void SingleApplicationPrivate::initializeMemoryBlock() {
+void SingleApplicationPrivate::initializeMemoryBlock() const {
 
-  InstancesInfo *inst = static_cast<InstancesInfo*>(memory_->data());
-  inst->primary = false;
-  inst->secondary = 0;
-  inst->primaryPid = -1;
-  inst->primaryUser[0] = '\0';
-  inst->checksum = blockChecksum();
+  InstancesInfo *instance = static_cast<InstancesInfo*>(memory_->data());
+  instance->primary = false;
+  instance->secondary = 0;
+  instance->primaryPid = -1;
+  instance->primaryUser[0] = '\0';
+  instance->checksum = blockChecksum();
 
 }
 
 void SingleApplicationPrivate::startPrimary() {
 
-  Q_Q(SingleApplication);
-
   // Reset the number of connections
-  InstancesInfo *inst = static_cast<InstancesInfo*>(memory_->data());
+  InstancesInfo *instance = static_cast<InstancesInfo*>(memory_->data());
 
-  inst->primary = true;
-  inst->primaryPid = q->applicationPid();
-  qstrncpy(inst->primaryUser, getUsername().toUtf8().data(), sizeof(inst->primaryUser));
-  inst->checksum = blockChecksum();
+  instance->primary = true;
+  instance->primaryPid = QCoreApplication::applicationPid();
+  qstrncpy(instance->primaryUser, getUsername().toUtf8().data(), sizeof(instance->primaryUser));
+  instance->checksum = blockChecksum();
   instanceNumber_ = 0;
   // Successful creation means that no main process exists
   // So we start a QLocalServer to listen for connections
@@ -212,11 +220,11 @@ void SingleApplicationPrivate::startPrimary() {
 
 void SingleApplicationPrivate::startSecondary() {
 
-  InstancesInfo *inst = static_cast<InstancesInfo*>(memory_->data());
+  InstancesInfo *instance = static_cast<InstancesInfo*>(memory_->data());
 
-  inst->secondary += 1;
-  inst->checksum = blockChecksum();
-  instanceNumber_ = inst->secondary;
+  instance->secondary += 1;
+  instance->checksum = blockChecksum();
+  instanceNumber_ = instance->secondary;
 
 }
 
@@ -237,8 +245,9 @@ bool SingleApplicationPrivate::connectToPrimary(const int timeout, const Connect
     forever {
       randomSleep();
 
-      if (socket_->state() != QLocalSocket::ConnectingState)
+      if (socket_->state() != QLocalSocket::ConnectingState) {
         socket_->connectToServer(blockServerName_);
+      }
 
       if (socket_->state() == QLocalSocket::ConnectingState) {
         socket_->waitForConnected(static_cast<int>(timeout - time.elapsed()));
@@ -262,29 +271,57 @@ bool SingleApplicationPrivate::connectToPrimary(const int timeout, const Connect
   writeStream << instanceNumber_;
 
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-  quint16 checksum = qChecksum(QByteArray(initMsg,  static_cast<quint32>(initMsg.length())));
+  quint16 checksum = qChecksum(QByteArray(initMsg, static_cast<quint32>(initMsg.length())));
 #else
   quint16 checksum = qChecksum(initMsg.constData(), static_cast<quint32>(initMsg.length()));
 #endif
 
   writeStream << checksum;
 
-  // The header indicates the message length that follows
-  QByteArray header;
-  QDataStream headerStream(&header, QIODevice::WriteOnly);
-  headerStream.setVersion(QDataStream::Qt_5_8);
-  headerStream << static_cast<quint64>(initMsg.length());
-
-  socket_->write(header);
-  socket_->write(initMsg);
-  bool result = socket_->waitForBytesWritten(static_cast<int>(timeout - time.elapsed()));
-  socket_->flush();
-
-  return result;
+  return writeConfirmedMessage(static_cast<int>(timeout - time.elapsed()), initMsg);
 
 }
 
-quint16 SingleApplicationPrivate::blockChecksum() {
+void SingleApplicationPrivate::writeAck(QLocalSocket *sock) {
+  sock->putChar('\n');
+}
+
+bool SingleApplicationPrivate::writeConfirmedMessage(const int timeout, const QByteArray &msg) const {
+
+  QElapsedTimer time;
+  time.start();
+
+  // Frame 1: The header indicates the message length that follows
+  QByteArray header;
+  QDataStream headerStream(&header, QIODevice::WriteOnly);
+  headerStream.setVersion(QDataStream::Qt_5_8);
+  headerStream << static_cast<quint64>(msg.length());
+
+  if (!writeConfirmedFrame(static_cast<int>(timeout - time.elapsed()), header)) {
+    return false;
+  }
+
+  // Frame 2: The message
+  return writeConfirmedFrame(static_cast<int>(timeout - time.elapsed()), msg);
+
+}
+
+bool SingleApplicationPrivate::writeConfirmedFrame(const int timeout, const QByteArray &msg) const {
+
+  socket_->write(msg);
+  socket_->flush();
+
+  bool result = socket_->waitForReadyRead(timeout);
+  if (result) {
+    socket_->read(1);
+    return true;
+  }
+
+  return false;
+
+}
+
+quint16 SingleApplicationPrivate::blockChecksum() const {
 
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
   quint16 checksum = qChecksum(QByteArray(static_cast<const char*>(memory_->constData()), offsetof(InstancesInfo, checksum)));
@@ -296,22 +333,22 @@ quint16 SingleApplicationPrivate::blockChecksum() {
 
 }
 
-qint64 SingleApplicationPrivate::primaryPid() {
+qint64 SingleApplicationPrivate::primaryPid() const {
 
   memory_->lock();
-  InstancesInfo *inst = static_cast<InstancesInfo*>(memory_->data());
-  qint64 pid = inst->primaryPid;
+  InstancesInfo *instance = static_cast<InstancesInfo*>(memory_->data());
+  qint64 pid = instance->primaryPid;
   memory_->unlock();
 
   return pid;
 
 }
 
-QString SingleApplicationPrivate::primaryUser() {
+QString SingleApplicationPrivate::primaryUser() const {
 
   memory_->lock();
-  InstancesInfo *inst = static_cast<InstancesInfo*>(memory_->data());
-  QByteArray username = inst->primaryUser;
+  InstancesInfo *instance = static_cast<InstancesInfo*>(memory_->data());
+  QByteArray username = instance->primaryUser;
   memory_->unlock();
 
   return QString::fromUtf8(username);
@@ -327,26 +364,30 @@ void SingleApplicationPrivate::slotConnectionEstablished() {
   connectionMap_.insert(nextConnSocket, ConnectionInfo());
 
   QObject::connect(nextConnSocket, &QLocalSocket::aboutToClose, this, [nextConnSocket, this]() {
-    auto &info = connectionMap_[nextConnSocket];
+    const ConnectionInfo &info = connectionMap_[nextConnSocket];
     slotClientConnectionClosed(nextConnSocket, info.instanceId);
   });
 
-  QObject::connect(nextConnSocket, &QLocalSocket::disconnected, this, [nextConnSocket, this]() {
+  QObject::connect(nextConnSocket, &QLocalSocket::disconnected, nextConnSocket, &QLocalSocket::deleteLater);
+
+  QObject::connect(nextConnSocket, &QLocalSocket::destroyed, this, [nextConnSocket, this]() {
     connectionMap_.remove(nextConnSocket);
-    nextConnSocket->deleteLater();
   });
 
   QObject::connect(nextConnSocket, &QLocalSocket::readyRead, this, [nextConnSocket, this]() {
-    auto &info = connectionMap_[nextConnSocket];
+    const ConnectionInfo &info = connectionMap_[nextConnSocket];
     switch (info.stage) {
-      case StageHeader:
-        readInitMessageHeader(nextConnSocket);
+      case StageInitHeader:
+        readMessageHeader(nextConnSocket, StageInitBody);
         break;
-      case StageBody:
+      case StageInitBody:
         readInitMessageBody(nextConnSocket);
         break;
-      case StageConnected:
-        slotDataAvailable(nextConnSocket, info.instanceId);
+      case StageConnectedHeader:
+        readMessageHeader(nextConnSocket, StageConnectedBody);
+        break;
+      case StageConnectedBody:
+        this->slotDataAvailable(nextConnSocket, info.instanceId);
         break;
       default:
         break;
@@ -355,7 +396,7 @@ void SingleApplicationPrivate::slotConnectionEstablished() {
 
 }
 
-void SingleApplicationPrivate::readInitMessageHeader(QLocalSocket *sock) {
+void SingleApplicationPrivate::readMessageHeader(QLocalSocket *sock, const SingleApplicationPrivate::ConnectionStage nextStage) {
 
   if (!connectionMap_.contains(sock)) {
     return;
@@ -372,30 +413,34 @@ void SingleApplicationPrivate::readInitMessageHeader(QLocalSocket *sock) {
   quint64 msgLen = 0;
   headerStream >> msgLen;
   ConnectionInfo &info = connectionMap_[sock];
-  info.stage = StageBody;
+  info.stage = nextStage;
   info.msgLen = msgLen;
 
-  if (sock->bytesAvailable() >= static_cast<qint64>(msgLen)) {
-    readInitMessageBody(sock);
+  writeAck(sock);
+
+}
+
+bool SingleApplicationPrivate::isFrameComplete(QLocalSocket *sock) {
+
+  if (!connectionMap_.contains(sock)) {
+    return false;
   }
 
+  const ConnectionInfo &info = connectionMap_[sock];
+  return (sock->bytesAvailable() >= static_cast<qint64>(info.msgLen));
+
 }
 
 void SingleApplicationPrivate::readInitMessageBody(QLocalSocket *sock) {
 
   Q_Q(SingleApplication);
 
-  if (!connectionMap_.contains(sock)) {
-    return;
-  }
-
-  ConnectionInfo &info = connectionMap_[sock];
-  if (sock->bytesAvailable() < static_cast<qint64>(info.msgLen)) {
+  if (!isFrameComplete(sock)) {
     return;
   }
 
   // Read the message body
-  QByteArray msgBytes = sock->read(info.msgLen);
+  QByteArray msgBytes = sock->readAll();
   QDataStream readStream(msgBytes);
   readStream.setVersion(QDataStream::Qt_5_8);
 
@@ -430,23 +475,34 @@ void SingleApplicationPrivate::readInitMessageBody(QLocalSocket *sock) {
     return;
   }
 
+  ConnectionInfo &info = connectionMap_[sock];
   info.instanceId = instanceId;
-  info.stage = StageConnected;
+  info.stage = StageConnectedHeader;
 
   if (connectionType == NewInstance || (connectionType == SecondaryInstance && options_ & SingleApplication::Mode::SecondaryNotification)) {
-    Q_EMIT q->instanceStarted();
+    emit q->instanceStarted();
   }
 
-  if (sock->bytesAvailable() > 0) {
-    slotDataAvailable(sock, instanceId);
-  }
+  writeAck(sock);
 
 }
 
 void SingleApplicationPrivate::slotDataAvailable(QLocalSocket *dataSocket, const quint32 instanceId) {
 
   Q_Q(SingleApplication);
-  Q_EMIT q->receivedMessage(instanceId, dataSocket->readAll());
+
+  if (!isFrameComplete(dataSocket)) {
+    return;
+  }
+
+  const QByteArray message = dataSocket->readAll();
+
+  writeAck(dataSocket);
+
+  ConnectionInfo &info = connectionMap_[dataSocket];
+  info.stage = StageConnectedHeader;
+
+  emit q->receivedMessage(instanceId, message);
 
 }
 
@@ -461,10 +517,10 @@ void SingleApplicationPrivate::slotClientConnectionClosed(QLocalSocket *closedSo
 void SingleApplicationPrivate::randomSleep() {
 
 #if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
-  QThread::msleep(QRandomGenerator::global()->bounded(8u, 18u));
+  QThread::msleep(QRandomGenerator::global()->bounded(8U, 18U));
 #else
   qsrand(QDateTime::currentMSecsSinceEpoch() % std::numeric_limits<uint>::max());
-  QThread::msleep(8 + static_cast<unsigned long>(static_cast<float>(qrand()) / RAND_MAX * 10));
+  QThread::msleep(qrand() % 11 + 8);
 #endif
 
 }

3rdparty/singleapplication/singleapplication_p.h

@@ -37,7 +37,7 @@
 #include <QtGlobal>
 #include <QObject>
 #include <QString>
-#include <QMap>
+#include <QHash>
 
 #include "singleapplication.h"
 
@@ -55,7 +55,7 @@ struct InstancesInfo {
 
 struct ConnectionInfo {
   explicit ConnectionInfo() : msgLen(0), instanceId(0), stage(0) {}
-  qint64 msgLen;
+  quint64 msgLen;
   quint32 instanceId;
   quint8 stage;
 };
@@ -71,27 +71,32 @@ class SingleApplicationPrivate : public QObject {
     Reconnect = 3
   };
   enum ConnectionStage : quint8 {
-    StageHeader = 0,
-    StageBody = 1,
-    StageConnected = 2,
+    StageInitHeader = 0,
+    StageInitBody = 1,
+    StageConnectedHeader = 2,
+    StageConnectedBody = 3,
   };
   Q_DECLARE_PUBLIC(SingleApplication)
 
   explicit SingleApplicationPrivate(SingleApplication *ptr);
   ~SingleApplicationPrivate() override;
 
-  QString getUsername();
+  static QString getUsername();
   void genBlockServerName();
-  void initializeMemoryBlock();
+  void initializeMemoryBlock() const;
   void startPrimary();
   void startSecondary();
   bool connectToPrimary(const int timeout, const ConnectionType connectionType);
-  quint16 blockChecksum();
-  qint64 primaryPid();
-  QString primaryUser();
-  void readInitMessageHeader(QLocalSocket *socket);
+  quint16 blockChecksum() const;
+  qint64 primaryPid() const;
+  QString primaryUser() const;
+  bool isFrameComplete(QLocalSocket *sock);
+  void readMessageHeader(QLocalSocket *socket, const ConnectionStage nextStage);
   void readInitMessageBody(QLocalSocket *socket);
-  void randomSleep();
+  void writeAck(QLocalSocket *sock);
+  bool writeConfirmedFrame(const int timeout, const QByteArray &msg) const;
+  bool writeConfirmedMessage(const int timeout, const QByteArray &msg) const;
+  static void randomSleep();
 
   SingleApplication *q_ptr;
   QSharedMemory *memory_;
@@ -100,7 +105,7 @@ class SingleApplicationPrivate : public QObject {
   quint32 instanceNumber_;
   QString blockServerName_;
   SingleApplication::Options options_;
-  QMap<QLocalSocket*, ConnectionInfo> connectionMap_;
+  QHash<QLocalSocket*, ConnectionInfo> connectionMap_;
 
  public slots:
   void slotConnectionEstablished();

3rdparty/singleapplication/singlecoreapplication.cpp

@@ -54,7 +54,7 @@
  * @param options Optional flags to toggle specific behaviour
  * @param timeout Maximum time blocking functions are allowed during app load
  */
-SingleCoreApplication::SingleCoreApplication(int &argc, char *argv[], bool allowSecondary, Options options, int timeout)
+SingleCoreApplication::SingleCoreApplication(int &argc, char *argv[], const bool allowSecondary, const Options options, const int timeout)
     : app_t(argc, argv),
       d_ptr(new SingleCoreApplicationPrivate(this)) {
 
@@ -67,7 +67,7 @@ SingleCoreApplication::SingleCoreApplication(int &argc, char *argv[], bool allow
   d->genBlockServerName();
 
   // To mitigate QSharedMemory issues with large amount of processes attempting to attach at the same time
-  d->randomSleep();
+  SingleCoreApplicationPrivate::randomSleep();
 
 #ifdef Q_OS_UNIX
   // By explicitly attaching it and then deleting it we make sure that the memory is deleted even after the process has crashed on Unix.
@@ -106,14 +106,14 @@ SingleCoreApplication::SingleCoreApplication(int &argc, char *argv[], bool allow
     }
   }
 
-  InstancesInfo *inst = static_cast<InstancesInfo*>(d->memory_->data());
+  InstancesInfo *instance = static_cast<InstancesInfo*>(d->memory_->data());
   QElapsedTimer time;
   time.start();
 
   // Make sure the shared memory block is initialised and in consistent state
   forever {
     // If the shared memory block's checksum is valid continue
-    if (d->blockChecksum() == inst->checksum) break;
+    if (d->blockChecksum() == instance->checksum) break;
 
     // If more than 5s have elapsed, assume the primary instance crashed and assume it's position
     if (time.elapsed() > 5000) {
@@ -127,14 +127,14 @@ SingleCoreApplication::SingleCoreApplication(int &argc, char *argv[], bool allow
       qDebug() << "SingleCoreApplication: Unable to unlock memory for random wait.";
       qDebug() << d->memory_->errorString();
     }
-    d->randomSleep();
+    SingleCoreApplicationPrivate::randomSleep();
     if (!d->memory_->lock()) {
       qCritical() << "SingleCoreApplication: Unable to lock memory after random wait.";
       abortSafely();
     }
   }
 
-  if (inst->primary == false) {
+  if (!instance->primary) {
     d->startPrimary();
     if (!d->memory_->unlock()) {
       qDebug() << "SingleCoreApplication: Unable to unlock memory after primary start.";
@@ -178,8 +178,8 @@ SingleCoreApplication::~SingleCoreApplication() {
  * Checks if the current application instance is primary.
  * @return Returns true if the instance is primary, false otherwise.
  */
-bool SingleCoreApplication::isPrimary() {
-  Q_D(SingleCoreApplication);
+bool SingleCoreApplication::isPrimary() const {
+  Q_D(const SingleCoreApplication);
   return d->server_ != nullptr;
 }
 
@@ -187,8 +187,8 @@ bool SingleCoreApplication::isPrimary() {
  * Checks if the current application instance is secondary.
  * @return Returns true if the instance is secondary, false otherwise.
  */
-bool SingleCoreApplication::isSecondary() {
-  Q_D(SingleCoreApplication);
+bool SingleCoreApplication::isSecondary() const {
+  Q_D(const SingleCoreApplication);
   return d->server_ == nullptr;
 }
 
@@ -197,8 +197,8 @@ bool SingleCoreApplication::isSecondary() {
  * It is reset when the first (primary) instance of your app starts and only incremented afterwards.
  * @return Returns a unique instance id.
  */
-quint32 SingleCoreApplication::instanceId() {
-  Q_D(SingleCoreApplication);
+quint32 SingleCoreApplication::instanceId() const {
+  Q_D(const SingleCoreApplication);
   return d->instanceNumber_;
 }
 
@@ -207,8 +207,8 @@ quint32 SingleCoreApplication::instanceId() {
  * Especially useful when SingleCoreApplication is coupled with OS. specific APIs.
  * @return Returns the primary instance PID.
  */
-qint64 SingleCoreApplication::primaryPid() {
-  Q_D(SingleCoreApplication);
+qint64 SingleCoreApplication::primaryPid() const {
+  Q_D(const SingleCoreApplication);
   return d->primaryPid();
 }
 
@@ -216,8 +216,8 @@ qint64 SingleCoreApplication::primaryPid() {
  * Returns the username the primary instance is running as.
  * @return Returns the username the primary instance is running as.
  */
-QString SingleCoreApplication::primaryUser() {
-  Q_D(SingleCoreApplication);
+QString SingleCoreApplication::primaryUser() const {
+  Q_D(const SingleCoreApplication);
   return d->primaryUser();
 }
 
@@ -225,18 +225,17 @@ QString SingleCoreApplication::primaryUser() {
  * Returns the username the current instance is running as.
  * @return Returns the username the current instance is running as.
  */
-QString SingleCoreApplication::currentUser() {
-  Q_D(SingleCoreApplication);
-  return d->getUsername();
+QString SingleCoreApplication::currentUser() const {
+  return SingleCoreApplicationPrivate::getUsername();
 }
 
 /**
  * Sends message to the Primary Instance.
  * @param message The message to send.
  * @param timeout the maximum timeout in milliseconds for blocking functions.
- * @return true if the message was sent successfuly, false otherwise.
+ * @return true if the message was sent successfully, false otherwise.
  */
-bool SingleCoreApplication::sendMessage(QByteArray message, int timeout) {
+bool SingleCoreApplication::sendMessage(const QByteArray &message, const int timeout) {
 
   Q_D(SingleCoreApplication);
 
@@ -244,14 +243,11 @@ bool SingleCoreApplication::sendMessage(QByteArray message, int timeout) {
   if (isPrimary()) return false;
 
   // Make sure the socket is connected
-  if (!d->connectToPrimary(timeout, SingleCoreApplicationPrivate::Reconnect))
+  if (!d->connectToPrimary(timeout, SingleCoreApplicationPrivate::Reconnect)) {
     return false;
+  }
 
-  d->socket_->write(message);
-  const bool dataWritten = d->socket_->waitForBytesWritten(timeout);
-  d->socket_->flush();
-  return dataWritten;
-
+  return d->writeConfirmedMessage(timeout, message);
 }
 
 /**
@@ -264,6 +260,7 @@ void SingleCoreApplication::abortSafely() {
 
   qCritical() << "SingleCoreApplication: " << d->memory_->error() << d->memory_->errorString();
   delete d;
+
   ::exit(EXIT_FAILURE);
 
 }

3rdparty/singleapplication/singlecoreapplication.h

@@ -42,13 +42,13 @@
 class SingleCoreApplicationPrivate;
 
 /**
- * @brief The SingleCoreApplication class handles multipe instances of the same Application
+ * @brief The SingleCoreApplication class handles multiple instances of the same Application
  * @see QCoreApplication
  */
-class SingleCoreApplication : public QCoreApplication {
+class SingleCoreApplication : public QCoreApplication {  // clazy:exclude=ctor-missing-parent-argument
   Q_OBJECT
 
-  typedef QCoreApplication app_t;
+  using app_t = QCoreApplication;
 
  public:
   /**
@@ -96,37 +96,37 @@ class SingleCoreApplication : public QCoreApplication {
    * @brief Returns if the instance is the primary instance
    * @returns {bool}
    */
-  bool isPrimary();
+  bool isPrimary() const;
 
   /**
    * @brief Returns if the instance is a secondary instance
    * @returns {bool}
    */
-  bool isSecondary();
+  bool isSecondary() const;
 
   /**
    * @brief Returns a unique identifier for the current instance
    * @returns {qint32}
    */
-  quint32 instanceId();
+  quint32 instanceId() const;
 
   /**
    * @brief Returns the process ID (PID) of the primary instance
    * @returns {qint64}
    */
-  qint64 primaryPid();
+  qint64 primaryPid() const;
 
   /**
    * @brief Returns the username of the user running the primary instance
    * @returns {QString}
    */
-  QString primaryUser();
+  QString primaryUser() const;
 
   /**
    * @brief Returns the username of the current user
    * @returns {QString}
    */
-  QString currentUser();
+  QString currentUser() const;
 
   /**
    * @brief Sends a message to the primary instance. Returns true on success.
@@ -135,7 +135,7 @@ class SingleCoreApplication : public QCoreApplication {
    * @note sendMessage() will return false if invoked from the primary
    * instance.
    */
-  bool sendMessage(QByteArray message, int timeout = 1000);
+  bool sendMessage(const QByteArray &message, const int timeout = 1000);
 
  signals:
   void instanceStarted();

3rdparty/singleapplication/singlecoreapplication_p.cpp

@@ -44,6 +44,14 @@
 #  include <pwd.h>
 #endif
 
+#ifdef Q_OS_WIN
+#  ifndef NOMINMAX
+#    define NOMINMAX 1
+#  endif
+#  include <windows.h>
+#  include <lmcons.h>
+#endif
+
 #include <QObject>
 #include <QThread>
 #include <QIODevice>
@@ -53,7 +61,6 @@
 #include <QCryptographicHash>
 #include <QLocalServer>
 #include <QLocalSocket>
-#include <QDir>
 #include <QElapsedTimer>
 #if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
 #  include <QRandomGenerator>
@@ -64,11 +71,6 @@
 #include "singlecoreapplication.h"
 #include "singlecoreapplication_p.h"
 
-#ifdef Q_OS_WIN
-#  include <windows.h>
-#  include <lmcons.h>
-#endif
-
 SingleCoreApplicationPrivate::SingleCoreApplicationPrivate(SingleCoreApplication *ptr)
     : q_ptr(ptr),
       memory_(nullptr),
@@ -86,14 +88,14 @@ SingleCoreApplicationPrivate::~SingleCoreApplicationPrivate() {
 
   if (memory_ != nullptr) {
     memory_->lock();
-    InstancesInfo *inst = static_cast<InstancesInfo*>(memory_->data());
+    InstancesInfo *instance = static_cast<InstancesInfo*>(memory_->data());
     if (server_ != nullptr) {
       server_->close();
       delete server_;
-      inst->primary = false;
-      inst->primaryPid = -1;
-      inst->primaryUser[0] = '\0';
-      inst->checksum = blockChecksum();
+      instance->primary = false;
+      instance->primaryPid = -1;
+      instance->primaryUser[0] = '\0';
+      instance->checksum = blockChecksum();
     }
     memory_->unlock();
 
@@ -142,7 +144,7 @@ QString SingleCoreApplicationPrivate::getUsername() {
 void SingleCoreApplicationPrivate::genBlockServerName() {
 
   QCryptographicHash appData(QCryptographicHash::Sha256);
-  appData.addData("SingleApplication", 17);
+  appData.addData("SingleApplication");
   appData.addData(SingleCoreApplication::app_t::applicationName().toUtf8());
   appData.addData(SingleCoreApplication::app_t::organizationName().toUtf8());
   appData.addData(SingleCoreApplication::app_t::organizationDomain().toUtf8());
@@ -152,7 +154,15 @@ void SingleCoreApplicationPrivate::genBlockServerName() {
   }
 
   if (!(options_ & SingleCoreApplication::Mode::ExcludeAppPath)) {
-#ifdef Q_OS_WIN
+#if defined(Q_OS_UNIX)
+    const QByteArray appImagePath = qgetenv("APPIMAGE");
+    if (appImagePath.isEmpty()) {
+      appData.addData(SingleCoreApplication::app_t::applicationFilePath().toUtf8());
+    }
+    else {
+      appData.addData(appImagePath);
+    };
+#elif defined(Q_OS_WIN)
     appData.addData(SingleCoreApplication::app_t::applicationFilePath().toLower().toUtf8());
 #else
     appData.addData(SingleCoreApplication::app_t::applicationFilePath().toUtf8());
@@ -169,28 +179,26 @@ void SingleCoreApplicationPrivate::genBlockServerName() {
 
 }
 
-void SingleCoreApplicationPrivate::initializeMemoryBlock() {
+void SingleCoreApplicationPrivate::initializeMemoryBlock() const {
 
-  InstancesInfo *inst = static_cast<InstancesInfo*>(memory_->data());
-  inst->primary = false;
-  inst->secondary = 0;
-  inst->primaryPid = -1;
-  inst->primaryUser[0] = '\0';
-  inst->checksum = blockChecksum();
+  InstancesInfo *instance = static_cast<InstancesInfo*>(memory_->data());
+  instance->primary = false;
+  instance->secondary = 0;
+  instance->primaryPid = -1;
+  instance->primaryUser[0] = '\0';
+  instance->checksum = blockChecksum();
 
 }
 
 void SingleCoreApplicationPrivate::startPrimary() {
 
-  Q_Q(SingleCoreApplication);
-
   // Reset the number of connections
-  InstancesInfo *inst = static_cast<InstancesInfo*>(memory_->data());
+  InstancesInfo *instance = static_cast<InstancesInfo*>(memory_->data());
 
-  inst->primary = true;
-  inst->primaryPid = q->applicationPid();
-  qstrncpy(inst->primaryUser, getUsername().toUtf8().data(), sizeof(inst->primaryUser));
-  inst->checksum = blockChecksum();
+  instance->primary = true;
+  instance->primaryPid = QCoreApplication::applicationPid();
+  qstrncpy(instance->primaryUser, getUsername().toUtf8().data(), sizeof(instance->primaryUser));
+  instance->checksum = blockChecksum();
   instanceNumber_ = 0;
   // Successful creation means that no main process exists
   // So we start a QLocalServer to listen for connections
@@ -212,11 +220,11 @@ void SingleCoreApplicationPrivate::startPrimary() {
 
 void SingleCoreApplicationPrivate::startSecondary() {
 
-  InstancesInfo *inst = static_cast<InstancesInfo*>(memory_->data());
+  InstancesInfo *instance = static_cast<InstancesInfo*>(memory_->data());
 
-  inst->secondary += 1;
-  inst->checksum = blockChecksum();
-  instanceNumber_ = inst->secondary;
+  instance->secondary += 1;
+  instance->checksum = blockChecksum();
+  instanceNumber_ = instance->secondary;
 
 }
 
@@ -237,8 +245,9 @@ bool SingleCoreApplicationPrivate::connectToPrimary(const int timeout, const Con
     forever {
       randomSleep();
 
-      if (socket_->state() != QLocalSocket::ConnectingState)
+      if (socket_->state() != QLocalSocket::ConnectingState) {
         socket_->connectToServer(blockServerName_);
+      }
 
       if (socket_->state() == QLocalSocket::ConnectingState) {
         socket_->waitForConnected(static_cast<int>(timeout - time.elapsed()));
@@ -262,29 +271,57 @@ bool SingleCoreApplicationPrivate::connectToPrimary(const int timeout, const Con
   writeStream << instanceNumber_;
 
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-  quint16 checksum = qChecksum(QByteArray(initMsg,  static_cast<quint32>(initMsg.length())));
+  quint16 checksum = qChecksum(QByteArray(initMsg, static_cast<quint32>(initMsg.length())));
 #else
   quint16 checksum = qChecksum(initMsg.constData(), static_cast<quint32>(initMsg.length()));
 #endif
 
   writeStream << checksum;
 
-  // The header indicates the message length that follows
-  QByteArray header;
-  QDataStream headerStream(&header, QIODevice::WriteOnly);
-  headerStream.setVersion(QDataStream::Qt_5_8);
-  headerStream << static_cast<quint64>(initMsg.length());
-
-  socket_->write(header);
-  socket_->write(initMsg);
-  bool result = socket_->waitForBytesWritten(timeout - static_cast<int>(time.elapsed()));
-  socket_->flush();
-
-  return result;
+  return writeConfirmedMessage(static_cast<int>(timeout - time.elapsed()), initMsg);
 
 }
 
-quint16 SingleCoreApplicationPrivate::blockChecksum() {
+void SingleCoreApplicationPrivate::writeAck(QLocalSocket *sock) {
+  sock->putChar('\n');
+}
+
+bool SingleCoreApplicationPrivate::writeConfirmedMessage(const int timeout, const QByteArray &msg) const {
+
+  QElapsedTimer time;
+  time.start();
+
+  // Frame 1: The header indicates the message length that follows
+  QByteArray header;
+  QDataStream headerStream(&header, QIODevice::WriteOnly);
+  headerStream.setVersion(QDataStream::Qt_5_8);
+  headerStream << static_cast<quint64>(msg.length());
+
+  if (!writeConfirmedFrame(static_cast<int>(timeout - time.elapsed()), header)) {
+    return false;
+  }
+
+  // Frame 2: The message
+  return writeConfirmedFrame(static_cast<int>(timeout - time.elapsed()), msg);
+
+}
+
+bool SingleCoreApplicationPrivate::writeConfirmedFrame(const int timeout, const QByteArray &msg) const {
+
+  socket_->write(msg);
+  socket_->flush();
+
+  bool result = socket_->waitForReadyRead(timeout);
+  if (result) {
+    socket_->read(1);
+    return true;
+  }
+
+  return false;
+
+}
+
+quint16 SingleCoreApplicationPrivate::blockChecksum() const {
 
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
   quint16 checksum = qChecksum(QByteArray(static_cast<const char*>(memory_->constData()), offsetof(InstancesInfo, checksum)));
@@ -296,22 +333,22 @@ quint16 SingleCoreApplicationPrivate::blockChecksum() {
 
 }
 
-qint64 SingleCoreApplicationPrivate::primaryPid() {
+qint64 SingleCoreApplicationPrivate::primaryPid() const {
 
   memory_->lock();
-  InstancesInfo *inst = static_cast<InstancesInfo*>(memory_->data());
-  qint64 pid = inst->primaryPid;
+  InstancesInfo *instance = static_cast<InstancesInfo*>(memory_->data());
+  qint64 pid = instance->primaryPid;
   memory_->unlock();
 
   return pid;
 
 }
 
-QString SingleCoreApplicationPrivate::primaryUser() {
+QString SingleCoreApplicationPrivate::primaryUser() const {
 
   memory_->lock();
-  InstancesInfo *inst = static_cast<InstancesInfo*>(memory_->data());
-  QByteArray username = inst->primaryUser;
+  InstancesInfo *instance = static_cast<InstancesInfo*>(memory_->data());
+  QByteArray username = instance->primaryUser;
   memory_->unlock();
 
   return QString::fromUtf8(username);
@@ -327,26 +364,30 @@ void SingleCoreApplicationPrivate::slotConnectionEstablished() {
   connectionMap_.insert(nextConnSocket, ConnectionInfo());
 
   QObject::connect(nextConnSocket, &QLocalSocket::aboutToClose, this, [nextConnSocket, this]() {
-    auto &info = connectionMap_[nextConnSocket];
+    const ConnectionInfo &info = connectionMap_[nextConnSocket];
     slotClientConnectionClosed(nextConnSocket, info.instanceId);
   });
 
-  QObject::connect(nextConnSocket, &QLocalSocket::disconnected, this, [nextConnSocket, this]() {
+  QObject::connect(nextConnSocket, &QLocalSocket::disconnected, nextConnSocket, &QLocalSocket::deleteLater);
+
+  QObject::connect(nextConnSocket, &QLocalSocket::destroyed, this, [nextConnSocket, this]() {
     connectionMap_.remove(nextConnSocket);
-    nextConnSocket->deleteLater();
   });
 
   QObject::connect(nextConnSocket, &QLocalSocket::readyRead, this, [nextConnSocket, this]() {
-    auto &info = connectionMap_[nextConnSocket];
+    const ConnectionInfo &info = connectionMap_[nextConnSocket];
     switch (info.stage) {
-      case StageHeader:
-        readInitMessageHeader(nextConnSocket);
+      case StageInitHeader:
+        readMessageHeader(nextConnSocket, StageInitBody);
         break;
-      case StageBody:
+      case StageInitBody:
         readInitMessageBody(nextConnSocket);
         break;
-      case StageConnected:
-        slotDataAvailable(nextConnSocket, info.instanceId);
+      case StageConnectedHeader:
+        readMessageHeader(nextConnSocket, StageConnectedBody);
+        break;
+      case StageConnectedBody:
+        this->slotDataAvailable(nextConnSocket, info.instanceId);
         break;
       default:
         break;
@@ -355,7 +396,7 @@ void SingleCoreApplicationPrivate::slotConnectionEstablished() {
 
 }
 
-void SingleCoreApplicationPrivate::readInitMessageHeader(QLocalSocket *sock) {
+void SingleCoreApplicationPrivate::readMessageHeader(QLocalSocket *sock, SingleCoreApplicationPrivate::ConnectionStage nextStage) {
 
   if (!connectionMap_.contains(sock)) {
     return;
@@ -372,30 +413,34 @@ void SingleCoreApplicationPrivate::readInitMessageHeader(QLocalSocket *sock) {
   quint64 msgLen = 0;
   headerStream >> msgLen;
   ConnectionInfo &info = connectionMap_[sock];
-  info.stage = StageBody;
+  info.stage = nextStage;
   info.msgLen = msgLen;
 
-  if (sock->bytesAvailable() >= static_cast<qint64>(msgLen)) {
-    readInitMessageBody(sock);
+  writeAck(sock);
+
+}
+
+bool SingleCoreApplicationPrivate::isFrameComplete(QLocalSocket *sock) {
+
+  if (!connectionMap_.contains(sock)) {
+    return false;
   }
 
+  ConnectionInfo &info = connectionMap_[sock];
+  return (sock->bytesAvailable() >= static_cast<qint64>(info.msgLen));
+
 }
 
 void SingleCoreApplicationPrivate::readInitMessageBody(QLocalSocket *sock) {
 
   Q_Q(SingleCoreApplication);
 
-  if (!connectionMap_.contains(sock)) {
-    return;
-  }
-
-  ConnectionInfo &info = connectionMap_[sock];
-  if (sock->bytesAvailable() < static_cast<qint64>(info.msgLen)) {
+  if (!isFrameComplete(sock)) {
     return;
   }
 
   // Read the message body
-  QByteArray msgBytes = sock->read(info.msgLen);
+  QByteArray msgBytes = sock->readAll();
   QDataStream readStream(msgBytes);
   readStream.setVersion(QDataStream::Qt_5_8);
 
@@ -430,23 +475,34 @@ void SingleCoreApplicationPrivate::readInitMessageBody(QLocalSocket *sock) {
     return;
   }
 
+  ConnectionInfo &info = connectionMap_[sock];
   info.instanceId = instanceId;
-  info.stage = StageConnected;
+  info.stage = StageConnectedHeader;
 
   if (connectionType == NewInstance || (connectionType == SecondaryInstance && options_ & SingleCoreApplication::Mode::SecondaryNotification)) {
-    Q_EMIT q->instanceStarted();
+    emit q->instanceStarted();
   }
 
-  if (sock->bytesAvailable() > 0) {
-    slotDataAvailable(sock, instanceId);
-  }
+  writeAck(sock);
 
 }
 
 void SingleCoreApplicationPrivate::slotDataAvailable(QLocalSocket *dataSocket, const quint32 instanceId) {
 
   Q_Q(SingleCoreApplication);
-  Q_EMIT q->receivedMessage(instanceId, dataSocket->readAll());
+
+  if (!isFrameComplete(dataSocket)) {
+    return;
+  }
+
+  const QByteArray message = dataSocket->readAll();
+
+  writeAck(dataSocket);
+
+  ConnectionInfo &info = connectionMap_[dataSocket];
+  info.stage = StageConnectedHeader;
+
+  emit q->receivedMessage(instanceId, message);
 
 }
 
@@ -461,10 +517,10 @@ void SingleCoreApplicationPrivate::slotClientConnectionClosed(QLocalSocket *clos
 void SingleCoreApplicationPrivate::randomSleep() {
 
 #if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
-  QThread::msleep(QRandomGenerator::global()->bounded(8u, 18u));
+  QThread::msleep(QRandomGenerator::global()->bounded(8U, 18U));
 #else
   qsrand(QDateTime::currentMSecsSinceEpoch() % std::numeric_limits<uint>::max());
-  QThread::msleep(8 + static_cast<unsigned long>(static_cast<float>(qrand()) / RAND_MAX * 10));
+  QThread::msleep(qrand() % 11 + 8);
 #endif
 
 }

3rdparty/singleapplication/singlecoreapplication_p.h

@@ -37,7 +37,7 @@
 #include <QtGlobal>
 #include <QObject>
 #include <QString>
-#include <QMap>
+#include <QHash>
 
 #include "singlecoreapplication.h"
 
@@ -55,7 +55,7 @@ struct InstancesInfo {
 
 struct ConnectionInfo {
   explicit ConnectionInfo() : msgLen(0), instanceId(0), stage(0) {}
-  qint64 msgLen;
+  quint64 msgLen;
   quint32 instanceId;
   quint8 stage;
 };
@@ -71,27 +71,32 @@ class SingleCoreApplicationPrivate : public QObject {
     Reconnect = 3
   };
   enum ConnectionStage : quint8 {
-    StageHeader = 0,
-    StageBody = 1,
-    StageConnected = 2,
+    StageInitHeader = 0,
+    StageInitBody = 1,
+    StageConnectedHeader = 2,
+    StageConnectedBody = 3,
   };
   Q_DECLARE_PUBLIC(SingleCoreApplication)
 
   explicit SingleCoreApplicationPrivate(SingleCoreApplication *ptr);
   ~SingleCoreApplicationPrivate() override;
 
-  QString getUsername();
+  static QString getUsername();
   void genBlockServerName();
-  void initializeMemoryBlock();
+  void initializeMemoryBlock() const;
   void startPrimary();
   void startSecondary();
   bool connectToPrimary(const int timeout, const ConnectionType connectionType);
-  quint16 blockChecksum();
-  qint64 primaryPid();
-  QString primaryUser();
-  void readInitMessageHeader(QLocalSocket *socket);
+  quint16 blockChecksum() const;
+  qint64 primaryPid() const;
+  QString primaryUser() const;
+  bool isFrameComplete(QLocalSocket *sock);
+  void readMessageHeader(QLocalSocket *socket, const ConnectionStage nextStage);
   void readInitMessageBody(QLocalSocket *socket);
-  void randomSleep();
+  void writeAck(QLocalSocket *sock);
+  bool writeConfirmedFrame(const int timeout, const QByteArray &msg) const;
+  bool writeConfirmedMessage(const int timeout, const QByteArray &msg) const;
+  static void randomSleep();
 
   SingleCoreApplication *q_ptr;
   QSharedMemory *memory_;
@@ -100,7 +105,7 @@ class SingleCoreApplicationPrivate : public QObject {
   quint32 instanceNumber_;
   QString blockServerName_;
   SingleCoreApplication::Options options_;
-  QMap<QLocalSocket*, ConnectionInfo> connectionMap_;
+  QHash<QLocalSocket*, ConnectionInfo> connectionMap_;
 
  public slots:
   void slotConnectionEstablished();

CMakeLists.txt

@@ -12,13 +12,13 @@ include(cmake/Summary.cmake)
 include(cmake/OptionalSource.cmake)
 include(cmake/ParseArguments.cmake)
 
-if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
   set(LINUX ON)
 endif()
-if (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
+if(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
   set(FREEBSD ON)
 endif()
-if (${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
+if(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
   set(OPENBSD ON)
 endif()
 
@@ -35,34 +35,37 @@ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-list(APPEND COMPILE_OPTIONS
-  $<$<COMPILE_LANGUAGE:C>:-std=c99>
-  $<$<COMPILE_LANGUAGE:CXX>:-std=c++17>
-  -Wall
-  -Wextra
-  -Wpedantic
-  -Wunused
-  -Wshadow
-  -Wundef
-  -Wuninitialized
-  -Wredundant-decls
-  -Wcast-align
-  -Winit-self
-  -Wmissing-include-dirs
-  -Wmissing-declarations
-  -Wstrict-overflow=2
-  -Wunused-parameter
-  -Wformat=2
-  -Wdisabled-optimization
-  $<$<COMPILE_LANGUAGE:CXX>:-Woverloaded-virtual>
-  $<$<COMPILE_LANGUAGE:CXX>:-Wno-old-style-cast>
-  $<$<COMPILE_LANGUAGE:CXX>:-fpermissive>
-)
+if(MSVC)
+  list(APPEND COMPILE_OPTIONS /std:c++17 /MP)
+else()
+  list(APPEND COMPILE_OPTIONS
+    $<$<COMPILE_LANGUAGE:C>:-std=c99>
+    $<$<COMPILE_LANGUAGE:CXX>:-std=c++17>
+    -Wall
+    -Wextra
+    -Wpedantic
+    -Wunused
+    -Wshadow
+    -Wundef
+    -Wuninitialized
+    -Wredundant-decls
+    -Wcast-align
+    -Winit-self
+    -Wmissing-include-dirs
+    -Wmissing-declarations
+    -Wstrict-overflow=2
+    -Wunused-parameter
+    -Wformat=2
+    -Wdisabled-optimization
+    $<$<COMPILE_LANGUAGE:CXX>:-Woverloaded-virtual>
+    $<$<COMPILE_LANGUAGE:CXX>:-Wold-style-cast>
+  )
+endif()
 
 option(BUILD_WERROR "Build with -Werror" OFF)
 if(BUILD_WERROR)
   list(APPEND COMPILE_OPTIONS -Werror)
-endif(BUILD_WERROR)
+endif()
 
 add_compile_options(${COMPILE_OPTIONS})
 
@@ -77,33 +80,33 @@ if(APPLE)
 endif()
 
 find_program(CCACHE_EXECUTABLE NAMES ccache)
-if (CCACHE_EXECUTABLE)
+if(CCACHE_EXECUTABLE)
   message(STATUS "ccache found: will be used for compilation and linkage")
   SET_PROPERTY(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ${CCACHE_EXECUTABLE})
   SET_PROPERTY(GLOBAL PROPERTY RULE_LAUNCH_LINK ${CCACHE_EXECUTABLE})
-endif ()
+endif()
 
 find_package(PkgConfig REQUIRED)
 find_package(Boost REQUIRED)
 find_package(Threads)
-find_package(Backtrace QUIET)
+find_package(Backtrace)
 if(Backtrace_FOUND)
   set(HAVE_BACKTRACE ON)
 endif()
-find_package(Iconv QUIET)
+find_package(Iconv)
 find_package(GnuTLS REQUIRED)
 find_package(Protobuf REQUIRED)
-if (NOT Protobuf_PROTOC_EXECUTABLE)
+if(NOT Protobuf_PROTOC_EXECUTABLE)
   message(FATAL_ERROR "Missing protobuf compiler.")
 endif()
 if(LINUX)
   find_package(ALSA REQUIRED)
   pkg_check_modules(DBUS REQUIRED dbus-1)
-else(LINUX)
+else()
   find_package(ALSA)
   pkg_check_modules(DBUS dbus-1)
-endif(LINUX)
-if (UNIX AND NOT APPLE)
+endif()
+if(UNIX AND NOT APPLE)
   find_package(X11)
   pkg_check_modules(XCB xcb)
 endif()
@@ -113,6 +116,9 @@ endif()
 pkg_check_modules(GLIB REQUIRED glib-2.0)
 pkg_check_modules(GOBJECT REQUIRED gobject-2.0)
 pkg_check_modules(GIO REQUIRED gio-2.0)
+if(UNIX)
+  pkg_check_modules(GIO_UNIX gio-unix-2.0)
+endif()
 pkg_check_modules(LIBCDIO libcdio)
 pkg_check_modules(GSTREAMER gstreamer-1.0)
 pkg_check_modules(GSTREAMER_BASE gstreamer-base-1.0)
@@ -123,7 +129,7 @@ pkg_check_modules(GSTREAMER_PBUTILS gstreamer-pbutils-1.0)
 pkg_check_modules(LIBVLC libvlc)
 pkg_check_modules(SQLITE REQUIRED sqlite3>=3.9)
 pkg_check_modules(LIBPULSE libpulse)
-pkg_check_modules(CHROMAPRINT libchromaprint)
+pkg_check_modules(CHROMAPRINT libchromaprint>=1.4)
 pkg_check_modules(LIBGPOD libgpod-1.0>=0.7.92)
 pkg_check_modules(LIBMTP libmtp>=1.0)
 pkg_check_modules(GDK_PIXBUF gdk-pixbuf-2.0)
@@ -132,81 +138,99 @@ find_package(FFTW3)
 find_package(GTest)
 find_library(GMOCK_LIBRARY gmock)
 
-if(NOT QT_DEFAULT_MAJOR_VERSION)
-  set(QT_DEFAULT_MAJOR_VERSION 5)
-endif()
-set(QT_MAJOR_VERSION ${QT_DEFAULT_MAJOR_VERSION} CACHE STRING "Qt version to use (5 or 6), defaults to ${QT_DEFAULT_MAJOR_VERSION}")
-
-option(BUILD_WITH_QT5 "Use Qt 5" OFF)
-option(BUILD_WITH_QT6 "Use Qt 6" OFF)
+option(QT_VERSION_MAJOR "Qt version to use (5 or 6)")
+option(BUILD_WITH_QT5 "Build with Qt 5" OFF)
+option(BUILD_WITH_QT6 "Build with Qt 6" OFF)
 
 if(WITH_QT6)
   set(BUILD_WITH_QT6 ON)
 endif()
-
-if(BUILD_WITH_QT5)
-  set(QT_MAJOR_VERSION 5)
-elseif(BUILD_WITH_QT6)
-  set(QT_MAJOR_VERSION 6)
-else()
-  if(QT_MAJOR_VERSION EQUAL 5)
-    set(BUILD_WITH_QT5 ON)
-  elseif(QT_MAJOR_VERSION EQUAL 6)
-    set(BUILD_WITH_QT6 ON)
-  else()
-    set(BUILD_WITH_QT5 ON)
-    set(QT_MAJOR_VERSION 5)
-  endif()
+if(QT_MAJOR_VERSION)
+  set(QT_VERSION_MAJOR ${QT_MAJOR_VERSION})
 endif()
 
-set(QT_COMPONENTS Core Concurrent Widgets Network Sql)
-set(QT_OPTIONAL_COMPONENTS Test)
-
-if(QT_MAJOR_VERSION EQUAL 5)
-  set(QT_MIN_VERSION 5.8)
+if(QT_VERSION_MAJOR)
+  set(QT_DEFAULT_MAJOR_VERSION ${QT_VERSION_MAJOR})
 endif()
-
+set(QT_COMPONENTS Core Concurrent Gui Widgets Network Sql)
 if(DBUS_FOUND AND NOT WIN32)
   list(APPEND QT_COMPONENTS DBus)
 endif()
-if(X11_FOUND)
+set(QT_OPTIONAL_COMPONENTS Test)
+set(QT_MIN_VERSION 5.9)
+
+if(BUILD_WITH_QT6 OR QT_VERSION_MAJOR EQUAL 6)
+  set(QT_VERSION_MAJOR 6 CACHE STRING "" FORCE)
+  set(BUILD_WITH_QT6 ON CACHE BOOL "" FORCE)
+elseif(BUILD_WITH_QT5 OR QT_VERSION_MAJOR EQUAL 5)
+  set(QT_VERSION_MAJOR 5 CACHE STRING "" FORCE)
+  set(BUILD_WITH_QT5 ON CACHE BOOL "" FORCE)
+else()
+  # Automatically detect Qt version.
+  find_package(QT NAMES Qt6 Qt5 COMPONENTS ${QT_COMPONENTS} REQUIRED)
+  if(QT_FOUND AND QT_VERSION_MAJOR EQUAL 6)
+    set(BUILD_WITH_QT6 ON CACHE BOOL "" FORCE)
+    set(QT_VERSION_MAJOR 6 CACHE STRING "" FORCE)
+  elseif(QT_FOUND AND QT_VERSION_MAJOR EQUAL 5)
+    set(BUILD_WITH_QT5 ON CACHE BOOL "" FORCE)
+    set(QT_VERSION_MAJOR 5 CACHE STRING "" FORCE)
+  else()
+    message(FATAL_ERROR "Missing Qt.")
+  endif()
+endif()
+
+if(QT_VERSION_MAJOR)
+  set(QT_DEFAULT_MAJOR_VERSION ${QT_VERSION_MAJOR})
+endif()
+
+if(X11_FOUND AND BUILD_WITH_QT5)
   list(APPEND QT_OPTIONAL_COMPONENTS X11Extras)
 endif()
-if(WIN32)
-  list(APPEND QT_OPTIONAL_COMPONENTS WinExtras)
-endif()
 
-find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} REQUIRED COMPONENTS ${QT_COMPONENTS} OPTIONAL_COMPONENTS ${QT_OPTIONAL_COMPONENTS})
+find_package(Qt${QT_VERSION_MAJOR} ${QT_MIN_VERSION} REQUIRED COMPONENTS ${QT_COMPONENTS} OPTIONAL_COMPONENTS ${QT_OPTIONAL_COMPONENTS})
 
-set(QtCore_LIBRARIES Qt${QT_MAJOR_VERSION}::Core)
-set(QtConcurrent_LIBRARIES Qt${QT_MAJOR_VERSION}::Concurrent)
-set(QtGui_LIBRARIES Qt${QT_MAJOR_VERSION}::Gui)
-set(QtWidgets_LIBRARIES Qt${QT_MAJOR_VERSION}::Widgets)
-set(QtNetwork_LIBRARIES Qt${QT_MAJOR_VERSION}::Network)
-set(QtSql_LIBRARIES Qt${QT_MAJOR_VERSION}::Sql)
-set(QT_LIBRARIES Qt${QT_MAJOR_VERSION}::Core Qt${QT_MAJOR_VERSION}::Concurrent Qt${QT_MAJOR_VERSION}::Gui Qt${QT_MAJOR_VERSION}::Widgets Qt${QT_MAJOR_VERSION}::Network Qt${QT_MAJOR_VERSION}::Sql)
-if(Qt${QT_MAJOR_VERSION}DBus_FOUND)
-  set(QtDBus_LIBRARIES Qt${QT_MAJOR_VERSION}::DBus)
-  list(APPEND QT_LIBRARIES Qt${QT_MAJOR_VERSION}::DBus)
-  get_target_property(QT_DBUSXML2CPP_EXECUTABLE Qt${QT_MAJOR_VERSION}::qdbusxml2cpp LOCATION)
+set(QtCore_LIBRARIES Qt${QT_VERSION_MAJOR}::Core)
+set(QtConcurrent_LIBRARIES Qt${QT_VERSION_MAJOR}::Concurrent)
+set(QtGui_LIBRARIES Qt${QT_VERSION_MAJOR}::Gui)
+set(QtWidgets_LIBRARIES Qt${QT_VERSION_MAJOR}::Widgets)
+set(QtNetwork_LIBRARIES Qt${QT_VERSION_MAJOR}::Network)
+set(QtSql_LIBRARIES Qt${QT_VERSION_MAJOR}::Sql)
+set(QT_LIBRARIES Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Concurrent Qt${QT_VERSION_MAJOR}::Gui Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::Network Qt${QT_VERSION_MAJOR}::Sql)
+if(Qt${QT_VERSION_MAJOR}DBus_FOUND)
+  set(QtDBus_LIBRARIES Qt${QT_VERSION_MAJOR}::DBus)
+  list(APPEND QT_LIBRARIES Qt${QT_VERSION_MAJOR}::DBus)
+  get_target_property(QT_DBUSXML2CPP_EXECUTABLE Qt${QT_VERSION_MAJOR}::qdbusxml2cpp LOCATION)
 endif()
-if(Qt${QT_MAJOR_VERSION}X11Extras_FOUND)
-  set(QtX11Extras_LIBRARIES Qt${QT_MAJOR_VERSION}::X11Extras)
-  list(APPEND QT_LIBRARIES Qt${QT_MAJOR_VERSION}::X11Extras)
+if(BUILD_WITH_QT5 AND Qt5X11Extras_FOUND)
   set(HAVE_X11EXTRAS ON)
+  set(QtX11Extras_LIBRARIES Qt5::X11Extras)
+  list(APPEND QT_LIBRARIES Qt5::X11Extras)
 endif()
-if(Qt${QT_MAJOR_VERSION}WinExtras_FOUND)
-  set(QtWinExtras_LIBRARIES Qt${QT_MAJOR_VERSION}::WinExtras)
-  list(APPEND QT_LIBRARIES Qt${QT_MAJOR_VERSION}::WinExtras)
-  set(HAVE_WINEXTRAS ON)
-endif()
-if(Qt${QT_MAJOR_VERSION}Test_FOUND)
-  set(QtTest_LIBRARIES Qt${QT_MAJOR_VERSION}::Test)
+if(Qt${QT_VERSION_MAJOR}Test_FOUND)
+  set(QtTest_LIBRARIES Qt${QT_VERSION_MAJOR}::Test)
 endif()
 
-find_package(Qt${QT_MAJOR_VERSION} QUIET COMPONENTS LinguistTools CONFIG)
-if(Qt${QT_MAJOR_VERSION}LinguistTools_FOUND)
-  set(QT_LCONVERT_EXECUTABLE Qt${QT_MAJOR_VERSION}::lconvert)
+find_package(Qt${QT_VERSION_MAJOR} QUIET COMPONENTS LinguistTools CONFIG)
+if(Qt${QT_VERSION_MAJOR}LinguistTools_FOUND)
+  set(QT_LCONVERT_EXECUTABLE Qt${QT_VERSION_MAJOR}::lconvert)
+endif()
+
+if(BUILD_WITH_QT5 AND Qt5Core_VERSION VERSION_LESS 5.15.0)
+  macro(qt_add_resources)
+    qt5_add_resources(${ARGN})
+  endmacro()
+  macro(qt_wrap_cpp)
+    qt5_wrap_cpp(${ARGN})
+  endmacro()
+  macro(qt_wrap_ui)
+    qt5_wrap_ui(${ARGN})
+  endmacro()
+  macro(qt_add_dbus_adaptor)
+    qt5_add_dbus_adaptor(${ARGN})
+  endmacro()
+  macro(qt_add_dbus_interface)
+    qt5_add_dbus_interface(${ARGN})
+  endmacro()
 endif()
 
 if(X11_FOUND)
@@ -222,27 +246,46 @@ if(X11_FOUND)
   else()
     message(WARNING, "Missing X11/XF86keysym.h")
   endif()
+
+  find_path(QPA_QPLATFORMNATIVEINTERFACE_H qpa/qplatformnativeinterface.h PATHS ${Qt${QT_VERSION_MAJOR}Gui_PRIVATE_INCLUDE_DIRS})
+  if(QPA_QPLATFORMNATIVEINTERFACE_H)
+    set(HAVE_QPA_QPLATFORMNATIVEINTERFACE_H ON)
+    message(STATUS "Have qpa/qplatformnativeinterface.h header.")
+  else()
+    message(STATUS "Missing qpa/qplatformnativeinterface.h header.")
+  endif()
 endif(X11_FOUND)
 
-find_path(QPA_QPLATFORMNATIVEINTERFACE_H qpa/qplatformnativeinterface.h PATHS ${Qt${QT_MAJOR_VERSION}Gui_PRIVATE_INCLUDE_DIRS})
-if(QPA_QPLATFORMNATIVEINTERFACE_H)
-  set(HAVE_QPA_QPLATFORMNATIVEINTERFACE_H ON)
-  include_directories(${Qt${QT_MAJOR_VERSION}Gui_PRIVATE_INCLUDE_DIRS})
-  message(STATUS "Have qpa/qplatformnativeinterface.h header.")
-else()
-  message(STATUS "Missing qpa/qplatformnativeinterface.h header.")
+option(USE_TAGLIB "Build with TagLib" OFF)
+option(USE_TAGPARSER "Build with TagParser" OFF)
+
+if(NOT USE_TAGLIB AND NOT USE_TAGPARSER)
+  set(USE_TAGLIB ON)
 endif()
 
 # TAGLIB
-pkg_check_modules(TAGLIB REQUIRED taglib>=1.11.1)
-find_path(HAVE_TAGLIB_DSFFILE_H taglib/dsffile.h)
-find_path(HAVE_TAGLIB_DSDIFFFILE_H taglib/dsdifffile.h)
-if(HAVE_TAGLIB_DSFFILE_H)
-  set(HAVE_TAGLIB_DSFFILE ON)
-endif(HAVE_TAGLIB_DSFFILE_H)
-if(HAVE_TAGLIB_DSDIFFFILE_H)
-  set(HAVE_TAGLIB_DSDIFFFILE ON)
-endif(HAVE_TAGLIB_DSDIFFFILE_H)
+if(USE_TAGLIB)
+  pkg_check_modules(TAGLIB REQUIRED taglib>=1.11.1)
+  if(TAGLIB_FOUND)
+    find_path(HAVE_TAGLIB_DSFFILE_H taglib/dsffile.h)
+    find_path(HAVE_TAGLIB_DSDIFFFILE_H taglib/dsdifffile.h)
+    if(HAVE_TAGLIB_DSFFILE_H)
+      set(HAVE_TAGLIB_DSFFILE ON)
+    endif(HAVE_TAGLIB_DSFFILE_H)
+    if(HAVE_TAGLIB_DSDIFFFILE_H)
+      set(HAVE_TAGLIB_DSDIFFFILE ON)
+    endif(HAVE_TAGLIB_DSDIFFFILE_H)
+  endif()
+endif()
+
+# TAGPARSER
+if(USE_TAGPARSER)
+  pkg_check_modules(TAGPARSER REQUIRED tagparser)
+endif()
+
+if(NOT TAGLIB_FOUND AND NOT TAGPARSER_FOUND)
+  message(FATAL_ERROR "You need either TagLib or TagParser!")
+endif()
 
 # SingleApplication
 add_subdirectory(3rdparty/singleapplication)
@@ -251,14 +294,14 @@ set(SINGLEAPPLICATION_LIBRARIES singleapplication)
 set(SINGLECOREAPPLICATION_LIBRARIES singlecoreapplication)
 
 if(APPLE)
-  find_library(SPARKLE Sparkle PATHS "/usr/local/opt/sparkle")
-  add_subdirectory(3rdparty/macdeployqt)
   add_subdirectory(3rdparty/SPMediaKeyTap)
   set(SPMEDIAKEYTAP_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/SPMediaKeyTap)
   set(SPMEDIAKEYTAP_LIBRARIES SPMediaKeyTap)
-endif(APPLE)
+  add_subdirectory(3rdparty/macdeployqt)
+  add_subdirectory(ext/macdeploycheck)
+endif()
 
-if(NOT SPARKLE AND (APPLE OR WIN32))
+if(WIN32)
   if(BUILD_WITH_QT6)
     pkg_check_modules(QTSPARKLE qtsparkle-qt6)
   else()
@@ -269,23 +312,28 @@ if(NOT SPARKLE AND (APPLE OR WIN32))
   endif()
 endif()
 
-if (WIN32)
+if(WIN32 AND MSVC)
+  add_subdirectory(3rdparty/getopt)
+  set(GETOPT_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/getopt)
+  set(GETOPT_LIBRARIES getopt)
+endif()
+
+if(WIN32 AND NOT MSVC)
   # RC compiler
   string(REPLACE "gcc" "windres" CMAKE_RC_COMPILER_INIT ${CMAKE_C_COMPILER})
   enable_language(RC)
   SET(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -O coff -o <OBJECT> <SOURCE> -I ${CMAKE_SOURCE_DIR}/dist/windows")
-endif(WIN32)
+endif()
 
-# Optional bits
 if(WIN32)
   option(ENABLE_WIN32_CONSOLE "Show the windows console even outside Debug mode" OFF)
-endif(WIN32)
+endif()
 
 optional_component(ALSA ON "ALSA integration"
   DEPENDS "alsa" ALSA_FOUND
 )
 
-optional_component(LIBPULSE ON "Pulse audio integration"
+optional_component(LIBPULSE ON "PulseAudio integration"
   DEPENDS "libpulse" LIBPULSE_FOUND
 )
 
@@ -306,11 +354,17 @@ optional_component(VLC ON "Engine: VLC backend"
   DEPENDS "libvlc" LIBVLC_FOUND
 )
 
-optional_component(CHROMAPRINT ON "Chromaprint (Tag fetching from Musicbrainz)"
+optional_component(SONGFINGERPRINTING ON "Song fingerprinting and tracking"
   DEPENDS "chromaprint" CHROMAPRINT_FOUND
+  DEPENDS "gstreamer" GSTREAMER_FOUND
 )
 
-if (X11_FOUND OR HAVE_DBUS OR APPLE OR WIN32)
+optional_component(MUSICBRAINZ ON "MusicBrainz integration"
+  DEPENDS "chromaprint" CHROMAPRINT_FOUND
+  DEPENDS "gstreamer" GSTREAMER_FOUND
+)
+
+if(X11_FOUND OR HAVE_DBUS OR APPLE OR WIN32)
   set(HAVE_GLOBALSHORTCUTS_SUPPORT ON)
 endif()
 
@@ -318,12 +372,21 @@ optional_component(GLOBALSHORTCUTS ON "Global shortcuts"
   DEPENDS "D-Bus, X11, Windows or macOS" HAVE_GLOBALSHORTCUTS_SUPPORT
 )
 
-optional_component(X11_GLOBALSHORTCUTS ON "X11 global shortcuts"
-  DEPENDS "X11Extras" Qt${QT_MAJOR_VERSION}X11Extras_FOUND
-)
+if(BUILD_WITH_QT6 AND (Qt6Core_VERSION VERSION_EQUAL 6.2.0 OR Qt6Core_VERSION VERSION_GREATER 6.2.0))
+  optional_component(X11_GLOBALSHORTCUTS ON "X11 global shortcuts" DEPENDS "X11" X11_FOUND)
+else()
+  if(HAVE_X11EXTRAS OR HAVE_QPA_QPLATFORMNATIVEINTERFACE_H)
+    set(HAVE_X11EXTRAS_OR_QPA_QPLATFORMNATIVEINTERFACE_H ON)
+  endif()
+  optional_component(X11_GLOBALSHORTCUTS ON "X11 global shortcuts"
+    DEPENDS "X11" X11_FOUND
+    DEPENDS "Qt >= 6.2, X11Extras or qpa/qplatformnativeinterface.h header" HAVE_X11EXTRAS_OR_QPA_QPLATFORMNATIVEINTERFACE_H
+  )
+endif()
 
 optional_component(AUDIOCD ON "Devices: Audio CD support"
   DEPENDS "libcdio" LIBCDIO_FOUND
+  DEPENDS "gstreamer" GSTREAMER_FOUND
 )
 
 optional_component(UDISKS2 ON "Devices: UDisks2 backend"
@@ -335,6 +398,11 @@ optional_component(GIO ON "Devices: GIO device backend"
   DEPENDS "Unix or Windows" "NOT APPLE"
 )
 
+optional_component(GIO_UNIX ON "Devices: GIO device backend (Unix support)"
+  DEPENDS "libgio-unix" GIO_UNIX_FOUND
+  DEPENDS "Unix" "UNIX"
+)
+
 optional_component(LIBGPOD ON "Devices: iPod classic support"
   DEPENDS "libgpod" LIBGPOD_FOUND
   DEPENDS "gdk-pixbuf" GDK_PIXBUF_FOUND
@@ -344,11 +412,6 @@ optional_component(LIBMTP ON "Devices: MTP support"
   DEPENDS "libmtp" LIBMTP_FOUND
 )
 
-optional_component(SPARKLE ON "Sparkle integration"
-  DEPENDS "macOS" APPLE
-  DEPENDS "Sparkle" SPARKLE
-)
-
 if(BUILD_WITH_QT6)
   optional_component(TRANSLATIONS ON "Translations"
     DEPENDS "gettext" GETTEXT_FOUND
@@ -363,33 +426,32 @@ endif()
 
 option(INSTALL_TRANSLATIONS "Install translations" OFF)
 
-optional_component(SUBSONIC ON "Subsonic support")
-optional_component(TIDAL ON "Tidal support")
-optional_component(QOBUZ ON "Qobuz support")
+optional_component(SUBSONIC ON "Streaming: Subsonic")
+optional_component(TIDAL ON "Streaming: Tidal")
+optional_component(QOBUZ ON "Streaming: Qobuz")
 
 optional_component(MOODBAR ON "Moodbar"
   DEPENDS "fftw3" FFTW3_FOUND
   DEPENDS "gstreamer" HAVE_GSTREAMER
 )
 
-if(LINUX OR APPLE)
-  option(USE_BUNDLE "Bundle dependencies" OFF)
-elseif(WIN32)
+if(APPLE OR WIN32)
   option(USE_BUNDLE "Bundle dependencies" ON)
+else()
+  option(USE_BUNDLE "Bundle dependencies" OFF)
 endif()
 
-if (USE_BUNDLE AND NOT USE_BUNDLE_DIR)
-if(LINUX)
-  set(USE_BUNDLE_DIR "../plugins")
-endif(LINUX)
-if(APPLE)
-  set(USE_BUNDLE_DIR "../PlugIns")
-endif(APPLE)
-endif(USE_BUNDLE AND NOT USE_BUNDLE_DIR)
-
-# Check that we have sqlite3 with FTS5
+if(USE_BUNDLE AND NOT USE_BUNDLE_DIR)
+  if(LINUX)
+    set(USE_BUNDLE_DIR "../plugins")
+  endif()
+  if(APPLE)
+    set(USE_BUNDLE_DIR "../PlugIns")
+  endif()
+endif()
 
 if(NOT CMAKE_CROSSCOMPILING)
+  # Check that we have Qt with sqlite driver
   set(CMAKE_REQUIRED_FLAGS "-std=c++17")
   set(CMAKE_REQUIRED_LIBRARIES ${QtCore_LIBRARIES} ${QtSql_LIBRARIES})
   check_cxx_source_runs("
@@ -400,22 +462,47 @@ if(NOT CMAKE_CROSSCOMPILING)
       db.setDatabaseName(\":memory:\");
       if (!db.open()) { return 1; }
       QSqlQuery q(db);
-      q.prepare(\"CREATE VIRTUAL TABLE test_fts USING fts5(test, tokenize = 'unicode61 remove_diacritics 0');\");
+      q.prepare(\"CREATE TABLE test (test TEXT);\");
       if (!q.exec()) return 1;
     }
     "
-    SQLITE3_FTS5
+    QT_SQLITE_TEST
   )
+  if(QT_SQLITE_TEST)
+    # Check that we have sqlite3 with FTS5
+    check_cxx_source_runs("
+      #include <QSqlDatabase>
+      #include <QSqlQuery>
+      int main() {
+        QSqlDatabase db = QSqlDatabase::addDatabase(\"QSQLITE\");
+        db.setDatabaseName(\":memory:\");
+        if (!db.open()) { return 1; }
+        QSqlQuery q(db);
+        q.prepare(\"CREATE VIRTUAL TABLE test_fts USING fts5(test, tokenize = 'unicode61 remove_diacritics 0');\");
+        if (!q.exec()) return 1;
+      }
+      "
+      SQLITE_FTS5_TEST
+    )
+  endif()
 endif()
 
 # Set up definitions
 
-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)
+add_definitions(
+  -DBOOST_BIND_NO_PLACEHOLDERS
+  -DQT_STRICT_ITERATORS
+  -DQT_USE_QSTRINGBUILDER
+  -DQT_NO_URL_CAST_FROM_STRING
+  -DQT_NO_CAST_TO_ASCII
+)
+
+if(WIN32)
+  add_definitions(-DUNICODE)
+  if(MSVC)
+    add_definitions(-DPROTOBUF_USE_DLLS)
+  endif()
+endif()
 
 # Subdirectories
 add_subdirectory(src)
@@ -431,27 +518,37 @@ if(GTest_FOUND AND GMOCK_LIBRARY AND QtTest_LIBRARIES)
   add_subdirectory(tests)
 endif()
 
-# Uninstall support
-configure_file(
-  "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
-  "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
-  IMMEDIATE @ONLY)
+if(LINUX AND LSB_RELEASE_EXEC AND DPKG_BUILDPACKAGE)
+  add_subdirectory(debian)
+endif()
 
-add_custom_target(uninstall
-  "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
+# Uninstall support
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" IMMEDIATE @ONLY)
+
+add_custom_target(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
 
 # Show a summary of what we have enabled
 summary_show()
 if(NOT HAVE_GSTREAMER AND NOT HAVE_VLC)
-  message(FATAL_ERROR "You need to have either GStreamer or VLC to compile!")
+  message(FATAL_ERROR "You need to have either GStreamer or libvlc 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()
 
-if(NOT SQLITE3_FTS5 AND NOT CMAKE_CROSSCOMPILING)
-  message(WARNING "sqlite3 must be enabled with FTS5. See: https://www.sqlite.org/fts5.html")
+if(QT_VERSION_MAJOR EQUAL 5)
+  message(WARNING "It is detected that Strawberry is being built with Qt 5.  There are no bugfix releases for the latest minor LTS version of Qt 5 available to open-source users, only commercial users.  Therefore Strawberry should be built with Qt 6 when possible. Building with Qt 6 will also take advantage of improvements and new features not available in Qt 5.  To build with Qt 6 specify -DBUILD_WITH_QT6=ON to automatically detect Qt 6, or for example -DCMAKE_PREFIX_PATH=/usr/local/lib64/cmake to manually specify the Qt 6 directory.")
 endif()
 
-if(NOT TAGLIB_VERSION VERSION_GREATER_EQUAL 1.12)
+if(NOT CMAKE_CROSSCOMPILING)
+  if(QT_SQLITE_TEST)
+    if(NOT SQLITE_FTS5_TEST)
+      message(WARNING "sqlite must be enabled with FTS5. See: https://www.sqlite.org/fts5.html")
+    endif()
+  else()
+    message(WARNING "The Qt sqlite driver test failed.")
+  endif()
+endif()
+
+if(USE_TAGLIB AND TAGLIB_FOUND AND NOT TAGLIB_VERSION VERSION_GREATER_EQUAL 1.12)
   message(WARNING "There is a critical bug in TagLib (1.11.1) that can result in corrupt Ogg files, see: https://github.com/taglib/taglib/issues/864, please consider updating TagLib to the newest version.")
 endif()

Changelog

@@ -2,7 +2,206 @@ Strawberry Music Player
 =======================
 ChangeLog
 
-0.9.2:
+Version 1.0.5 (2022.06.10)
+
+BugFixes:
+    * Fixed smart playlist filetype search.
+    * Fixed Radio Paradise URLs to use HTTPS instead of HTTP.
+    * Fixed horizontal scrolling not affecting currently playing track (#952).
+    * Fixed keep running in the background when window is closed with Wayland (#964).
+    * Fixed percent-encoding of URLs when loading and saving XSPF playlists (#821).
+    * Fixed fancy tabbar context menu showing on right clicks outside of tabbar when a song is playing.
+    * Fixed possible duplicating songs in the database when moving songs to the collection using the organize feature.
+    * (Windows|MSVC) Fixed moodbar fftw3 crash with (older) CPU's that does not support AVX2 (#944).
+    * (Windows|MSVC) Fixed using libiconv for converting characters when organizing files like with MinGW.
+
+  Enhancements
+    * Show more details in error dialog on GStreamer errors (#958).
+    * Allow setting blur amount of playlist background image up to 100px (#939).
+    * Include 128x128 icon sizes (#954).
+    * Show right click copy context menu in context view on top text and lyrics (#965).
+    * Improve fading between album covers in context view.
+    * Added option for overwriting database playcounts in collection settings (#962).
+    * Added option for disabling bar on currently playing track (#972).
+    * (Debian) Added Qt 6 support to debian files and build with Qt 6 for Debian Bookworm, Ubuntu Jammy and newer.
+    * (Windows|MSVC) Added libav/ffmpeg plugin.
+
+Version 1.0.4 (2022.04.10)
+
+  Bugfixes:
+    * Fixed use-after-free memory in ALSA PCM device finder.
+    * Translate global shortcuts.
+    * (Windows) Fixed registering 0-9 numpad keys in global shortcuts.
+
+  Enhancements
+    * Added save all playlists action.
+    * (Windows) Made updater support both MSVC and MinGW.
+    * (Windows) Added HLS support.
+
+  Other:
+    * Removed use of custom font in context.
+
+Version 1.0.3 (2022.03.24)
+
+  Bugfixes:
+    * Remove slash and backslash from filenames when saving album covers using album directory cover filenames (#903).
+    * Remove playlist file-extensions from accepted audio file extensions (#909).
+    * Fixed Qobuz requests only receiving the first 50 albums (#922).
+    * (Windows|MinGW) Fixed streaming stopping at the end of each track. libsoup downgraded from 3.0 to 2.74.
+    * (Windows|MSVC) Fixed initial database schema failure caused by CRLF line-endings in schema files.
+
+  New features
+    * Added support for bs2b (Improved headphone listening of stereo audio records using Bauer stereophonic-to-binaural DSP) (#249).
+
+Version 1.0.2 (2022.02.20)
+
+  Bugfixes:
+    * Fixed showing menu when clicking icon for collection and internet search tool buttons
+    * Fixed ignoring devices with system mounts as defined by GIO (#410).
+    * Fixed updating database when deleting songs from filesystem devices.
+    * Fixed unregistered metatype when listing songs from MTP devices with Qt 6.
+    * Fixed using entered password when testing Subsonic settings before pressing save (#879).
+    * Fixed downloading Subsonic album covers.
+    * Fixed subsonic album covers downloaded several times for each album when MD5 authentication was enabled (#885).
+    * Fixed volume going to 100% when pressing volume down with MRPIS2 and global shortcuts (#884).
+    * Fixed incorrect rounding when setting volume through MPRIS2 (#894).
+    * Fixed delete from disk not showing up in the menu when one or more CUE songs were selected.
+    * Fixed possible crashes when switching songs when fading is enabled (#890).
+    * Fixed X11 global shortcuts not working unless window was in focus with Qt 6.2 and higher (#893).
+    * Fixed scrobbler re-sending scrobbles to fast on error (#898).
+
+  Enhancements
+    * Log Qt version on startup.
+    * Added button for deleting existing Subsonic songs (#883).
+    * Make collection watcher ignore files with "qt_temp" filename and tmp extension.
+    * Require Qt 5.9 or higher.
+    * Added scrollbars to edit tag dialog (#888).
+    * Added advanced settings for configuring collection watcher.
+    * Disable open audio CD menu when compiled without audio CD support.
+    * Replaced use of deprecated QMouseEvent constructor as of Qt 6.4.
+    * Replaced use of deprecated QCryptographicHash::addData overload as of Qt 6.4.
+
+  Removed features:
+    * Removed broken "nomedia" / "nomusic" file handling.
+
+Version 1.0.1 (2022.01.08)
+
+  Bugfixes:
+    * Fixed collection and internet search filter tool button menu arrow overlap (#796).
+    * Fixed stop after this track button with Qt 6 (#795).
+    * Fixed not updating the URL when songs were moved on disk when the fingerprinting feature is enabled.
+    * Fixed SQL query error for songs with an invalid modification time (#815).
+    * Fixed blocky rendering of the currently playing track with high resolution screens (#794).
+    * Fixed incorrect playlist column filesize for radio streams.
+    * Fixed deleting embedded album cover from Ogg songs.
+    * Fixed parsing of Cue tracks with 1-digit minutes (#836).
+    * Fixed updating of playlist summary after reloading items when adding songs from files outside of the collection (#848).
+    * Fixed always saving metadata when saving playlists for Tidal, Qobuz and Subsonic songs independent of playlist setting (#851).
+    * Fixed setting media shortcuts when using kglobalaccel (#849).
+    * Fixed parsing of Genius lyrics when they are sometimes received in a different HTML format.
+    * Fixed saving MP4 specific tags as UTF-8 (#830).
+    * Fixed clearing "manually set" cover when saving album covers embedded from outside of the tag editor (#858).
+    * Fixed aborting collection scan when Strawberry exists to avoid hang on exit.
+    * Fixed resuming collection scan when adding a new directory after collection scan was aborted.
+    * Fixed excluding hidden songs from the collection.
+    * Disabled moodbar for CUE songs since they can not be supported properly (#865).
+    * (Windows) Added gstreamer gstxingmux plugin to fix transcoding to MP3 (#856).
+
+  Enhancements:
+    * Made playlist header column text elided (#801).
+    * Added support for reading and writing playcounts and ratings from/to tags.
+    * Added support for setting rating using the edit tag dialog.
+    * Added setting to enable/disable playlist toolbar (#809).
+    * Added component type, content_rating type and releases to AppStream data file (#806).
+    * Removed unused "mark as listened" option in organize dialog.
+    * Fixed some clazy warnings and narrowing conversions in the source code.
+    * Replaced uses of macros in the source code.
+    * Added a more user-friendly error message when receiving encrypted streams from Tidal (#824).
+    * Added support for port-pattern entered in the device textbox when using Jack as output (#828).
+    * Added Spanish (Spain) translation.
+    * Added support for more CUE filenames (#835).
+    * (Windows) Add gstreamer dash plugin.
+
+Version 1.0.0 (2021.10.14)
+
+  Bugfixes:
+    * Fix updating temporary metadata when reloading songs outside of the collection.
+    * Don't strip off "Live" from song title when sending scrobbles.
+    * Fix incorrect use of QFutureWatcher.
+    * Fix compile of Utilities::Hmac with Qt 6.2.
+    * Fix a memory leak when using right click context menu in internet search.
+    * Fix a gstreamer bus leak when adding streams and remote playlists.
+    * Fix "Source ID x was not found when attempting to remove it" error.
+    * Escape ampersands in playlist tabs.
+    * Fix analyzer with S24_32LE audio format.
+    * (macOS) Fix incorrect playlist alternating row colors with dark theme.
+    * (Windows) Fix adding songs with Japanese characters from the files tab.
+
+  Enhancements:
+    * Add replaygain fallback gain setting.
+    * Add option to turn off playlist alternating row colors.
+    * Make the default tabbbar background color lighter.
+    * Remove use of deprecated WinExtras Qt module.
+    * Add CMake test for Qt sqlite support.
+    * Automatically detect Qt version if BUILD_WITH_QT5 or BUILD_WITH_QT6 is not specified.
+    * Correct playlist tabbar favorite tooltip from "click" to "double-click".
+    * Remove scroll over icon to change track option since it does not work reliable.
+    * Improve resume playback on startup.
+    * Re-request stream URL for Tidal and QObuz when resuming playback after pausing for more than 30 seconds.
+    * Add Finnish, Ukrainian, Dutch, Japanese, Chinese, Catalan and Portuguese (Brazil).
+    * Add support for TagParser (https://github.com/Martchus/tagparser) as an alternative to TagLib.
+    * Add Subsonic option to turn off HTTP/2.
+    * Fix minor Clang-Tidy and Clazy warnings.
+    * Use higher resolution images from last.fm API.
+    * Add MD5 token authentication for Subsonic.
+    * Use 500 albums per request when receiving albums from Subsonic.
+    * Use QX11Application with Qt >= 6.2 for X11 global shortcuts.
+    * Allow fading when a ALSA PCM device is selected.
+    * Store Tidal MPEG-DASH file in data uri.
+    * Use XSPF image elements as manually set artwork.
+    * Make error dialog larger.
+    * Show error dialog for failed SQL queries.
+    * Show error dialog when failing to read or write album covers.
+    * Add module music formats (mod, s3m, xm, it) to detected filetypes.
+    * Disable gapless playback for module music formats to workaround gstreamer bug.
+    * Update directory ID and song path immediately when organizing collection songs.
+    * Add right click option to star a playlist in playlist tabs.
+    * Use seconds instead of minutes for scrobble submit delay.
+    * (macOS) Build with libgpod.
+    * (Windows) Fix compile with MSVC.
+
+  New features:
+    * Add ALSA PCM devices.
+    * Add song fingerprinting and tracking.
+    * Add support for native global shortcuts on MATE.
+    * Add radios view with channels from Radio Paradise and SomaFM.
+
+
+Version 0.9.3 (2021.04.18)
+
+  Bugfixes:
+    * Fix "Show in file browser" to work with thunar.
+    * Check that the clicked rating position is to the right or left of the rectangle.
+    * Fix rescan when collection directory is removed and readded.
+    * Create GLib main event loop on non-glib systems to fix stream discoverer.
+    * (macOS) Fix intermittent abort on startup.
+    * (macOS) Fix Tidal and Qobuz search field not showing.
+    * (macOS) Add tidal URL scheme to Info.plist.
+    * (macOS) Fix Tidal OAuth authentication.
+
+  Enhancements:
+    * Allow editing playlist metadata for radio streams.
+    * Make CollectionQuery subclass QSqlQuery, avoid copying QSqlQuery.
+    * Only enable FTS3 when schema needs upgrading, since FTS5 is used for search.
+    * Add setting for configuring the color for the currently playing song.
+    * Add setting to turn on OSD Pretty fading.
+    * Add commandline option to resize window.
+    * (Windows) Show dialog with programs that needs to close in nsis installer.
+    * (macOS) Make macdeployqt work with Qt 5 too.
+    * (macOS) Show keep running option in behaviour settings.
+
+
+Version 0.9.2 (2021.03.25)
 
   Bugfixes:
     * Fix marking songs available.
@@ -13,7 +212,8 @@ ChangeLog
     * (macOS) Fix crash when opening cover manager.
     * (macOS) Fix broken Qt plugins resulting in album covers not showing.
 
-0.9.1:
+
+Version 0.9.1 (2021.03.13)
 
   Bugfixes:
     * Fix duplicating songs in the DB when organizing songs between 2 different collection directories.
@@ -48,7 +248,8 @@ ChangeLog
   New features:
     * Add option and support for saving embedded covers for FLAC, Ogg Vorbis, MP3 and MP4/AAC.
 
-0.8.5:
+
+Version 0.8.5 (2020.12.19)
 
   Bugfixes:
     * Fix return type of SmartPlaylistQueryWizardPlugin::type().
@@ -67,7 +268,8 @@ ChangeLog
     * Add command line option to play a playlist based on name.
     * Change double-click behaviour in cover manager to open fullsize cover.
 
-0.8.4:
+
+Version 0.8.4 (2020.11.15)
 
   Bugfixes:
     * Fix preventing session logout when window is maxmimized.
@@ -85,15 +287,16 @@ ChangeLog
     * Add support for native global shortcuts on KDE.
     * Add track progress in system tray icon as an option.
     * Only strip problematic characters in suggested filename when saving a playlist to file.
-    * Change star/unstar playlist to doubleclick instead of singleclick.
-    * Don't edit playlist name on doubleclick in playlists view.
+    * Change star/unstar playlist to double-click instead of singleclick.
+    * Don't edit playlist name on double-click in playlists view.
     * Make context view top label text selectable.
     * Add setting to change Qt style.
     * Clear ID3v3 tags that are empty, and clear ID3v1 tags when setting ID3v3 tags.
     * Remove remaining uses of QTextCodec.
     * Remove Core5Compat dependency.
 
-0.8.3:
+
+Version 0.8.3 (2020.10.24)
 
   Bugfixes:
     * Fixed updating playing widget song details in small cover mode.
@@ -108,7 +311,8 @@ ChangeLog
   Enhancements:
     * (Windows) Added WASAPI plugin.
 
-0.8.2:
+
+Version 0.8.2 (2020.10.13)
 
   Bugfixes:
     * Fixed broken transition to next song for CUE files with certain audio formats (regression since version 0.6.13).
@@ -120,7 +324,8 @@ ChangeLog
     * Removed use of HTML in system tray icon tooltip for all desktop environments instead of just KDE and Cinnamon.
     * (Windows) Ignore "IDirectSoundBuffer_GetStatus The operation completed successfully" false error when switching device while playing.
 
-0.8.1:
+
+Version 0.8.1 (2020.10.09)
 
   Bugfixes:
     * Fixed engine selection in backend settings with Qt 6.
@@ -167,14 +372,15 @@ ChangeLog
     * Added Subsonic server side scrobbling support.
     * Load thumbnails from iPods to show under device collection.
 
-0.7.2:
+Version 0.7.2 (2020.08.15)
 
   Bugfixes:
     * Fixed installation directory for translations.
     * Fixed collection sorting for non-ASCII characters.
     * Fixed closing connected devices on exit.
 
-0.7.1:
+
+Version 0.7.1 (2020.08.15)
 
   Bugfixes:
     * Fixed incorrectly mapped global shortcuts keys "2" and "3".
@@ -213,7 +419,8 @@ ChangeLog
     * Removed Xine engine support.
     * Removed broken imobiledevice (iPhone) support.
 
-0.6.13:
+
+Version 0.6.13 (2020.07.13)
 
   Bugfixes:
     * Fixed cut-off text in about dialog.
@@ -239,7 +446,8 @@ ChangeLog
     * Fixed unit test for testing playlist model.
     * Added new unit tests for tagreader.
 
-0.6.12:
+
+Version 0.6.12 (2020.06.07)
 
   Bugfixes:
     * Fixed height of about dialog.
@@ -252,7 +460,8 @@ ChangeLog
     * Sort folders added from file view.
     * Changed default collection grouping to album - disc.
 
-0.6.11:
+
+Version 0.6.11 (2020.05.16)
 
   Bugfixes:
     * Fixed MPRIS missing art url when playing albums with embedded cover.
@@ -278,10 +487,11 @@ ChangeLog
     * Added album covers from Musixmatch and Spotify.
     * Added lyrics from Genius, Musixmatch and ChartLyrics.
 
-0.6.10:
+
+Version 0.6.10 (2020.05.01)
 
   Bugfixes:
-    * Fixed Subsonic album covers not working for albums with non ASCII charcters.
+    * Fixed Subsonic album covers not working for albums with non ASCII characters.
     * Fixed reading date and genre from individual tracks in CUE sheets.
     * Fixed resume playback on startup for CUE songs.
     * Fixed album cover manager not showing complete album titles in the list of album covers.
@@ -290,7 +500,7 @@ ChangeLog
     * Fixed engine and device in context using too large icons when icons were loaded from the system theme.
     * Fixed "Secure connection setup failed" problem on Windows when playing streams.
     * Fixed margin for song title text in context.
-    * Fixed UNC paths with non ASCII charcters not working.
+    * Fixed UNC paths with non ASCII characters not working.
 
   Enhancements:
     * Allowing all characters except slash and backslash when organising music unless options to strip characters is checked.
@@ -305,9 +515,9 @@ ChangeLog
     * Only showing song length in context when available.
     * Sort album cover search results by score and pick the best 3 first before trying others to improve album cover search speed.
     * Make scrobbler work for streams.
-    * Added search for lyrics as a seperate option in context.
+    * Added search for lyrics as a separate option in context.
     * Made font and font sizes in context configurable.
-    * Splitting artist and song title to the relevant metadata when artist and song title is sent as title seperated by a dash in streams.
+    * Splitting artist and song title to the relevant metadata when artist and song title is sent as title separated by a dash in streams.
     * Added label to show collection pixmap disk cache used in settings.
     * Icreased default collection pixmap disk cache to 360.
 
@@ -318,7 +528,8 @@ ChangeLog
   Removed features:
     * Removed Phonon engine support.
 
-Version 0.6.9:
+
+Version 0.6.9 (2020.03.09)
 
   BugFixes:
     * Fixed playlist metadata updating interfering with manual tag editing.
@@ -350,7 +561,8 @@ Version 0.6.9:
     * Tidal support (No agreement).
     * QObuz support (No agreement).
 
-Version 0.6.8:
+
+Version 0.6.8 (2020.01.05)
 
     * Fixed stuck tabbar and collection GUI with some themes.
     * Fixed possible crashes related to QProxyStyle.
@@ -367,7 +579,8 @@ Version 0.6.8:
     * (macOS) Fixed filesystem watcher to correctly pick up changed collection directories.
     * (Windows) Fixed translations not being included.
 
-Version 0.6.7:
+
+Version 0.6.7 (2019.11.27)
 
     * Fixed crash when cancelling scrobbler authentication
     * Fixed "Double clicking a song in the playlist" behaviour setting
@@ -384,7 +597,8 @@ Version 0.6.7:
     * Removed left click on analyzer to popup menu
     * (Windows) Added killproc executable to terminate running process before uninstalling
 
-Version 0.6.6:
+
+Version 0.6.6 (2019.11.09)
 
     * Fixed lowercased album artist in playlist column
     * Fixed compiling with different optional features turned off
@@ -402,7 +616,8 @@ Version 0.6.6:
     * Added option to automatically select current playing track
     * (Windows) Added support for WASAPI
 
-Version 0.6.5:
+
+Version 0.6.5 (2019.09.30)
 
     * Fixed scrobbler not to send scrobbles multiple times when metadata is updated
     * Fixed Listenbrainz scrobbler not don't send "various artists" as album artist
@@ -411,7 +626,8 @@ Version 0.6.5:
     * Fixed OSD pretty positioning on Windows on screens with negative geometry
     * Fixed appdata file to pass full validation
 
-Version 0.6.4:
+
+Version 0.6.4 (2019.09.25)
 
     * Added setting for fancy tabbar background color
     * Added setting to make marking songs unavailable optional
@@ -438,18 +654,21 @@ Version 0.6.4:
     * Fixed restoring to original window size when restoring from system tray
     * Updated 3rdparty taglib
 
-Version 0.6.3:
+
+Version 0.6.3 (2019.08.05)
 
     * Fixed crash when using internet services.
     * Fixed musicbrainz tagfetcher only showing 1 result per song.
     * Fixed collection watcher to unwatch deleted directories.
     * Added "album - disc" grouping.
 
-Version 0.6.2:
+
+Version 0.6.2 (2019.08.03)
 
     * Disabled fatal error for FTS5 cmake test.
 
-Version 0.6.1:
+
+Version 0.6.1 (2019.08.03)
 
     * Compare artist and album case-insensitive when generating score for album covers.
     * Fixed broken return value of sendMessage() in SingleApplication causing application to be started twice.
@@ -495,11 +714,13 @@ Version 0.6.1:
     * Fixed certain cases where the playing widget gets stuck when switching fast between context and other widgets.
     * Removed ChartLyrics provider (service have been down for a long time).
 
-Version 0.5.5:
+
+Version 0.5.5 (2019.05.05)
 
     * Fixed Tidal API url
 
-Version 0.5.4:
+
+Version 0.5.4 (2019.05.05)
 
     * Changed description for offline mode scrobbling for less confusion
     * Fixed scrobbler to not send "playing now" when in offline mode
@@ -530,7 +751,8 @@ Version 0.5.4:
     * Fixed and improved snap including upgrading to core18 and adding proper alsa support
     * Fixed resume playback on startup not working for other than the first playlist
 
-Version 0.5.3:
+
+Version 0.5.3 (2019.03.02)
 
     * Changed default tagging to albumartist in organise dialog
     * Removed support for older taglib in tagreader
@@ -570,7 +792,8 @@ Version 0.5.3:
     * Added group by format
     * Fixed gstreamer leaks
 
-Version 0.5.2:
+
+Version 0.5.2 (2019.01.26)
 
     * Added error handling and message for URL handler
     * Added SingleCoreApplication secondary check
@@ -587,7 +810,8 @@ Version 0.5.2:
     * Added option to copy album cover in organise dialog (filesystem and libgpod devices)
     * Added raise() to make sure window is on top when strawberry is started twice
 
-Version 0.5.1:
+
+Version 0.5.1 (2019.01.12)
 
     * Added scrobbler with support for Last.fm, Libre.fm and ListenBrainz
     * Fixed key up causing playback to reset
@@ -618,7 +842,8 @@ Version 0.5.1:
     * Added debian copyright file
     * Fixed some compile errors
 
-Version 0.4.2:
+
+Version 0.4.2 (2018.11.28)
 
     * Updated AppStream data file to newer specifications
     * Fixed Deezer engine to use quality setting
@@ -632,7 +857,8 @@ Version 0.4.2:
     * (Windows) Corrected uninstalled files on x64 installer
     * (macOS) Fixed poor performance
 
-Version 0.4.1:
+
+Version 0.4.1 (2018.11.01)
 
     * Fixed crash in analyzer
     * Fixed trying to use systray even if the desktop had no systray
@@ -650,11 +876,13 @@ Version 0.4.1:
     * Added AppStream data file
     * Fixed compiling with Qt 5 versions of system QtSingleApplication and Qxt library
 
-Version 0.3.3:
+
+Version 0.3.3 (2018.09.24)
 
     * Fixed Tidal login
 
-Version 0.3.2:
+
+Version 0.3.2 (2018.09.24)
 
     * Fixed search error not shown in Tidal search
     * Added URL handler for Tidal, now retrieving URL's when playing instead of when searching
@@ -666,7 +894,8 @@ Version 0.3.2:
     * Added encoding of Tidal token in the source code
     * Added encoding of Tidal password in the configuration
 
-Version 0.3.1:
+
+Version 0.3.1 (2018.09.15)
 
     * Added new lyrics provider with lyrics from AudD and API Seeds
     * New improved context widget with albums and lyrics
@@ -688,7 +917,8 @@ Version 0.3.1:
     * Added support for reading/writing lyrics to tags
     * Fixed saving tags (APE) for WavPack files
 
-Version 0.2.1:
+
+Version 0.2.1 (2018.07.05)
 
     * Fixed crash with newer Qt
     * Fixed setting output/device for Xine and VLC backend
@@ -698,19 +928,23 @@ Version 0.2.1:
     * Fixed device selection on macOS
     * Added xine on to windows build
 
-Version 0.1.6:
+
+Version 0.1.6 (2018.06.07)
     * Fixed crash on exit caused by NVIDIA driver
     * Fixed PulseAudio device selection
     * Improvements to device selection
 
-Version 0.1.5:
+
+Version 0.1.5 (2018.05.16)
     * Makefile fixes for building
 
-Version 0.1.4:
+
+Version 0.1.4 (2018.05.14)
     * Fixed compliation with clang compiler
     * This release is mainly to get it working on openbsd and freebsd.
 
-Version 0.1.3:
+
+Version 0.1.3 (2018.05.12)
     * Audio file detection by content
     * Added builtin taglib to 3rdparty to support detecting audio by content instead of just file extension
     * Removed unneeded qsqlite from 3rdparty
@@ -718,7 +952,8 @@ Version 0.1.3:
     * Replaced incorrect DLL libgstdirectsoundsink.dll (from gst 1.12.4) instead of libgstdirectsound.dll (from gst 1.14.0) for windows build
     * Fixed git versioning
 
-Version 0.1.2:
+
+Version 0.1.2 (2018.05.02)
     * Fixed playback of WavPack files
     * Fixed musicbrainz tagfetcher
     * Use common regex (Song::kCoverRemoveDisc) for removing Disc/CD from album
@@ -728,5 +963,6 @@ Version 0.1.2:
     * Fixed problems with windows build missing some DLL's, only supplying required gstreamer-plugins now
     * Removed redundant code
 
-Version 0.1.1:
+
+Version 0.1.1 (2018.04.07)
     * Initial release

README.md

@@ -1,11 +1,12 @@
 :strawberry: Strawberry Music Player [![Build Status](https://github.com/strawberrymusicplayer/strawberry/workflows/C/C++%20CI/badge.svg)](https://github.com/strawberrymusicplayer/strawberry/actions)
-[![PayPal](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://paypal.me/jonaskvinge)
-[![Patreon](https://img.shields.io/badge/patreon-donate-green.svg)](https://patreon.com/jonaskvinge)
 =======================
+[![Sponsor](https://img.shields.io/badge/-Sponsor-green?logo=github)](https://github.com/sponsors/jonaski)
+[![Patreon](https://img.shields.io/badge/patreon-donate-green.svg)](https://patreon.com/jonaskvinge)
+[![PayPal](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://paypal.me/jonaskvinge)
 
 Strawberry is a music player and music collection organizer. It is a fork of Clementine released in 2018 aimed at music collectors and audiophiles. It's written in C++ using the Qt toolkit.
 
-![Browse](https://www.strawberrymusicplayer.org/pictures/screenshot-002-large.png)
+![Browse](https://raw.githubusercontent.com/strawberrymusicplayer/strawberry/master/data/screenshot/screenshot.png)
 
 Resources:
 
@@ -15,13 +16,15 @@ Resources:
   * Buildbot: https://buildbot.strawberrymusicplayer.org/
   * Latest builds: https://builds.strawberrymusicplayer.org/
   * openSUSE buildservice: https://build.opensuse.org/package/show/home:jonaski:audio/strawberry
-  * PPA: https://launchpad.net/~jonaski/+archive/ubuntu/strawberry
+  * Ubuntu PPA: https://launchpad.net/~jonaski/+archive/ubuntu/strawberry
+  * Ubuntu Unstable PPA: https://launchpad.net/~jonaski/+archive/ubuntu/strawberry-unstable
   * Translations: https://translate.zanata.org/iteration/view/strawberry/master
 
 ### :bangbang: Opening an issue:
 
 * Search for the issue to see if it is already solved, or if there is an open issue for it already. If there is an open issue already, you can comment on it if you have additional information that could be useful to us.
-* For technical problems, questions and feature requests please use our forum on https://forum.strawberrymusicplayer.org/ that is better suited for discussion. It also better allows answers from the community instead of just the developers on GitHub.
+* For technical problems, discussion, questions and feature suggestions use the forum (https://forum.strawberrymusicplayer.org/) instead. The forum is better suited for discussion.
+* We do not take feature requests from users on GitHub. Any issues related to feature requests will be closed. This does not necessarily mean that we won't add new features, but we don't have time to take feature requests or answer questions about new features from users. It is still possible to suggest or discuss new features on the forum (https://forum.strawberrymusicplayer.org/).
 
 ### :moneybag:	Sponsoring:
 
@@ -43,14 +46,14 @@ Funding developers is a way to contribute to open source projects you appreciate
   * Playlist management
   * Smart and dynamic playlists
   * Advanced audio output and device configuration for bit-perfect playback on Linux
-  * Edit tags on music files
+  * Edit tags on audio files
   * Fetch tags from MusicBrainz
   * Album cover art from [Last.fm](https://www.last.fm/), [Musicbrainz](https://musicbrainz.org/), [Discogs](https://www.discogs.com/), [Musixmatch](https://www.musixmatch.com/), [Deezer](https://www.deezer.com/), [Tidal](https://www.tidal.com/), [Qobuz](https://www.qobuz.com/) and [Spotify](https://www.spotify.com/)
   * Song lyrics from [AudD](https://audd.io/), [Genius](https://genius.com/), [Musixmatch](https://www.musixmatch.com/), [ChartLyrics](http://www.chartlyrics.com/), [lyrics.ovh](https://lyrics.ovh/) and [lololyrics.com](https://www.lololyrics.com/)
   * Support for multiple backends
   * Audio analyzer
   * Audio equalizer
-  * Transfer music to iPod, MTP or mass-storage USB player
+  * Transfer music to mass-storage USB players, MTP compatible devices and iPod Nano/Classic
   * Scrobbler with support for [Last.fm](https://www.last.fm/), [Libre.fm](https://libre.fm/) and [ListenBrainz](https://listenbrainz.org/)
   * Subsonic, Tidal and Qobuz streaming support
 
@@ -63,32 +66,29 @@ It has so far been tested to work on Linux, OpenBSD, FreeBSD, macOS and Windows.
 
 To build Strawberry from source you need the following installed on your system with the additional development packages/headers:
 
-* [CMake and Make tools](https://cmake.org/)
-* [GCC](https://gcc.gnu.org/) or [clang](https://clang.llvm.org/) compiler
+* [CMake](https://cmake.org/)
+* [GCC](https://gcc.gnu.org/), [Clang](https://clang.llvm.org/) or [MSVC](https://visualstudio.microsoft.com/vs/features/cplusplus/) compiler
 * [Boost](https://www.boost.org/)
-* [POSIX thread (pthread)](http://www.yolinux.com/TUTORIALS/LinuxTutorialPosixThreads.html)
 * [GLib](https://developer.gnome.org/glib/)
-* [Protobuf](https://developers.google.com/protocol-buffers/)
-* [Qt 5.8 or higher (or Qt 6) with components Core, Gui, Widgets, Concurrent, Network and Sql](https://www.qt.io/)
-* [Qt components X11Extras and D-Bus for Linux/BSD and WinExtras for Windows](https://www.qt.io/)
+* [Qt 5.9 or higher (or Qt 6) with components Core, Gui, Widgets, Concurrent, Network and Sql](https://www.qt.io/)
 * [SQLite 3.9 or newer with FTS5](https://www.sqlite.org)
-* [Chromaprint](https://acoustid.org/chromaprint)
-* [ALSA (linux)](https://www.alsa-project.org/)
-* [D-Bus (linux)](https://www.freedesktop.org/wiki/Software/dbus/)
-* [PulseAudio (linux optional)](https://www.freedesktop.org/wiki/Software/PulseAudio/?)
+* [Protobuf](https://developers.google.com/protocol-buffers/)
+* [ALSA (Required on Linux)](https://www.alsa-project.org/)
+* [D-Bus (Required on Linux)](https://www.freedesktop.org/wiki/Software/dbus/)
 * [GStreamer](https://gstreamer.freedesktop.org/) or [VLC](https://www.videolan.org)
 * [GnuTLS](https://www.gnutls.org/)
-* [TagLib](https://www.taglib.org/)
+* [TagLib 1.11.1 or higher](https://www.taglib.org/) or [TagParser](https://github.com/Martchus/tagparser)
 
 Optional dependencies:
 
+* Song fingerprinting and MusicBrainz tagging: [Chromaprint](https://acoustid.org/chromaprint)
+* Moodbar: [fftw3](http://www.fftw.org/)
+* PulseAudio integration: [PulseAudio](https://www.freedesktop.org/wiki/Software/PulseAudio/?)
 * Audio CD: [libcdio](https://www.gnu.org/software/libcdio/)
 * MTP devices: [libmtp](http://libmtp.sourceforge.net/)
 * iPod Classic devices: [libgpod](http://www.gtkpod.org/libgpod/)
-* Moodbar: [fftw3](http://www.fftw.org/)
 
-Either GStreamer or VLC engine is required, but only GStreamer is fully implemented, and works best, it is therefore recommended to use GStreamer.
-You should also install the gstreamer plugins base and good, and optionally bad, ugly and libav.
+You should also install the gstreamer plugins base and good, and optionally bad, ugly and libav to support all audio formats.
 
 ### :wrench:	Compiling from source
 
@@ -100,13 +100,13 @@ You should also install the gstreamer plugins base and good, and optionally bad,
 
     cd strawberry
     mkdir build && cd build
-    cmake ..
+    cmake .. -DBUILD_WITH_QT6=ON
     make -j$(nproc)
     sudo make install
-    
-To compile with Qt 6 use:
 
-    cmake .. -DBUILD_WITH_QT6=ON
+Strawberry is backwards compatible with Qt 5, to compile with Qt 5 use:
+
+    cmake .. -DBUILD_WITH_QT5=ON
 
 ### :penguin:	Packaging status
 

cmake/Deb.cmake

@@ -2,18 +2,5 @@ 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 AND DEB_DATE)
-    add_custom_target(deb
-      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-      COMMAND ${DPKG_BUILDPACKAGE} -b -d -uc -us
-    )
-  endif()
-
+  add_custom_target(deb WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} COMMAND ${DPKG_BUILDPACKAGE} -b -d -uc -us)
 endif()

cmake/Dmg.cmake

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

cmake/OptionalSource.cmake

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

cmake/Rpm.cmake

@@ -12,10 +12,17 @@ if (LSB_RELEASE_EXEC AND RPMBUILD_EXEC)
     OUTPUT_VARIABLE DIST_RELEASE
     OUTPUT_STRIP_TRAILING_WHITESPACE
   )
-  execute_process(COMMAND /bin/sh "-c" "${LSB_RELEASE_EXEC} -ds | tr '[:upper:]' '[:lower:]' | sed 's/\"//g' | sed 's/\\.//g' | cut -d' ' -f3"
-    OUTPUT_VARIABLE DIST_VERSION
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-  )
+  if (${DIST_NAME} STREQUAL "openmandrivalinux")
+    execute_process(COMMAND /bin/sh "-c" "${LSB_RELEASE_EXEC} -ds | tr '[:upper:]' '[:lower:]' | sed 's/\"//g' | sed 's/\\./0/g' | cut -d' ' -f3"
+      OUTPUT_VARIABLE DIST_VERSION
+      OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+  else()
+    execute_process(COMMAND /bin/sh "-c" "${LSB_RELEASE_EXEC} -ds | tr '[:upper:]' '[:lower:]' | sed 's/\"//g' | sed 's/\\.//g' | cut -d' ' -f3"
+      OUTPUT_VARIABLE DIST_VERSION
+      OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+  endif()
   if (DIST_NAME)
 
     message(STATUS "Distro Name: ${DIST_NAME}")
@@ -44,6 +51,8 @@ if (LSB_RELEASE_EXEC AND RPMBUILD_EXEC)
       set(RPM_DISTRO "el${DIST_VERSION}")
     elseif (${DIST_NAME} STREQUAL "mageia" AND DIST_RELEASE)
       set(RPM_DISTRO "mga${DIST_RELEASE}")
+    elseif (${DIST_NAME} STREQUAL "openmandrivalinux" AND DIST_VERSION)
+      set(RPM_DISTRO "omv${DIST_VERSION}")
     endif()
 
     if(NOT RPM_DISTRO)

cmake/Summary.cmake

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

cmake/Translations.cmake

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

cmake/Version.cmake

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

data/data.qrc

@@ -14,6 +14,8 @@
         <file>schema/schema-11.sql</file>
         <file>schema/schema-12.sql</file>
         <file>schema/schema-13.sql</file>
+        <file>schema/schema-14.sql</file>
+        <file>schema/schema-15.sql</file>
         <file>schema/device-schema.sql</file>
         <file>style/strawberry.css</file>
         <file>style/smartplaylistsearchterm.css</file>
@@ -44,7 +46,6 @@
         <file>pictures/rainbowdash.png</file>
         <file>pictures/star-on.png</file>
         <file>pictures/star-off.png</file>
-        <file>fonts/HumongousofEternitySt.ttf</file>
         <file>mood/sample.mood</file>
         <file>text/ghosts.txt</file>
     </qresource>

data/icons.qrc

@@ -24,6 +24,7 @@
         <file>icons/128x128/document-open-folder.png</file>
         <file>icons/128x128/document-open.png</file>
         <file>icons/128x128/document-save.png</file>
+        <file>icons/128x128/document-save-all.png</file>
         <file>icons/128x128/document-search.png</file>
         <file>icons/128x128/download.png</file>
         <file>icons/128x128/edit-clear-list.png</file>
@@ -92,6 +93,10 @@
         <file>icons/128x128/tidal.png</file>
         <file>icons/128x128/qobuz.png</file>
         <file>icons/128x128/multimedia-player-ipod-standard-black.png</file>
+        <file>icons/128x128/radio.png</file>
+        <file>icons/128x128/somafm.png</file>
+        <file>icons/128x128/radioparadise.png</file>
+        <file>icons/128x128/musicbrainz.png</file>
         <file>icons/64x64/albums.png</file>
         <file>icons/64x64/alsa.png</file>
         <file>icons/64x64/application-exit.png</file>
@@ -116,6 +121,7 @@
         <file>icons/64x64/document-open-folder.png</file>
         <file>icons/64x64/document-open.png</file>
         <file>icons/64x64/document-save.png</file>
+        <file>icons/64x64/document-save-all.png</file>
         <file>icons/64x64/document-search.png</file>
         <file>icons/64x64/download.png</file>
         <file>icons/64x64/edit-clear-list.png</file>
@@ -185,6 +191,10 @@
         <file>icons/64x64/tidal.png</file>
         <file>icons/64x64/qobuz.png</file>
         <file>icons/64x64/multimedia-player-ipod-standard-black.png</file>
+        <file>icons/64x64/radio.png</file>
+        <file>icons/64x64/somafm.png</file>
+        <file>icons/64x64/radioparadise.png</file>
+        <file>icons/64x64/musicbrainz.png</file>
         <file>icons/48x48/albums.png</file>
         <file>icons/48x48/alsa.png</file>
         <file>icons/48x48/application-exit.png</file>
@@ -210,6 +220,7 @@
         <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-save-all.png</file>
         <file>icons/48x48/document-search.png</file>
         <file>icons/48x48/download.png</file>
         <file>icons/48x48/edit-clear-list.png</file>
@@ -282,6 +293,10 @@
 	<file>icons/48x48/tidal.png</file>
 	<file>icons/48x48/qobuz.png</file>
         <file>icons/48x48/multimedia-player-ipod-standard-black.png</file>
+        <file>icons/48x48/radio.png</file>
+        <file>icons/48x48/somafm.png</file>
+        <file>icons/48x48/radioparadise.png</file>
+        <file>icons/48x48/musicbrainz.png</file>
         <file>icons/32x32/albums.png</file>
         <file>icons/32x32/alsa.png</file>
         <file>icons/32x32/application-exit.png</file>
@@ -307,6 +322,7 @@
         <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-save-all.png</file>
         <file>icons/32x32/document-search.png</file>
         <file>icons/32x32/download.png</file>
         <file>icons/32x32/edit-clear-list.png</file>
@@ -379,6 +395,10 @@
         <file>icons/32x32/tidal.png</file>
         <file>icons/32x32/qobuz.png</file>
         <file>icons/32x32/multimedia-player-ipod-standard-black.png</file>
+        <file>icons/32x32/radio.png</file>
+        <file>icons/32x32/somafm.png</file>
+        <file>icons/32x32/radioparadise.png</file>
+        <file>icons/32x32/musicbrainz.png</file>
         <file>icons/22x22/albums.png</file>
         <file>icons/22x22/alsa.png</file>
         <file>icons/22x22/application-exit.png</file>
@@ -404,6 +424,7 @@
         <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-save-all.png</file>
         <file>icons/22x22/document-search.png</file>
         <file>icons/22x22/download.png</file>
         <file>icons/22x22/edit-clear-list.png</file>
@@ -476,5 +497,9 @@
         <file>icons/22x22/tidal.png</file>
         <file>icons/22x22/qobuz.png</file>
         <file>icons/22x22/multimedia-player-ipod-standard-black.png</file>
+        <file>icons/22x22/radio.png</file>
+        <file>icons/22x22/somafm.png</file>
+        <file>icons/22x22/radioparadise.png</file>
+        <file>icons/22x22/musicbrainz.png</file>
     </qresource>
 </RCC>

data/schema/device-schema.sql

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

data/schema/schema-14.sql

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

data/schema/schema-15.sql

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

data/schema/schema.sql

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

data/style/strawberry.css

@@ -19,47 +19,6 @@
   background-clip: content;
 }
 
-QToolButton {
-  border: 2px solid transparent;
-  border-radius: 3px;
-  padding: 1px;
-}
-
-QToolButton::menu-button {
-  width: 16px;
-  border: none;
-}
-
-QToolButton[popupMode="1"] {
-  padding-right: 16px;
-}
-
-QToolButton:hover {
-  border: 2px solid %palette-highlight;
-  background-color: %palette-highlight-lighter;
-}
-
-QToolButton:hover[popupMode="1"] {
-  padding-right: 16px;
-}
-
-QToolButton:pressed {
-  border: 2px solid %palette-highlight-darker;
-  background-color: %palette-highlight-lighter;
-}
-
-QToolButton:pressed[popupMode="1"] {
-  padding-right: 16px;
-}
-
-macos {
-  font-size: 11pt;
-}
-
-macos QMenu {
-  font-size: 13pt;
-}
-
 #context-layout-container {
   background-color: %palette-base;
 }
@@ -71,3 +30,45 @@ macos QMenu {
 #context-layout-scrollarea {
   background-color: %palette-base;
 }
+
+#context-scrollarea {
+  background-color: %palette-base;
+}
+
+QToolButton {
+  border: 2px solid transparent;
+  border-radius: 3px;
+  padding: 1px;
+}
+
+QToolButton:hover {
+  border: 2px solid %palette-highlight;
+  background-color: %palette-highlight-lighter;
+}
+
+QToolButton:pressed {
+  border: 2px solid %palette-highlight-darker;
+  background-color: %palette-highlight-lighter;
+}
+
+QToolButton[popupMode="MenuButtonPopup"], QToolButton:hover[popupMode="MenuButtonPopup"], QToolButton:pressed[popupMode="MenuButtonPopup"] {
+  padding-right: 16px;
+}
+
+/* For backwards compatibility with Qt 5 as it does not support property name */
+QToolButton[popupMode="1"], QToolButton:hover[popupMode="1"], QToolButton:pressed[popupMode="1"] {
+  padding-right: 16px;
+}
+
+QToolButton::menu-button {
+  width: 16px;
+  border: none;
+}
+
+macos {
+  font-size: 11pt;
+}
+
+macos QMenu {
+  font-size: 13pt;
+}

debian/CMakeLists.txt

@@ -0,0 +1,22 @@
+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 AND DEB_DATE)
+
+    if(BUILD_WITH_QT5)
+      set(DEBIAN_BUILD_DEPENDS_QT_PACKAGES qtbase5-dev,qtbase5-dev-tools,qttools5-dev,qttools5-dev-tools,libqt5x11extras5-dev)
+      set(DEBIAN_DEPENDS_QT_PACKAGES libqt5sql5-sqlite)
+    endif()
+    if(BUILD_WITH_QT6)
+      set(DEBIAN_BUILD_DEPENDS_QT_PACKAGES qt6-base-dev,qt6-base-dev-tools,qt6-tools-dev,qt6-tools-dev-tools,qt6-l10n-tools)
+      set(DEBIAN_DEPENDS_QT_PACKAGES libqt6sql6-sqlite,qt6-qpa-plugins)
+    endif()
+
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/control.in ${CMAKE_CURRENT_SOURCE_DIR}/control @ONLY)
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/changelog.in ${CMAKE_CURRENT_SOURCE_DIR}/changelog)
+  
+  endif()
+
+endif()

debian/control.in

@@ -6,6 +6,7 @@ Build-Depends: debhelper (>= 11),
                make,
                cmake,
                gcc,
+               g++,
                protobuf-compiler,
                libglib2.0-dev,
                libdbus-1-dev,
@@ -16,10 +17,7 @@ Build-Depends: debhelper (>= 11),
                libasound2-dev,
                libpulse-dev,
                libtag1-dev,
-               qtbase5-dev,
-               qtbase5-dev-tools,
-               qttools5-dev,
-               libqt5x11extras5-dev,
+               @DEBIAN_BUILD_DEPENDS_QT_PACKAGES@,
                libgstreamer1.0-dev,
                libgstreamer-plugins-base1.0-dev,
                libcdio-dev,
@@ -27,38 +25,38 @@ Build-Depends: debhelper (>= 11),
                libmtp-dev,
                libchromaprint-dev,
                libfftw3-dev
-Standards-Version: 4.2.1
+Standards-Version: 4.6.1
 
 Package: strawberry
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libsqlite3-0,
-         libqt5sql5-sqlite,
+         @DEBIAN_DEPENDS_QT_PACKAGES@,
          gstreamer1.0-plugins-base,
          gstreamer1.0-plugins-good,
          gstreamer1.0-alsa,
          gstreamer1.0-pulseaudio
 Homepage: http://www.strawberrymusicplayer.org/
-Description: Audio player and music collection organizer
- Strawberry is a music player aimed at music collectors, audio enthusiasts and audiophiles.
+Description: music player and music collection organizer
+ Strawberry is a music player aimed at music collectors and audiophiles.
  .
  Features:
   - Play and organize music
   - Supports WAV, FLAC, WavPack, Ogg Vorbis, Speex, MPC, TrueAudio, AIFF, MP4, MP3 and ASF
   - Audio CD playback
   - Native desktop notifications
-  - Playlists in multiple formats
+  - Playlist management and playlists in multiple formats
+  - Smart and dynamic playlists
   - Advanced audio output and device configuration for bit-perfect playback on Linux
-  - Edit tags on music files
-  - Fetch tags from MusicBrainz
+  - Edit tags on audio files
+  - Automatically retrieve tags from MusicBrainz
   - Album cover art from Last.fm, Musicbrainz, Discogs, Musixmatch, Deezer, Tidal, Qobuz and Spotify
   - Song lyrics from AudD, Genius, Musixmatch, ChartLyrics, lyrics.ovh and lololyrics.com
-  - Support for multiple backends
   - Audio analyzer
   - Audio equalizer
-  - Transfer music to iPod, iPhone, MTP or mass-storage USB player
+  - Transfer music to mass-storage USB players, MTP compatible devices and iPod Nano/Classic
   - Scrobbler with support for Last.fm, Libre.fm and ListenBrainz
-  - Streaming support for Subsonic
+  - Streaming support for Subsonic-compatible servers
+  - Unofficial streaming support for Tidal and Qobuz
  .
  It is a fork of Clementine. The name is inspired by the band Strawbs.

debian/copyright

@@ -1,10 +1,11 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: strawberry
 Upstream-Contact: Jonas Kvinge <jonas@jkvinge.net>
-Source: https://www.strawberrymusicplayer.org/
+Source: https://github.com/strawberrymusicplayer/strawberry
 
 Files: *
 Copyright: 2010-2015, David Sansome <me@davidsansome.com>
+           2012-2014, 2017-2022 Jonas Kvinge <jonas@jkvinge.net>
 License: GPL-3+
 
 Files: src/core/timeconstants.h
@@ -13,14 +14,13 @@ Files: src/core/timeconstants.h
        ext/libstrawberry-common/core/messagehandler.cpp
        ext/libstrawberry-common/core/messagehandler.h
 Copyright: 2011, 2012, David Sansome <me@davidsansome.com>
+           2018-2022, Jonas Kvinge <jonas@jkvinge.net>
 License: Apache-2.0
 
 Files: src/core/main.h
        src/core/iconloader.cpp
        src/core/iconloader.h
        src/core/iconmapper.h
-       src/config.h.in
-       src/version.h.in
        src/context/contextview.cpp
        src/context/contextview.h
        src/context/contextalbum.cpp
@@ -29,6 +29,8 @@ Files: src/core/main.h
        src/engine/enginetype.h
        src/engine/alsadevicefinder.cpp
        src/engine/alsadevicefinder.h
+       src/engine/alsapcmdevicefinder.cpp
+       src/engine/alsapcmdevicefinder.h
        src/engine/mmdevicefinder.cpp
        src/engine/mmdevicefinder.h
        src/engine/devicefinder.cpp
@@ -69,11 +71,17 @@ Files: src/core/main.h
        src/covermanager/spotifycoverprovider.h
        src/covermanager/musixmatchcoverprovider.cpp
        src/covermanager/musixmatchcoverprovider.h
-       src/globalshortcuts/globalshortcutsbackend-system.cpp
-       src/globalshortcuts/globalshortcutsbackend-system.h
+       src/globalshortcuts/globalshortcutsbackend-kde.cpp
+       src/globalshortcuts/globalshortcutsbackend-kde.h
+       src/globalshortcuts/globalshortcutsbackend-mate.cpp
+       src/globalshortcuts/globalshortcutsbackend-mate.h
+       src/globalshortcuts/globalshortcutsbackend-x11.cpp
+       src/globalshortcuts/globalshortcutsbackend-x11.h
+       src/globalshortcuts/globalshortcutsbackend-win.cpp
+       src/globalshortcuts/globalshortcutsbackend-win.h
        src/globalshortcuts/globalshortcut.cpp
        src/globalshortcuts/globalshortcut.h
-       src/globalshortcuts/globalshortcut-X11.cpp
+       src/globalshortcuts/globalshortcut-x11.cpp
        src/globalshortcuts/globalshortcut-win.cpp
        src/globalshortcuts/keymapper_x11.h
        src/globalshortcuts/keymapper_win.h
@@ -81,132 +89,21 @@ Files: src/core/main.h
        src/scrobbler/*
        src/subsonic/*
        src/tidal/*
+       src/qobuz/*
+       src/radios/*
        src/transcoder/transcoderoptionswavpack.cpp
        src/transcoder/transcoderoptionswavpack.h
-Copyright: 2012-2014, 2017-2020, Jonas Kvinge <jonas@jkvinge.net>
-License: GPL-3+
-
-Files: src/core/main.cpp
-       src/core/mainwindow.cpp
-       src/core/mainwindow.h
-       src/core/player.cpp
-       src/core/player.h
-       src/core/song.cpp
-       src/core/song.h
-       src/core/songloader.cpp
-       src/core/songloader.h
-       src/core/urlhandler.cpp
-       src/core/urlhandler.h
-       src/core/utilities.cpp
-       src/core/utilities.h
-       src/core/networkaccessmanager.cpp
-       src/core/networkaccessmanager.h
-       src/core/threadsafenetworkdiskcache.cpp
-       src/core/threadsafenetworkdiskcache.h
-       src/core/filesystemmusicstorage.cpp
-       src/core/filesystemmusicstorage.h
-       src/core/stylesheetloader.cpp
-       src/core/stylesheetloader.h
-       src/engine/gstenginepipeline.cpp
-       src/engine/gstenginepipeline.h
-       src/engine/vlcengine.cpp
-       src/engine/vlcengine.h
-       src/collection/collectionwatcher.cpp
-       src/collection/collectionwatcher.h
-       src/collection/collectionbackend.cpp
-       src/collection/collectionbackend.h
-       src/collection/collectionmodel.cpp
-       src/collection/collectionmodel.h
-       src/context/contextalbumsmodel.cpp
-       src/context/contextalbumsview.cpp
-       src/context/contextalbumsmodel.h
-       src/context/contextalbumsview.h
-       src/widgets/playingwidget.cpp
-       src/widgets/playingwidget.h
-       src/osd/osdbase.cpp
-       src/osd/osdbase.h
-       src/osd/osdpretty.cpp
-       src/osd/osdpretty.h
-       src/osd/osddbus.cpp
-       src/osd/osddbus.h
-       src/osd/osdmac.cpp
-       src/osd/osdmac.h
-       src/dialogs/about.cpp
-       src/dialogs/about.h
-       src/playlist/playlist.cpp
-       src/playlist/playlist.h
-       src/playlist/playlistitem.cpp
-       src/playlist/playlistitem.h
-       src/playlist/playlistdelegates.cpp
-       src/playlist/playlistdelegates.h
-       src/playlist/playlistbackend.cpp
-       src/playlist/playlistbackend.h
-       src/playlist/playlistview.cpp
-       src/playlist/playlistview.h
-       src/playlist/songplaylistitem.cpp
-       src/playlist/songplaylistitem.h
-       src/internet/internetplaylistitem.cpp
-       src/internet/internetsearch.cpp
-       src/internet/internetsearch.h
-       src/internet/internetsearchview.cpp
-       src/internet/internetsearchview.h
-       src/internet/internetservices.cpp
-       src/internet/internetservices.h
-       src/internet/internetsongsview.cpp
-       src/internet/internetsongsview.h
-       src/internet/internetcollectionview.cpp
-       src/internet/internetcollectionview.h
-       ext/libstrawberry-tagreader/tagreader.cpp
-       ext/libstrawberry-tagreader/tagreader.h
-       src/device/devicemanager.cpp
-       src/device/devicemanager.h
-       src/device/deviceinfo.cpp
-       src/device/deviceinfo.h
-       src/device/deviceproperties.cpp
-       src/device/deviceproperties.h
-       src/device/deviceview.cpp
-       src/device/deviceview.h
-       src/device/connecteddevice.cpp
-       src/device/connecteddevice.h
-       src/device/mtpconnection.cpp
-       src/device/mtpconnection.h
-       src/device/mtpdevice.cpp
-       src/device/mtpdevice.h
-       src/globalshortcuts/globalshortcutsmanager.cpp
-       src/globalshortcuts/globalshortcutsmanager.h
-       src/settings/shortcutssettingspage.cpp
-       src/settings/shortcutssettingspage.h
-       src/settings/appearancesettingspage.cpp
-       src/settings/appearancesettingspage.h
-       src/organize/organize.cpp
-       src/organize/organize.h
-       src/organize/organizedialog.cpp
-       src/organize/organizedialog.h
-       src/organize/organizeerrordialog.cpp
-       src/organize/organizeerrordialog.h
-       src/transcoder/transcoder.cpp
-       src/transcoder/transcoder.h
-       src/musicbrainz/musicbrainzclient.cpp
-       src/musicbrainz/musicbrainzclient.h
-       src/covermanager/albumcoverloader.cpp
-       src/covermanager/albumcoverloader.h
-       src/covermanager/currentalbumcoverloader.cpp
-       src/covermanager/currentalbumcoverloader.h
-       src/covermanager/albumcoverchoicecontroller.cpp
-       src/covermanager/albumcoverchoicecontroller.h
-       src/covermanager/albumcoverfetchersearch.cpp
-       src/covermanager/albumcoverfetchersearch.h
-       src/covermanager/coverproviders.cpp
-       src/covermanager/coverproviders.h
-       src/covermanager/coverprovider.cpp
-       src/covermanager/coverprovider.h
-Copyright: 2010, 2012-2014 David Sansome <me@davidsansome.com>
-           2012-2014, 2017-2020 Jonas Kvinge <jonas@jkvinge.net>
+       ext/libstrawberry-tagreader/tagreadertagparser.cpp
+       ext/libstrawberry-tagreader/tagreadertagparser.h
+       ext/macdeploycheck/*
+       widgets/resizabletextedit.cpp
+       widgets/resizabletextedit.h
+Copyright: 2012-2014, 2017-2022, Jonas Kvinge <jonas@jkvinge.net>
 License: GPL-3+
 
 Files: src/engine/enginebase.cpp
        src/engine/enginebase.h
-Copyright: 2017, 2018, Jonas Kvinge <jonas@jkvinge.net>
+Copyright: 2017-2021, Jonas Kvinge <jonas@jkvinge.net>
            2010, David Sansome <me@davidsansome.com>
            2004, 2005, Max Howell, <max.howell@methylblue.com>
            2003, Mark Kretschmann <markey@web.de>
@@ -214,7 +111,7 @@ License: GPL-3+
 
 Files: src/engine/gstengine.cpp
        src/engine/gstengine.h
-Copyright: 2017, 2018, Jonas Kvinge <jonas@jkvinge.net>
+Copyright: 2017-2021, Jonas Kvinge <jonas@jkvinge.net>
            2006, Paul Cifarelli <paul@cifarelli.net>
            2005, Jakub Stachowski <qbast@go2.pl>
            2003-2005, Mark Kretschmann <markey@web.de>
@@ -230,7 +127,7 @@ Files: src/core/application.cpp
        src/core/application.h
 Copyright: 2012, David Sansome <me@davidsansome.com>
            2012, 2014, John Maguire <john.maguire@gmail.com>
-           2018, Jonas Kvinge <jonas@jkvinge.net>
+           2018-2021, Jonas Kvinge <jonas@jkvinge.net>
 License: GPL-3+
 
 Files: src/core/appearance.cpp
@@ -244,13 +141,7 @@ Copyright: 2012, Martin Björklund <mbj4668@gmail.com>
            2016, Jonas Kvinge <jonas@jkvinge.net>
 License: GPL-3+
 
-Files: ext/libstrawberry-common/core/arraysize.h
-       ext/libstrawberry-common/core/scoped_nsautorelease_pool.h
-       ext/libstrawberry-common/core/scoped_nsautorelease_pool.mm
-Copyright: 2010, 2011, 2014, The Chromium Authors.
-License: BSD-style
-
-Files: ext/libstrawberry-common/core/lazy.h
+Files: src/core/lazy.h
 Copyright: 2016, John Maguire <john.maguire@gmail.com>
 License: GPL-3+
 
@@ -298,12 +189,17 @@ Copyright: 2011, Tyler Rhodes <tyler.s.rhodes@gmail.com>
            2015, Arun Narayanankutty <n.arun.lifescience@gmail.com>
 License: GPL-2+
 
-Files: src/collection/savedgroupingmanager.h
+Files: src/collection/savedgroupingmanager.*
 Copyright: 2015, Nick Lanham <nick@afternight.org>
+           2019-2021 Jonas Kvinge <jonas@jkvinge.net>
 License: GPL-3+
 
-Files: src/core/scoped_cftyperef.h
+Files:
+       src/core/arraysize.h
+       src/core/scoped_cftyperef.h
        src/core/scoped_nsobject.h
+       src/core/scoped_nsautorelease_pool.h
+       src/core/scoped_nsautorelease_pool.mm
 Copyright: 2010, 2011, 2014, The Chromium Authors.
 License: BSD-style
 
@@ -322,7 +218,7 @@ Files: src/internet/localredirectserver.cpp
        src/internet/localredirectserver.h
 Copyright: 2012, 2014, John Maguire <john.maguire@gmail.com>
            2014, Krzysztof Sobiecki <sobkas@gmail.com>
-           2018-2019, Jonas Kvinge <jonas@jkvinge.net>
+           2018-2021, Jonas Kvinge <jonas@jkvinge.net>
 License: GPL-3+
 
 Files: src/transcoder/transcoderoptionsopus.cpp
@@ -337,12 +233,16 @@ Files: src/widgets/clickablelabel.cpp
 Copyright: 2010, 2011, Andrea Decorte <adecorte@gmail.com>
 License: GPL-3+
 
-Files: src/widgets/sliderwidget.cpp
-       src/widgets/sliderwidget.h
+Files: src/widgets/volumeslider.cpp
+       src/widgets/volumeslider.h
 Copyright: 2005, Gábor Lehel
            2003, Mark Kretschmann <markey@web.de>
 License: GPL-2+
 
+Files: src/scrobbler/subsonicscrobbler.*
+Copyright: 2018-2021 Jonas Kvinge <jonas@jkvinge.net>
+           2020 Pascal Below <spezifisch@below.fr>
+
 Files: src/core/stylehelper.cpp
        src/core/stylehelper.h
 Copyright: 2016 The Qt Company Ltd.
@@ -358,6 +258,7 @@ License: GPL-2+
 Files: src/widgets/qsearchfield_nonmac.cpp
        src/widgets/qsearchfield_mac.mm
        src/widgets/qsearchfield.h
+       src/widgets/qocoa_mac.h
 Copyright: 2011, Mike McQuaid <mike@mikemcquaid.com>
 License: Expat
 
@@ -367,7 +268,7 @@ Copyright: 2010, Spotify AB
 License: BSD-3-clause
 
 Files: 3rdparty/singleapplication/*
-Copyright: 2015-2018, Itay Grudev
+Copyright: 2015-2022, Itay Grudev
 License: MIT
 
 

debian/copyright-scan-patterns.yml

@@ -4,14 +4,14 @@ ignore:
   - Changelog
   - COPYING
   - CMakeLists.txt
-  - Dockerfile
+  - cmake_uninstall.cmake.in
+  - .clang-format
   - .gitignore
-  - .travis.yml
+  - .github
   - /debian/
   - /cmake/
   - /data/
   - /dist/
-  - /snap/
 
   suffixes:
   - jpg

debian/rules

@@ -5,7 +5,6 @@
 
 override_dh_auto_clean:
 	rm -f dist/macos/Info.plist
-	rm -f dist/unix/PKGBUILD
 	rm -f dist/unix/strawberry.spec
 	rm -f dist/scripts/maketarball.sh
 	rm -f dist/windows/strawberry.nsi

dist/CMakeLists.txt

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

dist/macos/Info.plist.in

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

dist/macos/macgstcopy.sh

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

dist/scripts/import-from-clementine.sh

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

dist/scripts/maketarball.sh.in

@@ -11,10 +11,33 @@ if ! [ "$gitrev" = "ON" ]; then
   exclude_vcs="--exclude-vcs"
 fi
 
+cmds="gtar tar"
+for cmd in $cmds
+do
+  which $cmd >/dev/null 2>&1
+  if [ ! $? -eq 0 ]; then
+    continue
+  fi
+  result=$($cmd --version 2>&1 | head -n1)
+  if [ ! $? -eq 0 ]; then
+    continue
+  fi
+  echo "$result" | grep "^.* (GNU tar) .*$" >/dev/null 2>&1
+  if [ ! $? -eq 0 ]; then
+    continue
+  fi
+  TAR=$cmd
+done
+
+if [ "$TAR" = "" ]; then
+  echo "ERROR: Missing GNU Tar"
+  exit 1
+fi
+
 echo "Creating $name-$version.tar.xz..."
 
 rm -f "$name-$version.tar.xz"
-tar -cJf $name-$version.tar.xz \
+${TAR} -cJf $name-$version.tar.xz \
     --transform "s,^$rootnoslash,$name-$version," $exclude_vcs \
     --exclude=".directory" \
     --exclude="*.tar" \
@@ -37,7 +60,6 @@ tar -cJf $name-$version.tar.xz \
     --exclude="$root/.zanata-cache" \
     --exclude="$root/debian/changelog" \
     --exclude="$root/dist/scripts/maketarball.sh" \
-    --exclude="$root/dist/unix/PKGBUILD" \
     --exclude="$root/dist/macos/Info.plist" \
     --exclude="$root/dist/windows/windres.rc" \
     --exclude="$root/src/translations/translations.pot" \

dist/unix/PKGBUILD.in

@@ -1,56 +0,0 @@
-# Maintainer: Jonas Kvinge <jonas@jkvinge.net>
-pkgname=strawberry
-pkgver=@STRAWBERRY_VERSION_PAC_V@
-pkgrel=@STRAWBERRY_VERSION_PAC_R@
-pkgdesc="A music player aimed at audio enthusiasts and music collectors"
-arch=(x86_64)
-url="https://www.strawberrymusicplayer.org/"
-license=(GPL3)
-makedepends=(git cmake make gcc boost gettext qt5-tools)
-depends=(
-  desktop-file-utils
-  hicolor-icon-theme
-  gnutls
-  udisks2
-  protobuf
-  qt5-base
-  qt5-x11extras
-  sqlite3
-  alsa-lib
-  libpulse
-  dbus
-  taglib
-  gstreamer
-  gst-plugins-base
-  gst-plugins-good
-  vlc
-  chromaprint
-  libgpod
-  libcdio
-  libmtp
-  fftw
-)
-optdepends=(
-  gst-plugins-bad
-  gst-plugins-ugly
-  gst-libav
-)
-provides=(strawberry)
-conflicts=(strawberry)
-source=("strawberry-@STRAWBERRY_VERSION_PACKAGE@.tar.xz")
-sha256sums=('SKIP')
-
-prepare() {
-  mkdir -p build
-}
-
-build() {
-  cd build
-  cmake ../${pkgname}-@STRAWBERRY_VERSION_PACKAGE@ -DCMAKE_INSTALL_PREFIX=/usr
-  make -j$(nproc)
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-}

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

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

dist/unix/strawberry.1

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

dist/unix/strawberry.spec.in

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

dist/windows/Registry.nsh

@@ -0,0 +1,186 @@
+!define registry::Open `!insertmacro registry::Open`
+
+!macro registry::Open _PATH _OPTIONS _HANDLE
+	registry::_Open /NOUNLOAD `${_PATH}` `${_OPTIONS}`
+	Pop ${_HANDLE}
+!macroend
+
+
+!define registry::Find `!insertmacro registry::Find`
+
+!macro registry::Find _HANDLE _PATH _VALUEORKEY _STRING _TYPE
+	registry::_Find /NOUNLOAD `${_HANDLE}`
+	Pop ${_PATH}
+	Pop ${_VALUEORKEY}
+	Pop ${_STRING}
+	Pop ${_TYPE}
+!macroend
+
+
+!define registry::Close `!insertmacro registry::Close`
+
+!macro registry::Close _HANDLE
+	registry::_Close /NOUNLOAD `${_HANDLE}`
+!macroend
+
+
+!define registry::KeyExists `!insertmacro registry::KeyExists`
+
+!macro registry::KeyExists _PATH _ERR
+	registry::_KeyExists /NOUNLOAD `${_PATH}`
+	Pop ${_ERR}
+!macroend
+
+
+!define registry::Read `!insertmacro registry::Read`
+
+!macro registry::Read _PATH _VALUE _STRING _TYPE
+	registry::_Read /NOUNLOAD `${_PATH}` `${_VALUE}`
+	Pop ${_STRING}
+	Pop ${_TYPE}
+!macroend
+
+
+!define registry::Write `!insertmacro registry::Write`
+
+!macro registry::Write _PATH _VALUE _STRING _TYPE _ERR
+	registry::_Write /NOUNLOAD `${_PATH}` `${_VALUE}` `${_STRING}` `${_TYPE}`
+	Pop ${_ERR}
+!macroend
+
+
+!define registry::ReadExtra `!insertmacro registry::ReadExtra`
+
+!macro registry::ReadExtra _PATH _VALUE _NUMBER _STRING _TYPE
+	registry::_ReadExtra /NOUNLOAD `${_PATH}` `${_VALUE}` `${_NUMBER}`
+	Pop ${_STRING}
+	Pop ${_TYPE}
+!macroend
+
+
+!define registry::WriteExtra `!insertmacro registry::WriteExtra`
+
+!macro registry::WriteExtra _PATH _VALUE _STRING _ERR
+	registry::_WriteExtra /NOUNLOAD `${_PATH}` `${_VALUE}` `${_STRING}`
+	Pop ${_ERR}
+!macroend
+
+
+!define registry::CreateKey `!insertmacro registry::CreateKey`
+
+!macro registry::CreateKey _PATH _ERR
+	registry::_CreateKey /NOUNLOAD `${_PATH}`
+	Pop ${_ERR}
+!macroend
+
+
+!define registry::DeleteValue `!insertmacro registry::DeleteValue`
+
+!macro registry::DeleteValue _PATH _VALUE _ERR
+	registry::_DeleteValue /NOUNLOAD `${_PATH}` `${_VALUE}`
+	Pop ${_ERR}
+!macroend
+
+
+!define registry::DeleteKey `!insertmacro registry::DeleteKey`
+
+!macro registry::DeleteKey _PATH _ERR
+	registry::_DeleteKey /NOUNLOAD `${_PATH}`
+	Pop ${_ERR}
+!macroend
+
+
+!define registry::DeleteKeyEmpty `!insertmacro registry::DeleteKeyEmpty`
+
+!macro registry::DeleteKeyEmpty _PATH _ERR
+	registry::_DeleteKeyEmpty /NOUNLOAD `${_PATH}`
+	Pop ${_ERR}
+!macroend
+
+
+!define registry::CopyValue `!insertmacro registry::CopyValue`
+
+!macro registry::CopyValue _PATH_SOURCE _VALUE_SOURCE _PATH_TARGET _VALUE_TARGET _ERR
+	registry::_CopyValue /NOUNLOAD `${_PATH_SOURCE}` `${_VALUE_SOURCE}` `${_PATH_TARGET}` `${_VALUE_TARGET}`
+	Pop ${_ERR}
+!macroend
+
+
+!define registry::MoveValue `!insertmacro registry::MoveValue`
+
+!macro registry::MoveValue _PATH_SOURCE _VALUE_SOURCE _PATH_TARGET _VALUE_TARGET _ERR
+	registry::_MoveValue /NOUNLOAD `${_PATH_SOURCE}` `${_VALUE_SOURCE}` `${_PATH_TARGET}` `${_VALUE_TARGET}`
+	Pop ${_ERR}
+!macroend
+
+
+!define registry::CopyKey `!insertmacro registry::CopyKey`
+
+!macro registry::CopyKey _PATH_SOURCE _PATH_TARGET _ERR
+	registry::_CopyKey /NOUNLOAD `${_PATH_SOURCE}` `${_PATH_TARGET}`
+	Pop ${_ERR}
+!macroend
+
+
+!define registry::MoveKey `!insertmacro registry::MoveKey`
+
+!macro registry::MoveKey _PATH_SOURCE _PATH_TARGET _ERR
+	registry::_MoveKey /NOUNLOAD `${_PATH_SOURCE}` `${_PATH_TARGET}`
+	Pop ${_ERR}
+!macroend
+
+
+!define registry::SaveKey `!insertmacro registry::SaveKey`
+
+!macro registry::SaveKey _PATH _FILE _OPTIONS _ERR
+	registry::_SaveKey /NOUNLOAD `${_PATH}` `${_FILE}` `${_OPTIONS}`
+	Pop ${_ERR}
+!macroend
+
+
+!define registry::RestoreKey `!insertmacro registry::RestoreKey`
+
+!macro registry::RestoreKey _FILE _ERR
+	registry::_RestoreKey /NOUNLOAD `${_FILE}`
+	Pop ${_ERR}
+!macroend
+
+
+!define registry::StrToHex `!insertmacro registry::StrToHexA`
+!define registry::StrToHexA `!insertmacro registry::StrToHexA`
+
+!macro registry::StrToHexA _STRING _HEX_STRING
+	registry::_StrToHexA /NOUNLOAD `${_STRING}`
+	Pop ${_HEX_STRING}
+!macroend
+
+
+!define registry::StrToHexW `!insertmacro registry::StrToHexW`
+
+!macro registry::StrToHexW _STRING _HEX_STRING
+	registry::_StrToHexW /NOUNLOAD `${_STRING}`
+	Pop ${_HEX_STRING}
+!macroend
+
+
+!define registry::HexToStr `!insertmacro registry::HexToStrA`
+!define registry::HexToStrA `!insertmacro registry::HexToStrA`
+
+!macro registry::HexToStrA _HEX_STRING _STRING
+	registry::_HexToStrA /NOUNLOAD `${_HEX_STRING}`
+	Pop ${_STRING}
+!macroend
+
+!define registry::HexToStrW `!insertmacro registry::HexToStrW`
+
+!macro registry::HexToStrW _HEX_STRING _STRING
+	registry::_HexToStrW /NOUNLOAD `${_HEX_STRING}`
+	Pop ${_STRING}
+!macroend
+
+
+!define registry::Unload `!insertmacro registry::Unload`
+
+!macro registry::Unload
+	registry::_Unload
+!macroend

ext/gstmoodbar/gstfastspectrum.cpp

@@ -22,6 +22,7 @@
 #include <QtGlobal>
 
 #include <cstring>
+#include <cmath>
 
 #include <glib.h>
 
@@ -32,24 +33,13 @@
 
 #include "gstfastspectrum.h"
 
-GST_DEBUG_CATEGORY_STATIC (gst_fastspectrum_debug);
-#define GST_CAT_DEFAULT gst_fastspectrum_debug
+GST_DEBUG_CATEGORY_STATIC(gst_fastspectrum_debug);
 
-/* elementfactory information */
-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
-# define FORMATS "{ S16LE, S24LE, S32LE, F32LE, F64LE }"
-#else
-# define FORMATS "{ S16BE, S24BE, S32BE, F32BE, F64BE }"
-#endif
+namespace {
 
-#define ALLOWED_CAPS \
-  GST_AUDIO_CAPS_MAKE (FORMATS) ", " \
-  "layout = (string) interleaved, " \
-  "channels = 1"
-
-/* Spectrum properties */
-#define DEFAULT_INTERVAL		(GST_SECOND / 10)
-#define DEFAULT_BANDS			128
+// Spectrum properties
+constexpr auto DEFAULT_INTERVAL = (GST_SECOND / 10);
+constexpr auto DEFAULT_BANDS = 128;
 
 enum {
   PROP_0,
@@ -57,93 +47,100 @@ enum {
   PROP_BANDS
 };
 
+}  // namespace
+
 #define gst_fastspectrum_parent_class parent_class
-G_DEFINE_TYPE (GstFastSpectrum, gst_fastspectrum, GST_TYPE_AUDIO_FILTER)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wold-style-cast"
+G_DEFINE_TYPE(GstFastSpectrum, gst_fastspectrum, GST_TYPE_AUDIO_FILTER)
+#pragma GCC diagnostic pop
 
-static void gst_fastspectrum_finalize (GObject * object);
-static void gst_fastspectrum_set_property (GObject * object, guint prop_id, const GValue * value, GParamSpec * pspec);
-static void gst_fastspectrum_get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspec);
-static gboolean gst_fastspectrum_start (GstBaseTransform * trans);
-static gboolean gst_fastspectrum_stop (GstBaseTransform * trans);
-static GstFlowReturn gst_fastspectrum_transform_ip (GstBaseTransform *trans, GstBuffer *buffer);
-static gboolean gst_fastspectrum_setup (GstAudioFilter * base, const GstAudioInfo * info);
+static void gst_fastspectrum_finalize(GObject *object);
+static void gst_fastspectrum_set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
+static void gst_fastspectrum_get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
+static gboolean gst_fastspectrum_start(GstBaseTransform *trans);
+static gboolean gst_fastspectrum_stop(GstBaseTransform *trans);
+static GstFlowReturn gst_fastspectrum_transform_ip(GstBaseTransform *trans, GstBuffer *buffer);
+static gboolean gst_fastspectrum_setup(GstAudioFilter *base, const GstAudioInfo *info);
 
-static void gst_fastspectrum_class_init (GstFastSpectrumClass * klass) {
+static void gst_fastspectrum_class_init(GstFastSpectrumClass *klass) {
 
-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-  GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
-  GstBaseTransformClass *trans_class = GST_BASE_TRANSFORM_CLASS (klass);
-  GstAudioFilterClass *filter_class = GST_AUDIO_FILTER_CLASS (klass);
-  GstCaps *caps;
+  GObjectClass *gobject_class = G_OBJECT_CLASS(klass);
+  GstElementClass *element_class = GST_ELEMENT_CLASS(klass);
+  GstBaseTransformClass *trans_class = GST_BASE_TRANSFORM_CLASS(klass);
+  GstAudioFilterClass *filter_class = GST_AUDIO_FILTER_CLASS(klass);
+  GstCaps *caps = nullptr;
 
   gobject_class->set_property = gst_fastspectrum_set_property;
   gobject_class->get_property = gst_fastspectrum_get_property;
   gobject_class->finalize = gst_fastspectrum_finalize;
 
-  trans_class->start = GST_DEBUG_FUNCPTR (gst_fastspectrum_start);
-  trans_class->stop = GST_DEBUG_FUNCPTR (gst_fastspectrum_stop);
-  trans_class->transform_ip = GST_DEBUG_FUNCPTR (gst_fastspectrum_transform_ip);
+  trans_class->start = GST_DEBUG_FUNCPTR(gst_fastspectrum_start);
+  trans_class->stop = GST_DEBUG_FUNCPTR(gst_fastspectrum_stop);
+  trans_class->transform_ip = GST_DEBUG_FUNCPTR(gst_fastspectrum_transform_ip);
   trans_class->passthrough_on_same_caps = TRUE;
 
-  filter_class->setup = GST_DEBUG_FUNCPTR (gst_fastspectrum_setup);
+  filter_class->setup = GST_DEBUG_FUNCPTR(gst_fastspectrum_setup);
 
-  g_object_class_install_property (gobject_class, PROP_INTERVAL,
-      g_param_spec_uint64 ("interval", "Interval", "Interval of time between message posts (in nanoseconds)", 1, G_MAXUINT64, DEFAULT_INTERVAL, GParamFlags(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+  g_object_class_install_property(gobject_class, PROP_INTERVAL, g_param_spec_uint64("interval", "Interval", "Interval of time between message posts (in nanoseconds)", 1, G_MAXUINT64, DEFAULT_INTERVAL, GParamFlags(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
 
-  g_object_class_install_property (gobject_class, PROP_BANDS, g_param_spec_uint ("bands", "Bands", "Number of frequency bands", 0, G_MAXUINT, DEFAULT_BANDS, GParamFlags(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+  g_object_class_install_property(gobject_class, PROP_BANDS, g_param_spec_uint("bands", "Bands", "Number of frequency bands", 0, G_MAXUINT, DEFAULT_BANDS, GParamFlags(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
 
-  GST_DEBUG_CATEGORY_INIT (gst_fastspectrum_debug, "spectrum", 0,
-      "audio spectrum analyser element");
+  GST_DEBUG_CATEGORY_INIT(gst_fastspectrum_debug, "spectrum", 0, "audio spectrum analyser element");
 
-  gst_element_class_set_static_metadata (element_class, "Spectrum analyzer",
-      "Filter/Analyzer/Audio",
-      "Run an FFT on the audio signal, output spectrum data",
-      "Erik Walthinsen <omega@cse.ogi.edu>, "
-      "Stefan Kost <ensonic@users.sf.net>, "
-      "Sebastian Dröge <sebastian.droege@collabora.co.uk>");
+  gst_element_class_set_static_metadata(element_class, "Spectrum analyzer",
+    "Filter/Analyzer/Audio",
+    "Run an FFT on the audio signal, output spectrum data",
+    "Erik Walthinsen <omega@cse.ogi.edu>, "
+    "Stefan Kost <ensonic@users.sf.net>, "
+    "Sebastian Dröge <sebastian.droege@collabora.co.uk>");
 
-  caps = gst_caps_from_string (ALLOWED_CAPS);
-  gst_audio_filter_class_add_pad_templates (filter_class, caps);
-  gst_caps_unref (caps);
+#if G_BYTE_ORDER == G_LITTLE_ENDIAN
+  caps = gst_caps_from_string(GST_AUDIO_CAPS_MAKE("{ S16LE, S24LE, S32LE, F32LE, F64LE }") ", layout = (string) interleaved, channels = 1");
+#else
+  caps = gst_caps_from_string(GST_AUDIO_CAPS_MAKE("{ S16BE, S24BE, S32BE, F32BE, F64BE }") ", layout = (string) interleaved, channels = 1");
+#endif
+
+  gst_audio_filter_class_add_pad_templates(filter_class, caps);
+  gst_caps_unref(caps);
 
   klass->fftw_lock = new QMutex;
-
 }
 
-static void gst_fastspectrum_init (GstFastSpectrum * spectrum) {
+static void gst_fastspectrum_init(GstFastSpectrum *spectrum) {
 
   spectrum->interval = DEFAULT_INTERVAL;
   spectrum->bands = DEFAULT_BANDS;
 
   spectrum->channel_data_initialized = false;
 
-  g_mutex_init (&spectrum->lock);
+  g_mutex_init(&spectrum->lock);
 
 }
 
-static void gst_fastspectrum_alloc_channel_data (GstFastSpectrum * spectrum) {
+static void gst_fastspectrum_alloc_channel_data(GstFastSpectrum *spectrum) {
 
   guint bands = spectrum->bands;
   guint nfft = 2 * bands - 2;
 
   spectrum->input_ring_buffer = new double[nfft];
-  spectrum->fft_input = reinterpret_cast<double*>( fftw_malloc(sizeof(double) * nfft));
-  spectrum->fft_output =reinterpret_cast<fftw_complex*>( fftw_malloc(sizeof(fftw_complex) * (nfft/2+1)));
+  spectrum->fft_input = reinterpret_cast<double*>(fftw_malloc(sizeof(double) * nfft));
+  spectrum->fft_output = reinterpret_cast<fftw_complex*>(fftw_malloc(sizeof(fftw_complex) * (nfft / 2 + 1)));
 
-  spectrum->spect_magnitude = new double[bands]{};
+  spectrum->spect_magnitude = new double[bands] {};
 
-  GstFastSpectrumClass* klass = reinterpret_cast<GstFastSpectrumClass*>(G_OBJECT_GET_CLASS(spectrum));
+  GstFastSpectrumClass *klass = reinterpret_cast<GstFastSpectrumClass*>(G_OBJECT_GET_CLASS(spectrum));
   {
     QMutexLocker l(klass->fftw_lock);
-    spectrum->plan = fftw_plan_dft_r2c_1d(nfft, spectrum->fft_input, spectrum->fft_output, FFTW_ESTIMATE);
+    spectrum->plan = fftw_plan_dft_r2c_1d(static_cast<int>(nfft), spectrum->fft_input, spectrum->fft_output, FFTW_ESTIMATE);
   }
   spectrum->channel_data_initialized = true;
 
 }
 
-static void gst_fastspectrum_free_channel_data (GstFastSpectrum * spectrum) {
+static void gst_fastspectrum_free_channel_data(GstFastSpectrum *spectrum) {
 
-  GstFastSpectrumClass* klass = reinterpret_cast<GstFastSpectrumClass*>(G_OBJECT_GET_CLASS(spectrum));
+  GstFastSpectrumClass *klass = reinterpret_cast<GstFastSpectrumClass*>(G_OBJECT_GET_CLASS(spectrum));
   if (spectrum->channel_data_initialized) {
     {
       QMutexLocker l(klass->fftw_lock);
@@ -159,7 +156,7 @@ static void gst_fastspectrum_free_channel_data (GstFastSpectrum * spectrum) {
 
 }
 
-static void gst_fastspectrum_flush (GstFastSpectrum * spectrum) {
+static void gst_fastspectrum_flush(GstFastSpectrum *spectrum) {
 
   spectrum->num_frames = 0;
   spectrum->num_fft = 0;
@@ -168,150 +165,149 @@ static void gst_fastspectrum_flush (GstFastSpectrum * spectrum) {
 
 }
 
-static void gst_fastspectrum_reset_state (GstFastSpectrum * spectrum) {
+static void gst_fastspectrum_reset_state(GstFastSpectrum *spectrum) {
 
-  GST_DEBUG_OBJECT (spectrum, "resetting state");
+  GST_DEBUG_OBJECT(spectrum, "resetting state");
 
-  gst_fastspectrum_free_channel_data (spectrum);
-  gst_fastspectrum_flush (spectrum);
+  gst_fastspectrum_free_channel_data(spectrum);
+  gst_fastspectrum_flush(spectrum);
 
 }
 
-static void gst_fastspectrum_finalize (GObject * object) {
+static void gst_fastspectrum_finalize(GObject *object) {
 
   GstFastSpectrum *spectrum = reinterpret_cast<GstFastSpectrum*>(object);
 
-  gst_fastspectrum_reset_state (spectrum);
-  g_mutex_clear (&spectrum->lock);
+  gst_fastspectrum_reset_state(spectrum);
+  g_mutex_clear(&spectrum->lock);
 
-  G_OBJECT_CLASS (parent_class)->finalize (object);
+  G_OBJECT_CLASS(parent_class)->finalize(object);
 
 }
 
-static void gst_fastspectrum_set_property (GObject * object, guint prop_id, const GValue * value, GParamSpec * pspec) {
+static void gst_fastspectrum_set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) {
 
   GstFastSpectrum *filter = reinterpret_cast<GstFastSpectrum*>(object);
 
   switch (prop_id) {
-    case PROP_INTERVAL:{
-      guint64 interval = g_value_get_uint64 (value);
-      g_mutex_lock (&filter->lock);
+    case PROP_INTERVAL: {
+      guint64 interval = g_value_get_uint64(value);
+      g_mutex_lock(&filter->lock);
       if (filter->interval != interval) {
         filter->interval = interval;
-        gst_fastspectrum_reset_state (filter);
+        gst_fastspectrum_reset_state(filter);
       }
-      g_mutex_unlock (&filter->lock);
+      g_mutex_unlock(&filter->lock);
       break;
     }
-    case PROP_BANDS:{
-      guint bands = g_value_get_uint (value);
-      g_mutex_lock (&filter->lock);
+    case PROP_BANDS: {
+      guint bands = g_value_get_uint(value);
+      g_mutex_lock(&filter->lock);
       if (filter->bands != bands) {
         filter->bands = bands;
-        gst_fastspectrum_reset_state (filter);
+        gst_fastspectrum_reset_state(filter);
       }
-      g_mutex_unlock (&filter->lock);
+      g_mutex_unlock(&filter->lock);
       break;
     }
     default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
       break;
   }
 
 }
 
-static void gst_fastspectrum_get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspec) {
+static void gst_fastspectrum_get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) {
 
   GstFastSpectrum *filter = reinterpret_cast<GstFastSpectrum*>(object);
 
   switch (prop_id) {
     case PROP_INTERVAL:
-      g_value_set_uint64 (value, filter->interval);
+      g_value_set_uint64(value, filter->interval);
       break;
     case PROP_BANDS:
-      g_value_set_uint (value, filter->bands);
+      g_value_set_uint(value, filter->bands);
       break;
     default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
       break;
   }
 
 }
 
-static gboolean gst_fastspectrum_start (GstBaseTransform * trans) {
+static gboolean gst_fastspectrum_start(GstBaseTransform *trans) {
 
   GstFastSpectrum *spectrum = reinterpret_cast<GstFastSpectrum*>(trans);
 
-  gst_fastspectrum_reset_state (spectrum);
+  gst_fastspectrum_reset_state(spectrum);
 
   return TRUE;
 
 }
 
-static gboolean gst_fastspectrum_stop (GstBaseTransform * trans) {
+static gboolean gst_fastspectrum_stop(GstBaseTransform *trans) {
 
   GstFastSpectrum *spectrum = reinterpret_cast<GstFastSpectrum*>(trans);
 
-  gst_fastspectrum_reset_state (spectrum);
+  gst_fastspectrum_reset_state(spectrum);
 
   return TRUE;
 
 }
 
-/* mixing data readers */
+// Mixing data readers
 
-static void input_data_mixed_float(const guint8* _in, double* out, guint len, double max_value, guint op, guint nfft) {
+static void input_data_mixed_float(const guint8 *_in, double *out, guint len, double max_value, guint op, guint nfft) {
 
   Q_UNUSED(max_value);
 
-  guint j, ip = 0;
   const gfloat *in = reinterpret_cast<const gfloat*>(_in);
+  guint ip = 0;
 
-  for (j = 0; j < len; j++) {
+  for (guint j = 0; j < len; j++) {
     out[op] = in[ip++];
     op = (op + 1) % nfft;
   }
 
 }
 
-static void input_data_mixed_double (const guint8 * _in, double* out, guint len, double max_value, guint op, guint nfft) {
+static void input_data_mixed_double(const guint8 *_in, double *out, guint len, double max_value, guint op, guint nfft) {
 
   Q_UNUSED(max_value);
 
-  guint j, ip = 0;
   const gdouble *in = reinterpret_cast<const gdouble*>(_in);
+  guint ip = 0;
 
-  for (j = 0; j < len; j++) {
+  for (guint j = 0; j < len; j++) {
     out[op] = in[ip++];
     op = (op + 1) % nfft;
   }
 
 }
 
-static void input_data_mixed_int32_max (const guint8 * _in, double* out, guint len, double max_value, guint op, guint nfft) {
+static void input_data_mixed_int32_max(const guint8 *_in, double *out, guint len, double max_value, guint op, guint nfft) {
 
-  guint j, ip = 0;
   const gint32 *in = reinterpret_cast<const gint32*>(_in);
+  guint ip = 0;
 
-  for (j = 0; j < len; j++) {
+  for (guint j = 0; j < len; j++) {
     out[op] = in[ip++] / max_value;
     op = (op + 1) % nfft;
   }
 
 }
 
-static void input_data_mixed_int24_max (const guint8 * _in, double* out, guint len, double max_value, guint op, guint nfft) {
+static void input_data_mixed_int24_max(const guint8 *_in, double *out, guint len, double max_value, guint op, guint nfft) {
 
-  guint j;
-
-  for (j = 0; j < len; j++) {
+  for (guint j = 0; j < len; j++) {
 #if G_BYTE_ORDER == G_BIG_ENDIAN
-    gint32 value = GST_READ_UINT24_BE (_in);
+    guint32 value = GST_READ_UINT24_BE(_in);
 #else
-    gint32 value = GST_READ_UINT24_LE (_in);
+    guint32 value = GST_READ_UINT24_LE(_in);
 #endif
-    if (value & 0x00800000)
+    if (value & 0x00800000) {
       value |= 0xff000000;
+    }
 
     out[op] = value / max_value;
     op = (op + 1) % nfft;
@@ -320,25 +316,25 @@ static void input_data_mixed_int24_max (const guint8 * _in, double* out, guint l
 
 }
 
-static void input_data_mixed_int16_max (const guint8 * _in, double * out, guint len, double max_value, guint op, guint nfft) {
+static void input_data_mixed_int16_max(const guint8 *_in, double *out, guint len, double max_value, guint op, guint nfft) {
 
-  guint j, ip = 0;
   const gint16 *in = reinterpret_cast<const gint16*>(_in);
+  guint ip = 0;
 
-  for (j = 0; j < len; j++) {
+  for (guint j = 0; j < len; j++) {
     out[op] = in[ip++] / max_value;
     op = (op + 1) % nfft;
   }
 
 }
 
-static gboolean gst_fastspectrum_setup (GstAudioFilter * base, const GstAudioInfo * info) {
+static gboolean gst_fastspectrum_setup(GstAudioFilter *base, const GstAudioInfo *info) {
 
   GstFastSpectrum *spectrum = reinterpret_cast<GstFastSpectrum*>(base);
   GstFastSpectrumInputData input_data = nullptr;
 
-  g_mutex_lock (&spectrum->lock);
-  switch (GST_AUDIO_INFO_FORMAT (info)) {
+  g_mutex_lock(&spectrum->lock);
+  switch (GST_AUDIO_INFO_FORMAT(info)) {
     case GST_AUDIO_FORMAT_S16:
       input_data = input_data_mixed_int16_max;
       break;
@@ -355,34 +351,33 @@ static gboolean gst_fastspectrum_setup (GstAudioFilter * base, const GstAudioInf
       input_data = input_data_mixed_double;
       break;
     default:
-      g_assert_not_reached ();
+      g_assert_not_reached();
       break;
   }
   spectrum->input_data = input_data;
 
-  gst_fastspectrum_reset_state (spectrum);
-  g_mutex_unlock (&spectrum->lock);
+  gst_fastspectrum_reset_state(spectrum);
+  g_mutex_unlock(&spectrum->lock);
 
   return TRUE;
 
 }
 
-static void gst_fastspectrum_run_fft (GstFastSpectrum * spectrum, guint input_pos) {
+static void gst_fastspectrum_run_fft(GstFastSpectrum *spectrum, guint input_pos) {
 
-  guint i;
   guint bands = spectrum->bands;
   guint nfft = 2 * bands - 2;
 
-  for (i = 0; i < nfft; i++)
+  for (guint i = 0; i < nfft; i++) {
     spectrum->fft_input[i] = spectrum->input_ring_buffer[(input_pos + i) % nfft];
+  }
 
   // Should be safe to execute the same plan multiple times in parallel.
   fftw_execute(spectrum->plan);
 
-  gdouble val;
-  /* Calculate magnitude in db */
-  for (i = 0; i < bands; i++) {
-    val = spectrum->fft_output[i][0] * spectrum->fft_output[i][0];
+  // Calculate magnitude in db
+  for (guint i = 0; i < bands; i++) {
+    gdouble val = spectrum->fft_output[i][0] * spectrum->fft_output[i][0];
     val += spectrum->fft_output[i][1] * spectrum->fft_output[i][1];
     val /= nfft * nfft;
     spectrum->spect_magnitude[i] += val;
@@ -390,83 +385,76 @@ static void gst_fastspectrum_run_fft (GstFastSpectrum * spectrum, guint input_po
 
 }
 
-static GstFlowReturn gst_fastspectrum_transform_ip (GstBaseTransform *trans, GstBuffer *buffer) {
+static GstFlowReturn gst_fastspectrum_transform_ip(GstBaseTransform *trans, GstBuffer *buffer) {
 
   GstFastSpectrum *spectrum = reinterpret_cast<GstFastSpectrum*>(trans);
-  guint rate = GST_AUDIO_FILTER_RATE (spectrum);
-  guint bps = GST_AUDIO_FILTER_BPS (spectrum);
-  guint bpf = GST_AUDIO_FILTER_BPF (spectrum);
-  double max_value = (1UL << ((bps << 3) - 1)) - 1;
+  guint rate = GST_AUDIO_FILTER_RATE(spectrum);
+  guint bps = GST_AUDIO_FILTER_BPS(spectrum);
+  guint bpf = GST_AUDIO_FILTER_BPF(spectrum);
+  double max_value = static_cast<double>((1UL << ((bps << 3) - 1)) - 1);
   guint bands = spectrum->bands;
   guint nfft = 2 * bands - 2;
-  guint input_pos;
+  guint input_pos = 0;
   GstMapInfo map;
-  const guint8 *data;
-  gsize size;
-  guint fft_todo, msg_todo, block_size;
-  gboolean have_full_interval;
-  GstFastSpectrumInputData input_data;
+  const guint8 *data = nullptr;
+  gsize size = 0;
+  GstFastSpectrumInputData input_data = nullptr;
 
-  g_mutex_lock (&spectrum->lock);
-  gst_buffer_map (buffer, &map, GST_MAP_READ);
+  g_mutex_lock(&spectrum->lock);
+  gst_buffer_map(buffer, &map, GST_MAP_READ);
   data = map.data;
   size = map.size;
 
-  GST_LOG_OBJECT (spectrum, "input size: %" G_GSIZE_FORMAT " bytes", size);
+  GST_LOG_OBJECT(spectrum, "input size: %" G_GSIZE_FORMAT " bytes", size);
 
-  if (GST_BUFFER_IS_DISCONT (buffer)) {
-    GST_DEBUG_OBJECT (spectrum, "Discontinuity detected -- flushing");
-    gst_fastspectrum_flush (spectrum);
+  if (GST_BUFFER_IS_DISCONT(buffer)) {
+    GST_DEBUG_OBJECT(spectrum, "Discontinuity detected -- flushing");
+    gst_fastspectrum_flush(spectrum);
   }
 
-  /* If we don't have a FFT context yet (or it was reset due to parameter
-   * changes) get one and allocate memory for everything
-   */
+  // If we don't have a FFT context yet (or it was reset due to parameter changes) get one and allocate memory for everything
   if (!spectrum->channel_data_initialized) {
-    GST_DEBUG_OBJECT (spectrum, "allocating for bands %u", bands);
+    GST_DEBUG_OBJECT(spectrum, "allocating for bands %u", bands);
 
-    gst_fastspectrum_alloc_channel_data (spectrum);
+    gst_fastspectrum_alloc_channel_data(spectrum);
 
-    /* number of sample frames we process before posting a message
-     * interval is in ns */
-    spectrum->frames_per_interval = gst_util_uint64_scale (spectrum->interval, rate, GST_SECOND);
+    // Number of sample frames we process before posting a message interval is in ns
+    spectrum->frames_per_interval = gst_util_uint64_scale(spectrum->interval, rate, GST_SECOND);
     spectrum->frames_todo = spectrum->frames_per_interval;
-    /* rounding error for frames_per_interval in ns,
-     * aggregated it in accumulated_error */
+    // Rounding error for frames_per_interval in ns, aggregated it in accumulated_error
     spectrum->error_per_interval = (spectrum->interval * rate) % GST_SECOND;
-    if (spectrum->frames_per_interval == 0)
+    if (spectrum->frames_per_interval == 0) {
       spectrum->frames_per_interval = 1;
+    }
 
-    GST_INFO_OBJECT (spectrum, "interval %" GST_TIME_FORMAT ", fpi %"
-        G_GUINT64_FORMAT ", error %" GST_TIME_FORMAT,
-        GST_TIME_ARGS (spectrum->interval), spectrum->frames_per_interval,
-        GST_TIME_ARGS (spectrum->error_per_interval));
+    GST_INFO_OBJECT(spectrum, "interval %" GST_TIME_FORMAT ", fpi %" G_GUINT64_FORMAT ", error %" GST_TIME_FORMAT, GST_TIME_ARGS(spectrum->interval), spectrum->frames_per_interval, GST_TIME_ARGS(spectrum->error_per_interval));
 
     spectrum->input_pos = 0;
 
-    gst_fastspectrum_flush (spectrum);
+    gst_fastspectrum_flush(spectrum);
   }
 
-  if (spectrum->num_frames == 0)
-    spectrum->message_ts = GST_BUFFER_TIMESTAMP (buffer);
+  if (spectrum->num_frames == 0) {
+    spectrum->message_ts = GST_BUFFER_TIMESTAMP(buffer);
+  }
 
   input_pos = spectrum->input_pos;
   input_data = spectrum->input_data;
 
   while (size >= bpf) {
-    /* run input_data for a chunk of data */
-    fft_todo = nfft - (spectrum->num_frames % nfft);
-    msg_todo = spectrum->frames_todo - spectrum->num_frames;
-    GST_LOG_OBJECT (spectrum,
-        "message frames todo: %u, fft frames todo: %u, input frames %"
-        G_GSIZE_FORMAT, msg_todo, fft_todo, (size / bpf));
-    block_size = msg_todo;
-    if (block_size > (size / bpf))
+    // Run input_data for a chunk of data
+    guint fft_todo = nfft - (spectrum->num_frames % nfft);
+    guint msg_todo = spectrum->frames_todo - spectrum->num_frames;
+    GST_LOG_OBJECT(spectrum, "message frames todo: %u, fft frames todo: %u, input frames %" G_GSIZE_FORMAT, msg_todo, fft_todo, (size / bpf));
+    guint block_size = msg_todo;
+    if (block_size > (size / bpf)) {
       block_size = (size / bpf);
-    if (block_size > fft_todo)
+    }
+    if (block_size > fft_todo) {
       block_size = fft_todo;
+    }
 
-    /* Move the current frames into our ringbuffers */
+    // Move the current frames into our ringbuffers
     input_data(data, spectrum->input_ring_buffer, block_size, max_value, input_pos, nfft);
 
     data += block_size * bpf;
@@ -474,25 +462,19 @@ static GstFlowReturn gst_fastspectrum_transform_ip (GstBaseTransform *trans, Gst
     input_pos = (input_pos + block_size) % nfft;
     spectrum->num_frames += block_size;
 
-    have_full_interval = (spectrum->num_frames == spectrum->frames_todo);
+    gboolean have_full_interval = (spectrum->num_frames == spectrum->frames_todo);
 
-    GST_LOG_OBJECT (spectrum,
-        "size: %" G_GSIZE_FORMAT ", do-fft = %d, do-message = %d", size,
-        (spectrum->num_frames % nfft == 0), have_full_interval);
+    GST_LOG_OBJECT(spectrum, "size: %" G_GSIZE_FORMAT ", do-fft = %d, do-message = %d", size, (spectrum->num_frames % nfft == 0), have_full_interval);
 
-    /* If we have enough frames for an FFT or we have all frames required for
-     * the interval and we haven't run a FFT, then run an FFT */
+    // If we have enough frames for an FFT or we have all frames required for the interval and we haven't run a FFT, then run an FFT
     if ((spectrum->num_frames % nfft == 0) || (have_full_interval && !spectrum->num_fft)) {
-      gst_fastspectrum_run_fft (spectrum, input_pos);
+      gst_fastspectrum_run_fft(spectrum, input_pos);
       spectrum->num_fft++;
     }
 
-    /* Do we have the FFTs for one interval? */
+    // Do we have the FFTs for one interval?
     if (have_full_interval) {
-      GST_DEBUG_OBJECT (spectrum, "nfft: %u frames: %" G_GUINT64_FORMAT
-          " fpi: %" G_GUINT64_FORMAT " error: %" GST_TIME_FORMAT, nfft,
-          spectrum->num_frames, spectrum->frames_per_interval,
-          GST_TIME_ARGS (spectrum->accumulated_error));
+      GST_DEBUG_OBJECT(spectrum, "nfft: %u frames: %" G_GUINT64_FORMAT " fpi: %" G_GUINT64_FORMAT " error: %" GST_TIME_FORMAT, nfft, spectrum->num_frames, spectrum->frames_per_interval, GST_TIME_ARGS(spectrum->accumulated_error));
 
       spectrum->frames_todo = spectrum->frames_per_interval;
       if (spectrum->accumulated_error >= GST_SECOND) {
@@ -504,17 +486,18 @@ static GstFlowReturn gst_fastspectrum_transform_ip (GstBaseTransform *trans, Gst
       if (spectrum->output_callback) {
         // Calculate average
         for (guint i = 0; i < spectrum->bands; i++) {
-          spectrum->spect_magnitude[i] /= spectrum->num_fft;
+          spectrum->spect_magnitude[i] /= static_cast<double>(spectrum->num_fft);
         }
 
-        spectrum->output_callback(spectrum->spect_magnitude, spectrum->bands);
+        spectrum->output_callback(spectrum->spect_magnitude, static_cast<int>(spectrum->bands));
 
         // Reset spectrum accumulators
         memset(spectrum->spect_magnitude, 0, spectrum->bands * sizeof(double));
       }
 
-      if (GST_CLOCK_TIME_IS_VALID (spectrum->message_ts))
-        spectrum->message_ts += gst_util_uint64_scale (spectrum->num_frames, GST_SECOND, rate);
+      if (GST_CLOCK_TIME_IS_VALID(spectrum->message_ts)) {
+        spectrum->message_ts += gst_util_uint64_scale(spectrum->num_frames, GST_SECOND, rate);
+      }
 
       spectrum->num_frames = 0;
       spectrum->num_fft = 0;
@@ -523,10 +506,10 @@ static GstFlowReturn gst_fastspectrum_transform_ip (GstBaseTransform *trans, Gst
 
   spectrum->input_pos = input_pos;
 
-  gst_buffer_unmap (buffer, &map);
-  g_mutex_unlock (&spectrum->lock);
+  gst_buffer_unmap(buffer, &map);
+  g_mutex_unlock(&spectrum->lock);
 
-  g_assert (size == 0);
+  g_assert(size == 0);
 
   return GST_FLOW_OK;
 

ext/gstmoodbar/gstfastspectrum.h

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

ext/gstmoodbar/gstmoodbarplugin.cpp

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

ext/gstmoodbar/gstmoodbarplugin.h

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

ext/libstrawberry-common/CMakeLists.txt

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

ext/libstrawberry-common/core/logging.cpp

@@ -1,5 +1,6 @@
 /* This file is part of Strawberry.
    Copyright 2011, David Sansome <me@davidsansome.com>
+   Copyright 2018-2021, Jonas Kvinge <jonas@jkvinge.net>
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -23,7 +24,9 @@
 #include <cstring>
 #include <iostream>
 #include <memory>
-#include <cxxabi.h>
+#ifndef _MSC_VER
+#  include <cxxabi.h>
+#endif
 #include <glib.h>
 
 #ifdef HAVE_BACKTRACE
@@ -49,18 +52,17 @@
 namespace logging {
 
 static Level sDefaultLevel = Level_Debug;
-static QMap<QString, Level>* sClassLevels = nullptr;
+static QMap<QString, Level> *sClassLevels = nullptr;
 static QIODevice *sNullDevice = nullptr;
 
-//const char* kDefaultLogLevels = "*:3";
-const char* kDefaultLogLevels = "GstEnginePipeline:2,*:3";
+const char *kDefaultLogLevels = "*:3";
 
 static const char *kMessageHandlerMagic = "__logging_message__";
-static const int kMessageHandlerMagicLength = strlen(kMessageHandlerMagic);
+static const size_t kMessageHandlerMagicLength = strlen(kMessageHandlerMagic);
 static QtMessageHandler sOriginalMessageHandler = nullptr;
 
-template <class T>
-static T CreateLogger(Level level, const QString& class_name, int line, const char* category);
+template<class T>
+static T CreateLogger(Level level, const QString &class_name, int line, const char *category);
 
 void GLog(const char *domain, int level, const char *message, void*) {
 
@@ -86,19 +88,19 @@ void GLog(const char *domain, int level, const char *message, void*) {
 
 }
 
-template <class T>
+template<class T>
 class DebugBase : public QDebug {
  public:
   DebugBase() : QDebug(sNullDevice) {}
   explicit DebugBase(QtMsgType t) : QDebug(t) {}
-  T& space() { return static_cast<T&>(QDebug::space()); }
-  T& noSpace() { return static_cast<T&>(QDebug::nospace()); }
+  T &space() { return static_cast<T&>(QDebug::space()); }
+  T &nospace() { return static_cast<T&>(QDebug::nospace()); }
 };
 
 // Debug message will be stored in a buffer.
 class BufferedDebug : public DebugBase<BufferedDebug> {
  public:
-  BufferedDebug() {}
+  BufferedDebug() = default;
   explicit BufferedDebug(QtMsgType) : buf_(new QBuffer, later_deleter) {
     buf_->open(QIODevice::WriteOnly);
 
@@ -109,7 +111,7 @@ class BufferedDebug : public DebugBase<BufferedDebug> {
 
   // Delete function for the buffer. Since a base class is holding a reference to the raw pointer,
   // it shouldn't be deleted until after the deletion of this object is complete.
-  static void later_deleter(QBuffer* b) { b->deleteLater(); }
+  static void later_deleter(QBuffer *b) { b->deleteLater(); }
 
   std::shared_ptr<QBuffer> buf_;
 };
@@ -117,14 +119,15 @@ class BufferedDebug : public DebugBase<BufferedDebug> {
 // Debug message will be logged immediately.
 class LoggedDebug : public DebugBase<LoggedDebug> {
  public:
-  LoggedDebug() {}
+  LoggedDebug() = default;
   explicit LoggedDebug(QtMsgType t) : DebugBase(t) { nospace() << kMessageHandlerMagic; }
 };
 
 static void MessageHandler(QtMsgType type, const QMessageLogContext&, const QString &message) {
 
-  if (strncmp(kMessageHandlerMagic, message.toLocal8Bit().data(), kMessageHandlerMagicLength) == 0) {
-    fprintf(stderr, "%s\n", message.toLocal8Bit().data() + kMessageHandlerMagicLength);
+  if (message.startsWith(kMessageHandlerMagic)) {
+    fprintf(type == QtCriticalMsg || type == QtFatalMsg ? stderr : stdout, "%s\n", message.toUtf8().data() + kMessageHandlerMagicLength);
+    fflush(type == QtCriticalMsg || type == QtFatalMsg ? stderr : stdout);
     return;
   }
 
@@ -143,12 +146,13 @@ static void MessageHandler(QtMsgType type, const QMessageLogContext&, const QStr
       break;
   }
 
-  for (const QString& line : message.split('\n')) {
+  for (const QString &line : message.split('\n')) {
     BufferedDebug d = CreateLogger<BufferedDebug>(level, "unknown", -1, nullptr);
     d << line.toLocal8Bit().constData();
     if (d.buf_) {
       d.buf_->close();
-      fprintf(stderr, "%s\n", d.buf_->buffer().data());
+      fprintf(type == QtCriticalMsg || type == QtFatalMsg ? stderr : stdout, "%s\n", d.buf_->buffer().data());
+      fflush(type == QtCriticalMsg || type == QtFatalMsg ? stderr : stdout);
     }
   }
 
@@ -171,13 +175,14 @@ void Init() {
   if (!sOriginalMessageHandler) {
     sOriginalMessageHandler = qInstallMessageHandler(MessageHandler);
   }
+
 }
 
 void SetLevels(const QString &levels) {
 
   if (!sClassLevels) return;
 
-  for (const QString& item : levels.split(',')) {
+  for (const QString &item : levels.split(',')) {
     const QStringList class_level = item.split(':');
 
     QString class_name;
@@ -210,9 +215,9 @@ static QString ParsePrettyFunction(const char *pretty_function) {
 
   // Get the class name out of the function name.
   QString class_name = pretty_function;
-  const int paren = class_name.indexOf('(');
+  const qint64 paren = class_name.indexOf('(');
   if (paren != -1) {
-    const int colons = class_name.lastIndexOf("::", paren);
+    const qint64 colons = class_name.lastIndexOf("::", paren);
     if (colons != -1) {
       class_name = class_name.left(colons);
     }
@@ -221,16 +226,17 @@ static QString ParsePrettyFunction(const char *pretty_function) {
     }
   }
 
-  const int space = class_name.lastIndexOf(' ');
+  const qint64 space = class_name.lastIndexOf(' ');
   if (space != -1) {
-    class_name = class_name.mid(space+1);
+    class_name = class_name.mid(space + 1);
   }
 
   return class_name;
+
 }
 
 template <class T>
-static T CreateLogger(Level level, const QString &class_name, int line, const char* category) {
+static T CreateLogger(Level level, const QString &class_name, int line, const char *category) {
 
   // Map the level to a string
   const char *level_name = nullptr;
@@ -267,19 +273,18 @@ static T CreateLogger(Level level, const QString &class_name, int line, const ch
   }
 
   T ret(type);
-  ret.nospace() << QDateTime::currentDateTime().toString("hh:mm:ss.zzz").toLatin1().constData()
-                << level_name
-                << function_line.leftJustified(32).toLatin1().constData();
+  ret.nospace() << QDateTime::currentDateTime().toString("hh:mm:ss.zzz").toLatin1().constData() << level_name << function_line.leftJustified(32).toLatin1().constData();
 
   return ret.space();
+
 }
 
+#ifdef Q_OS_UNIX
 QString CXXDemangle(const QString &mangled_function);
-
 QString CXXDemangle(const QString &mangled_function) {
 
-  int status;
-  char* demangled_function = abi::__cxa_demangle(mangled_function.toLatin1().constData(), nullptr, nullptr, &status);
+  int status = 0;
+  char *demangled_function = abi::__cxa_demangle(mangled_function.toLatin1().constData(), nullptr, nullptr, &status);
   if (status == 0) {
     QString ret = QString::fromLatin1(demangled_function);
     free(demangled_function);
@@ -288,23 +293,10 @@ QString CXXDemangle(const QString &mangled_function) {
   return mangled_function;  // Probably not a C++ function.
 
 }
+#endif  // Q_OS_UNIX
 
-QString DarwinDemangle(const QString &symbol);
-
-QString DarwinDemangle(const QString &symbol) {
-
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-  QStringList split = symbol.split(' ', Qt::SkipEmptyParts);
-#else
-  QStringList split = symbol.split(' ', QString::SkipEmptyParts);
-#endif
-  QString mangled_function = split[3];
-  return CXXDemangle(mangled_function);
-
-}
-
+#ifdef Q_OS_LINUX
 QString LinuxDemangle(const QString &symbol);
-
 QString LinuxDemangle(const QString &symbol) {
 
   QRegularExpression regex("\\(([^+]+)");
@@ -316,10 +308,26 @@ QString LinuxDemangle(const QString &symbol) {
   return CXXDemangle(mangled_function);
 
 }
+#endif  // Q_OS_LINUX
+
+#ifdef Q_OS_MACOS
+QString DarwinDemangle(const QString &symbol);
+QString DarwinDemangle(const QString &symbol) {
+
+#  if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+  QStringList split = symbol.split(' ', Qt::SkipEmptyParts);
+#  else
+  QStringList split = symbol.split(' ', QString::SkipEmptyParts);
+#  endif
+  QString mangled_function = split[3];
+  return CXXDemangle(mangled_function);
+
+}
+#endif  // Q_OS_MACOS
 
 QString DemangleSymbol(const QString &symbol);
-
 QString DemangleSymbol(const QString &symbol) {
+
 #ifdef Q_OS_MACOS
   return DarwinDemangle(symbol);
 #elif defined(Q_OS_LINUX)
@@ -327,13 +335,15 @@ QString DemangleSymbol(const QString &symbol) {
 #else
   return symbol;
 #endif
+
 }
 
 void DumpStackTrace() {
+
 #ifdef HAVE_BACKTRACE
-  void* callstack[128];
+  void *callstack[128];
   int callstack_size = backtrace(reinterpret_cast<void**>(&callstack), sizeof(callstack));
-  char** symbols = backtrace_symbols(reinterpret_cast<void**>(&callstack), callstack_size);
+  char **symbols = backtrace_symbols(reinterpret_cast<void**>(&callstack), callstack_size);
   // Start from 1 to skip ourself.
   for (int i = 1; i < callstack_size; ++i) {
     std::cerr << DemangleSymbol(QString::fromLatin1(symbols[i])).toStdString() << std::endl;
@@ -342,35 +352,35 @@ void DumpStackTrace() {
 #else
   qLog(Debug) << "FIXME: Implement printing stack traces on this platform";
 #endif
+
 }
 
-// These are the functions that create loggers for the rest of Clementine.
-// It's okay that the LoggedDebug instance is copied to a QDebug in these. It
-// doesn't override any behavior that should be needed after return.
+// These are the functions that create loggers for the rest of Strawberry.
+// It's okay that the LoggedDebug instance is copied to a QDebug in these. It doesn't override any behavior that should be needed after return.
 #define qCreateLogger(line, pretty_function, category, level) logging::CreateLogger<LoggedDebug>(logging::Level_##level, logging::ParsePrettyFunction(pretty_function), line, category)
 
-QDebug CreateLoggerInfo(int line, const char *pretty_function, const char* category) { return qCreateLogger(line, pretty_function, category, Info); }
-QDebug CreateLoggerFatal(int line, const char *pretty_function, const char* category) { return qCreateLogger(line, pretty_function, category, Fatal); }
-QDebug CreateLoggerError(int line, const char *pretty_function, const char* category) { return qCreateLogger(line, pretty_function, category, Error); }
+QDebug CreateLoggerInfo(int line, const char *pretty_function, const char *category) { return qCreateLogger(line, pretty_function, category, Info); }
+QDebug CreateLoggerFatal(int line, const char *pretty_function, const char *category) { return qCreateLogger(line, pretty_function, category, Fatal); }
+QDebug CreateLoggerError(int line, const char *pretty_function, const char *category) { return qCreateLogger(line, pretty_function, category, Error); }
 
 #ifdef QT_NO_WARNING_OUTPUT
   QNoDebug CreateLoggerWarning(int, const char*, const char*) { return QNoDebug(); }
 #else
-  QDebug CreateLoggerWarning(int line, const char *pretty_function, const char* category) { return qCreateLogger(line, pretty_function, category, Warning); }
+  QDebug CreateLoggerWarning(int line, const char *pretty_function, const char *category) { return qCreateLogger(line, pretty_function, category, Warning); }
 #endif // QT_NO_WARNING_OUTPUT
 
 #ifdef QT_NO_DEBUG_OUTPUT
   QNoDebug CreateLoggerDebug(int, const char*, const char*) { return QNoDebug(); }
 #else
-  QDebug CreateLoggerDebug(int line, const char *pretty_function, const char* category) { return qCreateLogger(line, pretty_function, category, Debug); }
+  QDebug CreateLoggerDebug(int line, const char *pretty_function, const char *category) { return qCreateLogger(line, pretty_function, category, Debug); }
 #endif // QT_NO_DEBUG_OUTPUT
 
 }  // namespace logging
 
 namespace {
 
-template <typename T>
-QString print_duration(T duration, const std::string& unit) {
+template<typename T>
+QString print_duration(T duration, const std::string &unit) {
   return QString("%1%2").arg(duration.count()).arg(unit.c_str());
 }
 
@@ -380,4 +390,3 @@ QDebug operator<<(QDebug dbg, std::chrono::seconds secs) {
   dbg.nospace() << print_duration(secs, "s");
   return dbg.space();
 }
-

ext/libstrawberry-common/core/logging.h

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

ext/libstrawberry-common/core/messagehandler.cpp

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

ext/libstrawberry-common/core/messagehandler.h

@@ -1,5 +1,6 @@
 /* This file is part of Strawberry.
    Copyright 2011, David Sansome <me@davidsansome.com>
+   Copyright 2018-2021, Jonas Kvinge <jonas@jkvinge.net>
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -78,7 +79,7 @@ class _MessageHandlerBase : public QObject {
 
 // Reads and writes uint32 length encoded MessageType messages to a socket.
 // You should subclass this and implement the MessageArrived(MessageType) method.
-template <typename MT>
+template<typename MT>
 class AbstractMessageHandler : public _MessageHandlerBase {
  public:
   AbstractMessageHandler(QIODevice *device, QObject *parent);
@@ -114,11 +115,11 @@ class AbstractMessageHandler : public _MessageHandlerBase {
   QMap<int, ReplyType*> pending_replies_;
 };
 
-template <typename MT>
+template<typename MT>
 AbstractMessageHandler<MT>::AbstractMessageHandler(QIODevice *device, QObject *parent)
     : _MessageHandlerBase(device, parent) {}
 
-template <typename MT>
+template<typename MT>
 void AbstractMessageHandler<MT>::SendMessage(const MessageType &message) {
   Q_ASSERT(QThread::currentThread() == thread());
 
@@ -126,10 +127,10 @@ void AbstractMessageHandler<MT>::SendMessage(const MessageType &message) {
   WriteMessage(QByteArray(data.data(), data.size()));
 }
 
-template <typename MT>
+template<typename MT>
 void AbstractMessageHandler<MT>::SendMessageAsync(const MessageType &message) {
   std::string data = message.SerializeAsString();
-  metaObject()->invokeMethod(this, "WriteMessage", Qt::QueuedConnection, Q_ARG(QByteArray, QByteArray(data.data(), data.size())));
+  QMetaObject::invokeMethod(this, "WriteMessage", Qt::QueuedConnection, Q_ARG(QByteArray, QByteArray(data.data(), data.size())));
 }
 
 template<typename MT>

ext/libstrawberry-common/core/messagereply.cpp

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

ext/libstrawberry-common/core/messagereply.h

@@ -1,5 +1,6 @@
 /* This file is part of Strawberry.
    Copyright 2011, David Sansome <me@davidsansome.com>
+   Copyright 2018-2021, Jonas Kvinge <jonas@jkvinge.net>
 
    Strawberry is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -55,7 +56,7 @@ class _MessageReplyBase : public QObject {
 };
 
 // A reply future class that is returned immediately for requests that will occur in the background.  Similar to QNetworkReply.
-template <typename MessageType>
+template<typename MessageType>
 class MessageReply : public _MessageReplyBase {
  public:
   explicit MessageReply(const MessageType &request_message, QObject *parent = nullptr);