Release 1.0.23

Possible fix for #1313

.clang-format

@@ -86,7 +86,7 @@ ContinuationIndentWidth: 2
 Cpp11BracedListStyle: false
 DeriveLineEnding: true
 DerivePointerAlignment: false
-DisableFormat:   false
+DisableFormat:   true
 EmptyLineAfterAccessModifier: Never
 EmptyLineBeforeAccessModifier: LogicalBlock
 ExperimentalAutoDetectBinPacking: false

.github/FUNDING.yml

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

.github/workflows/codeql.yml

@@ -1,88 +0,0 @@
-name: CodeQL
-on: [push, pull_request]
-
-jobs:
-  codeql:
-    name: CodeQL Analyze
-    runs-on: ubuntu-latest
-
-    container:
-      image: opensuse/tumbleweed
-
-    steps:
-
-      - name: Refresh repositories
-        run: zypper -n --gpg-auto-import-keys ref
-
-      - name: Upgrade packages
-        run: zypper -n --gpg-auto-import-keys dup
-
-      - name: Install packages
-        run: >
-            zypper -n --gpg-auto-import-keys in
-            lsb-release
-            rpm-build
-            git
-            tar
-            gcc
-            gcc-c++
-            make
-            cmake
-            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
-            vlc-devel
-            taglib-devel
-            libicu-devel
-            libcdio-devel
-            libgpod-devel
-            libmtp-devel
-            libchromaprint-devel
-            qt6-core-devel
-            qt6-gui-devel
-            qt6-widgets-devel
-            qt6-concurrent-devel
-            qt6-network-devel
-            qt6-sql-devel
-            qt6-dbus-devel
-            qt6-test-devel
-            qt6-base-common-devel
-            qt6-sql-sqlite
-            qt6-linguist-devel
-            desktop-file-utils
-            update-desktop-files
-            appstream-glib
-            hicolor-icon-theme
-
-      - name: Checkout repository
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - name: Add safe git directory
-        run: git config --global --add safe.directory ${GITHUB_WORKSPACE}
-
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
-        with:
-          languages: cpp
-
-      - name: Autobuild
-        uses: github/codeql-action/autobuild@v2
-
-      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
-        with:
-          category: "/language:cpp"

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "3rdparty/kdsingleapplication/KDSingleApplication"]
+	path = 3rdparty/kdsingleapplication/KDSingleApplication
+	url = https://github.com/KDAB/KDSingleApplication.git
+	branch = master

3rdparty/README.md

@@ -1,15 +1,13 @@
 3rdparty libraries located in this directory
 ============================================
 
-singleapplication
+KDSingleApplication
 -----------------
 This is a small static library used by Strawberry to prevent it from starting twice per user session.
 If the user tries to start strawberry twice, the main window will maximize instead of starting another instance.
-If you dynamically link to your systems version, you'll need two versions, one defined as QApplication and
-one as a QCoreApplication.
-It is included here because it is not packed by distros and is also used on macOS and Windows.
+It is also used to pass command-line options through to the first instance.
 
-URL: https://github.com/itay-grudev/SingleApplication
+URL: https://github.com/KDAB/KDSingleApplication/
 
 
 SPMediaKeyTap
@@ -18,13 +16,6 @@ Used on macOS to exclusively enable strawberry to grab global media shortcuts.
 Can safely be deleted on other platforms.
 
 
-macdeployqt
------------
-A modified version of Qt's official macdeployqt utility that fixes some issues,
-this version also deploys gstreamer plugins.
-Can safely be deleted on other platforms.
-
-
 getopt
 ------
-getopt included only when compiling with MSVC on Windows.
+getopt included only when compiling on Windows.

3rdparty/getopt/CMakeLists.txt

@@ -1,2 +1,3 @@
-add_library(getopt STATIC getopt.c)
+add_library(getopt STATIC getopt.cpp)
+target_compile_definitions(getopt PRIVATE -DSTATIC_GETOPT -D_UNICODE)
 target_include_directories(getopt PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})

3rdparty/getopt/getopt.c

@@ -1,562 +0,0 @@
-/*	$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.cpp

@@ -0,0 +1,753 @@
+/* Getopt for Microsoft C
+This code is a modification of the Free Software Foundation, Inc.
+Getopt library for parsing command line argument the purpose was
+to provide a Microsoft Visual C friendly derivative. This code
+provides functionality for both Unicode and Multibyte builds.
+
+Date: 02/03/2011 - Ludvik Jerabek - Initial Release
+Version: 1.1
+Comment: Supports getopt, getopt_long, and getopt_long_only
+and POSIXLY_CORRECT environment flag
+License: LGPL
+
+Revisions:
+
+02/03/2011 - Ludvik Jerabek - Initial Release
+02/20/2011 - Ludvik Jerabek - Fixed compiler warnings at Level 4
+07/05/2011 - Ludvik Jerabek - Added no_argument, required_argument, optional_argument defs
+08/03/2011 - Ludvik Jerabek - Fixed non-argument runtime bug which caused runtime exception
+08/09/2011 - Ludvik Jerabek - Added code to export functions for DLL and LIB
+02/15/2012 - Ludvik Jerabek - Fixed _GETOPT_THROW definition missing in implementation file
+08/01/2012 - Ludvik Jerabek - Created separate functions for char and wchar_t characters so single dll can do both unicode and ansi
+10/15/2012 - Ludvik Jerabek - Modified to match latest GNU features
+06/19/2015 - Ludvik Jerabek - Fixed maximum option limitation caused by option_a (255) and option_w (65535) structure val variable
+09/24/2022 - Ludvik Jerabek - Updated to match most recent getopt release
+09/25/2022 - Ludvik Jerabek - Fixed memory allocation (malloc call) issue for wchar_t*
+
+**DISCLAIMER**
+THIS MATERIAL IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND,
+EITHER EXPRESS OR IMPLIED, INCLUDING, BUT Not LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+PURPOSE, OR NON-INFRINGEMENT. SOME JURISDICTIONS DO NOT ALLOW THE
+EXCLUSION OF IMPLIED WARRANTIES, SO THE ABOVE EXCLUSION MAY NOT
+APPLY TO YOU. IN NO EVENT WILL I BE LIABLE TO ANY PARTY FOR ANY
+DIRECT, INDIRECT, SPECIAL OR OTHER CONSEQUENTIAL DAMAGES FOR ANY
+USE OF THIS MATERIAL INCLUDING, WITHOUT LIMITATION, ANY LOST
+PROFITS, BUSINESS INTERRUPTION, LOSS OF PROGRAMS OR OTHER DATA ON
+YOUR INFORMATION HANDLING SYSTEM OR OTHERWISE, EVEN If WE ARE
+EXPRESSLY ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+*/
+#define _CRT_SECURE_NO_WARNINGS
+
+#include <assert.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <malloc.h>
+#include "getopt.h"
+
+#ifdef __cplusplus
+#  define _GETOPT_THROW throw()
+#else
+#  define _GETOPT_THROW
+#endif
+
+int optind = 1;
+int opterr = 1;
+int optopt = '?';
+enum ENUM_ORDERING {
+  REQUIRE_ORDER,
+  PERMUTE,
+  RETURN_IN_ORDER
+};
+
+//
+//
+//		Ansi structures and functions follow
+//
+//
+
+static struct _getopt_data_a {
+  int optind;
+  int opterr;
+  int optopt;
+  char *optarg;
+  int __initialized;
+  char *__nextchar;
+  enum ENUM_ORDERING __ordering;
+  int __first_nonopt;
+  int __last_nonopt;
+} getopt_data_a;
+char *optarg_a;
+
+static void exchange_a(char **argv, struct _getopt_data_a *d) {
+  int bottom = d->__first_nonopt;
+  int middle = d->__last_nonopt;
+  int top = d->optind;
+  char *tem;
+  while (top > middle && middle > bottom) {
+    if (top - middle > middle - bottom) {
+      int len = middle - bottom;
+      int i;
+      for (i = 0; i < len; i++) {
+        tem = argv[bottom + i];
+        argv[bottom + i] = argv[top - (middle - bottom) + i];
+        argv[top - (middle - bottom) + i] = tem;
+      }
+      top -= len;
+    }
+    else {
+      int len = top - middle;
+      int i;
+      for (i = 0; i < len; i++) {
+        tem = argv[bottom + i];
+        argv[bottom + i] = argv[middle + i];
+        argv[middle + i] = tem;
+      }
+      bottom += len;
+    }
+  }
+  d->__first_nonopt += (d->optind - d->__last_nonopt);
+  d->__last_nonopt = d->optind;
+}
+
+static int process_long_option_a(int argc, char **argv, const char *optstring, const struct option_a *longopts, int *longind, int long_only, struct _getopt_data_a *d, int print_errors, const char *prefix);
+static int process_long_option_a(int argc, char **argv, const char *optstring, const struct option_a *longopts, int *longind, int long_only, struct _getopt_data_a *d, int print_errors, const char *prefix) {
+  assert(longopts != NULL);
+  char *nameend;
+  size_t namelen;
+  const struct option_a *p;
+  const struct option_a *pfound = NULL;
+  int n_options;
+  int option_index = 0;
+  for (nameend = d->__nextchar; *nameend && *nameend != '='; nameend++)
+    ;
+  namelen = nameend - d->__nextchar;
+  for (p = longopts, n_options = 0; p->name; p++, n_options++)
+    if (!strncmp(p->name, d->__nextchar, namelen) && namelen == strlen(p->name)) {
+      pfound = p;
+      option_index = n_options;
+      break;
+    }
+  if (pfound == NULL) {
+    unsigned char *ambig_set = NULL;
+    int ambig_fallback = 0;
+    int indfound = -1;
+    for (p = longopts, option_index = 0; p->name; p++, option_index++)
+      if (!strncmp(p->name, d->__nextchar, namelen)) {
+        if (pfound == NULL) {
+          pfound = p;
+          indfound = option_index;
+        }
+        else if (long_only || pfound->has_arg != p->has_arg || pfound->flag != p->flag || pfound->val != p->val) {
+          if (!ambig_fallback) {
+            if (!print_errors)
+              ambig_fallback = 1;
+
+            else if (!ambig_set) {
+              if ((ambig_set = reinterpret_cast<unsigned char *>(malloc(n_options * sizeof(char)))) == NULL)
+                ambig_fallback = 1;
+
+              if (ambig_set) {
+                memset(ambig_set, 0, n_options * sizeof(char));
+                ambig_set[indfound] = 1;
+              }
+            }
+            if (ambig_set)
+              ambig_set[option_index] = 1;
+          }
+        }
+      }
+    if (ambig_set || ambig_fallback) {
+      if (print_errors) {
+        if (ambig_fallback)
+          fprintf(stderr, "%s: option '%s%s' is ambiguous\n", argv[0], prefix, d->__nextchar);
+        else {
+          _lock_file(stderr);
+          fprintf(stderr, "%s: option '%s%s' is ambiguous; possibilities:", argv[0], prefix, d->__nextchar);
+          for (option_index = 0; option_index < n_options; option_index++)
+            if (ambig_set[option_index])
+              fprintf(stderr, " '%s%s'", prefix, longopts[option_index].name);
+          fprintf(stderr, "\n");
+          _unlock_file(stderr);
+        }
+      }
+      free(ambig_set);
+      d->__nextchar += strlen(d->__nextchar);
+      d->optind++;
+      d->optopt = 0;
+      return '?';
+    }
+    option_index = indfound;
+  }
+  if (pfound == NULL) {
+    if (!long_only || argv[d->optind][1] == '-' || strchr(optstring, *d->__nextchar) == NULL) {
+      if (print_errors)
+        fprintf(stderr, "%s: unrecognized option '%s%s'\n", argv[0], prefix, d->__nextchar);
+      d->__nextchar = NULL;
+      d->optind++;
+      d->optopt = 0;
+      return '?';
+    }
+    return -1;
+  }
+  d->optind++;
+  d->__nextchar = NULL;
+  if (*nameend) {
+    if (pfound->has_arg)
+      d->optarg = nameend + 1;
+    else {
+      if (print_errors)
+        fprintf(stderr, "%s: option '%s%s' doesn't allow an argument\n", argv[0], prefix, pfound->name);
+      d->optopt = pfound->val;
+      return '?';
+    }
+  }
+  else if (pfound->has_arg == 1) {
+    if (d->optind < argc)
+      d->optarg = argv[d->optind++];
+    else {
+      if (print_errors)
+        fprintf(stderr, "%s: option '%s%s' requires an argument\n", argv[0], prefix, pfound->name);
+      d->optopt = pfound->val;
+      return optstring[0] == ':' ? ':' : '?';
+    }
+  }
+  if (longind != NULL)
+    *longind = option_index;
+
+  if (pfound->flag) {
+    *(pfound->flag) = pfound->val;
+    return 0;
+  }
+  return pfound->val;
+}
+
+static const char *_getopt_initialize_a(const char *optstring, struct _getopt_data_a *d, int posixly_correct) {
+  if (d->optind == 0)
+    d->optind = 1;
+
+  d->__first_nonopt = d->__last_nonopt = d->optind;
+  d->__nextchar = NULL;
+
+  if (optstring[0] == '-') {
+    d->__ordering = RETURN_IN_ORDER;
+    ++optstring;
+  }
+  else if (optstring[0] == '+') {
+    d->__ordering = REQUIRE_ORDER;
+    ++optstring;
+  }
+  else if (posixly_correct | !!getenv("POSIXLY_CORRECT"))
+    d->__ordering = REQUIRE_ORDER;
+  else
+    d->__ordering = PERMUTE;
+
+  d->__initialized = 1;
+  return optstring;
+}
+
+int _getopt_internal_r_a(int argc, char *const *argv, const char *optstring, const struct option_a *longopts, int *longind, int long_only, struct _getopt_data_a *d, int posixly_correct);
+int _getopt_internal_r_a(int argc, char *const *argv, const char *optstring, const struct option_a *longopts, int *longind, int long_only, struct _getopt_data_a *d, int posixly_correct) {
+  int print_errors = d->opterr;
+  if (argc < 1)
+    return -1;
+  d->optarg = NULL;
+  if (d->optind == 0 || !d->__initialized)
+    optstring = _getopt_initialize_a(optstring, d, posixly_correct);
+  else if (optstring[0] == '-' || optstring[0] == '+')
+    optstring++;
+  if (optstring[0] == ':')
+    print_errors = 0;
+
+  if (d->__nextchar == NULL || *d->__nextchar == '\0') {
+    if (d->__last_nonopt > d->optind)
+      d->__last_nonopt = d->optind;
+    if (d->__first_nonopt > d->optind)
+      d->__first_nonopt = d->optind;
+    if (d->__ordering == PERMUTE) {
+      if (d->__first_nonopt != d->__last_nonopt && d->__last_nonopt != d->optind)
+        exchange_a(const_cast<char **>(argv), d);
+      else if (d->__last_nonopt != d->optind)
+        d->__first_nonopt = d->optind;
+      while (d->optind < argc && (argv[d->optind][0] != '-' || argv[d->optind][1] == '\0'))
+        d->optind++;
+      d->__last_nonopt = d->optind;
+    }
+    if (d->optind != argc && !strcmp(argv[d->optind], "--")) {
+      d->optind++;
+      if (d->__first_nonopt != d->__last_nonopt && d->__last_nonopt != d->optind)
+        exchange_a(const_cast<char **>(argv), d);
+      else if (d->__first_nonopt == d->__last_nonopt)
+        d->__first_nonopt = d->optind;
+      d->__last_nonopt = argc;
+      d->optind = argc;
+    }
+    if (d->optind == argc) {
+      if (d->__first_nonopt != d->__last_nonopt)
+        d->optind = d->__first_nonopt;
+      return -1;
+    }
+    if (argv[d->optind][0] != '-' || argv[d->optind][1] == '\0') {
+      if (d->__ordering == REQUIRE_ORDER)
+        return -1;
+      d->optarg = argv[d->optind++];
+      return 1;
+    }
+    if (longopts) {
+      if (argv[d->optind][1] == '-') {
+        d->__nextchar = argv[d->optind] + 2;
+        return process_long_option_a(argc, const_cast<char **>(argv), optstring, longopts, longind, long_only, d, print_errors, "--");
+      }
+      if (long_only && (argv[d->optind][2] || !strchr(optstring, argv[d->optind][1]))) {
+        int code;
+        d->__nextchar = argv[d->optind] + 1;
+        code = process_long_option_a(argc, const_cast<char **>(argv), optstring, longopts,
+                                     longind, long_only, d,
+                                     print_errors, "-");
+        if (code != -1)
+          return code;
+      }
+    }
+    d->__nextchar = argv[d->optind] + 1;
+  }
+  {
+    char c = *d->__nextchar++;
+    const char *temp = strchr(optstring, c);
+    if (*d->__nextchar == '\0')
+      ++d->optind;
+    if (temp == NULL || c == ':' || c == ';') {
+      if (print_errors)
+        fprintf(stderr, "%s: invalid option -- '%c'\n", argv[0], c);
+      d->optopt = c;
+      return '?';
+    }
+    if (temp[0] == 'W' && temp[1] == ';' && longopts != NULL) {
+      if (*d->__nextchar != '\0')
+        d->optarg = d->__nextchar;
+      else if (d->optind == argc) {
+        if (print_errors)
+          fprintf(stderr, "%s: option requires an argument -- '%c'\n", argv[0], c);
+        d->optopt = c;
+        if (optstring[0] == ':')
+          c = ':';
+        else
+          c = '?';
+        return c;
+      }
+      else
+        d->optarg = argv[d->optind];
+      d->__nextchar = d->optarg;
+      d->optarg = NULL;
+      return process_long_option_a(argc, const_cast<char **>(argv), optstring, longopts, longind, 0, d, print_errors, "-W ");
+    }
+    if (temp[1] == ':') {
+      if (temp[2] == ':') {
+        if (*d->__nextchar != '\0') {
+          d->optarg = d->__nextchar;
+          d->optind++;
+        }
+        else
+          d->optarg = NULL;
+        d->__nextchar = NULL;
+      }
+      else {
+        if (*d->__nextchar != '\0') {
+          d->optarg = d->__nextchar;
+          d->optind++;
+        }
+        else if (d->optind == argc) {
+          if (print_errors)
+            fprintf(stderr, "%s: option requires an argument -- '%c'\n", argv[0], c);
+          d->optopt = c;
+          if (optstring[0] == ':')
+            c = ':';
+          else
+            c = '?';
+        }
+        else
+          d->optarg = argv[d->optind++];
+        d->__nextchar = NULL;
+      }
+    }
+    return c;
+  }
+}
+
+int _getopt_internal_a(int argc, char *const *argv, const char *optstring, const struct option_a *longopts, int *longind, int long_only, int posixly_correct);
+int _getopt_internal_a(int argc, char *const *argv, const char *optstring, const struct option_a *longopts, int *longind, int long_only, int posixly_correct) {
+  int result;
+  getopt_data_a.optind = optind;
+  getopt_data_a.opterr = opterr;
+  result = _getopt_internal_r_a(argc, argv, optstring, longopts, longind, long_only, &getopt_data_a, posixly_correct);
+  optind = getopt_data_a.optind;
+  optarg_a = getopt_data_a.optarg;
+  optopt = getopt_data_a.optopt;
+  return result;
+}
+
+int getopt_a(int argc, char *const *argv, const char *optstring) _GETOPT_THROW {
+  return _getopt_internal_a(argc, argv, optstring, static_cast<const struct option_a *>(0), static_cast<int *>(0), 0, 0);
+}
+
+int getopt_long_a(int argc, char *const *argv, const char *options, const struct option_a *long_options, int *opt_index) _GETOPT_THROW {
+  return _getopt_internal_a(argc, argv, options, long_options, opt_index, 0, 0);
+}
+
+int getopt_long_only_a(int argc, char *const *argv, const char *options, const struct option_a *long_options, int *opt_index) _GETOPT_THROW {
+  return _getopt_internal_a(argc, argv, options, long_options, opt_index, 1, 0);
+}
+
+int _getopt_long_r_a(int argc, char *const *argv, const char *options, const struct option_a *long_options, int *opt_index, struct _getopt_data_a *d);
+int _getopt_long_r_a(int argc, char *const *argv, const char *options, const struct option_a *long_options, int *opt_index, struct _getopt_data_a *d) {
+  return _getopt_internal_r_a(argc, argv, options, long_options, opt_index, 0, d, 0);
+}
+
+int _getopt_long_only_r_a(int argc, char *const *argv, const char *options, const struct option_a *long_options, int *opt_index, struct _getopt_data_a *d);
+int _getopt_long_only_r_a(int argc, char *const *argv, const char *options, const struct option_a *long_options, int *opt_index, struct _getopt_data_a *d) {
+  return _getopt_internal_r_a(argc, argv, options, long_options, opt_index, 1, d, 0);
+}
+
+//
+//
+//	Unicode Structures and Functions
+//
+//
+
+static struct _getopt_data_w {
+  int optind;
+  int opterr;
+  int optopt;
+  wchar_t *optarg;
+  int __initialized;
+  wchar_t *__nextchar;
+  enum ENUM_ORDERING __ordering;
+  int __first_nonopt;
+  int __last_nonopt;
+} getopt_data_w;
+wchar_t *optarg_w;
+
+static void exchange_w(wchar_t **argv, struct _getopt_data_w *d) {
+  int bottom = d->__first_nonopt;
+  int middle = d->__last_nonopt;
+  int top = d->optind;
+  wchar_t *tem;
+  while (top > middle && middle > bottom) {
+    if (top - middle > middle - bottom) {
+      int len = middle - bottom;
+      int i;
+      for (i = 0; i < len; i++) {
+        tem = argv[bottom + i];
+        argv[bottom + i] = argv[top - (middle - bottom) + i];
+        argv[top - (middle - bottom) + i] = tem;
+      }
+      top -= len;
+    }
+    else {
+      int len = top - middle;
+      int i;
+      for (i = 0; i < len; i++) {
+        tem = argv[bottom + i];
+        argv[bottom + i] = argv[middle + i];
+        argv[middle + i] = tem;
+      }
+      bottom += len;
+    }
+  }
+  d->__first_nonopt += (d->optind - d->__last_nonopt);
+  d->__last_nonopt = d->optind;
+}
+
+static int process_long_option_w(int argc, wchar_t **argv, const wchar_t *optstring, const struct option_w *longopts, int *longind, int long_only, struct _getopt_data_w *d, int print_errors, const wchar_t *prefix) {
+  assert(longopts != NULL);
+  wchar_t *nameend;
+  size_t namelen;
+  const struct option_w *p;
+  const struct option_w *pfound = NULL;
+  int n_options;
+  int option_index = 0;
+  for (nameend = d->__nextchar; *nameend && *nameend != L'='; nameend++)
+    ;
+  namelen = nameend - d->__nextchar;
+  for (p = longopts, n_options = 0; p->name; p++, n_options++)
+    if (!wcsncmp(p->name, d->__nextchar, namelen) && namelen == wcslen(p->name)) {
+      pfound = p;
+      option_index = n_options;
+      break;
+    }
+  if (pfound == NULL) {
+    wchar_t *ambig_set = NULL;
+    int ambig_fallback = 0;
+    int indfound = -1;
+    for (p = longopts, option_index = 0; p->name; p++, option_index++)
+      if (!wcsncmp(p->name, d->__nextchar, namelen)) {
+        if (pfound == NULL) {
+          pfound = p;
+          indfound = option_index;
+        }
+        else if (long_only || pfound->has_arg != p->has_arg || pfound->flag != p->flag || pfound->val != p->val) {
+          if (!ambig_fallback) {
+            if (!print_errors)
+              ambig_fallback = 1;
+
+            else if (!ambig_set) {
+              if ((ambig_set = reinterpret_cast<wchar_t *>(malloc(n_options * sizeof(wchar_t)))) == NULL)
+                ambig_fallback = 1;
+
+              if (ambig_set) {
+                memset(ambig_set, 0, n_options * sizeof(wchar_t));
+                ambig_set[indfound] = 1;
+              }
+            }
+            if (ambig_set)
+              ambig_set[option_index] = 1;
+          }
+        }
+      }
+    if (ambig_set || ambig_fallback) {
+      if (print_errors) {
+        if (ambig_fallback)
+          fwprintf(stderr, L"%s: option '%s%s' is ambiguous\n", argv[0], prefix, d->__nextchar);
+        else {
+          _lock_file(stderr);
+          fwprintf(stderr, L"%s: option '%s%s' is ambiguous; possibilities:", argv[0], prefix, d->__nextchar);
+          for (option_index = 0; option_index < n_options; option_index++)
+            if (ambig_set[option_index])
+              fwprintf(stderr, L" '%s%s'", prefix, longopts[option_index].name);
+          fwprintf(stderr, L"\n");
+          _unlock_file(stderr);
+        }
+      }
+      free(ambig_set);
+      d->__nextchar += wcslen(d->__nextchar);
+      d->optind++;
+      d->optopt = 0;
+      return L'?';
+    }
+    option_index = indfound;
+  }
+  if (pfound == NULL) {
+    if (!long_only || argv[d->optind][1] == L'-' || wcschr(optstring, *d->__nextchar) == NULL) {
+      if (print_errors)
+        fwprintf(stderr, L"%s: unrecognized option '%s%s'\n", argv[0], prefix, d->__nextchar);
+      d->__nextchar = NULL;
+      d->optind++;
+      d->optopt = 0;
+      return L'?';
+    }
+    return -1;
+  }
+  d->optind++;
+  d->__nextchar = NULL;
+  if (*nameend) {
+    if (pfound->has_arg)
+      d->optarg = nameend + 1;
+    else {
+      if (print_errors)
+        fwprintf(stderr, L"%s: option '%s%s' doesn't allow an argument\n", argv[0], prefix, pfound->name);
+      d->optopt = pfound->val;
+      return L'?';
+    }
+  }
+  else if (pfound->has_arg == 1) {
+    if (d->optind < argc)
+      d->optarg = argv[d->optind++];
+    else {
+      if (print_errors)
+        fwprintf(stderr, L"%s: option '%s%s' requires an argument\n", argv[0], prefix, pfound->name);
+      d->optopt = pfound->val;
+      return optstring[0] == L':' ? L':' : L'?';
+    }
+  }
+  if (longind != NULL)
+    *longind = option_index;
+  if (pfound->flag) {
+    *(pfound->flag) = pfound->val;
+    return 0;
+  }
+  return pfound->val;
+}
+
+static const wchar_t *_getopt_initialize_w(const wchar_t *optstring, struct _getopt_data_w *d, int posixly_correct) {
+  if (d->optind == 0)
+    d->optind = 1;
+
+  d->__first_nonopt = d->__last_nonopt = d->optind;
+  d->__nextchar = NULL;
+
+  if (optstring[0] == L'-') {
+    d->__ordering = RETURN_IN_ORDER;
+    ++optstring;
+  }
+  else if (optstring[0] == L'+') {
+    d->__ordering = REQUIRE_ORDER;
+    ++optstring;
+  }
+  else if (posixly_correct | !!_wgetenv(L"POSIXLY_CORRECT"))
+    d->__ordering = REQUIRE_ORDER;
+  else
+    d->__ordering = PERMUTE;
+
+  d->__initialized = 1;
+  return optstring;
+}
+
+int _getopt_internal_r_w(int argc, wchar_t *const *argv, const wchar_t *optstring, const struct option_w *longopts, int *longind, int long_only, struct _getopt_data_w *d, int posixly_correct);
+int _getopt_internal_r_w(int argc, wchar_t *const *argv, const wchar_t *optstring, const struct option_w *longopts, int *longind, int long_only, struct _getopt_data_w *d, int posixly_correct) {
+  int print_errors = d->opterr;
+  if (argc < 1)
+    return -1;
+  d->optarg = NULL;
+  if (d->optind == 0 || !d->__initialized)
+    optstring = _getopt_initialize_w(optstring, d, posixly_correct);
+  else if (optstring[0] == L'-' || optstring[0] == L'+')
+    optstring++;
+  if (optstring[0] == L':')
+    print_errors = 0;
+#define NONOPTION_P (argv[d->optind][0] != L'-' || argv[d->optind][1] == L'\0')
+
+  if (d->__nextchar == NULL || *d->__nextchar == L'\0') {
+    if (d->__last_nonopt > d->optind)
+      d->__last_nonopt = d->optind;
+    if (d->__first_nonopt > d->optind)
+      d->__first_nonopt = d->optind;
+    if (d->__ordering == PERMUTE) {
+      if (d->__first_nonopt != d->__last_nonopt && d->__last_nonopt != d->optind)
+        exchange_w(const_cast<wchar_t **>(argv), d);
+      else if (d->__last_nonopt != d->optind)
+        d->__first_nonopt = d->optind;
+      while (d->optind < argc && NONOPTION_P)
+        d->optind++;
+      d->__last_nonopt = d->optind;
+    }
+    if (d->optind != argc && !wcscmp(argv[d->optind], L"--")) {
+      d->optind++;
+      if (d->__first_nonopt != d->__last_nonopt && d->__last_nonopt != d->optind)
+        exchange_w(const_cast<wchar_t **>(argv), d);
+      else if (d->__first_nonopt == d->__last_nonopt)
+        d->__first_nonopt = d->optind;
+      d->__last_nonopt = argc;
+      d->optind = argc;
+    }
+    if (d->optind == argc) {
+      if (d->__first_nonopt != d->__last_nonopt)
+        d->optind = d->__first_nonopt;
+      return -1;
+    }
+    if (NONOPTION_P) {
+      if (d->__ordering == REQUIRE_ORDER)
+        return -1;
+      d->optarg = argv[d->optind++];
+      return 1;
+    }
+    if (longopts) {
+      if (argv[d->optind][1] == L'-') {
+        d->__nextchar = argv[d->optind] + 2;
+        return process_long_option_w(argc, const_cast<wchar_t **>(argv), optstring, longopts, longind, long_only, d, print_errors, L"--");
+      }
+      if (long_only && (argv[d->optind][2] || !wcschr(optstring, argv[d->optind][1]))) {
+        int code;
+        d->__nextchar = argv[d->optind] + 1;
+        code = process_long_option_w(argc, const_cast<wchar_t **>(argv), optstring, longopts, longind, long_only, d, print_errors, L"-");
+        if (code != -1)
+          return code;
+      }
+    }
+    d->__nextchar = argv[d->optind] + 1;
+  }
+  {
+    wchar_t c = *d->__nextchar++;
+    const wchar_t *temp = wcschr(optstring, c);
+    if (*d->__nextchar == L'\0')
+      ++d->optind;
+    if (temp == NULL || c == L':' || c == L';') {
+      if (print_errors)
+        fwprintf(stderr, L"%s: invalid option -- '%c'\n", argv[0], c);
+      d->optopt = c;
+      return L'?';
+    }
+    if (temp[0] == L'W' && temp[1] == L';' && longopts != NULL) {
+      if (*d->__nextchar != L'\0')
+        d->optarg = d->__nextchar;
+      else if (d->optind == argc) {
+        if (print_errors)
+          fwprintf(stderr, L"%s: option requires an argument -- '%c'\n", argv[0], c);
+        d->optopt = c;
+        if (optstring[0] == L':')
+          c = L':';
+        else
+          c = L'?';
+        return c;
+      }
+      else
+        d->optarg = argv[d->optind];
+      d->__nextchar = d->optarg;
+      d->optarg = NULL;
+      return process_long_option_w(argc, const_cast<wchar_t **>(argv), optstring, longopts, longind,
+                                   0, d, print_errors, L"-W ");
+    }
+    if (temp[1] == L':') {
+      if (temp[2] == L':') {
+        if (*d->__nextchar != L'\0') {
+          d->optarg = d->__nextchar;
+          d->optind++;
+        }
+        else
+          d->optarg = NULL;
+        d->__nextchar = NULL;
+      }
+      else {
+        if (*d->__nextchar != L'\0') {
+          d->optarg = d->__nextchar;
+          d->optind++;
+        }
+        else if (d->optind == argc) {
+          if (print_errors)
+            fwprintf(stderr, L"%s: option requires an argument -- '%c'\n", argv[0], c);
+          d->optopt = c;
+          if (optstring[0] == L':')
+            c = L':';
+          else
+            c = L'?';
+        }
+        else
+          d->optarg = argv[d->optind++];
+        d->__nextchar = NULL;
+      }
+    }
+    return c;
+  }
+}
+
+int _getopt_internal_w(int argc, wchar_t *const *argv, const wchar_t *optstring, const struct option_w *longopts, int *longind, int long_only, int posixly_correct);
+int _getopt_internal_w(int argc, wchar_t *const *argv, const wchar_t *optstring, const struct option_w *longopts, int *longind, int long_only, int posixly_correct) {
+  int result;
+  getopt_data_w.optind = optind;
+  getopt_data_w.opterr = opterr;
+  result = _getopt_internal_r_w(argc, argv, optstring, longopts, longind, long_only, &getopt_data_w, posixly_correct);
+  optind = getopt_data_w.optind;
+  optarg_w = getopt_data_w.optarg;
+  optopt = getopt_data_w.optopt;
+  return result;
+}
+
+int getopt_w(int argc, wchar_t *const *argv, const wchar_t *optstring) _GETOPT_THROW {
+  return _getopt_internal_w(argc, argv, optstring, static_cast<const struct option_w *>(0), static_cast<int *>(0), 0, 0);
+}
+
+int getopt_long_w(int argc, wchar_t *const *argv, const wchar_t *options, const struct option_w *long_options, int *opt_index) _GETOPT_THROW {
+  return _getopt_internal_w(argc, argv, options, long_options, opt_index, 0, 0);
+}
+
+int getopt_long_only_w(int argc, wchar_t *const *argv, const wchar_t *options, const struct option_w *long_options, int *opt_index) _GETOPT_THROW {
+  return _getopt_internal_w(argc, argv, options, long_options, opt_index, 1, 0);
+}
+
+int _getopt_long_r_w(int argc, wchar_t *const *argv, const wchar_t *options, const struct option_w *long_options, int *opt_index, struct _getopt_data_w *d);
+int _getopt_long_r_w(int argc, wchar_t *const *argv, const wchar_t *options, const struct option_w *long_options, int *opt_index, struct _getopt_data_w *d) {
+  return _getopt_internal_r_w(argc, argv, options, long_options, opt_index, 0, d, 0);
+}
+
+int _getopt_long_only_r_w(int argc, wchar_t *const *argv, const wchar_t *options, const struct option_w *long_options, int *opt_index, struct _getopt_data_w *d);
+int _getopt_long_only_r_w(int argc, wchar_t *const *argv, const wchar_t *options, const struct option_w *long_options, int *opt_index, struct _getopt_data_w *d) {
+  return _getopt_internal_r_w(argc, argv, options, long_options, opt_index, 1, d, 0);
+}

3rdparty/getopt/getopt.h

@@ -1,95 +1,135 @@
-#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__) */
+/* Getopt for Microsoft C
+This code is a modification of the Free Software Foundation, Inc.
+Getopt library for parsing command line argument the purpose was
+to provide a Microsoft Visual C friendly derivative. This code
+provides functionality for both Unicode and Multibyte builds.
+
+Date: 02/03/2011 - Ludvik Jerabek - Initial Release
+Version: 1.1
+Comment: Supports getopt, getopt_long, and getopt_long_only
+and POSIXLY_CORRECT environment flag
+License: LGPL
+
+Revisions:
+
+02/03/2011 - Ludvik Jerabek - Initial Release
+02/20/2011 - Ludvik Jerabek - Fixed compiler warnings at Level 4
+07/05/2011 - Ludvik Jerabek - Added no_argument, required_argument, optional_argument defs
+08/03/2011 - Ludvik Jerabek - Fixed non-argument runtime bug which caused runtime exception
+08/09/2011 - Ludvik Jerabek - Added code to export functions for DLL and LIB
+02/15/2012 - Ludvik Jerabek - Fixed _GETOPT_THROW definition missing in implementation file
+08/01/2012 - Ludvik Jerabek - Created separate functions for char and wchar_t characters so single dll can do both unicode and ansi
+10/15/2012 - Ludvik Jerabek - Modified to match latest GNU features
+06/19/2015 - Ludvik Jerabek - Fixed maximum option limitation caused by option_a (255) and option_w (65535) structure val variable
+09/24/2022 - Ludvik Jerabek - Updated to match most recent getopt release
+09/25/2022 - Ludvik Jerabek - Fixed memory allocation (malloc call) issue for wchar_t*
+
+**DISCLAIMER**
+THIS MATERIAL IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND,
+EITHER EXPRESS OR IMPLIED, INCLUDING, BUT Not LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+PURPOSE, OR NON-INFRINGEMENT. SOME JURISDICTIONS DO NOT ALLOW THE
+EXCLUSION OF IMPLIED WARRANTIES, SO THE ABOVE EXCLUSION MAY NOT
+APPLY TO YOU. IN NO EVENT WILL I BE LIABLE TO ANY PARTY FOR ANY
+DIRECT, INDIRECT, SPECIAL OR OTHER CONSEQUENTIAL DAMAGES FOR ANY
+USE OF THIS MATERIAL INCLUDING, WITHOUT LIMITATION, ANY LOST
+PROFITS, BUSINESS INTERRUPTION, LOSS OF PROGRAMS OR OTHER DATA ON
+YOUR INFORMATION HANDLING SYSTEM OR OTHERWISE, EVEN If WE ARE
+EXPRESSLY ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+*/
+#ifndef __GETOPT_H_
+#define __GETOPT_H_
+
+#ifdef _GETOPT_API
+#  undef _GETOPT_API
+#endif
+
+#if defined(EXPORTS_GETOPT) && defined(STATIC_GETOPT)
+#  error "The preprocessor definitions of EXPORTS_GETOPT and STATIC_GETOPT can only be used individually"
+#elif defined(STATIC_GETOPT)
+#  define _GETOPT_API
+#elif defined(EXPORTS_GETOPT)
+#  pragma message("Exporting getopt library")
+#  define _GETOPT_API __declspec(dllexport)
+#else
+#  pragma message("Importing getopt library")
+#  define _GETOPT_API __declspec(dllimport)
+#endif
+
+// Change behavior for C\C++
+#ifdef __cplusplus
+#  define _BEGIN_EXTERN_C extern "C" {
+#  define _END_EXTERN_C   }
+#  define _GETOPT_THROW   throw()
+#else
+#  define _BEGIN_EXTERN_C
+#  define _END_EXTERN_C
+#  define _GETOPT_THROW
+#endif
+
+// Standard GNU options
+#define null_argument     0 /*Argument Null*/
+#define no_argument       0 /*Argument Switch Only*/
+#define required_argument 1 /*Argument Required*/
+#define optional_argument 2 /*Argument Optional*/
+
+// Shorter Options
+#define ARG_NULL 0 /*Argument Null*/
+#define ARG_NONE 0 /*Argument Switch Only*/
+#define ARG_REQ  1 /*Argument Required*/
+#define ARG_OPT  2 /*Argument Optional*/
+
+#include <string.h>
+#include <wchar.h>
+
+_BEGIN_EXTERN_C
+
+extern _GETOPT_API int optind;
+extern _GETOPT_API int opterr;
+extern _GETOPT_API int optopt;
+
+// Ansi
+struct option_a {
+  const char *name;
+  int has_arg;
+  int *flag;
+  int val;
+};
+extern _GETOPT_API char *optarg_a;
+extern _GETOPT_API int getopt_a(int argc, char *const *argv, const char *optstring) _GETOPT_THROW;
+extern _GETOPT_API int getopt_long_a(int argc, char *const *argv, const char *options, const struct option_a *long_options, int *opt_index) _GETOPT_THROW;
+extern _GETOPT_API int getopt_long_only_a(int argc, char *const *argv, const char *options, const struct option_a *long_options, int *opt_index) _GETOPT_THROW;
+
+// Unicode
+struct option_w {
+  const wchar_t *name;
+  int has_arg;
+  int *flag;
+  int val;
+};
+extern _GETOPT_API wchar_t *optarg_w;
+extern _GETOPT_API int getopt_w(int argc, wchar_t *const *argv, const wchar_t *optstring) _GETOPT_THROW;
+extern _GETOPT_API int getopt_long_w(int argc, wchar_t *const *argv, const wchar_t *options, const struct option_w *long_options, int *opt_index) _GETOPT_THROW;
+extern _GETOPT_API int getopt_long_only_w(int argc, wchar_t *const *argv, const wchar_t *options, const struct option_w *long_options, int *opt_index) _GETOPT_THROW;
+
+_END_EXTERN_C
+
+#undef _BEGIN_EXTERN_C
+#undef _END_EXTERN_C
+#undef _GETOPT_THROW
+#undef _GETOPT_API
+
+#ifdef _UNICODE
+#  define getopt           getopt_w
+#  define getopt_long      getopt_long_w
+#  define getopt_long_only getopt_long_only_w
+#  define option           option_w
+#  define optarg           optarg_w
+#else
+#  define getopt           getopt_a
+#  define getopt_long      getopt_long_a
+#  define getopt_long_only getopt_long_only_a
+#  define option           option_a
+#  define optarg           optarg_a
+#endif
+#endif  // __GETOPT_H_

3rdparty/kdsingleapplication/CMakeLists.txt

@@ -0,0 +1,8 @@
+cmake_minimum_required(VERSION 3.7)
+set(SOURCES KDSingleApplication/src/kdsingleapplication.cpp KDSingleApplication/src/kdsingleapplication_localsocket.cpp)
+set(HEADERS KDSingleApplication/src/kdsingleapplication.h KDSingleApplication/src/kdsingleapplication_localsocket_p.h)
+qt_wrap_cpp(MOC ${HEADERS})
+add_library(kdsingleapplication STATIC ${SOURCES} ${MOC})
+target_compile_definitions(kdsingleapplication PRIVATE -DKDSINGLEAPPLICATION_STATIC_BUILD)
+target_include_directories(kdsingleapplication PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+target_link_libraries(kdsingleapplication PUBLIC Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Network)

3rdparty/macdeployqt/CMakeLists.txt

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

3rdparty/macdeployqt/main.cpp

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

3rdparty/macdeployqt/shared.h

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

3rdparty/singleapplication/CMakeLists.txt

@@ -1,12 +0,0 @@
-cmake_minimum_required(VERSION 3.7)
-
-include(CheckIncludeFiles)
-include(CheckFunctionExists)
-
-check_function_exists(geteuid HAVE_GETEUID)
-check_function_exists(getpwuid HAVE_GETPWUID)
-
-configure_file(config.h.in "${CMAKE_CURRENT_BINARY_DIR}/config.h")
-
-add_subdirectory(singleapplication)
-add_subdirectory(singlecoreapplication)

3rdparty/singleapplication/LICENSE

@@ -1,24 +0,0 @@
-The MIT License (MIT)
-
-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
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-Note: Some of the examples include code not distributed under the terms of the
-MIT License.

3rdparty/singleapplication/README.md

@@ -1,305 +0,0 @@
-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` 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)
-instances and can send data to the primary instance from secondary instances.
-
-Usage
------
-
-The `SingleApplication` class inherits from whatever `Q[Core|Gui]Application`
-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.
-
-You can use the library as if you use any other `QCoreApplication` derived
-class:
-
-```cpp
-#include <QApplication>
-#include <SingleApplication.h>
-
-int main( int argc, char* argv[] )
-{
-    SingleApplication app( argc, argv );
-
-    return app.exec();
-}
-```
-
-To include the library files I would recommend that you add it as a git
-submodule to your project. Here is how:
-
-```bash
-git submodule add https://github.com/itay-grudev/SingleApplication.git singleapplication
-```
-
-**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
-been started, for example.
-
-```cpp
-// window is a QWindow instance
-QObject::connect(
-    &app,
-    &SingleApplication::instanceStarted,
-    &window,
-    &QWindow::raise
-);
-```
-
-Using `SingleApplication::instance()` is a neat way to get the
-`SingleApplication` instance for binding to it's signals anywhere in your
-program.
-
-__Note:__ On Windows the ability to bring the application windows to the
-foreground is restricted. See [Windows specific implementations](Windows.md)
-for a workaround and an example implementation.
-
-
-Secondary Instances
--------------------
-
-If you want to be able to launch additional Secondary Instances (not related to
-your Primary Instance) you have to enable that with the third parameter of the
-`SingleApplication` constructor. The default is `false` meaning no Secondary
-Instances. Here is an example of how you would start a Secondary Instance send
-a message with the command line arguments to the primary instance and then shut
-down.
-
-```cpp
-int main(int argc, char *argv[])
-{
-    SingleApplication app( argc, argv, true );
-
-    if( app.isSecondary() ) {
-        app.sendMessage(  app.arguments().join(' ')).toUtf8() );
-        app.exit( 0 );
-    }
-
-    return app.exec();
-}
-```
-
-*__Note:__ A secondary instance won't cause the emission of the
-`instanceStarted()` signal by default. See `SingleApplication::Mode` for more
-details.*
-
-You can check whether your instance is a primary or secondary with the following
-methods:
-
-```cpp
-app.isPrimary();
-// or
-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, QString userData = QString() )
-```
-
-Depending on whether `allowSecondary` is set, this constructor may terminate
-your app if there is already a primary instance running. Additional `Options`
-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. 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.*
-
-*__Note:__ `Mode::SecondaryNotification` only works if set on both the primary
-and the secondary instance.*
-
-*__Note:__ Operating system can restrict the shared memory blocks to the same
-user, in which case the User/System modes will have no effect and the block will
-be user wide.*
-
----
-
-```cpp
-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. Returns `true` if the message has been sent
-successfully. If the message can't be sent or the function timeouts - returns `false`.
-
----
-
-```cpp
-bool SingleApplication::isPrimary()
-```
-
-Returns if the instance is the primary instance.
-
----
-
-```cpp
-bool SingleApplication::isSecondary()
-```
-Returns if the instance is a secondary instance.
-
----
-
-```cpp
-quint32 SingleApplication::instanceId()
-```
-
-Returns a unique identifier for the current instance.
-
----
-
-```cpp
-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
-void SingleApplication::instanceStarted()
-```
-
-Triggered whenever a new instance had been started, except for secondary
-instances if the `Mode::SecondaryNotification` flag is not specified.
-
----
-
-```cpp
-void SingleApplication::receivedMessage( quint32 instanceId, QByteArray message )
-```
-
-Triggered whenever there is a message received from a secondary instance.
-
----
-
-### Flags
-
-```cpp
-enum SingleApplication::Mode
-```
-
-*   `Mode::User` - The SingleApplication block should apply user wide. This adds
-    user specific data to the key used for the shared memory and server name.
-    This is the default functionality.
-*   `Mode::System` – The SingleApplication block applies system-wide.
-*   `Mode::SecondaryNotification` – Whether to trigger `instanceStarted()` even
-    whenever secondary instances are started.
-*   `Mode::ExcludeAppPath` – Excludes the application path from the server name
-    (and memory block) hash.
-*   `Mode::ExcludeAppVersion` – Excludes the application version from the server
-    name (and memory block) hash.
-
-*__Note:__ `Mode::SecondaryNotification` only works if set on both the primary
-and the secondary instance.*
-
-*__Note:__ Operating system can restrict the shared memory blocks to the same
-user, in which case the User/System modes will have no effect and the block will
-be user wide.*
-
----
-
-Versioning
-----------
-
-Each major version introduces either very significant changes or is not
-backwards compatible with the previous version. Minor versions only add
-additional features, bug fixes or performance improvements and are backwards
-compatible with the previous release. See [`CHANGELOG.md`](CHANGELOG.md) for
-more details.
-
-Implementation
---------------
-
-The library is implemented with a QSharedMemory block which is thread safe and
-guarantees a race condition will not occur. It also uses a QLocalSocket to
-notify the main process that a new instance had been spawned and thus invoke the
-`instanceStarted()` signal and for messaging the primary instance.
-
-Additionally the library can recover from being forcefully killed on *nix
-systems and will reset the memory block given that there are no other
-instances running.
-
-License
--------
-This library and it's supporting documentation are released under
-`The MIT License (MIT)` with the exception of the Qt calculator examples which
-is distributed under the BSD license.

3rdparty/singleapplication/config.h.in

@@ -1,2 +0,0 @@
-#cmakedefine HAVE_GETEUID
-#cmakedefine HAVE_GETPWUID

3rdparty/singleapplication/singleapplication/CMakeLists.txt

@@ -1,18 +0,0 @@
-cmake_minimum_required(VERSION 3.7)
-
-add_definitions(-DSINGLEAPPLICATION)
-
-set(SOURCES ../singleapplication_t.cpp ../singleapplication_p.cpp)
-set(HEADERS ../singleapplication_t.h ../singleapplication_p.h)
-qt_wrap_cpp(MOC ${HEADERS})
-add_library(singleapplication STATIC ${SOURCES} ${MOC})
-target_include_directories(singleapplication PUBLIC
-  ${CMAKE_CURRENT_SOURCE_DIR}/..
-  ${CMAKE_CURRENT_BINARY_DIR}/..
-  ${Boost_INCLUDE_DIRS}
-)
-target_link_libraries(singleapplication PUBLIC
-  ${QtCore_LIBRARIES}
-  ${QtWidgets_LIBRARIES}
-  ${QtNetwork_LIBRARIES}
-)

3rdparty/singleapplication/singleapplication/singleapplication.h

@@ -1,13 +0,0 @@
-#ifndef SINGLEAPPLICATION_H
-#define SINGLEAPPLICATION_H
-
-#ifdef SINGLEAPPLICATION
-#  error "SINGLEAPPLICATION already defined."
-#endif
-
-#define SINGLEAPPLICATION
-#include "../singleapplication_t.h"
-#undef SINGLEAPPLICATION_T_H
-#undef SINGLEAPPLICATION
-
-#endif  // SINGLEAPPLICATION_H

3rdparty/singleapplication/singleapplication_p.cpp

@@ -1,522 +0,0 @@
-// The MIT License (MIT)
-//
-// 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
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-//
-//  W A R N I N G !!!
-//  -----------------
-//
-// This is a modified version of SingleApplication,
-// The original version is at:
-//
-// https://github.com/itay-grudev/SingleApplication
-//
-//
-
-#include "config.h"
-
-#include <QtGlobal>
-
-#include <cstdlib>
-#include <cstddef>
-
-#ifdef Q_OS_UNIX
-#  include <unistd.h>
-#  include <sys/types.h>
-#  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>
-#include <QSharedMemory>
-#include <QByteArray>
-#include <QDataStream>
-#include <QCryptographicHash>
-#include <QLocalServer>
-#include <QLocalSocket>
-#include <QElapsedTimer>
-#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
-#  include <QRandomGenerator>
-#else
-#  include <QDateTime>
-#endif
-
-#include "singleapplication_t.h"
-#include "singleapplication_p.h"
-
-SingleApplicationPrivateClass::SingleApplicationPrivateClass(SingleApplicationClass *ptr)
-    : q_ptr(ptr),
-      memory_(nullptr),
-      socket_(nullptr),
-      server_(nullptr),
-      instanceNumber_(-1) {}
-
-SingleApplicationPrivateClass::~SingleApplicationPrivateClass() {
-
-  if (socket_ != nullptr && socket_->isOpen()) {
-    socket_->close();
-  }
-
-  if (memory_ != nullptr) {
-    memory_->lock();
-    if (server_ != nullptr) {
-      server_->close();
-      InstancesInfo *instance = static_cast<InstancesInfo*>(memory_->data());
-      instance->primary = false;
-      instance->primaryPid = -1;
-      instance->primaryUser[0] = '\0';
-      instance->checksum = blockChecksum();
-    }
-    memory_->unlock();
-    if (memory_->isAttached()) {
-      memory_->detach();
-    }
-  }
-
-}
-
-QString SingleApplicationPrivateClass::getUsername() {
-
-#ifdef Q_OS_UNIX
-  QString username;
-#if defined(HAVE_GETEUID) && defined(HAVE_GETPWUID)
-  struct passwd *pw = getpwuid(geteuid());
-  if (pw) {
-    username = QString::fromLocal8Bit(pw->pw_name);
-  }
-#endif
-  if (username.isEmpty()) {
-#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
-    username = qEnvironmentVariable("USER");
-#else
-    username = QString::fromLocal8Bit(qgetenv("USER"));
-#endif
-  }
-  return username;
-#endif
-
-#ifdef Q_OS_WIN
-  wchar_t username[UNLEN + 1];
-  // Specifies size of the buffer on input
-  DWORD usernameLength = UNLEN + 1;
-  if (GetUserNameW(username, &usernameLength)) {
-    return QString::fromWCharArray(username);
-  }
-#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
-  return qEnvironmentVariable("USERNAME");
-#else
-  return QString::fromLocal8Bit(qgetenv("USERNAME"));
-#endif
-#endif
-
-}
-
-void SingleApplicationPrivateClass::genBlockServerName() {
-
-  QCryptographicHash appData(QCryptographicHash::Sha256);
-  appData.addData("SingleApplication");
-  appData.addData(SingleApplicationClass::applicationName().toUtf8());
-  appData.addData(SingleApplicationClass::organizationName().toUtf8());
-  appData.addData(SingleApplicationClass::organizationDomain().toUtf8());
-
-  if (!(options_ & SingleApplicationClass::Mode::ExcludeAppVersion)) {
-    appData.addData(SingleApplicationClass::applicationVersion().toUtf8());
-  }
-
-  if (!(options_ & SingleApplicationClass::Mode::ExcludeAppPath)) {
-#if defined(Q_OS_UNIX)
-    const QByteArray appImagePath = qgetenv("APPIMAGE");
-    if (appImagePath.isEmpty()) {
-      appData.addData(SingleApplicationClass::applicationFilePath().toUtf8());
-    }
-    else {
-      appData.addData(appImagePath);
-    }
-#elif defined(Q_OS_WIN)
-    appData.addData(SingleApplicationClass::applicationFilePath().toLower().toUtf8());
-#else
-    appData.addData(SingleApplicationClass::applicationFilePath().toUtf8());
-#endif
-  }
-
-  // User level block requires a user specific data in the hash
-  if (options_ & SingleApplicationClass::Mode::User) {
-    appData.addData(getUsername().toUtf8());
-  }
-
-  // Replace the backslash in RFC 2045 Base64 [a-zA-Z0-9+/=] to comply with server naming requirements.
-  blockServerName_ = appData.result().toBase64().replace("/", "_");
-
-}
-
-void SingleApplicationPrivateClass::initializeMemoryBlock() const {
-
-  InstancesInfo *instance = static_cast<InstancesInfo*>(memory_->data());
-  instance->primary = false;
-  instance->secondary = 0;
-  instance->primaryPid = -1;
-  instance->primaryUser[0] = '\0';
-  instance->checksum = blockChecksum();
-
-}
-
-void SingleApplicationPrivateClass::startPrimary() {
-
-  // Reset the number of connections
-  InstancesInfo *instance = static_cast<InstancesInfo*>(memory_->data());
-
-  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
-  QLocalServer::removeServer(blockServerName_);
-  server_ = new QLocalServer(this);
-
-  // Restrict access to the socket according to the SingleApplication::Mode::User flag on User level or no restrictions
-  if (options_ & SingleApplicationClass::Mode::User) {
-    server_->setSocketOptions(QLocalServer::UserAccessOption);
-  }
-  else {
-    server_->setSocketOptions(QLocalServer::WorldAccessOption);
-  }
-
-  server_->listen(blockServerName_);
-  QObject::connect(server_, &QLocalServer::newConnection, this, &SingleApplicationPrivateClass::slotConnectionEstablished);
-
-}
-
-void SingleApplicationPrivateClass::startSecondary() {
-
-  InstancesInfo *instance = static_cast<InstancesInfo*>(memory_->data());
-
-  instance->secondary += 1;
-  instance->checksum = blockChecksum();
-  instanceNumber_ = instance->secondary;
-
-}
-
-bool SingleApplicationPrivateClass::connectToPrimary(const int timeout, const ConnectionType connectionType) {
-
-  // Connect to the Local Server of the Primary Instance if not already connected.
-  if (socket_ == nullptr) {
-    socket_ = new QLocalSocket(this);
-  }
-
-  if (socket_->state() == QLocalSocket::ConnectedState) return true;
-
-  QElapsedTimer time;
-  time.start();
-
-  if (socket_->state() != QLocalSocket::ConnectedState) {
-
-    forever {
-      randomSleep();
-
-      if (socket_->state() != QLocalSocket::ConnectingState) {
-        socket_->connectToServer(blockServerName_);
-      }
-
-      if (socket_->state() == QLocalSocket::ConnectingState) {
-        socket_->waitForConnected(static_cast<int>(timeout - time.elapsed()));
-      }
-
-      // If connected break out of the loop
-      if (socket_->state() == QLocalSocket::ConnectedState) break;
-
-      // If elapsed time since start is longer than the method timeout return
-      if (time.elapsed() >= timeout) return false;
-    }
-  }
-
-  // Initialization message according to the SingleApplication protocol
-  QByteArray initMsg;
-  QDataStream writeStream(&initMsg, QIODevice::WriteOnly);
-  writeStream.setVersion(QDataStream::Qt_5_8);
-
-  writeStream << blockServerName_.toLatin1();
-  writeStream << static_cast<quint8>(connectionType);
-  writeStream << instanceNumber_;
-
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-  quint16 checksum = qChecksum(QByteArray(initMsg, static_cast<quint32>(initMsg.length())));
-#else
-  quint16 checksum = qChecksum(initMsg.constData(), static_cast<quint32>(initMsg.length()));
-#endif
-
-  writeStream << checksum;
-
-  return writeConfirmedMessage(static_cast<int>(timeout - time.elapsed()), initMsg);
-
-}
-
-void SingleApplicationPrivateClass::writeAck(QLocalSocket *sock) {
-  sock->putChar('\n');
-}
-
-bool SingleApplicationPrivateClass::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 SingleApplicationPrivateClass::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 SingleApplicationPrivateClass::blockChecksum() const {
-
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-  quint16 checksum = qChecksum(QByteArray(static_cast<const char*>(memory_->constData()), offsetof(InstancesInfo, checksum)));
-#else
-  quint16 checksum = qChecksum(static_cast<const char*>(memory_->constData()), offsetof(InstancesInfo, checksum));
-#endif
-
-  return checksum;
-
-}
-
-qint64 SingleApplicationPrivateClass::primaryPid() const {
-
-  memory_->lock();
-  InstancesInfo *instance = static_cast<InstancesInfo*>(memory_->data());
-  qint64 pid = instance->primaryPid;
-  memory_->unlock();
-
-  return pid;
-
-}
-
-QString SingleApplicationPrivateClass::primaryUser() const {
-
-  memory_->lock();
-  InstancesInfo *instance = static_cast<InstancesInfo*>(memory_->data());
-  QByteArray username = instance->primaryUser;
-  memory_->unlock();
-
-  return QString::fromUtf8(username);
-
-}
-
-/**
- * @brief Executed when a connection has been made to the LocalServer
- */
-void SingleApplicationPrivateClass::slotConnectionEstablished() {
-
-  QLocalSocket *nextConnSocket = server_->nextPendingConnection();
-  connectionMap_.insert(nextConnSocket, ConnectionInfo());
-
-  QObject::connect(nextConnSocket, &QLocalSocket::aboutToClose, this, [this, nextConnSocket]() {
-    const ConnectionInfo &info = connectionMap_[nextConnSocket];
-    slotClientConnectionClosed(nextConnSocket, info.instanceId);
-  });
-
-  QObject::connect(nextConnSocket, &QLocalSocket::disconnected, nextConnSocket, &QLocalSocket::deleteLater);
-
-  QObject::connect(nextConnSocket, &QLocalSocket::destroyed, this, [this, nextConnSocket]() {
-    connectionMap_.remove(nextConnSocket);
-  });
-
-  QObject::connect(nextConnSocket, &QLocalSocket::readyRead, this, [this, nextConnSocket]() {
-    const ConnectionInfo &info = connectionMap_[nextConnSocket];
-    switch (info.stage) {
-      case StageInitHeader:
-        readMessageHeader(nextConnSocket, StageInitBody);
-        break;
-      case StageInitBody:
-        readInitMessageBody(nextConnSocket);
-        break;
-      case StageConnectedHeader:
-        readMessageHeader(nextConnSocket, StageConnectedBody);
-        break;
-      case StageConnectedBody:
-        slotDataAvailable(nextConnSocket, info.instanceId);
-        break;
-      default:
-        break;
-    }
-  });
-
-}
-
-void SingleApplicationPrivateClass::readMessageHeader(QLocalSocket *sock, const SingleApplicationPrivateClass::ConnectionStage nextStage) {
-
-  if (!connectionMap_.contains(sock)) {
-    return;
-  }
-
-  if (sock->bytesAvailable() < static_cast<qint64>(sizeof(quint64))) {
-    return;
-  }
-
-  QDataStream headerStream(sock);
-  headerStream.setVersion(QDataStream::Qt_5_8);
-
-  // Read the header to know the message length
-  quint64 msgLen = 0;
-  headerStream >> msgLen;
-  ConnectionInfo &info = connectionMap_[sock];
-  info.stage = nextStage;
-  info.msgLen = msgLen;
-
-  writeAck(sock);
-
-}
-
-bool SingleApplicationPrivateClass::isFrameComplete(QLocalSocket *sock) {
-
-  if (!connectionMap_.contains(sock)) {
-    return false;
-  }
-
-  const ConnectionInfo &info = connectionMap_[sock];
-  return (sock->bytesAvailable() >= static_cast<qint64>(info.msgLen));
-
-}
-
-void SingleApplicationPrivateClass::readInitMessageBody(QLocalSocket *sock) {
-
-  Q_Q(SingleApplicationClass);
-
-  if (!isFrameComplete(sock)) {
-    return;
-  }
-
-  // Read the message body
-  QByteArray msgBytes = sock->readAll();
-  QDataStream readStream(msgBytes);
-  readStream.setVersion(QDataStream::Qt_5_8);
-
-  // server name
-  QByteArray latin1Name;
-  readStream >> latin1Name;
-
-  // connection type
-  quint8 connTypeVal = InvalidConnection;
-  readStream >> connTypeVal;
-  const ConnectionType connectionType = static_cast<ConnectionType>(connTypeVal);
-
-  // instance id
-  quint32 instanceId = 0;
-  readStream >> instanceId;
-
-  // checksum
-  quint16 msgChecksum = 0;
-  readStream >> msgChecksum;
-
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-  const quint16 actualChecksum = qChecksum(QByteArray(msgBytes, static_cast<quint32>(msgBytes.length() - sizeof(quint16))));
-#else
-  const quint16 actualChecksum = qChecksum(msgBytes.constData(), static_cast<quint32>(msgBytes.length() - sizeof(quint16)));
-#endif
-
-  bool isValid = readStream.status() == QDataStream::Ok && QLatin1String(latin1Name) == blockServerName_ && msgChecksum == actualChecksum;
-
-  if (!isValid) {
-    sock->close();
-    return;
-  }
-
-  ConnectionInfo &info = connectionMap_[sock];
-  info.instanceId = instanceId;
-  info.stage = StageConnectedHeader;
-
-  if (connectionType == NewInstance || (connectionType == SecondaryInstance && options_ & SingleApplicationClass::Mode::SecondaryNotification)) {
-    emit q->instanceStarted();
-  }
-
-  writeAck(sock);
-
-}
-
-void SingleApplicationPrivateClass::slotDataAvailable(QLocalSocket *dataSocket, const quint32 instanceId) {
-
-  Q_Q(SingleApplicationClass);
-
-  if (!isFrameComplete(dataSocket)) {
-    return;
-  }
-
-  const QByteArray message = dataSocket->readAll();
-
-  writeAck(dataSocket);
-
-  ConnectionInfo &info = connectionMap_[dataSocket];
-  info.stage = StageConnectedHeader;
-
-  emit q->receivedMessage(instanceId, message);
-
-}
-
-void SingleApplicationPrivateClass::slotClientConnectionClosed(QLocalSocket *closedSocket, const quint32 instanceId) {
-
-  if (closedSocket->bytesAvailable() > 0) {
-    slotDataAvailable(closedSocket, instanceId);
-  }
-
-}
-
-void SingleApplicationPrivateClass::randomSleep() {
-
-#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
-  QThread::msleep(QRandomGenerator::global()->bounded(8U, 18U));
-#else
-  qsrand(QDateTime::currentMSecsSinceEpoch() % std::numeric_limits<uint>::max());
-  QThread::msleep(qrand() % 11 + 8);
-#endif
-
-}

3rdparty/singleapplication/singleapplication_p.h

@@ -1,117 +0,0 @@
-// The MIT License (MIT)
-//
-// 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
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-//
-//  W A R N I N G !!!
-//  -----------------
-//
-// This is a modified version of SingleApplication,
-// The original version is at:
-//
-// https://github.com/itay-grudev/SingleApplication
-//
-//
-
-#ifndef SINGLEAPPLICATION_P_H
-#define SINGLEAPPLICATION_P_H
-
-#include <QtGlobal>
-#include <QObject>
-#include <QString>
-#include <QHash>
-
-#include "singleapplication_t.h"
-
-class QLocalServer;
-class QLocalSocket;
-class QSharedMemory;
-
-class SingleApplicationPrivateClass : public QObject {
-  Q_OBJECT
-
- public:
-  explicit SingleApplicationPrivateClass(SingleApplicationClass *ptr);
-  ~SingleApplicationPrivateClass() override;
-
-  enum ConnectionType : quint8 {
-    InvalidConnection = 0,
-    NewInstance = 1,
-    SecondaryInstance = 2,
-    Reconnect = 3
-  };
-  enum ConnectionStage : quint8 {
-    StageInitHeader = 0,
-    StageInitBody = 1,
-    StageConnectedHeader = 2,
-    StageConnectedBody = 3
-  };
-  Q_DECLARE_PUBLIC(SingleApplicationClass)
-
-  struct InstancesInfo {
-    explicit InstancesInfo() : primary(false), secondary(0), primaryPid(0), checksum(0) {}
-    bool primary;
-    quint32 secondary;
-    qint64 primaryPid;
-    char primaryUser[128];
-    quint16 checksum;
-  };
-
-  struct ConnectionInfo {
-    explicit ConnectionInfo() : msgLen(0), instanceId(0), stage(0) {}
-    quint64 msgLen;
-    quint32 instanceId;
-    quint8 stage;
-  };
-
-  static QString getUsername();
-  void genBlockServerName();
-  void initializeMemoryBlock() const;
-  void startPrimary();
-  void startSecondary();
-  bool connectToPrimary(const int timeout, const ConnectionType connectionType);
-  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 writeAck(QLocalSocket *sock);
-  bool writeConfirmedFrame(const int timeout, const QByteArray &msg) const;
-  bool writeConfirmedMessage(const int timeout, const QByteArray &msg) const;
-  static void randomSleep();
-
-  SingleApplicationClass *q_ptr;
-  QSharedMemory *memory_;
-  QLocalSocket *socket_;
-  QLocalServer *server_;
-  quint32 instanceNumber_;
-  QString blockServerName_;
-  SingleApplicationClass::Options options_;
-  QHash<QLocalSocket*, ConnectionInfo> connectionMap_;
-
- public slots:
-  void slotConnectionEstablished();
-  void slotDataAvailable(QLocalSocket*, const quint32);
-  void slotClientConnectionClosed(QLocalSocket*, const quint32);
-};
-
-#endif  // SINGLEAPPLICATION_P_H

3rdparty/singleapplication/singleapplication_t.cpp

@@ -1,330 +0,0 @@
-// The MIT License (MIT)
-//
-// 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
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-//
-//  W A R N I N G !!!
-//  -----------------
-//
-// This is a modified version of SingleApplication,
-// The original version is at:
-//
-// https://github.com/itay-grudev/SingleApplication
-//
-//
-
-#include <cstdlib>
-#include <limits>
-#include <memory>
-
-#include <boost/scope_exit.hpp>
-
-#include <QtGlobal>
-#include <QThread>
-#include <QSharedMemory>
-#include <QLocalSocket>
-#include <QByteArray>
-#include <QElapsedTimer>
-#include <QtDebug>
-#if QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)
-#  include <QNativeIpcKey>
-#endif
-
-#include "singleapplication_t.h"
-#include "singleapplication_p.h"
-
-/**
- * @brief Constructor. Checks and fires up LocalServer or closes the program if another instance already exists
- * @param argc
- * @param argv
- * @param allowSecondary Whether to enable secondary instance support
- * @param options Optional flags to toggle specific behaviour
- * @param timeout Maximum time blocking functions are allowed during app load
- */
-SingleApplicationClass::SingleApplicationClass(int &argc, char *argv[], const bool allowSecondary, const Options options, const int timeout)
-    : ApplicationClass(argc, argv),
-      d_ptr(new SingleApplicationPrivateClass(this)) {
-
-#if defined(SINGLEAPPLICATION)
-  Q_D(SingleApplication);
-#elif defined(SINGLECOREAPPLICATION)
-  Q_D(SingleCoreApplication);
-#endif
-
-  // Store the current mode of the program
-  d->options_ = options;
-
-  // Generating an application ID used for identifying the shared memory block and QLocalServer
-  d->genBlockServerName();
-
-  // To mitigate QSharedMemory issues with large amount of processes attempting to attach at the same time
-  SingleApplicationPrivateClass::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.
-  {
-#  if QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)
-    std::unique_ptr<QSharedMemory> memory = std::make_unique<QSharedMemory>(QNativeIpcKey(d->blockServerName_));
-#  else
-    std::unique_ptr<QSharedMemory> memory = std::make_unique<QSharedMemory>(d->blockServerName_);
-#  endif
-    if (memory->attach()) {
-      memory->detach();
-    }
-  }
-#endif
-
-  // Guarantee thread safe behaviour with a shared memory block.
-#if QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)
-  QSharedMemory *memory = new QSharedMemory(QNativeIpcKey(d->blockServerName_), this);
-#else
-  QSharedMemory *memory = new QSharedMemory(d->blockServerName_, this);
-#endif
-  d->memory_ = memory;
-
-  bool primary = false;
-
-  // Create a shared memory block
-  if (d->memory_->create(sizeof(SingleApplicationPrivateClass::InstancesInfo))) {
-    primary = true;
-  }
-  else if (d->memory_->error() == QSharedMemory::AlreadyExists) {
-    if (!d->memory_->attach()) {
-      qCritical() << "SingleApplication: Unable to attach to shared memory block:" << d->memory_->error() << d->memory_->errorString();
-      return;
-    }
-  }
-  else {
-    qCritical() << "SingleApplication: Unable to create shared memory block:" << d->memory_->error() << d->memory_->errorString();
-    return;
-  }
-
-  bool locked = false;
-
-  BOOST_SCOPE_EXIT((memory)(&locked)) {
-    if (locked && !memory->unlock()) {
-      qWarning() << "SingleApplication: Unable to unlock shared memory block:" << memory->error() << memory->errorString();
-      return;
-    }
-  }BOOST_SCOPE_EXIT_END
-
-  if (!d->memory_->lock()) {
-    qCritical() << "SingleApplication: Unable to lock shared memory block:" << d->memory_->error() << d->memory_->errorString();
-    return;
-  }
-  locked = true;
-
-  if (primary) {
-    // Initialize the shared memory block
-    d->initializeMemoryBlock();
-  }
-
-  SingleApplicationPrivateClass::InstancesInfo *instance = static_cast<SingleApplicationPrivateClass::InstancesInfo*>(d->memory_->data());
-  QElapsedTimer time;
-  time.start();
-
-  // Make sure the shared memory block is initialized and in a consistent state
-  while (d->blockChecksum() != instance->checksum) {
-
-    // If more than 5 seconds have elapsed, assume the primary instance crashed and assume its position
-    if (time.elapsed() > 5000) {
-      qWarning() << "SingleApplication: Shared memory block has been in an inconsistent state from more than 5 seconds. Assuming primary instance failure.";
-      d->initializeMemoryBlock();
-    }
-
-    // Otherwise wait for a random period and try again.
-    // The random sleep here limits the probability of a collision between two racing apps and allows the app to initialize faster
-    if (locked) {
-      if (d->memory_->unlock()) {
-        locked = false;
-      }
-      else {
-        qCritical() << "SingleApplication: Unable to unlock shared memory block for random wait:" << memory->error() << memory->errorString();
-        return;
-      }
-    }
-
-    SingleApplicationPrivateClass::randomSleep();
-
-    if (!d->memory_->lock()) {
-      qCritical() << "SingleApplication: Unable to lock shared memory block after random wait:" << memory->error() << memory->errorString();
-      return;
-    }
-    locked = true;
-
-  }
-
-  if (instance->primary) {
-    // Check if another instance can be started
-    if (allowSecondary) {
-      d->startSecondary();
-      if (d->options_ & Mode::SecondaryNotification) {
-        d->connectToPrimary(timeout, SingleApplicationPrivateClass::SecondaryInstance);
-      }
-    }
-  }
-  else {
-    d->startPrimary();
-    primary = true;
-  }
-
-  if (locked) {
-    if (d->memory_->unlock()) {
-      locked = false;
-    }
-    else {
-      qWarning() << "SingleApplication: Unable to unlock shared memory block:" << memory->error() << memory->errorString();
-    }
-  }
-
-  if (!primary && !allowSecondary) {
-    d->connectToPrimary(timeout, SingleApplicationPrivateClass::NewInstance);
-  }
-
-}
-
-SingleApplicationClass::~SingleApplicationClass() {
-
-#if defined(SINGLEAPPLICATION)
-  Q_D(SingleApplication);
-#elif defined(SINGLECOREAPPLICATION)
-  Q_D(SingleCoreApplication);
-#endif
-
-  delete d;
-
-}
-
-/**
- * Checks if the current application instance is primary.
- * @return Returns true if the instance is primary, false otherwise.
- */
-bool SingleApplicationClass::isPrimary() const {
-
-#if defined(SINGLEAPPLICATION)
-  Q_D(const SingleApplication);
-#elif defined(SINGLECOREAPPLICATION)
-  Q_D(const SingleCoreApplication);
-#endif
-
-  return d->server_ != nullptr;
-
-}
-
-/**
- * Checks if the current application instance is secondary.
- * @return Returns true if the instance is secondary, false otherwise.
- */
-bool SingleApplicationClass::isSecondary() const {
-
-#if defined(SINGLEAPPLICATION)
-  Q_D(const SingleApplication);
-#elif defined(SINGLECOREAPPLICATION)
-  Q_D(const SingleCoreApplication);
-#endif
-
-  return d->server_ == nullptr;
-
-}
-
-/**
- * Allows you to identify an instance by returning unique consecutive instance ids.
- * It is reset when the first (primary) instance of your app starts and only incremented afterwards.
- * @return Returns a unique instance id.
- */
-quint32 SingleApplicationClass::instanceId() const {
-
-#if defined(SINGLEAPPLICATION)
-  Q_D(const SingleApplication);
-#elif defined(SINGLECOREAPPLICATION)
-  Q_D(const SingleCoreApplication);
-#endif
-
-  return d->instanceNumber_;
-
-}
-
-/**
- * Returns the OS PID (Process Identifier) of the process running the primary instance.
- * Especially useful when SingleApplication is coupled with OS. specific APIs.
- * @return Returns the primary instance PID.
- */
-qint64 SingleApplicationClass::primaryPid() const {
-
-#if defined(SINGLEAPPLICATION)
-  Q_D(const SingleApplication);
-#elif defined(SINGLECOREAPPLICATION)
-  Q_D(const SingleCoreApplication);
-#endif
-
-  return d->primaryPid();
-
-}
-
-/**
- * Returns the username the primary instance is running as.
- * @return Returns the username the primary instance is running as.
- */
-QString SingleApplicationClass::primaryUser() const {
-
-#if defined(SINGLEAPPLICATION)
-  Q_D(const SingleApplication);
-#elif defined(SINGLECOREAPPLICATION)
-  Q_D(const SingleCoreApplication);
-#endif
-
-  return d->primaryUser();
-
-}
-
-/**
- * Returns the username the current instance is running as.
- * @return Returns the username the current instance is running as.
- */
-QString SingleApplicationClass::currentUser() const {
-  return SingleApplicationPrivateClass::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 successfully, false otherwise.
- */
-bool SingleApplicationClass::sendMessage(const QByteArray &message, const int timeout) {
-
-#if defined(SINGLEAPPLICATION)
-  Q_D(SingleApplication);
-#elif defined(SINGLECOREAPPLICATION)
-  Q_D(SingleCoreApplication);
-#endif
-
-  // Nobody to connect to
-  if (isPrimary()) return false;
-
-  // Make sure the socket is connected
-  if (!d->connectToPrimary(timeout, SingleApplicationPrivateClass::Reconnect)) {
-    return false;
-  }
-
-  return d->writeConfirmedMessage(timeout, message);
-
-}

3rdparty/singleapplication/singleapplication_t.h

@@ -1,172 +0,0 @@
-// The MIT License (MIT)
-//
-// 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
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-//
-//  W A R N I N G !!!
-//  -----------------
-//
-// This is a modified version of SingleApplication,
-// The original version is at:
-//
-// https://github.com/itay-grudev/SingleApplication
-//
-//
-
-#ifndef SINGLEAPPLICATION_T_H
-#define SINGLEAPPLICATION_T_H
-
-#include <QtGlobal>
-
-#undef ApplicationClass
-#undef SingleApplicationClass
-#undef SingleApplicationPrivateClass
-
-#if defined(SINGLEAPPLICATION)
-#  include <QApplication>
-#  define ApplicationClass QApplication
-#  define SingleApplicationClass SingleApplication
-#  define SingleApplicationPrivateClass SingleApplicationPrivate
-#elif defined(SINGLECOREAPPLICATION)
-#  include <QCoreApplication>
-#  define ApplicationClass QCoreApplication
-#  define SingleApplicationClass SingleCoreApplication
-#  define SingleApplicationPrivateClass SingleCoreApplicationPrivate
-#else
-#  error "Define SINGLEAPPLICATION or SINGLECOREAPPLICATION."
-#endif
-
-#include <QFlags>
-#include <QByteArray>
-
-class SingleApplicationPrivateClass;
-
-/**
- * @brief The SingleApplication class handles multiple instances of the same Application
- * @see QApplication
- */
-class SingleApplicationClass : public ApplicationClass {  // clazy:exclude=ctor-missing-parent-argument
-  Q_OBJECT
-
- public:
-  /**
-   * @brief Mode of operation of SingleApplication.
-   * Whether the block should be user-wide or system-wide and whether the
-   * primary instance should be notified when a secondary instance had been
-   * started.
-   * @note Operating system can restrict the shared memory blocks to the same
-   * user, in which case the User/System modes will have no effect and the
-   * block will be user wide.
-   * @enum
-   */
-  enum class Mode {
-    User = 1 << 0,
-    System = 1 << 1,
-    SecondaryNotification = 1 << 2,
-    ExcludeAppVersion = 1 << 3,
-    ExcludeAppPath = 1 << 4
-  };
-  Q_DECLARE_FLAGS(Options, Mode)
-
-  /**
-   * @brief Intitializes a SingleApplication instance with argc command line
-   * arguments in argv
-   * @arg {int &} argc - Number of arguments in argv
-   * @arg {const char *[]} argv - Supplied command line arguments
-   * @arg {bool} allowSecondary - Whether to start the instance as secondary
-   * if there is already a primary instance.
-   * @arg {Mode} mode - Whether for the SingleApplication block to be applied
-   * User wide or System wide.
-   * @arg {int} timeout - Timeout to wait in milliseconds.
-   * @note argc and argv may be changed as Qt removes arguments that it
-   * recognizes
-   * @note Mode::SecondaryNotification only works if set on both the primary
-   * instance and the secondary instance.
-   * @note The timeout is just a hint for the maximum time of blocking
-   * operations. It does not guarantee that the SingleApplication
-   * initialization will be completed in given time, though is a good hint.
-   * Usually 4*timeout would be the worst case (fail) scenario.
-   */
-  explicit SingleApplicationClass(int &argc, char *argv[], const bool allowSecondary = false, const Options options = Mode::User, const int timeout = 1000);
-  ~SingleApplicationClass() override;
-
-  /**
-   * @brief Returns if the instance is the primary instance
-   * @returns {bool}
-   */
-  bool isPrimary() const;
-
-  /**
-   * @brief Returns if the instance is a secondary instance
-   * @returns {bool}
-   */
-  bool isSecondary() const;
-
-  /**
-   * @brief Returns a unique identifier for the current instance
-   * @returns {qint32}
-   */
-  quint32 instanceId() const;
-
-  /**
-   * @brief Returns the process ID (PID) of the primary instance
-   * @returns {qint64}
-   */
-  qint64 primaryPid() const;
-
-  /**
-   * @brief Returns the username of the user running the primary instance
-   * @returns {QString}
-   */
-  QString primaryUser() const;
-
-  /**
-   * @brief Returns the username of the current user
-   * @returns {QString}
-   */
-  QString currentUser() const;
-
-  /**
-   * @brief Sends a message to the primary instance. Returns true on success.
-   * @param {int} timeout - Timeout for connecting
-   * @returns {bool}
-   * @note sendMessage() will return false if invoked from the primary
-   * instance.
-   */
-  bool sendMessage(const QByteArray &message, const int timeout = 1000);
-
- signals:
-  void instanceStarted();
-  void receivedMessage(quint32 instanceId, QByteArray message);
-
- private:
-  SingleApplicationPrivateClass *d_ptr;
-#if defined(SINGLEAPPLICATION)
-  Q_DECLARE_PRIVATE(SingleApplication)
-#elif defined(SINGLECOREAPPLICATION)
-  Q_DECLARE_PRIVATE(SingleCoreApplication)
-#endif
-  void abortSafely();
-};
-
-Q_DECLARE_OPERATORS_FOR_FLAGS(SingleApplicationClass::Options)
-
-#endif  // SINGLEAPPLICATION_T_H

3rdparty/singleapplication/singlecoreapplication/CMakeLists.txt

@@ -1,17 +0,0 @@
-cmake_minimum_required(VERSION 3.7)
-
-add_definitions(-DSINGLECOREAPPLICATION)
-
-set(SOURCES ../singleapplication_t.cpp ../singleapplication_p.cpp)
-set(HEADERS ../singleapplication_t.h ../singleapplication_p.h)
-qt_wrap_cpp(MOC ${HEADERS})
-add_library(singlecoreapplication STATIC ${SOURCES} ${MOC})
-target_include_directories(singlecoreapplication PUBLIC
-  ${CMAKE_CURRENT_SOURCE_DIR}/..
-  ${CMAKE_CURRENT_BINARY_DIR}/..
-  ${Boost_INCLUDE_DIRS}
-)
-target_link_libraries(singlecoreapplication PUBLIC
-  ${QtCore_LIBRARIES}
-  ${QtNetwork_LIBRARIES}
-)

3rdparty/singleapplication/singlecoreapplication/singlecoreapplication.h

@@ -1,13 +0,0 @@
-#ifndef SINGLECOREAPPLICATION_H
-#define SINGLECOREAPPLICATION_H
-
-#ifdef SINGLECOREAPPLICATION
-#  error "SINGLECOREAPPLICATION already defined."
-#endif
-
-#define SINGLECOREAPPLICATION
-#include "../singleapplication_t.h"
-#undef SINGLEAPPLICATION_T_H
-#undef SINGLECOREAPPLICATION
-
-#endif  // SINGLECOREAPPLICATION_H

CMakeLists.txt

@@ -102,12 +102,12 @@ endif()
 option(USE_ICU "Use ICU" ON)
 
 find_package(PkgConfig REQUIRED)
-find_package(Boost REQUIRED)
-find_package(Threads)
+find_package(Threads REQUIRED)
 find_package(Backtrace)
 if(Backtrace_FOUND)
   set(HAVE_BACKTRACE ON)
 endif()
+find_package(Boost REQUIRED)
 if(USE_ICU)
   find_package(ICU COMPONENTS uc i18n REQUIRED)
   if(ICU_FOUND)
@@ -116,10 +116,12 @@ if(USE_ICU)
 else()
   find_package(Iconv)
 endif()
-find_package(GnuTLS REQUIRED)
-find_package(Protobuf REQUIRED)
-if(NOT Protobuf_PROTOC_EXECUTABLE)
-  message(FATAL_ERROR "Missing protobuf compiler.")
+find_package(Protobuf CONFIG)
+if(NOT Protobuf_FOUND)
+  find_package(Protobuf REQUIRED)
+endif()
+if(NOT TARGET protobuf::protoc)
+  message(FATAL_ERROR "Missing Protobuf compiler.")
 endif()
 if(LINUX)
   find_package(ALSA REQUIRED)
@@ -160,84 +162,52 @@ find_package(FFTW3)
 find_package(GTest)
 find_library(GMOCK_LIBRARY gmock)
 
-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(QT_MAJOR_VERSION)
-  set(QT_VERSION_MAJOR ${QT_MAJOR_VERSION})
+if(BUILD_WITH_QT6)
+  set(QT_VERSION_MAJOR 6)
+elseif(BUILD_WITH_QT5)
+  set(QT_VERSION_MAJOR 5)
 endif()
 
-if(QT_VERSION_MAJOR)
-  set(QT_DEFAULT_MAJOR_VERSION ${QT_VERSION_MAJOR})
+if(NOT QT_VERSION_MAJOR)
+  message(STATUS "QT_VERSION_MAJOR, BUILD_WITH_QT5 or BUILD_WITH_QT6 not set, detecting Qt version...")
+  find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED)
 endif()
+
+if(QT_VERSION_MAJOR EQUAL 6)
+  set(QT_MIN_VERSION 6.0)
+elseif(QT_VERSION_MAJOR EQUAL 5)
+  set(QT_MIN_VERSION 5.12)
+else()
+  message(FATAL_ERROR "Invalid QT_VERSION_MAJOR.")
+endif()
+
+set(QT_DEFAULT_MAJOR_VERSION ${QT_VERSION_MAJOR})
+
 set(QT_COMPONENTS Core Concurrent Gui Widgets Network Sql)
+set(QT_OPTIONAL_COMPONENTS LinguistTools Test)
 if(DBUS_FOUND AND NOT WIN32)
   list(APPEND QT_COMPONENTS DBus)
 endif()
-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()
+if(X11_FOUND AND QT_VERSION_MAJOR EQUAL 5)
+  list(APPEND QT_COMPONENTS X11Extras)
 endif()
 
-if(QT_VERSION_MAJOR)
-  set(QT_DEFAULT_MAJOR_VERSION ${QT_VERSION_MAJOR})
-endif()
+find_package(Qt${QT_VERSION_MAJOR} ${QT_MIN_VERSION} COMPONENTS ${QT_COMPONENTS} REQUIRED OPTIONAL_COMPONENTS ${QT_OPTIONAL_COMPONENTS})
 
-if(X11_FOUND AND BUILD_WITH_QT5)
-  list(APPEND QT_OPTIONAL_COMPONENTS X11Extras)
-endif()
-
-find_package(Qt${QT_VERSION_MAJOR} ${QT_MIN_VERSION} REQUIRED COMPONENTS ${QT_COMPONENTS} OPTIONAL_COMPONENTS ${QT_OPTIONAL_COMPONENTS})
-
-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(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_VERSION_MAJOR}Test_FOUND)
-  set(QtTest_LIBRARIES Qt${QT_VERSION_MAJOR}::Test)
-endif()
-
-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)
+  get_target_property(QT_LCONVERT_EXECUTABLE Qt${QT_VERSION_MAJOR}::lconvert LOCATION)
+endif()
+if(Qt${QT_VERSION_MAJOR}X11Extras_FOUND)
+  set(HAVE_X11EXTRAS ON)
 endif()
 
-if(BUILD_WITH_QT5 AND Qt5Core_VERSION VERSION_LESS 5.15.0)
+if(QT_VERSION_MAJOR EQUAL 5 AND Qt5Core_VERSION VERSION_LESS 5.15.0)
   macro(qt_add_resources)
     qt5_add_resources(${ARGN})
   endmacro()
@@ -276,6 +246,24 @@ if(X11_FOUND)
   else()
     message(STATUS "Missing qpa/qplatformnativeinterface.h header.")
   endif()
+
+  # Check for QX11Application (Qt 6 compiled with XCB).
+  if(QT_VERSION_MAJOR EQUAL 6 AND Qt6Gui_VERSION VERSION_GREATER_EQUAL 6.2.0)
+    set(CMAKE_REQUIRED_FLAGS "-std=c++17")
+    set(CMAKE_REQUIRED_LIBRARIES Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Gui)
+    check_cxx_source_compiles("
+    #include <QGuiApplication>
+    int main() {
+      (void)qApp->nativeInterface<QNativeInterface::QX11Application>();
+      return 0;
+    }
+    "
+      HAVE_QX11APPLICATION
+      )
+    unset(CMAKE_REQUIRED_FLAGS)
+    unset(CMAKE_REQUIRED_LIBRARIES)
+  endif()
+
 endif(X11_FOUND)
 
 option(USE_TAGLIB "Build with TagLib" OFF)
@@ -305,42 +293,55 @@ if(USE_TAGPARSER)
   pkg_check_modules(TAGPARSER REQUIRED tagparser)
 endif()
 
+pkg_check_modules(LIBEBUR128 IMPORTED_TARGET libebur128)
+
 if(NOT TAGLIB_FOUND AND NOT TAGPARSER_FOUND)
   message(FATAL_ERROR "You need either TagLib or TagParser!")
 endif()
 
 # SingleApplication
-add_subdirectory(3rdparty/singleapplication)
-set(SINGLEAPPLICATION_INCLUDE_DIRS
-  ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/singleapplication/singleapplication
-  ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/singleapplication/singlecoreapplication
-)
-set(SINGLEAPPLICATION_LIBRARIES singleapplication)
-set(SINGLECOREAPPLICATION_LIBRARIES singlecoreapplication)
+if(QT_VERSION_MAJOR EQUAL 5)
+  set(KDSINGLEAPPLICATION_NAME "KDSingleApplication")
+else()
+  set(KDSINGLEAPPLICATION_NAME "KDSingleApplication-qt${QT_VERSION_MAJOR}")
+endif()
+find_package(${KDSINGLEAPPLICATION_NAME} 1.1.0)
+if(TARGET KDAB::kdsingleapplication)
+  if(QT_VERSION_MAJOR EQUAL 5)
+    set(KDSINGLEAPPLICATION_VERSION "${KDSingleApplication_VERSION}")
+  elseif(QT_VERSION_MAJOR EQUAL 6)
+    set(KDSINGLEAPPLICATION_VERSION "${KDSingleApplication-qt6_VERSION}")
+  endif()
+  message(STATUS "Using system KDSingleApplication (Version ${KDSINGLEAPPLICATION_VERSION})")
+  set(SINGLEAPPLICATION_LIBRARIES KDAB::kdsingleapplication)
+else()
+  message(STATUS "Using 3rdparty KDSingleApplication")
+  set(HAVE_KDSINGLEAPPLICATION_OPTIONS ON)
+  add_subdirectory(3rdparty/kdsingleapplication)
+  set(SINGLEAPPLICATION_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/kdsingleapplication/KDSingleApplication/src)
+  set(SINGLEAPPLICATION_LIBRARIES kdsingleapplication)
+  add_definitions(-DKDSINGLEAPPLICATION_STATIC_BUILD)
+endif()
 
 if(APPLE)
   add_subdirectory(3rdparty/SPMediaKeyTap)
   set(SPMEDIAKEYTAP_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/SPMediaKeyTap)
   set(SPMEDIAKEYTAP_LIBRARIES SPMediaKeyTap)
-  add_subdirectory(3rdparty/macdeployqt)
   add_subdirectory(ext/macdeploycheck)
 endif()
 
 if(WIN32)
-  if(BUILD_WITH_QT6)
-    pkg_check_modules(QTSPARKLE qtsparkle-qt6)
-  else()
-    pkg_check_modules(QTSPARKLE qtsparkle-qt5)
-  endif()
+  pkg_check_modules(QTSPARKLE qtsparkle-qt${QT_VERSION_MAJOR})
   if(QTSPARKLE_FOUND)
     set(HAVE_QTSPARKLE ON)
   endif()
 endif()
 
-if(WIN32 AND MSVC)
+if(WIN32)
   add_subdirectory(3rdparty/getopt)
   set(GETOPT_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/getopt)
   set(GETOPT_LIBRARIES getopt)
+  add_definitions(-DSTATIC_GETOPT -D_UNICODE)
 endif()
 
 if(WIN32 AND NOT MSVC)
@@ -364,6 +365,7 @@ optional_component(LIBPULSE ON "PulseAudio integration"
 
 optional_component(DBUS ON "D-Bus support"
   DEPENDS "D-Bus" DBUS_FOUND
+  DEPENDS "Qt D-Bus" Qt${QT_VERSION_MAJOR}DBus_FOUND
 )
 
 optional_component(GSTREAMER ON "Engine: GStreamer backend"
@@ -389,7 +391,7 @@ optional_component(MUSICBRAINZ ON "MusicBrainz integration"
   DEPENDS "gstreamer" HAVE_GSTREAMER
 )
 
-if(X11_FOUND OR HAVE_DBUS OR APPLE OR WIN32)
+if(X11_FOUND OR (HAVE_DBUS AND Qt${QT_VERSION_MAJOR}DBus_FOUND) OR APPLE OR WIN32)
   set(HAVE_GLOBALSHORTCUTS_SUPPORT ON)
 endif()
 
@@ -397,17 +399,13 @@ optional_component(GLOBALSHORTCUTS ON "Global shortcuts"
   DEPENDS "D-Bus, X11, Windows or macOS" HAVE_GLOBALSHORTCUTS_SUPPORT
 )
 
-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
-  )
+if(HAVE_QX11APPLICATION OR HAVE_X11EXTRAS OR HAVE_QPA_QPLATFORMNATIVEINTERFACE_H)
+  set(X11_GLOBALSHORTCUTS_REQUIREMENT_FOUND ON)
 endif()
+optional_component(X11_GLOBALSHORTCUTS ON "X11 global shortcuts"
+  DEPENDS "X11" X11_FOUND
+  DEPENDS "QX11Application, X11Extras or qpa/qplatformnativeinterface.h header" X11_GLOBALSHORTCUTS_REQUIREMENT_FOUND
+)
 
 optional_component(AUDIOCD ON "Devices: Audio CD support"
   DEPENDS "libcdio" LIBCDIO_FOUND
@@ -415,7 +413,8 @@ optional_component(AUDIOCD ON "Devices: Audio CD support"
 )
 
 optional_component(UDISKS2 ON "Devices: UDisks2 backend"
-  DEPENDS "D-Bus support" DBUS_FOUND
+  DEPENDS "D-Bus" DBUS_FOUND
+  DEPENDS "Qt D-Bus" Qt${QT_VERSION_MAJOR}DBus_FOUND
 )
 
 optional_component(GIO ON "Devices: GIO device backend"
@@ -425,7 +424,7 @@ optional_component(GIO ON "Devices: GIO device backend"
 
 optional_component(GIO_UNIX ON "Devices: GIO device backend (Unix support)"
   DEPENDS "libgio-unix" GIO_UNIX_FOUND
-  DEPENDS "Unix" "UNIX"
+  DEPENDS "Unix or Windows" "NOT APPLE"
 )
 
 optional_component(LIBGPOD ON "Devices: iPod classic support"
@@ -437,17 +436,10 @@ optional_component(LIBMTP ON "Devices: MTP support"
   DEPENDS "libmtp" LIBMTP_FOUND
 )
 
-if(BUILD_WITH_QT6)
-  optional_component(TRANSLATIONS ON "Translations"
-    DEPENDS "gettext" GETTEXT_FOUND
-    DEPENDS "Qt6LinguistTools" Qt6LinguistTools_FOUND
-  )
-else()
-  optional_component(TRANSLATIONS ON "Translations"
-    DEPENDS "gettext" GETTEXT_FOUND
-    DEPENDS "Qt5LinguistTools" Qt5LinguistTools_FOUND
-  )
-endif()
+optional_component(TRANSLATIONS ON "Translations"
+  DEPENDS "gettext" GETTEXT_FOUND
+  DEPENDS "Qt LinguistTools" Qt${QT_VERSION_MAJOR}LinguistTools_FOUND
+)
 
 option(INSTALL_TRANSLATIONS "Install translations" OFF)
 
@@ -460,25 +452,22 @@ optional_component(MOODBAR ON "Moodbar"
   DEPENDS "gstreamer" HAVE_GSTREAMER
 )
 
-if(APPLE OR WIN32)
-  option(USE_BUNDLE "Bundle dependencies" ON)
-else()
-  option(USE_BUNDLE "Bundle dependencies" OFF)
-endif()
+optional_component(EBUR128 ON "EBU R 128 loudness normalization"
+  DEPENDS "libebur128" LIBEBUR128_FOUND
+  DEPENDS "gstreamer" HAVE_GSTREAMER
+)
 
-if(USE_BUNDLE AND NOT USE_BUNDLE_DIR)
-  if(LINUX)
-    set(USE_BUNDLE_DIR "../plugins")
-  endif()
-  if(APPLE)
-    set(USE_BUNDLE_DIR "../PlugIns")
-  endif()
+if(APPLE OR WIN32)
+  set(USE_BUNDLE_DEFAULT ON)
+else()
+  set(USE_BUNDLE_DEFAULT OFF)
 endif()
+option(USE_BUNDLE "Bundle dependencies" ${USE_BUNDLE_DEFAULT})
 
 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})
+  set(CMAKE_REQUIRED_LIBRARIES Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Sql)
   check_cxx_source_runs("
     #include <QSqlDatabase>
     #include <QSqlQuery>
@@ -510,6 +499,8 @@ if(NOT CMAKE_CROSSCOMPILING)
       SQLITE_FTS5_TEST
     )
   endif()
+  unset(CMAKE_REQUIRED_FLAGS)
+  unset(CMAKE_REQUIRED_LIBRARIES)
 endif()
 
 # Set up definitions
@@ -542,7 +533,7 @@ if(HAVE_MOODBAR)
   add_subdirectory(ext/gstmoodbar)
 endif()
 
-if(GTest_FOUND AND GMOCK_LIBRARY AND QtTest_LIBRARIES)
+if(GTest_FOUND AND GMOCK_LIBRARY AND Qt${QT_VERSION_MAJOR}Test_FOUND)
   add_subdirectory(tests)
 endif()
 

Changelog

@@ -2,6 +2,133 @@ Strawberry Music Player
 =======================
 ChangeLog
 
+Version 1.0.23 (2024.01.11):
+
+  Bugfixes:
+    * Fixed possible duplication of song entries after organizing (#1341).
+    * Fixed possible crash when connecting devices (#1313).
+    * Fixed playlist sorting of original year (#1349).
+    * (macOS) Fixed crash when adding collection directory (QTBUG-120469) (#1350).
+
+  Enhancements:
+    * Treat all stream errors as non-fatal (#1347).
+    * Require KDSingleApplication 1.1.0.
+    * Fix logging of restored unavailable songs.
+
+Version 1.0.22 (2023.12.09):
+
+  Bugfixes:
+    * Fixed KDSingleApplication cmake version check.
+    * Fixed KDSingleApplication Qt 5 detection (#1299).
+    * Fixed timer started in wrong thread (#1302).
+    * Fixed erratic seeking behaviour if buffer duration is set to zero (#1302).
+    * Fixed SCollection related crash on exit with Qt 5 (#1316).
+    * Fixed track about to end related crash on playback failure (#1332).
+    * Fixed playlist column widths not remembered if stretch mode is off with Qt 6.6.1 and higher (#1328).
+    * (Windows) Properly handle silent uninstall (#1323).
+
+  Enhancements:
+    * Increase thread priority for playback threads.
+    * Allow drag and drop of songs to favorite playlists.
+
+Version 1.0.21 (2023.10.21):
+
+  Bugfixes:
+    * Fixed seekbar position resetting to zero before showing actual position when seeking.
+    * Fixed compressed files showing up in collection (#1274).
+    * Fixed connecting devices (#1288).
+    * Fixed device schema missing ebur128 fields.
+    * Fixed collection search by tag not working with space between colon and search term (#1290).
+    * Fixed seeking when 5 seconds is remaining of the song resetting position to beginning (#1258).
+    * Fixed intermittent crash when seeking with Auto as output (#1123).
+    * (Windows) Fixed playlist header colors in dark mode (#1275).
+
+  Enhancements:
+    * Support using system KDSingleApplication when available.
+    * Improved lyrics matching.
+    * (macOS) Fully codesign binaries and DMG.
+
+Version 1.0.20 (2023.09.24):
+
+  Bugfixes:
+    * Fixed appdata validation.
+
+Version 1.0.19 (2023.09.24):
+
+  Bugfixes:
+    * Use shared pointers for objects to fix potential crashes on exit (#1239).
+    * Fixed smart playlist search not matching unrated songs (#1244).
+    * Fixed reading FMPS_Playcount for MP3 ID3v2 tags (#1248).
+    * Always stop playing after 100 errors to prevent flooding the error dialog (#1220).
+    * Fixed volume going to 100% when decreasing volume beyond zero (#1262).
+    * Fixed error dialog sometimes showing empty.
+    * (Windows) Removed broken volume sync (#1220).
+    * (Windows) Fixed shuttering / choppy audio (#1227).
+    * (macOS) Fixed missing search bars (#1221).
+
+  Enhancements:
+    * Add Mpris2 property to read/write rating (#1246).
+    * Capitalize playlist column names (#1264).
+    * Added lyrics from songlyrics.com, azlyrics.com, elyrics.net and lyricsmode.com.
+    * (Windows) Add gst-play-1.0.exe for debugging purposes.
+
+  New features
+    * Support performing song loudness analysis using `libebur128` (#1216).
+    * Support song playback loudness normalization, as per EBU R 128 (#1216).
+
+  Other:
+    * Removed last.fm HTTPS workaround and GnuTLS dependency
+    * Removed broken lyrics.com lyrics provider.
+    * (Windows) Use DirectSound as default sink.
+    * (Windows) Remove WASPI2 plugin because of GStreamer bug.
+
+Version 1.0.18 (2023.07.02):
+
+  Bugfixes:
+    * Fixed reading disc from QObuz songs (#1168).
+    * Fixed volume being reset on playback with PulseAudio (#1174).
+    * Fixed <br> tags in SQL query error message.
+    * Fixed compile with Qt 6 without XCB (QX11Application).
+    * Fixed smart playlist editor not properly loading search terms (#1172).
+    * Fixed use of fixed icon for playlist favorite star icon (#1178).
+    * Possible fix for collection thumbnails using disk cache having identical covers for albums with hashtag (#) in the album title (#1183).
+    * Fixed listenbrainz scrobbling for songs with multiple artist mbids.
+    * Fixed listenbrainz scrobbling for songs without duration.
+    * Fixed gapless playback sometimes not working.
+    * Fixed writing PNG images as embedded covers (#1209).
+    * Fixed greyscale album covers not working in OSD D-Bus (#1205).
+    * Fixed collection thumbnail disk cache with Qt 6.5.1 and newer.
+    * Fixed moodbar disk cache with Qt 6.5.1 and newer.
+    * Fixed playlist edit tag F2 shortcut only working for title tag (#1210).
+    * Append number to filename if the destination file already exist when transcoding audio (#1200).
+    * Fixed abseil linking issues with protobuf 1.22.0 and newer.
+    * (macOS) Fixed "Show this message" checkbox having no affect on Rosetta warning dialog (#1180).
+    * (macOS) Disable unused D-Bus.
+    * (Windows) Fixed command line options not working with diacritics (#1191).
+    * (Windows) Fixed issue with saving album covers in album directory being saved in temp directory instead.
+    * (Windows) Fixed crash when trying a play a song which doesn't exist, gstreamer issue #1683 (#1214).
+
+  Enhancements:
+    * Reduce memory overhead with album cover handling (#1046).
+    * Improved listenbrainz error handling.
+    * Show error dialog for listenbrainz errors similar to last.fm/libre.fm.
+    * Reduce NetworkAccessManager instances.
+    * Replace SingleApplication with KDSingleApplication.
+    * Require Qt 5.12 or higher.
+    * Add new database fields for art_embedded and art_unset.
+    * Rewrite album cover loader.
+    * Move cover filename settings from collection to covers settings.
+    * Add setting to set priorities for album cover types.
+    * Add rating filtering to playlist search (#1212).
+    * (Windows|MSVC) Add WSAPI2 plugin.
+
+Version 1.0.17 (2023.03.29):
+
+  Bugfixes:
+    * Fixed over-sized context album cover with device pixel ratio higher than 1.0 (#1166).
+    * Fixed playing widget fading from a blurry previous cover with device pixel ratio higher than 1.0.
+    * Made playlist source icon, album cover manager and OSD pretty cover respect device pixel ratio.
+
 Version 1.0.16 (2023.03.27):
 
   Bugfixes:

README.md

@@ -21,25 +21,27 @@ Resources:
   * Ubuntu Unstable PPA: https://launchpad.net/~jonaski/+archive/ubuntu/strawberry-unstable
   * Translations: https://translate.zanata.org/iteration/view/strawberry/master
 
-### :bangbang: Opening an issue:
+### :bangbang: Opening an issue
 
 * Read the FAQ: https://wiki.strawberrymusicplayer.org/wiki/FAQ
 * 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, 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/).
+* We do not maintain the Flatpak package. Do not report issues related to Flatpak unless the issue can be reproduced with a native package, use Flatpak support instead https://flatpak.org/about/
 
-### :moneybag:	Sponsoring:
+### :moneybag:	Sponsoring
 
 The program is free software, released under GPL. If you like this program and can make use of it, consider sponsoring or donating to help fund the project.
-There are currently 3 options for sponsoring:
+There are currently 4 options for sponsoring:
 
-1. [GitHub Sponsors](https://github.com/sponsors/jonaski)
+1. [GitHub](https://github.com/sponsors/jonaski)
 2. [Patreon](https://www.patreon.com/jonaskvinge)
-3. [PayPal](https://paypal.me/jonaskvinge)
+3. [Ko-fi](https://ko-fi.com/jonaskvinge)
+4. [PayPal](https://paypal.me/jonaskvinge)
 
 Funding developers is a way to contribute to open source projects you appreciate, it helps developers get the resources they need, and recognize contributors working behind the scenes to make open source better for everyone.
 
-### :heavy_check_mark: Features:
+### :heavy_check_mark: Features
 
   * Play and organize music
   * Supports WAV, FLAC, WavPack, Ogg FLAC, Ogg Vorbis, Ogg Opus, Ogg Speex, MPC, TrueAudio, AIFF, MP4, MP3, ASF and Monkey's Audio.
@@ -48,10 +50,11 @@ 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
+  * In-player song loudness analysis and song playback loudness normalization, as per EBU R 128
   * 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 [Lyrics.com](https://www.lyrics.com/), [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/)
+  * Song lyrics from [Genius](https://genius.com/), [Musixmatch](https://www.musixmatch.com/), [ChartLyrics](http://www.chartlyrics.com/), [lyrics.ovh](https://lyrics.ovh/), [lololyrics.com](https://www.lololyrics.com/), [songlyrics.com](https://www.songlyrics.com/), [azlyrics.com](https://www.azlyrics.com/), [elyrics.net](https://www.elyrics.net/) and [lyricsmode.com](https://www.lyricsmode.com/)
   * Support for multiple backends
   * Audio analyzer
   * Audio equalizer
@@ -62,7 +65,7 @@ Funding developers is a way to contribute to open source projects you appreciate
 
 It has so far been tested to work on Linux, OpenBSD, FreeBSD, macOS and Windows.
 
-**There currently isn't any macOS developers actively working on this project, so we might not be able to help you with issues related to macOS.**
+**macOS releases are currently limited to sponsors. This is because Strawberry mainly has one contributor/developer and supporting macOS requires Apple hardware, building libraries Strawberry depends and a Apple developer account for signing releases. If you are sponsoring strawberry through Patreon, releases are available directly on Patreon, if you are sponsoring through GitHub, Ko-fi or Paypal, please e-mail support@strawberrymusicplayer.org for access to downloads.**
 
 ### :heavy_exclamation_mark: Requirements
 
@@ -73,13 +76,12 @@ To build Strawberry from source you need the following installed on your system
 * [pkg-config](https://www.freedesktop.org/wiki/Software/pkg-config/) or [pkgconf](https://github.com/pkgconf/pkgconf)
 * [Boost](https://www.boost.org/)
 * [GLib](https://developer.gnome.org/glib/)
-* [Qt 6 or Qt 5.9 or higher with components Core, Gui, Widgets, Concurrent, Network and Sql](https://www.qt.io/)
+* [Qt 6 or Qt 5.12 or higher with components Core, Gui, Widgets, Concurrent, Network and Sql](https://www.qt.io/)
 * [SQLite 3.9 or newer with FTS5](https://www.sqlite.org)
 * [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 1.11.1 or higher](https://www.taglib.org/) or [TagParser](https://github.com/Martchus/tagparser)
 * [ICU](https://unicode-org.github.io/icu/)
 
@@ -91,6 +93,7 @@ Optional dependencies:
 * 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/)
+* EBU R 128 loudness normalization [libebur128](https://github.com/jiixyj/libebur128)
 
 You should also install the gstreamer plugins base and good, and optionally bad, ugly and libav to support all audio formats.
 
@@ -98,7 +101,7 @@ You should also install the gstreamer plugins base and good, and optionally bad,
 
 ### Get the code:
 
-    git clone https://github.com/strawberrymusicplayer/strawberry
+    git clone --recursive https://github.com/strawberrymusicplayer/strawberry
 
 ### Compile and install:
 
@@ -118,4 +121,3 @@ To compile on Windows with Visual Studio 2019 or 2022, see https://github.com/st
 ### :penguin:	Packaging status
 
 [![Packaging status](https://repology.org/badge/vertical-allrepos/strawberry.svg?exclude_unsupported=1)](https://repology.org/metapackage/strawberry/versions)
-

cmake/Dmg.cmake

@@ -1,5 +1,4 @@
-#find_program(MACDEPLOYQT_EXECUTABLE NAMES macdeployqt PATHS /usr/local/opt/qt6/bin /usr/local/opt/qt5/bin /usr/local/bin REQUIRED)
-set(MACDEPLOYQT_EXECUTABLE "${CMAKE_BINARY_DIR}/3rdparty/macdeployqt/macdeployqt")
+find_program(MACDEPLOYQT_EXECUTABLE NAMES macdeployqt PATHS /usr/bin /usr/local/bin /opt/local/bin /usr/local/opt/qt6/bin /usr/local/opt/qt5/bin REQUIRED)
 if(MACDEPLOYQT_EXECUTABLE)
   message(STATUS "Found macdeployqt: ${MACDEPLOYQT_EXECUTABLE}")
 else()
@@ -14,16 +13,23 @@ else()
 endif()
 
 if(MACDEPLOYQT_EXECUTABLE)
-  add_custom_target(copy_gstreamer_plugins
-    #COMMAND ${CMAKE_SOURCE_DIR}/dist/macos/macgstcopy.sh strawberry.app
-  )
+
+  if(APPLE_DEVELOPER_ID)
+    set(MACDEPLOYQT_CODESIGN -codesign=${APPLE_DEVELOPER_ID})
+    set(CREATEDMG_CODESIGN --codesign ${APPLE_DEVELOPER_ID})
+  endif()
+  if(CREATEDMG_SKIP_JENKINS)
+    set(CREATEDMG_SKIP_JENKINS_ARG "--skip-jenkins")
+  endif()
+
   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 ${CMAKE_SOURCE_DIR}/dist/macos/macgstcopy.sh ${CMAKE_BINARY_DIR}/strawberry.app
+    COMMAND ${MACDEPLOYQT_EXECUTABLE} strawberry.app -verbose=3 -executable=${CMAKE_BINARY_DIR}/strawberry.app/Contents/PlugIns/strawberry-tagreader -executable=${CMAKE_BINARY_DIR}/strawberry.app/Contents/PlugIns/gst-plugin-scanner ${MACDEPLOYQT_CODESIGN}
     WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-    DEPENDS strawberry strawberry-tagreader copy_gstreamer_plugins macdeployqt
+    DEPENDS strawberry strawberry-tagreader
   )
   add_custom_target(deploycheck
     COMMAND ${CMAKE_BINARY_DIR}/ext/macdeploycheck/macdeploycheck strawberry.app
@@ -31,9 +37,8 @@ if(MACDEPLOYQT_EXECUTABLE)
   )
   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
+      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 ${CREATEDMG_CODESIGN} ${CREATEDMG_SKIP_JENKINS_ARG} strawberry-${STRAWBERRY_VERSION_PACKAGE}-${CMAKE_HOST_SYSTEM_PROCESSOR}.dmg strawberry.app
       WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-      DEPENDS deploy deploycheck
     )
   endif()
 endif()

cmake/Translations.cmake

@@ -59,7 +59,7 @@ macro(add_po outfiles po_prefix)
     # Convert the .po files to .qm files
     add_custom_command(
       OUTPUT ${_qm_filepath}
-      COMMAND ${QT_LCONVERT_EXECUTABLE} ARGS ${_po_filepath} -o ${_qm_filepath} -of qm
+      COMMAND ${QT_LCONVERT_EXECUTABLE} ARGS ${_po_filepath} -o ${_qm_filepath} -of qm -target-language ${_lang}
       DEPENDS ${_po_filepath} ${_po_filepath}
     )
 

cmake/Version.cmake

@@ -1,6 +1,6 @@
 set(STRAWBERRY_VERSION_MAJOR 1)
 set(STRAWBERRY_VERSION_MINOR 0)
-set(STRAWBERRY_VERSION_PATCH 16)
+set(STRAWBERRY_VERSION_PATCH 23)
 #set(STRAWBERRY_VERSION_PRERELEASE rc1)
 
 set(INCLUDE_GIT_REVISION OFF)
@@ -25,7 +25,7 @@ if(INCLUDE_GIT_REVISION AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
 
   find_program(GIT_EXECUTABLE git)
   if(NOT GIT_EXECUTABLE OR GIT_EXECUTABLE-NOTFOUND)
-    message(FATAL_ERROR "Missing GIT executable." )
+    message(FATAL_ERROR "Missing Git executable." )
   endif()
 
   # Get the current working branch
@@ -48,7 +48,7 @@ if(INCLUDE_GIT_REVISION AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
   )
 
   if(NOT ${GIT_CMD_RESULT_REVISION} EQUAL 0)
-    message(FATAL_ERROR "GIT command failed to get revision string '${GIT_REVISION}'")
+    message(FATAL_ERROR "Git command failed to get revision string '${GIT_REVISION}'")
   endif()
 
 endif()
@@ -67,7 +67,7 @@ if(GIT_REVISION)
 
   list(LENGTH GIT_PARTS GIT_PARTS_LENGTH)
   if(NOT GIT_PARTS_LENGTH EQUAL 3)
-    message(FATAL_ERROR "Failed to parse git revision string '${GIT_REVISION}'")
+    set(GIT_PARTS "${majorminorpatch};0;${GIT_REVISION}")
   endif()
 
   list(GET GIT_PARTS 0 GIT_TAGNAME)

data/data.qrc

@@ -8,6 +8,8 @@
         <file>schema/schema-14.sql</file>
         <file>schema/schema-15.sql</file>
         <file>schema/schema-16.sql</file>
+        <file>schema/schema-17.sql</file>
+        <file>schema/schema-18.sql</file>
         <file>schema/device-schema.sql</file>
         <file>style/strawberry.css</file>
         <file>style/smartplaylistsearchterm.css</file>

data/schema/device-schema.sql

@@ -18,7 +18,7 @@ CREATE TABLE device_%deviceid_songs (
   track INTEGER NOT NULL DEFAULT -1,
   disc INTEGER NOT NULL DEFAULT -1,
   year INTEGER NOT NULL DEFAULT -1,
-  originalyear INTEGER NOT NULL DEFAULT 0,
+  originalyear INTEGER NOT NULL DEFAULT -1,
   genre TEXT,
   compilation INTEGER NOT NULL DEFAULT 0,
   composer TEXT,
@@ -59,8 +59,10 @@ CREATE TABLE device_%deviceid_songs (
   compilation_off INTEGER NOT NULL DEFAULT 0,
   compilation_effective INTEGER NOT NULL DEFAULT 0,
 
+  art_embedded INTEGER DEFAULT 0,
   art_automatic TEXT,
   art_manual TEXT,
+  art_unset INTEGER DEFAULT 0,
 
   effective_albumartist TEXT,
   effective_originalyear INTEGER NOT NULL DEFAULT 0,
@@ -81,7 +83,10 @@ CREATE TABLE device_%deviceid_songs (
   musicbrainz_track_id TEXT,
   musicbrainz_disc_id TEXT,
   musicbrainz_release_group_id TEXT,
-  musicbrainz_work_id TEXT
+  musicbrainz_work_id TEXT,
+
+  ebur128_integrated_loudness_lufs REAL,
+  ebur128_loudness_range_lu REAL
 
 );
 
@@ -94,4 +99,4 @@ CREATE VIRTUAL TABLE device_%deviceid_fts USING fts5(
   tokenize = "unicode61 remove_diacritics 1"
 );
 
-UPDATE devices SET schema_version=4 WHERE ROWID=%deviceid;
+UPDATE devices SET schema_version=5 WHERE ROWID=%deviceid;

data/schema/schema-17.sql

@@ -0,0 +1,45 @@
+ALTER TABLE songs ADD COLUMN art_embedded INTEGER DEFAULT 0;
+
+ALTER TABLE songs ADD COLUMN art_unset INTEGER DEFAULT 0;
+
+ALTER TABLE subsonic_songs ADD COLUMN art_embedded INTEGER DEFAULT 0;
+
+ALTER TABLE subsonic_songs ADD COLUMN art_unset INTEGER DEFAULT 0;
+
+ALTER TABLE tidal_artists_songs ADD COLUMN art_embedded INTEGER DEFAULT 0;
+
+ALTER TABLE tidal_artists_songs ADD COLUMN art_unset INTEGER DEFAULT 0;
+
+ALTER TABLE tidal_albums_songs ADD COLUMN art_embedded INTEGER DEFAULT 0;
+
+ALTER TABLE tidal_albums_songs ADD COLUMN art_unset INTEGER DEFAULT 0;
+
+ALTER TABLE tidal_songs ADD COLUMN art_embedded INTEGER DEFAULT 0;
+
+ALTER TABLE tidal_songs ADD COLUMN art_unset INTEGER DEFAULT 0;
+
+ALTER TABLE qobuz_artists_songs ADD COLUMN art_embedded INTEGER DEFAULT 0;
+
+ALTER TABLE qobuz_artists_songs ADD COLUMN art_unset INTEGER DEFAULT 0;
+
+ALTER TABLE qobuz_albums_songs ADD COLUMN art_embedded INTEGER DEFAULT 0;
+
+ALTER TABLE qobuz_albums_songs ADD COLUMN art_unset INTEGER DEFAULT 0;
+
+ALTER TABLE qobuz_songs ADD COLUMN art_embedded INTEGER DEFAULT 0;
+
+ALTER TABLE qobuz_songs ADD COLUMN art_unset INTEGER DEFAULT 0;
+
+ALTER TABLE playlist_items ADD COLUMN art_embedded INTEGER DEFAULT 0;
+
+ALTER TABLE playlist_items ADD COLUMN art_unset INTEGER DEFAULT 0;
+
+UPDATE songs SET art_embedded = 1 WHERE art_automatic = 'file:(embedded)';
+
+UPDATE songs SET art_automatic = '' WHERE art_automatic = 'file:(embedded)';
+
+UPDATE songs SET art_unset = 1 WHERE art_manual = 'file:(unset)';
+
+UPDATE songs SET art_manual = '' WHERE art_manual = 'file:(unset)';
+
+UPDATE schema_version SET version=17;

data/schema/schema-18.sql

@@ -0,0 +1,37 @@
+ALTER TABLE songs ADD COLUMN ebur128_integrated_loudness_lufs REAL;
+
+ALTER TABLE songs ADD COLUMN ebur128_loudness_range_lu REAL;
+
+ALTER TABLE subsonic_songs ADD COLUMN ebur128_integrated_loudness_lufs REAL;
+
+ALTER TABLE subsonic_songs ADD COLUMN ebur128_loudness_range_lu REAL;
+
+ALTER TABLE tidal_artists_songs ADD COLUMN ebur128_integrated_loudness_lufs REAL;
+
+ALTER TABLE tidal_artists_songs ADD COLUMN ebur128_loudness_range_lu REAL;
+
+ALTER TABLE tidal_albums_songs ADD COLUMN ebur128_integrated_loudness_lufs REAL;
+
+ALTER TABLE tidal_albums_songs ADD COLUMN ebur128_loudness_range_lu REAL;
+
+ALTER TABLE tidal_songs ADD COLUMN ebur128_integrated_loudness_lufs REAL;
+
+ALTER TABLE tidal_songs ADD COLUMN ebur128_loudness_range_lu REAL;
+
+ALTER TABLE qobuz_artists_songs ADD COLUMN ebur128_integrated_loudness_lufs REAL;
+
+ALTER TABLE qobuz_artists_songs ADD COLUMN ebur128_loudness_range_lu REAL;
+
+ALTER TABLE qobuz_albums_songs ADD COLUMN ebur128_integrated_loudness_lufs REAL;
+
+ALTER TABLE qobuz_albums_songs ADD COLUMN ebur128_loudness_range_lu REAL;
+
+ALTER TABLE qobuz_songs ADD COLUMN ebur128_integrated_loudness_lufs REAL;
+
+ALTER TABLE qobuz_songs ADD COLUMN ebur128_loudness_range_lu REAL;
+
+ALTER TABLE playlist_items ADD COLUMN ebur128_integrated_loudness_lufs REAL;
+
+ALTER TABLE playlist_items ADD COLUMN ebur128_loudness_range_lu REAL;
+
+UPDATE schema_version SET version=18;

data/schema/schema.sql

@@ -4,7 +4,7 @@ CREATE TABLE IF NOT EXISTS schema_version (
 
 DELETE FROM schema_version;
 
-INSERT INTO schema_version (version) VALUES (16);
+INSERT INTO schema_version (version) VALUES (18);
 
 CREATE TABLE IF NOT EXISTS directories (
   path TEXT NOT NULL,
@@ -67,8 +67,10 @@ CREATE TABLE IF NOT EXISTS songs (
   compilation_off INTEGER NOT NULL DEFAULT 0,
   compilation_effective INTEGER NOT NULL DEFAULT 0,
 
+  art_embedded INTEGER DEFAULT 0,
   art_automatic TEXT,
   art_manual TEXT,
+  art_unset INTEGER DEFAULT 0,
 
   effective_albumartist TEXT,
   effective_originalyear INTEGER NOT NULL DEFAULT 0,
@@ -89,7 +91,10 @@ CREATE TABLE IF NOT EXISTS songs (
   musicbrainz_track_id TEXT,
   musicbrainz_disc_id TEXT,
   musicbrainz_release_group_id TEXT,
-  musicbrainz_work_id TEXT
+  musicbrainz_work_id TEXT,
+
+  ebur128_integrated_loudness_lufs REAL,
+  ebur128_loudness_range_lu REAL
 
 );
 
@@ -143,8 +148,10 @@ CREATE TABLE IF NOT EXISTS subsonic_songs (
   compilation_off INTEGER NOT NULL DEFAULT 0,
   compilation_effective INTEGER NOT NULL DEFAULT 0,
 
+  art_embedded INTEGER DEFAULT 0,
   art_automatic TEXT,
   art_manual TEXT,
+  art_unset INTEGER DEFAULT 0,
 
   effective_albumartist TEXT,
   effective_originalyear INTEGER NOT NULL DEFAULT 0,
@@ -165,7 +172,10 @@ CREATE TABLE IF NOT EXISTS subsonic_songs (
   musicbrainz_track_id TEXT,
   musicbrainz_disc_id TEXT,
   musicbrainz_release_group_id TEXT,
-  musicbrainz_work_id TEXT
+  musicbrainz_work_id TEXT,
+
+  ebur128_integrated_loudness_lufs REAL,
+  ebur128_loudness_range_lu REAL
 
 );
 
@@ -219,8 +229,10 @@ CREATE TABLE IF NOT EXISTS tidal_artists_songs (
   compilation_off INTEGER NOT NULL DEFAULT 0,
   compilation_effective INTEGER NOT NULL DEFAULT 0,
 
+  art_embedded INTEGER DEFAULT 0,
   art_automatic TEXT,
   art_manual TEXT,
+  art_unset INTEGER DEFAULT 0,
 
   effective_albumartist TEXT,
   effective_originalyear INTEGER NOT NULL DEFAULT 0,
@@ -241,7 +253,10 @@ CREATE TABLE IF NOT EXISTS tidal_artists_songs (
   musicbrainz_track_id TEXT,
   musicbrainz_disc_id TEXT,
   musicbrainz_release_group_id TEXT,
-  musicbrainz_work_id TEXT
+  musicbrainz_work_id TEXT,
+
+  ebur128_integrated_loudness_lufs REAL,
+  ebur128_loudness_range_lu REAL
 
 );
 
@@ -295,8 +310,10 @@ CREATE TABLE IF NOT EXISTS tidal_albums_songs (
   compilation_off INTEGER NOT NULL DEFAULT 0,
   compilation_effective INTEGER NOT NULL DEFAULT 0,
 
+  art_embedded INTEGER DEFAULT 0,
   art_automatic TEXT,
   art_manual TEXT,
+  art_unset INTEGER DEFAULT 0,
 
   effective_albumartist TEXT,
   effective_originalyear INTEGER NOT NULL DEFAULT 0,
@@ -317,7 +334,10 @@ CREATE TABLE IF NOT EXISTS tidal_albums_songs (
   musicbrainz_track_id TEXT,
   musicbrainz_disc_id TEXT,
   musicbrainz_release_group_id TEXT,
-  musicbrainz_work_id TEXT
+  musicbrainz_work_id TEXT,
+
+  ebur128_integrated_loudness_lufs REAL,
+  ebur128_loudness_range_lu REAL
 
 );
 
@@ -371,8 +391,10 @@ CREATE TABLE IF NOT EXISTS tidal_songs (
   compilation_off INTEGER NOT NULL DEFAULT 0,
   compilation_effective INTEGER NOT NULL DEFAULT 0,
 
+  art_embedded INTEGER DEFAULT 0,
   art_automatic TEXT,
   art_manual TEXT,
+  art_unset INTEGER DEFAULT 0,
 
   effective_albumartist TEXT,
   effective_originalyear INTEGER NOT NULL DEFAULT 0,
@@ -393,7 +415,10 @@ CREATE TABLE IF NOT EXISTS tidal_songs (
   musicbrainz_track_id TEXT,
   musicbrainz_disc_id TEXT,
   musicbrainz_release_group_id TEXT,
-  musicbrainz_work_id TEXT
+  musicbrainz_work_id TEXT,
+
+  ebur128_integrated_loudness_lufs REAL,
+  ebur128_loudness_range_lu REAL
 
 );
 
@@ -447,8 +472,10 @@ CREATE TABLE IF NOT EXISTS qobuz_artists_songs (
   compilation_off INTEGER NOT NULL DEFAULT 0,
   compilation_effective INTEGER NOT NULL DEFAULT 0,
 
+  art_embedded INTEGER DEFAULT 0,
   art_automatic TEXT,
   art_manual TEXT,
+  art_unset INTEGER DEFAULT 0,
 
   effective_albumartist TEXT,
   effective_originalyear INTEGER NOT NULL DEFAULT 0,
@@ -469,7 +496,10 @@ CREATE TABLE IF NOT EXISTS qobuz_artists_songs (
   musicbrainz_track_id TEXT,
   musicbrainz_disc_id TEXT,
   musicbrainz_release_group_id TEXT,
-  musicbrainz_work_id TEXT
+  musicbrainz_work_id TEXT,
+
+  ebur128_integrated_loudness_lufs REAL,
+  ebur128_loudness_range_lu REAL
 
 );
 
@@ -523,8 +553,10 @@ CREATE TABLE IF NOT EXISTS qobuz_albums_songs (
   compilation_off INTEGER NOT NULL DEFAULT 0,
   compilation_effective INTEGER NOT NULL DEFAULT 0,
 
+  art_embedded INTEGER DEFAULT 0,
   art_automatic TEXT,
   art_manual TEXT,
+  art_unset INTEGER DEFAULT 0,
 
   effective_albumartist TEXT,
   effective_originalyear INTEGER NOT NULL DEFAULT 0,
@@ -545,7 +577,10 @@ CREATE TABLE IF NOT EXISTS qobuz_albums_songs (
   musicbrainz_track_id TEXT,
   musicbrainz_disc_id TEXT,
   musicbrainz_release_group_id TEXT,
-  musicbrainz_work_id TEXT
+  musicbrainz_work_id TEXT,
+
+  ebur128_integrated_loudness_lufs REAL,
+  ebur128_loudness_range_lu REAL
 
 );
 
@@ -599,8 +634,10 @@ CREATE TABLE IF NOT EXISTS qobuz_songs (
   compilation_off INTEGER NOT NULL DEFAULT 0,
   compilation_effective INTEGER NOT NULL DEFAULT 0,
 
+  art_embedded INTEGER DEFAULT 0,
   art_automatic TEXT,
   art_manual TEXT,
+  art_unset INTEGER DEFAULT 0,
 
   effective_albumartist TEXT,
   effective_originalyear INTEGER NOT NULL DEFAULT 0,
@@ -621,7 +658,10 @@ CREATE TABLE IF NOT EXISTS qobuz_songs (
   musicbrainz_track_id TEXT,
   musicbrainz_disc_id TEXT,
   musicbrainz_release_group_id TEXT,
-  musicbrainz_work_id TEXT
+  musicbrainz_work_id TEXT,
+
+  ebur128_integrated_loudness_lufs REAL,
+  ebur128_loudness_range_lu REAL
 
 );
 
@@ -695,8 +735,10 @@ CREATE TABLE IF NOT EXISTS playlist_items (
   compilation_off INTEGER DEFAULT 0,
   compilation_effective INTEGER DEFAULT 0,
 
+  art_embedded INTEGER DEFAULT 0,
   art_automatic TEXT,
   art_manual TEXT,
+  art_unset INTEGER DEFAULT 0,
 
   effective_albumartist TEXT,
   effective_originalyear INTEGER,
@@ -717,7 +759,10 @@ CREATE TABLE IF NOT EXISTS playlist_items (
   musicbrainz_track_id TEXT,
   musicbrainz_disc_id TEXT,
   musicbrainz_release_group_id TEXT,
-  musicbrainz_work_id TEXT
+  musicbrainz_work_id TEXT,
+
+  ebur128_integrated_loudness_lufs REAL,
+  ebur128_loudness_range_lu REAL
 
 );
 

data/style/strawberry.css

@@ -64,11 +64,3 @@ QToolButton::menu-button {
   width: 16px;
   border: none;
 }
-
-macos {
-  font-size: 11pt;
-}
-
-macos QMenu {
-  font-size: 13pt;
-}

debian/CMakeLists.txt

@@ -5,11 +5,11 @@ if(LSB_RELEASE_EXEC AND DPKG_BUILDPACKAGE)
 
   if(DEB_CODENAME AND DEB_DATE)
 
-    if(BUILD_WITH_QT5)
+    if(QT_VERSION_MAJOR EQUAL 5)
       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)
+    if(QT_VERSION_MAJOR EQUAL 6)
       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()

debian/control.in

@@ -3,6 +3,7 @@ Section: sound
 Priority: optional
 Maintainer: Jonas Kvinge <jonas@jkvinge.net>
 Build-Depends: debhelper (>= 11),
+               git,
                make,
                cmake,
                gcc,
@@ -10,7 +11,6 @@ Build-Depends: debhelper (>= 11),
                protobuf-compiler,
                libglib2.0-dev,
                libdbus-1-dev,
-               libgnutls28-dev,
                libprotobuf-dev,
                libboost-dev,
                libsqlite3-dev,
@@ -25,7 +25,8 @@ Build-Depends: debhelper (>= 11),
                libgpod-dev,
                libmtp-dev,
                libchromaprint-dev,
-               libfftw3-dev
+               libfftw3-dev,
+               libebur128-dev
 Standards-Version: 4.6.1
 
 Package: strawberry
@@ -52,7 +53,7 @@ Description: music player and music collection organizer
   - 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 Lyrics.com, AudD, Genius, Musixmatch, ChartLyrics, lyrics.ovh and lololyrics.com
+  - Song lyrics from Genius, Musixmatch, ChartLyrics, lyrics.ovh, lololyrics.com, songlyrics.com, azlyrics.com, elyrics.net and lyricsmode.com
   - Audio analyzer
   - Audio equalizer
   - Transfer music to mass-storage USB players, MTP compatible devices and iPod Nano/Classic

debian/copyright

@@ -25,8 +25,6 @@ Files: src/core/main.h
        src/context/contextview.h
        src/context/contextalbum.cpp
        src/context/contextalbum.h
-       src/engine/enginetype.cpp
-       src/engine/enginetype.h
        src/engine/alsadevicefinder.cpp
        src/engine/alsadevicefinder.h
        src/engine/alsapcmdevicefinder.cpp
@@ -37,6 +35,8 @@ Files: src/core/main.h
        src/engine/devicefinder.h
        src/engine/enginedevice.cpp
        src/engine/enginedevice.h
+       src/engine/enginemetadata.cpp
+       src/engine/enginemetadata.h
        src/internet/internetservice.cpp
        src/internet/internetservice.h
        src/internet/internettabsview.cpp
@@ -267,8 +267,8 @@ Copyright: 2010, Spotify AB
            2011, Joachim Bengtsson
 License: BSD-3-clause
 
-Files: 3rdparty/singleapplication/*
-Copyright: 2015-2022, Itay Grudev
+Files: 3rdparty/kdsingleapplication/*
+Copyright: 2019-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
 License: MIT
 
 
@@ -376,7 +376,7 @@ License: Apache-2.0
   On Debian systems, the complete text of the Apache 2.0 license can be
   found in the file
   `/usr/share/common-licenses/Apache-2.0`.
- 
+
 License: BSD-3-clause
  Copyright (c) The Regents of the University of California.
  All rights reserved.

dist/macos/Info.plist.in

@@ -33,7 +33,7 @@
   <key>LSApplicationCategoryType</key>
   <string>public.app-category.music</string>
   <key>LSMinimumSystemVersion</key>
-  <string>10.13.4</string>
+  <string>11.0</string>
   <key>SUFeedURL</key>
   <string>https://www.strawberrymusicplayer.org/sparkle-macos</string>
   <key>SUPublicEDKey</key>

dist/macos/macgstcopy.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Script to copy gstreamer plugins before macdeployqt is run.
+# Script to copy gio modules and gstreamer plugins before macdeployqt is run.
 
 if [ "$1" = "" ]; then
   echo "Usage: $0 <bundledir>"
@@ -8,104 +8,141 @@ if [ "$1" = "" ]; then
 fi
 bundledir=$1
 
-if [ "$GIO_EXTRA_MODULES" = "" ]; then
-  echo "Error: Set the GIO_EXTRA_MODULES environment variable to the path containing libgiognutls.so."
+if [ "${GIO_EXTRA_MODULES}" = "" ]; then
+  echo "Error: Set the GIO_EXTRA_MODULES environment variable to the path containing gio modules."
   exit 1
 fi
 
-if [ "$GST_PLUGIN_SCANNER" = "" ]; then
+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
+if [ "${GST_PLUGIN_PATH}" = "" ]; then
   echo "Error: Set the GST_PLUGIN_PATH environment variable to the path containing gstreamer plugins."
   exit 1
 fi
 
+if ! [ -e "${GIO_EXTRA_MODULES}/libgiognutls.so" ] && ! [ -e "${GIO_EXTRA_MODULES}/libgioopenssl.so" ]; then
+  echo "Error: Missing ${GIO_EXTRA_MODULES}/libgiognutls.so or ${GIO_EXTRA_MODULES}/libgioopenssl.so."
+  exit 1
+fi
+
+if ! [ -e "${GST_PLUGIN_SCANNER}" ]; then
+  echo "Error: Missing ${GST_PLUGIN_SCANNER}"
+  exit 1
+fi
+
+if ! [ -d "${GST_PLUGIN_PATH}" ]; then
+  echo "Error: GStreamer plugins path ${GST_PLUGIN_PATH} does not exist."
+  exit 1
+fi
+
+if ! [ -e "${GST_PLUGIN_PATH}/libgstcoreelements.so" ] && ! [ -e "${GST_PLUGIN_PATH}/libgstcoreelements.dylib" ]; then
+  echo "Error: Missing libgstcoreelements.{so,dylib} in GStreamer plugins path ${GST_PLUGIN_PATH}."
+  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
+if [ -e "${GIO_EXTRA_MODULES}/libgiognutls.so" ]; then
+  cp -v -f "${GIO_EXTRA_MODULES}/libgiognutls.so" "${bundledir}/Contents/PlugIns/gio-modules/" || exit 1
+else
+  echo "Warning: Missing ${GIO_EXTRA_MODULES}/libgiognutls.so."
 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
+if [ -e "${GIO_EXTRA_MODULES}/libgioopenssl.so" ]; then
+  cp -v -f "${GIO_EXTRA_MODULES}/libgioopenssl.so" "${bundledir}/Contents/PlugIns/gio-modules/" || exit 1
+else
+  echo "Warning: Missing ${GIO_EXTRA_MODULES}/libgioopenssl.so"
 fi
+
 cp -v -f "${GST_PLUGIN_SCANNER}" "${bundledir}/Contents/PlugIns/" || exit 1
+install_name_tool -add_rpath "@loader_path/../Frameworks" "${bundledir}/Contents/PlugIns/$(basename ${GST_PLUGIN_SCANNER})" || 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;
+libgstaes
+libgstaiff
+libgstapetag
+libgstapp
+libgstasf
+libgstasfmux
+libgstaudioconvert
+libgstaudiofx
+libgstaudiomixer
+libgstaudioparsers
+libgstaudiorate
+libgstaudioresample
+libgstaudiotestsrc
+libgstautodetect
+libgstbs2b
+libgstcdio
+libgstcoreelements
+libgstdash
+libgstequalizer
+libgstfaac
+libgstfaad
+libgstfdkaac
+libgstflac
+libgstgio
+libgsthls
+libgsticydemux
+libgstid3demux
+libgstid3tag
+libgstisomp4
+libgstlame
+libgstlibav
+libgstmpg123
+libgstmusepack
+libgstogg
+libgstopenmpt
+libgstopus
+libgstopusparse
+libgstosxaudio
+libgstpbtypes
+libgstplayback
+libgstreplaygain
+libgstrtp
+libgstrtsp
+libgstsoup
+libgstspectrum
+libgstspeex
+libgsttaglib
+libgsttcp
+libgsttwolame
+libgsttypefindfunctions
+libgstudp
+libgstvolume
+libgstvorbis
+libgstwavenc
+libgstwavpack
+libgstwavparse
+libgstxingmux
 "
 
 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
+for gst_plugin in $gst_plugins; do
+  if [ -e "${GST_PLUGIN_PATH}/${gst_plugin}.dylib" ]; then
+    cp -v -f "${GST_PLUGIN_PATH}/${gst_plugin}.dylib" "${bundledir}/Contents/PlugIns/gstreamer/" || exit 1
+    install_name_tool -id "@rpath/${gst_plugin}.dylib" "${bundledir}/Contents/PlugIns/gstreamer/${gst_plugin}.dylib"
+  elif [ -e "${GST_PLUGIN_PATH}/${gst_plugin}.so" ]; then
+    cp -v -f "${GST_PLUGIN_PATH}/${gst_plugin}.so" "${bundledir}/Contents/PlugIns/gstreamer/" || exit 1
+    install_name_tool -id "@rpath/${gst_plugin}.so" "${bundledir}/Contents/PlugIns/gstreamer/${gst_plugin}.so"
   else
-    echo "Warning: Missing gstreamer plugin ${GST_PLUGIN_PATH}/${gst_plugin}"
+    echo "Warning: Missing gstreamer plugin ${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/"
+# libsoup is dynamically loaded by gstreamer, so it needs to be copied.
+if [ "${LIBSOUP_LIBRARY_PATH}" = "" ]; then
+  echo "Warning: Set the LIBSOUP_LIBRARY_PATH environment variable for copying libsoup."
+else
+  if [ -e "${LIBSOUP_LIBRARY_PATH}" ]; then
+    mkdir -p "${bundledir}/Contents/Frameworks" || exit 1
+    cp -v -f "${LIBSOUP_LIBRARY_PATH}" "${bundledir}/Contents/Frameworks/" || exit 1
+    install_name_tool -id "@rpath/$(basename ${LIBSOUP_LIBRARY_PATH})" "${bundledir}/Contents/Frameworks/$(basename ${LIBSOUP_LIBRARY_PATH})"
+  else
+    echo "Warning: Missing libsoup ${LIBSOUP_LIBRARY_PATH}."
+  fi
 fi

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

@@ -29,7 +29,7 @@
       <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 Lyrics.com, AudD, Genius, Musixmatch, ChartLyrics, lyrics.ovh and lololyrics.com</li>
+      <li>Song lyrics from Genius, Musixmatch, ChartLyrics, lyrics.ovh, lololyrics.com, songlyrics.com, azlyrics.com, elyrics.net and lyricsmode.com</li>
       <li>Support for multiple backends</li>
       <li>Audio analyzer and equalizer</li>
       <li>Transfer music to mass-storage USB players, MTP compatible devices and iPod Nano/Classic</li>
@@ -50,6 +50,11 @@
   </screenshots>
   <update_contact>eclipseo@fedoraproject.org</update_contact>
     <releases>
-        <release version="1.0.0" date="2021-10-16"/>
+        <release version="1.0.23" date="2024-01-11"/>
+        <release version="1.0.22" date="2023-12-09"/>
+        <release version="1.0.21" date="2023-10-21"/>
+        <release version="1.0.20" date="2023-09-24"/>
+        <release version="1.0.19" date="2023-09-24"/>
+        <release version="1.0.18" date="2023-07-02"/>
     </releases>
 </component>

dist/unix/org.strawberrymusicplayer.strawberry.desktop

@@ -3,7 +3,9 @@ Version=1.0
 Type=Application
 Name=Strawberry
 GenericName=Strawberry Music Player
+GenericName[ru]=Музыкальный проигрыватель Strawberry
 Comment=Plays music
+Comment[ru]=Прослушивание музыки
 Exec=strawberry %U
 TryExec=strawberry
 Icon=strawberry
@@ -18,19 +20,24 @@ Actions=Play-Pause;Stop;StopAfterCurrent;Previous;Next;
 [Desktop Action Play-Pause]
 Name=Play/Pause
 Exec=strawberry --play-pause
+Name[ru]=Играть/пауза
 
 [Desktop Action Stop]
 Name=Stop
 Exec=strawberry --stop
+Name[ru]=Стоп
 
 [Desktop Action StopAfterCurrent]
 Name=Stop after this track
 Exec=strawberry --stop-after-current
+Name[ru]=Стоп после этого трека
 
 [Desktop Action Previous]
 Name=Previous
 Exec=strawberry --previous
+Name[ru]=Предыдущий
 
 [Desktop Action Next]
 Name=Next
 Exec=strawberry --next
+Name[ru]=Следующий

dist/unix/strawberry.1

@@ -29,7 +29,7 @@ Features:
 .br
 - Album cover art from Last.fm, Musicbrainz, Discogs, Musixmatch, Deezer, Tidal, Qobuz and Spotify
 .br
-- Song lyrics from Lyrics.com, AudD, Genius, Musixmatch, ChartLyrics, lyrics.ovh and lololyrics.com
+- Song lyrics from Lyrics.com, Genius, Musixmatch, ChartLyrics, lyrics.ovh and lololyrics.com
 .br
 - Support for multiple backends
 .br

dist/unix/strawberry.spec.in

@@ -1,9 +1,9 @@
 Name:           strawberry
 Version:        @STRAWBERRY_VERSION_RPM_V@
-%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos} || "%{?_vendor}" == "openmandriva"
-Release:        @STRAWBERRY_VERSION_RPM_R@%{?dist}
-%else
+%if 0%{?suse_version}
 Release:        @STRAWBERRY_VERSION_RPM_R@.@RPM_DISTRO@
+%else
+Release:        @STRAWBERRY_VERSION_RPM_R@%{?dist}
 %endif
 Summary:        A music player and music collection organizer
 Group:          Productivity/Multimedia/Sound/Players
@@ -11,7 +11,7 @@ License:        GPL-3.0+
 URL:            https://www.strawberrymusicplayer.org/
 Source0:        %{name}-@STRAWBERRY_VERSION_PACKAGE@.tar.xz
 
-%if 0%{?suse_version} && 0%{?suse_version} > 1325
+%if 0%{?suse_version}
 BuildRequires:  libboost_headers-devel
 %else
 BuildRequires:  boost-devel
@@ -25,15 +25,13 @@ BuildRequires:  gettext
 BuildRequires:  desktop-file-utils
 %if 0%{?suse_version}
 BuildRequires:  update-desktop-files
-%endif
-%if 0%{?suse_version}
 BuildRequires:  appstream-glib
-%else
-  %if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos}
+%endif
+%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos}
 BuildRequires:  libappstream-glib
-  %else
+%endif
+%if 0%{?mageia} || "%{?_vendor}" == "openmandriva"
 BuildRequires:  appstream-util
-  %endif
 %endif
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(glib-2.0)
@@ -41,52 +39,34 @@ BuildRequires:  pkgconfig(gio-2.0)
 BuildRequires:  pkgconfig(gio-unix-2.0)
 BuildRequires:  pkgconfig(gthread-2.0)
 BuildRequires:  pkgconfig(dbus-1)
-BuildRequires:  pkgconfig(gnutls)
 BuildRequires:  pkgconfig(alsa)
 BuildRequires:  pkgconfig(protobuf)
 BuildRequires:  pkgconfig(sqlite3) >= 3.9
-%if ! 0%{?centos} && ! 0%{?mageia}
 BuildRequires:  pkgconfig(taglib)
-%endif
 BuildRequires:  pkgconfig(fftw3)
 BuildRequires:  pkgconfig(icu-uc)
 BuildRequires:  pkgconfig(icu-i18n)
-%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_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@Gui)
+BuildRequires:  cmake(Qt@QT_VERSION_MAJOR@Widgets)
 BuildRequires:  cmake(Qt@QT_VERSION_MAJOR@Test)
+BuildRequires:  cmake(Qt@QT_VERSION_MAJOR@LinguistTools)
 %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_VERSION_MAJOR@LinguistTools)
-%endif
 BuildRequires:  pkgconfig(gstreamer-1.0)
 BuildRequires:  pkgconfig(gstreamer-app-1.0)
 BuildRequires:  pkgconfig(gstreamer-audio-1.0)
 BuildRequires:  pkgconfig(gstreamer-base-1.0)
 BuildRequires:  pkgconfig(gstreamer-tag-1.0)
-%if ! 0%{?centos}
 BuildRequires:  pkgconfig(libchromaprint)
-%endif
 BuildRequires:  pkgconfig(libpulse)
 BuildRequires:  pkgconfig(libcdio)
+BuildRequires:  pkgconfig(libebur128)
 BuildRequires:  pkgconfig(libgpod-1.0)
 BuildRequires:  pkgconfig(libmtp)
 %if 0%{?suse_version} || 0%{?fedora_version}
@@ -119,7 +99,7 @@ Features:
   - 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 Lyrics.com, AudD, Genius, Musixmatch, ChartLyrics, lyrics.ovh and lololyrics.com
+  - Song lyrics from Genius, Musixmatch, ChartLyrics, lyrics.ovh, lololyrics.com, songlyrics.com, azlyrics.com, elyrics.net and lyricsmode.com
   - Support for multiple backends
   - Audio analyzer
   - Audio equalizer
@@ -139,22 +119,19 @@ Features:
 %if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos}
   export CXXFLAGS="-fPIC $RPM_OPT_FLAGS"
 %endif
-%{cmake} -DQT_VERSION_MAJOR=@QT_VERSION_MAJOR@
-%if 0%{?centos} || (0%{?mageia} && 0%{?mageia} <= 7) || "%{?_vendor}" == "openmandriva"
-  %make_build
+%if "%{?_vendor}" == "openmandriva"
+%{cmake} -DQT_VERSION_MAJOR=@QT_VERSION_MAJOR@ -DENABLE_TRANSLATIONS=OFF
+%make_build
 %else
-  %cmake_build
+%{cmake} -DQT_VERSION_MAJOR=@QT_VERSION_MAJOR@
+%cmake_build
 %endif
 
 %install
-%if 0%{?centos}
-  %make_install
+%if "%{?_vendor}" == "openmandriva"
+%make_install -C build
 %else
-%if 0%{?mageia} || "%{?_vendor}" == "openmandriva"
-  %make_install -C build
-%else
-  %cmake_install
-%endif
+%cmake_install
 %endif
 
 %if 0%{?suse_version}
@@ -163,10 +140,10 @@ Features:
 
 %check
 desktop-file-validate %{buildroot}%{_datadir}/applications/org.strawberrymusicplayer.strawberry.desktop
-%if 0%{?fedora_version}
-  appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/org.strawberrymusicplayer.strawberry.appdata.xml
-%else
+%if 0%{?suse_version}
   appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.strawberrymusicplayer.strawberry.appdata.xml
+%else
+  appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/org.strawberrymusicplayer.strawberry.appdata.xml
 %endif
 
 %files
@@ -177,13 +154,13 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.strawberrymusicpl
 %{_bindir}/strawberry-tagreader
 %{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/*/apps/strawberry.*
-%if 0%{?fedora_version}
-  %{_metainfodir}/*.appdata.xml
-%else
-  %{_datadir}/metainfo/*.appdata.xml
-%endif
 %{_mandir}/man1/%{name}.1.*
 %{_mandir}/man1/%{name}-tagreader.1.*
+%if 0%{?suse_version}
+%{_datadir}/metainfo/*.appdata.xml
+%else
+%{_metainfodir}/*.appdata.xml
+%endif
 
 %changelog
 * @RPM_DATE@ Jonas Kvinge <jonas@jkvinge.net> - @STRAWBERRY_VERSION_RPM_V@

dist/windows/strawberry.nsi.in

@@ -136,8 +136,6 @@ SetCompressor /SOLID lzma
   ReserveFile "${NSISDIR}\Plugins\x86-unicode\INetC.dll"
 !endif
 
-!define LockedListPATH	$InstallDir
-
 ; Installer pages
 !insertmacro MUI_PAGE_WELCOME
 !insertmacro MUI_PAGE_LICENSE COPYING
@@ -184,19 +182,22 @@ FunctionEnd
 Function CheckPreviousInstall
 
   ReadRegStr $R0 ${PRODUCT_UNINST_ROOT_KEY} ${PRODUCT_UNINST_KEY} "UninstallString"
-  StrCmp $R0 "" done
+  StrCmp $R0 "" Done
 
-  MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION \
-  "${PRODUCT_NAME} is already installed. $\n$\nClick `OK` to remove the \
-  previous version or `Cancel` to cancel this upgrade." \
-  IDOK uninst
+${IfNot} ${Silent}
+  MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION "${PRODUCT_NAME} is already installed. $\n$\nClick `OK` to remove the previous version or `Cancel` to cancel this upgrade." IDOK Uninstall
   Abort
-; Run the uninstaller
-uninst:
-  ClearErrors
-  ExecWait '$R0' ; Do not copy the uninstaller to a temp file
+${EndIf}
 
-done:
+  Uninstall:
+  ClearErrors
+  ${If} ${Silent}
+  ExecWait '$R0 /S'
+  ${Else}
+  ExecWait '$R0'
+  ${EndIf}
+
+  Done:
 
 FunctionEnd
 
@@ -235,6 +236,7 @@ Section "Strawberry" Strawberry
   File "strawberry.ico"
   File "sqlite3.exe"
   File "gst-launch-1.0.exe"
+  File "gst-play-1.0.exe"
   File "gst-discoverer-1.0.exe"
 
   ; MinGW specific files
@@ -252,10 +254,6 @@ Section "Strawberry" Strawberry
   File "libssl-3-x64.dll"
 !endif
 
-  File "avcodec-60.dll"
-  File "avfilter-9.dll"
-  File "avformat-60.dll"
-  File "avutil-58.dll"
   File "libFLAC-12.dll"
   File "libbrotlicommon.dll"
   File "libbrotlidec.dll"
@@ -264,6 +262,7 @@ Section "Strawberry" Strawberry
   File "libbz2.dll"
   File "libchromaprint.dll"
   File "libdl.dll"
+  File "libebur128.dll"
   File "libfaac-0.dll"
   File "libfaad-2.dll"
   File "libfdk-aac-2.dll"
@@ -301,6 +300,7 @@ Section "Strawberry" Strawberry
   File "libidn2-0.dll"
   File "libintl-8.dll"
   File "libjpeg-9.dll"
+  File "libkdsingleapplication-qt6.dll"
   File "liblzma-5.dll"
   File "libmp3lame-0.dll"
   File "libmpcdec.dll"
@@ -330,9 +330,6 @@ Section "Strawberry" Strawberry
   File "libwinpthread-1.dll"
   File "libxml2-2.dll"
   File "libzstd.dll"
-  File "postproc-57.dll"
-  File "swresample-4.dll"
-  File "swscale-7.dll"
   File "zlib1.dll"
 
   File "libabsl_base.dll"
@@ -348,8 +345,10 @@ Section "Strawberry" Strawberry
   File "libabsl_examine_stack.dll"
   File "libabsl_hash.dll"
   File "libabsl_int128.dll"
+  File "libabsl_kernel_timeout_internal.dll"
   File "libabsl_log_globals.dll"
   File "libabsl_log_internal_check_op.dll"
+  File "libabsl_log_internal_conditions.dll"
   File "libabsl_log_internal_format.dll"
   File "libabsl_log_internal_globals.dll"
   File "libabsl_log_internal_log_sink_set.dll"
@@ -406,21 +405,17 @@ Section "Strawberry" Strawberry
 !endif
 
   File "FLAC.dll"
-  File "avcodec-58.dll"
-  File "avfilter-7.dll"
-  File "avformat-58.dll"
-  File "avutil-56.dll"
   File "brotlicommon.dll"
   File "brotlidec.dll"
   File "chromaprint.dll"
-  File "faad.dll"
+  File "ebur128.dll"
+  File "faad-2.dll"
   File "fdk-aac.dll"
   File "ffi-7.dll"
   File "gio-2.0-0.dll"
   File "glib-2.0-0.dll"
   File "gme.dll"
   File "gmodule-2.0-0.dll"
-  File "gnutls.dll"
   File "gobject-2.0-0.dll"
   File "gstadaptivedemux-1.0-0.dll"
   File "gstapp-1.0-0.dll"
@@ -439,28 +434,26 @@ Section "Strawberry" Strawberry
   File "gsttag-1.0-0.dll"
   File "gsturidownloader-1.0-0.dll"
   File "gstvideo-1.0-0.dll"
+  File "gstwinrt-1.0-0.dll"
   File "harfbuzz.dll"
   File "intl-8.dll"
   File "jpeg62.dll"
+  File "kdsingleapplication-qt6.dll"
   File "libbs2b.dll"
   File "libfaac_dll.dll"
   File "liblzma.dll"
   File "libmp3lame.dll"
   File "libopenmpt.dll"
-  File "libspeex.dll"
   File "mpcdec.dll"
   File "mpg123.dll"
   File "nghttp2.dll"
   File "ogg.dll"
   File "opus.dll"
   File "orc-0.4-0.dll"
-  File "postproc-55.dll"
   File "psl-5.dll"
   File "qtsparkle-qt6.dll"
   File "soup-3.0-0.dll"
   File "sqlite3.dll"
-  File "swresample-3.dll"
-  File "swscale-5.dll"
   File "tag.dll"
   File "vorbis.dll"
   File "vorbisfile.dll"
@@ -471,6 +464,7 @@ Section "Strawberry" Strawberry
   File "freetype.dll"
   File "libiconv.dll"
   File "libpng16.dll"
+  File "libspeex.dll"
   File "libxml2.dll"
   File "pcre2-8.dll"
   File "pcre2-16.dll"
@@ -481,6 +475,7 @@ Section "Strawberry" Strawberry
   File "freetyped.dll"
   File "libiconvd.dll"
   File "libpng16d.dll"
+  File "libspeexd.dll"
   File "libxml2d.dll"
   File "pcre2-8d.dll"
   File "pcre2-16d.dll"
@@ -488,11 +483,17 @@ Section "Strawberry" Strawberry
   File "zlibd.dll"
 !endif
 
+  ; Used by libfftw3-3.dll because fftw is compiled with MinGW.
+!ifdef arch_x86
+  File "libgcc_s_sjlj-1.dll"
+  File "libwinpthread-1.dll"
+!endif
+
 !endif ; MSVC
 
   ; Common files
 
-  File "icudt72.dll"
+  File "icudt74.dll"
   File "libfftw3-3.dll"
 !ifdef debug
   File "libprotobufd.dll"
@@ -500,8 +501,8 @@ Section "Strawberry" Strawberry
   File "libprotobuf.dll"
 !endif
 !ifdef msvc && debug
-  File "icuin72d.dll"
-  File "icuuc72d.dll"
+  File "icuin74d.dll"
+  File "icuuc74d.dll"
   File "Qt6Concurrentd.dll"
   File "Qt6Cored.dll"
   File "Qt6Guid.dll"
@@ -509,8 +510,8 @@ Section "Strawberry" Strawberry
   File "Qt6Sqld.dll"
   File "Qt6Widgetsd.dll"
 !else
-  File "icuin72.dll"
-  File "icuuc72.dll"
+  File "icuin74.dll"
+  File "icuuc74.dll"
   File "Qt6Concurrent.dll"
   File "Qt6Core.dll"
   File "Qt6Gui.dll"
@@ -519,6 +520,14 @@ Section "Strawberry" Strawberry
   File "Qt6Widgets.dll"
 !endif
 
+  File "avcodec-60.dll"
+  File "avfilter-9.dll"
+  File "avformat-60.dll"
+  File "avutil-58.dll"
+  File "postproc-57.dll"
+  File "swresample-4.dll"
+  File "swscale-7.dll"
+
   ; Register Strawberry with Default Programs
   Var /GLOBAL AppIcon
   Var /GLOBAL AppExe
@@ -733,6 +742,8 @@ Section "Gstreamer plugins" gstreamer-plugins
   File "/oname=gstvolume.dll" "gstreamer-plugins\gstvolume.dll"
   File "/oname=gstvorbis.dll" "gstreamer-plugins\gstvorbis.dll"
   File "/oname=gstwasapi.dll" "gstreamer-plugins\gstwasapi.dll"
+  ; Disable wasapi2 until issue (https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/2870) is fixed.
+  ;File "/oname=gstwasapi2.dll" "gstreamer-plugins\gstwasapi2.dll"
   File "/oname=gstwavenc.dll" "gstreamer-plugins\gstwavenc.dll"
   File "/oname=gstwavpack.dll" "gstreamer-plugins\gstwavpack.dll"
   File "/oname=gstwavparse.dll" "gstreamer-plugins\gstwavparse.dll"
@@ -781,6 +792,7 @@ Section "Uninstall"
   Delete "$INSTDIR\strawberry.ico"
   Delete "$INSTDIR\sqlite3.exe"
   Delete "$INSTDIR\gst-launch-1.0.exe"
+  Delete "$INSTDIR\gst-play-1.0.exe"
   Delete "$INSTDIR\gst-discoverer-1.0.exe"
 
   ; MinGW specific files
@@ -799,10 +811,6 @@ Section "Uninstall"
   Delete "$INSTDIR\libssl-3-x64.dll"
 !endif
 
-  Delete "$INSTDIR\avcodec-60.dll"
-  Delete "$INSTDIR\avfilter-9.dll"
-  Delete "$INSTDIR\avformat-60.dll"
-  Delete "$INSTDIR\avutil-58.dll"
   Delete "$INSTDIR\libFLAC-12.dll"
   Delete "$INSTDIR\libbrotlicommon.dll"
   Delete "$INSTDIR\libbrotlidec.dll"
@@ -811,6 +819,7 @@ Section "Uninstall"
   Delete "$INSTDIR\libbz2.dll"
   Delete "$INSTDIR\libchromaprint.dll"
   Delete "$INSTDIR\libdl.dll"
+  Delete "$INSTDIR\libebur128.dll"
   Delete "$INSTDIR\libfaac-0.dll"
   Delete "$INSTDIR\libfaad-2.dll"
   Delete "$INSTDIR\libfdk-aac-2.dll"
@@ -848,6 +857,7 @@ Section "Uninstall"
   Delete "$INSTDIR\libidn2-0.dll"
   Delete "$INSTDIR\libintl-8.dll"
   Delete "$INSTDIR\libjpeg-9.dll"
+  Delete "$INSTDIR\libkdsingleapplication-qt6.dll"
   Delete "$INSTDIR\liblzma-5.dll"
   Delete "$INSTDIR\libmp3lame-0.dll"
   Delete "$INSTDIR\libmpcdec.dll"
@@ -877,9 +887,6 @@ Section "Uninstall"
   Delete "$INSTDIR\libwinpthread-1.dll"
   Delete "$INSTDIR\libxml2-2.dll"
   Delete "$INSTDIR\libzstd.dll"
-  Delete "$INSTDIR\postproc-57.dll"
-  Delete "$INSTDIR\swresample-4.dll"
-  Delete "$INSTDIR\swscale-7.dll"
   Delete "$INSTDIR\zlib1.dll"
 
   Delete "$INSTDIR\libabsl_base.dll"
@@ -895,8 +902,10 @@ Section "Uninstall"
   Delete "$INSTDIR\libabsl_examine_stack.dll"
   Delete "$INSTDIR\libabsl_hash.dll"
   Delete "$INSTDIR\libabsl_int128.dll"
+  Delete "$INSTDIR\libabsl_kernel_timeout_internal.dll"
   Delete "$INSTDIR\libabsl_log_globals.dll"
   Delete "$INSTDIR\libabsl_log_internal_check_op.dll"
+  Delete "$INSTDIR\libabsl_log_internal_conditions.dll"
   Delete "$INSTDIR\libabsl_log_internal_format.dll"
   Delete "$INSTDIR\libabsl_log_internal_globals.dll"
   Delete "$INSTDIR\libabsl_log_internal_log_sink_set.dll"
@@ -953,21 +962,17 @@ Section "Uninstall"
 !endif
 
   Delete "$INSTDIR\FLAC.dll"
-  Delete "$INSTDIR\avcodec-58.dll"
-  Delete "$INSTDIR\avfilter-7.dll"
-  Delete "$INSTDIR\avformat-58.dll"
-  Delete "$INSTDIR\avutil-56.dll"
   Delete "$INSTDIR\brotlicommon.dll"
   Delete "$INSTDIR\brotlidec.dll"
   Delete "$INSTDIR\chromaprint.dll"
-  Delete "$INSTDIR\faad.dll"
+  Delete "$INSTDIR\ebur128.dll"
+  Delete "$INSTDIR\faad-2.dll"
   Delete "$INSTDIR\fdk-aac.dll"
   Delete "$INSTDIR\ffi-7.dll"
   Delete "$INSTDIR\gio-2.0-0.dll"
   Delete "$INSTDIR\glib-2.0-0.dll"
   Delete "$INSTDIR\gme.dll"
   Delete "$INSTDIR\gmodule-2.0-0.dll"
-  Delete "$INSTDIR\gnutls.dll"
   Delete "$INSTDIR\gobject-2.0-0.dll"
   Delete "$INSTDIR\gstadaptivedemux-1.0-0.dll"
   Delete "$INSTDIR\gstapp-1.0-0.dll"
@@ -986,28 +991,26 @@ Section "Uninstall"
   Delete "$INSTDIR\gsttag-1.0-0.dll"
   Delete "$INSTDIR\gsturidownloader-1.0-0.dll"
   Delete "$INSTDIR\gstvideo-1.0-0.dll"
+  Delete "$INSTDIR\gstwinrt-1.0-0.dll"
   Delete "$INSTDIR\harfbuzz.dll"
   Delete "$INSTDIR\intl-8.dll"
   Delete "$INSTDIR\jpeg62.dll"
+  Delete "$INSTDIR\kdsingleapplication-qt6.dll"
   Delete "$INSTDIR\libbs2b.dll"
   Delete "$INSTDIR\libfaac_dll.dll"
   Delete "$INSTDIR\liblzma.dll"
   Delete "$INSTDIR\libmp3lame.dll"
   Delete "$INSTDIR\libopenmpt.dll"
-  Delete "$INSTDIR\libspeex.dll"
   Delete "$INSTDIR\mpcdec.dll"
   Delete "$INSTDIR\mpg123.dll"
   Delete "$INSTDIR\nghttp2.dll"
   Delete "$INSTDIR\ogg.dll"
   Delete "$INSTDIR\opus.dll"
   Delete "$INSTDIR\orc-0.4-0.dll"
-  Delete "$INSTDIR\postproc-55.dll"
   Delete "$INSTDIR\psl-5.dll"
   Delete "$INSTDIR\qtsparkle-qt6.dll"
   Delete "$INSTDIR\soup-3.0-0.dll"
   Delete "$INSTDIR\sqlite3.dll"
-  Delete "$INSTDIR\swresample-3.dll"
-  Delete "$INSTDIR\swscale-5.dll"
   Delete "$INSTDIR\tag.dll"
   Delete "$INSTDIR\vorbis.dll"
   Delete "$INSTDIR\vorbisfile.dll"
@@ -1018,6 +1021,7 @@ Section "Uninstall"
   Delete "$INSTDIR\freetype.dll"
   Delete "$INSTDIR\libiconv.dll"
   Delete "$INSTDIR\libpng16.dll"
+  Delete "$INSTDIR\libspeex.dll"
   Delete "$INSTDIR\libxml2.dll"
   Delete "$INSTDIR\pcre2-8.dll"
   Delete "$INSTDIR\pcre2-16.dll"
@@ -1028,6 +1032,7 @@ Section "Uninstall"
   Delete "$INSTDIR\freetyped.dll"
   Delete "$INSTDIR\libiconvd.dll"
   Delete "$INSTDIR\libpng16d.dll"
+  Delete "$INSTDIR\libspeexd.dll"
   Delete "$INSTDIR\libxml2d.dll"
   Delete "$INSTDIR\pcre2-8d.dll"
   Delete "$INSTDIR\pcre2-16d.dll"
@@ -1035,11 +1040,16 @@ Section "Uninstall"
   Delete "$INSTDIR\zlibd.dll"
 !endif
 
+!ifdef arch_x86
+  Delete "$INSTDIR\libgcc_s_sjlj-1.dll"
+  Delete "$INSTDIR\libwinpthread-1.dll"
+!endif
+
 !endif ; MSVC
 
   ; Common files
 
-  Delete "$INSTDIR\icudt72.dll"
+  Delete "$INSTDIR\icudt74.dll"
   Delete "$INSTDIR\libfftw3-3.dll"
 !ifdef debug
   Delete "$INSTDIR\libprotobufd.dll"
@@ -1047,8 +1057,8 @@ Section "Uninstall"
   Delete "$INSTDIR\libprotobuf.dll"
 !endif
 !ifdef msvc && debug
-  Delete "$INSTDIR\icuin72d.dll"
-  Delete "$INSTDIR\icuuc72d.dll"
+  Delete "$INSTDIR\icuin74d.dll"
+  Delete "$INSTDIR\icuuc74d.dll"
   Delete "$INSTDIR\Qt6Concurrentd.dll"
   Delete "$INSTDIR\Qt6Cored.dll"
   Delete "$INSTDIR\Qt6Guid.dll"
@@ -1056,8 +1066,8 @@ Section "Uninstall"
   Delete "$INSTDIR\Qt6Sqld.dll"
   Delete "$INSTDIR\Qt6Widgetsd.dll"
 !else
-  Delete "$INSTDIR\icuin72.dll"
-  Delete "$INSTDIR\icuuc72.dll"
+  Delete "$INSTDIR\icuin74.dll"
+  Delete "$INSTDIR\icuuc74.dll"
   Delete "$INSTDIR\Qt6Concurrent.dll"
   Delete "$INSTDIR\Qt6Core.dll"
   Delete "$INSTDIR\Qt6Gui.dll"
@@ -1066,6 +1076,14 @@ Section "Uninstall"
   Delete "$INSTDIR\Qt6Widgets.dll"
 !endif
 
+  Delete "$INSTDIR\avcodec-60.dll"
+  Delete "$INSTDIR\avfilter-9.dll"
+  Delete "$INSTDIR\avformat-60.dll"
+  Delete "$INSTDIR\avutil-58.dll"
+  Delete "$INSTDIR\postproc-57.dll"
+  Delete "$INSTDIR\swresample-4.dll"
+  Delete "$INSTDIR\swscale-7.dll"
+
 !ifdef mingw
   Delete "$INSTDIR\gio-modules\libgiognutls.dll"
   Delete "$INSTDIR\gio-modules\libgioopenssl.dll"
@@ -1215,13 +1233,14 @@ Section "Uninstall"
   Delete "$INSTDIR\gstreamer-plugins\gstvolume.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstvorbis.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstwasapi.dll"
+  Delete "$INSTDIR\gstreamer-plugins\gstwasapi2.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstwavenc.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstwavpack.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstwavparse.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstxingmux.dll"
 !endif ; msvc
 
-  Delete $INSTDIR\Uninstall.exe"
+  Delete "$INSTDIR\Uninstall.exe"
 
   ; Remove the installation folders.
   RMDir "$INSTDIR\platforms"

ext/gstmoodbar/CMakeLists.txt

@@ -31,5 +31,5 @@ target_link_libraries(gstmoodbar PRIVATE
   ${GSTREAMER_BASE_LIBRARIES}
   ${GSTREAMER_AUDIO_LIBRARIES}
   ${FFTW3_FFTW_LIBRARY}
-  ${QtCore_LIBRARIES}
+  Qt${QT_VERSION_MAJOR}::Core
 )

ext/gstmoodbar/gstfastspectrum.cpp

@@ -50,10 +50,14 @@ enum {
 }  // namespace
 
 #define gst_fastspectrum_parent_class parent_class
+#ifdef __GNUC__
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wold-style-cast"
+#endif
 G_DEFINE_TYPE(GstFastSpectrum, gst_fastspectrum, GST_TYPE_AUDIO_FILTER)
+#ifdef __GNUC__
 #pragma GCC diagnostic pop
+#endif
 
 static void gst_fastspectrum_finalize(GObject *object);
 static void gst_fastspectrum_set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);

ext/libstrawberry-common/CMakeLists.txt

@@ -34,8 +34,8 @@ endif()
 target_link_libraries(libstrawberry-common PRIVATE
   ${CMAKE_THREAD_LIBS_INIT}
   ${GLIB_LIBRARIES}
-  ${QtCore_LIBRARIES}
-  ${QtNetwork_LIBRARIES}
+  Qt${QT_VERSION_MAJOR}::Core
+  Qt${QT_VERSION_MAJOR}::Network
 )
 
 if(Backtrace_FOUND)

ext/libstrawberry-common/core/logging.cpp

@@ -22,12 +22,22 @@
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
+
 #include <iostream>
 #include <memory>
+
 #ifndef _MSC_VER
 #  include <cxxabi.h>
 #endif
+
+#ifdef __clang__
+#  pragma clang diagnostic push
+#  pragma clang diagnostic ignored "-Wold-style-cast"
+#endif
 #include <glib.h>
+#ifdef __clang__
+#  pragma clang diagnostic pop
+#endif
 
 #ifdef HAVE_BACKTRACE
 #  include <execinfo.h>

ext/libstrawberry-common/core/workerpool.h

@@ -31,15 +31,14 @@
 #include <QMutex>
 #include <QLocalServer>
 #include <QProcess>
+#include <QDir>
 #include <QFile>
 #include <QList>
 #include <QQueue>
 #include <QString>
 #include <QStringList>
 #include <QAtomicInt>
-#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
-#  include <QRandomGenerator>
-#endif
+#include <QRandomGenerator>
 
 #include "core/logging.h"
 
@@ -228,7 +227,7 @@ void WorkerPool<HandlerType>::SetExecutableName(const QString &executable_name)
 
 template<typename HandlerType>
 void WorkerPool<HandlerType>::Start() {
-  QMetaObject::invokeMethod(this, "DoStart");
+  QMetaObject::invokeMethod(this, &WorkerPool<HandlerType>::DoStart);
 }
 
 template<typename HandlerType>
@@ -247,8 +246,8 @@ void WorkerPool<HandlerType>::DoStart() {
   search_path << "/usr/libexec";
   search_path << "/usr/local/libexec";
 #endif
-#if defined(Q_OS_MACOS) && defined(USE_BUNDLE)
-  search_path << QCoreApplication::applicationDirPath() + "/" + USE_BUNDLE_DIR;
+#if defined(Q_OS_MACOS)
+  search_path << QDir::cleanPath(QCoreApplication::applicationDirPath() + "/../PlugIns");
 #endif
 
   for (const QString &path_prefix : search_path) {
@@ -294,11 +293,7 @@ void WorkerPool<HandlerType>::StartOneWorker(Worker *worker) {
 
   // Create a server, find an unused name and start listening
   forever {
-#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
     const quint32 unique_number = QRandomGenerator::global()->bounded(static_cast<quint32>(quint64(this) & 0xFFFFFFFF));
-#else
-    const quint32 unique_number = qrand() ^ (static_cast<quint32>(quint64(this) & 0xFFFFFFFF));
-#endif
     const QString name = QString("%1_%2").arg(local_server_name_).arg(unique_number);
 
     if (worker->local_server_->listen(name)) {
@@ -423,7 +418,7 @@ WorkerPool<HandlerType>::SendMessageWithReply(MessageType *message) {
   }
 
   // Wake up the main thread
-  QMetaObject::invokeMethod(this, "SendQueuedMessages", Qt::QueuedConnection);
+  QMetaObject::invokeMethod(this, &WorkerPool<HandlerType>::SendQueuedMessages, Qt::QueuedConnection);
 
   return reply;
 

ext/libstrawberry-tagreader/CMakeLists.txt

@@ -1,7 +1,15 @@
 cmake_minimum_required(VERSION 3.7)
 
-set(MESSAGES tagreadermessages.proto)
-set(SOURCES tagreaderbase.cpp)
+# Workaround a bug in protobuf-generate.cmake (https://github.com/protocolbuffers/protobuf/issues/12450)
+if(NOT protobuf_PROTOC_EXE)
+  set(protobuf_PROTOC_EXE "protobuf::protoc")
+endif()
+
+if(NOT Protobuf_LIBRARIES)
+  set(Protobuf_LIBRARIES protobuf::libprotobuf)
+endif()
+
+set(SOURCES tagreaderbase.cpp tagreadermessages.proto)
 
 if(USE_TAGLIB AND TAGLIB_FOUND)
   list(APPEND SOURCES tagreadertaglib.cpp tagreadergme.cpp)
@@ -11,8 +19,6 @@ if(USE_TAGPARSER AND TAGPARSER_FOUND)
   list(APPEND SOURCES tagreadertagparser.cpp)
 endif()
 
-protobuf_generate_cpp(PROTO_SOURCES PROTO_HEADERS ${MESSAGES})
-
 link_directories(
   ${GLIB_LIBRARY_DIRS}
   ${PROTOBUF_LIBRARY_DIRS}
@@ -44,20 +50,12 @@ target_include_directories(libstrawberry-tagreader PRIVATE
 target_link_libraries(libstrawberry-tagreader PRIVATE
   ${GLIB_LIBRARIES}
   ${Protobuf_LIBRARIES}
-  ${QtCore_LIBRARIES}
-  ${QtNetwork_LIBRARIES}
-  ${QtGui_LIBRARIES}
+  Qt${QT_VERSION_MAJOR}::Core
+  Qt${QT_VERSION_MAJOR}::Network
+  Qt${QT_VERSION_MAJOR}::Gui
   libstrawberry-common
 )
 
-if(WIN32 AND Protobuf_VERSION VERSION_GREATER_EQUAL 4.22.0)
-  if (MSVC)
-    target_link_libraries(libstrawberry-tagreader PRIVATE abseil_dll)
-  else()
-    target_link_libraries(libstrawberry-tagreader PRIVATE absl_log_internal_message absl_log_internal_check_op)
-  endif()
-endif()
-
 if(USE_TAGLIB AND TAGLIB_FOUND)
   target_include_directories(libstrawberry-tagreader SYSTEM PRIVATE ${TAGLIB_INCLUDE_DIRS})
   target_link_libraries(libstrawberry-tagreader PRIVATE ${TAGLIB_LIBRARIES})
@@ -67,3 +65,5 @@ if(USE_TAGPARSER AND TAGPARSER_FOUND)
   target_include_directories(libstrawberry-tagreader SYSTEM PRIVATE ${TAGPARSER_INCLUDE_DIRS})
   target_link_libraries(libstrawberry-tagreader PRIVATE ${TAGPARSER_LIBRARIES})
 endif()
+
+protobuf_generate(TARGET libstrawberry-tagreader)

ext/libstrawberry-tagreader/tagreaderbase.cpp

@@ -1,5 +1,5 @@
 /* This file is part of Strawberry.
-   Copyright 2018-2021, Jonas Kvinge <jonas@jkvinge.net>
+   Copyright 2018-2023, 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
@@ -30,8 +30,6 @@
 #include "core/logging.h"
 #include "tagreaderbase.h"
 
-const std::string TagReaderBase::kEmbeddedCover = "(embedded)";
-
 TagReaderBase::TagReaderBase() = default;
 TagReaderBase::~TagReaderBase() = default;
 
@@ -59,72 +57,74 @@ int TagReaderBase::ConvertToPOPMRating(const float rating) {
 
 }
 
-QByteArray TagReaderBase::LoadCoverDataFromRequest(const spb::tagreader::SaveFileRequest &request) {
+TagReaderBase::Cover TagReaderBase::LoadCoverFromRequest(const spb::tagreader::SaveFileRequest &request) {
 
   if (!request.has_save_cover() || !request.save_cover()) {
-    return QByteArray();
+    return Cover();
   }
 
-  const QString song_filename = QString::fromUtf8(request.filename().data(), request.filename().size());
+  const QString song_filename = QString::fromUtf8(request.filename().data(), static_cast<qint64>(request.filename().size()));
   QString cover_filename;
   if (request.has_cover_filename()) {
-    cover_filename = QString::fromUtf8(request.cover_filename().data(), request.cover_filename().size());
+    cover_filename = QString::fromUtf8(request.cover_filename().data(), static_cast<qint64>(request.cover_filename().size()));
   }
   QByteArray cover_data;
   if (request.has_cover_data()) {
-    cover_data = QByteArray(request.cover_data().data(), request.cover_data().size());
+    cover_data = QByteArray(request.cover_data().data(), static_cast<qint64>(request.cover_data().size()));
   }
-  bool cover_is_jpeg = false;
-  if (request.has_cover_is_jpeg()) {
-    cover_is_jpeg = request.cover_is_jpeg();
+  QString cover_mime_type;
+  if (request.has_cover_mime_type()) {
+    cover_mime_type = QByteArray(request.cover_mime_type().data(), static_cast<qint64>(request.cover_mime_type().size()));
   }
 
-  return LoadCoverDataFromRequest(song_filename, cover_filename, cover_data, cover_is_jpeg);
+  return LoadCoverFromRequest(song_filename, cover_filename, cover_data, cover_mime_type);
 
 }
 
-QByteArray TagReaderBase::LoadCoverDataFromRequest(const spb::tagreader::SaveEmbeddedArtRequest &request) {
+TagReaderBase::Cover TagReaderBase::LoadCoverFromRequest(const spb::tagreader::SaveEmbeddedArtRequest &request) {
 
-  const QString song_filename = QString::fromUtf8(request.filename().data(), request.filename().size());
+  const QString song_filename = QString::fromUtf8(request.filename().data(), static_cast<qint64>(request.filename().size()));
   QString cover_filename;
   if (request.has_cover_filename()) {
-    cover_filename = QString::fromUtf8(request.cover_filename().data(), request.cover_filename().size());
+    cover_filename = QString::fromUtf8(request.cover_filename().data(), static_cast<qint64>(request.cover_filename().size()));
   }
   QByteArray cover_data;
   if (request.has_cover_data()) {
-    cover_data = QByteArray(request.cover_data().data(), request.cover_data().size());
+    cover_data = QByteArray(request.cover_data().data(), static_cast<qint64>(request.cover_data().size()));
   }
-  bool cover_is_jpeg = false;
-  if (request.has_cover_is_jpeg()) {
-    cover_is_jpeg = request.cover_is_jpeg();
+  QString cover_mime_type;
+  if (request.has_cover_mime_type()) {
+    cover_mime_type = QByteArray(request.cover_mime_type().data(), static_cast<qint64>(request.cover_mime_type().size()));
   }
 
-  return LoadCoverDataFromRequest(song_filename, cover_filename, cover_data, cover_is_jpeg);
+  return LoadCoverFromRequest(song_filename, cover_filename, cover_data, cover_mime_type);
 
 }
 
-QByteArray TagReaderBase::LoadCoverDataFromRequest(const QString &song_filename, const QString &cover_filename, QByteArray cover_data, const bool cover_is_jpeg) {
-
-  if (!cover_data.isEmpty() && cover_is_jpeg) {
-    qLog(Debug) << "Using cover from JPEG data for" << song_filename;
-    return cover_data;
-  }
+TagReaderBase::Cover TagReaderBase::LoadCoverFromRequest(const QString &song_filename, const QString &cover_filename, QByteArray cover_data, QString cover_mime_type) {
 
   if (cover_data.isEmpty() && !cover_filename.isEmpty()) {
     qLog(Debug) << "Loading cover from" << cover_filename << "for" << song_filename;
     QFile file(cover_filename);
     if (!file.open(QIODevice::ReadOnly)) {
       qLog(Error) << "Failed to open file" << cover_filename << "for reading:" << file.errorString();
-      return QByteArray();
+      return Cover();
     }
     cover_data = file.readAll();
     file.close();
   }
 
   if (!cover_data.isEmpty()) {
-    if (QMimeDatabase().mimeTypeForData(cover_data).name() == "image/jpeg") {
+    if (cover_mime_type.isEmpty()) {
+      cover_mime_type = QMimeDatabase().mimeTypeForData(cover_data).name();
+    }
+    if (cover_mime_type == "image/jpeg") {
       qLog(Debug) << "Using cover from JPEG data for" << song_filename;
-      return cover_data;
+      return Cover(cover_data, cover_mime_type);
+    }
+    if (cover_mime_type == "image/png") {
+      qLog(Debug) << "Using cover from PNG data for" << song_filename;
+      return Cover(cover_data, cover_mime_type);
     }
     // Convert image to JPEG.
     qLog(Debug) << "Converting cover to JPEG data for" << song_filename;
@@ -135,9 +135,9 @@ QByteArray TagReaderBase::LoadCoverDataFromRequest(const QString &song_filename,
       cover_image.save(&buffer, "JPEG");
       buffer.close();
     }
-    return cover_data;
+    return Cover(cover_data, "image/jpeg");
   }
 
-  return QByteArray();
+  return Cover();
 
 }

ext/libstrawberry-tagreader/tagreaderbase.h

@@ -1,5 +1,5 @@
 /* This file is part of Strawberry.
-   Copyright 2018-2021, Jonas Kvinge <jonas@jkvinge.net>
+   Copyright 2018-2023, 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
@@ -36,6 +36,14 @@ class TagReaderBase {
   explicit TagReaderBase();
   ~TagReaderBase();
 
+  class Cover {
+   public:
+    explicit Cover(const QByteArray &_data = QByteArray(), const QString &_mime_type = QString()) : data(_data), mime_type(_mime_type) {}
+    QByteArray data;
+    QString mime_type;
+    QString error;
+  };
+
   virtual bool IsMediaFile(const QString &filename) const = 0;
 
   virtual bool ReadFile(const QString &filename, spb::tagreader::SongMetadata *song) const = 0;
@@ -50,14 +58,11 @@ class TagReaderBase {
   static float ConvertPOPMRating(const int POPM_rating);
   static int ConvertToPOPMRating(const float rating);
 
-  static QByteArray LoadCoverDataFromRequest(const spb::tagreader::SaveFileRequest &request);
-  static QByteArray LoadCoverDataFromRequest(const spb::tagreader::SaveEmbeddedArtRequest &request);
+  static Cover LoadCoverFromRequest(const spb::tagreader::SaveFileRequest &request);
+  static Cover LoadCoverFromRequest(const spb::tagreader::SaveEmbeddedArtRequest &request);
 
  private:
-  static QByteArray LoadCoverDataFromRequest(const QString &song_filename, const QString &cover_filename, QByteArray cover_data, const bool cover_is_jpeg);
-
- protected:
-  static const std::string kEmbeddedCover;
+  static Cover LoadCoverFromRequest(const QString &song_filename, const QString &cover_filename, QByteArray cover_data, QString cover_mime_type);
 
   Q_DISABLE_COPY(TagReaderBase)
 };

ext/libstrawberry-tagreader/tagreadergme.cpp

@@ -98,9 +98,8 @@ void GME::SPC::Read(const QFileInfo &file_info, spb::tagreader::SongMetadata *so
 
   file.seek(INTRO_LENGTH_OFFSET);
   QByteArray length_bytes = file.read(INTRO_LENGTH_SIZE);
-  quint64 length_in_sec = 0;
   if (length_bytes.size() >= INTRO_LENGTH_SIZE) {
-    length_in_sec = ConvertSPCStringToNum(length_bytes);
+    quint64 length_in_sec = ConvertSPCStringToNum(length_bytes);
 
     if (!length_in_sec || length_in_sec >= 0x1FFF) {
       // This means that parsing the length as a string failed, so get value LE.
@@ -120,6 +119,7 @@ void GME::SPC::Read(const QFileInfo &file_info, spb::tagreader::SongMetadata *so
     if (fade_length_in_ms > 0x7FFF) {
       fade_length_in_ms = fade_bytes[0] | (fade_bytes[1] << 8) | (fade_bytes[2] << 16) | (fade_bytes[3] << 24);
     }
+    Q_UNUSED(fade_length_in_ms)
   }
 
   // Check for XID6 data -- this is infrequently used, but being able to fill in data from this is ideal before trying to rely on APETAG values.
@@ -141,7 +141,7 @@ void GME::SPC::Read(const QFileInfo &file_info, spb::tagreader::SongMetadata *so
         qint8 type = arr[1];
         Q_UNUSED(id);
         Q_UNUSED(type);
-        qint16 length = arr[2] | (arr[3] << 8);
+        qint16 length = static_cast<qint16>(arr[2] | (arr[3] << 8));
 
         file.read(GetNextMemAddressAlign32bit(length));
       }
@@ -161,8 +161,8 @@ void GME::SPC::Read(const QFileInfo &file_info, spb::tagreader::SongMetadata *so
     TagReaderTagLib::TStringToStdString(tag->album(), song_info->mutable_album());
     TagReaderTagLib::TStringToStdString(tag->title(), song_info->mutable_title());
     TagReaderTagLib::TStringToStdString(tag->genre(), song_info->mutable_genre());
-    song_info->set_track(tag->track());
-    song_info->set_year(tag->year());
+    song_info->set_track(static_cast<std::int32_t>(tag->track()));
+    song_info->set_year(static_cast<std::int32_t>(tag->year()));
   }
 
   song_info->set_valid(true);
@@ -171,7 +171,7 @@ void GME::SPC::Read(const QFileInfo &file_info, spb::tagreader::SongMetadata *so
 }
 
 qint16 GME::SPC::GetNextMemAddressAlign32bit(qint16 input) {
-  return ((input + 0x3) & ~0x3);
+  return static_cast<qint16>((input + 0x3) & ~0x3);
   // Plus 0x3 for rounding up (not down), AND NOT to flatten out on a 32 bit level.
 }
 
@@ -211,7 +211,7 @@ void GME::VGM::Read(const QFileInfo &file_info, spb::tagreader::SongMetadata *so
 
   if (!GetPlaybackLength(sample_count_bytes, loop_count_bytes, length)) return;
 
-  file.seek(GD3_TAG_PTR + pt);
+  file.seek(static_cast<qint64>(GD3_TAG_PTR + pt));
   QByteArray gd3_version = file.read(4);
 
   file.seek(file.pos() + 4);
@@ -249,11 +249,11 @@ bool GME::VGM::GetPlaybackLength(const QByteArray &sample_count_bytes, const QBy
 
   quint64 sample_count = GME::UnpackBytes32(sample_count_bytes.constData(), sample_count_bytes.size());
 
-  if (sample_count <= 0) return false;
+  if (sample_count == 0) return false;
 
   quint64 loop_sample_count = GME::UnpackBytes32(loop_count_bytes.constData(), loop_count_bytes.size());
 
-  if (loop_sample_count <= 0) {
+  if (loop_sample_count == 0) {
     out_length = sample_count * 1000 / SAMPLE_TIMEBASE;
     return true;
   }

ext/libstrawberry-tagreader/tagreadergme.h

@@ -34,7 +34,7 @@ namespace GME {
 bool IsSupportedFormat(const QFileInfo &file_info);
 bool ReadFile(const QFileInfo &file_info, spb::tagreader::SongMetadata *song_info);
 
-uint32_t UnpackBytes32(const char *const arr, size_t length);
+uint32_t UnpackBytes32(const char *const bytes, size_t length);
 
 namespace SPC {
 // SPC SPEC: http://vspcplay.raphnet.net/spc_file_format.txt

ext/libstrawberry-tagreader/tagreadermessages.proto

@@ -69,7 +69,7 @@ message SongMetadata {
   optional int64 lastplayed = 29;
   optional int64 lastseen = 30;
 
-  optional string art_automatic = 31;
+  optional bool art_embedded = 31;
 
   optional float rating = 32;
 
@@ -97,6 +97,7 @@ message IsMediaFileRequest {
 
 message IsMediaFileResponse {
   optional bool success = 1;
+  optional string error = 2;
 }
 
 message ReadFileRequest {
@@ -105,6 +106,7 @@ message ReadFileRequest {
 
 message ReadFileResponse {
   optional SongMetadata metadata = 1;
+  optional string error = 2;
 }
 
 message SaveFileRequest {
@@ -116,11 +118,12 @@ message SaveFileRequest {
   optional SongMetadata metadata = 6;
   optional string cover_filename = 7;
   optional bytes cover_data = 8;
-  optional bool cover_is_jpeg = 9;
+  optional string cover_mime_type = 9;
 }
 
 message SaveFileResponse {
   optional bool success = 1;
+  optional string error = 2;
 }
 
 message LoadEmbeddedArtRequest {
@@ -129,17 +132,19 @@ message LoadEmbeddedArtRequest {
 
 message LoadEmbeddedArtResponse {
   optional bytes data = 1;
+  optional string error = 2;
 }
 
 message SaveEmbeddedArtRequest {
   optional string filename = 1;
   optional string cover_filename = 2;
   optional bytes cover_data = 3;
-  optional bool cover_is_jpeg = 4;
+  optional string cover_mime_type = 4;
 }
 
 message SaveEmbeddedArtResponse {
   optional bool success = 1;
+  optional string error = 2;
 }
 
 message SaveSongPlaycountToFileRequest {
@@ -149,6 +154,7 @@ message SaveSongPlaycountToFileRequest {
 
 message SaveSongPlaycountToFileResponse {
   optional bool success = 1;
+  optional string error = 2;
 }
 
 message SaveSongRatingToFileRequest {
@@ -158,6 +164,7 @@ message SaveSongRatingToFileRequest {
 
 message SaveSongRatingToFileResponse {
   optional bool success = 1;
+  optional string error = 2;
 }
 
 message Message {

ext/libstrawberry-tagreader/tagreadertaglib.cpp

@@ -1,6 +1,6 @@
 /* This file is part of Strawberry.
    Copyright 2013, David Sansome <me@davidsansome.com>
-   Copyright 2018-2021, Jonas Kvinge <jonas@jkvinge.net>
+   Copyright 2018-2023, 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
@@ -240,12 +240,9 @@ bool TagReaderTagLib::ReadFile(const QString &filename, spb::tagreader::SongMeta
   song->set_basefilename(basefilename.constData(), basefilename.length());
   song->set_url(url.constData(), url.size());
   song->set_filesize(fileinfo.size());
+
   song->set_mtime(fileinfo.lastModified().isValid() ? std::max(fileinfo.lastModified().toSecsSinceEpoch(), 0LL) : 0LL);
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0))
   song->set_ctime(fileinfo.birthTime().isValid() ? std::max(fileinfo.birthTime().toSecsSinceEpoch(), 0LL) : fileinfo.lastModified().isValid() ? std::max(fileinfo.lastModified().toSecsSinceEpoch(), 0LL) : 0LL);
-#else
-  song->set_ctime(fileinfo.created().isValid() ? std::max(fileinfo.created().toSecsSinceEpoch(), 0LL) : fileinfo.lastModified().isValid() ? std::max(fileinfo.lastModified().toSecsSinceEpoch(), 0LL) : 0LL);
-#endif
 
   if (song->ctime() <= 0) {
     song->set_ctime(song->mtime());
@@ -290,7 +287,7 @@ bool TagReaderTagLib::ReadFile(const QString &filename, spb::tagreader::SongMeta
     if (!pictures.isEmpty()) {
       for (TagLib::FLAC::Picture *picture : pictures) {
         if (picture->type() == TagLib::FLAC::Picture::FrontCover && picture->data().size() > 0) {
-          song->set_art_automatic(kEmbeddedCover);
+          song->set_art_embedded(true);
           break;
         }
       }
@@ -305,7 +302,7 @@ bool TagReaderTagLib::ReadFile(const QString &filename, spb::tagreader::SongMeta
       if (!pictures.isEmpty()) {
         for (TagLib::FLAC::Picture *picture : pictures) {
           if (picture->type() == TagLib::FLAC::Picture::FrontCover && picture->data().size() > 0) {
-            song->set_art_automatic(kEmbeddedCover);
+            song->set_art_embedded(true);
             break;
           }
         }
@@ -365,7 +362,7 @@ bool TagReaderTagLib::ReadFile(const QString &filename, spb::tagreader::SongMeta
         TStringToStdString(map["SYLT"].front()->toString(), song->mutable_lyrics());
       }
 
-      if (map.contains("APIC")) song->set_art_automatic(kEmbeddedCover);
+      if (map.contains("APIC")) song->set_art_embedded(true);
 
       // Find a suitable comment tag.  For now we ignore iTunNORM comments.
       for (uint i = 0; i < map["COMM"].size(); ++i) {
@@ -377,6 +374,16 @@ bool TagReaderTagLib::ReadFile(const QString &filename, spb::tagreader::SongMeta
         }
       }
 
+      if (TagLib::ID3v2::UserTextIdentificationFrame *frame_fmps_playcount = TagLib::ID3v2::UserTextIdentificationFrame::find(file_mpeg->ID3v2Tag(), "FMPS_Playcount")) {
+        TagLib::StringList frame_field_list = frame_fmps_playcount->fieldList();
+        if (frame_field_list.size() > 1) {
+          int playcount = TStringToQString(frame_field_list[1]).toInt();
+          if (song->playcount() <= 0 && playcount > 0) {
+            song->set_playcount(playcount);
+          }
+        }
+      }
+
       if (TagLib::ID3v2::UserTextIdentificationFrame *frame_fmps_rating = TagLib::ID3v2::UserTextIdentificationFrame::find(file_mpeg->ID3v2Tag(), "FMPS_Rating")) {
         TagLib::StringList frame_field_list = frame_fmps_rating->fieldList();
         if (frame_field_list.size() > 1) {
@@ -472,7 +479,7 @@ bool TagReaderTagLib::ReadFile(const QString &filename, spb::tagreader::SongMeta
 
       // Find album cover art
       if (mp4_tag->item("covr").isValid()) {
-        song->set_art_automatic(kEmbeddedCover);
+        song->set_art_embedded(true);
       }
 
       if (mp4_tag->item("disk").isValid()) {
@@ -668,8 +675,8 @@ bool TagReaderTagLib::ReadFile(const QString &filename, spb::tagreader::SongMeta
 
   if (compilation.isEmpty()) {
     // well, it wasn't set, but if the artist is VA assume it's a compilation
-    const QString albumartist = QString::fromUtf8(song->albumartist().data(), song->albumartist().size());
-    const QString artist = QString::fromUtf8(song->artist().data(), song->artist().size());
+    const QString albumartist = QString::fromUtf8(song->albumartist().data(), static_cast<qint64>(song->albumartist().size()));
+    const QString artist = QString::fromUtf8(song->artist().data(), static_cast<qint64>(song->artist().size()));
     if (artist.compare("various artists") == 0 || albumartist.compare("various artists") == 0) {
       song->set_compilation(true);
     }
@@ -718,8 +725,8 @@ void TagReaderTagLib::ParseOggTag(const TagLib::Ogg::FieldListMap &map, QString
 
   if (map.contains("DISCNUMBER")) *disc = TStringToQString(map["DISCNUMBER"].front()).trimmed();
   if (map.contains("COMPILATION")) *compilation = TStringToQString(map["COMPILATION"].front()).trimmed();
-  if (map.contains("COVERART")) song->set_art_automatic(kEmbeddedCover);
-  if (map.contains("METADATA_BLOCK_PICTURE")) song->set_art_automatic(kEmbeddedCover);
+  if (map.contains("COVERART")) song->set_art_embedded(true);
+  if (map.contains("METADATA_BLOCK_PICTURE")) song->set_art_embedded(true);
 
   if (map.contains("FMPS_PLAYCOUNT") && song->playcount() <= 0) {
     const int playcount = TStringToQString(map["FMPS_PLAYCOUNT"].front()).trimmed().toInt();
@@ -756,7 +763,7 @@ void TagReaderTagLib::ParseAPETag(const TagLib::APE::ItemListMap &map, QString *
     }
   }
 
-  if (map.find("COVER ART (FRONT)") != map.end()) song->set_art_automatic(kEmbeddedCover);
+  if (map.find("COVER ART (FRONT)") != map.end()) song->set_art_embedded(true);
   if (map.contains("COMPILATION")) {
     *compilation = TStringToQString(TagLib::String::number(map["COMPILATION"].toString().toInt()));
   }
@@ -833,7 +840,7 @@ bool TagReaderTagLib::SaveFile(const spb::tagreader::SaveFileRequest &request) c
 
   if (request.filename().empty()) return false;
 
-  const QString filename = QString::fromUtf8(request.filename().data(), request.filename().size());
+  const QString filename = QString::fromUtf8(request.filename().data(), static_cast<qint64>(request.filename().size()));
   const spb::tagreader::SongMetadata song = request.metadata();
   const bool save_tags = request.has_save_tags() && request.save_tags();
   const bool save_playcount = request.has_save_playcount() && request.save_playcount();
@@ -856,7 +863,7 @@ bool TagReaderTagLib::SaveFile(const spb::tagreader::SaveFileRequest &request) c
 
   qLog(Debug) << "Saving" << save_tags_options.join(", ") << "to" << filename;
 
-  const QByteArray cover_data = LoadCoverDataFromRequest(request);
+  const Cover cover = LoadCoverFromRequest(request);
 
   std::unique_ptr<TagLib::FileRef> fileref(factory_->GetFileRef(filename));
   if (!fileref || fileref->isNull()) return false;
@@ -886,7 +893,7 @@ bool TagReaderTagLib::SaveFile(const spb::tagreader::SaveFileRequest &request) c
       SetRating(xiph_comment, song);
     }
     if (save_cover) {
-      SetEmbeddedArt(file_flac, xiph_comment, cover_data);
+      SetEmbeddedArt(file_flac, xiph_comment, cover.data, cover.mime_type);
     }
   }
 
@@ -952,7 +959,7 @@ bool TagReaderTagLib::SaveFile(const spb::tagreader::SaveFileRequest &request) c
       SetRating(tag, song);
     }
     if (save_cover) {
-      SetEmbeddedArt(file_mpeg, tag, cover_data);
+      SetEmbeddedArt(file_mpeg, tag, cover.data, cover.mime_type);
     }
   }
 
@@ -974,7 +981,7 @@ bool TagReaderTagLib::SaveFile(const spb::tagreader::SaveFileRequest &request) c
       SetRating(tag, song);
     }
     if (save_cover) {
-      SetEmbeddedArt(file_mp4, tag, cover_data);
+      SetEmbeddedArt(file_mp4, tag, cover.data, cover.mime_type);
     }
   }
 
@@ -992,20 +999,20 @@ bool TagReaderTagLib::SaveFile(const spb::tagreader::SaveFileRequest &request) c
         SetRating(xiph_comment, song);
       }
       if (save_cover) {
-        SetEmbeddedArt(xiph_comment, cover_data);
+        SetEmbeddedArt(xiph_comment, cover.data, cover.mime_type);
       }
     }
   }
 
-  const bool result = fileref->save();
+  const bool success = fileref->save();
 #ifdef Q_OS_LINUX
-  if (result) {
+  if (success) {
     // Linux: inotify doesn't seem to notice the change to the file unless we change the timestamps as well. (this is what touch does)
     utimensat(0, QFile::encodeName(filename).constData(), nullptr, 0);
   }
 #endif  // Q_OS_LINUX
 
-  return result;
+  return success;
 
 }
 
@@ -1241,7 +1248,7 @@ QByteArray TagReaderTagLib::LoadEmbeddedAPEArt(const TagLib::APE::ItemListMap &m
 
 }
 
-void TagReaderTagLib::SetEmbeddedArt(TagLib::FLAC::File *flac_file, TagLib::Ogg::XiphComment *xiph_comment, const QByteArray &data) const {
+void TagReaderTagLib::SetEmbeddedArt(TagLib::FLAC::File *flac_file, TagLib::Ogg::XiphComment *xiph_comment, const QByteArray &data, const QString &mime_type) const {
 
   (void)xiph_comment;
 
@@ -1250,28 +1257,28 @@ void TagReaderTagLib::SetEmbeddedArt(TagLib::FLAC::File *flac_file, TagLib::Ogg:
   if (!data.isEmpty()) {
     TagLib::FLAC::Picture *picture = new TagLib::FLAC::Picture();
     picture->setType(TagLib::FLAC::Picture::FrontCover);
-    picture->setMimeType("image/jpeg");
+    picture->setMimeType(QStringToTString(mime_type));
     picture->setData(TagLib::ByteVector(data.constData(), data.size()));
     flac_file->addPicture(picture);
   }
 
 }
 
-void TagReaderTagLib::SetEmbeddedArt(TagLib::Ogg::XiphComment *xiph_comment, const QByteArray &data) const {
+void TagReaderTagLib::SetEmbeddedArt(TagLib::Ogg::XiphComment *xiph_comment, const QByteArray &data, const QString &mime_type) const {
 
   xiph_comment->removeAllPictures();
 
   if (!data.isEmpty()) {
     TagLib::FLAC::Picture *picture = new TagLib::FLAC::Picture();
     picture->setType(TagLib::FLAC::Picture::FrontCover);
-    picture->setMimeType("image/jpeg");
+    picture->setMimeType(QStringToTString(mime_type));
     picture->setData(TagLib::ByteVector(data.constData(), data.size()));
     xiph_comment->addPicture(picture);
   }
 
 }
 
-void TagReaderTagLib::SetEmbeddedArt(TagLib::MPEG::File *file_mp3, TagLib::ID3v2::Tag *tag, const QByteArray &data) const {
+void TagReaderTagLib::SetEmbeddedArt(TagLib::MPEG::File *file_mp3, TagLib::ID3v2::Tag *tag, const QByteArray &data, const QString &mime_type) const {
 
   (void)file_mp3;
 
@@ -1287,14 +1294,14 @@ void TagReaderTagLib::SetEmbeddedArt(TagLib::MPEG::File *file_mp3, TagLib::ID3v2
     TagLib::ID3v2::AttachedPictureFrame *frontcover = nullptr;
     frontcover = new TagLib::ID3v2::AttachedPictureFrame("APIC");
     frontcover->setType(TagLib::ID3v2::AttachedPictureFrame::FrontCover);
-    frontcover->setMimeType("image/jpeg");
+    frontcover->setMimeType(QStringToTString(mime_type));
     frontcover->setPicture(TagLib::ByteVector(data.constData(), data.size()));
     tag->addFrame(frontcover);
   }
 
 }
 
-void TagReaderTagLib::SetEmbeddedArt(TagLib::MP4::File *aac_file, TagLib::MP4::Tag *tag, const QByteArray &data) const {
+void TagReaderTagLib::SetEmbeddedArt(TagLib::MP4::File *aac_file, TagLib::MP4::Tag *tag, const QByteArray &data, const QString &mime_type) const {
 
   (void)aac_file;
 
@@ -1303,7 +1310,17 @@ void TagReaderTagLib::SetEmbeddedArt(TagLib::MP4::File *aac_file, TagLib::MP4::T
     if (tag->contains("covr")) tag->removeItem("covr");
   }
   else {
-    covers.append(TagLib::MP4::CoverArt(TagLib::MP4::CoverArt::JPEG, TagLib::ByteVector(data.constData(), data.size())));
+    TagLib::MP4::CoverArt::Format cover_format = TagLib::MP4::CoverArt::Format::JPEG;
+    if (mime_type == "image/jpeg") {
+      cover_format = TagLib::MP4::CoverArt::Format::JPEG;
+    }
+    else if (mime_type == "image/png") {
+      cover_format = TagLib::MP4::CoverArt::Format::PNG;
+    }
+    else {
+      return;
+    }
+    covers.append(TagLib::MP4::CoverArt(cover_format, TagLib::ByteVector(data.constData(), data.size())));
     tag->setItem("covr", covers);
   }
 
@@ -1313,11 +1330,11 @@ bool TagReaderTagLib::SaveEmbeddedArt(const spb::tagreader::SaveEmbeddedArtReque
 
   if (request.filename().empty()) return false;
 
-  const QString filename = QString::fromUtf8(request.filename().data(), request.filename().size());
+  const QString filename = QString::fromUtf8(request.filename().data(), static_cast<qint64>(request.filename().size()));
 
   qLog(Debug) << "Saving art to" << filename;
 
-  const QByteArray cover_data = LoadCoverDataFromRequest(request);
+  const Cover cover = LoadCoverFromRequest(request);
 
 #ifdef Q_OS_WIN32
   TagLib::FileRef fileref(filename.toStdWString().c_str());
@@ -1331,40 +1348,40 @@ bool TagReaderTagLib::SaveEmbeddedArt(const spb::tagreader::SaveEmbeddedArtReque
   if (TagLib::FLAC::File *flac_file = dynamic_cast<TagLib::FLAC::File*>(fileref.file())) {
     TagLib::Ogg::XiphComment *xiph_comment = flac_file->xiphComment(true);
     if (!xiph_comment) return false;
-    SetEmbeddedArt(flac_file, xiph_comment, cover_data);
+    SetEmbeddedArt(flac_file, xiph_comment, cover.data, cover.mime_type);
   }
 
   // Ogg Vorbis / Opus / Speex
   else if (TagLib::Ogg::XiphComment *xiph_comment = dynamic_cast<TagLib::Ogg::XiphComment*>(fileref.file()->tag())) {
-    SetEmbeddedArt(xiph_comment, cover_data);
+    SetEmbeddedArt(xiph_comment, cover.data, cover.mime_type);
   }
 
   // MP3
   else if (TagLib::MPEG::File *file_mp3 = dynamic_cast<TagLib::MPEG::File*>(fileref.file())) {
     TagLib::ID3v2::Tag *tag = file_mp3->ID3v2Tag();
     if (!tag) return false;
-    SetEmbeddedArt(file_mp3, tag, cover_data);
+    SetEmbeddedArt(file_mp3, tag, cover.data, cover.mime_type);
   }
 
   // MP4/AAC
   else if (TagLib::MP4::File *aac_file = dynamic_cast<TagLib::MP4::File*>(fileref.file())) {
     TagLib::MP4::Tag *tag = aac_file->tag();
     if (!tag) return false;
-    SetEmbeddedArt(aac_file, tag, cover_data);
+    SetEmbeddedArt(aac_file, tag, cover.data, cover.mime_type);
   }
 
   // Not supported.
   else return false;
 
-  const bool result = fileref.file()->save();
+  const bool success = fileref.file()->save();
 #ifdef Q_OS_LINUX
-  if (result) {
+  if (success) {
     // Linux: inotify doesn't seem to notice the change to the file unless we change the timestamps as well. (this is what touch does)
     utimensat(0, QFile::encodeName(filename).constData(), nullptr, 0);
   }
 #endif  // Q_OS_LINUX
 
-  return result;
+  return success;
 
 }
 
@@ -1493,15 +1510,15 @@ bool TagReaderTagLib::SaveSongPlaycountToFile(const QString &filename, const spb
     return true;
   }
 
-  bool ret = fileref->save();
+  bool success = fileref->save();
 #ifdef Q_OS_LINUX
-  if (ret) {
+  if (success) {
     // Linux: inotify doesn't seem to notice the change to the file unless we change the timestamps as well. (this is what touch does)
     utimensat(0, QFile::encodeName(filename).constData(), nullptr, 0);
   }
 #endif  // Q_OS_LINUX
 
-  return ret;
+  return success;
 
 }
 
@@ -1605,14 +1622,14 @@ bool TagReaderTagLib::SaveSongRatingToFile(const QString &filename, const spb::t
     return true;
   }
 
-  bool ret = fileref->save();
+  const bool success = fileref->save();
 #ifdef Q_OS_LINUX
-  if (ret) {
+  if (success) {
     // Linux: inotify doesn't seem to notice the change to the file unless we change the timestamps as well. (this is what touch does)
     utimensat(0, QFile::encodeName(filename).constData(), nullptr, 0);
   }
 #endif  // Q_OS_LINUX
 
-  return ret;
+  return success;
 
 }

ext/libstrawberry-tagreader/tagreadertaglib.h

@@ -1,6 +1,6 @@
 /* This file is part of Strawberry.
    Copyright 2013, David Sansome <me@davidsansome.com>
-   Copyright 2018-2021, Jonas Kvinge <jonas@jkvinge.net>
+   Copyright 2018-2023, 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
@@ -96,10 +96,10 @@ class TagReaderTagLib : public TagReaderBase {
   void SetRating(TagLib::MP4::Tag *tag, const spb::tagreader::SongMetadata &song) const;
   void SetRating(TagLib::ASF::Tag *tag, const spb::tagreader::SongMetadata &song) const;
 
-  void SetEmbeddedArt(TagLib::FLAC::File *flac_file, TagLib::Ogg::XiphComment *xiph_comment, const QByteArray &data) const;
-  void SetEmbeddedArt(TagLib::Ogg::XiphComment *xiph_comment, const QByteArray &data) const;
-  void SetEmbeddedArt(TagLib::MPEG::File *file_mp3, TagLib::ID3v2::Tag *tag, const QByteArray &data) const;
-  void SetEmbeddedArt(TagLib::MP4::File *aac_file, TagLib::MP4::Tag *tag, const QByteArray &data) const;
+  void SetEmbeddedArt(TagLib::FLAC::File *flac_file, TagLib::Ogg::XiphComment *xiph_comment, const QByteArray &data, const QString &mime_type) const;
+  void SetEmbeddedArt(TagLib::Ogg::XiphComment *xiph_comment, const QByteArray &data, const QString &mime_type) const;
+  void SetEmbeddedArt(TagLib::MPEG::File *file_mp3, TagLib::ID3v2::Tag *tag, const QByteArray &data, const QString &mime_type) const;
+  void SetEmbeddedArt(TagLib::MP4::File *aac_file, TagLib::MP4::Tag *tag, const QByteArray &data, const QString &mime_type) const;
 
  private:
   FileRefFactory *factory_;

ext/libstrawberry-tagreader/tagreadertagparser.cpp

@@ -108,12 +108,9 @@ bool TagReaderTagParser::ReadFile(const QString &filename, spb::tagreader::SongM
   song->set_basefilename(basefilename.constData(), basefilename.size());
   song->set_url(url.constData(), url.size());
   song->set_filesize(fileinfo.size());
+
   song->set_mtime(fileinfo.lastModified().isValid() ? std::max(fileinfo.lastModified().toSecsSinceEpoch(), 0LL) : 0LL);
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0))
   song->set_ctime(fileinfo.birthTime().isValid() ? std::max(fileinfo.birthTime().toSecsSinceEpoch(), 0LL) : fileinfo.lastModified().isValid() ? std::max(fileinfo.lastModified().toSecsSinceEpoch(), 0LL) : 0LL);
-#else
-  song->set_ctime(fileinfo.created().isValid() ? std::max(fileinfo.created().toSecsSinceEpoch(), 0LL) : fileinfo.lastModified().isValid() ? std::max(fileinfo.lastModified().toSecsSinceEpoch(), 0LL) : 0LL);
-#endif
 
   if (song->ctime() <= 0) {
     song->set_ctime(song->mtime());
@@ -227,7 +224,7 @@ bool TagReaderTagParser::ReadFile(const QString &filename, spb::tagreader::SongM
       song->set_track(tag->value(TagParser::KnownField::TrackPosition).toInteger());
       song->set_disc(tag->value(TagParser::KnownField::DiskPosition).toInteger());
       if (!tag->value(TagParser::KnownField::Cover).empty() && tag->value(TagParser::KnownField::Cover).dataSize() > 0) {
-        song->set_art_automatic(kEmbeddedCover);
+        song->set_art_embedded(true);
       }
       const float rating = ConvertPOPMRating(tag->value(TagParser::KnownField::Rating));
       if (song->rating() <= 0 && rating > 0.0 && rating <= 1.0) {

ext/macdeploycheck/CMakeLists.txt

@@ -11,5 +11,5 @@ target_include_directories(macdeploycheck PUBLIC
 target_link_libraries(macdeploycheck PUBLIC
   "-framework AppKit"
   ${GLIB_LIBRARIES}
-  ${QtCore_LIBRARIES}
+  Qt${QT_VERSION_MAJOR}::Core
 )

ext/macdeploycheck/macdeploycheck.cpp

@@ -105,7 +105,7 @@ int main(int argc, char **argv) {
         else if (library.startsWith("@executable_path")) {
           QString real_path = library;
           real_path = real_path.replace("@executable_path", bundle_path + "/Contents/MacOS");
-          if (!QFile(real_path).exists()) {
+          if (!QFile::exists(real_path)) {
             qLog(Error) << real_path << "does not exist for" << filepath;
             success = false;
           }
@@ -113,7 +113,7 @@ int main(int argc, char **argv) {
         else if (library.startsWith("@rpath")) {
           QString real_path = library;
           real_path = real_path.replace("@rpath", bundle_path + "/Contents/Frameworks");
-          if (!QFile(real_path).exists() && !real_path.endsWith("QtSvg")) {  // FIXME: Ignore broken svg image plugin.
+          if (!QFile::exists(real_path) && !real_path.endsWith("QtSvg")) {  // FIXME: Ignore broken svg image plugin.
             qLog(Error) << real_path << "does not exist for" << filepath;
             success = false;
           }
@@ -122,7 +122,7 @@ int main(int argc, char **argv) {
           QString loader_path = QFileInfo(filepath).path();
           QString real_path = library;
           real_path = real_path.replace("@loader_path", loader_path);
-          if (!QFile(real_path).exists()) {
+          if (!QFile::exists(real_path)) {
             qLog(Error) << real_path << "does not exist for" << filepath;
             success = false;
           }

ext/strawberry-tagreader/CMakeLists.txt

@@ -33,8 +33,8 @@ target_include_directories(strawberry-tagreader PRIVATE
 
 target_link_libraries(strawberry-tagreader PRIVATE
   ${GLIB_LIBRARIES}
-  ${QtCore_LIBRARIES}
-  ${QtNetwork_LIBRARIES}
+  Qt${QT_VERSION_MAJOR}::Core
+  Qt${QT_VERSION_MAJOR}::Network
   libstrawberry-common
   libstrawberry-tagreader
 )

ext/strawberry-tagreader/main.cpp

@@ -20,9 +20,6 @@
 
 #include <QtGlobal>
 
-#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0)
-#  include <sys/time.h>
-#endif
 #include <iostream>
 
 #include <QCoreApplication>
@@ -46,13 +43,6 @@ int main(int argc, char **argv) {
     return 1;
   }
 
-  // Seed random number generator
-#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0)
-  timeval time;
-  gettimeofday(&time, nullptr);
-  qsrand((time.tv_sec * 1000) + (time.tv_usec / 1000));
-#endif
-
   logging::Init();
   qLog(Info) << "TagReader worker connecting to" << args[1];
 
@@ -67,4 +57,5 @@ int main(int argc, char **argv) {
   TagReaderWorker worker(&socket);
 
   return a.exec();
+  
 }

ext/strawberry-tagreader/tagreaderworker.cpp

@@ -56,13 +56,13 @@ void TagReaderWorker::DeviceClosed() {
 bool TagReaderWorker::HandleMessage(const spb::tagreader::Message &message, spb::tagreader::Message &reply, TagReaderBase *reader) {
 
   if (message.has_is_media_file_request()) {
-    const QString filename = QString::fromUtf8(message.is_media_file_request().filename().data(), message.is_media_file_request().filename().size());
+    const QString filename = QString::fromUtf8(message.is_media_file_request().filename().data(), static_cast<qint64>(message.is_media_file_request().filename().size()));
     bool success = reader->IsMediaFile(filename);
     reply.mutable_is_media_file_response()->set_success(success);
     return success;
   }
   else if (message.has_read_file_request()) {
-    const QString filename = QString::fromUtf8(message.read_file_request().filename().data(), message.read_file_request().filename().size());
+    const QString filename = QString::fromUtf8(message.read_file_request().filename().data(), static_cast<qint64>(static_cast<qint64>(message.read_file_request().filename().size())));
     bool success = reader->ReadFile(filename, reply.mutable_read_file_response()->mutable_metadata());
     return success;
   }
@@ -72,7 +72,7 @@ bool TagReaderWorker::HandleMessage(const spb::tagreader::Message &message, spb:
     return success;
   }
   else if (message.has_load_embedded_art_request()) {
-    const QString filename = QString::fromUtf8(message.load_embedded_art_request().filename().data(), message.load_embedded_art_request().filename().size());
+    const QString filename = QString::fromUtf8(message.load_embedded_art_request().filename().data(), static_cast<qint64>(static_cast<qint64>(message.load_embedded_art_request().filename().size())));
     QByteArray data = reader->LoadEmbeddedArt(filename);
     reply.mutable_load_embedded_art_response()->set_data(data.constData(), data.size());
     return true;
@@ -83,13 +83,13 @@ bool TagReaderWorker::HandleMessage(const spb::tagreader::Message &message, spb:
     return success;
   }
   else if (message.has_save_song_playcount_to_file_request()) {
-    const QString filename = QString::fromUtf8(message.save_song_playcount_to_file_request().filename().data(), message.save_song_playcount_to_file_request().filename().size());
+    const QString filename = QString::fromUtf8(message.save_song_playcount_to_file_request().filename().data(), static_cast<qint64>(static_cast<qint64>(message.save_song_playcount_to_file_request().filename().size())));
     bool success = reader->SaveSongPlaycountToFile(filename, message.save_song_playcount_to_file_request().metadata());
     reply.mutable_save_song_playcount_to_file_response()->set_success(success);
     return success;
   }
   else if (message.has_save_song_rating_to_file_request()) {
-    const QString filename = QString::fromUtf8(message.save_song_rating_to_file_request().filename().data(), message.save_song_rating_to_file_request().filename().size());
+    const QString filename = QString::fromUtf8(message.save_song_rating_to_file_request().filename().data(), static_cast<qint64>(message.save_song_rating_to_file_request().filename().size()));
     bool success = reader->SaveSongRatingToFile(filename, message.save_song_rating_to_file_request().metadata());
     reply.mutable_save_song_rating_to_file_response()->set_success(success);
     return success;

src/CMakeLists.txt

@@ -56,11 +56,14 @@ set(SOURCES
   utilities/xmlutils.cpp
   utilities/filemanagerutils.cpp
   utilities/coverutils.cpp
+  utilities/screenutils.cpp
+  utilities/searchparserutils.cpp
 
-  engine/enginetype.cpp
   engine/enginebase.cpp
+  engine/enginedevice.cpp
   engine/devicefinders.cpp
   engine/devicefinder.cpp
+  engine/enginemetadata.cpp
 
   analyzer/fht.cpp
   analyzer/analyzerbase.cpp
@@ -110,6 +113,7 @@ set(SOURCES
   playlist/playlisttabbar.cpp
   playlist/playlistundocommands.cpp
   playlist/playlistview.cpp
+  playlist/playlistproxystyle.cpp
   playlist/songloaderinserter.cpp
   playlist/songplaylistitem.cpp
   playlist/dynamicplaylistcontrols.cpp
@@ -145,6 +149,7 @@ set(SOURCES
   covermanager/albumcovermanager.cpp
   covermanager/albumcovermanagerlist.cpp
   covermanager/albumcoverloader.cpp
+  covermanager/albumcoverloaderoptions.cpp
   covermanager/albumcoverfetcher.cpp
   covermanager/albumcoverfetchersearch.cpp
   covermanager/albumcoversearcher.cpp
@@ -174,13 +179,16 @@ set(SOURCES
   lyrics/lyricsfetcher.cpp
   lyrics/lyricsfetchersearch.cpp
   lyrics/jsonlyricsprovider.cpp
-  lyrics/auddlyricsprovider.cpp
+  lyrics/htmllyricsprovider.cpp
   lyrics/ovhlyricsprovider.cpp
   lyrics/lololyricsprovider.cpp
   lyrics/geniuslyricsprovider.cpp
   lyrics/musixmatchlyricsprovider.cpp
   lyrics/chartlyricsprovider.cpp
-  lyrics/lyricscomlyricsprovider.cpp
+  lyrics/songlyricscomlyricsprovider.cpp
+  lyrics/azlyricscomlyricsprovider.cpp
+  lyrics/elyricsnetlyricsprovider.cpp
+  lyrics/lyricsmodecomlyricsprovider.cpp
 
   providers/musixmatchprovider.cpp
 
@@ -207,6 +215,7 @@ set(SOURCES
   dialogs/userpassdialog.cpp
   dialogs/deleteconfirmationdialog.cpp
   dialogs/lastfmimportdialog.cpp
+  dialogs/messagedialog.cpp
   dialogs/snapdialog.cpp
   dialogs/saveplaylistsdialog.cpp
 
@@ -266,7 +275,7 @@ set(SOURCES
   radios/radioparadiseservice.cpp
 
   scrobbler/audioscrobbler.cpp
-  scrobbler/scrobblerservices.cpp
+  scrobbler/scrobblersettings.cpp
   scrobbler/scrobblerservice.cpp
   scrobbler/scrobblercache.cpp
   scrobbler/scrobblercacheitem.cpp
@@ -351,6 +360,7 @@ set(HEADERS
   playlist/playlistsequence.h
   playlist/playlisttabbar.h
   playlist/playlistview.h
+  playlist/playlistproxystyle.h
   playlist/playlistitemmimedata.h
   playlist/songloaderinserter.h
   playlist/songmimedata.h
@@ -412,13 +422,16 @@ set(HEADERS
   lyrics/lyricsfetcher.h
   lyrics/lyricsfetchersearch.h
   lyrics/jsonlyricsprovider.h
-  lyrics/auddlyricsprovider.h
+  lyrics/htmllyricsprovider.h
   lyrics/ovhlyricsprovider.h
   lyrics/lololyricsprovider.h
   lyrics/geniuslyricsprovider.h
   lyrics/musixmatchlyricsprovider.h
   lyrics/chartlyricsprovider.h
-  lyrics/lyricscomlyricsprovider.h
+  lyrics/songlyricscomlyricsprovider.h
+  lyrics/azlyricscomlyricsprovider.h
+  lyrics/elyricsnetlyricsprovider.h
+  lyrics/lyricsmodecomlyricsprovider.h
 
   settings/settingsdialog.h
   settings/settingspage.h
@@ -443,6 +456,7 @@ set(HEADERS
   dialogs/userpassdialog.h
   dialogs/deleteconfirmationdialog.h
   dialogs/lastfmimportdialog.h
+  dialogs/messagedialog.h
   dialogs/snapdialog.h
   dialogs/saveplaylistsdialog.h
 
@@ -500,7 +514,7 @@ set(HEADERS
   radios/radioparadiseservice.h
 
   scrobbler/audioscrobbler.h
-  scrobbler/scrobblerservices.h
+  scrobbler/scrobblersettings.h
   scrobbler/scrobblerservice.h
   scrobbler/scrobblercache.h
   scrobbler/scrobblingapi20.h
@@ -569,7 +583,7 @@ set(UI
   dialogs/addstreamdialog.ui
   dialogs/userpassdialog.ui
   dialogs/lastfmimportdialog.ui
-  dialogs/snapdialog.ui
+  dialogs/messagedialog.ui
   dialogs/saveplaylistsdialog.ui
 
   widgets/trackslider.ui
@@ -590,7 +604,6 @@ set(UI
 )
 
 set(RESOURCES ../data/data.qrc ../data/icons.qrc)
-set(OTHER_SOURCES)
 
 option(USE_INSTALL_PREFIX "Look for data in CMAKE_INSTALL_PREFIX" ON)
 
@@ -837,6 +850,7 @@ optional_source(WIN32
   HEADERS
     core/windows7thumbbar.h
 )
+optional_source(MSVC SOURCES engine/uwpdevicefinder.cpp)
 
 optional_source(HAVE_SUBSONIC
   SOURCES
@@ -925,6 +939,11 @@ optional_source(HAVE_MOODBAR
     settings/moodbarsettingspage.ui
 )
 
+# EBU R 128
+optional_source(HAVE_EBUR128
+  SOURCES engine/ebur128analysis.cpp
+)
+
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h)
 
@@ -956,8 +975,7 @@ if(HAVE_TRANSLATIONS)
     ${SOURCES}
     ${MOC}
     ${UIC}
-    ${OTHER_SOURCES}
-    ../data/html/oauthsuccess.html
+    ${CMAKE_SOURCE_DIR}/data/html/oauthsuccess.html
   )
   add_po(PO strawberry_ LANGUAGES ${LANGUAGES} DIRECTORY translations)
 
@@ -967,11 +985,9 @@ link_directories(
   ${Boost_LIBRARY_DIRS}
   ${GLIB_LIBRARY_DIRS}
   ${GOBJECT_LIBRARY_DIRS}
-  ${GNUTLS_LIBRARY_DIRS}
   ${SQLITE_LIBRARY_DIRS}
   ${PROTOBUF_LIBRARY_DIRS}
   ${SINGLEAPPLICATION_LIBRARY_DIRS}
-  ${SINGLECOREAPPLICATION_LIBRARY_DIRS}
 )
 
 if(HAVE_ICU)
@@ -1061,7 +1077,6 @@ target_include_directories(strawberry_lib SYSTEM PUBLIC
   ${Boost_INCLUDE_DIRS}
   ${GLIB_INCLUDE_DIRS}
   ${GOBJECT_INCLUDE_DIRS}
-  ${GNUTLS_INCLUDE_DIRS}
   ${SQLITE_INCLUDE_DIRS}
   ${PROTOBUF_INCLUDE_DIRS}
 )
@@ -1079,23 +1094,33 @@ target_include_directories(strawberry_lib PUBLIC
   ${CMAKE_SOURCE_DIR}/ext/libstrawberry-tagreader
   ${CMAKE_BINARY_DIR}/ext/libstrawberry-tagreader
   ${SINGLEAPPLICATION_INCLUDE_DIRS}
-  ${SINGLECOREAPPLICATION_INCLUDE_DIRS}
 )
 
 target_link_libraries(strawberry_lib PUBLIC
   ${CMAKE_THREAD_LIBS_INIT}
   ${GLIB_LIBRARIES}
   ${GOBJECT_LIBRARIES}
-  ${GNUTLS_LIBRARIES}
   ${SQLITE_LIBRARIES}
-  ${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
   ${Protobuf_LIBRARIES}
   ${SINGLEAPPLICATION_LIBRARIES}
-  ${SINGLECOREAPPLICATION_LIBRARIES}
   libstrawberry-common
   libstrawberry-tagreader
 )
 
+if(HAVE_DBUS)
+  target_link_libraries(strawberry_lib PUBLIC Qt${QT_VERSION_MAJOR}::DBus)
+endif()
+
+if(HAVE_X11_GLOBALSHORTCUTS AND HAVE_X11EXTRAS)
+  target_link_libraries(strawberry_lib PUBLIC Qt${QT_VERSION_MAJOR}::X11Extras)
+endif()
+
 if(HAVE_ICU)
   target_include_directories(strawberry_lib SYSTEM PRIVATE ${ICU_INCLUDE_DIRS})
   target_link_libraries(strawberry_lib PRIVATE ${ICU_LIBRARIES})
@@ -1150,6 +1175,10 @@ if(HAVE_SONGFINGERPRINTING OR HAVE_MUSICBRAINZ)
   target_link_libraries(strawberry_lib PRIVATE ${CHROMAPRINT_LIBRARIES})
 endif()
 
+if(HAVE_EBUR128)
+  target_link_libraries(strawberry_lib PRIVATE PkgConfig::LIBEBUR128)
+endif()
+
 if(X11_FOUND)
   target_include_directories(strawberry_lib SYSTEM PRIVATE ${X11_INCLUDE_DIR})
   target_link_libraries(strawberry_lib PRIVATE ${X11_LIBRARIES})
@@ -1201,13 +1230,13 @@ endif()
 if(WIN32)
   target_link_libraries(strawberry_lib PRIVATE dsound dwmapi)
   if(MSVC)
-    target_link_libraries(strawberry_lib PRIVATE sqlite3)
-    if (GETOPT_INCLUDE_DIRS)
-      target_include_directories(strawberry_lib SYSTEM PRIVATE ${GETOPT_INCLUDE_DIRS})
-    endif()
-    if(GETOPT_LIBRARIES)
-      target_link_libraries(strawberry_lib PRIVATE ${GETOPT_LIBRARIES})
-    endif()
+    target_link_libraries(strawberry_lib PRIVATE WindowsApp)
+  endif()
+  if(GETOPT_INCLUDE_DIRS)
+    target_include_directories(strawberry_lib SYSTEM PRIVATE ${GETOPT_INCLUDE_DIRS})
+  endif()
+  if(GETOPT_LIBRARIES)
+    target_link_libraries(strawberry_lib PRIVATE ${GETOPT_LIBRARIES})
   endif()
 endif()
 

src/analyzer/analyzerbase.cpp

@@ -24,9 +24,9 @@
 
 #include "analyzerbase.h"
 
-#include <algorithm>
-#include <cmath>
 #include <cstdint>
+#include <cmath>
+#include <algorithm>
 
 #include <QWidget>
 #include <QVector>
@@ -50,7 +50,7 @@
 // Make an INSTRUCTIONS file
 // can't mod scope in analyze you have to use transform for 2D use setErasePixmap Qt function insetead of m_background
 
-Analyzer::Base::Base(QWidget *parent, const uint scopeSize)
+AnalyzerBase::AnalyzerBase(QWidget *parent, const uint scopeSize)
     : QWidget(parent),
       fht_(new FHT(scopeSize)),
       engine_(nullptr),
@@ -63,19 +63,19 @@ Analyzer::Base::Base(QWidget *parent, const uint scopeSize)
 
 }
 
-Analyzer::Base::~Base() {
+AnalyzerBase::~AnalyzerBase() {
   delete fht_;
 }
 
-void Analyzer::Base::showEvent(QShowEvent*) {
+void AnalyzerBase::showEvent(QShowEvent*) {
   timer_.start(timeout(), this);
 }
 
-void Analyzer::Base::hideEvent(QHideEvent*) {
+void AnalyzerBase::hideEvent(QHideEvent*) {
   timer_.stop();
 }
 
-void Analyzer::Base::ChangeTimeout(const int timeout) {
+void AnalyzerBase::ChangeTimeout(const int timeout) {
 
   timeout_ = timeout;
   if (timer_.isActive()) {
@@ -85,7 +85,7 @@ void Analyzer::Base::ChangeTimeout(const int timeout) {
 
 }
 
-void Analyzer::Base::transform(Scope &scope) {
+void AnalyzerBase::transform(Scope &scope) {
 
   QVector<float> aux(fht_->size());
   if (static_cast<unsigned long int>(aux.size()) >= scope.size()) {
@@ -102,14 +102,14 @@ void Analyzer::Base::transform(Scope &scope) {
 
 }
 
-void Analyzer::Base::paintEvent(QPaintEvent *e) {
+void AnalyzerBase::paintEvent(QPaintEvent *e) {
 
   QPainter p(this);
   p.fillRect(e->rect(), palette().color(QPalette::Window));
 
   switch (engine_->state()) {
-    case Engine::State::Playing: {
-      const Engine::Scope &thescope = engine_->scope(timeout_);
+    case EngineBase::State::Playing: {
+      const EngineBase::Scope &thescope = engine_->scope(timeout_);
       int i = 0;
 
       // convert to mono here - our built in analyzers need mono, but the engines provide interleaved pcm
@@ -126,7 +126,7 @@ void Analyzer::Base::paintEvent(QPaintEvent *e) {
 
       break;
     }
-    case Engine::State::Paused:
+    case EngineBase::State::Paused:
       is_playing_ = false;
       analyze(p, lastscope_, new_frame_);
       break;
@@ -140,7 +140,7 @@ void Analyzer::Base::paintEvent(QPaintEvent *e) {
 
 }
 
-int Analyzer::Base::resizeExponent(int exp) {
+int AnalyzerBase::resizeExponent(int exp) {
 
   if (exp < 3) {
     exp = 3;
@@ -157,7 +157,7 @@ int Analyzer::Base::resizeExponent(int exp) {
 
 }
 
-int Analyzer::Base::resizeForBands(const int bands) {
+int AnalyzerBase::resizeForBands(const int bands) {
 
   int exp = 0;
   if (bands <= 8) {
@@ -184,7 +184,7 @@ int Analyzer::Base::resizeForBands(const int bands) {
 
 }
 
-void Analyzer::Base::demo(QPainter &p) {
+void AnalyzerBase::demo(QPainter &p) {
 
   static int t = 201;  // FIXME make static to namespace perhaps
 
@@ -209,7 +209,7 @@ void Analyzer::Base::demo(QPainter &p) {
 
 }
 
-void Analyzer::interpolate(const Scope &inVec, Scope &outVec) {
+void AnalyzerBase::interpolate(const Scope &inVec, Scope &outVec) {
 
   double pos = 0.0;
   const double step = static_cast<double>(inVec.size()) / static_cast<double>(outVec.size());
@@ -235,7 +235,7 @@ void Analyzer::interpolate(const Scope &inVec, Scope &outVec) {
 
 }
 
-void Analyzer::initSin(Scope &v, const uint size) {
+void AnalyzerBase::initSin(Scope &v, const uint size) {
 
   double step = (M_PI * 2) / size;
   double radian = 0;
@@ -247,7 +247,7 @@ void Analyzer::initSin(Scope &v, const uint size) {
 
 }
 
-void Analyzer::Base::timerEvent(QTimerEvent *e) {
+void AnalyzerBase::timerEvent(QTimerEvent *e) {
 
   QWidget::timerEvent(e);
   if (e->timerId() != timer_.timerId()) {

src/analyzer/analyzerbase.h

@@ -38,8 +38,8 @@
 #include <QString>
 #include <QPainter>
 
+#include "core/shared_ptr.h"
 #include "analyzer/fht.h"
-#include "engine/engine_fwd.h"
 #include "engine/enginebase.h"
 
 class QHideEvent;
@@ -47,26 +47,23 @@ class QShowEvent;
 class QPaintEvent;
 class QTimerEvent;
 
-namespace Analyzer {
-
-using Scope = std::vector<float>;
-
-class Base : public QWidget {
+class AnalyzerBase : public QWidget {
   Q_OBJECT
 
  public:
-  ~Base() override;
+  ~AnalyzerBase() override;
 
   int timeout() const { return timeout_; }
 
-  void set_engine(EngineBase *engine) { engine_ = engine; }
+  void set_engine(SharedPtr<EngineBase> engine) { engine_ = engine; }
 
   void ChangeTimeout(const int timeout);
 
   virtual void framerateChanged() {}
 
  protected:
-  explicit Base(QWidget*, const uint scopeSize = 7);
+  using Scope = std::vector<float>;
+  explicit AnalyzerBase(QWidget*, const uint scopeSize = 7);
 
   void hideEvent(QHideEvent*) override;
   void showEvent(QShowEvent*) override;
@@ -80,10 +77,13 @@ class Base : public QWidget {
   virtual void analyze(QPainter &p, const Scope&, const bool new_frame) = 0;
   virtual void demo(QPainter &p);
 
+  void interpolate(const Scope&, Scope&);
+  void initSin(Scope&, const uint = 6000);
+
  protected:
   QBasicTimer timer_;
   FHT *fht_;
-  EngineBase *engine_;
+  SharedPtr<EngineBase> engine_;
   Scope lastscope_;
 
   bool new_frame_;
@@ -91,10 +91,5 @@ class Base : public QWidget {
   int timeout_;
 };
 
-void interpolate(const Scope&, Scope&);
-void initSin(Scope&, const uint = 6000);
-
-}  //  namespace Analyzer
-
 #endif  // ANALYZERBASE_H
 

src/analyzer/analyzercontainer.cpp

@@ -43,8 +43,8 @@
 #include "sonogram.h"
 
 #include "core/logging.h"
+#include "core/shared_ptr.h"
 #include "engine/enginebase.h"
-#include "engine/enginetype.h"
 
 using namespace std::chrono_literals;
 
@@ -84,8 +84,8 @@ AnalyzerContainer::AnalyzerContainer(QWidget *parent)
 
   AddAnalyzerType<BlockAnalyzer>();
   AddAnalyzerType<BoomAnalyzer>();
-  AddAnalyzerType<Rainbow::NyanCatAnalyzer>();
-  AddAnalyzerType<Rainbow::RainbowDashAnalyzer>();
+  AddAnalyzerType<NyanCatAnalyzer>();
+  AddAnalyzerType<RainbowDashAnalyzer>();
   AddAnalyzerType<Sonogram>();
 
   disable_action_ = context_menu_->addAction(tr("No analyzer"), this, &AnalyzerContainer::DisableAnalyzer);
@@ -104,7 +104,7 @@ AnalyzerContainer::AnalyzerContainer(QWidget *parent)
 
 void AnalyzerContainer::mouseReleaseEvent(QMouseEvent *e) {
 
-  if (engine_->type() != Engine::EngineType::GStreamer) {
+  if (engine_->type() != EngineBase::Type::GStreamer) {
     return;
   }
 
@@ -126,7 +126,7 @@ void AnalyzerContainer::wheelEvent(QWheelEvent *e) {
   emit WheelEvent(e->angleDelta().y());
 }
 
-void AnalyzerContainer::SetEngine(EngineBase *engine) {
+void AnalyzerContainer::SetEngine(SharedPtr<EngineBase> engine) {
 
   if (current_analyzer_) current_analyzer_->set_engine(engine);
   engine_ = engine;
@@ -150,7 +150,7 @@ void AnalyzerContainer::ChangeAnalyzer(const int id) {
   }
 
   delete current_analyzer_;
-  current_analyzer_ = qobject_cast<Analyzer::Base*>(instance);
+  current_analyzer_ = qobject_cast<AnalyzerBase*>(instance);
   current_analyzer_->set_engine(engine_);
   // Even if it is not supposed to happen, I don't want to get a dbz error
   current_framerate_ = current_framerate_ == 0 ? kMediumFramerate : current_framerate_;

src/analyzer/analyzercontainer.h

@@ -30,15 +30,14 @@
 #include <QAction>
 #include <QActionGroup>
 
-#include "engine/engine_fwd.h"
+#include "core/shared_ptr.h"
+#include "engine/enginebase.h"
 
 class QTimer;
 class QMouseEvent;
 class QWheelEvent;
 
-namespace Analyzer {
-class Base;
-}  // namespace Analyzer
+class AnalyzerBase;
 
 class AnalyzerContainer : public QWidget {
   Q_OBJECT
@@ -46,14 +45,14 @@ class AnalyzerContainer : public QWidget {
  public:
   explicit AnalyzerContainer(QWidget *parent);
 
-  void SetEngine(EngineBase *engine);
+  void SetEngine(SharedPtr<EngineBase> engine);
   void SetActions(QAction *visualisation);
 
   static const char *kSettingsGroup;
   static const char *kSettingsFramerate;
 
  signals:
-  void WheelEvent(int delta);
+  void WheelEvent(const int delta);
 
  protected:
   void mouseReleaseEvent(QMouseEvent*) override;
@@ -94,8 +93,8 @@ class AnalyzerContainer : public QWidget {
   QPoint last_click_pos_;
   bool ignore_next_click_;
 
-  Analyzer::Base *current_analyzer_;
-  EngineBase *engine_;
+  AnalyzerBase *current_analyzer_;
+  SharedPtr<EngineBase> engine_;
 };
 
 template<typename T>

src/analyzer/blockanalyzer.cpp

@@ -46,7 +46,7 @@ const int BlockAnalyzer::kFadeSize = 90;
 const char *BlockAnalyzer::kName = QT_TRANSLATE_NOOP("AnalyzerContainer", "Block analyzer");
 
 BlockAnalyzer::BlockAnalyzer(QWidget *parent)
-    : Analyzer::Base(parent, 9),
+    : AnalyzerBase(parent, 9),
       columns_(0),
       rows_(0),
       y_(0),
@@ -124,7 +124,7 @@ void BlockAnalyzer::framerateChanged() {
   determineStep();
 }
 
-void BlockAnalyzer::transform(Analyzer::Scope &s) {
+void BlockAnalyzer::transform(Scope &s) {
 
   for (uint x = 0; x < s.size(); ++x) s[x] *= 2;
 
@@ -136,7 +136,7 @@ void BlockAnalyzer::transform(Analyzer::Scope &s) {
 
 }
 
-void BlockAnalyzer::analyze(QPainter &p, const Analyzer::Scope &s, bool new_frame) {
+void BlockAnalyzer::analyze(QPainter &p, const Scope &s, bool new_frame) {
 
   // y = 2 3 2 1 0 2
   //     . . . . # .
@@ -158,14 +158,14 @@ void BlockAnalyzer::analyze(QPainter &p, const Analyzer::Scope &s, bool new_fram
 
   QPainter canvas_painter(&canvas_);
 
-  Analyzer::interpolate(s, scope_);
+  interpolate(s, scope_);
 
   // Paint the background
   canvas_painter.drawPixmap(0, 0, background_);
 
   for (int x = 0, y = 0; x < static_cast<int>(scope_.size()); ++x) {
     // determine y
-    for (y = 0; scope_[x] < yscale_[y]; ++y) continue;
+    for (y = 0; scope_[x] < yscale_[y]; ++y);
 
     // This is opposite to what you'd think, higher than y means the bar is lower than y (physically)
     if (static_cast<double>(y) > store_[x]) {

src/analyzer/blockanalyzer.h

@@ -37,7 +37,7 @@
 class QWidget;
 class QResizeEvent;
 
-class BlockAnalyzer : public Analyzer::Base {
+class BlockAnalyzer : public AnalyzerBase {
   Q_OBJECT
 
  public:
@@ -53,8 +53,8 @@ class BlockAnalyzer : public Analyzer::Base {
   static const char *kName;
 
  protected:
-  void transform(Analyzer::Scope&) override;
-  void analyze(QPainter &p, const Analyzer::Scope&, bool new_frame) override;
+  void transform(Scope&) override;
+  void analyze(QPainter &p, const Scope&, bool new_frame) override;
   void resizeEvent(QResizeEvent*) override;
   virtual void paletteChange(const QPalette&);
   void framerateChanged() override;
@@ -71,7 +71,7 @@ class BlockAnalyzer : public Analyzer::Base {
   QPixmap topbarpixmap_;
   QPixmap background_;
   QPixmap canvas_;
-  Analyzer::Scope scope_;  // so we don't create a vector every frame
+  Scope scope_;  // so we don't create a vector every frame
   QVector<double> store_;  // current bar heights
   QVector<double> yscale_;
 

src/analyzer/boomanalyzer.cpp

@@ -32,13 +32,10 @@
 #include <QPalette>
 #include <QColor>
 
-#include "engine/engine_fwd.h"
 #include "engine/enginebase.h"
 #include "fht.h"
 #include "analyzerbase.h"
 
-using Analyzer::Scope;
-
 const int BoomAnalyzer::kColumnWidth = 4;
 const int BoomAnalyzer::kMaxBandCount = 256;
 const int BoomAnalyzer::kMinBandCount = 32;
@@ -46,7 +43,7 @@ const int BoomAnalyzer::kMinBandCount = 32;
 const char *BoomAnalyzer::kName = QT_TRANSLATE_NOOP("AnalyzerContainer", "Boom analyzer");
 
 BoomAnalyzer::BoomAnalyzer(QWidget *parent)
-    : Analyzer::Base(parent, 9),
+    : AnalyzerBase(parent, 9),
       bands_(0),
       scope_(kMinBandCount),
       fg_(palette().color(QPalette::Highlight)),
@@ -110,20 +107,20 @@ void BoomAnalyzer::transform(Scope &s) {
 
 void BoomAnalyzer::analyze(QPainter &p, const Scope &scope, const bool new_frame) {
 
-  if (!new_frame || engine_->state() == Engine::State::Paused) {
+  if (!new_frame || engine_->state() == EngineBase::State::Paused) {
     p.drawPixmap(0, 0, canvas_);
     return;
   }
-  double h = 0.0;
+
   const uint MAX_HEIGHT = height() - 1;
 
   QPainter canvas_painter(&canvas_);
   canvas_.fill(palette().color(QPalette::Window));
 
-  Analyzer::interpolate(scope, scope_);
+  interpolate(scope, scope_);
 
   for (int i = 0, x = 0, y = 0; i < bands_; ++i, x += kColumnWidth + 1) {
-    h = log10(scope_[i] * 256.0) * F_;
+    double h = log10(scope_[i] * 256.0) * F_;
 
     if (h > MAX_HEIGHT) h = MAX_HEIGHT;
 

src/analyzer/boomanalyzer.h

@@ -36,7 +36,7 @@
 class QWidget;
 class QResizeEvent;
 
-class BoomAnalyzer : public Analyzer::Base {
+class BoomAnalyzer : public AnalyzerBase {
   Q_OBJECT
 
  public:
@@ -44,8 +44,8 @@ class BoomAnalyzer : public Analyzer::Base {
 
   static const char *kName;
 
-  void transform(Analyzer::Scope &s) override;
-  void analyze(QPainter &p, const Analyzer::Scope&, const bool new_frame) override;
+  void transform(Scope &s) override;
+  void analyze(QPainter &p, const Scope&, const bool new_frame) override;
 
  public slots:
   void changeK_barHeight(int);
@@ -59,7 +59,7 @@ class BoomAnalyzer : public Analyzer::Base {
   static const int kMinBandCount;
 
   int bands_;
-  Analyzer::Scope scope_;
+  Scope scope_;
   QColor fg_;
 
   double K_barHeight_, F_peakSpeed_, F_;

src/analyzer/rainbowanalyzer.cpp

@@ -41,23 +41,21 @@
 #include "fht.h"
 #include "analyzerbase.h"
 
-using Analyzer::Scope;
+const int RainbowAnalyzer::kHeight[] = { 21, 33 };
+const int RainbowAnalyzer::kWidth[] = { 34, 53 };
+const int RainbowAnalyzer::kFrameCount[] = { 6, 16 };
+const int RainbowAnalyzer::kRainbowHeight[] = { 21, 16 };
+const int RainbowAnalyzer::kRainbowOverlap[] = { 13, 15 };
+const int RainbowAnalyzer::kSleepingHeight[] = { 24, 33 };
 
-const int Rainbow::RainbowAnalyzer::kHeight[] = { 21, 33 };
-const int Rainbow::RainbowAnalyzer::kWidth[] = { 34, 53 };
-const int Rainbow::RainbowAnalyzer::kFrameCount[] = { 6, 16 };
-const int Rainbow::RainbowAnalyzer::kRainbowHeight[] = { 21, 16 };
-const int Rainbow::RainbowAnalyzer::kRainbowOverlap[] = { 13, 15 };
-const int Rainbow::RainbowAnalyzer::kSleepingHeight[] = { 24, 33 };
+const char *NyanCatAnalyzer::kName = "Nyanalyzer Cat";
+const char *RainbowDashAnalyzer::kName = "Rainbow Dash";
+const float RainbowAnalyzer::kPixelScale = 0.02F;
 
-const char *Rainbow::NyanCatAnalyzer::kName = "Nyanalyzer Cat";
-const char *Rainbow::RainbowDashAnalyzer::kName = "Rainbow Dash";
-const float Rainbow::RainbowAnalyzer::kPixelScale = 0.02F;
+RainbowAnalyzer::RainbowType RainbowAnalyzer::rainbowtype;
 
-Rainbow::RainbowAnalyzer::RainbowType Rainbow::RainbowAnalyzer::rainbowtype;
-
-Rainbow::RainbowAnalyzer::RainbowAnalyzer(const RainbowType rbtype, QWidget *parent)
-    : Analyzer::Base(parent, 9),
+RainbowAnalyzer::RainbowAnalyzer(const RainbowType rbtype, QWidget *parent)
+    : AnalyzerBase(parent, 9),
       timer_id_(startTimer(kFrameIntervalMs)),
       frame_(0),
       current_buffer_(0),
@@ -81,20 +79,20 @@ Rainbow::RainbowAnalyzer::RainbowAnalyzer(const RainbowType rbtype, QWidget *par
 
 }
 
-void Rainbow::RainbowAnalyzer::transform(Scope &s) { fht_->spectrum(s.data()); }
+void RainbowAnalyzer::transform(Scope &s) { fht_->spectrum(s.data()); }
 
-void Rainbow::RainbowAnalyzer::timerEvent(QTimerEvent *e) {
+void RainbowAnalyzer::timerEvent(QTimerEvent *e) {
 
   if (e->timerId() == timer_id_) {
     frame_ = (frame_ + 1) % kFrameCount[rainbowtype];
   }
   else {
-    Analyzer::Base::timerEvent(e);
+    AnalyzerBase::timerEvent(e);
   }
 
 }
 
-void Rainbow::RainbowAnalyzer::resizeEvent(QResizeEvent *e) {
+void RainbowAnalyzer::resizeEvent(QResizeEvent *e) {
 
   Q_UNUSED(e);
 
@@ -108,7 +106,7 @@ void Rainbow::RainbowAnalyzer::resizeEvent(QResizeEvent *e) {
 
 }
 
-void Rainbow::RainbowAnalyzer::analyze(QPainter &p, const Analyzer::Scope &s, bool new_frame) {
+void RainbowAnalyzer::analyze(QPainter &p, const Scope &s, bool new_frame) {
 
   // Discard the second half of the transform
   const int scope_size = static_cast<int>(s.size() / 2);
@@ -203,8 +201,8 @@ void Rainbow::RainbowAnalyzer::analyze(QPainter &p, const Analyzer::Scope &s, bo
 
 }
 
-Rainbow::NyanCatAnalyzer::NyanCatAnalyzer(QWidget *parent)
-    : RainbowAnalyzer(Rainbow::RainbowAnalyzer::Nyancat, parent) {}
+NyanCatAnalyzer::NyanCatAnalyzer(QWidget *parent)
+    : RainbowAnalyzer(RainbowAnalyzer::Nyancat, parent) {}
 
-Rainbow::RainbowDashAnalyzer::RainbowDashAnalyzer(QWidget *parent)
-    : RainbowAnalyzer(Rainbow::RainbowAnalyzer::Dash, parent) {}
+RainbowDashAnalyzer::RainbowDashAnalyzer(QWidget *parent)
+    : RainbowAnalyzer(RainbowAnalyzer::Dash, parent) {}

src/analyzer/rainbowanalyzer.h

@@ -40,8 +40,7 @@ class QWidget;
 class QTimerEvent;
 class QResizeEvent;
 
-namespace Rainbow {
-class RainbowAnalyzer : public Analyzer::Base {
+class RainbowAnalyzer : public AnalyzerBase {
   Q_OBJECT
 
  public:
@@ -53,8 +52,8 @@ class RainbowAnalyzer : public Analyzer::Base {
   RainbowAnalyzer(const RainbowType rbtype, QWidget *parent);
 
  protected:
-  void transform(Analyzer::Scope&) override;
-  void analyze(QPainter &p, const Analyzer::Scope&, bool new_frame) override;
+  void transform(Scope&) override;
+  void analyze(QPainter &p, const Scope&, bool new_frame) override;
 
   void timerEvent(QTimerEvent *e) override;
   void resizeEvent(QResizeEvent *e) override;
@@ -142,6 +141,5 @@ class RainbowDashAnalyzer : public RainbowAnalyzer {
 
   static const char *kName;
 };
-}  // namespace Rainbow
 
 #endif  // RAINBOWANALYZER_H

src/analyzer/sonogram.cpp

@@ -24,12 +24,14 @@
 #include <QPainter>
 #include <QResizeEvent>
 
+#include "engine/enginebase.h"
+
 #include "sonogram.h"
 
 const char *Sonogram::kName = QT_TRANSLATE_NOOP("AnalyzerContainer", "Sonogram");
 
 Sonogram::Sonogram(QWidget *parent)
-    : Analyzer::Base(parent, 9) {}
+    : AnalyzerBase(parent, 9) {}
 
 void Sonogram::resizeEvent(QResizeEvent *e) {
 
@@ -40,9 +42,9 @@ void Sonogram::resizeEvent(QResizeEvent *e) {
 
 }
 
-void Sonogram::analyze(QPainter &p, const Analyzer::Scope &s, bool new_frame) {
+void Sonogram::analyze(QPainter &p, const Scope &s, bool new_frame) {
 
-  if (!new_frame || engine_->state() == Engine::State::Paused) {
+  if (!new_frame || engine_->state() == EngineBase::State::Paused) {
     p.drawPixmap(0, 0, canvas_);
     return;
   }
@@ -50,7 +52,7 @@ void Sonogram::analyze(QPainter &p, const Analyzer::Scope &s, bool new_frame) {
   QPainter canvas_painter(&canvas_);
   canvas_painter.drawPixmap(0, 0, canvas_, 1, 0, width() - 1, -1);
 
-  Analyzer::Scope::const_iterator it = s.begin(), end = s.end();
+  Scope::const_iterator it = s.begin(), end = s.end();
 
   for (int y = height() - 1; y;) {
     QColor c;
@@ -79,7 +81,7 @@ void Sonogram::analyze(QPainter &p, const Analyzer::Scope &s, bool new_frame) {
 
 }
 
-void Sonogram::transform(Analyzer::Scope &scope) {
+void Sonogram::transform(Scope &scope) {
 
   fht_->power2(scope.data());
   fht_->scale(scope.data(), 1.0 / 256);
@@ -88,5 +90,5 @@ void Sonogram::transform(Analyzer::Scope &scope) {
 }
 
 void Sonogram::demo(QPainter &p) {
-  analyze(p, Analyzer::Scope(fht_->size(), 0), new_frame_);
+  analyze(p, Scope(fht_->size(), 0), new_frame_);
 }

src/analyzer/sonogram.h

@@ -29,7 +29,7 @@
 
 #include "analyzerbase.h"
 
-class Sonogram : public Analyzer::Base {
+class Sonogram : public AnalyzerBase {
   Q_OBJECT
  public:
   Q_INVOKABLE explicit Sonogram(QWidget *parent);
@@ -38,8 +38,8 @@ class Sonogram : public Analyzer::Base {
 
  protected:
   void resizeEvent(QResizeEvent *e) override;
-  void analyze(QPainter &p, const Analyzer::Scope &s, bool new_frame) override;
-  void transform(Analyzer::Scope &scope) override;
+  void analyze(QPainter &p, const Scope &s, bool new_frame) override;
+  void transform(Scope &scope) override;
   void demo(QPainter &p) override;
 
  private:

src/collection/collection.cpp

@@ -21,6 +21,8 @@
 
 #include "config.h"
 
+#include <memory>
+
 #include <QtGlobal>
 #include <QObject>
 #include <QThread>
@@ -31,7 +33,6 @@
 #include "core/application.h"
 #include "core/taskmanager.h"
 #include "core/database.h"
-#include "core/player.h"
 #include "core/tagreaderclient.h"
 #include "core/thread.h"
 #include "core/song.h"
@@ -41,10 +42,11 @@
 #include "collectionwatcher.h"
 #include "collectionbackend.h"
 #include "collectionmodel.h"
-#include "playlist/playlistmanager.h"
 #include "scrobbler/lastfmimport.h"
 #include "settings/collectionsettingspage.h"
 
+using std::make_shared;
+
 const char *SCollection::kSongsTable = "songs";
 const char *SCollection::kFtsTable = "songs_fts";
 const char *SCollection::kDirsTable = "directories";
@@ -63,9 +65,9 @@ SCollection::SCollection(Application *app, QObject *parent)
 
   original_thread_ = thread();
 
-  backend_ = new CollectionBackend();
+  backend_ = make_shared<CollectionBackend>();
   backend()->moveToThread(app->database()->thread());
-  qLog(Debug) << backend_ << "moved to thread" << app->database()->thread();
+  qLog(Debug) << &*backend_ << "moved to thread" << app->database()->thread();
 
   backend_->Init(app->database(), app->task_manager(), Song::Source::Collection, kSongsTable, kFtsTable, kDirsTable, kSubdirsTable);
 
@@ -85,7 +87,6 @@ SCollection::~SCollection() {
     watcher_thread_->exit();
     watcher_thread_->wait(5000);
   }
-  backend_->deleteLater();
 
 }
 
@@ -105,24 +106,24 @@ void SCollection::Init() {
   watcher_->set_backend(backend_);
   watcher_->set_task_manager(app_->task_manager());
 
-  QObject::connect(backend_, &CollectionBackend::Error, this, &SCollection::Error);
-  QObject::connect(backend_, &CollectionBackend::DirectoryDiscovered, watcher_, &CollectionWatcher::AddDirectory);
-  QObject::connect(backend_, &CollectionBackend::DirectoryDeleted, watcher_, &CollectionWatcher::RemoveDirectory);
-  QObject::connect(backend_, &CollectionBackend::SongsRatingChanged, this, &SCollection::SongsRatingChanged);
-  QObject::connect(backend_, &CollectionBackend::SongsStatisticsChanged, this, &SCollection::SongsPlaycountChanged);
+  QObject::connect(&*backend_, &CollectionBackend::Error, this, &SCollection::Error);
+  QObject::connect(&*backend_, &CollectionBackend::DirectoryDiscovered, watcher_, &CollectionWatcher::AddDirectory);
+  QObject::connect(&*backend_, &CollectionBackend::DirectoryDeleted, watcher_, &CollectionWatcher::RemoveDirectory);
+  QObject::connect(&*backend_, &CollectionBackend::SongsRatingChanged, this, &SCollection::SongsRatingChanged);
+  QObject::connect(&*backend_, &CollectionBackend::SongsStatisticsChanged, this, &SCollection::SongsPlaycountChanged);
 
-  QObject::connect(watcher_, &CollectionWatcher::NewOrUpdatedSongs, backend_, &CollectionBackend::AddOrUpdateSongs);
-  QObject::connect(watcher_, &CollectionWatcher::SongsMTimeUpdated, backend_, &CollectionBackend::UpdateMTimesOnly);
-  QObject::connect(watcher_, &CollectionWatcher::SongsDeleted, backend_, &CollectionBackend::DeleteSongs);
-  QObject::connect(watcher_, &CollectionWatcher::SongsUnavailable, backend_, &CollectionBackend::MarkSongsUnavailable);
-  QObject::connect(watcher_, &CollectionWatcher::SongsReadded, backend_, &CollectionBackend::MarkSongsUnavailable);
-  QObject::connect(watcher_, &CollectionWatcher::SubdirsDiscovered, backend_, &CollectionBackend::AddOrUpdateSubdirs);
-  QObject::connect(watcher_, &CollectionWatcher::SubdirsMTimeUpdated, backend_, &CollectionBackend::AddOrUpdateSubdirs);
-  QObject::connect(watcher_, &CollectionWatcher::CompilationsNeedUpdating, backend_, &CollectionBackend::CompilationsNeedUpdating);
-  QObject::connect(watcher_, &CollectionWatcher::UpdateLastSeen, backend_, &CollectionBackend::UpdateLastSeen);
+  QObject::connect(watcher_, &CollectionWatcher::NewOrUpdatedSongs, &*backend_, &CollectionBackend::AddOrUpdateSongs);
+  QObject::connect(watcher_, &CollectionWatcher::SongsMTimeUpdated, &*backend_, &CollectionBackend::UpdateMTimesOnly);
+  QObject::connect(watcher_, &CollectionWatcher::SongsDeleted, &*backend_, &CollectionBackend::DeleteSongs);
+  QObject::connect(watcher_, &CollectionWatcher::SongsUnavailable, &*backend_, &CollectionBackend::MarkSongsUnavailable);
+  QObject::connect(watcher_, &CollectionWatcher::SongsReadded, &*backend_, &CollectionBackend::MarkSongsUnavailable);
+  QObject::connect(watcher_, &CollectionWatcher::SubdirsDiscovered, &*backend_, &CollectionBackend::AddOrUpdateSubdirs);
+  QObject::connect(watcher_, &CollectionWatcher::SubdirsMTimeUpdated, &*backend_, &CollectionBackend::AddOrUpdateSubdirs);
+  QObject::connect(watcher_, &CollectionWatcher::CompilationsNeedUpdating, &*backend_, &CollectionBackend::CompilationsNeedUpdating);
+  QObject::connect(watcher_, &CollectionWatcher::UpdateLastSeen, &*backend_, &CollectionBackend::UpdateLastSeen);
 
-  QObject::connect(app_->lastfm_import(), &LastFMImport::UpdateLastPlayed, backend_, &CollectionBackend::UpdateLastPlayed);
-  QObject::connect(app_->lastfm_import(), &LastFMImport::UpdatePlayCount, backend_, &CollectionBackend::UpdatePlayCount);
+  QObject::connect(&*app_->lastfm_import(), &LastFMImport::UpdateLastPlayed, &*backend_, &CollectionBackend::UpdateLastPlayed);
+  QObject::connect(&*app_->lastfm_import(), &LastFMImport::UpdatePlayCount, &*backend_, &CollectionBackend::UpdatePlayCount);
 
   // This will start the watcher checking for updates
   backend_->LoadDirectoriesAsync();
@@ -131,12 +132,12 @@ void SCollection::Init() {
 
 void SCollection::Exit() {
 
-  wait_for_exit_ << backend_ << watcher_;
+  wait_for_exit_ << &*backend_ << watcher_;
 
-  QObject::disconnect(backend_, nullptr, watcher_, nullptr);
-  QObject::disconnect(watcher_, nullptr, backend_, nullptr);
+  QObject::disconnect(&*backend_, nullptr, watcher_, nullptr);
+  QObject::disconnect(watcher_, nullptr, &*backend_, nullptr);
 
-  QObject::connect(backend_, &CollectionBackend::ExitFinished, this, &SCollection::ExitReceived);
+  QObject::connect(&*backend_, &CollectionBackend::ExitFinished, this, &SCollection::ExitReceived);
   QObject::connect(watcher_, &CollectionWatcher::ExitFinished, this, &SCollection::ExitReceived);
   backend_->ExitAsync();
   watcher_->Abort();

src/collection/collection.h

@@ -29,6 +29,7 @@
 #include <QHash>
 #include <QString>
 
+#include "core/shared_ptr.h"
 #include "core/song.h"
 
 class QThread;
@@ -42,7 +43,7 @@ class SCollection : public QObject {
   Q_OBJECT
 
  public:
-  explicit SCollection(Application *app, QObject *parent);
+  explicit SCollection(Application *app, QObject *parent = nullptr);
   ~SCollection() override;
 
   static const char *kSongsTable;
@@ -53,7 +54,7 @@ class SCollection : public QObject {
   void Init();
   void Exit();
 
-  CollectionBackend *backend() const { return backend_; }
+  SharedPtr<CollectionBackend> backend() const { return backend_; }
   CollectionModel *model() const { return model_; }
 
   QString full_rescan_reason(int schema_version) const { return full_rescan_revisions_.value(schema_version, QString()); }
@@ -81,12 +82,12 @@ class SCollection : public QObject {
   void SongsRatingChanged(const SongList &songs, const bool save_tags = false);
 
  signals:
-  void Error(QString);
+  void Error(const QString &error);
   void ExitFinished();
 
  private:
   Application *app_;
-  CollectionBackend *backend_;
+  SharedPtr<CollectionBackend> backend_;
   CollectionModel *model_;
 
   CollectionWatcher *watcher_;

src/collection/collectionbackend.cpp

@@ -2,7 +2,7 @@
  * Strawberry Music Player
  * This file was part of Clementine.
  * Copyright 2010, David Sansome <me@davidsansome.com>
- * Copyright 2018-2021, Jonas Kvinge <jonas@jkvinge.net>
+ * Copyright 2018-2023, Jonas Kvinge <jonas@jkvinge.net>
  *
  * Strawberry is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -43,6 +43,7 @@
 #include <QSqlQuery>
 #include <QSqlError>
 
+#include "core/shared_ptr.h"
 #include "core/logging.h"
 #include "core/database.h"
 #include "core/scopedtransaction.h"
@@ -67,7 +68,13 @@ CollectionBackend::CollectionBackend(QObject *parent)
 
 }
 
-void CollectionBackend::Init(Database *db, TaskManager *task_manager, const Song::Source source, const QString &songs_table, const QString &fts_table, const QString &dirs_table, const QString &subdirs_table) {
+CollectionBackend::~CollectionBackend() {
+
+  qLog(Debug) << "Collection backend" << this << "for" << Song::TextForSource(source_) << "deleted";
+
+}
+
+void CollectionBackend::Init(SharedPtr<Database> db, SharedPtr<TaskManager> task_manager, const Song::Source source, const QString &songs_table, const QString &fts_table, const QString &dirs_table, const QString &subdirs_table) {
 
   db_ = db;
   task_manager_ = task_manager;
@@ -89,7 +96,7 @@ void CollectionBackend::Close() {
 }
 
 void CollectionBackend::ExitAsync() {
-  QMetaObject::invokeMethod(this, "Exit", Qt::QueuedConnection);
+  QMetaObject::invokeMethod(this, &CollectionBackend::Exit, Qt::QueuedConnection);
 }
 
 void CollectionBackend::Exit() {
@@ -105,31 +112,29 @@ void CollectionBackend::ReportErrors(const CollectionQuery &query) {
 
   const QSqlError sql_error = query.lastError();
   if (sql_error.isValid()) {
-    qLog(Error) << "Unable to execute collection SQL query: " << sql_error;
-    qLog(Error) << "Faulty SQL query: " << query.lastQuery();
-    qLog(Error) << "Bound SQL values: " << query.boundValues();
-    QString error;
-    error += "Unable to execute collection SQL query: " + sql_error.text() + "<br />";
-    error += "Faulty SQL query: " + query.lastQuery();
-    emit Error(error);
+    qLog(Error) << "Unable to execute collection SQL query:" << sql_error;
+    qLog(Error) << "Failed SQL query:" << query.lastQuery();
+    qLog(Error) << "Bound SQL values:" << query.boundValues();
+    emit Error(tr("Unable to execute collection SQL query: %1").arg(sql_error.text()));
+    emit Error(tr("Failed SQL query: %1").arg(query.lastQuery()));
   }
 
 }
 
 void CollectionBackend::LoadDirectoriesAsync() {
-  QMetaObject::invokeMethod(this, "LoadDirectories", Qt::QueuedConnection);
+  QMetaObject::invokeMethod(this, &CollectionBackend::LoadDirectories, Qt::QueuedConnection);
 }
 
 void CollectionBackend::UpdateTotalSongCountAsync() {
-  QMetaObject::invokeMethod(this, "UpdateTotalSongCount", Qt::QueuedConnection);
+  QMetaObject::invokeMethod(this, &CollectionBackend::UpdateTotalSongCount, Qt::QueuedConnection);
 }
 
 void CollectionBackend::UpdateTotalArtistCountAsync() {
-  QMetaObject::invokeMethod(this, "UpdateTotalArtistCount", Qt::QueuedConnection);
+  QMetaObject::invokeMethod(this, &CollectionBackend::UpdateTotalArtistCount, Qt::QueuedConnection);
 }
 
 void CollectionBackend::UpdateTotalAlbumCountAsync() {
-  QMetaObject::invokeMethod(this, "UpdateTotalAlbumCount", Qt::QueuedConnection);
+  QMetaObject::invokeMethod(this, &CollectionBackend::UpdateTotalAlbumCount, Qt::QueuedConnection);
 }
 
 void CollectionBackend::IncrementPlayCountAsync(const int id) {
@@ -396,7 +401,7 @@ SongList CollectionBackend::FindSongsInDirectory(const int id) {
   QSqlDatabase db(db_->Connect());
 
   SqlQuery q(db);
-  q.prepare(QString("SELECT ROWID, " + Song::kColumnSpec + " FROM %1 WHERE directory_id = :directory_id").arg(songs_table_));
+  q.prepare(QString("SELECT ROWID, %1 FROM %2 WHERE directory_id = :directory_id").arg(Song::kColumnSpec, songs_table_));
   q.BindValue(":directory_id", id);
   if (!q.Exec()) {
     db_->ReportErrors(q);
@@ -419,7 +424,30 @@ SongList CollectionBackend::SongsWithMissingFingerprint(const int id) {
   QSqlDatabase db(db_->Connect());
 
   SqlQuery q(db);
-  q.prepare(QString("SELECT ROWID, " + Song::kColumnSpec + " FROM %1 WHERE directory_id = :directory_id AND unavailable = 0 AND (fingerprint IS NULL OR fingerprint = '')").arg(songs_table_));
+  q.prepare(QString("SELECT ROWID, %1 FROM %2 WHERE directory_id = :directory_id AND unavailable = 0 AND (fingerprint IS NULL OR fingerprint = '')").arg(Song::kColumnSpec, songs_table_));
+  q.BindValue(":directory_id", id);
+  if (!q.Exec()) {
+    db_->ReportErrors(q);
+    return SongList();
+  }
+
+  SongList ret;
+  while (q.next()) {
+    Song song(source_);
+    song.InitFromQuery(q, true);
+    ret << song;
+  }
+  return ret;
+
+}
+
+SongList CollectionBackend::SongsWithMissingLoudnessCharacteristics(const int id) {
+
+  QMutexLocker l(db_->Mutex());
+  QSqlDatabase db(db_->Connect());
+
+  SqlQuery q(db);
+  q.prepare(QString("SELECT ROWID, %1 FROM %2 WHERE directory_id = :directory_id AND unavailable = 0 AND (ebur128_integrated_loudness_lufs IS NULL OR ebur128_loudness_range_lu IS NULL)").arg(Song::kColumnSpec, songs_table_));
   q.BindValue(":directory_id", id);
   if (!q.Exec()) {
     db_->ReportErrors(q);
@@ -520,7 +548,7 @@ SongList CollectionBackend::GetAllSongs() {
   QSqlDatabase db(db_->Connect());
 
   SqlQuery q(db);
-  q.prepare(QString("SELECT ROWID, " + Song::kColumnSpec + " FROM %1").arg(songs_table_));
+  q.prepare(QString("SELECT ROWID, %1 FROM %2").arg(Song::kColumnSpec, songs_table_));
   if (!q.Exec()) {
     db_->ReportErrors(q);
     return SongList();
@@ -576,7 +604,7 @@ void CollectionBackend::AddOrUpdateSongs(const SongList &songs) {
       // Update
       {
         SqlQuery q(db);
-        q.prepare(QString("UPDATE %1 SET " + Song::kUpdateSpec + " WHERE ROWID = :id").arg(songs_table_));
+        q.prepare(QString("UPDATE %1 SET %2 WHERE ROWID = :id").arg(songs_table_, Song::kUpdateSpec));
         song.BindToQuery(&q);
         q.BindValue(":id", song.id());
         if (!q.Exec()) {
@@ -587,7 +615,7 @@ void CollectionBackend::AddOrUpdateSongs(const SongList &songs) {
 
       {
         SqlQuery q(db);
-        q.prepare(QString("UPDATE %1 SET " + Song::kFtsUpdateSpec + " WHERE ROWID = :id").arg(fts_table_));
+        q.prepare(QString("UPDATE %1 SET %2 WHERE ROWID = :id").arg(fts_table_, Song::kFtsUpdateSpec));
         song.BindToFtsQuery(&q);
         q.BindValue(":id", song.id());
         if (!q.Exec()) {
@@ -615,7 +643,7 @@ void CollectionBackend::AddOrUpdateSongs(const SongList &songs) {
         // Update
         {
           SqlQuery q(db);
-          q.prepare(QString("UPDATE %1 SET " + Song::kUpdateSpec + " WHERE ROWID = :id").arg(songs_table_));
+          q.prepare(QString("UPDATE %1 SET %2 WHERE ROWID = :id").arg(songs_table_, Song::kUpdateSpec));
           new_song.BindToQuery(&q);
           q.BindValue(":id", new_song.id());
           if (!q.Exec()) {
@@ -626,7 +654,7 @@ void CollectionBackend::AddOrUpdateSongs(const SongList &songs) {
 
         {
           SqlQuery q(db);
-          q.prepare(QString("UPDATE %1 SET " + Song::kFtsUpdateSpec + " WHERE ROWID = :id").arg(fts_table_));
+          q.prepare(QString("UPDATE %1 SET %2 WHERE ROWID = :id").arg(fts_table_, Song::kFtsUpdateSpec));
           new_song.BindToFtsQuery(&q);
           q.BindValue(":id", new_song.id());
           if (!q.Exec()) {
@@ -647,7 +675,7 @@ void CollectionBackend::AddOrUpdateSongs(const SongList &songs) {
     int id = -1;
     {  // Insert the row and create a new ID
       SqlQuery q(db);
-      q.prepare(QString("INSERT INTO %1 (" + Song::kColumnSpec + ") VALUES (" + Song::kBindSpec + ")").arg(songs_table_));
+      q.prepare(QString("INSERT INTO %1 (%2) VALUES (%3)").arg(songs_table_, Song::kColumnSpec, Song::kBindSpec));
       song.BindToQuery(&q);
       if (!q.Exec()) {
         db_->ReportErrors(q);
@@ -661,7 +689,7 @@ void CollectionBackend::AddOrUpdateSongs(const SongList &songs) {
 
     {  // Add to the FTS index
       SqlQuery q(db);
-      q.prepare(QString("INSERT INTO %1 (ROWID, " + Song::kFtsColumnSpec + ") VALUES (:id, " + Song::kFtsBindSpec + ")").arg(fts_table_));
+      q.prepare(QString("INSERT INTO %1 (ROWID, %2) VALUES (:id, %3)").arg(fts_table_, Song::kFtsColumnSpec, Song::kFtsBindSpec));
       q.BindValue(":id", id);
       song.BindToFtsQuery(&q);
       if (!q.Exec()) {
@@ -722,7 +750,7 @@ void CollectionBackend::UpdateSongsBySongID(const SongMap &new_songs) {
 
         {
           SqlQuery q(db);
-          q.prepare(QString("UPDATE %1 SET " + Song::kUpdateSpec + " WHERE ROWID = :id").arg(songs_table_));
+          q.prepare(QString("UPDATE %1 SET %2 WHERE ROWID = :id").arg(songs_table_, Song::kUpdateSpec));
           new_song.BindToQuery(&q);
           q.BindValue(":id", old_song.id());
           if (!q.Exec()) {
@@ -732,7 +760,7 @@ void CollectionBackend::UpdateSongsBySongID(const SongMap &new_songs) {
         }
         {
           SqlQuery q(db);
-          q.prepare(QString("UPDATE %1 SET " + Song::kFtsUpdateSpec + " WHERE ROWID = :id").arg(fts_table_));
+          q.prepare(QString("UPDATE %1 SET %2 WHERE ROWID = :id").arg(fts_table_, Song::kFtsUpdateSpec));
           new_song.BindToFtsQuery(&q);
           q.BindValue(":id", old_song.id());
           if (!q.Exec()) {
@@ -753,7 +781,7 @@ void CollectionBackend::UpdateSongsBySongID(const SongMap &new_songs) {
       int id = -1;
       {
         SqlQuery q(db);
-        q.prepare(QString("INSERT INTO %1 (" + Song::kColumnSpec + ") VALUES (" + Song::kBindSpec + ")").arg(songs_table_));
+        q.prepare(QString("INSERT INTO %1 (%2) VALUES (%3)").arg(songs_table_, Song::kColumnSpec, Song::kBindSpec));
         new_song.BindToQuery(&q);
         if (!q.Exec()) {
           db_->ReportErrors(q);
@@ -767,7 +795,7 @@ void CollectionBackend::UpdateSongsBySongID(const SongMap &new_songs) {
 
       {  // Add to the FTS index
         SqlQuery q(db);
-        q.prepare(QString("INSERT INTO %1 (ROWID, " + Song::kFtsColumnSpec + ") VALUES (:id, " + Song::kFtsBindSpec + ")").arg(fts_table_));
+        q.prepare(QString("INSERT INTO %1 (ROWID, %2) VALUES (:id, %3)").arg(fts_table_, Song::kFtsColumnSpec, Song::kFtsBindSpec));
         q.BindValue(":id", id);
         new_song.BindToFtsQuery(&q);
         if (!q.Exec()) {
@@ -879,14 +907,14 @@ void CollectionBackend::MarkSongsUnavailable(const SongList &songs, const bool u
   QMutexLocker l(db_->Mutex());
   QSqlDatabase db(db_->Connect());
 
-  SqlQuery remove(db);
-  remove.prepare(QString("UPDATE %1 SET unavailable = %2 WHERE ROWID = :id").arg(songs_table_).arg(static_cast<int>(unavailable)));
+  SqlQuery query(db);
+  query.prepare(QString("UPDATE %1 SET unavailable = %2 WHERE ROWID = :id").arg(songs_table_).arg(static_cast<int>(unavailable)));
 
   ScopedTransaction transaction(&db);
   for (const Song &song : songs) {
-    remove.BindValue(":id", song.id());
-    if (!remove.Exec()) {
-      db_->ReportErrors(remove);
+    query.BindValue(":id", song.id());
+    if (!query.Exec()) {
+      db_->ReportErrors(query);
       return;
     }
   }
@@ -1105,7 +1133,7 @@ SongList CollectionBackend::GetSongsByForeignId(const QStringList &ids, const QS
   QString in = ids.join(",");
 
   SqlQuery q(db);
-  q.prepare(QString("SELECT %2.ROWID, " + Song::kColumnSpec + ", %2.%3 FROM %2, %1 WHERE %2.%3 IN (%4) AND %1.ROWID = %2.ROWID AND unavailable = 0").arg(songs_table_, table, column, in));
+  q.prepare(QString("SELECT %3.ROWID, %2, %3.%4 FROM %3, %1 WHERE %3.%4 IN (in) AND %1.ROWID = %3.ROWID AND unavailable = 0").arg(songs_table_, Song::kColumnSpec, table, column, in));
   if (!q.Exec()) {
     db_->ReportErrors(q);
     return SongList();
@@ -1136,7 +1164,7 @@ SongList CollectionBackend::GetSongsById(const QStringList &ids, QSqlDatabase &d
   QString in = ids.join(",");
 
   SqlQuery q(db);
-  q.prepare(QString("SELECT ROWID, " + Song::kColumnSpec + " FROM %1 WHERE ROWID IN (%2)").arg(songs_table_, in));
+  q.prepare(QString("SELECT ROWID, %1 FROM %2 WHERE ROWID IN (%3)").arg(Song::kColumnSpec, songs_table_, in));
   if (!q.Exec()) {
     db_->ReportErrors(q);
     return SongList();
@@ -1158,7 +1186,7 @@ Song CollectionBackend::GetSongByUrl(const QUrl &url, const qint64 beginning) {
   QSqlDatabase db(db_->Connect());
 
   SqlQuery q(db);
-  q.prepare(QString("SELECT ROWID, " + Song::kColumnSpec + " FROM %1 WHERE (url = :url1 OR url = :url2 OR url = :url3 OR url = :url4) AND beginning = :beginning AND unavailable = 0").arg(songs_table_));
+  q.prepare(QString("SELECT ROWID, %1 FROM %2 WHERE (url = :url1 OR url = :url2 OR url = :url3 OR url = :url4) AND beginning = :beginning AND unavailable = 0").arg(Song::kColumnSpec, songs_table_));
 
   q.BindValue(":url1", url);
   q.BindValue(":url2", url.toString());
@@ -1188,7 +1216,7 @@ SongList CollectionBackend::GetSongsByUrl(const QUrl &url, const bool unavailabl
   QSqlDatabase db(db_->Connect());
 
   SqlQuery q(db);
-  q.prepare(QString("SELECT ROWID, " + Song::kColumnSpec + " FROM %1 WHERE (url = :url1 OR url = :url2 OR url = :url3 OR url = :url4) AND unavailable = :unavailable").arg(songs_table_));
+  q.prepare(QString("SELECT ROWID, %1 FROM %2 WHERE (url = :url1 OR url = :url2 OR url = :url3 OR url = :url4) AND unavailable = :unavailable").arg(Song::kColumnSpec, songs_table_));
 
   q.BindValue(":url1", url);
   q.BindValue(":url2", url.toString());
@@ -1248,7 +1276,7 @@ SongList CollectionBackend::GetSongsBySongId(const QStringList &song_ids, QSqlDa
   QString in = song_ids2.join(",");
 
   SqlQuery q(db);
-  q.prepare(QString("SELECT ROWID, " + Song::kColumnSpec + " FROM %1 WHERE SONG_ID IN (%2)").arg(songs_table_, in));
+  q.prepare(QString("SELECT ROWID, %1 FROM %2 WHERE SONG_ID IN (%3)").arg(Song::kColumnSpec, songs_table_, in));
   if (!q.Exec()) {
     db_->ReportErrors(q);
     return SongList();
@@ -1271,7 +1299,7 @@ SongList CollectionBackend::GetSongsByFingerprint(const QString &fingerprint) {
   QSqlDatabase db(db_->Connect());
 
   SqlQuery q(db);
-  q.prepare(QString("SELECT ROWID, " + Song::kColumnSpec + " FROM %1 WHERE fingerprint = :fingerprint").arg(songs_table_));
+  q.prepare(QString("SELECT ROWID, %1 FROM %2 WHERE fingerprint = :fingerprint").arg(Song::kColumnSpec, songs_table_));
   q.BindValue(":fingerprint", fingerprint);
   if (!q.Exec()) {
     db_->ReportErrors(q);
@@ -1394,7 +1422,7 @@ bool CollectionBackend::UpdateCompilations(const QSqlDatabase &db, SongList &del
 
   {  // Get song, so we can tell the model its updated
     SqlQuery q(db);
-    q.prepare(QString("SELECT ROWID, " + Song::kColumnSpec + " FROM %1 WHERE (url = :url1 OR url = :url2 OR url = :url3 OR url = :url4) AND unavailable = 0").arg(songs_table_));
+    q.prepare(QString("SELECT ROWID, %1 FROM %2 WHERE (url = :url1 OR url = :url2 OR url = :url3 OR url = :url4) AND unavailable = 0").arg(Song::kColumnSpec, songs_table_));
     q.BindValue(":url1", url);
     q.BindValue(":url2", url.toString());
     q.BindValue(":url3", url.toString(QUrl::FullyEncoded));
@@ -1437,7 +1465,7 @@ CollectionBackend::AlbumList CollectionBackend::GetAlbums(const QString &artist,
   QSqlDatabase db(db_->Connect());
 
   CollectionQuery query(db, songs_table_, fts_table_, opt);
-  query.SetColumnSpec("url, effective_albumartist, album, compilation_effective, art_automatic, art_manual, filetype, cue_path");
+  query.SetColumnSpec("url, filetype, cue_path, effective_albumartist, album, compilation_effective, art_embedded, art_automatic, art_manual, art_unset");
   query.SetOrderBy("effective_albumartist, album, url");
 
   if (compilation_required) {
@@ -1455,42 +1483,48 @@ CollectionBackend::AlbumList CollectionBackend::GetAlbums(const QString &artist,
 
   QMap<QString, Album> albums;
   while (query.Next()) {
-    bool is_compilation = query.Value(3).toBool();
 
-    Album info;
+    Album album_info;
     QUrl url = QUrl::fromEncoded(query.Value(0).toByteArray());
+
+    album_info.filetype = static_cast<Song::FileType>(query.Value(1).toInt());
+    const QString filetype = Song::TextForFiletype(album_info.filetype);
+    album_info.cue_path = query.Value(2).toString();
+
+    const bool is_compilation = query.Value(5).toBool();
     if (!is_compilation) {
-      info.album_artist = query.Value(1).toString();
+      album_info.album_artist = query.Value(3).toString();
     }
-    info.album = query.Value(2).toString();
 
-    QString art_automatic = query.Value(4).toString();
+    album_info.album = query.Value(4).toString();
+
+    album_info.art_embedded = query.Value(6).toBool();
+
+    const QString art_automatic = query.Value(7).toString();
     if (art_automatic.contains(QRegularExpression("..+:.*"))) {
-      info.art_automatic = QUrl::fromEncoded(art_automatic.toUtf8());
+      album_info.art_automatic = QUrl::fromEncoded(art_automatic.toUtf8());
     }
     else {
-      info.art_automatic = QUrl::fromLocalFile(art_automatic);
+      album_info.art_automatic = QUrl::fromLocalFile(art_automatic);
     }
 
-    QString art_manual = query.Value(5).toString();
+    const QString art_manual = query.Value(8).toString();
     if (art_manual.contains(QRegularExpression("..+:.*"))) {
-      info.art_manual = QUrl::fromEncoded(art_manual.toUtf8());
+      album_info.art_manual = QUrl::fromEncoded(art_manual.toUtf8());
     }
     else {
-      info.art_manual = QUrl::fromLocalFile(art_manual);
+      album_info.art_manual = QUrl::fromLocalFile(art_manual);
     }
 
-    info.filetype = static_cast<Song::FileType>(query.Value(6).toInt());
-    QString filetype = Song::TextForFiletype(info.filetype);
-    info.cue_path = query.Value(7).toString();
+    album_info.art_unset = query.Value(9).toBool();
 
     QString key;
-    if (!info.album_artist.isEmpty()) {
-      key.append(info.album_artist);
+    if (!album_info.album_artist.isEmpty()) {
+      key.append(album_info.album_artist);
     }
-    if (!info.album.isEmpty()) {
+    if (!album_info.album.isEmpty()) {
       if (!key.isEmpty()) key.append("-");
-      key.append(info.album);
+      key.append(album_info.album);
     }
     if (!filetype.isEmpty()) {
       key.append(filetype);
@@ -1502,8 +1536,8 @@ CollectionBackend::AlbumList CollectionBackend::GetAlbums(const QString &artist,
       albums[key].urls.append(url);
     }
     else {
-      info.urls << url;
-      albums.insert(key, info);
+      album_info.urls << url;
+      albums.insert(key, album_info);
     }
 
   }
@@ -1522,7 +1556,7 @@ CollectionBackend::Album CollectionBackend::GetAlbumArt(const QString &effective
   ret.album_artist = effective_albumartist;
 
   CollectionQuery query(db, songs_table_, fts_table_);
-  query.SetColumnSpec("art_automatic, art_manual, url");
+  query.SetColumnSpec("url, art_embedded, art_automatic, art_manual, art_unset");
   if (!effective_albumartist.isEmpty()) {
     query.AddWhere("effective_albumartist", effective_albumartist);
   }
@@ -1534,22 +1568,24 @@ CollectionBackend::Album CollectionBackend::GetAlbumArt(const QString &effective
   }
 
   if (query.Next()) {
-    ret.art_automatic = QUrl::fromEncoded(query.Value(0).toByteArray());
-    ret.art_manual = QUrl::fromEncoded(query.Value(1).toByteArray());
-    ret.urls << QUrl::fromEncoded(query.Value(2).toByteArray());
+    ret.urls << QUrl::fromEncoded(query.Value(0).toByteArray());
+    ret.art_embedded = query.Value(1).toInt() == 1;
+    ret.art_automatic = QUrl::fromEncoded(query.Value(2).toByteArray());
+    ret.art_manual = QUrl::fromEncoded(query.Value(3).toByteArray());
+    ret.art_unset = query.Value(4).toInt() == 1;
   }
 
   return ret;
 
 }
 
-void CollectionBackend::UpdateManualAlbumArtAsync(const QString &effective_albumartist, const QString &album, const QUrl &cover_url, const bool clear_art_automatic) {
+void CollectionBackend::UpdateEmbeddedAlbumArtAsync(const QString &effective_albumartist, const QString &album, const bool art_embedded) {
 
-  QMetaObject::invokeMethod(this, "UpdateManualAlbumArt", Qt::QueuedConnection, Q_ARG(QString, effective_albumartist), Q_ARG(QString, album), Q_ARG(QUrl, cover_url), Q_ARG(bool, clear_art_automatic));
+  QMetaObject::invokeMethod(this, "UpdateEmbeddedAlbumArt", Qt::QueuedConnection, Q_ARG(QString, effective_albumartist), Q_ARG(QString, album), Q_ARG(bool, art_embedded));
 
 }
 
-void CollectionBackend::UpdateManualAlbumArt(const QString &effective_albumartist, const QString &album, const QUrl &cover_url, const bool clear_art_automatic) {
+void CollectionBackend::UpdateEmbeddedAlbumArt(const QString &effective_albumartist, const QString &album, const bool art_embedded) {
 
   QMutexLocker l(db_->Mutex());
   QSqlDatabase db(db_->Connect());
@@ -1573,15 +1609,11 @@ void CollectionBackend::UpdateManualAlbumArt(const QString &effective_albumartis
   }
 
   // Update the songs
-  QString sql = QString("UPDATE %1 SET art_manual = :cover").arg(songs_table_);
-  if (clear_art_automatic) {
-    sql += ", art_automatic = ''";
-  }
-  sql += " WHERE effective_albumartist = :effective_albumartist AND album = :album AND unavailable = 0";
+  QString sql = QString("UPDATE %1 SET art_embedded = :art_embedded, art_unset = 0 WHERE effective_albumartist = :effective_albumartist AND album = :album AND unavailable = 0").arg(songs_table_);
 
   SqlQuery q(db);
   q.prepare(sql);
-  q.BindValue(":cover", cover_url.isValid() ? cover_url.toString(QUrl::FullyEncoded) : "");
+  q.BindValue(":art_embedded", art_embedded ? 1 : 0);
   q.BindValue(":effective_albumartist", effective_albumartist);
   q.BindValue(":album", album);
 
@@ -1610,18 +1642,17 @@ void CollectionBackend::UpdateManualAlbumArt(const QString &effective_albumartis
 
 }
 
-void CollectionBackend::UpdateAutomaticAlbumArtAsync(const QString &effective_albumartist, const QString &album, const QUrl &cover_url, const bool clear_art_manual) {
+void CollectionBackend::UpdateManualAlbumArtAsync(const QString &effective_albumartist, const QString &album, const QUrl &art_manual) {
 
-  QMetaObject::invokeMethod(this, "UpdateAutomaticAlbumArt", Qt::QueuedConnection, Q_ARG(QString, effective_albumartist), Q_ARG(QString, album), Q_ARG(QUrl, cover_url), Q_ARG(bool, clear_art_manual));
+  QMetaObject::invokeMethod(this, "UpdateManualAlbumArt", Qt::QueuedConnection, Q_ARG(QString, effective_albumartist), Q_ARG(QString, album), Q_ARG(QUrl, art_manual));
 
 }
 
-void CollectionBackend::UpdateAutomaticAlbumArt(const QString &effective_albumartist, const QString &album, const QUrl &cover_url, const bool clear_art_manual) {
+void CollectionBackend::UpdateManualAlbumArt(const QString &effective_albumartist, const QString &album, const QUrl &art_manual) {
 
   QMutexLocker l(db_->Mutex());
   QSqlDatabase db(db_->Connect());
 
-  // Get the songs before they're updated
   CollectionQuery query(db, songs_table_, fts_table_);
   query.SetColumnSpec("ROWID, " + Song::kColumnSpec);
   query.AddWhere("effective_albumartist", effective_albumartist);
@@ -1639,16 +1670,124 @@ void CollectionBackend::UpdateAutomaticAlbumArt(const QString &effective_albumar
     deleted_songs << song;
   }
 
-  // Update the songs
-  QString sql = QString("UPDATE %1 SET art_automatic = :cover").arg(songs_table_);
-  if (clear_art_manual) {
-    sql += ", art_manual = ''";
-  }
-  sql += " WHERE effective_albumartist = :effective_albumartist AND album = :album AND unavailable = 0";
-
   SqlQuery q(db);
-  q.prepare(sql);
-  q.BindValue(":cover", cover_url.isValid() ? cover_url.toString(QUrl::FullyEncoded) : "");
+  q.prepare(QString("UPDATE %1 SET art_manual = :art_manual, art_unset = 0 WHERE effective_albumartist = :effective_albumartist AND album = :album AND unavailable = 0").arg(songs_table_));
+  q.BindValue(":art_manual", art_manual.isValid() ? art_manual.toString(QUrl::FullyEncoded) : "");
+  q.BindValue(":effective_albumartist", effective_albumartist);
+  q.BindValue(":album", album);
+
+  if (!q.Exec()) {
+    db_->ReportErrors(q);
+    return;
+  }
+
+  if (!query.Exec()) {
+    ReportErrors(query);
+    return;
+  }
+
+  SongList added_songs;
+  while (query.Next()) {
+    Song song(source_);
+    song.InitFromQuery(query, true);
+    added_songs << song;
+  }
+
+  if (!added_songs.isEmpty() || !deleted_songs.isEmpty()) {
+    emit SongsDeleted(deleted_songs);
+    emit SongsDiscovered(added_songs);
+  }
+
+}
+
+void CollectionBackend::UnsetAlbumArtAsync(const QString &effective_albumartist, const QString &album) {
+
+  QMetaObject::invokeMethod(this, "UnsetAlbumArt", Qt::QueuedConnection, Q_ARG(QString, effective_albumartist), Q_ARG(QString, album));
+
+}
+
+void CollectionBackend::UnsetAlbumArt(const QString &effective_albumartist, const QString &album) {
+
+  QMutexLocker l(db_->Mutex());
+  QSqlDatabase db(db_->Connect());
+
+  CollectionQuery query(db, songs_table_, fts_table_);
+  query.SetColumnSpec("ROWID, " + Song::kColumnSpec);
+  query.AddWhere("effective_albumartist", effective_albumartist);
+  query.AddWhere("album", album);
+
+  if (!query.Exec()) {
+    ReportErrors(query);
+    return;
+  }
+
+  SongList deleted_songs;
+  while (query.Next()) {
+    Song song(source_);
+    song.InitFromQuery(query, true);
+    deleted_songs << song;
+  }
+
+  SqlQuery q(db);
+  q.prepare(QString("UPDATE %1 SET art_unset = 1, art_manual = '', art_automatic = '', art_embedded = '' WHERE effective_albumartist = :effective_albumartist AND album = :album AND unavailable = 0").arg(songs_table_));
+  q.BindValue(":effective_albumartist", effective_albumartist);
+  q.BindValue(":album", album);
+
+  if (!q.Exec()) {
+    db_->ReportErrors(q);
+    return;
+  }
+
+  if (!query.Exec()) {
+    ReportErrors(query);
+    return;
+  }
+
+  SongList added_songs;
+  while (query.Next()) {
+    Song song(source_);
+    song.InitFromQuery(query, true);
+    added_songs << song;
+  }
+
+  if (!added_songs.isEmpty() || !deleted_songs.isEmpty()) {
+    emit SongsDeleted(deleted_songs);
+    emit SongsDiscovered(added_songs);
+  }
+
+}
+
+void CollectionBackend::ClearAlbumArtAsync(const QString &effective_albumartist, const QString &album, const bool unset) {
+
+  QMetaObject::invokeMethod(this, "ClearAlbumArt", Qt::QueuedConnection, Q_ARG(QString, effective_albumartist), Q_ARG(QString, album), Q_ARG(bool, unset));
+
+}
+
+void CollectionBackend::ClearAlbumArt(const QString &effective_albumartist, const QString &album, const bool art_unset) {
+
+  QMutexLocker l(db_->Mutex());
+  QSqlDatabase db(db_->Connect());
+
+  CollectionQuery query(db, songs_table_, fts_table_);
+  query.SetColumnSpec("ROWID, " + Song::kColumnSpec);
+  query.AddWhere("effective_albumartist", effective_albumartist);
+  query.AddWhere("album", album);
+
+  if (!query.Exec()) {
+    ReportErrors(query);
+    return;
+  }
+
+  SongList deleted_songs;
+  while (query.Next()) {
+    Song song(source_);
+    song.InitFromQuery(query, true);
+    deleted_songs << song;
+  }
+
+  SqlQuery q(db);
+  q.prepare(QString("UPDATE %1 SET art_embedded = 0, art_automatic = '', art_manual = '', art_unset = :art_unset WHERE effective_albumartist = :effective_albumartist AND album = :album AND unavailable = 0").arg(songs_table_));
+  q.BindValue(":art_unset", art_unset ? 1 : 0);
   q.BindValue(":effective_albumartist", effective_albumartist);
   q.BindValue(":album", album);
 
@@ -1657,7 +1796,6 @@ void CollectionBackend::UpdateAutomaticAlbumArt(const QString &effective_albumar
     return;
   }
 
-  // Now get the updated songs
   if (!query.Exec()) {
     ReportErrors(query);
     return;
@@ -1827,7 +1965,7 @@ bool CollectionBackend::ResetPlayStatistics(const QStringList &id_str_list) {
 
 void CollectionBackend::DeleteAllAsync() {
 
-  QMetaObject::invokeMethod(this, "DeleteAll", Qt::QueuedConnection);
+  QMetaObject::invokeMethod(this, &CollectionBackend::DeleteAll, Qt::QueuedConnection);
 
 }
 
@@ -1905,10 +2043,10 @@ SongList CollectionBackend::GetSongsBy(const QString &artist, const QString &alb
   SongList songs;
   SqlQuery q(db);
   if (album.isEmpty()) {
-    q.prepare(QString("SELECT ROWID, " + Song::kColumnSpec + " FROM %1 WHERE artist = :artist COLLATE NOCASE AND title = :title COLLATE NOCASE").arg(songs_table_));
+    q.prepare(QString("SELECT ROWID, %1 FROM %2 WHERE artist = :artist COLLATE NOCASE AND title = :title COLLATE NOCASE").arg(Song::kColumnSpec, songs_table_));
   }
   else {
-    q.prepare(QString("SELECT ROWID, " + Song::kColumnSpec + " FROM %1 WHERE artist = :artist COLLATE NOCASE AND album = :album COLLATE NOCASE AND title = :title COLLATE NOCASE").arg(songs_table_));
+    q.prepare(QString("SELECT ROWID, %1 FROM %2 WHERE artist = :artist COLLATE NOCASE AND album = :album COLLATE NOCASE AND title = :title COLLATE NOCASE").arg(Song::kColumnSpec, songs_table_));
   }
   q.BindValue(":artist", artist);
   if (!album.isEmpty()) q.BindValue(":album", album);
@@ -2052,7 +2190,7 @@ void CollectionBackend::ExpireSongs(const int directory_id, const int expire_una
     QMutexLocker l(db_->Mutex());
     QSqlDatabase db(db_->Connect());
     SqlQuery q(db);
-    q.prepare(QString("SELECT ROWID, " + Song::kColumnSpec + " FROM %1 WHERE directory_id = :directory_id AND unavailable = 1 AND lastseen > 0 AND lastseen < :time").arg(songs_table_));
+    q.prepare(QString("SELECT %1.ROWID, " + Song::JoinSpec("%1") + " FROM %1 LEFT JOIN playlist_items ON %1.ROWID = playlist_items.collection_id WHERE %1.directory_id = :directory_id AND %1.unavailable = 1 AND %1.lastseen > 0 AND %1.lastseen < :time AND playlist_items.collection_id IS NULL").arg(songs_table_));
     q.BindValue(":directory_id", directory_id);
     q.BindValue(":time", QDateTime::currentDateTime().toSecsSinceEpoch() - (expire_unavailable_songs_days * 86400));
     if (!q.Exec()) {

src/collection/collectionbackend.h

@@ -2,7 +2,7 @@
  * Strawberry Music Player
  * This file was part of Clementine.
  * Copyright 2010, David Sansome <me@davidsansome.com>
- * Copyright 2018-2021, Jonas Kvinge <jonas@jkvinge.net>
+ * Copyright 2018-2023, 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
@@ -25,6 +25,7 @@
 #include "config.h"
 
 #include <optional>
+#include <memory>
 
 #include <QtGlobal>
 #include <QObject>
@@ -34,10 +35,9 @@
 #include <QStringList>
 #include <QUrl>
 #include <QSqlDatabase>
-#include <QSqlQuery>
 
+#include "core/shared_ptr.h"
 #include "core/song.h"
-#include "core/sqlquery.h"
 #include "collectionfilteroptions.h"
 #include "collectionquery.h"
 #include "collectiondirectory.h"
@@ -54,12 +54,14 @@ class CollectionBackendInterface : public QObject {
   explicit CollectionBackendInterface(QObject *parent = nullptr) : QObject(parent) {}
 
   struct Album {
-    Album() : filetype(Song::FileType::Unknown) {}
-    Album(const QString &_album_artist, const QString &_album, const QUrl &_art_automatic, const QUrl &_art_manual, const QList<QUrl> &_urls, const Song::FileType _filetype, const QString &_cue_path)
+    Album() : art_embedded(false), art_unset(false), filetype(Song::FileType::Unknown) {}
+    Album(const QString &_album_artist, const QString &_album, const bool _art_embedded, const QUrl &_art_automatic, const QUrl &_art_manual, const bool _art_unset, const QList<QUrl> &_urls, const Song::FileType _filetype, const QString &_cue_path)
         : album_artist(_album_artist),
           album(_album),
+          art_embedded(_art_embedded),
           art_automatic(_art_automatic),
           art_manual(_art_manual),
+          art_unset(_art_unset),
           urls(_urls),
           filetype(_filetype),
           cue_path(_cue_path) {}
@@ -67,8 +69,10 @@ class CollectionBackendInterface : public QObject {
     QString album_artist;
     QString album;
 
+    bool art_embedded;
     QUrl art_automatic;
     QUrl art_manual;
+    bool art_unset;
     QList<QUrl> urls;
     Song::FileType filetype;
     QString cue_path;
@@ -80,7 +84,7 @@ class CollectionBackendInterface : public QObject {
 
   virtual Song::Source source() const = 0;
 
-  virtual Database *db() const = 0;
+  virtual SharedPtr<Database> db() const = 0;
 
   // Get a list of directories in the collection.  Emits DirectoriesDiscovered.
   virtual void LoadDirectoriesAsync() = 0;
@@ -91,6 +95,7 @@ class CollectionBackendInterface : public QObject {
 
   virtual SongList FindSongsInDirectory(const int id) = 0;
   virtual SongList SongsWithMissingFingerprint(const int id) = 0;
+  virtual SongList SongsWithMissingLoudnessCharacteristics(const int id) = 0;
   virtual CollectionSubdirectoryList SubdirsInDirectory(const int id) = 0;
   virtual CollectionDirectoryList GetAllDirectories() = 0;
   virtual void ChangeDirPath(const int id, const QString &old_path, const QString &new_path) = 0;
@@ -109,8 +114,10 @@ class CollectionBackendInterface : public QObject {
   virtual AlbumList GetAlbumsByArtist(const QString &artist, const CollectionFilterOptions &opt = CollectionFilterOptions()) = 0;
   virtual AlbumList GetCompilationAlbums(const CollectionFilterOptions &opt = CollectionFilterOptions()) = 0;
 
-  virtual void UpdateManualAlbumArtAsync(const QString &effective_albumartist, const QString &album, const QUrl &cover_url, const bool clear_art_automatic = false) = 0;
-  virtual void UpdateAutomaticAlbumArtAsync(const QString &effective_albumartist, const QString &album, const QUrl &cover_url, const bool clear_art_manual = false) = 0;
+  virtual void UpdateEmbeddedAlbumArtAsync(const QString &effective_albumartist, const QString &album, const bool art_embedded) = 0;
+  virtual void UpdateManualAlbumArtAsync(const QString &effective_albumartist, const QString &album, const QUrl &art_manual) = 0;
+  virtual void UnsetAlbumArtAsync(const QString &effective_albumartist, const QString &album) = 0;
+  virtual void ClearAlbumArtAsync(const QString &effective_albumartist, const QString &album, const bool art_unset) = 0;
 
   virtual Album GetAlbumArt(const QString &effective_albumartist, const QString &album) = 0;
 
@@ -135,7 +142,9 @@ class CollectionBackend : public CollectionBackendInterface {
 
   Q_INVOKABLE explicit CollectionBackend(QObject *parent = nullptr);
 
-  void Init(Database *db, TaskManager *task_manager, const Song::Source source, const QString &songs_table, const QString &fts_table, const QString &dirs_table = QString(), const QString &subdirs_table = QString());
+  ~CollectionBackend();
+
+  void Init(SharedPtr<Database> db, SharedPtr<TaskManager> task_manager, const Song::Source source, const QString &songs_table, const QString &fts_table, const QString &dirs_table = QString(), const QString &subdirs_table = QString());
   void Close();
 
   void ExitAsync();
@@ -144,7 +153,7 @@ class CollectionBackend : public CollectionBackendInterface {
 
   Song::Source source() const override { return source_; }
 
-  Database *db() const override { return db_; }
+  SharedPtr<Database> db() const override { return db_; }
 
   QString songs_table() const override { return songs_table_; }
   QString fts_table() const override { return fts_table_; }
@@ -160,6 +169,7 @@ class CollectionBackend : public CollectionBackendInterface {
 
   SongList FindSongsInDirectory(const int id) override;
   SongList SongsWithMissingFingerprint(const int id) override;
+  SongList SongsWithMissingLoudnessCharacteristics(const int id) override;
   CollectionSubdirectoryList SubdirsInDirectory(const int id) override;
   CollectionDirectoryList GetAllDirectories() override;
   void ChangeDirPath(const int id, const QString &old_path, const QString &new_path) override;
@@ -179,8 +189,10 @@ class CollectionBackend : public CollectionBackendInterface {
   AlbumList GetCompilationAlbums(const CollectionFilterOptions &opt = CollectionFilterOptions()) override;
   AlbumList GetAlbumsByArtist(const QString &artist, const CollectionFilterOptions &opt = CollectionFilterOptions()) override;
 
-  void UpdateManualAlbumArtAsync(const QString &effective_albumartist, const QString &album, const QUrl &cover_url, const bool clear_art_automatic = false) override;
-  void UpdateAutomaticAlbumArtAsync(const QString &effective_albumartist, const QString &album, const QUrl &cover_url, const bool clear_art_manual = false) override;
+  void UpdateEmbeddedAlbumArtAsync(const QString &effective_albumartist, const QString &album, const bool art_embedded) override;
+  void UpdateManualAlbumArtAsync(const QString &effective_albumartist, const QString &album, const QUrl &art_manual) override;
+  void UnsetAlbumArtAsync(const QString &effective_albumartist, const QString &album) override;
+  void ClearAlbumArtAsync(const QString &effective_albumartist, const QString &album, const bool art_unset) override;
 
   Album GetAlbumArt(const QString &effective_albumartist, const QString &album) override;
 
@@ -232,8 +244,10 @@ class CollectionBackend : public CollectionBackendInterface {
   void MarkSongsUnavailable(const SongList &songs, const bool unavailable = true);
   void AddOrUpdateSubdirs(const CollectionSubdirectoryList &subdirs);
   void CompilationsNeedUpdating();
-  void UpdateManualAlbumArt(const QString &effective_albumartist, const QString &album, const QUrl &cover_url, const bool clear_art_automatic = false);
-  void UpdateAutomaticAlbumArt(const QString &effective_albumartist, const QString &album, const QUrl &cover_url, const bool clear_art_manual = false);
+  void UpdateEmbeddedAlbumArt(const QString &effective_albumartist, const QString &album, const bool art_embedded);
+  void UpdateManualAlbumArt(const QString &effective_albumartist, const QString &album, const QUrl &art_manual);
+  void UnsetAlbumArt(const QString &effective_albumartist, const QString &album);
+  void ClearAlbumArt(const QString &effective_albumartist, const QString &album, const bool art_unset);
   void ForceCompilation(const QString &album, const QList<QString> &artists, const bool on);
   void IncrementPlayCount(const int id);
   void IncrementSkipCount(const int id, const float progress);
@@ -254,23 +268,23 @@ class CollectionBackend : public CollectionBackendInterface {
   void ExpireSongs(const int directory_id, const int expire_unavailable_songs_days);
 
  signals:
-  void DirectoryDiscovered(CollectionDirectory, CollectionSubdirectoryList);
-  void DirectoryDeleted(CollectionDirectory);
+  void DirectoryDiscovered(const CollectionDirectory &dir, const CollectionSubdirectoryList &subdir);
+  void DirectoryDeleted(const CollectionDirectory &dir);
 
-  void SongsDiscovered(SongList);
-  void SongsDeleted(SongList);
-  void SongsStatisticsChanged(SongList, bool = false);
+  void SongsDiscovered(const SongList &songs);
+  void SongsDeleted(const SongList &songs);
+  void SongsStatisticsChanged(const SongList &songs, const bool save_tags = false);
 
   void DatabaseReset();
 
-  void TotalSongCountUpdated(int);
-  void TotalArtistCountUpdated(int);
-  void TotalAlbumCountUpdated(int);
-  void SongsRatingChanged(SongList, bool);
+  void TotalSongCountUpdated(const int count);
+  void TotalArtistCountUpdated(const int count);
+  void TotalAlbumCountUpdated(const int count);
+  void SongsRatingChanged(const SongList &songs, const bool save_tags);
 
   void ExitFinished();
 
-  void Error(QString);
+  void Error(const QString &error);
 
  private:
   struct CompilationInfo {
@@ -295,15 +309,14 @@ class CollectionBackend : public CollectionBackendInterface {
   SongList GetSongsBySongId(const QStringList &song_ids, QSqlDatabase &db);
 
  private:
-  Database *db_;
-  TaskManager *task_manager_;
+  SharedPtr<Database> db_;
+  SharedPtr<TaskManager> task_manager_;
   Song::Source source_;
   QString songs_table_;
   QString dirs_table_;
   QString subdirs_table_;
   QString fts_table_;
   QThread *original_thread_;
-
 };
 
 #endif  // COLLECTIONBACKEND_H

src/collection/collectiondirectorymodel.cpp

@@ -20,12 +20,15 @@
 
 #include "config.h"
 
+#include <memory>
+
 #include <QObject>
 #include <QStandardItemModel>
 #include <QAbstractItemModel>
 #include <QVariant>
 #include <QString>
 
+#include "core/shared_ptr.h"
 #include "core/filesystemmusicstorage.h"
 #include "core/iconloader.h"
 #include "core/musicstorage.h"
@@ -34,24 +37,24 @@
 #include "collectionbackend.h"
 #include "collectiondirectorymodel.h"
 
-CollectionDirectoryModel::CollectionDirectoryModel(CollectionBackend *backend, QObject *parent)
+using std::make_shared;
+
+CollectionDirectoryModel::CollectionDirectoryModel(SharedPtr<CollectionBackend> backend, QObject *parent)
     : QStandardItemModel(parent),
       dir_icon_(IconLoader::Load("document-open-folder")),
       backend_(backend) {
 
-  QObject::connect(backend_, &CollectionBackend::DirectoryDiscovered, this, &CollectionDirectoryModel::DirectoryDiscovered);
-  QObject::connect(backend_, &CollectionBackend::DirectoryDeleted, this, &CollectionDirectoryModel::DirectoryDeleted);
+  QObject::connect(&*backend_, &CollectionBackend::DirectoryDiscovered, this, &CollectionDirectoryModel::DirectoryDiscovered);
+  QObject::connect(&*backend_, &CollectionBackend::DirectoryDeleted, this, &CollectionDirectoryModel::DirectoryDeleted);
 
 }
 
-CollectionDirectoryModel::~CollectionDirectoryModel() = default;
-
 void CollectionDirectoryModel::DirectoryDiscovered(const CollectionDirectory &dir) {
 
   QStandardItem *item = new QStandardItem(dir.path);
   item->setData(dir.id, kIdRole);
   item->setIcon(dir_icon_);
-  storage_ << std::make_shared<FilesystemMusicStorage>(backend_->source(), dir.path, dir.id);
+  storage_ << make_shared<FilesystemMusicStorage>(backend_->source(), dir.path, dir.id);
   appendRow(item);
 
 }

src/collection/collectiondirectorymodel.h

@@ -23,8 +23,6 @@
 
 #include "config.h"
 
-#include <memory>
-
 #include <QObject>
 #include <QStandardItemModel>
 #include <QList>
@@ -32,6 +30,8 @@
 #include <QString>
 #include <QIcon>
 
+#include "core/shared_ptr.h"
+
 class QModelIndex;
 
 struct CollectionDirectory;
@@ -42,8 +42,7 @@ class CollectionDirectoryModel : public QStandardItemModel {
   Q_OBJECT
 
  public:
-  explicit CollectionDirectoryModel(CollectionBackend *backend, QObject *parent = nullptr);
-  ~CollectionDirectoryModel() override;
+  explicit CollectionDirectoryModel(SharedPtr<CollectionBackend> collection_backend, QObject *parent = nullptr);
 
   // To be called by GUIs
   void AddDirectory(const QString &path);
@@ -60,8 +59,8 @@ class CollectionDirectoryModel : public QStandardItemModel {
   static const int kIdRole = Qt::UserRole + 1;
 
   QIcon dir_icon_;
-  CollectionBackend *backend_;
-  QList<std::shared_ptr<MusicStorage>> storage_;
+  SharedPtr<CollectionBackend> backend_;
+  QList<SharedPtr<MusicStorage>> storage_;
 };
 
 #endif  // COLLECTIONDIRECTORYMODEL_H

src/collection/collectionfilterwidget.cpp

@@ -48,7 +48,6 @@
 #include "core/logging.h"
 #include "collectionfilteroptions.h"
 #include "collectionmodel.h"
-#include "collectionquery.h"
 #include "savedgroupingmanager.h"
 #include "collectionfilterwidget.h"
 #include "groupbydialog.h"
@@ -74,6 +73,7 @@ CollectionFilterWidget::CollectionFilterWidget(QWidget *parent)
   ui_->setupUi(this);
 
   QString available_fields = Song::kFtsColumns.join(", ").replace(QRegularExpression("\\bfts"), "");
+  available_fields += QString(", ") + Song::kNumericalColumns.join(", ");
 
   ui_->search_field->setToolTip(
     QString("<html><head/><body><p>") +
@@ -81,18 +81,26 @@ CollectionFilterWidget::CollectionFilterWidget(QWidget *parent)
     QString(" ") +
     QString("<span style=\"font-weight:600;\">") +
     tr("artist") +
-    QString(":") +
-    QString("</span><span style=\"font-style:italic;\">Strawbs</span>") +
-    QString(" ") +
-    tr("searches the collection for all artists that contain the word") +
-    QString(" Strawbs.") +
+    QString(":</span><span style=\"font-style:italic;\">Strawbs</span> ") +
+    tr("searches the collection for all artists that contain the word %1. ").arg("Strawbs") +
+    QString("</p><p>") +
+    tr("Search terms for numerical fields can be prefixed with %1 or %2 to refine the search, e.g.: ")
+      .arg(" =, !=, &lt;, &gt;, &lt;=", "&gt;=") +
+    QString("<span style=\"font-weight:600;\">") +
+    tr("rating") +
+    QString("</span>") +
+    QString(":>=") +
+    QString("<span style=\"font-weight:italic;\">4</span>") +
+
     QString("</p><p><span style=\"font-weight:600;\">") +
     tr("Available fields") +
     QString(": ") +
-    "</span><span style=\"font-style:italic;\">" +
+    QString("</span>") +
+    QString("<span style=\"font-style:italic;\">") +
     available_fields +
     QString("</span>.") +
-    QString("</p></body></html>"));
+    QString("</p></body></html>")
+  );
 
   QObject::connect(ui_->search_field, &QSearchField::returnPressed, this, &CollectionFilterWidget::ReturnPressed);
   QObject::connect(filter_delay_, &QTimer::timeout, this, &CollectionFilterWidget::FilterDelayTimeout);

src/collection/collectionfilterwidget.h

@@ -31,8 +31,6 @@
 #include <QHash>
 #include <QString>
 
-#include "collectionquery.h"
-#include "collectionqueryoptions.h"
 #include "collectionmodel.h"
 
 class QTimer;
@@ -96,7 +94,7 @@ class CollectionFilterWidget : public QWidget {
   void UpPressed();
   void DownPressed();
   void ReturnPressed();
-  void Filter(QString text);
+  void Filter(const QString &text);
 
  protected:
   void keyReleaseEvent(QKeyEvent *e) override;
@@ -135,7 +133,6 @@ class CollectionFilterWidget : public QWidget {
   QString settings_group_;
   QString saved_groupings_settings_group_;
   QString settings_prefix_;
-
 };
 
 #endif  // COLLECTIONFILTERWIDGET_H

src/collection/collectionitemdelegate.cpp

@@ -127,7 +127,7 @@ bool CollectionItemDelegate::helpEvent(QHelpEvent *event, QAbstractItemView *vie
 
   QString text = displayText(idx.data(), QLocale::system());
 
-  if (text.isEmpty() || !event) return false;
+  if (text.isEmpty()) return false;
 
   switch (event->type()) {
     case QEvent::ToolTip: {

src/collection/collectionmodel.cpp

@@ -2,7 +2,7 @@
  * Strawberry Music Player
  * This file was part of Clementine.
  * Copyright 2010, David Sansome <me@davidsansome.com>
- * Copyright 2018-2021, Jonas Kvinge <jonas@jkvinge.net>
+ * Copyright 2018-2023, 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
@@ -53,6 +53,8 @@
 #include <QSettings>
 #include <QStandardPaths>
 
+#include "core/scoped_ptr.h"
+#include "core/shared_ptr.h"
 #include "core/application.h"
 #include "core/database.h"
 #include "core/iconloader.h"
@@ -68,8 +70,9 @@
 #include "collectionmodel.h"
 #include "playlist/playlistmanager.h"
 #include "playlist/songmimedata.h"
-#include "covermanager/albumcoverloader.h"
+#include "covermanager/albumcoverloaderoptions.h"
 #include "covermanager/albumcoverloaderresult.h"
+#include "covermanager/albumcoverloader.h"
 #include "settings/collectionsettingspage.h"
 
 const int CollectionModel::kPrettyCoverSize = 32;
@@ -77,7 +80,7 @@ const char *CollectionModel::kPixmapDiskCacheDir = "pixmapcache";
 
 QNetworkDiskCache *CollectionModel::sIconCache = nullptr;
 
-CollectionModel::CollectionModel(CollectionBackend *backend, Application *app, QObject *parent)
+CollectionModel::CollectionModel(SharedPtr<CollectionBackend> backend, Application *app, QObject *parent)
     : SimpleTreeModel<CollectionItem>(new CollectionItem(this), parent),
       backend_(backend),
       app_(app),
@@ -101,14 +104,8 @@ CollectionModel::CollectionModel(CollectionBackend *backend, Application *app, Q
   group_by_[1] = GroupBy::AlbumDisc;
   group_by_[2] = GroupBy::None;
 
-  cover_loader_options_.get_image_data_ = false;
-  cover_loader_options_.get_image_ = true;
-  cover_loader_options_.scale_output_image_ = true;
-  cover_loader_options_.pad_output_image_ = true;
-  cover_loader_options_.desired_height_ = kPrettyCoverSize;
-
   if (app_) {
-    QObject::connect(app_->album_cover_loader(), &AlbumCoverLoader::AlbumCoverLoaded, this, &CollectionModel::AlbumCoverLoaded);
+    QObject::connect(&*app_->album_cover_loader(), &AlbumCoverLoader::AlbumCoverLoaded, this, &CollectionModel::AlbumCoverLoaded);
   }
 
   QIcon nocover = IconLoader::Load("cdcase");
@@ -123,14 +120,14 @@ CollectionModel::CollectionModel(CollectionBackend *backend, Application *app, Q
     QObject::connect(app_, &Application::ClearPixmapDiskCache, this, &CollectionModel::ClearDiskCache);
   }
 
-  QObject::connect(backend_, &CollectionBackend::SongsDiscovered, this, &CollectionModel::SongsDiscovered);
-  QObject::connect(backend_, &CollectionBackend::SongsDeleted, this, &CollectionModel::SongsDeleted);
-  QObject::connect(backend_, &CollectionBackend::DatabaseReset, this, &CollectionModel::Reset);
-  QObject::connect(backend_, &CollectionBackend::TotalSongCountUpdated, this, &CollectionModel::TotalSongCountUpdatedSlot);
-  QObject::connect(backend_, &CollectionBackend::TotalArtistCountUpdated, this, &CollectionModel::TotalArtistCountUpdatedSlot);
-  QObject::connect(backend_, &CollectionBackend::TotalAlbumCountUpdated, this, &CollectionModel::TotalAlbumCountUpdatedSlot);
-  QObject::connect(backend_, &CollectionBackend::SongsStatisticsChanged, this, &CollectionModel::SongsSlightlyChanged);
-  QObject::connect(backend_, &CollectionBackend::SongsRatingChanged, this, &CollectionModel::SongsSlightlyChanged);
+  QObject::connect(&*backend_, &CollectionBackend::SongsDiscovered, this, &CollectionModel::SongsDiscovered);
+  QObject::connect(&*backend_, &CollectionBackend::SongsDeleted, this, &CollectionModel::SongsDeleted);
+  QObject::connect(&*backend_, &CollectionBackend::DatabaseReset, this, &CollectionModel::Reset);
+  QObject::connect(&*backend_, &CollectionBackend::TotalSongCountUpdated, this, &CollectionModel::TotalSongCountUpdatedSlot);
+  QObject::connect(&*backend_, &CollectionBackend::TotalArtistCountUpdated, this, &CollectionModel::TotalArtistCountUpdatedSlot);
+  QObject::connect(&*backend_, &CollectionBackend::TotalAlbumCountUpdated, this, &CollectionModel::TotalAlbumCountUpdatedSlot);
+  QObject::connect(&*backend_, &CollectionBackend::SongsStatisticsChanged, this, &CollectionModel::SongsSlightlyChanged);
+  QObject::connect(&*backend_, &CollectionBackend::SongsRatingChanged, this, &CollectionModel::SongsSlightlyChanged);
 
   backend_->UpdateTotalSongCountAsync();
   backend_->UpdateTotalArtistCountAsync();
@@ -141,7 +138,11 @@ CollectionModel::CollectionModel(CollectionBackend *backend, Application *app, Q
 }
 
 CollectionModel::~CollectionModel() {
+
+  qLog(Debug) << "Collection model" << this << "for" << Song::TextForSource(backend_->source()) << "deleted";
+
   delete root_;
+
 }
 
 void CollectionModel::set_pretty_covers(const bool use_pretty_covers) {
@@ -150,6 +151,7 @@ void CollectionModel::set_pretty_covers(const bool use_pretty_covers) {
     use_pretty_covers_ = use_pretty_covers;
     Reset();
   }
+
 }
 
 void CollectionModel::set_show_dividers(const bool show_dividers) {
@@ -177,6 +179,8 @@ void CollectionModel::ReloadSettings() {
 
   s.endGroup();
 
+  cover_types_ = AlbumCoverLoaderOptions::LoadTypes();
+
   if (!use_disk_cache_) {
     ClearDiskCache();
   }
@@ -558,7 +562,7 @@ void CollectionModel::SongsDeleted(const SongList &songs) {
       // Remove from pixmap cache
       const QString cache_key = AlbumIconPixmapCacheKey(ItemToIndex(node));
       QPixmapCache::remove(cache_key);
-      if (use_disk_cache_ && sIconCache) sIconCache->remove(QUrl(cache_key));
+      if (use_disk_cache_ && sIconCache) sIconCache->remove(AlbumIconPixmapDiskCacheKey(cache_key));
       if (pending_cache_keys_.contains(cache_key)) {
         pending_cache_keys_.remove(cache_key);
       }
@@ -613,6 +617,12 @@ QString CollectionModel::AlbumIconPixmapCacheKey(const QModelIndex &idx) const {
 
 }
 
+QUrl CollectionModel::AlbumIconPixmapDiskCacheKey(const QString &cache_key) const {
+
+  return QUrl(QUrl::toPercentEncoding(cache_key));
+
+}
+
 QVariant CollectionModel::AlbumIcon(const QModelIndex &idx) {
 
   CollectionItem *item = IndexToItem(idx);
@@ -628,10 +638,10 @@ QVariant CollectionModel::AlbumIcon(const QModelIndex &idx) {
 
   // Try to load it from the disk cache
   if (use_disk_cache_ && sIconCache) {
-    std::unique_ptr<QIODevice> cache(sIconCache->data(QUrl(cache_key)));
-    if (cache) {
+    ScopedPtr<QIODevice> disk_cache_img(sIconCache->data(AlbumIconPixmapDiskCacheKey(cache_key)));
+    if (disk_cache_img) {
       QImage cached_image;
-      if (cached_image.load(cache.get(), "XPM")) {
+      if (cached_image.load(&*disk_cache_img, "XPM")) {
         QPixmapCache::insert(cache_key, QPixmap::fromImage(cached_image));
         return QPixmap::fromImage(cached_image);
       }
@@ -646,7 +656,10 @@ QVariant CollectionModel::AlbumIcon(const QModelIndex &idx) {
   // No art is cached and we're not loading it already.  Load art for the first song in the album.
   SongList songs = GetChildSongs(idx);
   if (!songs.isEmpty()) {
-    const quint64 id = app_->album_cover_loader()->LoadImageAsync(cover_loader_options_, songs.first());
+    AlbumCoverLoaderOptions cover_loader_options(AlbumCoverLoaderOptions::Option::ScaledImage | AlbumCoverLoaderOptions::Option::PadScaledImage);
+    cover_loader_options.desired_scaled_size = QSize(kPrettyCoverSize, kPrettyCoverSize);
+    cover_loader_options.types = cover_types_;
+    const quint64 id = app_->album_cover_loader()->LoadImageAsync(cover_loader_options, songs.first());
     pending_art_[id] = ItemAndCacheKey(item, cache_key);
     pending_cache_keys_.insert(cache_key);
   }
@@ -668,7 +681,7 @@ void CollectionModel::AlbumCoverLoaded(const quint64 id, const AlbumCoverLoaderR
   pending_cache_keys_.remove(cache_key);
 
   // Insert this image in the cache.
-  if (!result.success || result.image_scaled.isNull() || result.type == AlbumCoverLoaderResult::Type_ManuallyUnset) {
+  if (!result.success || result.image_scaled.isNull() || result.type == AlbumCoverLoaderResult::Type::Unset) {
     // Set the no_cover image so we don't continually try to load art.
     QPixmapCache::insert(cache_key, no_cover_icon_);
   }
@@ -680,15 +693,18 @@ void CollectionModel::AlbumCoverLoaded(const quint64 id, const AlbumCoverLoaderR
 
   // If we have a valid cover not already in the disk cache
   if (use_disk_cache_ && sIconCache && result.success && !result.image_scaled.isNull()) {
-    std::unique_ptr<QIODevice> cached_img(sIconCache->data(QUrl(cache_key)));
-    if (!cached_img) {
-      QNetworkCacheMetaData item_metadata;
-      item_metadata.setSaveToDisk(true);
-      item_metadata.setUrl(QUrl(cache_key));
-      QIODevice *cache = sIconCache->prepare(item_metadata);
-      if (cache) {
-        result.image_scaled.save(cache, "XPM");
-        sIconCache->insert(cache);
+    const QUrl disk_cache_key = AlbumIconPixmapDiskCacheKey(cache_key);
+    ScopedPtr<QIODevice> disk_cache_img(sIconCache->data(disk_cache_key));
+    if (!disk_cache_img) {
+      QNetworkCacheMetaData disk_cache_metadata;
+      disk_cache_metadata.setSaveToDisk(true);
+      disk_cache_metadata.setUrl(disk_cache_key);
+      // Qt 6 now ignores any entry without headers, so add a fake header.
+      disk_cache_metadata.setRawHeaders(QNetworkCacheMetaData::RawHeaderList() << qMakePair(QByteArray(), QByteArray()));
+      QIODevice *device_iconcache = sIconCache->prepare(disk_cache_metadata);
+      if (device_iconcache) {
+        result.image_scaled.save(device_iconcache, "XPM");
+        sIconCache->insert(device_iconcache);
       }
     }
   }

src/collection/collectionmodel.h

@@ -2,7 +2,7 @@
  * Strawberry Music Player
  * This file was part of Clementine.
  * Copyright 2010, David Sansome <me@davidsansome.com>
- * Copyright 2018-2021, Jonas Kvinge <jonas@jkvinge.net>
+ * Copyright 2018-2023, 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
@@ -45,15 +45,15 @@
 #include <QPixmap>
 #include <QNetworkDiskCache>
 
+#include "core/shared_ptr.h"
 #include "core/simpletreemodel.h"
 #include "core/song.h"
 #include "core/sqlrow.h"
-#include "covermanager/albumcoverloader.h"
+#include "covermanager/albumcoverloaderoptions.h"
+#include "covermanager/albumcoverloaderresult.h"
 #include "collectionfilteroptions.h"
-#include "collectionquery.h"
 #include "collectionqueryoptions.h"
 #include "collectionitem.h"
-#include "covermanager/albumcoverloaderoptions.h"
 
 class QSettings;
 
@@ -65,7 +65,7 @@ class CollectionModel : public SimpleTreeModel<CollectionItem> {
   Q_OBJECT
 
  public:
-  explicit CollectionModel(CollectionBackend *backend, Application *app, QObject *parent = nullptr);
+  explicit CollectionModel(SharedPtr<CollectionBackend> backend, Application *app, QObject *parent = nullptr);
   ~CollectionModel() override;
 
   static const int kPrettyCoverSize;
@@ -132,7 +132,7 @@ class CollectionModel : public SimpleTreeModel<CollectionItem> {
     bool create_va;
   };
 
-  CollectionBackend *backend() const { return backend_; }
+  SharedPtr<CollectionBackend> backend() const { return backend_; }
   CollectionDirectoryModel *directory_model() const { return dir_model_; }
 
   // Call before Init()
@@ -199,10 +199,10 @@ class CollectionModel : public SimpleTreeModel<CollectionItem> {
   static QString ContainerKey(const GroupBy group_by, const bool separate_albums_by_grouping, const Song &song);
 
  signals:
-  void TotalSongCountUpdated(int count);
-  void TotalArtistCountUpdated(int count);
-  void TotalAlbumCountUpdated(int count);
-  void GroupingChanged(CollectionModel::Grouping g, bool separate_albums_by_grouping);
+  void TotalSongCountUpdated(const int count);
+  void TotalArtistCountUpdated(const int count);
+  void TotalAlbumCountUpdated(const int count);
+  void GroupingChanged(const CollectionModel::Grouping g, const bool separate_albums_by_grouping);
 
  public slots:
   void SetFilterMode(CollectionFilterOptions::FilterMode filter_mode);
@@ -267,13 +267,14 @@ class CollectionModel : public SimpleTreeModel<CollectionItem> {
   // Helpers
   static bool IsCompilationArtistNode(const CollectionItem *node) { return node == node->parent->compilation_artist_node_; }
   QString AlbumIconPixmapCacheKey(const QModelIndex &idx) const;
+  QUrl AlbumIconPixmapDiskCacheKey(const QString &cache_key) const;
   QVariant AlbumIcon(const QModelIndex &idx);
   QVariant data(const CollectionItem *item, const int role) const;
   bool CompareItems(const CollectionItem *a, const CollectionItem *b) const;
   static qint64 MaximumCacheSize(QSettings *s, const char *size_id, const char *size_unit_id, const qint64 cache_size_default);
 
  private:
-  CollectionBackend *backend_;
+  SharedPtr<CollectionBackend> backend_;
   Application *app_;
   CollectionDirectoryModel *dir_model_;
   bool show_various_artists_;
@@ -309,7 +310,7 @@ class CollectionModel : public SimpleTreeModel<CollectionItem> {
   bool use_disk_cache_;
   bool use_lazy_loading_;
 
-  AlbumCoverLoaderOptions cover_loader_options_;
+  AlbumCoverLoaderOptions::Types cover_types_;
 
   using ItemAndCacheKey = QPair<CollectionItem*, QString>;
   QMap<quint64, ItemAndCacheKey> pending_art_;

src/collection/collectionquery.cpp

@@ -32,13 +32,11 @@
 #include <QSqlDatabase>
 #include <QSqlQuery>
 
-#include "core/logging.h"
-#include "core/sqlquery.h"
 #include "core/song.h"
 
 #include "collectionquery.h"
 #include "collectionfilteroptions.h"
-#include "collectionqueryoptions.h"
+#include "utilities/searchparserutils.h"
 
 CollectionQuery::CollectionQuery(const QSqlDatabase &db, const QString &songs_table, const QString &fts_table, const CollectionFilterOptions &filter_options)
     : QSqlQuery(db),
@@ -56,36 +54,48 @@ CollectionQuery::CollectionQuery(const QSqlDatabase &db, const QString &songs_ta
     //  3) Remove colons which don't correspond to column names.
 
     // Split on whitespace
+    QString filter_text = filter_options.filter_text().replace(QRegularExpression(":\\s+"), ":");
 #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-    QStringList tokens(filter_options.filter_text().split(QRegularExpression("\\s+"), Qt::SkipEmptyParts));
+    QStringList tokens(filter_text.split(QRegularExpression("\\s+"), Qt::SkipEmptyParts));
 #else
-    QStringList tokens(filter_options.filter_text().split(QRegularExpression("\\s+"), QString::SkipEmptyParts));
+    QStringList tokens(filter_text.split(QRegularExpression("\\s+"), QString::SkipEmptyParts));
 #endif
     QString query;
     for (QString token : tokens) {
-      token.remove('(');
-      token.remove(')');
-      token.remove('"');
-      token.replace('-', ' ');
+      token.remove('(')
+           .remove(')')
+           .remove('"')
+           .replace('-', ' ');
 
       if (token.contains(':')) {
-        // Only prefix fts if the token is a valid column name.
-        if (Song::kFtsColumns.contains("fts" + token.section(':', 0, 0), Qt::CaseInsensitive)) {
-          // Account for multiple colons.
-          QString columntoken = token.section(':', 0, 0, QString::SectionIncludeTrailingSep);
-          QString subtoken = token.section(':', 1, -1);
-          subtoken.replace(":", " ");
-          subtoken = subtoken.trimmed();
-          if (!subtoken.isEmpty()) {
-            if (!query.isEmpty()) query.append(" ");
-            query += "fts" + columntoken + "\"" + subtoken + "\"*";
+        const QString columntoken = token.section(':', 0, 0);
+        QString subtoken = token.section(':', 1, -1).replace(":", " ").trimmed();
+        if (subtoken.isEmpty()) continue;
+        if (Song::kFtsColumns.contains("fts" + columntoken, Qt::CaseInsensitive)) {
+          if (!query.isEmpty()) query.append(" ");
+          query += "fts" + columntoken + ":\"" + subtoken + "\"*";
+        }
+        else if (Song::kNumericalColumns.contains(columntoken, Qt::CaseInsensitive)) {
+          QString comparator = RemoveSqlOperator(subtoken);
+          if (columntoken.compare("rating", Qt::CaseInsensitive) == 0) {
+            AddWhereRating(subtoken, comparator);
+          }
+          else if (columntoken.compare("length", Qt::CaseInsensitive) == 0) {
+            // Time is saved in nanoseconds, so add 9 0's
+            QString parsedTime = QString::number(Utilities::ParseSearchTime(subtoken)) + "000000000";
+            AddWhere(columntoken, parsedTime, comparator);
+          }
+          else {
+            AddWhere(columntoken, subtoken, comparator);
           }
         }
+        // Not a valid filter, remove
         else {
-          token.replace(":", " ");
-          token = token.trimmed();
-          if (!query.isEmpty()) query.append(" ");
-          query += "\"" + token + "\"*";
+          token = token.replace(":", " ").trimmed();
+          if (!token.isEmpty()) {
+            if (!query.isEmpty()) query.append(" ");
+            query += "\"" + token + "\"*";
+          }
         }
       }
       else {
@@ -121,6 +131,24 @@ CollectionQuery::CollectionQuery(const QSqlDatabase &db, const QString &songs_ta
 
 }
 
+QString CollectionQuery::RemoveSqlOperator(QString &token) {
+
+  QString op = "=";
+  static QRegularExpression rxOp("^(=|<[>=]?|>=?|!=)");
+  QRegularExpressionMatch match = rxOp.match(token);
+  if (match.hasMatch()) {
+    op = match.captured(0);
+  }
+  token.remove(rxOp);
+
+  if (op == "!=") {
+    op = "<>";
+  }
+
+  return op;
+
+}
+
 void CollectionQuery::AddWhere(const QString &column, const QVariant &value, const QString &op) {
 
   // Ignore 'literal' for IN
@@ -170,6 +198,37 @@ void CollectionQuery::AddWhereArtist(const QVariant &value) {
 
 }
 
+void CollectionQuery::AddWhereRating(const QVariant &value, const QString &op) {
+
+  float parsed_rating = Utilities::ParseSearchRating(value.toString());
+
+  // You can't query the database for a float, due to float precision errors,
+  // So we have to use a certain tolerance, so that the searched value is definetly included.
+  const float tolerance = 0.001F;
+  if (op == "<") {
+    AddWhere("rating", parsed_rating-tolerance, "<");
+  }
+  else if (op == ">") {
+    AddWhere("rating", parsed_rating+tolerance, ">");
+  }
+  else if (op == "<=") {
+    AddWhere("rating", parsed_rating+tolerance, "<=");
+  }
+  else if (op == ">=") {
+    AddWhere("rating", parsed_rating-tolerance, ">=");
+  }
+  else if (op == "<>") {
+    where_clauses_ << QString("(rating<? OR rating>?)");
+    bound_values_ << parsed_rating - tolerance;
+    bound_values_ << parsed_rating + tolerance;
+  }
+  else /* (op == "=") */ {
+    AddWhere("rating", parsed_rating+tolerance, "<");
+    AddWhere("rating", parsed_rating-tolerance, ">");
+  }
+
+}
+
 void CollectionQuery::AddCompilationRequirement(const bool compilation) {
   // The unary + is added to prevent sqlite from using the index idx_comp_artist.
   // When joining with fts, sqlite 3.8 has a tendency to use this index and thereby nesting the tables in an order which gives very poor performance
@@ -213,7 +272,7 @@ bool CollectionQuery::Exec() {
   sql.replace("%fts_table_noprefix", fts_table_.section('.', -1, -1));
   sql.replace("%fts_table", fts_table_);
 
-  QSqlQuery::prepare(sql);
+  if (!QSqlQuery::prepare(sql)) return false;
 
   // Bind values
   for (const QVariant &value : bound_values_) {

src/collection/collectionquery.h

@@ -32,7 +32,6 @@
 #include <QSqlQuery>
 
 #include "collectionfilteroptions.h"
-#include "collectionqueryoptions.h"
 
 class CollectionQuery : public QSqlQuery {
  public:
@@ -62,10 +61,15 @@ class CollectionQuery : public QSqlQuery {
   void SetOrderBy(const QString &order_by) { order_by_ = order_by; }
 
   void SetWhereClauses(const QStringList &where_clauses) { where_clauses_ = where_clauses; }
+
+  // Removes = < > <= >= <> from the beginning of the input string and returns the operator
+  // If the input String has no operator, returns "="
+  QString RemoveSqlOperator(QString &token);
   // Adds a fragment of WHERE clause. When executed, this Query will connect all the fragments with AND operator.
   // Please note that IN operator expects a QStringList as value.
   void AddWhere(const QString &column, const QVariant &value, const QString &op = "=");
   void AddWhereArtist(const QVariant &value);
+  void AddWhereRating(const QVariant &value, const QString &op = "=");
 
   void SetBoundValues(const QVariantList &bound_values) { bound_values_ = bound_values; }
   void SetDuplicatesOnly(const bool duplicates_only) { duplicates_only_ = duplicates_only; }

src/collection/collectionqueryoptions.cpp

@@ -21,7 +21,6 @@
 #include <QString>
 
 #include "collectionqueryoptions.h"
-#include "collectionfilteroptions.h"
 
 CollectionQueryOptions::CollectionQueryOptions()
     : compilation_requirement_(CollectionQueryOptions::CompilationRequirement::None),

src/collection/collectionqueryoptions.h

@@ -30,7 +30,7 @@ class CollectionQueryOptions {
   explicit CollectionQueryOptions();
 
   struct Where {
-    explicit Where(const QString _column = QString(), const QVariant _value = QString(), const QString _op = QString()) : column(_column), value(_value), op(_op) {}
+    explicit Where(const QString &_column = QString(), const QVariant &_value = QString(), const QString &_op = QString()) : column(_column), value(_value), op(_op) {}
     QString column;
     QVariant value;
     QString op;

src/collection/collectiontask.cpp

@@ -19,10 +19,11 @@
 
 #include <QString>
 
+#include "core/shared_ptr.h"
 #include "core/taskmanager.h"
 #include "collectiontask.h"
 
-CollectionTask::CollectionTask(TaskManager *task_manager, const QString &message) : task_manager_(task_manager), task_id_(-1) {
+CollectionTask::CollectionTask(SharedPtr<TaskManager> task_manager, const QString &message) : task_manager_(task_manager), task_id_(-1) {
 
   if (task_manager_) task_id_ = task_manager_->StartTask(message);
 

src/collection/collectiontask.h

@@ -23,15 +23,17 @@
 #include <QtGlobal>
 #include <QString>
 
+#include "core/shared_ptr.h"
+
 class TaskManager;
 
 class CollectionTask {
  public:
-  explicit CollectionTask(TaskManager *task_manager, const QString &message);
+  explicit CollectionTask(SharedPtr<TaskManager> task_manager, const QString &message);
   ~CollectionTask();
 
  private:
-  TaskManager *task_manager_;
+  SharedPtr<TaskManager> task_manager_;
   int task_id_;
 
   Q_DISABLE_COPY(CollectionTask)

src/collection/collectionview.cpp

@@ -71,6 +71,8 @@
 #include "organize/organizeerrordialog.h"
 #include "settings/collectionsettingspage.h"
 
+using std::make_unique;
+
 CollectionView::CollectionView(QWidget *parent)
     : AutoExpandingTreeView(parent),
       app_(nullptr),
@@ -117,7 +119,7 @@ void CollectionView::SaveFocus() {
 
   QModelIndex current = currentIndex();
   QVariant type = model()->data(current, CollectionModel::Role_Type);
-  if (!type.isValid() || !(type.toInt() == CollectionItem::Type_Song || type.toInt() == CollectionItem::Type_Container || type.toInt() == CollectionItem::Type_Divider)) {
+  if (!type.isValid() || (type.toInt() != CollectionItem::Type_Song && type.toInt() != CollectionItem::Type_Container && type.toInt() != CollectionItem::Type_Divider)) {
     return;
   }
 
@@ -154,7 +156,7 @@ void CollectionView::SaveContainerPath(const QModelIndex &child) {
 
   QModelIndex current = model()->parent(child);
   QVariant type = model()->data(current, CollectionModel::Role_Type);
-  if (!type.isValid() || !(type.toInt() == CollectionItem::Type_Container || type.toInt() == CollectionItem::Type_Divider)) {
+  if (!type.isValid() || (type.toInt() != CollectionItem::Type_Container && type.toInt() != CollectionItem::Type_Divider)) {
     return;
   }
 
@@ -402,7 +404,6 @@ void CollectionView::contextMenuEvent(QContextMenuEvent *e) {
   }
 
   const int songs_selected = regular_elements;
-  const bool regular_elements_only = songs_selected == regular_elements && regular_elements > 0;
 
   // in all modes
   action_load_->setEnabled(songs_selected > 0);
@@ -430,8 +431,8 @@ void CollectionView::contextMenuEvent(QContextMenuEvent *e) {
   action_delete_files_->setVisible(false);
 #endif
 
-  action_show_in_various_->setVisible(regular_elements_only);
-  action_no_show_in_various_->setVisible(regular_elements_only);
+  action_show_in_various_->setVisible(songs_selected > 0);
+  action_no_show_in_various_->setVisible(songs_selected > 0);
 
   // only when all selected items are editable
   action_organize_->setEnabled(regular_elements == regular_editable);
@@ -573,7 +574,7 @@ SongList CollectionView::GetSelectedSongs() const {
 void CollectionView::Organize() {
 
   if (!organize_dialog_) {
-    organize_dialog_ = std::make_unique<OrganizeDialog>(app_->task_manager(), app_->collection_backend(), this);
+    organize_dialog_ = make_unique<OrganizeDialog>(app_->task_manager(), app_->collection_backend(), this);
   }
 
   organize_dialog_->SetDestinationModel(app_->collection_model()->directory_model());
@@ -591,8 +592,8 @@ void CollectionView::Organize() {
 void CollectionView::EditTracks() {
 
   if (!edit_tag_dialog_) {
-    edit_tag_dialog_ = std::make_unique<EditTagDialog>(app_, this);
-    QObject::connect(edit_tag_dialog_.get(), &EditTagDialog::Error, this, &CollectionView::EditTagError);
+    edit_tag_dialog_ = make_unique<EditTagDialog>(app_, this);
+    QObject::connect(&*edit_tag_dialog_, &EditTagDialog::Error, this, &CollectionView::EditTagError);
   }
   const SongList songs = GetSelectedSongs();
   edit_tag_dialog_->SetSongs(songs);
@@ -614,7 +615,7 @@ void CollectionView::CopyToDevice() {
 
 #ifndef Q_OS_WIN
   if (!organize_dialog_) {
-    organize_dialog_ = std::make_unique<OrganizeDialog>(app_->task_manager(), nullptr, this);
+    organize_dialog_ = make_unique<OrganizeDialog>(app_->task_manager(), nullptr, this);
   }
 
   organize_dialog_->SetDestinationModel(app_->device_manager()->connected_devices_model(), true);
@@ -686,7 +687,7 @@ void CollectionView::Delete() {
   if (DeleteConfirmationDialog::warning(files) != QDialogButtonBox::Yes) return;
 
   // We can cheat and always take the storage of the first directory, since they'll all be FilesystemMusicStorage in a collection and deleting doesn't check the actual directory.
-  std::shared_ptr<MusicStorage> storage = app_->collection_model()->directory_model()->index(0, 0).data(MusicStorage::Role_Storage).value<std::shared_ptr<MusicStorage>>();
+  SharedPtr<MusicStorage> storage = app_->collection_model()->directory_model()->index(0, 0).data(MusicStorage::Role_Storage).value<SharedPtr<MusicStorage>>();
 
   DeleteFiles *delete_files = new DeleteFiles(app_->task_manager(), storage, true);
   QObject::connect(delete_files, &DeleteFiles::Finished, this, &CollectionView::DeleteFilesFinished);