Release 1.1.0

Possible fix for #1482

.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/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: daily

.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,36 +0,0 @@
-cmake_minimum_required(VERSION 3.7)
-
-include(CheckIncludeFiles)
-include(CheckFunctionExists)
-
-check_function_exists(geteuid HAVE_GETEUID)
-check_function_exists(getpwuid HAVE_GETPWUID)
-
-set(SINGLEAPP-SOURCES singleapplication.cpp singleapplication_p.cpp)
-set(SINGLEAPP-MOC-HEADERS singleapplication.h singleapplication_p.h)
-qt_wrap_cpp(SINGLEAPP-SOURCES-MOC ${SINGLEAPP-MOC-HEADERS})
-add_library(singleapplication STATIC ${SINGLEAPP-SOURCES} ${SINGLEAPP-SOURCES-MOC})
-target_include_directories(singleapplication PRIVATE
-  ${CMAKE_CURRENT_SOURCE_DIR}
-  ${CMAKE_CURRENT_BINARY_DIR}
-)
-target_link_libraries(singleapplication PRIVATE
-  ${QtCore_LIBRARIES}
-  ${QtWidgets_LIBRARIES}
-  ${QtNetwork_LIBRARIES}
-)
-
-set(SINGLECOREAPP-SOURCES singlecoreapplication.cpp singlecoreapplication_p.cpp)
-set(SINGLECOREAPP-MOC-HEADERS singlecoreapplication.h singlecoreapplication_p.h)
-qt_wrap_cpp(SINGLECOREAPP-SOURCES-MOC ${SINGLECOREAPP-MOC-HEADERS})
-add_library(singlecoreapplication STATIC ${SINGLECOREAPP-SOURCES} ${SINGLECOREAPP-SOURCES-MOC})
-target_include_directories(singlecoreapplication PRIVATE
-  ${CMAKE_CURRENT_SOURCE_DIR}
-  ${CMAKE_CURRENT_BINARY_DIR}
-)
-target_link_libraries(singlecoreapplication PRIVATE
-  ${QtCore_LIBRARIES}
-  ${QtNetwork_LIBRARIES}
-)
-
-configure_file(config.h.in "${CMAKE_CURRENT_BINARY_DIR}/config.h")

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

@@ -1,266 +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 <QtGlobal>
-#include <QApplication>
-#include <QThread>
-#include <QSharedMemory>
-#include <QLocalSocket>
-#include <QByteArray>
-#include <QElapsedTimer>
-#include <QtDebug>
-
-#include "singleapplication.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
- */
-SingleApplication::SingleApplication(int &argc, char *argv[], const bool allowSecondary, const Options options, const int timeout)
-    : app_t(argc, argv),
-      d_ptr(new SingleApplicationPrivate(this)) {
-
-  Q_D(SingleApplication);
-
-  // 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
-  SingleApplicationPrivate::randomSleep();
-
-#ifdef Q_OS_UNIX
-  // By explicitly attaching it and then deleting it we make sure that the memory is deleted even after the process has crashed on Unix.
-  d->memory_ = new QSharedMemory(d->blockServerName_);
-  d->memory_->attach();
-  delete d->memory_;
-#endif
-
-  // Guarantee thread safe behaviour with a shared memory block.
-  d->memory_ = new QSharedMemory(d->blockServerName_);
-
-  // Create a shared memory block
-  if (d->memory_->create(sizeof(InstancesInfo))) {
-    // Initialize the shared memory block
-    if (!d->memory_->lock()) {
-      qCritical() << "SingleApplication: Unable to lock memory block after create.";
-      abortSafely();
-    }
-    d->initializeMemoryBlock();
-  }
-  else {
-    if (d->memory_->error() == QSharedMemory::AlreadyExists) {
-      // Attempt to attach to the memory segment
-      if (!d->memory_->attach()) {
-        qCritical() << "SingleApplication: Unable to attach to shared memory block.";
-        abortSafely();
-      }
-      if (!d->memory_->lock()) {
-        qCritical() << "SingleApplication: Unable to lock memory block after attach.";
-        abortSafely();
-      }
-    }
-    else {
-      qCritical() << "SingleApplication: Unable to create block.";
-      abortSafely();
-    }
-  }
-
-  InstancesInfo *instance = static_cast<InstancesInfo*>(d->memory_->data());
-  QElapsedTimer time;
-  time.start();
-
-  // Make sure the shared memory block is initialised and in consistent state
-  forever {
-    // If the shared memory block's checksum is valid continue
-    if (d->blockChecksum() == instance->checksum) break;
-
-    // If more than 5s have elapsed, assume the primary instance crashed and assume it's position
-    if (time.elapsed() > 5000) {
-      qWarning() << "SingleApplication: Shared memory block has been in an inconsistent state from more than 5s. 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 initialise faster
-    if (!d->memory_->unlock()) {
-      qDebug() << "SingleApplication: Unable to unlock memory for random wait.";
-      qDebug() << d->memory_->errorString();
-    }
-    SingleApplicationPrivate::randomSleep();
-    if (!d->memory_->lock()) {
-      qCritical() << "SingleApplication: Unable to lock memory after random wait.";
-      abortSafely();
-    }
-  }
-
-  if (!instance->primary) {
-    d->startPrimary();
-    if (!d->memory_->unlock()) {
-      qDebug() << "SingleApplication: Unable to unlock memory after primary start.";
-      qDebug() << d->memory_->errorString();
-    }
-    return;
-  }
-
-  // Check if another instance can be started
-  if (allowSecondary) {
-    d->startSecondary();
-    if (d->options_ & Mode::SecondaryNotification) {
-      d->connectToPrimary(timeout, SingleApplicationPrivate::SecondaryInstance);
-    }
-    if (!d->memory_->unlock()) {
-      qDebug() << "SingleApplication: Unable to unlock memory after secondary start.";
-      qDebug() << d->memory_->errorString();
-    }
-    return;
-  }
-
-  if (!d->memory_->unlock()) {
-    qDebug() << "SingleApplication: Unable to unlock memory at end of execution.";
-    qDebug() << d->memory_->errorString();
-  }
-
-  d->connectToPrimary(timeout, SingleApplicationPrivate::NewInstance);
-
-  delete d;
-
-  ::exit(EXIT_SUCCESS);
-
-}
-
-SingleApplication::~SingleApplication() {
-  Q_D(SingleApplication);
-  delete d;
-}
-
-/**
- * Checks if the current application instance is primary.
- * @return Returns true if the instance is primary, false otherwise.
- */
-bool SingleApplication::isPrimary() const {
-  Q_D(const SingleApplication);
-  return d->server_ != nullptr;
-}
-
-/**
- * Checks if the current application instance is secondary.
- * @return Returns true if the instance is secondary, false otherwise.
- */
-bool SingleApplication::isSecondary() const {
-  Q_D(const SingleApplication);
-  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 SingleApplication::instanceId() const {
-  Q_D(const SingleApplication);
-  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 SingleApplication::primaryPid() const {
-  Q_D(const SingleApplication);
-  return d->primaryPid();
-}
-
-/**
- * Returns the username the primary instance is running as.
- * @return Returns the username the primary instance is running as.
- */
-QString SingleApplication::primaryUser() const {
-  Q_D(const SingleApplication);
-  return d->primaryUser();
-}
-
-/**
- * Returns the username the current instance is running as.
- * @return Returns the username the current instance is running as.
- */
-QString SingleApplication::currentUser() const {
-  return SingleApplicationPrivate::getUsername();
-}
-
-/**
- * Sends message to the Primary Instance.
- * @param message The message to send.
- * @param timeout the maximum timeout in milliseconds for blocking functions.
- * @return true if the message was sent successfully, false otherwise.
- */
-bool SingleApplication::sendMessage(const QByteArray &message, const int timeout) {
-
-  Q_D(SingleApplication);
-
-  // Nobody to connect to
-  if (isPrimary()) return false;
-
-  // Make sure the socket is connected
-  if (!d->connectToPrimary(timeout, SingleApplicationPrivate::Reconnect)) {
-    return false;
-  }
-
-  return d->writeConfirmedMessage(timeout, message);
-}
-
-/**
- * Cleans up the shared memory block and exits with a failure.
- * This function halts program execution.
- */
-void SingleApplication::abortSafely() {
-
-  Q_D(SingleApplication);
-
-  qCritical() << "SingleApplication: " << d->memory_->error() << d->memory_->errorString();
-  delete d;
-
-  ::exit(EXIT_FAILURE);
-
-}

3rdparty/singleapplication/singleapplication.h

@@ -1,152 +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_H
-#define SINGLEAPPLICATION_H
-
-#include <QtGlobal>
-#include <QApplication>
-#include <QFlags>
-#include <QByteArray>
-
-class SingleApplicationPrivate;
-
-/**
- * @brief The SingleApplication class handles multiple instances of the same Application
- * @see QApplication
- */
-class SingleApplication : public QApplication {  // clazy:exclude=ctor-missing-parent-argument
-  Q_OBJECT
-
-  using app_t = QApplication;
-
- 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 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
-   * initialisation will be completed in given time, though is a good hint.
-   * Usually 4*timeout would be the worst case (fail) scenario.
-   */
-  explicit SingleApplication(int &argc, char *argv[], const bool allowSecondary = false, const Options options = Mode::User, const int timeout = 1000);
-  ~SingleApplication() override;
-
-  /**
-   * @brief Returns if the instance is the primary instance
-   * @returns {bool}
-   */
-  bool isPrimary() 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:
-  SingleApplicationPrivate *d_ptr;
-  Q_DECLARE_PRIVATE(SingleApplication)
-  void abortSafely();
-};
-
-Q_DECLARE_OPERATORS_FOR_FLAGS(SingleApplication::Options)
-
-#endif  // SINGLEAPPLICATION_H

3rdparty/singleapplication/singleapplication_p.cpp

@@ -1,526 +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.h"
-#include "singleapplication_p.h"
-
-SingleApplicationPrivate::SingleApplicationPrivate(SingleApplication *ptr)
-    : q_ptr(ptr),
-      memory_(nullptr),
-      socket_(nullptr),
-      server_(nullptr),
-      instanceNumber_(-1) {}
-
-SingleApplicationPrivate::~SingleApplicationPrivate() {
-
-  if (socket_ != nullptr) {
-    socket_->close();
-    delete socket_;
-    socket_ = nullptr;
-  }
-
-  if (memory_ != nullptr) {
-    memory_->lock();
-    InstancesInfo *instance = static_cast<InstancesInfo*>(memory_->data());
-    if (server_ != nullptr) {
-      server_->close();
-      delete server_;
-      instance->primary = false;
-      instance->primaryPid = -1;
-      instance->primaryUser[0] = '\0';
-      instance->checksum = blockChecksum();
-    }
-    memory_->unlock();
-
-    delete memory_;
-    memory_ = nullptr;
-  }
-
-}
-
-QString SingleApplicationPrivate::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 SingleApplicationPrivate::genBlockServerName() {
-
-  QCryptographicHash appData(QCryptographicHash::Sha256);
-  appData.addData("SingleApplication");
-  appData.addData(SingleApplication::app_t::applicationName().toUtf8());
-  appData.addData(SingleApplication::app_t::organizationName().toUtf8());
-  appData.addData(SingleApplication::app_t::organizationDomain().toUtf8());
-
-  if (!(options_ & SingleApplication::Mode::ExcludeAppVersion)) {
-    appData.addData(SingleApplication::app_t::applicationVersion().toUtf8());
-  }
-
-  if (!(options_ & SingleApplication::Mode::ExcludeAppPath)) {
-#if defined(Q_OS_UNIX)
-    const QByteArray appImagePath = qgetenv("APPIMAGE");
-    if (appImagePath.isEmpty()) {
-      appData.addData(SingleApplication::app_t::applicationFilePath().toUtf8());
-    }
-    else {
-      appData.addData(appImagePath);
-    };
-#elif defined(Q_OS_WIN)
-    appData.addData(SingleApplication::app_t::applicationFilePath().toLower().toUtf8());
-#else
-    appData.addData(SingleApplication::app_t::applicationFilePath().toUtf8());
-#endif
-  }
-
-  // User level block requires a user specific data in the hash
-  if (options_ & SingleApplication::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 SingleApplicationPrivate::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 SingleApplicationPrivate::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();
-
-  // Restrict access to the socket according to the SingleApplication::Mode::User flag on User level or no restrictions
-  if (options_ & SingleApplication::Mode::User) {
-    server_->setSocketOptions(QLocalServer::UserAccessOption);
-  }
-  else {
-    server_->setSocketOptions(QLocalServer::WorldAccessOption);
-  }
-
-  server_->listen(blockServerName_);
-  QObject::connect(server_, &QLocalServer::newConnection, this, &SingleApplicationPrivate::slotConnectionEstablished);
-
-}
-
-void SingleApplicationPrivate::startSecondary() {
-
-  InstancesInfo *instance = static_cast<InstancesInfo*>(memory_->data());
-
-  instance->secondary += 1;
-  instance->checksum = blockChecksum();
-  instanceNumber_ = instance->secondary;
-
-}
-
-bool SingleApplicationPrivate::connectToPrimary(const int timeout, const ConnectionType connectionType) {
-
-  QElapsedTimer time;
-  time.start();
-
-  // Connect to the Local Server of the Primary Instance if not already connected.
-  if (socket_ == nullptr) {
-    socket_ = new QLocalSocket();
-  }
-
-  if (socket_->state() == QLocalSocket::ConnectedState) return true;
-
-  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;
-    }
-  }
-
-  // Initialisation 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 SingleApplicationPrivate::writeAck(QLocalSocket *sock) {
-  sock->putChar('\n');
-}
-
-bool SingleApplicationPrivate::writeConfirmedMessage(const int timeout, const QByteArray &msg) const {
-
-  QElapsedTimer time;
-  time.start();
-
-  // Frame 1: The header indicates the message length that follows
-  QByteArray header;
-  QDataStream headerStream(&header, QIODevice::WriteOnly);
-  headerStream.setVersion(QDataStream::Qt_5_8);
-  headerStream << static_cast<quint64>(msg.length());
-
-  if (!writeConfirmedFrame(static_cast<int>(timeout - time.elapsed()), header)) {
-    return false;
-  }
-
-  // Frame 2: The message
-  return writeConfirmedFrame(static_cast<int>(timeout - time.elapsed()), msg);
-
-}
-
-bool SingleApplicationPrivate::writeConfirmedFrame(const int timeout, const QByteArray &msg) const {
-
-  socket_->write(msg);
-  socket_->flush();
-
-  bool result = socket_->waitForReadyRead(timeout);
-  if (result) {
-    socket_->read(1);
-    return true;
-  }
-
-  return false;
-
-}
-
-quint16 SingleApplicationPrivate::blockChecksum() const {
-
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-  quint16 checksum = qChecksum(QByteArray(static_cast<const char*>(memory_->constData()), offsetof(InstancesInfo, checksum)));
-#else
-  quint16 checksum = qChecksum(static_cast<const char*>(memory_->constData()), offsetof(InstancesInfo, checksum));
-#endif
-
-  return checksum;
-
-}
-
-qint64 SingleApplicationPrivate::primaryPid() const {
-
-  memory_->lock();
-  InstancesInfo *instance = static_cast<InstancesInfo*>(memory_->data());
-  qint64 pid = instance->primaryPid;
-  memory_->unlock();
-
-  return pid;
-
-}
-
-QString SingleApplicationPrivate::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 SingleApplicationPrivate::slotConnectionEstablished() {
-
-  QLocalSocket *nextConnSocket = server_->nextPendingConnection();
-  connectionMap_.insert(nextConnSocket, ConnectionInfo());
-
-  QObject::connect(nextConnSocket, &QLocalSocket::aboutToClose, this, [nextConnSocket, this]() {
-    const ConnectionInfo &info = connectionMap_[nextConnSocket];
-    slotClientConnectionClosed(nextConnSocket, info.instanceId);
-  });
-
-  QObject::connect(nextConnSocket, &QLocalSocket::disconnected, nextConnSocket, &QLocalSocket::deleteLater);
-
-  QObject::connect(nextConnSocket, &QLocalSocket::destroyed, this, [nextConnSocket, this]() {
-    connectionMap_.remove(nextConnSocket);
-  });
-
-  QObject::connect(nextConnSocket, &QLocalSocket::readyRead, this, [nextConnSocket, this]() {
-    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:
-        this->slotDataAvailable(nextConnSocket, info.instanceId);
-        break;
-      default:
-        break;
-    };
-  });
-
-}
-
-void SingleApplicationPrivate::readMessageHeader(QLocalSocket *sock, const SingleApplicationPrivate::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 SingleApplicationPrivate::isFrameComplete(QLocalSocket *sock) {
-
-  if (!connectionMap_.contains(sock)) {
-    return false;
-  }
-
-  const ConnectionInfo &info = connectionMap_[sock];
-  return (sock->bytesAvailable() >= static_cast<qint64>(info.msgLen));
-
-}
-
-void SingleApplicationPrivate::readInitMessageBody(QLocalSocket *sock) {
-
-  Q_Q(SingleApplication);
-
-  if (!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
-  ConnectionType connectionType = InvalidConnection;
-  quint8 connTypeVal = InvalidConnection;
-  readStream >> connTypeVal;
-  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_ & SingleApplication::Mode::SecondaryNotification)) {
-    emit q->instanceStarted();
-  }
-
-  writeAck(sock);
-
-}
-
-void SingleApplicationPrivate::slotDataAvailable(QLocalSocket *dataSocket, const quint32 instanceId) {
-
-  Q_Q(SingleApplication);
-
-  if (!isFrameComplete(dataSocket)) {
-    return;
-  }
-
-  const QByteArray message = dataSocket->readAll();
-
-  writeAck(dataSocket);
-
-  ConnectionInfo &info = connectionMap_[dataSocket];
-  info.stage = StageConnectedHeader;
-
-  emit q->receivedMessage(instanceId, message);
-
-}
-
-void SingleApplicationPrivate::slotClientConnectionClosed(QLocalSocket *closedSocket, const quint32 instanceId) {
-
-  if (closedSocket->bytesAvailable() > 0) {
-    slotDataAvailable(closedSocket, instanceId);
-  }
-
-}
-
-void SingleApplicationPrivate::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,116 +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.h"
-
-class QLocalServer;
-class QLocalSocket;
-class QSharedMemory;
-
-struct InstancesInfo {
-  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;
-};
-
-class SingleApplicationPrivate : public QObject {
-  Q_OBJECT
-
- public:
-  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(SingleApplication)
-
-  explicit SingleApplicationPrivate(SingleApplication *ptr);
-  ~SingleApplicationPrivate() override;
-
-  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();
-
-  SingleApplication *q_ptr;
-  QSharedMemory *memory_;
-  QLocalSocket *socket_;
-  QLocalServer *server_;
-  quint32 instanceNumber_;
-  QString blockServerName_;
-  SingleApplication::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/singlecoreapplication.cpp

@@ -1,266 +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 <QtGlobal>
-#include <QCoreApplication>
-#include <QThread>
-#include <QSharedMemory>
-#include <QLocalSocket>
-#include <QByteArray>
-#include <QElapsedTimer>
-#include <QtDebug>
-
-#include "singlecoreapplication.h"
-#include "singlecoreapplication_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
- */
-SingleCoreApplication::SingleCoreApplication(int &argc, char *argv[], const bool allowSecondary, const Options options, const int timeout)
-    : app_t(argc, argv),
-      d_ptr(new SingleCoreApplicationPrivate(this)) {
-
-  Q_D(SingleCoreApplication);
-
-  // 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
-  SingleCoreApplicationPrivate::randomSleep();
-
-#ifdef Q_OS_UNIX
-  // By explicitly attaching it and then deleting it we make sure that the memory is deleted even after the process has crashed on Unix.
-  d->memory_ = new QSharedMemory(d->blockServerName_);
-  d->memory_->attach();
-  delete d->memory_;
-#endif
-
-  // Guarantee thread safe behaviour with a shared memory block.
-  d->memory_ = new QSharedMemory(d->blockServerName_);
-
-  // Create a shared memory block
-  if (d->memory_->create(sizeof(InstancesInfo))) {
-    // Initialize the shared memory block
-    if (!d->memory_->lock()) {
-      qCritical() << "SingleCoreApplication: Unable to lock memory block after create.";
-      abortSafely();
-    }
-    d->initializeMemoryBlock();
-  }
-  else {
-    if (d->memory_->error() == QSharedMemory::AlreadyExists) {
-      // Attempt to attach to the memory segment
-      if (!d->memory_->attach()) {
-        qCritical() << "SingleCoreApplication: Unable to attach to shared memory block.";
-        abortSafely();
-      }
-      if (!d->memory_->lock()) {
-        qCritical() << "SingleCoreApplication: Unable to lock memory block after attach.";
-        abortSafely();
-      }
-    }
-    else {
-      qCritical() << "SingleCoreApplication: Unable to create block.";
-      abortSafely();
-    }
-  }
-
-  InstancesInfo *instance = static_cast<InstancesInfo*>(d->memory_->data());
-  QElapsedTimer time;
-  time.start();
-
-  // Make sure the shared memory block is initialised and in consistent state
-  forever {
-    // If the shared memory block's checksum is valid continue
-    if (d->blockChecksum() == instance->checksum) break;
-
-    // If more than 5s have elapsed, assume the primary instance crashed and assume it's position
-    if (time.elapsed() > 5000) {
-      qWarning() << "SingleCoreApplication: Shared memory block has been in an inconsistent state from more than 5s. 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 initialise faster
-    if (!d->memory_->unlock()) {
-      qDebug() << "SingleCoreApplication: Unable to unlock memory for random wait.";
-      qDebug() << d->memory_->errorString();
-    }
-    SingleCoreApplicationPrivate::randomSleep();
-    if (!d->memory_->lock()) {
-      qCritical() << "SingleCoreApplication: Unable to lock memory after random wait.";
-      abortSafely();
-    }
-  }
-
-  if (!instance->primary) {
-    d->startPrimary();
-    if (!d->memory_->unlock()) {
-      qDebug() << "SingleCoreApplication: Unable to unlock memory after primary start.";
-      qDebug() << d->memory_->errorString();
-    }
-    return;
-  }
-
-  // Check if another instance can be started
-  if (allowSecondary) {
-    d->startSecondary();
-    if (d->options_ & Mode::SecondaryNotification) {
-      d->connectToPrimary(timeout, SingleCoreApplicationPrivate::SecondaryInstance);
-    }
-    if (!d->memory_->unlock()) {
-      qDebug() << "SingleCoreApplication: Unable to unlock memory after secondary start.";
-      qDebug() << d->memory_->errorString();
-    }
-    return;
-  }
-
-  if (!d->memory_->unlock()) {
-    qDebug() << "SingleCoreApplication: Unable to unlock memory at end of execution.";
-    qDebug() << d->memory_->errorString();
-  }
-
-  d->connectToPrimary(timeout, SingleCoreApplicationPrivate::NewInstance);
-
-  delete d;
-
-  ::exit(EXIT_SUCCESS);
-
-}
-
-SingleCoreApplication::~SingleCoreApplication() {
-  Q_D(SingleCoreApplication);
-  delete d;
-}
-
-/**
- * Checks if the current application instance is primary.
- * @return Returns true if the instance is primary, false otherwise.
- */
-bool SingleCoreApplication::isPrimary() const {
-  Q_D(const SingleCoreApplication);
-  return d->server_ != nullptr;
-}
-
-/**
- * Checks if the current application instance is secondary.
- * @return Returns true if the instance is secondary, false otherwise.
- */
-bool SingleCoreApplication::isSecondary() const {
-  Q_D(const SingleCoreApplication);
-  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 SingleCoreApplication::instanceId() const {
-  Q_D(const SingleCoreApplication);
-  return d->instanceNumber_;
-}
-
-/**
- * Returns the OS PID (Process Identifier) of the process running the primary instance.
- * Especially useful when SingleCoreApplication is coupled with OS. specific APIs.
- * @return Returns the primary instance PID.
- */
-qint64 SingleCoreApplication::primaryPid() const {
-  Q_D(const SingleCoreApplication);
-  return d->primaryPid();
-}
-
-/**
- * Returns the username the primary instance is running as.
- * @return Returns the username the primary instance is running as.
- */
-QString SingleCoreApplication::primaryUser() const {
-  Q_D(const SingleCoreApplication);
-  return d->primaryUser();
-}
-
-/**
- * Returns the username the current instance is running as.
- * @return Returns the username the current instance is running as.
- */
-QString SingleCoreApplication::currentUser() const {
-  return SingleCoreApplicationPrivate::getUsername();
-}
-
-/**
- * Sends message to the Primary Instance.
- * @param message The message to send.
- * @param timeout the maximum timeout in milliseconds for blocking functions.
- * @return true if the message was sent successfully, false otherwise.
- */
-bool SingleCoreApplication::sendMessage(const QByteArray &message, const int timeout) {
-
-  Q_D(SingleCoreApplication);
-
-  // Nobody to connect to
-  if (isPrimary()) return false;
-
-  // Make sure the socket is connected
-  if (!d->connectToPrimary(timeout, SingleCoreApplicationPrivate::Reconnect)) {
-    return false;
-  }
-
-  return d->writeConfirmedMessage(timeout, message);
-}
-
-/**
- * Cleans up the shared memory block and exits with a failure.
- * This function halts program execution.
- */
-void SingleCoreApplication::abortSafely() {
-
-  Q_D(SingleCoreApplication);
-
-  qCritical() << "SingleCoreApplication: " << d->memory_->error() << d->memory_->errorString();
-  delete d;
-
-  ::exit(EXIT_FAILURE);
-
-}

3rdparty/singleapplication/singlecoreapplication.h

@@ -1,152 +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 SINGLECOREAPPLICATION_H
-#define SINGLECOREAPPLICATION_H
-
-#include <QtGlobal>
-#include <QCoreApplication>
-#include <QFlags>
-#include <QByteArray>
-
-class SingleCoreApplicationPrivate;
-
-/**
- * @brief The SingleCoreApplication class handles multiple instances of the same Application
- * @see QCoreApplication
- */
-class SingleCoreApplication : public QCoreApplication {  // clazy:exclude=ctor-missing-parent-argument
-  Q_OBJECT
-
-  using app_t = QCoreApplication;
-
- public:
-  /**
-   * @brief Mode of operation of SingleCoreApplication.
-   * 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 Mode {
-    User = 1 << 0,
-    System = 1 << 1,
-    SecondaryNotification = 1 << 2,
-    ExcludeAppVersion = 1 << 3,
-    ExcludeAppPath = 1 << 4
-  };
-  Q_DECLARE_FLAGS(Options, Mode)
-
-  /**
-   * @brief Intitializes a SingleCoreApplication 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 SingleCoreApplication 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 SingleCoreApplication
-   * initialisation will be completed in given time, though is a good hint.
-   * Usually 4*timeout would be the worst case (fail) scenario.
-   */
-  explicit SingleCoreApplication(int &argc, char *argv[], const bool allowSecondary = false, const Options options = Mode::User, const int timeout = 1000);
-  ~SingleCoreApplication() 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:
-  SingleCoreApplicationPrivate *d_ptr;
-  Q_DECLARE_PRIVATE(SingleCoreApplication)
-  void abortSafely();
-};
-
-Q_DECLARE_OPERATORS_FOR_FLAGS(SingleCoreApplication::Options)
-
-#endif  // SINGLECOREAPPLICATION_H

3rdparty/singleapplication/singlecoreapplication_p.cpp

@@ -1,526 +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 "singlecoreapplication.h"
-#include "singlecoreapplication_p.h"
-
-SingleCoreApplicationPrivate::SingleCoreApplicationPrivate(SingleCoreApplication *ptr)
-    : q_ptr(ptr),
-      memory_(nullptr),
-      socket_(nullptr),
-      server_(nullptr),
-      instanceNumber_(-1) {}
-
-SingleCoreApplicationPrivate::~SingleCoreApplicationPrivate() {
-
-  if (socket_ != nullptr) {
-    socket_->close();
-    delete socket_;
-    socket_ = nullptr;
-  }
-
-  if (memory_ != nullptr) {
-    memory_->lock();
-    InstancesInfo *instance = static_cast<InstancesInfo*>(memory_->data());
-    if (server_ != nullptr) {
-      server_->close();
-      delete server_;
-      instance->primary = false;
-      instance->primaryPid = -1;
-      instance->primaryUser[0] = '\0';
-      instance->checksum = blockChecksum();
-    }
-    memory_->unlock();
-
-    delete memory_;
-    memory_ = nullptr;
-  }
-
-}
-
-QString SingleCoreApplicationPrivate::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 SingleCoreApplicationPrivate::genBlockServerName() {
-
-  QCryptographicHash appData(QCryptographicHash::Sha256);
-  appData.addData("SingleApplication");
-  appData.addData(SingleCoreApplication::app_t::applicationName().toUtf8());
-  appData.addData(SingleCoreApplication::app_t::organizationName().toUtf8());
-  appData.addData(SingleCoreApplication::app_t::organizationDomain().toUtf8());
-
-  if (!(options_ & SingleCoreApplication::Mode::ExcludeAppVersion)) {
-    appData.addData(SingleCoreApplication::app_t::applicationVersion().toUtf8());
-  }
-
-  if (!(options_ & SingleCoreApplication::Mode::ExcludeAppPath)) {
-#if defined(Q_OS_UNIX)
-    const QByteArray appImagePath = qgetenv("APPIMAGE");
-    if (appImagePath.isEmpty()) {
-      appData.addData(SingleCoreApplication::app_t::applicationFilePath().toUtf8());
-    }
-    else {
-      appData.addData(appImagePath);
-    };
-#elif defined(Q_OS_WIN)
-    appData.addData(SingleCoreApplication::app_t::applicationFilePath().toLower().toUtf8());
-#else
-    appData.addData(SingleCoreApplication::app_t::applicationFilePath().toUtf8());
-#endif
-  }
-
-  // User level block requires a user specific data in the hash
-  if (options_ & SingleCoreApplication::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 SingleCoreApplicationPrivate::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 SingleCoreApplicationPrivate::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();
-
-  // Restrict access to the socket according to the SingleCoreApplication::Mode::User flag on User level or no restrictions
-  if (options_ & SingleCoreApplication::Mode::User) {
-    server_->setSocketOptions(QLocalServer::UserAccessOption);
-  }
-  else {
-    server_->setSocketOptions(QLocalServer::WorldAccessOption);
-  }
-
-  server_->listen(blockServerName_);
-  QObject::connect(server_, &QLocalServer::newConnection, this, &SingleCoreApplicationPrivate::slotConnectionEstablished);
-
-}
-
-void SingleCoreApplicationPrivate::startSecondary() {
-
-  InstancesInfo *instance = static_cast<InstancesInfo*>(memory_->data());
-
-  instance->secondary += 1;
-  instance->checksum = blockChecksum();
-  instanceNumber_ = instance->secondary;
-
-}
-
-bool SingleCoreApplicationPrivate::connectToPrimary(const int timeout, const ConnectionType connectionType) {
-
-  QElapsedTimer time;
-  time.start();
-
-  // Connect to the Local Server of the Primary Instance if not already connected.
-  if (socket_ == nullptr) {
-    socket_ = new QLocalSocket();
-  }
-
-  if (socket_->state() == QLocalSocket::ConnectedState) return true;
-
-  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;
-    }
-  }
-
-  // Initialisation message according to the SingleCoreApplication 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 SingleCoreApplicationPrivate::writeAck(QLocalSocket *sock) {
-  sock->putChar('\n');
-}
-
-bool SingleCoreApplicationPrivate::writeConfirmedMessage(const int timeout, const QByteArray &msg) const {
-
-  QElapsedTimer time;
-  time.start();
-
-  // Frame 1: The header indicates the message length that follows
-  QByteArray header;
-  QDataStream headerStream(&header, QIODevice::WriteOnly);
-  headerStream.setVersion(QDataStream::Qt_5_8);
-  headerStream << static_cast<quint64>(msg.length());
-
-  if (!writeConfirmedFrame(static_cast<int>(timeout - time.elapsed()), header)) {
-    return false;
-  }
-
-  // Frame 2: The message
-  return writeConfirmedFrame(static_cast<int>(timeout - time.elapsed()), msg);
-
-}
-
-bool SingleCoreApplicationPrivate::writeConfirmedFrame(const int timeout, const QByteArray &msg) const {
-
-  socket_->write(msg);
-  socket_->flush();
-
-  bool result = socket_->waitForReadyRead(timeout);
-  if (result) {
-    socket_->read(1);
-    return true;
-  }
-
-  return false;
-
-}
-
-quint16 SingleCoreApplicationPrivate::blockChecksum() const {
-
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-  quint16 checksum = qChecksum(QByteArray(static_cast<const char*>(memory_->constData()), offsetof(InstancesInfo, checksum)));
-#else
-  quint16 checksum = qChecksum(static_cast<const char*>(memory_->constData()), offsetof(InstancesInfo, checksum));
-#endif
-
-  return checksum;
-
-}
-
-qint64 SingleCoreApplicationPrivate::primaryPid() const {
-
-  memory_->lock();
-  InstancesInfo *instance = static_cast<InstancesInfo*>(memory_->data());
-  qint64 pid = instance->primaryPid;
-  memory_->unlock();
-
-  return pid;
-
-}
-
-QString SingleCoreApplicationPrivate::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 SingleCoreApplicationPrivate::slotConnectionEstablished() {
-
-  QLocalSocket *nextConnSocket = server_->nextPendingConnection();
-  connectionMap_.insert(nextConnSocket, ConnectionInfo());
-
-  QObject::connect(nextConnSocket, &QLocalSocket::aboutToClose, this, [nextConnSocket, this]() {
-    const ConnectionInfo &info = connectionMap_[nextConnSocket];
-    slotClientConnectionClosed(nextConnSocket, info.instanceId);
-  });
-
-  QObject::connect(nextConnSocket, &QLocalSocket::disconnected, nextConnSocket, &QLocalSocket::deleteLater);
-
-  QObject::connect(nextConnSocket, &QLocalSocket::destroyed, this, [nextConnSocket, this]() {
-    connectionMap_.remove(nextConnSocket);
-  });
-
-  QObject::connect(nextConnSocket, &QLocalSocket::readyRead, this, [nextConnSocket, this]() {
-    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:
-        this->slotDataAvailable(nextConnSocket, info.instanceId);
-        break;
-      default:
-        break;
-    };
-  });
-
-}
-
-void SingleCoreApplicationPrivate::readMessageHeader(QLocalSocket *sock, SingleCoreApplicationPrivate::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 SingleCoreApplicationPrivate::isFrameComplete(QLocalSocket *sock) {
-
-  if (!connectionMap_.contains(sock)) {
-    return false;
-  }
-
-  ConnectionInfo &info = connectionMap_[sock];
-  return (sock->bytesAvailable() >= static_cast<qint64>(info.msgLen));
-
-}
-
-void SingleCoreApplicationPrivate::readInitMessageBody(QLocalSocket *sock) {
-
-  Q_Q(SingleCoreApplication);
-
-  if (!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
-  ConnectionType connectionType = InvalidConnection;
-  quint8 connTypeVal = InvalidConnection;
-  readStream >> connTypeVal;
-  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_ & SingleCoreApplication::Mode::SecondaryNotification)) {
-    emit q->instanceStarted();
-  }
-
-  writeAck(sock);
-
-}
-
-void SingleCoreApplicationPrivate::slotDataAvailable(QLocalSocket *dataSocket, const quint32 instanceId) {
-
-  Q_Q(SingleCoreApplication);
-
-  if (!isFrameComplete(dataSocket)) {
-    return;
-  }
-
-  const QByteArray message = dataSocket->readAll();
-
-  writeAck(dataSocket);
-
-  ConnectionInfo &info = connectionMap_[dataSocket];
-  info.stage = StageConnectedHeader;
-
-  emit q->receivedMessage(instanceId, message);
-
-}
-
-void SingleCoreApplicationPrivate::slotClientConnectionClosed(QLocalSocket *closedSocket, const quint32 instanceId) {
-
-  if (closedSocket->bytesAvailable() > 0) {
-    slotDataAvailable(closedSocket, instanceId);
-  }
-
-}
-
-void SingleCoreApplicationPrivate::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/singlecoreapplication_p.h

@@ -1,116 +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 SINGLECOREAPPLICATION_P_H
-#define SINGLECOREAPPLICATION_P_H
-
-#include <QtGlobal>
-#include <QObject>
-#include <QString>
-#include <QHash>
-
-#include "singlecoreapplication.h"
-
-class QLocalServer;
-class QLocalSocket;
-class QSharedMemory;
-
-struct InstancesInfo {
-  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;
-};
-
-class SingleCoreApplicationPrivate : public QObject {
-  Q_OBJECT
-
- public:
-  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(SingleCoreApplication)
-
-  explicit SingleCoreApplicationPrivate(SingleCoreApplication *ptr);
-  ~SingleCoreApplicationPrivate() override;
-
-  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();
-
-  SingleCoreApplication *q_ptr;
-  QSharedMemory *memory_;
-  QLocalSocket *socket_;
-  QLocalServer *server_;
-  quint32 instanceNumber_;
-  QString blockServerName_;
-  SingleCoreApplication::Options options_;
-  QHash<QLocalSocket*, ConnectionInfo> connectionMap_;
-
- public slots:
-  void slotConnectionEstablished();
-  void slotDataAvailable(QLocalSocket*, const quint32);
-  void slotClientConnectionClosed(QLocalSocket*, const quint32);
-};
-
-#endif  // SINGLECOREAPPLICATION_P_H

CMakeLists.txt

@@ -2,8 +2,10 @@ cmake_minimum_required(VERSION 3.7)
 
 project(strawberry)
 
-cmake_policy(SET CMP0054 NEW)
-if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.12)
+if(POLICY CMP0054)
+  cmake_policy(SET CMP0054 NEW)
+endif()
+if(POLICY CMP0074)
   cmake_policy(SET CMP0074 NEW)
 endif()
 
@@ -97,27 +99,20 @@ if(CCACHE_EXECUTABLE)
   SET_PROPERTY(GLOBAL PROPERTY RULE_LAUNCH_LINK ${CCACHE_EXECUTABLE})
 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()
-if(USE_ICU)
-  find_package(ICU COMPONENTS uc i18n REQUIRED)
-  if(ICU_FOUND)
-    set(HAVE_ICU ON)
-  endif()
-else()
-  find_package(Iconv)
+find_package(Boost REQUIRED)
+find_package(ICU COMPONENTS uc i18n REQUIRED)
+find_package(Protobuf CONFIG)
+if(NOT Protobuf_FOUND)
+  find_package(Protobuf REQUIRED)
 endif()
-find_package(GnuTLS REQUIRED)
-find_package(Protobuf REQUIRED)
-if(NOT Protobuf_PROTOC_EXECUTABLE)
-  message(FATAL_ERROR "Missing protobuf compiler.")
+if(NOT TARGET protobuf::protoc)
+  message(FATAL_ERROR "Missing Protobuf compiler.")
 endif()
 if(LINUX)
   find_package(ALSA REQUIRED)
@@ -158,84 +153,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()
@@ -274,68 +237,102 @@ 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)
+option(USE_TAGLIB "Build with TagLib" ON)
 option(USE_TAGPARSER "Build with TagParser" OFF)
 
-if(NOT USE_TAGLIB AND NOT USE_TAGPARSER)
-  set(USE_TAGLIB ON)
-endif()
-
 # TAGLIB
 if(USE_TAGLIB)
-  pkg_check_modules(TAGLIB REQUIRED taglib>=1.11.1)
-  if(TAGLIB_FOUND)
-    find_path(HAVE_TAGLIB_DSFFILE_H taglib/dsffile.h)
-    find_path(HAVE_TAGLIB_DSDIFFFILE_H taglib/dsdifffile.h)
-    if(HAVE_TAGLIB_DSFFILE_H)
-      set(HAVE_TAGLIB_DSFFILE ON)
-    endif(HAVE_TAGLIB_DSFFILE_H)
-    if(HAVE_TAGLIB_DSDIFFFILE_H)
-      set(HAVE_TAGLIB_DSDIFFFILE ON)
-    endif(HAVE_TAGLIB_DSDIFFFILE_H)
+  find_package(TagLib 2.0)
+  if(TARGET TagLib::TagLib)
+    set(TAGLIB_FOUND ON)
+    set(TAGLIB_LIBRARIES TagLib::TagLib)
+    set(HAVE_TAGLIB_DSFFILE ON)
+    set(HAVE_TAGLIB_DSDIFFFILE ON)
+  else()
+    pkg_check_modules(TAGLIB REQUIRED taglib>=1.11.1)
   endif()
+  set(HAVE_TAGLIB ON)
+else()
+  set(HAVE_TAGLIB OFF)
 endif()
 
 # TAGPARSER
 if(USE_TAGPARSER)
   pkg_check_modules(TAGPARSER REQUIRED tagparser)
+  set(HAVE_TAGPARSER ON)
+else()
+  set(HAVE_TAGPARSER OFF)
 endif()
 
-if(NOT TAGLIB_FOUND AND NOT TAGPARSER_FOUND)
+pkg_check_modules(LIBEBUR128 IMPORTED_TARGET libebur128)
+
+if(NOT HAVE_TAGLIB AND NOT HAVE_TAGPARSER)
   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)
-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)
@@ -359,6 +356,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"
@@ -376,15 +374,15 @@ optional_component(VLC ON "Engine: VLC backend"
 
 optional_component(SONGFINGERPRINTING ON "Song fingerprinting and tracking"
   DEPENDS "chromaprint" CHROMAPRINT_FOUND
-  DEPENDS "gstreamer" GSTREAMER_FOUND
+  DEPENDS "gstreamer" HAVE_GSTREAMER
 )
 
 optional_component(MUSICBRAINZ ON "MusicBrainz integration"
   DEPENDS "chromaprint" CHROMAPRINT_FOUND
-  DEPENDS "gstreamer" GSTREAMER_FOUND
+  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()
 
@@ -392,25 +390,22 @@ 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
-  DEPENDS "gstreamer" GSTREAMER_FOUND
+  DEPENDS "gstreamer" HAVE_GSTREAMER
 )
 
 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"
@@ -420,7 +415,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"
@@ -432,22 +427,16 @@ 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)
 
 optional_component(SUBSONIC ON "Streaming: Subsonic")
 optional_component(TIDAL ON "Streaming: Tidal")
+optional_component(SPOTIFY ON "Streaming: Spotify" DEPENDS "gstreamer" GSTREAMER_FOUND)
 optional_component(QOBUZ ON "Streaming: Qobuz")
 
 optional_component(MOODBAR ON "Moodbar"
@@ -455,29 +444,28 @@ 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 <QCoreApplication>
     #include <QSqlDatabase>
     #include <QSqlQuery>
-    int main() {
+    int main(int argc, char *argv[]) {
+      QCoreApplication app(argc, argv);
       QSqlDatabase db = QSqlDatabase::addDatabase(\"QSQLITE\");
       db.setDatabaseName(\":memory:\");
       if (!db.open()) { return 1; }
@@ -488,23 +476,6 @@ if(NOT CMAKE_CROSSCOMPILING)
     "
     QT_SQLITE_TEST
   )
-  if(QT_SQLITE_TEST)
-    # Check that we have sqlite3 with FTS5
-    check_cxx_source_runs("
-      #include <QSqlDatabase>
-      #include <QSqlQuery>
-      int main() {
-        QSqlDatabase db = QSqlDatabase::addDatabase(\"QSQLITE\");
-        db.setDatabaseName(\":memory:\");
-        if (!db.open()) { return 1; }
-        QSqlQuery q(db);
-        q.prepare(\"CREATE VIRTUAL TABLE test_fts USING fts5(test, tokenize = 'unicode61 remove_diacritics 0');\");
-        if (!q.exec()) return 1;
-      }
-      "
-      SQLITE_FTS5_TEST
-    )
-  endif()
 endif()
 
 # Set up definitions
@@ -518,6 +489,8 @@ add_definitions(
   -DQT_NO_CAST_TO_ASCII
   -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT
   -DQT_NO_FOREACH
+  -DQT_ASCII_CAST_WARNINGS
+  -DQT_NO_CAST_FROM_ASCII
 )
 
 if(WIN32)
@@ -537,7 +510,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()
 
@@ -563,15 +536,11 @@ if(QT_VERSION_MAJOR EQUAL 5)
 endif()
 
 if(NOT CMAKE_CROSSCOMPILING)
-  if(QT_SQLITE_TEST)
-    if(NOT SQLITE_FTS5_TEST)
-      message(WARNING "sqlite must be enabled with FTS5. See: https://www.sqlite.org/fts5.html")
-    endif()
-  else()
+  if(NOT QT_SQLITE_TEST)
     message(WARNING "The Qt sqlite driver test failed.")
   endif()
 endif()
 
-if(USE_TAGLIB AND TAGLIB_FOUND AND NOT TAGLIB_VERSION VERSION_GREATER_EQUAL 1.12)
+if(HAVE_TAGLIB AND TAGLIB_FOUND AND NOT TAGLIB_VERSION VERSION_GREATER_EQUAL 1.12)
   message(WARNING "There is a critical bug in TagLib (1.11.1) that can result in corrupt Ogg files, see: https://github.com/taglib/taglib/issues/864, please consider updating TagLib to the newest version.")
 endif()

CONTRIBUTING.md

@@ -0,0 +1,115 @@
+# Contribution guidelines
+
+Strawberry is an free and open-source project, it is possible and encouraged to participate in the development.
+You can also participate by answering questions, reporting bugs or helping with documentation.
+
+
+## Submitting a pull request
+
+You should start by creating a fork of the Strawberry repository using the GitHub
+fork button, after that you can clone the repository from your fork.
+Replace "username" with your own.
+
+
+### Clone the repository
+
+    git clone git@github.com:username/strawberry.git
+    cd strawberry
+
+
+### Setup the remote
+
+    git remote add upstream git@github.com:strawberrymusicplayer/strawberry.git
+
+
+### Create a new branch
+
+This creates a new branch from the master branch that you use for specific
+changes.
+
+    git checkout -b your-branch
+
+
+### Stage changes
+
+Once you've finished working on a specific change, stage the changes for
+a specific commit.
+
+Always keep your commits relevant to the pull request, and each commit as
+small as possible.
+
+    git add -p
+
+
+### Commit changes
+
+    git commit
+
+
+### Commit messages
+
+The first line should start with the name of the class that is changed
+followed by a colon then a short explanation of the commit.
+Don't use a trailing period after the first line.
+If this change affects more than one class, omit the class name and write a
+more general message.
+
+You only need to include a main description (body) for larger changes
+where the one line is not enough to describe everything.
+The main description starts after two newlines, it is normal prose and
+should use normal punctuation and capital letters where appropriate.
+It should explain exactly what's changed, why it's changed,
+and what bugs were fixed.
+
+An example of the expected format for git commit messages is as follows:
+
+```
+StretchHeaderView: Set default section size
+
+As of Qt 6.6.1, style changes are resetting the column sizes. To prevent this, we set a default section size.
+
+Fixes #1328
+```
+
+
+### Push the changes to GitHub
+
+Once you've finished working on the changes, push the branch
+to the Git repository and open a new pull request.
+
+
+    git push origin your-branch
+
+
+### Update your fork's master branch
+
+    git checkout master
+    git pull --rebase origin master
+    git fetch upstream
+    git merge upstream/master
+    git push origin master
+
+
+### Update your branch
+
+    git checkout your-branch
+    git fetch upstream
+    git rebase upstream/master
+    git push origin your-branch --force-with-lease
+
+
+### Rebase your branch
+
+If you need fix any issues with your commits, you need to rebase your
+branch to squash any commits, or to change the commit message.
+
+    git checkout your-branch
+    git log
+    git rebase -i commit_sha~
+    git push origin your-branch --force-with-lease
+
+
+### Delete your fork
+
+If you do not plan to work more on Strawberry, please delete your fork from GitHub
+once the pull requests are merged.

Changelog

@@ -2,6 +2,239 @@ Strawberry Music Player
 =======================
 ChangeLog
 
+Version 1.1.0 (2024.07.14):
+
+  Bugfixes:
+    * Fixed crash when pressing CTRL + C (#1359).
+    * Pass on scroll events to page in settings to avoid changing settings when scrolling with mouse (#1380).
+    * Fixed misredered playlist search field with Wayland using scaling (#1255).
+    * Fixed Azlyrics lyrics provider because of website changes.
+    * Fixed Musixmatch lyrics provider because of website changes.
+    * Fixed application exiting when closing file dialog (#1401).
+    * Fixed playlist shuffle randomness (#707).
+    * Fixed playlist shuffle order always the same when restarting playback (#1381).
+    * Fixed dynamic random mix not always ignoring shuffle and repeat mode (#1366).
+    * Fixed manual shuffle while playing not setting current song to new index (##1353).
+    * Fixed volume sync with PA when output is set to auto (#1123).
+    * Fixed mpris:trackid type with KDE 6 (#1397).
+    * Fixed open in file manager feature not handling missing XDG_DATA_DIRS variable.
+    * Fixed collection pixmap disk cache and moodbar cache with newer Qt versions.
+    * Fixed reading common metadata CUE's with multiple files (#1463).
+    * Fixed playlist header stretch mode to only resize the right column of the column being resized.
+    * Fixed adding columns to playlist header not working when not using stretch mode (#1085).
+    * Fixed severe memory leak (!) in context album cover fading (#1464).
+    * Separate albums by different artist in album groupings (#1276).
+    * Removed -new-window parameter from dolphin command for open in file manager (#1412).
+    * Only use playbin3 with GStreamer 1.24 and higher, not with GStreamer 1.22 or lower.
+    * (macOS/Windows) Fixed dash and hls streaming, plugins were missing.
+    * (Windows) Fixed incorrect colors in smart playlist wizard with Fusion in dark mode (#1399).
+    * (Windows) Fixed update window blocking sponsor window on startup.
+
+  Enhancements:
+    * Improve error messages when connecting and copying to devices.
+    * Allow enter to be used with multiselection to add songs to playlist (#1360)
+    * Add song progress to taskbar using D-Bus.
+    * Use API to receive Radio Paradise channels.
+    * Added button for fetching lyrics to tag editor (#1391).
+    * Added option not to skip "A", "An" and "The” when sorting artist names in collection (#1393).
+    * Improved album and title disc, remastered, etc matching and stripping (#1387).
+    * Save volume to settings when adjusting (#1272).
+    * Resolve song from collection using track with Cue in XSPF (#1181).
+    * Added background image to sidebar.
+    * Read metadata from RIFF WAV files (#1424).
+    * Use original path instead of canonical path when adding directories to the collection.
+    * Only apply added/removed collection directories when settings are saved.
+    * Detect and handle different text encodings when reading CUE files (#1429).
+    * The collection has been rewritten and improved (model/filter/search) (#392).
+    * Improve error messages from tag reader.
+    * (Unix) Add experimental GStreamer pipewire support.
+    * (Windows) Add experimental exclusive mode for WASAPI.
+    * (Windows MSVC) Added experimental ASIO support.
+    * (Windows MSVC) Add back WASAPI2.
+
+  New features:
+    * Letras lyrics provider.
+    * Open Tidal API (openapi.tidal.com) cover provider.
+    * Turbine analyzer.
+    * WaveRubber analyzer.
+    * Spotify streaming support.
+
+  Removed features:
+    * Removed now broken lyricsmode.com lyrics provider because of website changes.
+
+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:
+    * Fixed lyrics from Musixmatch.
+    * Fixed possible file corruption when saving both tags and embedded cover using the tag editor (#1158).
+    * Fixed compile without GStreamer.
+    * Fixed context and playing now album art rendering on High DPI displays (#1161).
+    * Fixed setting source properties (device, user-agent, ssl-strict) with GStreamer 1.22 (playbin3) and higher (#1148).
+    * Fixed rescan songs feature not ignoring mtime.
+    * Search lyrics by artist instead of album artist by default.
+
+  Code improvements:
+    * Replace use of deprecated QSqlDatabase::exec().
+
+  Added features:
+    * Added backend setting for strict SSL mode.
+    * Read AcoustID and MusicBrainz tags.
+    * Submit MusicBrainz tags with ListenBrainz.
+
+Version 1.0.15 (2023.03.04):
+
+  Bugfixes:
+    * Fixed playlist column showing invalid last played date for streams.
+    * Fixed crash when the audio bin failed to initialize (#1123, #1133).
+    * Fixed duplicated filename when organizing files using dot in the filename (#1136).
+    * Fixed tag inline editing for streams (#1130).
+    * Fixed resetting play statistics using tag edit dialog (#1124).
+    * Fixed compilation songs not showing if group by was set to other than (Album) Artist / Album (#1140).
+
+  Enhancements:
+    * Added lyrics from stands4 (lyrics.com).
+    * Added Sonogram analyzer.
+    * Use GStreamer playbin3 with GStreamer 1.22.0 and higher.
+
+  Code improvements:
+    * Made use of C++11 enum class where possible.
+    * Use new QNativeIpcKey based QSharedMemory constructor with Qt 6.6 and higher.
+
+Version 1.0.14 (2023.01.13):
+
+  Bugfixes:
+    * Fix initial volume not set when using Auto as output (#1104).
+    * Fix saving moodbar if the URL contains host, ie.: UNC paths for SMB (#1101).
+    * Fix CollectionBackendTest compile error (#1100).
+    * Remove explicitly enabling debug messages (#1106).
+
 Version 1.0.13 (2023.01.09):
 
   Bugfixes:

README.md

@@ -1,4 +1,4 @@
-:strawberry: Strawberry Music Player [![Build Status](https://github.com/strawberrymusicplayer/strawberry/workflows/build/badge.svg)](https://github.com/strawberrymusicplayer/strawberry/actions)
+:strawberry: Strawberry Music Player [![Build Status](https://github.com/strawberrymusicplayer/strawberry/workflows/Build/badge.svg)](https://github.com/strawberrymusicplayer/strawberry/actions)
 =======================
 [![Sponsor](https://img.shields.io/badge/-Sponsor-green?logo=github)](https://github.com/sponsors/jonaski)
 [![Patreon](https://img.shields.io/badge/patreon-donate-green.svg)](https://patreon.com/jonaskvinge)
@@ -19,27 +19,28 @@ Resources:
   * openSUSE buildservice: https://build.opensuse.org/package/show/home:jonaski:audio/strawberry
   * Ubuntu PPA: https://launchpad.net/~jonaski/+archive/ubuntu/strawberry
   * Ubuntu Unstable PPA: https://launchpad.net/~jonaski/+archive/ubuntu/strawberry-unstable
-  * Translations: https://translate.zanata.org/iteration/view/strawberry/master
 
-### :bangbang: Opening an issue:
+### :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,21 +49,22 @@ 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 [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/) and [elyrics.net](https://www.elyrics.net/)
   * Support for multiple backends
   * Audio analyzer
   * Audio equalizer
   * Transfer music to mass-storage USB players, MTP compatible devices and iPod Nano/Classic
   * Scrobbler with support for [Last.fm](https://www.last.fm/), [Libre.fm](https://libre.fm/) and [ListenBrainz](https://listenbrainz.org/)
-  * Subsonic, Tidal and Qobuz streaming support
+  * Subsonic, Tidal, Spotify and Qobuz streaming support
 
 
 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 +75,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/)
-* [SQLite 3.9 or newer with FTS5](https://www.sqlite.org)
+* [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](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,14 +92,15 @@ 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.
 
-### :wrench:	Compiling from source
+### :wrench: Compiling from source
 
 ### Get the code:
 
-    git clone https://github.com/strawberrymusicplayer/strawberry
+    git clone --recursive https://github.com/strawberrymusicplayer/strawberry
 
 ### Compile and install:
 
@@ -115,7 +117,6 @@ Strawberry is backwards compatible with Qt 5, to compile with Qt 5 use:
 
 To compile on Windows with Visual Studio 2019 or 2022, see https://github.com/strawberrymusicplayer/strawberry-msvc
 
-### :penguin:	Packaging status
+### :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

@@ -1,21 +1,33 @@
-find_program(GETTEXT_XGETTEXT_EXECUTABLE xgettext)
-if(NOT GETTEXT_XGETTEXT_EXECUTABLE)
-  message(FATAL_ERROR "Could not find xgettext executable")
-endif(NOT GETTEXT_XGETTEXT_EXECUTABLE)
+find_program(GETTEXT_XGETTEXT_EXECUTABLE xgettext REQUIRED)
+find_program(CAT_EXECUTABLE cat REQUIRED)
 
-set (XGETTEXT_OPTIONS
-    --qt
-    --keyword=tr:1,2c
-    --keyword=tr --flag=tr:1:pass-c-format --flag=tr:1:pass-qt-format
-    --keyword=trUtf8 --flag=tr:1:pass-c-format --flag=tr:1:pass-qt-format
-    --keyword=translate:2,3c
-    --keyword=translate:2 --flag=translate:2:pass-c-format --flag=translate:2:pass-qt-format
-    --keyword=QT_TR_NOOP --flag=QT_TR_NOOP:1:pass-c-format --flag=QT_TR_NOOP:1:pass-qt-format
-    --keyword=QT_TRANSLATE_NOOP:2 --flag=QT_TRANSLATE_NOOP:2:pass-c-format --flag=QT_TRANSLATE_NOOP:2:pass-qt-format
-    --keyword=_ --flag=_:1:pass-c-format --flag=_:1:pass-qt-format
-    --keyword=N_ --flag=N_:1:pass-c-format --flag=N_:1:pass-qt-format
-    --from-code=utf-8
-    )
+list(APPEND XGETTEXT_OPTIONS
+  --qt
+  --keyword=tr:1,2c
+  --keyword=tr
+  --flag=tr:1:pass-c-format
+  --flag=tr:1:pass-qt-format
+  --keyword=trUtf8
+  --flag=tr:1:pass-c-format
+  --flag=tr:1:pass-qt-format
+  --keyword=translate:2,3c
+  --keyword=translate:2
+  --flag=translate:2:pass-c-format
+  --flag=translate:2:pass-qt-format
+  --keyword=QT_TR_NOOP
+  --flag=QT_TR_NOOP:1:pass-c-format
+  --flag=QT_TR_NOOP:1:pass-qt-format
+  --keyword=QT_TRANSLATE_NOOP:2
+  --flag=QT_TRANSLATE_NOOP:2:pass-c-format
+  --flag=QT_TRANSLATE_NOOP:2:pass-qt-format
+  --keyword=_
+  --flag=_:1:pass-c-format
+  --flag=_:1:pass-qt-format
+  --keyword=N_
+  --flag=N_:1:pass-c-format
+  --flag=N_:1:pass-qt-format
+  --from-code=utf-8
+)
 
 execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/translations)
 
@@ -32,7 +44,7 @@ macro(add_pot outfiles header pot)
   add_custom_command(
     OUTPUT ${pot}
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-    COMMAND ${GETTEXT_XGETTEXT_EXECUTABLE} ${XGETTEXT_OPTIONS} -s -C --omit-header --output=${CMAKE_CURRENT_BINARY_DIR}/pot.temp ${add_pot_sources}
+    COMMAND xgettext ${XGETTEXT_OPTIONS} -s -C --omit-header --output="${CMAKE_CURRENT_BINARY_DIR}/pot.temp" ${add_pot_sources}
     COMMAND cat ${header} ${CMAKE_CURRENT_BINARY_DIR}/pot.temp > ${pot}
     DEPENDS ${add_pot_sources} ${header}
   )
@@ -59,7 +71,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,31 +1,19 @@
 set(STRAWBERRY_VERSION_MAJOR 1)
-set(STRAWBERRY_VERSION_MINOR 0)
-set(STRAWBERRY_VERSION_PATCH 13)
+set(STRAWBERRY_VERSION_MINOR 1)
+set(STRAWBERRY_VERSION_PATCH 0)
 #set(STRAWBERRY_VERSION_PRERELEASE rc1)
 
 set(INCLUDE_GIT_REVISION OFF)
 
 set(majorminorpatch "${STRAWBERRY_VERSION_MAJOR}.${STRAWBERRY_VERSION_MINOR}.${STRAWBERRY_VERSION_PATCH}")
 
-set(STRAWBERRY_VERSION_DISPLAY "${majorminorpatch}")
-set(STRAWBERRY_VERSION_PACKAGE "${majorminorpatch}")
-set(STRAWBERRY_VERSION_RPM_V   "${majorminorpatch}")
-set(STRAWBERRY_VERSION_RPM_R   "1")
-set(STRAWBERRY_VERSION_PAC_V   "${majorminorpatch}")
-set(STRAWBERRY_VERSION_PAC_R   "1")
-
-if(STRAWBERRY_VERSION_PRERELEASE)
-  set(STRAWBERRY_VERSION_DISPLAY "${STRAWBERRY_VERSION_DISPLAY} ${STRAWBERRY_VERSION_PRERELEASE}")
-  set(STRAWBERRY_VERSION_RPM_R   "0.${STRAWBERRY_VERSION_PRERELEASE}")
-  set(STRAWBERRY_VERSION_PACKAGE "${STRAWBERRY_VERSION_PACKAGE}${STRAWBERRY_VERSION_PRERELEASE}")
-endif(STRAWBERRY_VERSION_PRERELEASE)
-
-
-if(INCLUDE_GIT_REVISION AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
+if(FORCE_GIT_REVISION)
+  set(GIT_REVISION ${FORCE_GIT_REVISION})
+elseif(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,15 +36,11 @@ 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()
 
-if(FORCE_GIT_REVISION)
-  set(GIT_REVISION ${FORCE_GIT_REVISION})
-endif()
-
 if(GIT_REVISION)
 
   string(REGEX REPLACE "^(.+)-([0-9]+)-(g[a-f0-9]+)$" "\\1;\\2;\\3" GIT_PARTS ${GIT_REVISION})
@@ -67,7 +51,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)
@@ -78,15 +62,23 @@ if(GIT_REVISION)
 
   set(STRAWBERRY_VERSION_DISPLAY "${GIT_REVISION}")
   set(STRAWBERRY_VERSION_PACKAGE "${GIT_TAGNAME}.${GIT_COMMITCOUNT}.${GIT_SHA1}")
-  set(STRAWBERRY_VERSION_RPM_V   "${GIT_TAGNAME}")
+  string(REPLACE "-" "~" STRAWBERRY_VERSION_RPM_V "${GIT_TAGNAME}")
   set(STRAWBERRY_VERSION_RPM_R   "2.${GIT_COMMITCOUNT}.${GIT_SHA1}")
-  set(STRAWBERRY_VERSION_PAC_V   "${GIT_TAGNAME}.r${GIT_COMMITCOUNT}.${GIT_SHA1}")
-  set(STRAWBERRY_VERSION_PAC_R   "1")
 
+else()
+  if(STRAWBERRY_VERSION_PRERELEASE)
+    set(STRAWBERRY_VERSION_DISPLAY "${majorminorpatch}-${STRAWBERRY_VERSION_PRERELEASE}")
+    set(STRAWBERRY_VERSION_RPM_V   "${majorminorpatch}~${STRAWBERRY_VERSION_PRERELEASE}")
+    set(STRAWBERRY_VERSION_PACKAGE "${majorminorpatch}${STRAWBERRY_VERSION_PRERELEASE}")
+  else()
+    set(STRAWBERRY_VERSION_DISPLAY "${majorminorpatch}")
+    set(STRAWBERRY_VERSION_PACKAGE "${majorminorpatch}")
+    set(STRAWBERRY_VERSION_RPM_V   "${majorminorpatch}")
+  endif()
+  set(STRAWBERRY_VERSION_RPM_R   "1")
 endif()
 
 message(STATUS "Strawberry Version:")
 message(STATUS "Display:  ${STRAWBERRY_VERSION_DISPLAY}")
 message(STATUS "Package:  ${STRAWBERRY_VERSION_PACKAGE}")
 message(STATUS "RPM:      ${STRAWBERRY_VERSION_RPM_V}-${STRAWBERRY_VERSION_RPM_R}")
-message(STATUS "PAC:      ${STRAWBERRY_VERSION_PAC_V}-${STRAWBERRY_VERSION_PAC_R}")

data/data.qrc

@@ -7,6 +7,11 @@
         <file>schema/schema-13.sql</file>
         <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/schema-19.sql</file>
+        <file>schema/schema-20.sql</file>
         <file>schema/device-schema.sql</file>
         <file>style/strawberry.css</file>
         <file>style/smartplaylistsearchterm.css</file>
@@ -39,5 +44,6 @@
         <file>pictures/star-off.png</file>
         <file>mood/sample.mood</file>
         <file>text/ghosts.txt</file>
+        <file>pictures/sidebar-background.png</file>
     </qresource>
 </RCC>

data/icons.qrc

@@ -91,6 +91,7 @@
         <file>icons/128x128/love.png</file>
         <file>icons/128x128/subsonic.png</file>
         <file>icons/128x128/tidal.png</file>
+        <file>icons/128x128/spotify.png</file>
         <file>icons/128x128/qobuz.png</file>
         <file>icons/128x128/multimedia-player-ipod-standard-black.png</file>
         <file>icons/128x128/radio.png</file>
@@ -189,6 +190,7 @@
         <file>icons/64x64/love.png</file>
         <file>icons/64x64/subsonic.png</file>
         <file>icons/64x64/tidal.png</file>
+        <file>icons/64x64/spotify.png</file>
         <file>icons/64x64/qobuz.png</file>
         <file>icons/64x64/multimedia-player-ipod-standard-black.png</file>
         <file>icons/64x64/radio.png</file>
@@ -290,8 +292,9 @@
         <file>icons/48x48/moodbar.png</file>
         <file>icons/48x48/love.png</file>
         <file>icons/48x48/subsonic.png</file>
-	<file>icons/48x48/tidal.png</file>
-	<file>icons/48x48/qobuz.png</file>
+        <file>icons/48x48/tidal.png</file>
+        <file>icons/48x48/spotify.png</file>
+        <file>icons/48x48/qobuz.png</file>
         <file>icons/48x48/multimedia-player-ipod-standard-black.png</file>
         <file>icons/48x48/radio.png</file>
         <file>icons/48x48/somafm.png</file>
@@ -393,6 +396,7 @@
         <file>icons/32x32/love.png</file>
         <file>icons/32x32/subsonic.png</file>
         <file>icons/32x32/tidal.png</file>
+        <file>icons/32x32/spotify.png</file>
         <file>icons/32x32/qobuz.png</file>
         <file>icons/32x32/multimedia-player-ipod-standard-black.png</file>
         <file>icons/32x32/radio.png</file>
@@ -495,6 +499,7 @@
         <file>icons/22x22/love.png</file>
         <file>icons/22x22/subsonic.png</file>
         <file>icons/22x22/tidal.png</file>
+        <file>icons/22x22/spotify.png</file>
         <file>icons/22x22/qobuz.png</file>
         <file>icons/22x22/multimedia-player-ipod-standard-black.png</file>
         <file>icons/22x22/radio.png</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,15 +59,34 @@ 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,
 
   cue_path TEXT,
 
-  rating INTEGER DEFAULT -1
+  rating INTEGER DEFAULT -1,
+
+  acoustid_id TEXT,
+  acoustid_fingerprint TEXT,
+
+  musicbrainz_album_artist_id TEXT,
+  musicbrainz_artist_id TEXT,
+  musicbrainz_original_artist_id TEXT,
+  musicbrainz_album_id TEXT,
+  musicbrainz_original_album_id TEXT,
+  musicbrainz_recording_id TEXT,
+  musicbrainz_track_id TEXT,
+  musicbrainz_disc_id TEXT,
+  musicbrainz_release_group_id TEXT,
+  musicbrainz_work_id TEXT,
+
+  ebur128_integrated_loudness_lufs REAL,
+  ebur128_loudness_range_lu REAL
 
 );
 
@@ -75,9 +94,4 @@ CREATE INDEX idx_device_%deviceid_songs_album ON device_%deviceid_songs (album);
 
 CREATE INDEX idx_device_%deviceid_songs_comp_artist ON device_%deviceid_songs (compilation_effective, artist);
 
-CREATE VIRTUAL TABLE device_%deviceid_fts USING fts5(
-  ftstitle, ftsalbum, ftsartist, ftsalbumartist, ftscomposer, ftsperformer, ftsgrouping, ftsgenre, ftscomment,
-  tokenize = "unicode61 remove_diacritics 1"
-);
-
-UPDATE devices SET schema_version=3 WHERE ROWID=%deviceid;
+UPDATE devices SET schema_version=5 WHERE ROWID=%deviceid;

data/schema/schema-16.sql

@@ -0,0 +1,217 @@
+ALTER TABLE songs ADD COLUMN acoustid_id TEXT;
+
+ALTER TABLE songs ADD COLUMN acoustid_fingerprint TEXT;
+
+ALTER TABLE songs ADD COLUMN musicbrainz_album_artist_id TEXT;
+
+ALTER TABLE songs ADD COLUMN musicbrainz_artist_id TEXT;
+
+ALTER TABLE songs ADD COLUMN musicbrainz_original_artist_id TEXT;
+
+ALTER TABLE songs ADD COLUMN musicbrainz_album_id TEXT;
+
+ALTER TABLE songs ADD COLUMN musicbrainz_original_album_id TEXT;
+
+ALTER TABLE songs ADD COLUMN musicbrainz_recording_id TEXT;
+
+ALTER TABLE songs ADD COLUMN musicbrainz_track_id TEXT;
+
+ALTER TABLE songs ADD COLUMN musicbrainz_disc_id TEXT;
+
+ALTER TABLE songs ADD COLUMN musicbrainz_release_group_id TEXT;
+
+ALTER TABLE songs ADD COLUMN musicbrainz_work_id TEXT;
+
+ALTER TABLE subsonic_songs ADD COLUMN acoustid_id TEXT;
+
+ALTER TABLE subsonic_songs ADD COLUMN acoustid_fingerprint TEXT;
+
+ALTER TABLE subsonic_songs ADD COLUMN musicbrainz_album_artist_id TEXT;
+
+ALTER TABLE subsonic_songs ADD COLUMN musicbrainz_artist_id TEXT;
+
+ALTER TABLE subsonic_songs ADD COLUMN musicbrainz_original_artist_id TEXT;
+
+ALTER TABLE subsonic_songs ADD COLUMN musicbrainz_album_id TEXT;
+
+ALTER TABLE subsonic_songs ADD COLUMN musicbrainz_original_album_id TEXT;
+
+ALTER TABLE subsonic_songs ADD COLUMN musicbrainz_recording_id TEXT;
+
+ALTER TABLE subsonic_songs ADD COLUMN musicbrainz_track_id TEXT;
+
+ALTER TABLE subsonic_songs ADD COLUMN musicbrainz_disc_id TEXT;
+
+ALTER TABLE subsonic_songs ADD COLUMN musicbrainz_release_group_id TEXT;
+
+ALTER TABLE subsonic_songs ADD COLUMN musicbrainz_work_id TEXT;
+
+ALTER TABLE tidal_artists_songs ADD COLUMN acoustid_id TEXT;
+
+ALTER TABLE tidal_artists_songs ADD COLUMN acoustid_fingerprint TEXT;
+
+ALTER TABLE tidal_artists_songs ADD COLUMN musicbrainz_album_artist_id TEXT;
+
+ALTER TABLE tidal_artists_songs ADD COLUMN musicbrainz_artist_id TEXT;
+
+ALTER TABLE tidal_artists_songs ADD COLUMN musicbrainz_original_artist_id TEXT;
+
+ALTER TABLE tidal_artists_songs ADD COLUMN musicbrainz_album_id TEXT;
+
+ALTER TABLE tidal_artists_songs ADD COLUMN musicbrainz_original_album_id TEXT;
+
+ALTER TABLE tidal_artists_songs ADD COLUMN musicbrainz_recording_id TEXT;
+
+ALTER TABLE tidal_artists_songs ADD COLUMN musicbrainz_track_id TEXT;
+
+ALTER TABLE tidal_artists_songs ADD COLUMN musicbrainz_disc_id TEXT;
+
+ALTER TABLE tidal_artists_songs ADD COLUMN musicbrainz_release_group_id TEXT;
+
+ALTER TABLE tidal_artists_songs ADD COLUMN musicbrainz_work_id TEXT;
+
+ALTER TABLE tidal_albums_songs ADD COLUMN acoustid_id TEXT;
+
+ALTER TABLE tidal_albums_songs ADD COLUMN acoustid_fingerprint TEXT;
+
+ALTER TABLE tidal_albums_songs ADD COLUMN musicbrainz_album_artist_id TEXT;
+
+ALTER TABLE tidal_albums_songs ADD COLUMN musicbrainz_artist_id TEXT;
+
+ALTER TABLE tidal_albums_songs ADD COLUMN musicbrainz_original_artist_id TEXT;
+
+ALTER TABLE tidal_albums_songs ADD COLUMN musicbrainz_album_id TEXT;
+
+ALTER TABLE tidal_albums_songs ADD COLUMN musicbrainz_original_album_id TEXT;
+
+ALTER TABLE tidal_albums_songs ADD COLUMN musicbrainz_recording_id TEXT;
+
+ALTER TABLE tidal_albums_songs ADD COLUMN musicbrainz_track_id TEXT;
+
+ALTER TABLE tidal_albums_songs ADD COLUMN musicbrainz_disc_id TEXT;
+
+ALTER TABLE tidal_albums_songs ADD COLUMN musicbrainz_release_group_id TEXT;
+
+ALTER TABLE tidal_albums_songs ADD COLUMN musicbrainz_work_id TEXT;
+
+ALTER TABLE tidal_songs ADD COLUMN acoustid_id TEXT;
+
+ALTER TABLE tidal_songs ADD COLUMN acoustid_fingerprint TEXT;
+
+ALTER TABLE tidal_songs ADD COLUMN musicbrainz_album_artist_id TEXT;
+
+ALTER TABLE tidal_songs ADD COLUMN musicbrainz_artist_id TEXT;
+
+ALTER TABLE tidal_songs ADD COLUMN musicbrainz_original_artist_id TEXT;
+
+ALTER TABLE tidal_songs ADD COLUMN musicbrainz_album_id TEXT;
+
+ALTER TABLE tidal_songs ADD COLUMN musicbrainz_original_album_id TEXT;
+
+ALTER TABLE tidal_songs ADD COLUMN musicbrainz_recording_id TEXT;
+
+ALTER TABLE tidal_songs ADD COLUMN musicbrainz_track_id TEXT;
+
+ALTER TABLE tidal_songs ADD COLUMN musicbrainz_disc_id TEXT;
+
+ALTER TABLE tidal_songs ADD COLUMN musicbrainz_release_group_id TEXT;
+
+ALTER TABLE tidal_songs ADD COLUMN musicbrainz_work_id TEXT;
+
+ALTER TABLE qobuz_artists_songs ADD COLUMN acoustid_id TEXT;
+
+ALTER TABLE qobuz_artists_songs ADD COLUMN acoustid_fingerprint TEXT;
+
+ALTER TABLE qobuz_artists_songs ADD COLUMN musicbrainz_album_artist_id TEXT;
+
+ALTER TABLE qobuz_artists_songs ADD COLUMN musicbrainz_artist_id TEXT;
+
+ALTER TABLE qobuz_artists_songs ADD COLUMN musicbrainz_original_artist_id TEXT;
+
+ALTER TABLE qobuz_artists_songs ADD COLUMN musicbrainz_album_id TEXT;
+
+ALTER TABLE qobuz_artists_songs ADD COLUMN musicbrainz_original_album_id TEXT;
+
+ALTER TABLE qobuz_artists_songs ADD COLUMN musicbrainz_recording_id TEXT;
+
+ALTER TABLE qobuz_artists_songs ADD COLUMN musicbrainz_track_id TEXT;
+
+ALTER TABLE qobuz_artists_songs ADD COLUMN musicbrainz_disc_id TEXT;
+
+ALTER TABLE qobuz_artists_songs ADD COLUMN musicbrainz_release_group_id TEXT;
+
+ALTER TABLE qobuz_artists_songs ADD COLUMN musicbrainz_work_id TEXT;
+
+ALTER TABLE qobuz_albums_songs ADD COLUMN acoustid_id TEXT;
+
+ALTER TABLE qobuz_albums_songs ADD COLUMN acoustid_fingerprint TEXT;
+
+ALTER TABLE qobuz_albums_songs ADD COLUMN musicbrainz_album_artist_id TEXT;
+
+ALTER TABLE qobuz_albums_songs ADD COLUMN musicbrainz_artist_id TEXT;
+
+ALTER TABLE qobuz_albums_songs ADD COLUMN musicbrainz_original_artist_id TEXT;
+
+ALTER TABLE qobuz_albums_songs ADD COLUMN musicbrainz_album_id TEXT;
+
+ALTER TABLE qobuz_albums_songs ADD COLUMN musicbrainz_original_album_id TEXT;
+
+ALTER TABLE qobuz_albums_songs ADD COLUMN musicbrainz_recording_id TEXT;
+
+ALTER TABLE qobuz_albums_songs ADD COLUMN musicbrainz_track_id TEXT;
+
+ALTER TABLE qobuz_albums_songs ADD COLUMN musicbrainz_disc_id TEXT;
+
+ALTER TABLE qobuz_albums_songs ADD COLUMN musicbrainz_release_group_id TEXT;
+
+ALTER TABLE qobuz_albums_songs ADD COLUMN musicbrainz_work_id TEXT;
+
+ALTER TABLE qobuz_songs ADD COLUMN acoustid_id TEXT;
+
+ALTER TABLE qobuz_songs ADD COLUMN acoustid_fingerprint TEXT;
+
+ALTER TABLE qobuz_songs ADD COLUMN musicbrainz_album_artist_id TEXT;
+
+ALTER TABLE qobuz_songs ADD COLUMN musicbrainz_artist_id TEXT;
+
+ALTER TABLE qobuz_songs ADD COLUMN musicbrainz_original_artist_id TEXT;
+
+ALTER TABLE qobuz_songs ADD COLUMN musicbrainz_album_id TEXT;
+
+ALTER TABLE qobuz_songs ADD COLUMN musicbrainz_original_album_id TEXT;
+
+ALTER TABLE qobuz_songs ADD COLUMN musicbrainz_recording_id TEXT;
+
+ALTER TABLE qobuz_songs ADD COLUMN musicbrainz_track_id TEXT;
+
+ALTER TABLE qobuz_songs ADD COLUMN musicbrainz_disc_id TEXT;
+
+ALTER TABLE qobuz_songs ADD COLUMN musicbrainz_release_group_id TEXT;
+
+ALTER TABLE qobuz_songs ADD COLUMN musicbrainz_work_id TEXT;
+
+ALTER TABLE playlist_items ADD COLUMN acoustid_id TEXT;
+
+ALTER TABLE playlist_items ADD COLUMN acoustid_fingerprint TEXT;
+
+ALTER TABLE playlist_items ADD COLUMN musicbrainz_album_artist_id TEXT;
+
+ALTER TABLE playlist_items ADD COLUMN musicbrainz_artist_id TEXT;
+
+ALTER TABLE playlist_items ADD COLUMN musicbrainz_original_artist_id TEXT;
+
+ALTER TABLE playlist_items ADD COLUMN musicbrainz_album_id TEXT;
+
+ALTER TABLE playlist_items ADD COLUMN musicbrainz_original_album_id TEXT;
+
+ALTER TABLE playlist_items ADD COLUMN musicbrainz_recording_id TEXT;
+
+ALTER TABLE playlist_items ADD COLUMN musicbrainz_track_id TEXT;
+
+ALTER TABLE playlist_items ADD COLUMN musicbrainz_disc_id TEXT;
+
+ALTER TABLE playlist_items ADD COLUMN musicbrainz_release_group_id TEXT;
+
+ALTER TABLE playlist_items ADD COLUMN musicbrainz_work_id TEXT;
+
+UPDATE schema_version SET version=16;

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

@@ -0,0 +1,19 @@
+DROP TABLE IF EXISTS %allsongstables_fts;
+
+DROP TABLE IF EXISTS songs_fts;
+
+DROP TABLE IF EXISTS subsonic_songs_fts;
+
+DROP TABLE IF EXISTS tidal_artists_songs_fts;
+
+DROP TABLE IF EXISTS tidal_albums_songs_fts;
+
+DROP TABLE IF EXISTS tidal_songs_fts;
+
+DROP TABLE IF EXISTS qobuz_artists_songs_fts;
+
+DROP TABLE IF EXISTS qobuz_albums_songs_fts;
+
+DROP TABLE IF EXISTS qobuz_songs_fts;
+
+UPDATE schema_version SET version=19;

data/schema/schema-20.sql

@@ -0,0 +1,244 @@
+CREATE TABLE IF NOT EXISTS spotify_artists_songs (
+
+  title TEXT,
+  album TEXT,
+  artist TEXT,
+  albumartist TEXT,
+  track INTEGER NOT NULL DEFAULT -1,
+  disc INTEGER NOT NULL DEFAULT -1,
+  year INTEGER NOT NULL DEFAULT -1,
+  originalyear INTEGER NOT NULL DEFAULT -1,
+  genre TEXT,
+  compilation INTEGER NOT NULL DEFAULT 0,
+  composer TEXT,
+  performer TEXT,
+  grouping TEXT,
+  comment TEXT,
+  lyrics TEXT,
+
+  artist_id TEXT,
+  album_id TEXT,
+  song_id TEXT,
+
+  beginning INTEGER NOT NULL DEFAULT 0,
+  length INTEGER NOT NULL DEFAULT 0,
+
+  bitrate INTEGER NOT NULL DEFAULT -1,
+  samplerate INTEGER NOT NULL DEFAULT -1,
+  bitdepth INTEGER NOT NULL DEFAULT -1,
+
+  source INTEGER NOT NULL DEFAULT 0,
+  directory_id INTEGER NOT NULL DEFAULT -1,
+  url TEXT NOT NULL,
+  filetype INTEGER NOT NULL DEFAULT 0,
+  filesize INTEGER NOT NULL DEFAULT -1,
+  mtime INTEGER NOT NULL DEFAULT -1,
+  ctime INTEGER NOT NULL DEFAULT -1,
+  unavailable INTEGER DEFAULT 0,
+
+  fingerprint TEXT,
+
+  playcount INTEGER NOT NULL DEFAULT 0,
+  skipcount INTEGER NOT NULL DEFAULT 0,
+  lastplayed INTEGER NOT NULL DEFAULT -1,
+  lastseen INTEGER NOT NULL DEFAULT -1,
+
+  compilation_detected INTEGER DEFAULT 0,
+  compilation_on INTEGER NOT NULL DEFAULT 0,
+  compilation_off INTEGER NOT NULL DEFAULT 0,
+  compilation_effective INTEGER NOT NULL DEFAULT 0,
+
+  art_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,
+
+  cue_path TEXT,
+
+  rating INTEGER DEFAULT -1,
+
+  acoustid_id TEXT,
+  acoustid_fingerprint TEXT,
+
+  musicbrainz_album_artist_id TEXT,
+  musicbrainz_artist_id TEXT,
+  musicbrainz_original_artist_id TEXT,
+  musicbrainz_album_id TEXT,
+  musicbrainz_original_album_id TEXT,
+  musicbrainz_recording_id TEXT,
+  musicbrainz_track_id TEXT,
+  musicbrainz_disc_id TEXT,
+  musicbrainz_release_group_id TEXT,
+  musicbrainz_work_id TEXT,
+
+  ebur128_integrated_loudness_lufs REAL,
+  ebur128_loudness_range_lu REAL
+
+);
+
+CREATE TABLE IF NOT EXISTS spotify_albums_songs (
+
+  title TEXT,
+  album TEXT,
+  artist TEXT,
+  albumartist TEXT,
+  track INTEGER NOT NULL DEFAULT -1,
+  disc INTEGER NOT NULL DEFAULT -1,
+  year INTEGER NOT NULL DEFAULT -1,
+  originalyear INTEGER NOT NULL DEFAULT -1,
+  genre TEXT,
+  compilation INTEGER NOT NULL DEFAULT 0,
+  composer TEXT,
+  performer TEXT,
+  grouping TEXT,
+  comment TEXT,
+  lyrics TEXT,
+
+  artist_id TEXT,
+  album_id TEXT,
+  song_id TEXT,
+
+  beginning INTEGER NOT NULL DEFAULT 0,
+  length INTEGER NOT NULL DEFAULT 0,
+
+  bitrate INTEGER NOT NULL DEFAULT -1,
+  samplerate INTEGER NOT NULL DEFAULT -1,
+  bitdepth INTEGER NOT NULL DEFAULT -1,
+
+  source INTEGER NOT NULL DEFAULT 0,
+  directory_id INTEGER NOT NULL DEFAULT -1,
+  url TEXT NOT NULL,
+  filetype INTEGER NOT NULL DEFAULT 0,
+  filesize INTEGER NOT NULL DEFAULT -1,
+  mtime INTEGER NOT NULL DEFAULT -1,
+  ctime INTEGER NOT NULL DEFAULT -1,
+  unavailable INTEGER DEFAULT 0,
+
+  fingerprint TEXT,
+
+  playcount INTEGER NOT NULL DEFAULT 0,
+  skipcount INTEGER NOT NULL DEFAULT 0,
+  lastplayed INTEGER NOT NULL DEFAULT -1,
+  lastseen INTEGER NOT NULL DEFAULT -1,
+
+  compilation_detected INTEGER DEFAULT 0,
+  compilation_on INTEGER NOT NULL DEFAULT 0,
+  compilation_off INTEGER NOT NULL DEFAULT 0,
+  compilation_effective INTEGER NOT NULL DEFAULT 0,
+
+  art_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,
+
+  cue_path TEXT,
+
+  rating INTEGER DEFAULT -1,
+
+  acoustid_id TEXT,
+  acoustid_fingerprint TEXT,
+
+  musicbrainz_album_artist_id TEXT,
+  musicbrainz_artist_id TEXT,
+  musicbrainz_original_artist_id TEXT,
+  musicbrainz_album_id TEXT,
+  musicbrainz_original_album_id TEXT,
+  musicbrainz_recording_id TEXT,
+  musicbrainz_track_id TEXT,
+  musicbrainz_disc_id TEXT,
+  musicbrainz_release_group_id TEXT,
+  musicbrainz_work_id TEXT,
+
+  ebur128_integrated_loudness_lufs REAL,
+  ebur128_loudness_range_lu REAL
+
+);
+
+CREATE TABLE IF NOT EXISTS spotify_songs (
+
+  title TEXT,
+  album TEXT,
+  artist TEXT,
+  albumartist TEXT,
+  track INTEGER NOT NULL DEFAULT -1,
+  disc INTEGER NOT NULL DEFAULT -1,
+  year INTEGER NOT NULL DEFAULT -1,
+  originalyear INTEGER NOT NULL DEFAULT -1,
+  genre TEXT,
+  compilation INTEGER NOT NULL DEFAULT 0,
+  composer TEXT,
+  performer TEXT,
+  grouping TEXT,
+  comment TEXT,
+  lyrics TEXT,
+
+  artist_id TEXT,
+  album_id TEXT,
+  song_id TEXT,
+
+  beginning INTEGER NOT NULL DEFAULT 0,
+  length INTEGER NOT NULL DEFAULT 0,
+
+  bitrate INTEGER NOT NULL DEFAULT -1,
+  samplerate INTEGER NOT NULL DEFAULT -1,
+  bitdepth INTEGER NOT NULL DEFAULT -1,
+
+  source INTEGER NOT NULL DEFAULT 0,
+  directory_id INTEGER NOT NULL DEFAULT -1,
+  url TEXT NOT NULL,
+  filetype INTEGER NOT NULL DEFAULT 0,
+  filesize INTEGER NOT NULL DEFAULT -1,
+  mtime INTEGER NOT NULL DEFAULT -1,
+  ctime INTEGER NOT NULL DEFAULT -1,
+  unavailable INTEGER DEFAULT 0,
+
+  fingerprint TEXT,
+
+  playcount INTEGER NOT NULL DEFAULT 0,
+  skipcount INTEGER NOT NULL DEFAULT 0,
+  lastplayed INTEGER NOT NULL DEFAULT -1,
+  lastseen INTEGER NOT NULL DEFAULT -1,
+
+  compilation_detected INTEGER DEFAULT 0,
+  compilation_on INTEGER NOT NULL DEFAULT 0,
+  compilation_off INTEGER NOT NULL DEFAULT 0,
+  compilation_effective INTEGER NOT NULL DEFAULT 0,
+
+  art_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,
+
+  cue_path TEXT,
+
+  rating INTEGER DEFAULT -1,
+
+  acoustid_id TEXT,
+  acoustid_fingerprint TEXT,
+
+  musicbrainz_album_artist_id TEXT,
+  musicbrainz_artist_id TEXT,
+  musicbrainz_original_artist_id TEXT,
+  musicbrainz_album_id TEXT,
+  musicbrainz_original_album_id TEXT,
+  musicbrainz_recording_id TEXT,
+  musicbrainz_track_id TEXT,
+  musicbrainz_disc_id TEXT,
+  musicbrainz_release_group_id TEXT,
+  musicbrainz_work_id TEXT,
+
+  ebur128_integrated_loudness_lufs REAL,
+  ebur128_loudness_range_lu REAL
+
+);
+
+UPDATE schema_version SET version=20;

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 (15);
+INSERT INTO schema_version (version) VALUES (20);
 
 CREATE TABLE IF NOT EXISTS directories (
   path TEXT NOT NULL,
@@ -67,15 +67,34 @@ 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,
 
   cue_path TEXT,
 
-  rating INTEGER DEFAULT -1
+  rating INTEGER DEFAULT -1,
+
+  acoustid_id TEXT,
+  acoustid_fingerprint TEXT,
+
+  musicbrainz_album_artist_id TEXT,
+  musicbrainz_artist_id TEXT,
+  musicbrainz_original_artist_id TEXT,
+  musicbrainz_album_id TEXT,
+  musicbrainz_original_album_id TEXT,
+  musicbrainz_recording_id TEXT,
+  musicbrainz_track_id TEXT,
+  musicbrainz_disc_id TEXT,
+  musicbrainz_release_group_id TEXT,
+  musicbrainz_work_id TEXT,
+
+  ebur128_integrated_loudness_lufs REAL,
+  ebur128_loudness_range_lu REAL
 
 );
 
@@ -129,15 +148,34 @@ 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,
 
   cue_path TEXT,
 
-  rating INTEGER DEFAULT -1
+  rating INTEGER DEFAULT -1,
+
+  acoustid_id TEXT,
+  acoustid_fingerprint TEXT,
+
+  musicbrainz_album_artist_id TEXT,
+  musicbrainz_artist_id TEXT,
+  musicbrainz_original_artist_id TEXT,
+  musicbrainz_album_id TEXT,
+  musicbrainz_original_album_id TEXT,
+  musicbrainz_recording_id TEXT,
+  musicbrainz_track_id TEXT,
+  musicbrainz_disc_id TEXT,
+  musicbrainz_release_group_id TEXT,
+  musicbrainz_work_id TEXT,
+
+  ebur128_integrated_loudness_lufs REAL,
+  ebur128_loudness_range_lu REAL
 
 );
 
@@ -191,15 +229,34 @@ 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,
 
   cue_path TEXT,
 
-  rating INTEGER DEFAULT -1
+  rating INTEGER DEFAULT -1,
+
+  acoustid_id TEXT,
+  acoustid_fingerprint TEXT,
+
+  musicbrainz_album_artist_id TEXT,
+  musicbrainz_artist_id TEXT,
+  musicbrainz_original_artist_id TEXT,
+  musicbrainz_album_id TEXT,
+  musicbrainz_original_album_id TEXT,
+  musicbrainz_recording_id TEXT,
+  musicbrainz_track_id TEXT,
+  musicbrainz_disc_id TEXT,
+  musicbrainz_release_group_id TEXT,
+  musicbrainz_work_id TEXT,
+
+  ebur128_integrated_loudness_lufs REAL,
+  ebur128_loudness_range_lu REAL
 
 );
 
@@ -253,15 +310,34 @@ 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,
 
   cue_path TEXT,
 
-  rating INTEGER DEFAULT -1
+  rating INTEGER DEFAULT -1,
+
+  acoustid_id TEXT,
+  acoustid_fingerprint TEXT,
+
+  musicbrainz_album_artist_id TEXT,
+  musicbrainz_artist_id TEXT,
+  musicbrainz_original_artist_id TEXT,
+  musicbrainz_album_id TEXT,
+  musicbrainz_original_album_id TEXT,
+  musicbrainz_recording_id TEXT,
+  musicbrainz_track_id TEXT,
+  musicbrainz_disc_id TEXT,
+  musicbrainz_release_group_id TEXT,
+  musicbrainz_work_id TEXT,
+
+  ebur128_integrated_loudness_lufs REAL,
+  ebur128_loudness_range_lu REAL
 
 );
 
@@ -315,15 +391,277 @@ 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,
 
   cue_path TEXT,
 
-  rating INTEGER DEFAULT -1
+  rating INTEGER DEFAULT -1,
+
+  acoustid_id TEXT,
+  acoustid_fingerprint TEXT,
+
+  musicbrainz_album_artist_id TEXT,
+  musicbrainz_artist_id TEXT,
+  musicbrainz_original_artist_id TEXT,
+  musicbrainz_album_id TEXT,
+  musicbrainz_original_album_id TEXT,
+  musicbrainz_recording_id TEXT,
+  musicbrainz_track_id TEXT,
+  musicbrainz_disc_id TEXT,
+  musicbrainz_release_group_id TEXT,
+  musicbrainz_work_id TEXT,
+
+  ebur128_integrated_loudness_lufs REAL,
+  ebur128_loudness_range_lu REAL
+
+);
+
+CREATE TABLE IF NOT EXISTS spotify_artists_songs (
+
+  title TEXT,
+  album TEXT,
+  artist TEXT,
+  albumartist TEXT,
+  track INTEGER NOT NULL DEFAULT -1,
+  disc INTEGER NOT NULL DEFAULT -1,
+  year INTEGER NOT NULL DEFAULT -1,
+  originalyear INTEGER NOT NULL DEFAULT -1,
+  genre TEXT,
+  compilation INTEGER NOT NULL DEFAULT 0,
+  composer TEXT,
+  performer TEXT,
+  grouping TEXT,
+  comment TEXT,
+  lyrics TEXT,
+
+  artist_id TEXT,
+  album_id TEXT,
+  song_id TEXT,
+
+  beginning INTEGER NOT NULL DEFAULT 0,
+  length INTEGER NOT NULL DEFAULT 0,
+
+  bitrate INTEGER NOT NULL DEFAULT -1,
+  samplerate INTEGER NOT NULL DEFAULT -1,
+  bitdepth INTEGER NOT NULL DEFAULT -1,
+
+  source INTEGER NOT NULL DEFAULT 0,
+  directory_id INTEGER NOT NULL DEFAULT -1,
+  url TEXT NOT NULL,
+  filetype INTEGER NOT NULL DEFAULT 0,
+  filesize INTEGER NOT NULL DEFAULT -1,
+  mtime INTEGER NOT NULL DEFAULT -1,
+  ctime INTEGER NOT NULL DEFAULT -1,
+  unavailable INTEGER DEFAULT 0,
+
+  fingerprint TEXT,
+
+  playcount INTEGER NOT NULL DEFAULT 0,
+  skipcount INTEGER NOT NULL DEFAULT 0,
+  lastplayed INTEGER NOT NULL DEFAULT -1,
+  lastseen INTEGER NOT NULL DEFAULT -1,
+
+  compilation_detected INTEGER DEFAULT 0,
+  compilation_on INTEGER NOT NULL DEFAULT 0,
+  compilation_off INTEGER NOT NULL DEFAULT 0,
+  compilation_effective INTEGER NOT NULL DEFAULT 0,
+
+  art_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,
+
+  cue_path TEXT,
+
+  rating INTEGER DEFAULT -1,
+
+  acoustid_id TEXT,
+  acoustid_fingerprint TEXT,
+
+  musicbrainz_album_artist_id TEXT,
+  musicbrainz_artist_id TEXT,
+  musicbrainz_original_artist_id TEXT,
+  musicbrainz_album_id TEXT,
+  musicbrainz_original_album_id TEXT,
+  musicbrainz_recording_id TEXT,
+  musicbrainz_track_id TEXT,
+  musicbrainz_disc_id TEXT,
+  musicbrainz_release_group_id TEXT,
+  musicbrainz_work_id TEXT,
+
+  ebur128_integrated_loudness_lufs REAL,
+  ebur128_loudness_range_lu REAL
+
+);
+
+CREATE TABLE IF NOT EXISTS spotify_albums_songs (
+
+  title TEXT,
+  album TEXT,
+  artist TEXT,
+  albumartist TEXT,
+  track INTEGER NOT NULL DEFAULT -1,
+  disc INTEGER NOT NULL DEFAULT -1,
+  year INTEGER NOT NULL DEFAULT -1,
+  originalyear INTEGER NOT NULL DEFAULT -1,
+  genre TEXT,
+  compilation INTEGER NOT NULL DEFAULT 0,
+  composer TEXT,
+  performer TEXT,
+  grouping TEXT,
+  comment TEXT,
+  lyrics TEXT,
+
+  artist_id TEXT,
+  album_id TEXT,
+  song_id TEXT,
+
+  beginning INTEGER NOT NULL DEFAULT 0,
+  length INTEGER NOT NULL DEFAULT 0,
+
+  bitrate INTEGER NOT NULL DEFAULT -1,
+  samplerate INTEGER NOT NULL DEFAULT -1,
+  bitdepth INTEGER NOT NULL DEFAULT -1,
+
+  source INTEGER NOT NULL DEFAULT 0,
+  directory_id INTEGER NOT NULL DEFAULT -1,
+  url TEXT NOT NULL,
+  filetype INTEGER NOT NULL DEFAULT 0,
+  filesize INTEGER NOT NULL DEFAULT -1,
+  mtime INTEGER NOT NULL DEFAULT -1,
+  ctime INTEGER NOT NULL DEFAULT -1,
+  unavailable INTEGER DEFAULT 0,
+
+  fingerprint TEXT,
+
+  playcount INTEGER NOT NULL DEFAULT 0,
+  skipcount INTEGER NOT NULL DEFAULT 0,
+  lastplayed INTEGER NOT NULL DEFAULT -1,
+  lastseen INTEGER NOT NULL DEFAULT -1,
+
+  compilation_detected INTEGER DEFAULT 0,
+  compilation_on INTEGER NOT NULL DEFAULT 0,
+  compilation_off INTEGER NOT NULL DEFAULT 0,
+  compilation_effective INTEGER NOT NULL DEFAULT 0,
+
+  art_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,
+
+  cue_path TEXT,
+
+  rating INTEGER DEFAULT -1,
+
+  acoustid_id TEXT,
+  acoustid_fingerprint TEXT,
+
+  musicbrainz_album_artist_id TEXT,
+  musicbrainz_artist_id TEXT,
+  musicbrainz_original_artist_id TEXT,
+  musicbrainz_album_id TEXT,
+  musicbrainz_original_album_id TEXT,
+  musicbrainz_recording_id TEXT,
+  musicbrainz_track_id TEXT,
+  musicbrainz_disc_id TEXT,
+  musicbrainz_release_group_id TEXT,
+  musicbrainz_work_id TEXT,
+
+  ebur128_integrated_loudness_lufs REAL,
+  ebur128_loudness_range_lu REAL
+
+);
+
+CREATE TABLE IF NOT EXISTS spotify_songs (
+
+  title TEXT,
+  album TEXT,
+  artist TEXT,
+  albumartist TEXT,
+  track INTEGER NOT NULL DEFAULT -1,
+  disc INTEGER NOT NULL DEFAULT -1,
+  year INTEGER NOT NULL DEFAULT -1,
+  originalyear INTEGER NOT NULL DEFAULT -1,
+  genre TEXT,
+  compilation INTEGER NOT NULL DEFAULT 0,
+  composer TEXT,
+  performer TEXT,
+  grouping TEXT,
+  comment TEXT,
+  lyrics TEXT,
+
+  artist_id TEXT,
+  album_id TEXT,
+  song_id TEXT,
+
+  beginning INTEGER NOT NULL DEFAULT 0,
+  length INTEGER NOT NULL DEFAULT 0,
+
+  bitrate INTEGER NOT NULL DEFAULT -1,
+  samplerate INTEGER NOT NULL DEFAULT -1,
+  bitdepth INTEGER NOT NULL DEFAULT -1,
+
+  source INTEGER NOT NULL DEFAULT 0,
+  directory_id INTEGER NOT NULL DEFAULT -1,
+  url TEXT NOT NULL,
+  filetype INTEGER NOT NULL DEFAULT 0,
+  filesize INTEGER NOT NULL DEFAULT -1,
+  mtime INTEGER NOT NULL DEFAULT -1,
+  ctime INTEGER NOT NULL DEFAULT -1,
+  unavailable INTEGER DEFAULT 0,
+
+  fingerprint TEXT,
+
+  playcount INTEGER NOT NULL DEFAULT 0,
+  skipcount INTEGER NOT NULL DEFAULT 0,
+  lastplayed INTEGER NOT NULL DEFAULT -1,
+  lastseen INTEGER NOT NULL DEFAULT -1,
+
+  compilation_detected INTEGER DEFAULT 0,
+  compilation_on INTEGER NOT NULL DEFAULT 0,
+  compilation_off INTEGER NOT NULL DEFAULT 0,
+  compilation_effective INTEGER NOT NULL DEFAULT 0,
+
+  art_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,
+
+  cue_path TEXT,
+
+  rating INTEGER DEFAULT -1,
+
+  acoustid_id TEXT,
+  acoustid_fingerprint TEXT,
+
+  musicbrainz_album_artist_id TEXT,
+  musicbrainz_artist_id TEXT,
+  musicbrainz_original_artist_id TEXT,
+  musicbrainz_album_id TEXT,
+  musicbrainz_original_album_id TEXT,
+  musicbrainz_recording_id TEXT,
+  musicbrainz_track_id TEXT,
+  musicbrainz_disc_id TEXT,
+  musicbrainz_release_group_id TEXT,
+  musicbrainz_work_id TEXT,
+
+  ebur128_integrated_loudness_lufs REAL,
+  ebur128_loudness_range_lu REAL
 
 );
 
@@ -377,15 +715,34 @@ 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,
 
   cue_path TEXT,
 
-  rating INTEGER DEFAULT -1
+  rating INTEGER DEFAULT -1,
+
+  acoustid_id TEXT,
+  acoustid_fingerprint TEXT,
+
+  musicbrainz_album_artist_id TEXT,
+  musicbrainz_artist_id TEXT,
+  musicbrainz_original_artist_id TEXT,
+  musicbrainz_album_id TEXT,
+  musicbrainz_original_album_id TEXT,
+  musicbrainz_recording_id TEXT,
+  musicbrainz_track_id TEXT,
+  musicbrainz_disc_id TEXT,
+  musicbrainz_release_group_id TEXT,
+  musicbrainz_work_id TEXT,
+
+  ebur128_integrated_loudness_lufs REAL,
+  ebur128_loudness_range_lu REAL
 
 );
 
@@ -439,15 +796,34 @@ 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,
 
   cue_path TEXT,
 
-  rating INTEGER DEFAULT -1
+  rating INTEGER DEFAULT -1,
+
+  acoustid_id TEXT,
+  acoustid_fingerprint TEXT,
+
+  musicbrainz_album_artist_id TEXT,
+  musicbrainz_artist_id TEXT,
+  musicbrainz_original_artist_id TEXT,
+  musicbrainz_album_id TEXT,
+  musicbrainz_original_album_id TEXT,
+  musicbrainz_recording_id TEXT,
+  musicbrainz_track_id TEXT,
+  musicbrainz_disc_id TEXT,
+  musicbrainz_release_group_id TEXT,
+  musicbrainz_work_id TEXT,
+
+  ebur128_integrated_loudness_lufs REAL,
+  ebur128_loudness_range_lu REAL
 
 );
 
@@ -501,15 +877,34 @@ 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,
 
   cue_path TEXT,
 
-  rating INTEGER DEFAULT -1
+  rating INTEGER DEFAULT -1,
+
+  acoustid_id TEXT,
+  acoustid_fingerprint TEXT,
+
+  musicbrainz_album_artist_id TEXT,
+  musicbrainz_artist_id TEXT,
+  musicbrainz_original_artist_id TEXT,
+  musicbrainz_album_id TEXT,
+  musicbrainz_original_album_id TEXT,
+  musicbrainz_recording_id TEXT,
+  musicbrainz_track_id TEXT,
+  musicbrainz_disc_id TEXT,
+  musicbrainz_release_group_id TEXT,
+  musicbrainz_work_id TEXT,
+
+  ebur128_integrated_loudness_lufs REAL,
+  ebur128_loudness_range_lu REAL
 
 );
 
@@ -583,15 +978,34 @@ 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,
 
   cue_path TEXT,
 
-  rating INTEGER DEFAULT -1
+  rating INTEGER DEFAULT -1,
+
+  acoustid_id TEXT,
+  acoustid_fingerprint TEXT,
+
+  musicbrainz_album_artist_id TEXT,
+  musicbrainz_artist_id TEXT,
+  musicbrainz_original_artist_id TEXT,
+  musicbrainz_album_id TEXT,
+  musicbrainz_original_album_id TEXT,
+  musicbrainz_recording_id TEXT,
+  musicbrainz_track_id TEXT,
+  musicbrainz_disc_id TEXT,
+  musicbrainz_release_group_id TEXT,
+  musicbrainz_work_id TEXT,
+
+  ebur128_integrated_loudness_lufs REAL,
+  ebur128_loudness_range_lu REAL
 
 );
 
@@ -625,138 +1039,3 @@ CREATE INDEX IF NOT EXISTS idx_album ON songs (album);
 CREATE INDEX IF NOT EXISTS idx_title ON songs (title);
 
 CREATE VIEW IF NOT EXISTS duplicated_songs as select artist dup_artist, album dup_album, title dup_title from songs as inner_songs where artist != '' and album != '' and title != '' and unavailable = 0 group by artist, album , title having count(*) > 1;
-
-CREATE VIRTUAL TABLE IF NOT EXISTS songs_fts USING fts5(
-
-  ftstitle,
-  ftsalbum,
-  ftsartist,
-  ftsalbumartist,
-  ftscomposer,
-  ftsperformer,
-  ftsgrouping,
-  ftsgenre,
-  ftscomment,
-  tokenize = "unicode61 remove_diacritics 1"
-
-);
-
-CREATE VIRTUAL TABLE IF NOT EXISTS subsonic_songs_fts USING fts5(
-
-  ftstitle,
-  ftsalbum,
-  ftsartist,
-  ftsalbumartist,
-  ftscomposer,
-  ftsperformer,
-  ftsgrouping,
-  ftsgenre,
-  ftscomment,
-  tokenize = "unicode61 remove_diacritics 1"
-
-);
-
-CREATE VIRTUAL TABLE IF NOT EXISTS tidal_artists_songs_fts USING fts5(
-
-  ftstitle,
-  ftsalbum,
-  ftsartist,
-  ftsalbumartist,
-  ftscomposer,
-  ftsperformer,
-  ftsgrouping,
-  ftsgenre,
-  ftscomment,
-  tokenize = "unicode61 remove_diacritics 1"
-
-);
-
-CREATE VIRTUAL TABLE IF NOT EXISTS tidal_albums_songs_fts USING fts5(
-
-  ftstitle,
-  ftsalbum,
-  ftsartist,
-  ftsalbumartist,
-  ftscomposer,
-  ftsperformer,
-  ftsgrouping,
-  ftsgenre,
-  ftscomment,
-  tokenize = "unicode61 remove_diacritics 1"
-
-);
-
-CREATE VIRTUAL TABLE IF NOT EXISTS tidal_songs_fts USING fts5(
-
-  ftstitle,
-  ftsalbum,
-  ftsartist,
-  ftsalbumartist,
-  ftscomposer,
-  ftsperformer,
-  ftsgrouping,
-  ftsgenre,
-  ftscomment,
-  tokenize = "unicode61 remove_diacritics 1"
-
-);
-
-CREATE VIRTUAL TABLE IF NOT EXISTS qobuz_artists_songs_fts USING fts5(
-
-  ftstitle,
-  ftsalbum,
-  ftsartist,
-  ftsalbumartist,
-  ftscomposer,
-  ftsperformer,
-  ftsgrouping,
-  ftsgenre,
-  ftscomment,
-  tokenize = "unicode61 remove_diacritics 1"
-
-);
-
-CREATE VIRTUAL TABLE IF NOT EXISTS qobuz_albums_songs_fts USING fts5(
-
-  ftstitle,
-  ftsalbum,
-  ftsartist,
-  ftsalbumartist,
-  ftscomposer,
-  ftsperformer,
-  ftsgrouping,
-  ftsgenre,
-  ftscomment,
-  tokenize = "unicode61 remove_diacritics 1"
-
-);
-
-CREATE VIRTUAL TABLE IF NOT EXISTS qobuz_songs_fts USING fts5(
-
-  ftstitle,
-  ftsalbum,
-  ftsartist,
-  ftsalbumartist,
-  ftscomposer,
-  ftsperformer,
-  ftsgrouping,
-  ftsgenre,
-  ftscomment,
-  tokenize = "unicode61 remove_diacritics 1"
-
-);
-
-CREATE VIRTUAL TABLE IF NOT EXISTS %allsongstables_fts USING fts5(
-
-  ftstitle,
-  ftsalbum,
-  ftsartist,
-  ftsalbumartist,
-  ftscomposer,
-  ftsperformer,
-  ftsgrouping,
-  ftsgenre,
-  ftscomment,
-  tokenize = "unicode61 remove_diacritics 1"
-
-);

data/style/strawberry.css

@@ -35,40 +35,32 @@
   background-color: %palette-base;
 }
 
-QToolButton {
+QToolButton[accessibleName="MenuPopupToolButton"] {
   border: 2px solid transparent;
   border-radius: 3px;
   padding: 1px;
 }
 
-QToolButton:hover {
+QToolButton:hover[accessibleName="MenuPopupToolButton"] {
   border: 2px solid %palette-highlight;
   background-color: %palette-highlight-lighter;
 }
 
-QToolButton:pressed {
+QToolButton:pressed[accessibleName="MenuPopupToolButton"] {
   border: 2px solid %palette-highlight-darker;
   background-color: %palette-highlight-lighter;
 }
 
-QToolButton[popupMode="MenuButtonPopup"], QToolButton:hover[popupMode="MenuButtonPopup"], QToolButton:pressed[popupMode="MenuButtonPopup"] {
+QToolButton[popupMode="MenuButtonPopup"][accessibleName="MenuPopupToolButton"], QToolButton:hover[popupMode="MenuButtonPopup"][accessibleName="MenuPopupToolButton"], QToolButton:pressed[popupMode="MenuButtonPopup"][accessibleName="MenuPopupToolButton"] {
   padding-right: 16px;
 }
 
 /* For backwards compatibility with Qt 5 as it does not support property name */
-QToolButton[popupMode="1"], QToolButton:hover[popupMode="1"], QToolButton:pressed[popupMode="1"] {
+QToolButton[popupMode="1"][accessibleName="MenuPopupToolButton"], QToolButton:hover[popupMode="1"][accessibleName="MenuPopupToolButton"], QToolButton:pressed[popupMode="1"][accessibleName="MenuPopupToolButton"] {
   padding-right: 16px;
 }
 
-QToolButton::menu-button {
+QToolButton::menu-button[accessibleName="MenuPopupToolButton"] {
   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 AudD, Genius, Musixmatch, ChartLyrics, lyrics.ovh and lololyrics.com
+  - Song lyrics from Genius, Musixmatch, ChartLyrics, lyrics.ovh, lololyrics.com, songlyrics.com, azlyrics.com and elyrics.net
   - 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/CMakeLists.txt

@@ -4,6 +4,11 @@ if(RPM_DISTRO AND RPM_DATE)
 endif(RPM_DISTRO AND RPM_DATE)
 
 if(APPLE)
+  if(DEFINED ENV{MACOSX_DEPLOYMENT_TARGET})
+    set(LSMinimumSystemVersion $ENV{MACOSX_DEPLOYMENT_TARGET})
+  else()
+    set(LSMinimumSystemVersion 12.0)
+  endif()
   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/macos/Info.plist.in ${CMAKE_CURRENT_SOURCE_DIR}/macos/Info.plist)
 endif(APPLE)
 

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>@LSMinimumSystemVersion@</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,144 @@ 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;
+libgstadaptivedemux2
+libgstaes
+libgstaiff
+libgstapetag
+libgstapp
+libgstasf
+libgstasfmux
+libgstaudioconvert
+libgstaudiofx
+libgstaudioparsers
+libgstaudioresample
+libgstautodetect
+libgstbs2b
+libgstcdio
+libgstcoreelements
+libgstdash
+libgstdsd
+libgstequalizer
+libgstfaac
+libgstfaad
+libgstfdkaac
+libgstflac
+libgstgio
+libgsthls
+libgsticydemux
+libgstid3demux
+libgstid3tag
+libgstisomp4
+libgstlame
+libgstmpegpsdemux
+libgstmpegpsmux
+libgstmpegtsdemux
+libgstmpegtsmux
+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 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 and elyrics.net</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,12 @@
   </screenshots>
   <update_contact>eclipseo@fedoraproject.org</update_contact>
     <releases>
-        <release version="1.0.0" date="2021-10-16"/>
+        <release version="1.1.0" date="2024-07-14"/>
+        <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,11 @@ Version=1.0
 Type=Application
 Name=Strawberry
 GenericName=Strawberry Music Player
+GenericName[fr]=Lecteur de musique Strawberry
+GenericName[ru]=Музыкальный проигрыватель Strawberry
 Comment=Plays music
+Comment[fr]=Joue de la musique
+Comment[ru]=Прослушивание музыки
 Exec=strawberry %U
 TryExec=strawberry
 Icon=strawberry
@@ -18,19 +22,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 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 AudD, Genius, Musixmatch, ChartLyrics, lyrics.ovh and lololyrics.com
+  - Song lyrics from Genius, Musixmatch, ChartLyrics, lyrics.ovh, lololyrics.com, songlyrics.com, azlyrics.com and elyrics.net
   - 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

@@ -1,57 +1,68 @@
-!define build_type ""
-!define compiler "unknown"
-!define arch "unknown"
-
-!if "@ARCH@" == "x86"
-  !define arch_x86
-  !undef arch
-  !define arch "x86"
-!endif
-
-!if "@ARCH@" == "i686-w64-mingw32.shared"
-  !define arch_x86
-  !undef arch
-  !define arch "x86"
-!endif
-
-!if "@ARCH@" == "x86_64"
-  !define arch_x64
-  !undef arch
-  !define arch "x64"
-!endif
-
-!if "@ARCH@" == "x86_64-w64-mingw32.shared"
-  !define arch_x64
-  !undef arch
-  !define arch "x64"
-!endif
-
 !if "@MINGW@" == "1"
   !define mingw
-  !undef compiler
   !define compiler "mingw"
 !endif
 
 !if "@MSVC@" == "1"
   !define msvc
-  !undef compiler
   !define compiler "msvc"
 !endif
 
+
+!if "@ARCH@" == "x86"
+  !define arch_x86
+!else if "@ARCH@" == "i686"
+  !define arch_x86
+!else if "@ARCH@" == "i686-w64-mingw32.shared"
+  !define arch_x86
+!else if "@ARCH@" == "x64"
+  !define arch_x64
+!else if "@ARCH@" == "x86_64"
+  !define arch_x64
+!else if "@ARCH@" == "x86_64-w64-mingw32.shared"
+  !define arch_x64
+!endif
+
+!ifdef arch_x86
+  !define arch "x86"
+!endif
+
+!ifdef arch_x64
+  !define arch "x64"
+!endif
+
+
 !if "@CMAKE_BUILD_TYPE@" == "Release"
   !define release
-!endif
-
-!if "@CMAKE_BUILD_TYPE@" == "RelWithDebInfo"
+!else if "@CMAKE_BUILD_TYPE@" == "RelWithDebInfo"
   !define release
+!else if "@CMAKE_BUILD_TYPE@" == "Debug"
+  !define debug
 !endif
 
-!if "@CMAKE_BUILD_TYPE@" == "Debug"
-  !define debug
-  !undef build_type
+!ifdef release
+  !define build_type ""
+!endif
+
+!ifdef debug
   !define build_type "-Debug"
 !endif
 
+
+!ifndef compiler
+  !error "Missing compiler."
+!endif
+
+!ifndef build_type
+  !error "Missing build type."
+!endif
+
+!ifndef arch
+  !error "Missing arch."
+!endif
+
+
+
 !ifdef debug
   !define PRODUCT_NAME "Strawberry Music Player Debug"
   !define PRODUCT_NAME_SHORT "Strawberry"
@@ -98,7 +109,11 @@
 
 Unicode True
 
+!ifdef debug
+SetCompressor lzma
+!else
 SetCompressor /SOLID lzma
+!endif
 
 !include "MUI2.nsh"
 !include "FileAssociation.nsh"
@@ -125,8 +140,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
@@ -173,19 +186,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
 
@@ -224,6 +240,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
@@ -241,18 +258,14 @@ Section "Strawberry" Strawberry
   File "libssl-3-x64.dll"
 !endif
 
-  File "avcodec-59.dll"
-  File "avfilter-8.dll"
-  File "avformat-59.dll"
-  File "avutil-57.dll"
   File "libFLAC-12.dll"
   File "libbrotlicommon.dll"
   File "libbrotlidec.dll"
-  File "libbrotlienc.dll"
   File "libbs2b-0.dll"
   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"
@@ -272,8 +285,10 @@ Section "Strawberry" Strawberry
   File "libgstaudio-1.0-0.dll"
   File "libgstbadaudio-1.0-0.dll"
   File "libgstbase-1.0-0.dll"
+  File "libgstcodecparsers-1.0-0.dll"
   File "libgstfft-1.0-0.dll"
   File "libgstisoff-1.0-0.dll"
+  File "libgstmpegts-1.0-0.dll"
   File "libgstnet-1.0-0.dll"
   File "libgstpbutils-1.0-0.dll"
   File "libgstreamer-1.0-0.dll"
@@ -290,6 +305,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"
@@ -301,7 +317,6 @@ Section "Strawberry" Strawberry
   File "libopus-0.dll"
   File "liborc-0.4-0.dll"
   File "libpng16-16.dll"
-  File "libprotobuf-32.dll"
   File "libpsl-5.dll"
   File "libqtsparkle-qt6.dll"
   File "libsoup-3.0-0.dll"
@@ -318,13 +333,51 @@ Section "Strawberry" Strawberry
   File "libvorbisfile-3.dll"
   File "libwavpack-1.dll"
   File "libwinpthread-1.dll"
-  File "libxml2-2.dll"
   File "libzstd.dll"
-  File "postproc-56.dll"
-  File "swresample-4.dll"
-  File "swscale-6.dll"
   File "zlib1.dll"
 
+  File "libabsl_base.dll"
+  File "libabsl_city.dll"
+  File "libabsl_cord.dll"
+  File "libabsl_cord_internal.dll"
+  File "libabsl_cordz_handle.dll"
+  File "libabsl_cordz_info.dll"
+  File "libabsl_crc32c.dll"
+  File "libabsl_crc_cord_state.dll"
+  File "libabsl_crc_internal.dll"
+  File "libabsl_die_if_null.dll"
+  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"
+  File "libabsl_log_internal_message.dll"
+  File "libabsl_log_internal_nullguard.dll"
+  File "libabsl_log_internal_proto.dll"
+  File "libabsl_log_sink.dll"
+  File "libabsl_low_level_hash.dll"
+  File "libabsl_malloc_internal.dll"
+  File "libabsl_raw_hash_set.dll"
+  File "libabsl_raw_logging_internal.dll"
+  File "libabsl_spinlock_wait.dll"
+  File "libabsl_stacktrace.dll"
+  File "libabsl_status.dll"
+  File "libabsl_statusor.dll"
+  File "libabsl_strerror.dll"
+  File "libabsl_str_format_internal.dll"
+  File "libabsl_strings.dll"
+  File "libabsl_strings_internal.dll"
+  File "libabsl_symbolize.dll"
+  File "libabsl_synchronization.dll"
+  File "libabsl_throw_delegate.dll"
+  File "libabsl_time.dll"
+  File "libabsl_time_zone.dll"
+
 !ifdef debug
   File "gdb.exe"
   File "libexpat-1.dll"
@@ -334,6 +387,7 @@ Section "Strawberry" Strawberry
   File "libpcre2-16d.dll"
   File "libreadline8.dll"
   File "libtermcap.dll"
+  File "libabsl_graphcycles_internal.dll"
 !else
   File "libpcre2-8.dll"
   File "libpcre2-16.dll"
@@ -355,29 +409,27 @@ 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"
   File "gstaudio-1.0-0.dll"
   File "gstbadaudio-1.0-0.dll"
   File "gstbase-1.0-0.dll"
+  File "gstcodecparsers-1.0-0.dll"
   File "gstfft-1.0-0.dll"
   File "gstisoff-1.0-0.dll"
+  File "gstmpegts-1.0-0.dll"
   File "gstnet-1.0-0.dll"
   File "gstpbutils-1.0-0.dll"
   File "gstreamer-1.0-0.dll"
@@ -388,39 +440,37 @@ 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 "libiconv.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"
   File "wavpackdll.dll"
+  File "abseil_dll.dll"
 
 !ifdef release
   File "freetype.dll"
+  File "libiconv.dll"
   File "libpng16.dll"
-  File "libprotobuf.dll"
-  File "libxml2.dll"
+  File "libspeex.dll"
   File "pcre2-8.dll"
   File "pcre2-16.dll"
   File "twolame.dll"
@@ -428,24 +478,36 @@ Section "Strawberry" Strawberry
 !endif
 !ifdef debug
   File "freetyped.dll"
+  File "libiconvd.dll"
   File "libpng16d.dll"
-  File "libprotobufd.dll"
-  File "libxml2d.dll"
+  File "libspeexd.dll"
   File "pcre2-8d.dll"
   File "pcre2-16d.dll"
   File "twolamed.dll"
   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 "icudt75.dll"
   File "libfftw3-3.dll"
+!ifdef debug
+  File "libprotobufd.dll"
+!else
+  File "libprotobuf.dll"
+!endif
 !ifdef msvc && debug
-  File "icuin72d.dll"
-  File "icuuc72d.dll"
+  File "icuin75d.dll"
+  File "icuuc75d.dll"
+  File "libxml2d.dll"
   File "Qt6Concurrentd.dll"
   File "Qt6Cored.dll"
   File "Qt6Guid.dll"
@@ -453,8 +515,9 @@ Section "Strawberry" Strawberry
   File "Qt6Sqld.dll"
   File "Qt6Widgetsd.dll"
 !else
-  File "icuin72.dll"
-  File "icuuc72.dll"
+  File "icuin75.dll"
+  File "icuuc75.dll"
+  File "libxml2.dll"
   File "Qt6Concurrent.dll"
   File "Qt6Core.dll"
   File "Qt6Gui.dll"
@@ -463,6 +526,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
@@ -519,9 +590,9 @@ SectionEnd
 Section "Qt styles" styles
   SetOutPath "$INSTDIR\styles"
 !ifdef msvc && debug
-  File "/oname=qwindowsvistastyled.dll" "styles\qwindowsvistastyled.dll"
+  File "/oname=qmodernwindowsstyled.dll" "styles\qmodernwindowsstyled.dll"
 !else
-  File "/oname=qwindowsvistastyle.dll" "styles\qwindowsvistastyle.dll"
+  File "/oname=qmodernwindowsstyle.dll" "styles\qmodernwindowsstyle.dll"
 !endif
 SectionEnd
 
@@ -562,6 +633,7 @@ Section "Gstreamer plugins" gstreamer-plugins
   SetOutPath "$INSTDIR\gstreamer-plugins"
 
 !ifdef mingw
+  File "/oname=libgstadaptivedemux2.dll" "gstreamer-plugins\libgstadaptivedemux2.dll"
   File "/oname=libgstaes.dll" "gstreamer-plugins\libgstaes.dll"
   File "/oname=libgstaiff.dll" "gstreamer-plugins\libgstaiff.dll"
   File "/oname=libgstapetag.dll" "gstreamer-plugins\libgstapetag.dll"
@@ -570,16 +642,14 @@ Section "Gstreamer plugins" gstreamer-plugins
   File "/oname=libgstasfmux.dll" "gstreamer-plugins\libgstasfmux.dll"
   File "/oname=libgstaudioconvert.dll" "gstreamer-plugins\libgstaudioconvert.dll"
   File "/oname=libgstaudiofx.dll" "gstreamer-plugins\libgstaudiofx.dll"
-  File "/oname=libgstaudiomixer.dll" "gstreamer-plugins\libgstaudiomixer.dll"
   File "/oname=libgstaudioparsers.dll" "gstreamer-plugins\libgstaudioparsers.dll"
-  File "/oname=libgstaudiorate.dll" "gstreamer-plugins\libgstaudiorate.dll"
   File "/oname=libgstaudioresample.dll" "gstreamer-plugins\libgstaudioresample.dll"
-  File "/oname=libgstaudiotestsrc.dll" "gstreamer-plugins\libgstaudiotestsrc.dll"
   File "/oname=libgstautodetect.dll" "gstreamer-plugins\libgstautodetect.dll"
   File "/oname=libgstbs2b.dll" "gstreamer-plugins\libgstbs2b.dll"
   File "/oname=libgstcoreelements.dll" "gstreamer-plugins\libgstcoreelements.dll"
   File "/oname=libgstdash.dll" "gstreamer-plugins\libgstdash.dll"
   File "/oname=libgstdirectsound.dll" "gstreamer-plugins\libgstdirectsound.dll"
+  File "/oname=libgstdsd.dll" "gstreamer-plugins\libgstdsd.dll"
   File "/oname=libgstequalizer.dll" "gstreamer-plugins\libgstequalizer.dll"
   File "/oname=libgstfaac.dll" "gstreamer-plugins\libgstfaac.dll"
   File "/oname=libgstfaad.dll" "gstreamer-plugins\libgstfaad.dll"
@@ -594,6 +664,10 @@ Section "Gstreamer plugins" gstreamer-plugins
   File "/oname=libgstisomp4.dll" "gstreamer-plugins\libgstisomp4.dll"
   File "/oname=libgstlame.dll" "gstreamer-plugins\libgstlame.dll"
   File "/oname=libgstlibav.dll" "gstreamer-plugins\libgstlibav.dll"
+  File "/oname=libgstmpegpsdemux.dll" "gstreamer-plugins\libgstmpegpsdemux.dll"
+  File "/oname=libgstmpegpsmux.dll" "gstreamer-plugins\libgstmpegpsmux.dll"
+  File "/oname=libgstmpegtsdemux.dll" "gstreamer-plugins\libgstmpegtsdemux.dll"
+  File "/oname=libgstmpegtsmux.dll" "gstreamer-plugins\libgstmpegtsmux.dll"
   File "/oname=libgstmpg123.dll" "gstreamer-plugins\libgstmpg123.dll"
   File "/oname=libgstmusepack.dll" "gstreamer-plugins\libgstmusepack.dll"
   File "/oname=libgstogg.dll" "gstreamer-plugins\libgstogg.dll"
@@ -616,6 +690,7 @@ Section "Gstreamer plugins" gstreamer-plugins
   File "/oname=libgstvolume.dll" "gstreamer-plugins\libgstvolume.dll"
   File "/oname=libgstvorbis.dll" "gstreamer-plugins\libgstvorbis.dll"
   File "/oname=libgstwasapi.dll" "gstreamer-plugins\libgstwasapi.dll"
+  File "/oname=libgstwaveform.dll" "gstreamer-plugins\libgstwaveform.dll"
   File "/oname=libgstwavenc.dll" "gstreamer-plugins\libgstwavenc.dll"
   File "/oname=libgstwavpack.dll" "gstreamer-plugins\libgstwavpack.dll"
   File "/oname=libgstwavparse.dll" "gstreamer-plugins\libgstwavparse.dll"
@@ -623,24 +698,24 @@ Section "Gstreamer plugins" gstreamer-plugins
 !endif ; MinGW
 
 !ifdef msvc
+  File "/oname=gstadaptivedemux2.dll" "gstreamer-plugins\gstadaptivedemux2.dll"
   File "/oname=gstaes.dll" "gstreamer-plugins\gstaes.dll"
   File "/oname=gstaiff.dll" "gstreamer-plugins\gstaiff.dll"
   File "/oname=gstapetag.dll" "gstreamer-plugins\gstapetag.dll"
   File "/oname=gstapp.dll" "gstreamer-plugins\gstapp.dll"
   File "/oname=gstasf.dll" "gstreamer-plugins\gstasf.dll"
   File "/oname=gstasfmux.dll" "gstreamer-plugins\gstasfmux.dll"
+  File "/oname=gstasio.dll" "gstreamer-plugins\gstasio.dll"
   File "/oname=gstaudioconvert.dll" "gstreamer-plugins\gstaudioconvert.dll"
   File "/oname=gstaudiofx.dll" "gstreamer-plugins\gstaudiofx.dll"
-  File "/oname=gstaudiomixer.dll" "gstreamer-plugins\gstaudiomixer.dll"
   File "/oname=gstaudioparsers.dll" "gstreamer-plugins\gstaudioparsers.dll"
-  File "/oname=gstaudiorate.dll" "gstreamer-plugins\gstaudiorate.dll"
   File "/oname=gstaudioresample.dll" "gstreamer-plugins\gstaudioresample.dll"
-  File "/oname=gstaudiotestsrc.dll" "gstreamer-plugins\gstaudiotestsrc.dll"
   File "/oname=gstautodetect.dll" "gstreamer-plugins\gstautodetect.dll"
   File "/oname=gstbs2b.dll" "gstreamer-plugins\gstbs2b.dll"
   File "/oname=gstcoreelements.dll" "gstreamer-plugins\gstcoreelements.dll"
   File "/oname=gstdash.dll" "gstreamer-plugins\gstdash.dll"
   File "/oname=gstdirectsound.dll" "gstreamer-plugins\gstdirectsound.dll"
+  File "/oname=gstdsd.dll" "gstreamer-plugins\gstdsd.dll"
   File "/oname=gstequalizer.dll" "gstreamer-plugins\gstequalizer.dll"
   File "/oname=gstfaac.dll" "gstreamer-plugins\gstfaac.dll"
   File "/oname=gstfaad.dll" "gstreamer-plugins\gstfaad.dll"
@@ -655,6 +730,10 @@ Section "Gstreamer plugins" gstreamer-plugins
   File "/oname=gstisomp4.dll" "gstreamer-plugins\gstisomp4.dll"
   File "/oname=gstlame.dll" "gstreamer-plugins\gstlame.dll"
   File "/oname=gstlibav.dll" "gstreamer-plugins\gstlibav.dll"
+  File "/oname=gstmpegpsdemux.dll" "gstreamer-plugins\gstmpegpsdemux.dll"
+  File "/oname=gstmpegpsmux.dll" "gstreamer-plugins\gstmpegpsmux.dll"
+  File "/oname=gstmpegtsdemux.dll" "gstreamer-plugins\gstmpegtsdemux.dll"
+  File "/oname=gstmpegtsmux.dll" "gstreamer-plugins\gstmpegtsmux.dll"
   File "/oname=gstmpg123.dll" "gstreamer-plugins\gstmpg123.dll"
   File "/oname=gstmusepack.dll" "gstreamer-plugins\gstmusepack.dll"
   File "/oname=gstogg.dll" "gstreamer-plugins\gstogg.dll"
@@ -677,10 +756,15 @@ 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"
+  File "/oname=gstwasapi2.dll" "gstreamer-plugins\gstwasapi2.dll"
+  File "/oname=gstwaveform.dll" "gstreamer-plugins\gstwaveform.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"
   File "/oname=gstxingmux.dll" "gstreamer-plugins\gstxingmux.dll"
+!ifdef arch_x64
+  File "/oname=gstspotify.dll" "gstreamer-plugins\gstspotify.dll"
+!endif
 !endif ; MSVC
 
 SectionEnd
@@ -725,6 +809,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
@@ -743,18 +828,14 @@ Section "Uninstall"
   Delete "$INSTDIR\libssl-3-x64.dll"
 !endif
 
-  Delete "$INSTDIR\avcodec-59.dll"
-  Delete "$INSTDIR\avfilter-8.dll"
-  Delete "$INSTDIR\avformat-59.dll"
-  Delete "$INSTDIR\avutil-57.dll"
   Delete "$INSTDIR\libFLAC-12.dll"
   Delete "$INSTDIR\libbrotlicommon.dll"
   Delete "$INSTDIR\libbrotlidec.dll"
-  Delete "$INSTDIR\libbrotlienc.dll"
   Delete "$INSTDIR\libbs2b-0.dll"
   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"
@@ -774,8 +855,10 @@ Section "Uninstall"
   Delete "$INSTDIR\libgstaudio-1.0-0.dll"
   Delete "$INSTDIR\libgstbadaudio-1.0-0.dll"
   Delete "$INSTDIR\libgstbase-1.0-0.dll"
+  Delete "$INSTDIR\libgstcodecparsers-1.0-0.dll"
   Delete "$INSTDIR\libgstfft-1.0-0.dll"
   Delete "$INSTDIR\libgstisoff-1.0-0.dll"
+  Delete "$INSTDIR\libgstmpegts-1.0-0.dll"
   Delete "$INSTDIR\libgstnet-1.0-0.dll"
   Delete "$INSTDIR\libgstpbutils-1.0-0.dll"
   Delete "$INSTDIR\libgstreamer-1.0-0.dll"
@@ -792,6 +875,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"
@@ -803,7 +887,6 @@ Section "Uninstall"
   Delete "$INSTDIR\libopus-0.dll"
   Delete "$INSTDIR\liborc-0.4-0.dll"
   Delete "$INSTDIR\libpng16-16.dll"
-  Delete "$INSTDIR\libprotobuf-32.dll"
   Delete "$INSTDIR\libpsl-5.dll"
   Delete "$INSTDIR\libqtsparkle-qt6.dll"
   Delete "$INSTDIR\libsoup-3.0-0.dll"
@@ -820,13 +903,51 @@ Section "Uninstall"
   Delete "$INSTDIR\libvorbisfile-3.dll"
   Delete "$INSTDIR\libwavpack-1.dll"
   Delete "$INSTDIR\libwinpthread-1.dll"
-  Delete "$INSTDIR\libxml2-2.dll"
   Delete "$INSTDIR\libzstd.dll"
-  Delete "$INSTDIR\postproc-56.dll"
-  Delete "$INSTDIR\swresample-4.dll"
-  Delete "$INSTDIR\swscale-6.dll"
   Delete "$INSTDIR\zlib1.dll"
 
+  Delete "$INSTDIR\libabsl_base.dll"
+  Delete "$INSTDIR\libabsl_city.dll"
+  Delete "$INSTDIR\libabsl_cord.dll"
+  Delete "$INSTDIR\libabsl_cord_internal.dll"
+  Delete "$INSTDIR\libabsl_cordz_handle.dll"
+  Delete "$INSTDIR\libabsl_cordz_info.dll"
+  Delete "$INSTDIR\libabsl_crc32c.dll"
+  Delete "$INSTDIR\libabsl_crc_cord_state.dll"
+  Delete "$INSTDIR\libabsl_crc_internal.dll"
+  Delete "$INSTDIR\libabsl_die_if_null.dll"
+  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"
+  Delete "$INSTDIR\libabsl_log_internal_message.dll"
+  Delete "$INSTDIR\libabsl_log_internal_nullguard.dll"
+  Delete "$INSTDIR\libabsl_log_internal_proto.dll"
+  Delete "$INSTDIR\libabsl_log_sink.dll"
+  Delete "$INSTDIR\libabsl_low_level_hash.dll"
+  Delete "$INSTDIR\libabsl_malloc_internal.dll"
+  Delete "$INSTDIR\libabsl_raw_hash_set.dll"
+  Delete "$INSTDIR\libabsl_raw_logging_internal.dll"
+  Delete "$INSTDIR\libabsl_spinlock_wait.dll"
+  Delete "$INSTDIR\libabsl_stacktrace.dll"
+  Delete "$INSTDIR\libabsl_status.dll"
+  Delete "$INSTDIR\libabsl_statusor.dll"
+  Delete "$INSTDIR\libabsl_strerror.dll"
+  Delete "$INSTDIR\libabsl_str_format_internal.dll"
+  Delete "$INSTDIR\libabsl_strings.dll"
+  Delete "$INSTDIR\libabsl_strings_internal.dll"
+  Delete "$INSTDIR\libabsl_symbolize.dll"
+  Delete "$INSTDIR\libabsl_synchronization.dll"
+  Delete "$INSTDIR\libabsl_throw_delegate.dll"
+  Delete "$INSTDIR\libabsl_time.dll"
+  Delete "$INSTDIR\libabsl_time_zone.dll"
+
 !ifdef debug
   Delete "$INSTDIR\gdb.exe"
   Delete "$INSTDIR\libexpat-1.dll"
@@ -836,6 +957,7 @@ Section "Uninstall"
   Delete "$INSTDIR\libpcre2-16d.dll"
   Delete "$INSTDIR\libreadline8.dll"
   Delete "$INSTDIR\libtermcap.dll"
+  Delete "$INSTDIR\libabsl_graphcycles_internal.dll"
 !else
   Delete "$INSTDIR\libpcre2-8.dll"
   Delete "$INSTDIR\libpcre2-16.dll"
@@ -857,29 +979,27 @@ 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"
   Delete "$INSTDIR\gstaudio-1.0-0.dll"
   Delete "$INSTDIR\gstbadaudio-1.0-0.dll"
   Delete "$INSTDIR\gstbase-1.0-0.dll"
+  Delete "$INSTDIR\gstcodecparsers-1.0-0.dll"
   Delete "$INSTDIR\gstfft-1.0-0.dll"
   Delete "$INSTDIR\gstisoff-1.0-0.dll"
+  Delete "$INSTDIR\gstmpegts-1.0-0.dll"
   Delete "$INSTDIR\gstnet-1.0-0.dll"
   Delete "$INSTDIR\gstpbutils-1.0-0.dll"
   Delete "$INSTDIR\gstreamer-1.0-0.dll"
@@ -890,39 +1010,37 @@ 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\libiconv.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"
   Delete "$INSTDIR\wavpackdll.dll"
+  Delete "$INSTDIR\abseil_dll.dll"
 
 !ifdef release
   Delete "$INSTDIR\freetype.dll"
+  Delete "$INSTDIR\libiconv.dll"
   Delete "$INSTDIR\libpng16.dll"
-  Delete "$INSTDIR\libprotobuf.dll"
-  Delete "$INSTDIR\libxml2.dll"
+  Delete "$INSTDIR\libspeex.dll"
   Delete "$INSTDIR\pcre2-8.dll"
   Delete "$INSTDIR\pcre2-16.dll"
   Delete "$INSTDIR\twolame.dll"
@@ -930,24 +1048,35 @@ Section "Uninstall"
 !endif
 !ifdef debug
   Delete "$INSTDIR\freetyped.dll"
+  Delete "$INSTDIR\libiconvd.dll"
   Delete "$INSTDIR\libpng16d.dll"
-  Delete "$INSTDIR\libprotobufd.dll"
-  Delete "$INSTDIR\libxml2d.dll"
+  Delete "$INSTDIR\libspeexd.dll"
   Delete "$INSTDIR\pcre2-8d.dll"
   Delete "$INSTDIR\pcre2-16d.dll"
   Delete "$INSTDIR\twolamed.dll"
   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\icudt75.dll"
   Delete "$INSTDIR\libfftw3-3.dll"
+!ifdef debug
+  Delete "$INSTDIR\libprotobufd.dll"
+!else
+  Delete "$INSTDIR\libprotobuf.dll"
+!endif
 !ifdef msvc && debug
-  Delete "$INSTDIR\icuin72d.dll"
-  Delete "$INSTDIR\icuuc72d.dll"
+  Delete "$INSTDIR\icuin75d.dll"
+  Delete "$INSTDIR\icuuc75d.dll"
+  Delete "$INSTDIR\libxml2d.dll"
   Delete "$INSTDIR\Qt6Concurrentd.dll"
   Delete "$INSTDIR\Qt6Cored.dll"
   Delete "$INSTDIR\Qt6Guid.dll"
@@ -955,8 +1084,9 @@ Section "Uninstall"
   Delete "$INSTDIR\Qt6Sqld.dll"
   Delete "$INSTDIR\Qt6Widgetsd.dll"
 !else
-  Delete "$INSTDIR\icuin72.dll"
-  Delete "$INSTDIR\icuuc72.dll"
+  Delete "$INSTDIR\icuin75.dll"
+  Delete "$INSTDIR\icuuc75.dll"
+  Delete "$INSTDIR\libxml2.dll"
   Delete "$INSTDIR\Qt6Concurrent.dll"
   Delete "$INSTDIR\Qt6Core.dll"
   Delete "$INSTDIR\Qt6Gui.dll"
@@ -965,6 +1095,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"
@@ -976,7 +1114,7 @@ Section "Uninstall"
 
 !ifdef msvc && debug
   Delete "$INSTDIR\platforms\qwindowsd.dll"
-  Delete "$INSTDIR\styles\qwindowsvistastyled.dll"
+  Delete "$INSTDIR\styles\qmodernwindowsstyled.dll"
   Delete "$INSTDIR\tls\qschannelbackendd.dll"
   Delete "$INSTDIR\tls\qopensslbackendd.dll"
   Delete "$INSTDIR\sqldrivers\qsqlited.dll"
@@ -985,7 +1123,7 @@ Section "Uninstall"
   Delete "$INSTDIR\imageformats\qjpegd.dll"
 !else
   Delete "$INSTDIR\platforms\qwindows.dll"
-  Delete "$INSTDIR\styles\qwindowsvistastyle.dll"
+  Delete "$INSTDIR\styles\qmodernwindowsstyle.dll"
   Delete "$INSTDIR\tls\qschannelbackend.dll"
   Delete "$INSTDIR\tls\qopensslbackend.dll"
   Delete "$INSTDIR\sqldrivers\qsqlite.dll"
@@ -997,6 +1135,7 @@ Section "Uninstall"
   ; MinGW GStreamer plugins
 
 !ifdef mingw
+  Delete "$INSTDIR\gstreamer-plugins\libgstadaptivedemux2.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstaes.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstaiff.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstapetag.dll"
@@ -1005,16 +1144,14 @@ Section "Uninstall"
   Delete "$INSTDIR\gstreamer-plugins\libgstasfmux.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstaudioconvert.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstaudiofx.dll"
-  Delete "$INSTDIR\gstreamer-plugins\libgstaudiomixer.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstaudioparsers.dll"
-  Delete "$INSTDIR\gstreamer-plugins\libgstaudiorate.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstaudioresample.dll"
-  Delete "$INSTDIR\gstreamer-plugins\libgstaudiotestsrc.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstautodetect.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstbs2b.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstcoreelements.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstdash.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstdirectsound.dll"
+  Delete "$INSTDIR\gstreamer-plugins\libgstdsd.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstequalizer.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstfaac.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstfaad.dll"
@@ -1029,6 +1166,10 @@ Section "Uninstall"
   Delete "$INSTDIR\gstreamer-plugins\libgstisomp4.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstlame.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstlibav.dll"
+  Delete "$INSTDIR\gstreamer-plugins\libgstmpegpsdemux.dll"
+  Delete "$INSTDIR\gstreamer-plugins\libgstmpegpsmux.dll"
+  Delete "$INSTDIR\gstreamer-plugins\libgstmpegtsdemux.dll"
+  Delete "$INSTDIR\gstreamer-plugins\libgstmpegtsmux.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstmpg123.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstmusepack.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstogg.dll"
@@ -1051,6 +1192,7 @@ Section "Uninstall"
   Delete "$INSTDIR\gstreamer-plugins\libgstvolume.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstvorbis.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstwasapi.dll"
+  Delete "$INSTDIR\gstreamer-plugins\libgstwaveform.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstwavenc.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstwavpack.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstwavparse.dll"
@@ -1060,24 +1202,24 @@ Section "Uninstall"
   ; MSVC GStreamer plugins
 
 !ifdef msvc
+  Delete "$INSTDIR\gstreamer-plugins\gstadaptivedemux2.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstaes.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstaiff.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstapetag.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstapp.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstasf.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstasfmux.dll"
+  Delete "$INSTDIR\gstreamer-plugins\gstasio.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstaudioconvert.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstaudiofx.dll"
-  Delete "$INSTDIR\gstreamer-plugins\gstaudiomixer.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstaudioparsers.dll"
-  Delete "$INSTDIR\gstreamer-plugins\gstaudiorate.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstaudioresample.dll"
-  Delete "$INSTDIR\gstreamer-plugins\gstaudiotestsrc.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstautodetect.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstbs2b.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstcoreelements.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstdash.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstdirectsound.dll"
+  Delete "$INSTDIR\gstreamer-plugins\gstdsd.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstequalizer.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstfaac.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstfaad.dll"
@@ -1092,6 +1234,10 @@ Section "Uninstall"
   Delete "$INSTDIR\gstreamer-plugins\gstisomp4.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstlame.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstlibav.dll"
+  Delete "$INSTDIR\gstreamer-plugins\gstmpegpsdemux.dll"
+  Delete "$INSTDIR\gstreamer-plugins\gstmpegpsmux.dll"
+  Delete "$INSTDIR\gstreamer-plugins\gstmpegtsdemux.dll"
+  Delete "$INSTDIR\gstreamer-plugins\gstmpegtsmux.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstmpg123.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstmusepack.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstogg.dll"
@@ -1114,13 +1260,18 @@ 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\gstwaveform.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"
+!ifdef arch_x64
+  Delete "$INSTDIR\gstreamer-plugins\gstspotify.dll"
+!endif
 !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/gstmoodbar/gstmoodbarplugin.cpp

@@ -21,8 +21,6 @@
 #include "gstfastspectrum.h"
 #include "gstmoodbarplugin.h"
 
-namespace {
-
 static gboolean gst_moodbar_plugin_init(GstPlugin *plugin) {
 
   if (!gst_element_register(plugin, "fastspectrum", GST_RANK_NONE, GST_TYPE_FASTSPECTRUM)) {
@@ -32,8 +30,6 @@ static gboolean gst_moodbar_plugin_init(GstPlugin *plugin) {
   return TRUE;
 }
 
-}  // namespace
-
 int gstfastspectrum_register_static() {
 
   return gst_plugin_register_static(

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>
@@ -57,8 +67,8 @@ static QIODevice *sNullDevice = nullptr;
 
 const char *kDefaultLogLevels = "*:3";
 
-static const char *kMessageHandlerMagic = "__logging_message__";
-static const size_t kMessageHandlerMagicLength = strlen(kMessageHandlerMagic);
+static constexpr char kMessageHandlerMagic[] = "__logging_message__";
+static const size_t kMessageHandlerMagicLen = strlen(kMessageHandlerMagic);
 static QtMessageHandler sOriginalMessageHandler = nullptr;
 
 template<class T>
@@ -125,9 +135,9 @@ class LoggedDebug : public DebugBase<LoggedDebug> {
 
 static void MessageHandler(QtMsgType type, const QMessageLogContext&, const QString &message) {
 
-  if (message.startsWith(kMessageHandlerMagic)) {
+  if (message.startsWith(QLatin1String(kMessageHandlerMagic))) {
     QByteArray message_data = message.toUtf8();
-    fprintf(type == QtCriticalMsg || type == QtFatalMsg ? stderr : stdout, "%s\n", message_data.constData() + kMessageHandlerMagicLength);
+    fprintf(type == QtCriticalMsg || type == QtFatalMsg ? stderr : stdout, "%s\n", message_data.constData() + kMessageHandlerMagicLen);
     fflush(type == QtCriticalMsg || type == QtFatalMsg ? stderr : stdout);
     return;
   }
@@ -147,8 +157,8 @@ static void MessageHandler(QtMsgType type, const QMessageLogContext&, const QStr
       break;
   }
 
-  for (const QString &line : message.split('\n')) {
-    BufferedDebug d = CreateLogger<BufferedDebug>(level, "unknown", -1, nullptr);
+  for (const QString &line : message.split(QLatin1Char('\n'))) {
+    BufferedDebug d = CreateLogger<BufferedDebug>(level, QStringLiteral("unknown"), -1, nullptr);
     d << line.toLocal8Bit().constData();
     if (d.buf_) {
       d.buf_->close();
@@ -183,8 +193,8 @@ void SetLevels(const QString &levels) {
 
   if (!sClassLevels) return;
 
-  for (const QString &item : levels.split(',')) {
-    const QStringList class_level = item.split(':');
+  for (const QString &item : levels.split(QLatin1Char(','))) {
+    const QStringList class_level = item.split(QLatin1Char(':'));
 
     QString class_name;
     bool ok = false;
@@ -202,7 +212,7 @@ void SetLevels(const QString &levels) {
       continue;
     }
 
-    if (class_name.isEmpty() || class_name == "*") {
+    if (class_name.isEmpty() || class_name == QLatin1Char('*')) {
       sDefaultLevel = static_cast<Level>(level);
     }
     else {
@@ -215,10 +225,10 @@ void SetLevels(const QString &levels) {
 static QString ParsePrettyFunction(const char *pretty_function) {
 
   // Get the class name out of the function name.
-  QString class_name = pretty_function;
-  const qint64 paren = class_name.indexOf('(');
+  QString class_name = QLatin1String(pretty_function);
+  const qint64 paren = class_name.indexOf(QLatin1Char('('));
   if (paren != -1) {
-    const qint64 colons = class_name.lastIndexOf("::", paren);
+    const qint64 colons = class_name.lastIndexOf(QLatin1String("::"), paren);
     if (colons != -1) {
       class_name = class_name.left(colons);
     }
@@ -227,7 +237,7 @@ static QString ParsePrettyFunction(const char *pretty_function) {
     }
   }
 
-  const qint64 space = class_name.lastIndexOf(' ');
+  const qint64 space = class_name.lastIndexOf(QLatin1Char(' '));
   if (space != -1) {
     class_name = class_name.mid(space + 1);
   }
@@ -249,7 +259,7 @@ static T CreateLogger(Level level, const QString &class_name, int line, const ch
     case Level_Fatal:   level_name = " FATAL "; break;
   }
 
-  QString filter_category = (category != nullptr) ? category : class_name;
+  QString filter_category = (category != nullptr) ? QLatin1String(category) : class_name;
   // Check the settings to see if we're meant to show or hide this message.
   Level threshold_level = sDefaultLevel;
   if (sClassLevels && sClassLevels->contains(filter_category)) {
@@ -262,10 +272,10 @@ static T CreateLogger(Level level, const QString &class_name, int line, const ch
 
   QString function_line = class_name;
   if (line != -1) {
-    function_line += ":" + QString::number(line);
+    function_line += QLatin1Char(':') + QString::number(line);
   }
   if (category) {
-    function_line += "(" + QString(category) + ")";
+    function_line += QLatin1Char('(') + QLatin1String(category) + QLatin1Char(')');
   }
 
   QtMsgType type = QtDebugMsg;
@@ -274,7 +284,7 @@ static T CreateLogger(Level level, const QString &class_name, int line, const ch
   }
 
   T ret(type);
-  ret.nospace() << QDateTime::currentDateTime().toString("hh:mm:ss.zzz").toLatin1().constData() << level_name << function_line.leftJustified(32).toLatin1().constData();
+  ret.nospace() << QDateTime::currentDateTime().toString(QStringLiteral("hh:mm:ss.zzz")).toLatin1().constData() << level_name << function_line.leftJustified(32).toLatin1().constData();
 
   return ret.space();
 
@@ -300,7 +310,7 @@ QString CXXDemangle(const QString &mangled_function) {
 QString LinuxDemangle(const QString &symbol);
 QString LinuxDemangle(const QString &symbol) {
 
-  QRegularExpression regex("\\(([^+]+)");
+  QRegularExpression regex(QStringLiteral("\\(([^+]+)"));
   QRegularExpressionMatch match = regex.match(symbol);
   if (!match.hasMatch()) {
     return symbol;
@@ -316,9 +326,9 @@ QString DarwinDemangle(const QString &symbol);
 QString DarwinDemangle(const QString &symbol) {
 
 #  if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-  QStringList split = symbol.split(' ', Qt::SkipEmptyParts);
+  QStringList split = symbol.split(QLatin1Char(' '), Qt::SkipEmptyParts);
 #  else
-  QStringList split = symbol.split(' ', QString::SkipEmptyParts);
+  QStringList split = symbol.split(QLatin1Char(' '), QString::SkipEmptyParts);
 #  endif
   QString mangled_function = split[3];
   return CXXDemangle(mangled_function);
@@ -382,7 +392,7 @@ namespace {
 
 template<typename T>
 QString print_duration(T duration, const std::string &unit) {
-  return QString("%1%2").arg(duration.count()).arg(unit.c_str());
+  return QStringLiteral("%1%2").arg(duration.count()).arg(QString::fromStdString(unit));
 }
 
 }  // namespace

ext/libstrawberry-common/core/messagehandler.h

@@ -120,13 +120,13 @@ template<typename MT>
 void AbstractMessageHandler<MT>::SendMessage(const MessageType &message) {
   Q_ASSERT(QThread::currentThread() == thread());
 
-  std::string data = message.SerializeAsString();
+  const std::string data = message.SerializeAsString();
   WriteMessage(QByteArray(data.data(), data.size()));
 }
 
 template<typename MT>
 void AbstractMessageHandler<MT>::SendMessageAsync(const MessageType &message) {
-  std::string data = message.SerializeAsString();
+  const std::string data = message.SerializeAsString();
   QMetaObject::invokeMethod(this, "WriteMessage", Qt::QueuedConnection, Q_ARG(QByteArray, QByteArray(data.data(), data.size())));
 }
 

ext/libstrawberry-common/core/workerpool.h

@@ -23,6 +23,7 @@
 
 #include <cstdio>
 #include <cstddef>
+#include <utility>
 
 #include <QtGlobal>
 #include <QObject>
@@ -31,15 +32,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"
 
@@ -165,14 +165,14 @@ class WorkerPool : public _WorkerPoolBase {
 template<typename HandlerType>
 WorkerPool<HandlerType>::WorkerPool(QObject *parent)
     : _WorkerPoolBase(parent),
+      worker_count_(1),
       next_worker_(0),
       next_id_(0) {
 
-  worker_count_ = qBound(1, QThread::idealThreadCount() / 2, 4);
   local_server_name_ = qApp->applicationName().toLower();
 
   if (local_server_name_.isEmpty()) {
-    local_server_name_ = "workerpool";
+    local_server_name_ = QStringLiteral("workerpool");
   }
 
 }
@@ -228,7 +228,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>
@@ -244,15 +244,15 @@ void WorkerPool<HandlerType>::DoStart() {
   QStringList search_path;
   search_path << QCoreApplication::applicationDirPath();
 #if defined(Q_OS_UNIX)
-  search_path << "/usr/libexec";
-  search_path << "/usr/local/libexec";
+  search_path << QStringLiteral("/usr/libexec");
+  search_path << QStringLiteral("/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() + QStringLiteral("/../PlugIns"));
 #endif
 
-  for (const QString &path_prefix : search_path) {
-    const QString executable_path = path_prefix + "/" + executable_name_;
+  for (const QString &path_prefix : std::as_const(search_path)) {
+    const QString executable_path = path_prefix + QLatin1Char('/') + executable_name_;
     if (QFile::exists(executable_path)) {
       executable_path_ = executable_path;
       qLog(Debug) << "Using worker" << executable_name_ << "from" << path_prefix;
@@ -294,12 +294,8 @@ 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);
+    const QString name = QStringLiteral("%1_%2").arg(local_server_name_).arg(unique_number);
 
     if (worker->local_server_->listen(name)) {
       break;
@@ -423,7 +419,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,28 +1,34 @@
 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(USE_TAGLIB AND TAGLIB_FOUND)
+if(NOT Protobuf_LIBRARIES)
+  set(Protobuf_LIBRARIES protobuf::libprotobuf)
+endif()
+
+set(SOURCES tagreaderbase.cpp tagreadermessages.proto)
+
+if(HAVE_TAGLIB)
   list(APPEND SOURCES tagreadertaglib.cpp tagreadergme.cpp)
 endif()
 
-if(USE_TAGPARSER AND TAGPARSER_FOUND)
+if(HAVE_TAGPARSER)
   list(APPEND SOURCES tagreadertagparser.cpp)
 endif()
 
-protobuf_generate_cpp(PROTO_SOURCES PROTO_HEADERS ${MESSAGES})
-
 link_directories(
   ${GLIB_LIBRARY_DIRS}
   ${PROTOBUF_LIBRARY_DIRS}
 )
 
-if(USE_TAGLIB AND TAGLIB_FOUND)
+if(HAVE_TAGLIB)
   link_directories(${TAGLIB_LIBRARY_DIRS})
 endif()
 
-if(USE_TAGPARSER AND TAGPARSER_FOUND)
+if(HAVE_TAGPARSER)
   link_directories(${TAGPARSER_LIBRARY_DIRS})
 endif()
 
@@ -43,18 +49,21 @@ target_include_directories(libstrawberry-tagreader PRIVATE
 
 target_link_libraries(libstrawberry-tagreader PRIVATE
   ${GLIB_LIBRARIES}
-  ${PROTOBUF_LIBRARY}
-  ${QtCore_LIBRARIES}
-  ${QtNetwork_LIBRARIES}
+  ${Protobuf_LIBRARIES}
+  Qt${QT_VERSION_MAJOR}::Core
+  Qt${QT_VERSION_MAJOR}::Network
+  Qt${QT_VERSION_MAJOR}::Gui
   libstrawberry-common
 )
 
-if(USE_TAGLIB AND TAGLIB_FOUND)
+if(HAVE_TAGLIB)
   target_include_directories(libstrawberry-tagreader SYSTEM PRIVATE ${TAGLIB_INCLUDE_DIRS})
   target_link_libraries(libstrawberry-tagreader PRIVATE ${TAGLIB_LIBRARIES})
 endif()
 
-if(USE_TAGPARSER AND TAGPARSER_FOUND)
+if(HAVE_TAGPARSER)
   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-2024, 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
@@ -19,26 +19,52 @@
 
 #include <string>
 
+#include <QObject>
+#include <QByteArray>
+#include <QString>
+#include <QIODevice>
+#include <QFile>
+#include <QBuffer>
+#include <QImage>
+#include <QMimeDatabase>
+
+#include "core/logging.h"
 #include "tagreaderbase.h"
 
-const std::string TagReaderBase::kEmbeddedCover = "(embedded)";
-
 TagReaderBase::TagReaderBase() = default;
-TagReaderBase::~TagReaderBase() = default;
 
-void TagReaderBase::Decode(const QString &tag, std::string *output) {
+QString TagReaderBase::ErrorString(const Result &result) {
 
-  output->assign(DataCommaSizeFromQString(tag));
+  switch (result.error_code) {
+    case Result::ErrorCode::Success:
+      return QObject::tr("Success");
+    case Result::ErrorCode::Unsupported:
+      return QObject::tr("File is unsupported");
+    case Result::ErrorCode::FilenameMissing:
+      return QObject::tr("Filename is missing");
+    case Result::ErrorCode::FileDoesNotExist:
+      return QObject::tr("File does not exist");
+    case Result::ErrorCode::FileOpenError:
+      return QObject::tr("File could not be opened");
+    case Result::ErrorCode::FileParseError:
+      return QObject::tr("Could not parse file");
+    case Result::ErrorCode::FileSaveError:
+      return QObject::tr("Could save file");
+    case Result::ErrorCode::CustomError:
+      return result.error;
+  }
+
+  return QObject::tr("Unknown error");
 
 }
 
 float TagReaderBase::ConvertPOPMRating(const int POPM_rating) {
 
   if (POPM_rating < 0x01) return 0.0F;
-  else if (POPM_rating < 0x40) return 0.20F;
-  else if (POPM_rating < 0x80) return 0.40F;
-  else if (POPM_rating < 0xC0) return 0.60F;
-  else if (POPM_rating < 0xFC) return 0.80F;
+  if (POPM_rating < 0x40) return 0.20F;
+  if (POPM_rating < 0x80) return 0.40F;
+  if (POPM_rating < 0xC0) return 0.60F;
+  if (POPM_rating < 0xFC) return 0.80F;
 
   return 1.0F;
 
@@ -47,11 +73,98 @@ float TagReaderBase::ConvertPOPMRating(const int POPM_rating) {
 int TagReaderBase::ConvertToPOPMRating(const float rating) {
 
   if (rating < 0.20) return 0x00;
-  else if (rating < 0.40) return 0x01;
-  else if (rating < 0.60) return 0x40;
-  else if (rating < 0.80) return 0x80;
-  else if (rating < 1.0)  return 0xC0;
+  if (rating < 0.40) return 0x01;
+  if (rating < 0.60) return 0x40;
+  if (rating < 0.80) return 0x80;
+  if (rating < 1.0)  return 0xC0;
 
   return 0xFF;
 
 }
+
+TagReaderBase::Cover TagReaderBase::LoadCoverFromRequest(const QString &song_filename, const spb::tagreader::WriteFileRequest &request) {
+
+  if (!request.has_save_cover() || !request.save_cover()) {
+    return Cover();
+  }
+
+  QString cover_filename;
+  if (request.has_cover_filename()) {
+    cover_filename = QString::fromStdString(request.cover_filename());
+  }
+  QByteArray cover_data;
+  if (request.has_cover_data()) {
+    cover_data = QByteArray(request.cover_data().data(), static_cast<qint64>(request.cover_data().size()));
+  }
+  QString cover_mime_type;
+  if (request.has_cover_mime_type()) {
+    cover_mime_type = QString::fromStdString(request.cover_mime_type());
+  }
+
+  return LoadCoverFromRequest(song_filename, cover_filename, cover_data, cover_mime_type);
+
+}
+
+TagReaderBase::Cover TagReaderBase::LoadCoverFromRequest(const QString &song_filename, const spb::tagreader::SaveEmbeddedArtRequest &request) {
+
+  QString cover_filename;
+  if (request.has_cover_filename()) {
+    cover_filename = QString::fromStdString(request.cover_filename());
+  }
+  QByteArray cover_data;
+  if (request.has_cover_data()) {
+    cover_data = QByteArray(request.cover_data().data(), static_cast<qint64>(request.cover_data().size()));
+  }
+  QString cover_mime_type;
+  if (request.has_cover_mime_type()) {
+    cover_mime_type = QString::fromStdString(request.cover_mime_type());
+  }
+
+  return LoadCoverFromRequest(song_filename, cover_filename, cover_data, cover_mime_type);
+
+}
+
+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 Cover();
+    }
+    cover_data = file.readAll();
+    file.close();
+  }
+
+  if (!cover_data.isEmpty()) {
+    if (cover_mime_type.isEmpty()) {
+      cover_mime_type = QMimeDatabase().mimeTypeForData(cover_data).name();
+    }
+    if (cover_mime_type == QLatin1String("image/jpeg")) {
+      qLog(Debug) << "Using cover from JPEG data for" << song_filename;
+      return Cover(cover_data, cover_mime_type);
+    }
+    if (cover_mime_type == QLatin1String("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;
+    QImage cover_image;
+    if (!cover_image.loadFromData(cover_data)) {
+      qLog(Error) << "Failed to load image from cover data for" << song_filename;
+      return Cover();
+    }
+    cover_data.clear();
+    QBuffer buffer(&cover_data);
+    if (buffer.open(QIODevice::WriteOnly)) {
+      cover_image.save(&buffer, "JPEG");
+      buffer.close();
+    }
+    return Cover(cover_data, QStringLiteral("image/jpeg"));
+  }
+
+  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-2024, 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
@@ -27,9 +27,6 @@
 
 #include "tagreadermessages.pb.h"
 
-#define QStringFromStdString(x) QString::fromUtf8((x).data(), (x).size())
-#define DataCommaSizeFromQString(x) (x).toUtf8().constData(), (x).toUtf8().length()
-
 /*
  * This class holds all useful methods to read and write tags from/to files.
  * You should not use it directly in the main process but rather use a TagReaderWorker process (using TagReaderClient)
@@ -37,26 +34,56 @@
 class TagReaderBase {
  public:
   explicit TagReaderBase();
-  ~TagReaderBase();
+  ~TagReaderBase() = default;
+
+  class Result {
+   public:
+    enum class ErrorCode {
+      Success,
+      Unsupported,
+      FilenameMissing,
+      FileDoesNotExist,
+      FileOpenError,
+      FileParseError,
+      FileSaveError,
+      CustomError,
+    };
+    Result(const ErrorCode _error_code, const QString &_error = QString()) : error_code(_error_code), error(_error) {}
+    ErrorCode error_code;
+    QString error;
+    bool success() const { return error_code == ErrorCode::Success; }
+  };
+
+  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;
+  };
+
+  static QString ErrorString(const Result &result);
 
   virtual bool IsMediaFile(const QString &filename) const = 0;
 
-  virtual bool ReadFile(const QString &filename, spb::tagreader::SongMetadata *song) const = 0;
-  virtual bool SaveFile(const QString &filename, const spb::tagreader::SongMetadata &song) const = 0;
+  virtual Result ReadFile(const QString &filename, spb::tagreader::SongMetadata *song) const = 0;
+  virtual Result WriteFile(const QString &filename, const spb::tagreader::WriteFileRequest &request) const = 0;
 
-  virtual QByteArray LoadEmbeddedArt(const QString &filename) const = 0;
-  virtual bool SaveEmbeddedArt(const QString &filename, const QByteArray &data) = 0;
+  virtual Result LoadEmbeddedArt(const QString &filename, QByteArray &data) const = 0;
+  virtual Result SaveEmbeddedArt(const QString &filename, const spb::tagreader::SaveEmbeddedArtRequest &request) const = 0;
 
-  virtual bool SaveSongPlaycountToFile(const QString &filename, const spb::tagreader::SongMetadata &song) const = 0;
-  virtual bool SaveSongRatingToFile(const QString &filename, const spb::tagreader::SongMetadata &song) const = 0;
-
-  static void Decode(const QString &tag, std::string *output);
+  virtual Result SaveSongPlaycountToFile(const QString &filename, const uint playcount) const = 0;
+  virtual Result SaveSongRatingToFile(const QString &filename, const float rating) const = 0;
 
+ protected:
   static float ConvertPOPMRating(const int POPM_rating);
   static int ConvertToPOPMRating(const float rating);
 
- protected:
-  static const std::string kEmbeddedCover;
+  static Cover LoadCoverFromRequest(const QString &song_filename, const spb::tagreader::WriteFileRequest &request);
+  static Cover LoadCoverFromRequest(const QString &song_filename, const spb::tagreader::SaveEmbeddedArtRequest &request);
+
+ private:
+  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

@@ -19,8 +19,7 @@
 
 #include "tagreadergme.h"
 
-#include <tag.h>
-#include <apefile.h>
+#include <taglib/apefile.h>
 
 #include <QByteArray>
 #include <QString>
@@ -35,22 +34,23 @@
 #include "tagreaderbase.h"
 #include "tagreadertaglib.h"
 
-bool GME::IsSupportedFormat(const QFileInfo &file_info) {
-  return file_info.exists() && (file_info.completeSuffix().endsWith("spc", Qt::CaseInsensitive) || file_info.completeSuffix().endsWith("vgm"), Qt::CaseInsensitive);
+#undef TStringToQString
+#undef QStringToTString
+
+bool GME::IsSupportedFormat(const QFileInfo &fileinfo) {
+  return fileinfo.exists() && (fileinfo.completeSuffix().endsWith(QLatin1String("spc"), Qt::CaseInsensitive) || fileinfo.completeSuffix().endsWith(QLatin1String("vgm")), Qt::CaseInsensitive);
 }
 
-bool GME::ReadFile(const QFileInfo &file_info, spb::tagreader::SongMetadata *song_info) {
+TagReaderBase::Result GME::ReadFile(const QFileInfo &fileinfo, spb::tagreader::SongMetadata *song) {
 
-  if (file_info.completeSuffix().endsWith("spc"), Qt::CaseInsensitive) {
-    SPC::Read(file_info, song_info);
-    return true;
+  if (fileinfo.completeSuffix().endsWith(QLatin1String("spc")), Qt::CaseInsensitive) {
+    return SPC::Read(fileinfo, song);
   }
-  if (file_info.completeSuffix().endsWith("vgm", Qt::CaseInsensitive)) {
-    VGM::Read(file_info, song_info);
-    return true;
+  if (fileinfo.completeSuffix().endsWith(QLatin1String("vgm"), Qt::CaseInsensitive)) {
+    return VGM::Read(fileinfo, song);
   }
 
-  return false;
+  return TagReaderBase::Result::ErrorCode::Unsupported;
 
 }
 
@@ -67,15 +67,19 @@ quint32 GME::UnpackBytes32(const char *const bytes, size_t length) {
 
 }
 
-void GME::SPC::Read(const QFileInfo &file_info, spb::tagreader::SongMetadata *song_info) {
+TagReaderBase::Result GME::SPC::Read(const QFileInfo &fileinfo, spb::tagreader::SongMetadata *song) {
 
-  QFile file(file_info.filePath());
-  if (!file.open(QIODevice::ReadOnly)) return;
+  QFile file(fileinfo.filePath());
+  if (!file.open(QIODevice::ReadOnly)) {
+    return TagReaderBase::Result(TagReaderBase::Result::ErrorCode::FileOpenError, file.errorString());
+  }
 
-  qLog(Debug) << "Reading tags from SPC file" << file_info.fileName();
+  qLog(Debug) << "Reading tags from SPC file" << fileinfo.fileName();
 
   // Check for header -- more reliable than file name alone.
-  if (!file.read(33).startsWith(QString("SNES-SPC700").toLatin1())) return;
+  if (!file.read(33).startsWith(QStringLiteral("SNES-SPC700").toLatin1())) {
+    return TagReaderBase::Result::ErrorCode::Unsupported;
+  }
 
   // First order of business -- get any tag values that exist within the core file information.
   // These only allow for a certain number of bytes per field,
@@ -84,22 +88,22 @@ void GME::SPC::Read(const QFileInfo &file_info, spb::tagreader::SongMetadata *so
   //  Make sure to check id6 documentation before changing the read values!
 
   file.seek(HAS_ID6_OFFSET);
-  bool has_id6 = (file.read(1)[0] == static_cast<char>(xID6_STATUS::ON));
+  const QByteArray id6_status = file.read(1);
+  const bool has_id6 = id6_status.length() >= 1 && id6_status[0] == static_cast<char>(xID6_STATUS::ON);
 
   file.seek(SONG_TITLE_OFFSET);
-  song_info->set_title(QString::fromLatin1(file.read(32)).toStdString());
+  song->set_title(QString::fromLatin1(file.read(32)).toStdString());
 
   file.seek(GAME_TITLE_OFFSET);
-  song_info->set_album(QString::fromLatin1(file.read(32)).toStdString());
+  song->set_album(QString::fromLatin1(file.read(32)).toStdString());
 
   file.seek(ARTIST_OFFSET);
-  song_info->set_artist(QString::fromLatin1(file.read(32)).toStdString());
+  song->set_artist(QString::fromLatin1(file.read(32)).toStdString());
 
   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.
@@ -107,7 +111,7 @@ void GME::SPC::Read(const QFileInfo &file_info, spb::tagreader::SongMetadata *so
     }
 
     if (length_in_sec < 0x1FFF) {
-      song_info->set_length_nanosec(length_in_sec * kNsecPerSec);
+      song->set_length_nanosec(length_in_sec * kNsecPerSec);
     }
   }
 
@@ -119,18 +123,19 @@ 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.
   // XID6 format follows EA's binary file format standard named "IFF"
   file.seek(XID6_OFFSET);
-  if (has_id6 && file.read(4) == QString("xid6").toLatin1()) {
+  if (has_id6 && file.read(4) == QStringLiteral("xid6").toLatin1()) {
     QByteArray xid6_head_data = file.read(4);
     if (xid6_head_data.size() >= 4) {
       qint64 xid6_size = xid6_head_data[0] | (xid6_head_data[1] << 8) | (xid6_head_data[2] << 16) | xid6_head_data[3];
       // This should be the size remaining for entire ID6 block, but it seems that most files treat this as the size of the remaining header space...
 
-      qLog(Debug) << file_info.fileName() << "has ID6 tag.";
+      qLog(Debug) << fileinfo.fileName() << "has ID6 tag.";
 
       while ((file.pos()) + 4 < XID6_OFFSET + xid6_size) {
         QByteArray arr = file.read(4);
@@ -140,7 +145,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));
       }
@@ -151,26 +156,30 @@ void GME::SPC::Read(const QFileInfo &file_info, spb::tagreader::SongMetadata *so
   // an APETAG entry at the bottom of the file instead of writing into the xid6 tagging space.
   // This is where a lot of the extra data for a file is stored, such as genre or replaygain data.
   // This data is currently supported by TagLib, so we will simply use that for the remaining values.
-  TagLib::APE::File ape(file_info.filePath().toStdString().data());
+  TagLib::APE::File ape(fileinfo.filePath().toStdString().data());
   if (ape.hasAPETag()) {
     TagLib::Tag *tag = ape.tag();
-    if (!tag) return;
+    if (!tag) {
+      return TagReaderBase::Result::ErrorCode::FileParseError;
+    }
 
-    TagReaderTagLib::Decode(tag->artist(), song_info->mutable_artist());
-    TagReaderTagLib::Decode(tag->album(), song_info->mutable_album());
-    TagReaderTagLib::Decode(tag->title(), song_info->mutable_title());
-    TagReaderTagLib::Decode(tag->genre(), song_info->mutable_genre());
-    song_info->set_track(tag->track());
-    song_info->set_year(tag->year());
+    TagReaderTagLib::AssignTagLibStringToStdString(tag->artist(), song->mutable_artist());
+    TagReaderTagLib::AssignTagLibStringToStdString(tag->album(), song->mutable_album());
+    TagReaderTagLib::AssignTagLibStringToStdString(tag->title(), song->mutable_title());
+    TagReaderTagLib::AssignTagLibStringToStdString(tag->genre(), song->mutable_genre());
+    song->set_track(static_cast<std::int32_t>(tag->track()));
+    song->set_year(static_cast<std::int32_t>(tag->year()));
   }
 
-  song_info->set_valid(true);
-  song_info->set_filetype(spb::tagreader::SongMetadata_FileType_SPC);
+  song->set_valid(true);
+  song->set_filetype(spb::tagreader::SongMetadata_FileType_SPC);
+
+  return TagReaderBase::Result::ErrorCode::Success;
 
 }
 
 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.
 }
 
@@ -187,18 +196,24 @@ quint64 GME::SPC::ConvertSPCStringToNum(const QByteArray &arr) {
 
 }
 
-void GME::VGM::Read(const QFileInfo &file_info, spb::tagreader::SongMetadata *song_info) {
+TagReaderBase::Result GME::VGM::Read(const QFileInfo &fileinfo, spb::tagreader::SongMetadata *song) {
 
-  QFile file(file_info.filePath());
-  if (!file.open(QIODevice::ReadOnly)) return;
+  QFile file(fileinfo.filePath());
+  if (!file.open(QIODevice::ReadOnly)) {
+    return TagReaderBase::Result(TagReaderBase::Result::ErrorCode::FileOpenError, file.errorString());
+  }
 
-  qLog(Debug) << "Reading tags from VGM file" << file_info.fileName();
+  qLog(Debug) << "Reading tags from VGM file" << fileinfo.filePath();
 
-  if (!file.read(4).startsWith(QString("Vgm ").toLatin1())) return;
+  if (!file.read(4).startsWith(QStringLiteral("Vgm ").toLatin1())) {
+    return TagReaderBase::Result::ErrorCode::Unsupported;
+  }
 
   file.seek(GD3_TAG_PTR);
   QByteArray gd3_head = file.read(4);
-  if (gd3_head.size() < 4) return;
+  if (gd3_head.size() < 4) {
+    return TagReaderBase::Result::ErrorCode::FileParseError;
+  }
 
   quint64 pt = GME::UnpackBytes32(gd3_head.constData(), gd3_head.size());
 
@@ -208,9 +223,11 @@ void GME::VGM::Read(const QFileInfo &file_info, spb::tagreader::SongMetadata *so
   QByteArray loop_count_bytes = file.read(4);
   quint64 length = 0;
 
-  if (!GetPlaybackLength(sample_count_bytes, loop_count_bytes, length)) return;
+  if (!GetPlaybackLength(sample_count_bytes, loop_count_bytes, length)) {
+    return TagReaderBase::Result::ErrorCode::FileParseError;
+  }
 
-  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);
@@ -225,19 +242,23 @@ void GME::VGM::Read(const QFileInfo &file_info, spb::tagreader::SongMetadata *so
 #else
   fileTagStream.setCodec("UTF-16");
 #endif
-  QStringList strings = fileTagStream.readLine(0).split(QChar('\0'));
-  if (strings.count() < 10) return;
+  QStringList strings = fileTagStream.readLine(0).split(QLatin1Char('\0'));
+  if (strings.count() < 10) {
+    return TagReaderBase::Result::ErrorCode::FileParseError;
+  }
 
   // VGM standard dictates string tag data exist in specific order.
   // Order alternates between English and Japanese version of data.
   // Read GD3 tag standard for more details.
-  song_info->set_title(strings[0].toStdString());
-  song_info->set_album(strings[2].toStdString());
-  song_info->set_artist(strings[6].toStdString());
-  song_info->set_year(strings[8].left(4).toInt());
-  song_info->set_length_nanosec(length * kNsecPerMsec);
-  song_info->set_valid(true);
-  song_info->set_filetype(spb::tagreader::SongMetadata_FileType_VGM);
+  song->set_title(strings[0].toStdString());
+  song->set_album(strings[2].toStdString());
+  song->set_artist(strings[6].toStdString());
+  song->set_year(strings[8].left(4).toInt());
+  song->set_length_nanosec(length * kNsecPerMsec);
+  song->set_valid(true);
+  song->set_filetype(spb::tagreader::SongMetadata_FileType_VGM);
+
+  return TagReaderBase::Result::ErrorCode::Success;
 
 }
 
@@ -248,11 +269,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;
   }
@@ -266,34 +287,63 @@ bool GME::VGM::GetPlaybackLength(const QByteArray &sample_count_bytes, const QBy
 }
 
 TagReaderGME::TagReaderGME() = default;
-TagReaderGME::~TagReaderGME() = default;
+
 
 bool TagReaderGME::IsMediaFile(const QString &filename) const {
+
   QFileInfo fileinfo(filename);
   return GME::IsSupportedFormat(fileinfo);
+
 }
 
-bool TagReaderGME::ReadFile(const QString &filename, spb::tagreader::SongMetadata *song) const {
+TagReaderBase::Result TagReaderGME::ReadFile(const QString &filename, spb::tagreader::SongMetadata *song) const {
+
   QFileInfo fileinfo(filename);
   return GME::ReadFile(fileinfo, song);
+
 }
 
-bool TagReaderGME::SaveFile(const QString&, const spb::tagreader::SongMetadata&) const {
-  return false;
+TagReaderBase::Result TagReaderGME::WriteFile(const QString &filename, const spb::tagreader::WriteFileRequest &request) const {
+
+  Q_UNUSED(filename);
+  Q_UNUSED(request);
+
+  return Result::ErrorCode::Unsupported;
+
 }
 
-QByteArray TagReaderGME::LoadEmbeddedArt(const QString&) const {
-  return QByteArray();
+TagReaderBase::Result TagReaderGME::LoadEmbeddedArt(const QString &filename, QByteArray &data) const {
+
+  Q_UNUSED(filename);
+  Q_UNUSED(data);
+
+  return Result::ErrorCode::Unsupported;
+
 }
 
-bool TagReaderGME::SaveEmbeddedArt(const QString&, const QByteArray&) {
-  return false;
+TagReaderBase::Result TagReaderGME::SaveEmbeddedArt(const QString &filename, const spb::tagreader::SaveEmbeddedArtRequest &request) const {
+
+  Q_UNUSED(filename);
+  Q_UNUSED(request);
+
+  return Result::ErrorCode::Unsupported;
+
 }
 
-bool TagReaderGME::SaveSongPlaycountToFile(const QString&, const spb::tagreader::SongMetadata&) const {
-  return false;
+TagReaderBase::Result TagReaderGME::SaveSongPlaycountToFile(const QString &filename, const uint playcount) const {
+
+  Q_UNUSED(filename);
+  Q_UNUSED(playcount);
+
+  return Result::ErrorCode::Unsupported;
+
 }
 
-bool TagReaderGME::SaveSongRatingToFile(const QString&, const spb::tagreader::SongMetadata&) const {
-  return false;
+TagReaderBase::Result TagReaderGME::SaveSongRatingToFile(const QString &filename, const float rating) const {
+
+  Q_UNUSED(filename);
+  Q_UNUSED(rating);
+
+  return Result::ErrorCode::Unsupported;
+
 }

ext/libstrawberry-tagreader/tagreadergme.h

@@ -20,8 +20,6 @@
 #ifndef TAGREADERGME_H
 #define TAGREADERGME_H
 
-#include <taglib/tstring.h>
-
 #include <QByteArray>
 #include <QString>
 #include <QFileInfo>
@@ -29,12 +27,11 @@
 #include "tagreaderbase.h"
 #include "tagreadermessages.pb.h"
 
-
 namespace GME {
-bool IsSupportedFormat(const QFileInfo &file_info);
-bool ReadFile(const QFileInfo &file_info, spb::tagreader::SongMetadata *song_info);
+bool IsSupportedFormat(const QFileInfo &fileinfo);
+TagReaderBase::Result ReadFile(const QFileInfo &fileinfo, spb::tagreader::SongMetadata *song);
 
-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
@@ -55,16 +52,24 @@ constexpr int XID6_OFFSET = (0x101C0 + 64);
 
 constexpr int NANO_PER_MS = 1000000;
 
-enum xID6_STATUS {
+enum class xID6_STATUS {
   ON = 0x26,
-  OFF = 0x27,
+  OFF = 0x27
 };
 
-enum xID6_ID { SongName = 0x01, GameName = 0x02, ArtistName = 0x03 };
+enum class xID6_ID {
+  SongName = 0x01,
+  GameName = 0x02,
+  ArtistName = 0x03
+};
 
-enum xID6_TYPE { Length = 0x0, String = 0x1, Integer = 0x4 };
+enum class xID6_TYPE {
+  Length = 0x0,
+  String = 0x1,
+  Integer = 0x4
+};
 
-void Read(const QFileInfo &file_info, spb::tagreader::SongMetadata *song_info);
+TagReaderBase::Result Read(const QFileInfo &fileinfo, spb::tagreader::SongMetadata *song);
 qint16 GetNextMemAddressAlign32bit(qint16 input);
 quint64 ConvertSPCStringToNum(const QByteArray &arr);
 }  // namespace SPC
@@ -80,7 +85,7 @@ constexpr int LOOP_SAMPLE_COUNT = 0x20;
 constexpr int SAMPLE_TIMEBASE = 44100;
 constexpr int GST_GME_LOOP_TIME_MS = 8000;
 
-void Read(const QFileInfo &file_info, spb::tagreader::SongMetadata *song_info);
+TagReaderBase::Result Read(const QFileInfo &fileinfo, spb::tagreader::SongMetadata *song);
 // Takes in two QByteArrays, expected to be 4 bytes long. Desired length is returned via output parameter out_length. Returns false on error.
 bool GetPlaybackLength(const QByteArray &sample_count_bytes, const QByteArray &loop_count_bytes, quint64 &out_length);
 
@@ -94,18 +99,18 @@ class TagReaderGME : public TagReaderBase {
 
  public:
   explicit TagReaderGME();
-  ~TagReaderGME();
+  ~TagReaderGME() = default;
 
   bool IsMediaFile(const QString &filename) const override;
 
-  bool ReadFile(const QString &filename, spb::tagreader::SongMetadata *song) const override;
-  bool SaveFile(const QString &filename, const spb::tagreader::SongMetadata &song) const override;
+  Result ReadFile(const QString &filename, spb::tagreader::SongMetadata *song) const override;
+  Result WriteFile(const QString &filename, const spb::tagreader::WriteFileRequest &request) const override;
 
-  QByteArray LoadEmbeddedArt(const QString &filename) const override;
-  bool SaveEmbeddedArt(const QString &filename, const QByteArray &data) override;
+  Result LoadEmbeddedArt(const QString &filename, QByteArray &data) const override;
+  Result SaveEmbeddedArt(const QString &filename, const spb::tagreader::SaveEmbeddedArtRequest &request) const override;
 
-  bool SaveSongPlaycountToFile(const QString &filename, const spb::tagreader::SongMetadata &song) const override;
-  bool SaveSongRatingToFile(const QString &filename, const spb::tagreader::SongMetadata &song) const override;
+  Result SaveSongPlaycountToFile(const QString &filename, const uint playcount) const override;
+  Result SaveSongRatingToFile(const QString &filename, const float rating) const override;
 };
 
-#endif
+#endif  // TAGREADERGME_H

ext/libstrawberry-tagreader/tagreadermessages.proto

@@ -69,29 +69,26 @@ message SongMetadata {
   optional int64 lastplayed = 29;
   optional int64 lastseen = 30;
 
-  optional string art_automatic = 31;
+  optional bool art_embedded = 31;
 
   optional float rating = 32;
 
-  optional bool suspicious_tags = 40;
+  optional string acoustid_id = 33;
+  optional string acoustid_fingerprint = 34;
 
-}
+  optional string musicbrainz_album_artist_id = 35;     // MusicBrainz Release Artist ID (MUSICBRAINZ_ALBUMARTISTID)
+  optional string musicbrainz_artist_id = 36;           // MusicBrainz Artist ID (MUSICBRAINZ_ARTISTID)
+  optional string musicbrainz_original_artist_id = 37;  // MusicBrainz Original Artist ID (MUSICBRAINZ_ORIGINALARTISTID)
+  optional string musicbrainz_album_id = 38;            // MusicBrainz Release ID (MUSICBRAINZ_ALBUMID)
+  optional string musicbrainz_original_album_id = 39;   // MusicBrainz Original Release ID (MUSICBRAINZ_ORIGINALALBUMID)
+  optional string musicbrainz_recording_id = 40;        // MusicBrainz Recording ID (MUSICBRAINZ_TRACKID)
+  optional string musicbrainz_track_id = 41;            // MusicBrainz Track ID (MUSICBRAINZ_RELEASETRACKID)
+  optional string musicbrainz_disc_id = 42;             // MusicBrainz Disc ID (MUSICBRAINZ_DISCID)
+  optional string musicbrainz_release_group_id = 43;    // MusicBrainz Release Group ID (MUSICBRAINZ_RELEASEGROUPID)
+  optional string musicbrainz_work_id = 44;             // MusicBrainz Work ID (MUSICBRAINZ_WORKID)
 
-message ReadFileRequest {
-  optional string filename = 1;
-}
+  optional bool suspicious_tags = 50;
 
-message ReadFileResponse {
-  optional SongMetadata metadata = 1;
-}
-
-message SaveFileRequest {
-  optional string filename = 1;
-  optional SongMetadata metadata = 2;
-}
-
-message SaveFileResponse {
-  optional bool success = 1;
 }
 
 message IsMediaFileRequest {
@@ -102,39 +99,73 @@ message IsMediaFileResponse {
   optional bool success = 1;
 }
 
+message ReadFileRequest {
+  optional string filename = 1;
+}
+
+message ReadFileResponse {
+  optional bool success = 1;
+  optional SongMetadata metadata = 2;
+  optional string error = 3;
+}
+
+message WriteFileRequest {
+  optional string filename = 1;
+  optional bool save_tags = 2;
+  optional bool save_playcount = 3;
+  optional bool save_rating = 4;
+  optional bool save_cover = 5;
+  optional SongMetadata metadata = 6;
+  optional string cover_filename = 7;
+  optional bytes cover_data = 8;
+  optional string cover_mime_type = 9;
+}
+
+message WriteFileResponse {
+  optional bool success = 1;
+  optional string error = 2;
+}
+
 message LoadEmbeddedArtRequest {
   optional string filename = 1;
 }
 
 message LoadEmbeddedArtResponse {
-  optional bytes data = 1;
+  optional bool success = 1;
+  optional bytes data = 2;
+  optional string error = 3;
 }
 
 message SaveEmbeddedArtRequest {
   optional string filename = 1;
-  optional bytes data = 2;
+  optional string cover_filename = 2;
+  optional bytes cover_data = 3;
+  optional string cover_mime_type = 4;
 }
 
 message SaveEmbeddedArtResponse {
   optional bool success = 1;
+  optional string error = 2;
 }
 
 message SaveSongPlaycountToFileRequest {
   optional string filename = 1;
-  optional SongMetadata metadata = 2;
+  optional uint32 playcount = 2;
 }
 
 message SaveSongPlaycountToFileResponse {
   optional bool success = 1;
+  optional string error = 2;
 }
 
 message SaveSongRatingToFileRequest {
   optional string filename = 1;
-  optional SongMetadata metadata = 2;
+  optional float rating = 2;
 }
 
 message SaveSongRatingToFileResponse {
   optional bool success = 1;
+  optional string error = 2;
 }
 
 message Message {
@@ -143,8 +174,8 @@ message Message {
   optional ReadFileRequest read_file_request = 2;
   optional ReadFileResponse read_file_response = 3;
 
-  optional SaveFileRequest save_file_request = 4;
-  optional SaveFileResponse save_file_response = 5;
+  optional WriteFileRequest write_file_request = 4;
+  optional WriteFileResponse write_file_response = 5;
 
   optional IsMediaFileRequest is_media_file_request = 6;
   optional IsMediaFileResponse is_media_file_response = 7;

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-2024, 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
@@ -29,14 +29,23 @@
 #include <taglib/tstring.h>
 #include <taglib/fileref.h>
 #include <taglib/xiphcomment.h>
+#include <taglib/flacfile.h>
+#include <taglib/mpegfile.h>
+#include <taglib/mp4file.h>
 #include <taglib/apetag.h>
 #include <taglib/apefile.h>
+#include <taglib/asffile.h>
 #include <taglib/id3v2tag.h>
 #include <taglib/popularimeterframe.h>
+#include <taglib/mp4tag.h>
+#include <taglib/asftag.h>
 
 #include "tagreaderbase.h"
 #include "tagreadermessages.pb.h"
 
+#undef TStringToQString
+#undef QStringToTString
+
 class FileRefFactory;
 
 /*
@@ -48,38 +57,85 @@ class TagReaderTagLib : public TagReaderBase {
   explicit TagReaderTagLib();
   ~TagReaderTagLib();
 
+  static inline TagLib::String StdStringToTagLibString(const std::string &s) {
+    return TagLib::String(s.c_str(), TagLib::String::UTF8);
+  }
+
+  static inline std::string TagLibStringToStdString(const TagLib::String &s) {
+    return std::string(s.toCString(true), s.length());
+  }
+
+  static inline TagLib::String QStringToTagLibString(const QString &s) {
+    return TagLib::String(s.toUtf8().constData(), TagLib::String::UTF8);
+  }
+
+  static inline QString TagLibStringToQString(const TagLib::String &s) {
+    return QString::fromUtf8((s).toCString(true));
+  }
+
+  static inline void AssignTagLibStringToStdString(const TagLib::String &tstr, std::string *output) {
+
+    const QString qstr = TagLibStringToQString(tstr).trimmed();
+    const QByteArray data = qstr.toUtf8();
+    output->assign(data.constData(), data.size());
+
+  }
+
   bool IsMediaFile(const QString &filename) const override;
 
-  bool ReadFile(const QString &filename, spb::tagreader::SongMetadata *song) const override;
-  bool SaveFile(const QString &filename, const spb::tagreader::SongMetadata &song) const override;
+  Result ReadFile(const QString &filename, spb::tagreader::SongMetadata *song) const override;
+  Result WriteFile(const QString &filename, const spb::tagreader::WriteFileRequest &request) const override;
 
-  QByteArray LoadEmbeddedArt(const QString &filename) const override;
-  bool SaveEmbeddedArt(const QString &filename, const QByteArray &data) override;
+  Result LoadEmbeddedArt(const QString &filename, QByteArray &data) const;
+  Result SaveEmbeddedArt(const QString &filename, const spb::tagreader::SaveEmbeddedArtRequest &request) const override;
 
-  bool SaveSongPlaycountToFile(const QString &filename, const spb::tagreader::SongMetadata &song) const override;
-  bool SaveSongRatingToFile(const QString &filename, const spb::tagreader::SongMetadata &song) const override;
-
-  static void Decode(const TagLib::String &tag, std::string *output);
+  Result SaveSongPlaycountToFile(const QString &filename, const uint playcount) const override;
+  Result SaveSongRatingToFile(const QString &filename, const float rating) const override;
 
  private:
   spb::tagreader::SongMetadata_FileType GuessFileType(TagLib::FileRef *fileref) const;
 
-  void ParseOggTag(const TagLib::Ogg::FieldListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const;
-  void ParseAPETag(const TagLib::APE::ItemListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const;
-
-  void SetVorbisComments(TagLib::Ogg::XiphComment *vorbis_comments, const spb::tagreader::SongMetadata &song) const;
-  void SaveAPETag(TagLib::APE::Tag *tag, const spb::tagreader::SongMetadata &song) const;
+  void ParseID3v2Tags(TagLib::ID3v2::Tag *tag, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const;
+  void ParseVorbisComments(const TagLib::Ogg::FieldListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const;
+  void ParseAPETags(const TagLib::APE::ItemListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const;
+  void ParseMP4Tags(TagLib::MP4::Tag *tag, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const;
+  void ParseASFTags(TagLib::ASF::Tag *tag, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const;
+  void ParseASFAttribute(const TagLib::ASF::AttributeListMap &attributes_map, const char *attribute, std::string *str) const;
 
+  void SetID3v2Tag(TagLib::ID3v2::Tag *tag, const spb::tagreader::SongMetadata &song) const;
   void SetTextFrame(const char *id, const QString &value, TagLib::ID3v2::Tag *tag) const;
   void SetTextFrame(const char *id, const std::string &value, TagLib::ID3v2::Tag *tag) const;
   void SetUserTextFrame(const QString &description, const QString &value, TagLib::ID3v2::Tag *tag) const;
   void SetUserTextFrame(const std::string &description, const std::string &value, TagLib::ID3v2::Tag *tag) const;
   void SetUnsyncLyricsFrame(const std::string &value, TagLib::ID3v2::Tag *tag) const;
 
+  void SetVorbisComments(TagLib::Ogg::XiphComment *vorbis_comment, const spb::tagreader::SongMetadata &song) const;
+  void SetAPETag(TagLib::APE::Tag *tag, const spb::tagreader::SongMetadata &song) const;
+  void SetASFTag(TagLib::ASF::Tag *tag, const spb::tagreader::SongMetadata &song) const;
+  void SetAsfAttribute(TagLib::ASF::Tag *tag, const char *attribute, const std::string &value) const;
+  void SetAsfAttribute(TagLib::ASF::Tag *tag, const char *attribute, const int value) const;
+
   QByteArray LoadEmbeddedAPEArt(const TagLib::APE::ItemListMap &map) const;
 
   static TagLib::ID3v2::PopularimeterFrame *GetPOPMFrameFromTag(TagLib::ID3v2::Tag *tag);
 
+  void SetPlaycount(TagLib::Ogg::XiphComment *vorbis_comment, const uint playcount) const;
+  void SetPlaycount(TagLib::APE::Tag *tag, const uint playcount) const;
+  void SetPlaycount(TagLib::ID3v2::Tag *tag, const uint playcount) const;
+  void SetPlaycount(TagLib::MP4::Tag *tag, const uint playcount) const;
+  void SetPlaycount(TagLib::ASF::Tag *tag, const uint playcount) const;
+
+  void SetRating(TagLib::Ogg::XiphComment *vorbis_comment, const float rating) const;
+  void SetRating(TagLib::APE::Tag *tag, const float rating) const;
+  void SetRating(TagLib::ID3v2::Tag *tag, const float rating) const;
+  void SetRating(TagLib::MP4::Tag *tag, const float rating) const;
+  void SetRating(TagLib::ASF::Tag *tag, const float rating) const;
+
+  void SetEmbeddedArt(TagLib::FLAC::File *flac_file, TagLib::Ogg::XiphComment *vorbis_comment, const QByteArray &data, const QString &mime_type) const;
+  void SetEmbeddedArt(TagLib::Ogg::XiphComment *vorbis_comment, const QByteArray &data, const QString &mime_type) const;
+  void SetEmbeddedArt(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

@@ -1,5 +1,5 @@
 /* This file is part of Strawberry.
-   Copyright 2021, Jonas Kvinge <jonas@jkvinge.net>
+   Copyright 2021-2024, 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
@@ -22,6 +22,7 @@
 #include <string>
 #include <memory>
 #include <algorithm>
+#include <vector>
 #include <sys/stat.h>
 
 #include <tagparser/mediafileinfo.h>
@@ -41,7 +42,7 @@
 
 #include "core/logging.h"
 #include "core/messagehandler.h"
-#include "core/timeconstants.h"
+#include "utilities/timeconstants.h"
 
 TagReaderTagParser::TagReaderTagParser() = default;
 
@@ -52,7 +53,7 @@ bool TagReaderTagParser::IsMediaFile(const QString &filename) const {
   qLog(Debug) << "Checking for valid file" << filename;
 
   QFileInfo fileinfo(filename);
-  if (!fileinfo.exists() || fileinfo.suffix().compare("bak", Qt::CaseInsensitive) == 0) return false;
+  if (!fileinfo.exists() || fileinfo.suffix().compare(QLatin1String("bak"), Qt::CaseInsensitive) == 0) return false;
 
   try {
     TagParser::MediaFileInfo taginfo;
@@ -79,7 +80,7 @@ bool TagReaderTagParser::IsMediaFile(const QString &filename) const {
     }
 
     const auto tracks = taginfo.tracks();
-    for (const auto track : tracks) {
+    for (TagParser::AbstractTrack *track : tracks) {
       if (track->mediaType() == TagParser::MediaType::Audio) {
         taginfo.close();
         return true;
@@ -93,25 +94,23 @@ bool TagReaderTagParser::IsMediaFile(const QString &filename) const {
 
 }
 
-bool TagReaderTagParser::ReadFile(const QString &filename, spb::tagreader::SongMetadata *song) const {
+TagReaderBase::Result TagReaderTagParser::ReadFile(const QString &filename, spb::tagreader::SongMetadata *song) const {
 
   qLog(Debug) << "Reading tags from" << filename;
 
   const QFileInfo fileinfo(filename);
 
-  if (!fileinfo.exists() || fileinfo.suffix().compare("bak", Qt::CaseInsensitive) == 0) return false;
+  if (!fileinfo.exists() || fileinfo.suffix().compare(QLatin1String("bak"), Qt::CaseInsensitive) == 0) return Result::ErrorCode::FileParseError;
 
   const QByteArray url(QUrl::fromLocalFile(filename).toEncoded());
+  const QByteArray basefilename = fileinfo.fileName().toUtf8();
 
-  song->set_basefilename(DataCommaSizeFromQString(fileinfo.fileName()));
+  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());
@@ -135,27 +134,27 @@ bool TagReaderTagParser::ReadFile(const QString &filename, spb::tagreader::SongM
     taginfo.parseContainerFormat(diag, progress);
     if (progress.isAborted()) {
       taginfo.close();
-      return false;
+      return Result::ErrorCode::FileParseError;
     }
 
     taginfo.parseTracks(diag, progress);
     if (progress.isAborted()) {
       taginfo.close();
-      return false;
+      return Result::ErrorCode::FileParseError;
     }
 
     taginfo.parseTags(diag, progress);
     if (progress.isAborted()) {
       taginfo.close();
-      return false;
+      return Result::ErrorCode::FileParseError;
     }
 
     for (const TagParser::DiagMessage &msg : diag) {
       qLog(Debug) << QString::fromStdString(msg.message());
     }
 
-    const auto tracks = taginfo.tracks();
-    for (const auto track : tracks) {
+    std::vector<TagParser::AbstractTrack*> tracks = taginfo.tracks();
+    for (TagParser::AbstractTrack *track : tracks) {
       switch (track->format().general) {
         case TagParser::GeneralMediaFormat::Flac:
           song->set_filetype(spb::tagreader::SongMetadata_FileType::SongMetadata_FileType_FLAC);
@@ -206,10 +205,10 @@ bool TagReaderTagParser::ReadFile(const QString &filename, spb::tagreader::SongM
 
     if (song->filetype() == spb::tagreader::SongMetadata_FileType::SongMetadata_FileType_UNKNOWN) {
       taginfo.close();
-      return false;
+      return Result::ErrorCode::Unsupported;
     }
 
-    for (const auto tag : taginfo.tags()) {
+    for (TagParser::Tag *tag : taginfo.tags()) {
       song->set_albumartist(tag->value(TagParser::KnownField::AlbumArtist).toString(TagParser::TagTextEncoding::Utf8));
       song->set_artist(tag->value(TagParser::KnownField::Artist).toString(TagParser::TagTextEncoding::Utf8));
       song->set_album(tag->value(TagParser::KnownField::Album).toString(TagParser::TagTextEncoding::Utf8));
@@ -225,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) {
@@ -247,20 +246,42 @@ bool TagReaderTagParser::ReadFile(const QString &filename, spb::tagreader::SongM
 
     taginfo.close();
 
-    return true;
+    return Result::ErrorCode::Success;
 
   }
   catch(...) {
-    return false;
+    return Result::ErrorCode::FileParseError;
   }
 
 }
 
-bool TagReaderTagParser::SaveFile(const QString &filename, const spb::tagreader::SongMetadata &song) const {
+TagReaderBase::Result TagReaderTagParser::WriteFile(const QString &filename, const spb::tagreader::WriteFileRequest &request) const {
 
-  if (filename.isEmpty()) return false;
+  if (request.filename().empty()) return Result::ErrorCode::FilenameMissing;
 
-  qLog(Debug) << "Saving tags to" << filename;
+  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();
+  const bool save_rating = request.has_save_rating() && request.save_rating();
+  const bool save_cover = request.has_save_cover() && request.save_cover();
+
+  QStringList save_tags_options;
+  if (save_tags) {
+    save_tags_options << QStringLiteral("tags");
+  }
+  if (save_playcount) {
+    save_tags_options << QStringLiteral("playcount");
+  }
+  if (save_rating) {
+    save_tags_options << QStringLiteral("rating");
+  }
+  if (save_cover) {
+    save_tags_options << QStringLiteral("embedded cover");
+  }
+
+  qLog(Debug) << "Saving" << save_tags_options.join(QLatin1String(", ")) << "to" << filename;
+
+  const Cover cover = LoadCoverFromRequest(filename, request);
 
   try {
     TagParser::MediaFileInfo taginfo;
@@ -276,41 +297,53 @@ bool TagReaderTagParser::SaveFile(const QString &filename, const spb::tagreader:
     taginfo.parseContainerFormat(diag, progress);
     if (progress.isAborted()) {
       taginfo.close();
-      return false;
+      return Result::ErrorCode::FileParseError;
     }
 
     taginfo.parseTracks(diag, progress);
     if (progress.isAborted()) {
       taginfo.close();
-      return false;
+      return Result::ErrorCode::FileParseError;
     }
 
     taginfo.parseTags(diag, progress);
     if (progress.isAborted()) {
       taginfo.close();
-      return false;
+      return Result::ErrorCode::FileParseError;
     }
 
     if (taginfo.tags().size() <= 0) {
       taginfo.createAppropriateTags();
     }
 
-    for (const auto tag : taginfo.tags()) {
-      tag->setValue(TagParser::KnownField::AlbumArtist, TagParser::TagValue(song.albumartist(), TagParser::TagTextEncoding::Utf8, tag->proposedTextEncoding()));
-      tag->setValue(TagParser::KnownField::Artist, TagParser::TagValue(song.artist(), TagParser::TagTextEncoding::Utf8, tag->proposedTextEncoding()));
-      tag->setValue(TagParser::KnownField::Album, TagParser::TagValue(song.album(), TagParser::TagTextEncoding::Utf8, tag->proposedTextEncoding()));
-      tag->setValue(TagParser::KnownField::Title, TagParser::TagValue(song.title(), TagParser::TagTextEncoding::Utf8, tag->proposedTextEncoding()));
-      tag->setValue(TagParser::KnownField::Genre, TagParser::TagValue(song.genre(), TagParser::TagTextEncoding::Utf8, tag->proposedTextEncoding()));
-      tag->setValue(TagParser::KnownField::Composer, TagParser::TagValue(song.composer(), TagParser::TagTextEncoding::Utf8, tag->proposedTextEncoding()));
-      tag->setValue(TagParser::KnownField::Performers, TagParser::TagValue(song.performer(), TagParser::TagTextEncoding::Utf8, tag->proposedTextEncoding()));
-      tag->setValue(TagParser::KnownField::Grouping, TagParser::TagValue(song.grouping(), TagParser::TagTextEncoding::Utf8, tag->proposedTextEncoding()));
-      tag->setValue(TagParser::KnownField::Comment, TagParser::TagValue(song.comment(), TagParser::TagTextEncoding::Utf8, tag->proposedTextEncoding()));
-      tag->setValue(TagParser::KnownField::Lyrics, TagParser::TagValue(song.lyrics(), TagParser::TagTextEncoding::Utf8, tag->proposedTextEncoding()));
-      tag->setValue(TagParser::KnownField::TrackPosition, TagParser::TagValue(song.track()));
-      tag->setValue(TagParser::KnownField::DiskPosition, TagParser::TagValue(song.disc()));
-      tag->setValue(TagParser::KnownField::RecordDate, TagParser::TagValue(song.year()));
-      tag->setValue(TagParser::KnownField::ReleaseDate, TagParser::TagValue(song.originalyear()));
+    for (TagParser::Tag *tag : taginfo.tags()) {
+      if (save_tags) {
+        tag->setValue(TagParser::KnownField::AlbumArtist, TagParser::TagValue(song.albumartist(), TagParser::TagTextEncoding::Utf8, tag->proposedTextEncoding()));
+        tag->setValue(TagParser::KnownField::Artist, TagParser::TagValue(song.artist(), TagParser::TagTextEncoding::Utf8, tag->proposedTextEncoding()));
+        tag->setValue(TagParser::KnownField::Album, TagParser::TagValue(song.album(), TagParser::TagTextEncoding::Utf8, tag->proposedTextEncoding()));
+        tag->setValue(TagParser::KnownField::Title, TagParser::TagValue(song.title(), TagParser::TagTextEncoding::Utf8, tag->proposedTextEncoding()));
+        tag->setValue(TagParser::KnownField::Genre, TagParser::TagValue(song.genre(), TagParser::TagTextEncoding::Utf8, tag->proposedTextEncoding()));
+        tag->setValue(TagParser::KnownField::Composer, TagParser::TagValue(song.composer(), TagParser::TagTextEncoding::Utf8, tag->proposedTextEncoding()));
+        tag->setValue(TagParser::KnownField::Performers, TagParser::TagValue(song.performer(), TagParser::TagTextEncoding::Utf8, tag->proposedTextEncoding()));
+        tag->setValue(TagParser::KnownField::Grouping, TagParser::TagValue(song.grouping(), TagParser::TagTextEncoding::Utf8, tag->proposedTextEncoding()));
+        tag->setValue(TagParser::KnownField::Comment, TagParser::TagValue(song.comment(), TagParser::TagTextEncoding::Utf8, tag->proposedTextEncoding()));
+        tag->setValue(TagParser::KnownField::Lyrics, TagParser::TagValue(song.lyrics(), TagParser::TagTextEncoding::Utf8, tag->proposedTextEncoding()));
+        tag->setValue(TagParser::KnownField::TrackPosition, TagParser::TagValue(song.track()));
+        tag->setValue(TagParser::KnownField::DiskPosition, TagParser::TagValue(song.disc()));
+        tag->setValue(TagParser::KnownField::RecordDate, TagParser::TagValue(song.year()));
+        tag->setValue(TagParser::KnownField::ReleaseDate, TagParser::TagValue(song.originalyear()));
+      }
+      if (save_playcount) {
+        SaveSongPlaycountToFile(tag, song.playcount());
+      }
+      if (save_rating) {
+        SaveSongRatingToFile(tag, song.rating());
+      }
+      if (save_cover) {
+        SaveEmbeddedArt(tag, cover.data);
+      }
     }
+
     taginfo.applyChanges(diag, progress);
     taginfo.close();
 
@@ -318,17 +351,17 @@ bool TagReaderTagParser::SaveFile(const QString &filename, const spb::tagreader:
       qLog(Debug) << QString::fromStdString(msg.message());
     }
 
-    return true;
+    return Result::ErrorCode::Success;
   }
   catch(...) {}
 
-  return false;
+  return Result::ErrorCode::FileParseError;
 
 }
 
-QByteArray TagReaderTagParser::LoadEmbeddedArt(const QString &filename) const {
+TagReaderBase::Result TagReaderTagParser::LoadEmbeddedArt(const QString &filename, QByteArray &data) const {
 
-  if (filename.isEmpty()) return QByteArray();
+  if (filename.isEmpty()) return Result::ErrorCode::FilenameMissing;
 
   qLog(Debug) << "Loading art from" << filename;
 
@@ -349,20 +382,20 @@ QByteArray TagReaderTagParser::LoadEmbeddedArt(const QString &filename) const {
     taginfo.parseContainerFormat(diag, progress);
     if (progress.isAborted()) {
       taginfo.close();
-      return QByteArray();
+      return Result::ErrorCode::FileParseError;
     }
 
     taginfo.parseTags(diag, progress);
     if (progress.isAborted()) {
       taginfo.close();
-      return QByteArray();
+      return Result::ErrorCode::FileParseError;
     }
 
-    for (const auto tag : taginfo.tags()) {
+    for (TagParser::Tag *tag : taginfo.tags()) {
       if (!tag->value(TagParser::KnownField::Cover).empty() && tag->value(TagParser::KnownField::Cover).dataSize() > 0) {
-        QByteArray data(tag->value(TagParser::KnownField::Cover).dataPointer(), tag->value(TagParser::KnownField::Cover).dataSize());
+        data = QByteArray(tag->value(TagParser::KnownField::Cover).dataPointer(), tag->value(TagParser::KnownField::Cover).dataSize());
         taginfo.close();
-        return data;
+        return Result::ErrorCode::Success;
       }
     }
 
@@ -375,16 +408,24 @@ QByteArray TagReaderTagParser::LoadEmbeddedArt(const QString &filename) const {
   }
   catch(...) {}
 
-  return QByteArray();
+  return Result::ErrorCode::FileParseError;
 
 }
 
-bool TagReaderTagParser::SaveEmbeddedArt(const QString &filename, const QByteArray &data) {
+void TagReaderTagParser::SaveEmbeddedArt(TagParser::Tag *tag, const QByteArray &data) const {
 
-  if (filename.isEmpty()) return false;
+  tag->setValue(TagParser::KnownField::Cover, TagParser::TagValue(data.toStdString()));
+
+}
+
+TagReaderBase::Result TagReaderTagParser::SaveEmbeddedArt(const QString &filename, const spb::tagreader::SaveEmbeddedArtRequest &request) const {
+
+  if (request.filename().empty()) return Result::ErrorCode::FilenameMissing;
 
   qLog(Debug) << "Saving art to" << filename;
 
+  const Cover cover = LoadCoverFromRequest(filename, request);
+
   try {
 
     TagParser::MediaFileInfo taginfo;
@@ -402,21 +443,21 @@ bool TagReaderTagParser::SaveEmbeddedArt(const QString &filename, const QByteArr
     taginfo.parseContainerFormat(diag, progress);
     if (progress.isAborted()) {
       taginfo.close();
-      return false;
+      return Result::ErrorCode::FileParseError;
     }
 
     taginfo.parseTags(diag, progress);
     if (progress.isAborted()) {
       taginfo.close();
-      return false;
+      return Result::ErrorCode::FileParseError;
     }
 
     if (taginfo.tags().size() <= 0) {
       taginfo.createAppropriateTags();
     }
 
-    for (const auto tag : taginfo.tags()) {
-      tag->setValue(TagParser::KnownField::Cover, TagParser::TagValue(data.toStdString()));
+    for (TagParser::Tag *tag : taginfo.tags()) {
+      SaveEmbeddedArt(tag, cover.data);
     }
 
     taginfo.applyChanges(diag, progress);
@@ -426,20 +467,40 @@ bool TagReaderTagParser::SaveEmbeddedArt(const QString &filename, const QByteArr
       qLog(Debug) << QString::fromStdString(msg.message());
     }
 
-    return true;
+    return Result::ErrorCode::Success;
 
   }
   catch(...) {}
 
-  return false;
+  return Result::ErrorCode::FileParseError;
 
 }
 
-bool TagReaderTagParser::SaveSongPlaycountToFile(const QString&, const spb::tagreader::SongMetadata&) const { return false; }
+void TagReaderTagParser::SaveSongPlaycountToFile(TagParser::Tag *tag, const uint playcount) const {
 
-bool TagReaderTagParser::SaveSongRatingToFile(const QString &filename, const spb::tagreader::SongMetadata &song) const {
+  Q_UNUSED(tag);
+  Q_UNUSED(playcount);
 
-    if (filename.isEmpty()) return false;
+}
+
+TagReaderBase::Result TagReaderTagParser::SaveSongPlaycountToFile(const QString &filename, const uint playcount) const {
+
+  Q_UNUSED(filename);
+  Q_UNUSED(playcount);
+
+  return Result::ErrorCode::Unsupported;
+
+}
+
+void TagReaderTagParser::SaveSongRatingToFile(TagParser::Tag *tag, const float rating) const {
+
+  tag->setValue(TagParser::KnownField::Rating, TagParser::TagValue(ConvertToPOPMRating(rating)));
+
+}
+
+TagReaderBase::Result TagReaderTagParser::SaveSongRatingToFile(const QString &filename, const float rating) const {
+
+    if (filename.isEmpty()) return Result::ErrorCode::FilenameMissing;
 
     qLog(Debug) << "Saving song rating to" << filename;
 
@@ -457,28 +518,29 @@ bool TagReaderTagParser::SaveSongRatingToFile(const QString &filename, const spb
       taginfo.parseContainerFormat(diag, progress);
       if (progress.isAborted()) {
         taginfo.close();
-        return false;
+        return Result::ErrorCode::FileParseError;
       }
 
       taginfo.parseTracks(diag, progress);
       if (progress.isAborted()) {
         taginfo.close();
-        return false;
+        return Result::ErrorCode::FileParseError;
       }
 
       taginfo.parseTags(diag, progress);
       if (progress.isAborted()) {
         taginfo.close();
-        return false;
+        return Result::ErrorCode::FileParseError;
       }
 
       if (taginfo.tags().size() <= 0) {
         taginfo.createAppropriateTags();
       }
 
-      for (const auto tag : taginfo.tags()) {
-        tag->setValue(TagParser::KnownField::Rating, TagParser::TagValue(ConvertToPOPMRating(song.rating())));
+      for (TagParser::Tag *tag : taginfo.tags()) {
+        SaveSongRatingToFile(tag, rating);
       }
+
       taginfo.applyChanges(diag, progress);
       taginfo.close();
 
@@ -486,10 +548,10 @@ bool TagReaderTagParser::SaveSongRatingToFile(const QString &filename, const spb
         qLog(Debug) << QString::fromStdString(msg.message());
       }
 
-      return true;
+      return Result::ErrorCode::Success;
     }
     catch(...) {}
 
-    return false;
+    return Result::ErrorCode::FileParseError;
 
 }

ext/libstrawberry-tagreader/tagreadertagparser.h

@@ -1,5 +1,5 @@
 /* This file is part of Strawberry.
-   Copyright 2021, Jonas Kvinge <jonas@jkvinge.net>
+   Copyright 2021-2024, 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
@@ -22,6 +22,8 @@
 
 #include <string>
 
+#include <tagparser/tag.h>
+
 #include <QByteArray>
 #include <QString>
 
@@ -39,15 +41,21 @@ class TagReaderTagParser : public TagReaderBase {
 
   bool IsMediaFile(const QString &filename) const override;
 
-  bool ReadFile(const QString &filename, spb::tagreader::SongMetadata *song) const override;
-  bool SaveFile(const QString &filename, const spb::tagreader::SongMetadata &song) const override;
+  Result ReadFile(const QString &filename, spb::tagreader::SongMetadata *song) const override;
+  Result WriteFile(const QString &filename, const spb::tagreader::WriteFileRequest &request) const override;
 
-  QByteArray LoadEmbeddedArt(const QString &filename) const override;
-  bool SaveEmbeddedArt(const QString &filename, const QByteArray &data) override;
+  Result LoadEmbeddedArt(const QString &filename, QByteArray &data) const override;
+  Result SaveEmbeddedArt(const QString &filename, const spb::tagreader::SaveEmbeddedArtRequest &request) const override;
 
-  bool SaveSongPlaycountToFile(const QString &filename, const spb::tagreader::SongMetadata &song) const override;
-  bool SaveSongRatingToFile(const QString &filename, const spb::tagreader::SongMetadata &song) const override;
+  Result SaveSongPlaycountToFile(const QString &filename, const uint playcount) const override;
+  Result SaveSongRatingToFile(const QString &filename, const float rating) const override;
 
+ private:
+  void SaveSongPlaycountToFile(TagParser::Tag *tag, const uint playcount) const;
+  void SaveSongRatingToFile(TagParser::Tag *tag, const float rating) const;
+  void SaveEmbeddedArt(TagParser::Tag *tag, const QByteArray &data) const;
+
+ public:
   Q_DISABLE_COPY(TagReaderTagParser)
 };
 

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

@@ -9,11 +9,11 @@ qt_wrap_cpp(MOC ${HEADERS})
 
 link_directories(${GLIB_LIBRARY_DIRS})
 
-if(USE_TAGLIB AND TAGLIB_FOUND)
+if(HAVE_TAGLIB)
   link_directories(${TAGLIB_LIBRARY_DIRS})
 endif()
 
-if(USE_TAGPARSER AND TAGPARSER_FOUND)
+if(HAVE_TAGPARSER)
   link_directories(${TAGPARSER_LIBRARY_DIRS})
 endif()
 
@@ -33,18 +33,18 @@ 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
 )
 
-if(USE_TAGLIB AND TAGLIB_FOUND)
+if(HAVE_TAGLIB)
   target_include_directories(strawberry-tagreader SYSTEM PRIVATE ${TAGLIB_INCLUDE_DIRS})
   target_link_libraries(strawberry-tagreader PRIVATE ${TAGLIB_LIBRARIES})
 endif()
 
-if(USE_TAGPARSER AND TAGPARSER_FOUND)
+if(HAVE_TAGPARSER)
   target_include_directories(strawberry-tagreader SYSTEM PRIVATE ${TAGPARSER_INCLUDE_DIRS})
   target_link_libraries(strawberry-tagreader PRIVATE ${TAGPARSER_LIBRARIES})
 endif()

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

@@ -1,6 +1,6 @@
 /* This file is part of Strawberry.
    Copyright 2011, David Sansome <me@davidsansome.com>
-   Copyright 2018-2021, Jonas Kvinge <jonas@jkvinge.net>
+   Copyright 2018-2024, Jonas Kvinge <jonas@jkvinge.net>
 
    Strawberry is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,6 +18,7 @@
 
 #include "config.h"
 
+#include <memory>
 #include <string>
 
 #include <QCoreApplication>
@@ -27,20 +28,37 @@
 
 #include "tagreaderworker.h"
 
+#ifdef HAVE_TAGLIB
+#  include "tagreadertaglib.h"
+#  include "tagreadergme.h"
+#endif
+
+#ifdef HAVE_TAGPARSER
+#  include "tagreadertagparser.h"
+#endif
+
+using std::make_shared;
+using std::shared_ptr;
+
 TagReaderWorker::TagReaderWorker(QIODevice *socket, QObject *parent)
-    : AbstractMessageHandler<spb::tagreader::Message>(socket, parent) {}
+    : AbstractMessageHandler<spb::tagreader::Message>(socket, parent) {
+
+#ifdef HAVE_TAGLIB
+  tagreaders_ << make_shared<TagReaderTagLib>();
+  tagreaders_ << make_shared<TagReaderGME>();
+#endif
+
+#ifdef HAVE_TAGPARSER
+  tagreaders_ << make_shared<TagReaderTagParser>();
+#endif
+
+}
 
 void TagReaderWorker::MessageArrived(const spb::tagreader::Message &message) {
 
   spb::tagreader::Message reply;
 
-  bool success = HandleMessage(message, reply, &tag_reader_);
-  if (!success) {
-#if defined(USE_TAGLIB)
-    HandleMessage(message, reply, &tag_reader_gme_);
-#endif
-  }
-
+  HandleMessage(message, reply);
   SendReply(message, &reply);
 
 }
@@ -53,43 +71,123 @@ void TagReaderWorker::DeviceClosed() {
 
 }
 
-bool TagReaderWorker::HandleMessage(const spb::tagreader::Message &message, spb::tagreader::Message &reply, TagReaderBase *reader) {
+void TagReaderWorker::HandleMessage(const spb::tagreader::Message &message, spb::tagreader::Message &reply) {
 
-  if (message.has_is_media_file_request()) {
-    bool success = reader->IsMediaFile(QStringFromStdString(message.is_media_file_request().filename()));
-    reply.mutable_is_media_file_response()->set_success(success);
-    return success;
-  }
-  else if (message.has_read_file_request()) {
-    bool success = reader->ReadFile(QStringFromStdString(message.read_file_request().filename()), reply.mutable_read_file_response()->mutable_metadata());
-    return success;
-  }
-  else if (message.has_save_file_request()) {
-    bool success = reader->SaveFile(QStringFromStdString(message.save_file_request().filename()), message.save_file_request().metadata());
-    reply.mutable_save_file_response()->set_success(success);
-    return success;
-  }
-  else if (message.has_load_embedded_art_request()) {
-    QByteArray data = reader->LoadEmbeddedArt(QStringFromStdString(message.load_embedded_art_request().filename()));
-    reply.mutable_load_embedded_art_response()->set_data(data.constData(), data.size());
-    return true;
-  }
-  else if (message.has_save_embedded_art_request()) {
-    bool success = reader->SaveEmbeddedArt(QStringFromStdString(message.save_embedded_art_request().filename()), QByteArray(message.save_embedded_art_request().data().data(), static_cast<qint64>(message.save_embedded_art_request().data().size())));
-    reply.mutable_save_embedded_art_response()->set_success(success);
-    return success;
-  }
-  else if (message.has_save_song_playcount_to_file_request()) {
-    bool success = reader->SaveSongPlaycountToFile(QStringFromStdString(message.save_song_playcount_to_file_request().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()) {
-    bool success = reader->SaveSongRatingToFile(QStringFromStdString(message.save_song_rating_to_file_request().filename()), message.save_song_rating_to_file_request().metadata());
-    reply.mutable_save_song_rating_to_file_response()->set_success(success);
-    return success;
-  }
+  for (shared_ptr<TagReaderBase> reader : tagreaders_) {
 
-  return false;
+    if (message.has_is_media_file_request()) {
+      const QString filename = QString::fromStdString(message.is_media_file_request().filename());
+      const bool success = reader->IsMediaFile(filename);
+      reply.mutable_is_media_file_response()->set_success(success);
+      if (success) {
+        return;
+      }
+    }
+    if (message.has_read_file_request()) {
+      const QString filename = QString::fromStdString(message.read_file_request().filename());
+      spb::tagreader::ReadFileResponse *response = reply.mutable_read_file_response();
+      const TagReaderBase::Result result = reader->ReadFile(filename, response->mutable_metadata());
+      response->set_success(result.success());
+      if (result.success()) {
+        if (response->has_error()) {
+          response->clear_error();
+        }
+        return;
+      }
+      else {
+        if (!response->has_error()) {
+          response->set_error(TagReaderBase::ErrorString(result).toStdString());
+        }
+      }
+    }
+    if (message.has_write_file_request()) {
+      const QString filename = QString::fromStdString(message.write_file_request().filename());
+      const TagReaderBase::Result result = reader->WriteFile(filename, message.write_file_request());
+      spb::tagreader::WriteFileResponse *response = reply.mutable_write_file_response();
+      response->set_success(result.success());
+      if (result.success()) {
+        if (response->has_error()) {
+          response->clear_error();
+        }
+        return;
+      }
+      else {
+        if (!response->has_error()) {
+          response->set_error(TagReaderBase::ErrorString(result).toStdString());
+        }
+      }
+    }
+    if (message.has_load_embedded_art_request()) {
+      const QString filename = QString::fromStdString(message.load_embedded_art_request().filename());
+      QByteArray data;
+      const TagReaderBase::Result result = reader->LoadEmbeddedArt(filename, data);
+      spb::tagreader::LoadEmbeddedArtResponse *response = reply.mutable_load_embedded_art_response();
+      response->set_success(result.success());
+      if (result.success()) {
+        response->set_data(data.toStdString());
+        if (response->has_error()) {
+          response->clear_error();
+        }
+        return;
+      }
+      else {
+        if (!response->has_error()) {
+          response->set_error(TagReaderBase::ErrorString(result).toStdString());
+        }
+      }
+    }
+    if (message.has_save_embedded_art_request()) {
+      const QString filename = QString::fromStdString(message.save_embedded_art_request().filename());
+      const TagReaderBase::Result result = reader->SaveEmbeddedArt(filename, message.save_embedded_art_request());
+      spb::tagreader::SaveEmbeddedArtResponse *response = reply.mutable_save_embedded_art_response();
+      response->set_success(result.success());
+      if (result.success()) {
+        if (response->has_error()) {
+          response->clear_error();
+        }
+        return;
+      }
+      else {
+        if (!response->has_error()) {
+          response->set_error(TagReaderBase::ErrorString(result).toStdString());
+        }
+      }
+    }
+    if (message.has_save_song_playcount_to_file_request()) {
+      const QString filename = QString::fromStdString(message.save_song_playcount_to_file_request().filename());
+      const TagReaderBase::Result result = reader->SaveSongPlaycountToFile(filename, message.save_song_playcount_to_file_request().playcount());
+      spb::tagreader::SaveSongPlaycountToFileResponse *response = reply.mutable_save_song_playcount_to_file_response();
+      response->set_success(result.success());
+      if (result.success()) {
+        if (response->has_error()) {
+          response->clear_error();
+        }
+        return;
+      }
+      else {
+        if (!response->has_error()) {
+          response->set_error(TagReaderBase::ErrorString(result).toStdString());
+        }
+      }
+    }
+    if (message.has_save_song_rating_to_file_request()) {
+      const QString filename = QString::fromStdString(message.save_song_rating_to_file_request().filename());
+      const TagReaderBase::Result result = reader->SaveSongRatingToFile(filename, message.save_song_rating_to_file_request().rating());
+      spb::tagreader::SaveSongRatingToFileResponse *response = reply.mutable_save_song_rating_to_file_response();
+      response->set_success(result.success());
+      if (result.success()) {
+        if (response->has_error()) {
+          response->clear_error();
+        }
+        return;
+      }
+      else {
+        if (!response->has_error()) {
+          response->set_error(TagReaderBase::ErrorString(result).toStdString());
+        }
+      }
+    }
+
+  }
 
 }

ext/strawberry-tagreader/tagreaderworker.h

@@ -1,6 +1,6 @@
 /* This file is part of Strawberry.
    Copyright 2011, David Sansome <me@davidsansome.com>
-   Copyright 2018-2021, Jonas Kvinge <jonas@jkvinge.net>
+   Copyright 2018-2024, 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
@@ -21,19 +21,19 @@
 
 #include "config.h"
 
+#include <memory>
+
 #include <QObject>
+#include <QList>
 
 #include "core/messagehandler.h"
-#if defined(USE_TAGLIB)
-#  include "tagreadertaglib.h"
-#  include "tagreadergme.h"
-#elif defined(USE_TAGPARSER)
-#  include "tagreadertagparser.h"
-#endif
 
 #include "tagreadermessages.pb.h"
 
 class QIODevice;
+class TagReaderBase;
+
+using std::shared_ptr;
 
 class TagReaderWorker : public AbstractMessageHandler<spb::tagreader::Message> {
   Q_OBJECT
@@ -46,15 +46,9 @@ class TagReaderWorker : public AbstractMessageHandler<spb::tagreader::Message> {
   void DeviceClosed() override;
 
  private:
-  // Handle message using specific TagReaderBase implementation. Returns true on successful message handle.
-  bool HandleMessage(const spb::tagreader::Message &message, spb::tagreader::Message &reply, TagReaderBase* reader);
+  void HandleMessage(const spb::tagreader::Message &message, spb::tagreader::Message &reply);
 
-#if defined(USE_TAGLIB)
-  TagReaderTagLib tag_reader_;
-  TagReaderGME tag_reader_gme_;
-#elif defined(USE_TAGPARSER)
-  TagReaderTagParser tag_reader_;
-#endif
+  QList<shared_ptr<TagReaderBase>> tagreaders_;
 };
 
 #endif  // TAGREADERWORKER_H

src/CMakeLists.txt

@@ -24,6 +24,7 @@ set(SOURCES
   core/networktimeouts.cpp
   core/networkproxyfactory.cpp
   core/qtfslistener.cpp
+  core/settings.cpp
   core/settingsprovider.cpp
   core/signalchecker.cpp
   core/song.cpp
@@ -39,7 +40,7 @@ set(SOURCES
   core/scopedtransaction.cpp
   core/translations.cpp
   core/systemtrayicon.cpp
-
+  core/localredirectserver.cpp
   utilities/strutils.cpp
   utilities/envutils.cpp
   utilities/colorutils.cpp
@@ -55,17 +56,25 @@ set(SOURCES
   utilities/transliterate.cpp
   utilities/xmlutils.cpp
   utilities/filemanagerutils.cpp
+  utilities/coverutils.cpp
+  utilities/screenutils.cpp
+  utilities/searchparserutils.cpp
+  utilities/textencodingutils.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
   analyzer/analyzercontainer.cpp
   analyzer/blockanalyzer.cpp
   analyzer/boomanalyzer.cpp
+  analyzer/turbineanalyzer.cpp
+  analyzer/sonogramanalyzer.cpp
+  analyzer/waverubberanalyzer.cpp
   analyzer/rainbowanalyzer.cpp
 
   equalizer/equalizer.cpp
@@ -84,12 +93,14 @@ set(SOURCES
   collection/collectiondirectorymodel.cpp
   collection/collectionfilteroptions.cpp
   collection/collectionfilterwidget.cpp
+  collection/collectionfilter.cpp
   collection/collectionplaylistitem.cpp
   collection/collectionquery.cpp
   collection/collectionqueryoptions.cpp
   collection/savedgroupingmanager.cpp
   collection/groupbydialog.cpp
   collection/collectiontask.cpp
+  collection/collectionmodelupdate.cpp
 
   playlist/playlist.cpp
   playlist/playlistbackend.cpp
@@ -108,6 +119,7 @@ set(SOURCES
   playlist/playlisttabbar.cpp
   playlist/playlistundocommands.cpp
   playlist/playlistview.cpp
+  playlist/playlistproxystyle.cpp
   playlist/songloaderinserter.cpp
   playlist/songplaylistitem.cpp
   playlist/dynamicplaylistcontrols.cpp
@@ -143,6 +155,7 @@ set(SOURCES
   covermanager/albumcovermanager.cpp
   covermanager/albumcovermanagerlist.cpp
   covermanager/albumcoverloader.cpp
+  covermanager/albumcoverloaderoptions.cpp
   covermanager/albumcoverfetcher.cpp
   covermanager/albumcoverfetchersearch.cpp
   covermanager/albumcoversearcher.cpp
@@ -163,19 +176,25 @@ set(SOURCES
   covermanager/deezercoverprovider.cpp
   covermanager/qobuzcoverprovider.cpp
   covermanager/musixmatchcoverprovider.cpp
-  covermanager/spotifycoverprovider.cpp
+  covermanager/opentidalcoverprovider.cpp
 
   lyrics/lyricsproviders.cpp
   lyrics/lyricsprovider.cpp
+  lyrics/lyricssearchrequest.h
+  lyrics/lyricssearchresult.h
   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/songlyricscomlyricsprovider.cpp
+  lyrics/azlyricscomlyricsprovider.cpp
+  lyrics/elyricsnetlyricsprovider.cpp
+  lyrics/letraslyricsprovider.cpp
 
   providers/musixmatchprovider.cpp
 
@@ -183,6 +202,7 @@ set(SOURCES
   settings/settingspage.cpp
   settings/behavioursettingspage.cpp
   settings/collectionsettingspage.cpp
+  settings/collectionsettingsdirectorymodel.cpp
   settings/backendsettingspage.cpp
   settings/playlistsettingspage.cpp
   settings/scrobblersettingspage.cpp
@@ -202,6 +222,7 @@ set(SOURCES
   dialogs/userpassdialog.cpp
   dialogs/deleteconfirmationdialog.cpp
   dialogs/lastfmimportdialog.cpp
+  dialogs/messagedialog.cpp
   dialogs/snapdialog.cpp
   dialogs/saveplaylistsdialog.cpp
 
@@ -235,19 +256,18 @@ set(SOURCES
   osd/osdbase.cpp
   osd/osdpretty.cpp
 
-  internet/internetservices.cpp
-  internet/internetservice.cpp
-  internet/internetplaylistitem.cpp
-  internet/internetsearchview.cpp
-  internet/internetsearchmodel.cpp
-  internet/internetsearchsortmodel.cpp
-  internet/internetsearchitemdelegate.cpp
-  internet/localredirectserver.cpp
-  internet/internetsongsview.cpp
-  internet/internettabsview.cpp
-  internet/internetcollectionview.cpp
-  internet/internetcollectionviewcontainer.cpp
-  internet/internetsearchview.cpp
+  streaming/streamingservices.cpp
+  streaming/streamingservice.cpp
+  streaming/streamplaylistitem.cpp
+  streaming/streamingsearchview.cpp
+  streaming/streamingsearchmodel.cpp
+  streaming/streamingsearchsortmodel.cpp
+  streaming/streamingsearchitemdelegate.cpp
+  streaming/streamingsongsview.cpp
+  streaming/streamingtabsview.cpp
+  streaming/streamingcollectionview.cpp
+  streaming/streamingcollectionviewcontainer.cpp
+  streaming/streamingsearchview.cpp
 
   radios/radioservices.cpp
   radios/radiobackend.cpp
@@ -261,10 +281,11 @@ set(SOURCES
   radios/radioparadiseservice.cpp
 
   scrobbler/audioscrobbler.cpp
-  scrobbler/scrobblerservices.cpp
+  scrobbler/scrobblersettings.cpp
   scrobbler/scrobblerservice.cpp
   scrobbler/scrobblercache.cpp
   scrobbler/scrobblercacheitem.cpp
+  scrobbler/scrobblemetadata.cpp
   scrobbler/scrobblingapi20.cpp
   scrobbler/lastfmscrobbler.cpp
   scrobbler/librefmscrobbler.cpp
@@ -291,6 +312,7 @@ set(HEADERS
   core/threadsafenetworkdiskcache.h
   core/networktimeouts.h
   core/qtfslistener.h
+  core/settings.h
   core/songloader.h
   core/tagreaderclient.h
   core/taskmanager.h
@@ -301,6 +323,7 @@ set(HEADERS
   core/potranslator.h
   core/mimedata.h
   core/stylesheetloader.h
+  core/localredirectserver.h
 
   engine/enginebase.h
   engine/devicefinders.h
@@ -309,6 +332,9 @@ set(HEADERS
   analyzer/analyzercontainer.h
   analyzer/blockanalyzer.h
   analyzer/boomanalyzer.h
+  analyzer/turbineanalyzer.h
+  analyzer/sonogramanalyzer.h
+  analyzer/waverubberanalyzer.h
   analyzer/rainbowanalyzer.h
 
   equalizer/equalizer.h
@@ -326,6 +352,7 @@ set(HEADERS
   collection/collectionviewcontainer.h
   collection/collectiondirectorymodel.h
   collection/collectionfilterwidget.h
+  collection/collectionfilter.h
   collection/savedgroupingmanager.h
   collection/groupbydialog.h
 
@@ -344,6 +371,7 @@ set(HEADERS
   playlist/playlistsequence.h
   playlist/playlisttabbar.h
   playlist/playlistview.h
+  playlist/playlistproxystyle.h
   playlist/playlistitemmimedata.h
   playlist/songloaderinserter.h
   playlist/songmimedata.h
@@ -398,24 +426,29 @@ set(HEADERS
   covermanager/deezercoverprovider.h
   covermanager/qobuzcoverprovider.h
   covermanager/musixmatchcoverprovider.h
-  covermanager/spotifycoverprovider.h
+  covermanager/opentidalcoverprovider.h
 
   lyrics/lyricsproviders.h
   lyrics/lyricsprovider.h
   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/songlyricscomlyricsprovider.h
+  lyrics/azlyricscomlyricsprovider.h
+  lyrics/elyricsnetlyricsprovider.h
+  lyrics/letraslyricsprovider.h
 
   settings/settingsdialog.h
   settings/settingspage.h
   settings/behavioursettingspage.h
   settings/collectionsettingspage.h
+  settings/collectionsettingsdirectorymodel.h
   settings/backendsettingspage.h
   settings/playlistsettingspage.h
   settings/scrobblersettingspage.h
@@ -435,6 +468,7 @@ set(HEADERS
   dialogs/userpassdialog.h
   dialogs/deleteconfirmationdialog.h
   dialogs/lastfmimportdialog.h
+  dialogs/messagedialog.h
   dialogs/snapdialog.h
   dialogs/saveplaylistsdialog.h
 
@@ -464,22 +498,22 @@ set(HEADERS
   widgets/qsearchfield.h
   widgets/ratingwidget.h
   widgets/forcescrollperpixel.h
+  widgets/resizabletextedit.h
 
   osd/osdbase.h
   osd/osdpretty.h
 
-  internet/internetservices.h
-  internet/internetservice.h
-  internet/internetsongmimedata.h
-  internet/internetsearchmodel.h
-  internet/internetsearchsortmodel.h
-  internet/internetsearchitemdelegate.h
-  internet/internetsearchview.h
-  internet/localredirectserver.h
-  internet/internetsongsview.h
-  internet/internettabsview.h
-  internet/internetcollectionview.h
-  internet/internetcollectionviewcontainer.h
+  streaming/streamingservices.h
+  streaming/streamingservice.h
+  streaming/streamsongmimedata.h
+  streaming/streamingsearchmodel.h
+  streaming/streamingsearchsortmodel.h
+  streaming/streamingsearchitemdelegate.h
+  streaming/streamingsearchview.h
+  streaming/streamingsongsview.h
+  streaming/streamingtabsview.h
+  streaming/streamingcollectionview.h
+  streaming/streamingcollectionviewcontainer.h
 
   radios/radioservices.h
   radios/radiobackend.h
@@ -492,10 +526,9 @@ set(HEADERS
   radios/radioparadiseservice.h
 
   scrobbler/audioscrobbler.h
-  scrobbler/scrobblerservices.h
+  scrobbler/scrobblersettings.h
   scrobbler/scrobblerservice.h
   scrobbler/scrobblercache.h
-  scrobbler/scrobblercacheitem.h
   scrobbler/scrobblingapi20.h
   scrobbler/lastfmscrobbler.h
   scrobbler/librefmscrobbler.h
@@ -562,7 +595,7 @@ set(UI
   dialogs/addstreamdialog.ui
   dialogs/userpassdialog.ui
   dialogs/lastfmimportdialog.ui
-  dialogs/snapdialog.ui
+  dialogs/messagedialog.ui
   dialogs/saveplaylistsdialog.ui
 
   widgets/trackslider.ui
@@ -571,9 +604,9 @@ set(UI
 
   osd/osdpretty.ui
 
-  internet/internettabsview.ui
-  internet/internetcollectionviewcontainer.ui
-  internet/internetsearchview.ui
+  streaming/streamingtabsview.ui
+  streaming/streamingcollectionviewcontainer.ui
+  streaming/streamingsearchview.ui
 
   radios/radioviewcontainer.ui
 
@@ -583,7 +616,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)
 
@@ -830,6 +862,7 @@ optional_source(WIN32
   HEADERS
     core/windows7thumbbar.h
 )
+optional_source(MSVC SOURCES engine/uwpdevicefinder.cpp engine/asiodevicefinder.cpp)
 
 optional_source(HAVE_SUBSONIC
   SOURCES
@@ -875,6 +908,25 @@ optional_source(HAVE_TIDAL
     settings/tidalsettingspage.ui
 )
 
+optional_source(HAVE_SPOTIFY
+  SOURCES
+    spotify/spotifyservice.cpp
+    spotify/spotifybaserequest.cpp
+    spotify/spotifyrequest.cpp
+    spotify/spotifyfavoriterequest.cpp
+    settings/spotifysettingspage.cpp
+    covermanager/spotifycoverprovider.cpp
+  HEADERS
+    spotify/spotifyservice.h
+    spotify/spotifybaserequest.h
+    spotify/spotifyrequest.h
+    spotify/spotifyfavoriterequest.h
+    settings/spotifysettingspage.h
+    covermanager/spotifycoverprovider.h
+  UI
+    settings/spotifysettingspage.ui
+)
+
 optional_source(HAVE_QOBUZ
   SOURCES
     qobuz/qobuzservice.cpp
@@ -918,6 +970,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)
 
@@ -949,8 +1006,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)
 
@@ -960,18 +1016,12 @@ 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}
+  ${ICU_LIBRARY_DIRS}
 )
 
-if(HAVE_ICU)
-  link_directories(${ICU_LIBRARY_DIRS})
-else()
-  link_directories(${Iconv_LIBRARY_DIRS})
-endif()
-
 if(HAVE_ALSA)
   link_directories(${ALSA_LIBRARY_DIRS})
 endif()
@@ -1027,11 +1077,11 @@ if(HAVE_LIBMTP)
   link_directories(${LIBMTP_LIBRARY_DIRS})
 endif()
 
-if(USE_TAGLIB AND TAGLIB_FOUND)
+if(HAVE_TAGLIB)
   link_directories(${TAGLIB_LIBRARY_DIRS})
 endif()
 
-if(USE_TAGPARSER AND TAGPARSER_FOUND)
+if(HAVE_TAGPARSER)
   link_directories(${TAGPARSER_LIBRARY_DIRS})
 endif()
 
@@ -1053,9 +1103,9 @@ 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}
+  ${ICU_INCLUDE_DIRS}
 )
 
 if(HAVE_QPA_QPLATFORMNATIVEINTERFACE_H)
@@ -1071,31 +1121,32 @@ 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}
+  ${ICU_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_ICU)
-  target_include_directories(strawberry_lib SYSTEM PRIVATE ${ICU_INCLUDE_DIRS})
-  target_link_libraries(strawberry_lib PRIVATE ${ICU_LIBRARIES})
-else()
-  if(FREEBSD AND NOT Iconv_LIBRARIES)
-    set(Iconv_LIBRARIES iconv)
-  endif()
-  target_include_directories(strawberry_lib SYSTEM PRIVATE ${Iconv_INCLUDE_DIRS})
-  target_link_libraries(strawberry_lib PRIVATE ${Iconv_LIBRARIES})
+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_ALSA)
@@ -1141,6 +1192,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})
@@ -1192,13 +1247,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,10 +85,10 @@ 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()) {
+  if (static_cast<quint64>(aux.size()) >= scope.size()) {
     std::copy(scope.begin(), scope.end(), aux.begin());
   }
   else {
@@ -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::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::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

@@ -39,11 +39,15 @@
 #include "analyzerbase.h"
 #include "blockanalyzer.h"
 #include "boomanalyzer.h"
+#include "turbineanalyzer.h"
+#include "sonogramanalyzer.h"
+#include "waverubberanalyzer.h"
 #include "rainbowanalyzer.h"
 
 #include "core/logging.h"
+#include "core/shared_ptr.h"
+#include "core/settings.h"
 #include "engine/enginebase.h"
-#include "engine/enginetype.h"
 
 using namespace std::chrono_literals;
 
@@ -51,10 +55,12 @@ const char *AnalyzerContainer::kSettingsGroup = "Analyzer";
 const char *AnalyzerContainer::kSettingsFramerate = "framerate";
 
 // Framerates
-const int AnalyzerContainer::kLowFramerate = 20;
-const int AnalyzerContainer::kMediumFramerate = 25;
-const int AnalyzerContainer::kHighFramerate = 30;
-const int AnalyzerContainer::kSuperHighFramerate = 60;
+namespace {
+constexpr int kLowFramerate = 20;
+constexpr int kMediumFramerate = 25;
+constexpr int kHighFramerate = 30;
+constexpr int kSuperHighFramerate = 60;
+} // namespace
 
 AnalyzerContainer::AnalyzerContainer(QWidget *parent)
     : QWidget(parent),
@@ -83,8 +89,11 @@ AnalyzerContainer::AnalyzerContainer(QWidget *parent)
 
   AddAnalyzerType<BlockAnalyzer>();
   AddAnalyzerType<BoomAnalyzer>();
-  AddAnalyzerType<Rainbow::NyanCatAnalyzer>();
-  AddAnalyzerType<Rainbow::RainbowDashAnalyzer>();
+  AddAnalyzerType<TurbineAnalyzer>();
+  AddAnalyzerType<SonogramAnalyzer>();
+  AddAnalyzerType<WaveRubberAnalyzer>();
+  AddAnalyzerType<RainbowDashAnalyzer>();
+  AddAnalyzerType<NyanCatAnalyzer>();
 
   disable_action_ = context_menu_->addAction(tr("No analyzer"), this, &AnalyzerContainer::DisableAnalyzer);
   disable_action_->setCheckable(true);
@@ -102,7 +111,7 @@ AnalyzerContainer::AnalyzerContainer(QWidget *parent)
 
 void AnalyzerContainer::mouseReleaseEvent(QMouseEvent *e) {
 
-  if (engine_->type() != Engine::EngineType::GStreamer) {
+  if (engine_->type() != EngineBase::Type::GStreamer) {
     return;
   }
 
@@ -124,7 +133,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;
@@ -148,7 +157,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_;
@@ -176,9 +185,9 @@ void AnalyzerContainer::ChangeFramerate(int new_framerate) {
 
 void AnalyzerContainer::Load() {
 
-  QSettings s;
+  Settings s;
   s.beginGroup(kSettingsGroup);
-  QString type = s.value("type", "BlockAnalyzer").toString();
+  QString type = s.value("type", QStringLiteral("BlockAnalyzer")).toString();
   current_framerate_ = s.value(kSettingsFramerate, kMediumFramerate).toInt();
   s.endGroup();
 
@@ -189,7 +198,7 @@ void AnalyzerContainer::Load() {
   }
   else {
     for (int i = 0; i < analyzer_types_.count(); ++i) {
-      if (type == analyzer_types_[i]->className()) {
+      if (type == QString::fromLatin1(analyzer_types_[i]->className())) {
         ChangeAnalyzer(i);
         actions_[i]->setChecked(true);
         break;
@@ -213,7 +222,7 @@ void AnalyzerContainer::SaveFramerate(const int framerate) {
 
   // For now, framerate is common for all analyzers. Maybe each analyzer should have its own framerate?
   current_framerate_ = framerate;
-  QSettings s;
+  Settings s;
   s.beginGroup(kSettingsGroup);
   s.setValue(kSettingsFramerate, current_framerate_);
   s.endGroup();
@@ -222,9 +231,9 @@ void AnalyzerContainer::SaveFramerate(const int framerate) {
 
 void AnalyzerContainer::Save() {
 
-  QSettings s;
+  Settings s;
   s.beginGroup(kSettingsGroup);
-  s.setValue("type", current_analyzer_ ? current_analyzer_->metaObject()->className() : QVariant());
+  s.setValue("type", current_analyzer_ ? QString::fromLatin1(current_analyzer_->metaObject()->className()) : QVariant());
   s.endGroup();
 
 }

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,17 +45,16 @@ class AnalyzerContainer : public QWidget {
  public:
   explicit AnalyzerContainer(QWidget *parent);
 
-  void SetEngine(EngineBase *engine);
-  void SetActions(QAction *visualisation);
+  void SetEngine(SharedPtr<EngineBase> engine);
 
   static const char *kSettingsGroup;
   static const char *kSettingsFramerate;
 
  signals:
-  void WheelEvent(int delta);
+  void WheelEvent(const int delta);
 
  protected:
-  void mouseReleaseEvent(QMouseEvent*) override;
+  void mouseReleaseEvent(QMouseEvent *e) override;
   void wheelEvent(QWheelEvent *e) override;
 
  private slots:
@@ -66,11 +64,6 @@ class AnalyzerContainer : public QWidget {
   void ShowPopupMenu();
 
  private:
-  static const int kLowFramerate;
-  static const int kMediumFramerate;
-  static const int kHighFramerate;
-  static const int kSuperHighFramerate;
-
   void Load();
   void Save();
   void SaveFramerate(const int framerate);
@@ -94,8 +87,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, const 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]) {
@@ -266,12 +266,12 @@ QColor ensureContrast(const QColor &bg, const QColor &fg, int amount) {
 
   // value is the best measure of contrast
   // if there is enough difference in value already, return fg unchanged
-  if (dv > static_cast<int>(amount)) return fg;
+  if (dv > amount) return fg;
 
   int ds = abs(bs - fs);
 
   // saturation is good enough too. But not as good. TODO adapt this a little
-  if (ds > static_cast<int>(amount)) return fg;
+  if (ds > amount) return fg;
 
   int dh = abs(bh - fh);
 
@@ -285,7 +285,7 @@ QColor ensureContrast(const QColor &bg, const QColor &fg, int amount) {
     if (ds > amount / 2 && (bs > 125 && fs > 125)) {
       return fg;
     }
-    else if (dv > amount / 2 && (bv > 125 && fv > 125)) {
+    if (dv > amount / 2 && (bv > 125 && fv > 125)) {
       return fg;
     }
   }
@@ -294,7 +294,7 @@ QColor ensureContrast(const QColor &bg, const QColor &fg, int amount) {
     // low saturation on a low saturation is sad
     const int tmp = 50 - fs;
     fs = 50;
-    if (static_cast<int>(amount) > tmp) {
+    if (amount > tmp) {
       amount -= tmp;
     }
     else {
@@ -310,25 +310,25 @@ QColor ensureContrast(const QColor &bg, const QColor &fg, int amount) {
     if (amount > 0) adjustToLimits(bs, fs, amount);
 
     // see if we need to adjust the hue
-    if (static_cast<int>(amount) > 0)
-      fh += static_cast<int>(amount);  // cycles around;
+    if (amount > 0)
+      fh += amount;  // cycles around;
 
     return QColor::fromHsv(fh, fs, fv);
   }
 
-  if (fv > bv && bv > static_cast<int>(amount)) {
-    return QColor::fromHsv(fh, fs, bv - static_cast<int>(amount));
+  if (fv > bv && bv > amount) {
+    return QColor::fromHsv(fh, fs, bv - amount);
   }
 
-  if (fv < bv && fv > static_cast<int>(amount)) {
+  if (fv < bv && fv > amount) {
     return QColor::fromHsv(fh, fs, fv - amount);
   }
 
-  if (fv > bv && (255 - fv > static_cast<int>(amount))) {
+  if (fv > bv && (255 - fv > amount)) {
     return QColor::fromHsv(fh, fs, fv + amount);
   }
 
-  if (fv < bv && (255 - bv > static_cast<int>(amount))) {
+  if (fv < bv && (255 - bv > amount)) {
     return QColor::fromHsv(fh, fs, bv + amount);
   }
 

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 &s, const 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)),
@@ -81,7 +78,7 @@ void BoomAnalyzer::resizeEvent(QResizeEvent *e) {
   bands_ = qMin(static_cast<int>(static_cast<double>(width() + 1) / (kColumnWidth + 1)) + 1, kMaxBandCount);
   scope_.resize(bands_);
 
-  F_ = static_cast<double>(HEIGHT) / (log10(256) * static_cast<double>(1.1) /*<- max. amplitude*/);
+  F_ = static_cast<double>(HEIGHT) / (log10(256) * 1.1 /*<- max. amplitude*/);
 
   barPixmap_ = QPixmap(kColumnWidth - 2, HEIGHT);
   canvas_ = QPixmap(size());
@@ -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::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 &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/fht.cpp

@@ -28,7 +28,7 @@
 #include <QVector>
 #include <QtMath>
 
-FHT::FHT(uint n) : num_((n < 3) ? 0 : 1 << n), exp2_((n < 3) ? static_cast<int>(-1) : static_cast<int>(n)) {
+FHT::FHT(uint n) : num_((n < 3) ? 0 : 1 << n), exp2_((n < 3) ? -1 : static_cast<int>(n)) {
 
   if (n > 3) {
     buf_vector_.resize(num_);
@@ -47,7 +47,7 @@ float *FHT::buf_() { return buf_vector_.data(); }
 float *FHT::tab_() { return tab_vector_.data(); }
 int *FHT::log_() { return log_vector_.data(); }
 
-void FHT::makeCasTable(void) {
+void FHT::makeCasTable() {
 
   float *costab = tab_();
   float *sintab = tab_() + num_ / 2 + 1;

src/analyzer/rainbowanalyzer.cpp

@@ -41,23 +41,24 @@
 #include "fht.h"
 #include "analyzerbase.h"
 
-using Analyzer::Scope;
+const char *NyanCatAnalyzer::kName = "Nyanalyzer Cat";
+const char *RainbowDashAnalyzer::kName = "Rainbow Dash";
 
-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 };
+RainbowAnalyzer::RainbowType RainbowAnalyzer::rainbowtype;
+const int RainbowAnalyzer::kHeight[] = { 21, 33 };
+const int RainbowAnalyzer::kWidth[] = { 34, 53 };
+const int RainbowAnalyzer::kFrameCount[] = { 6, 16 };
+const int RainbowAnalyzer::kSleepingHeight[] = { 24, 33 };
 
-const char *Rainbow::NyanCatAnalyzer::kName = "Nyanalyzer Cat";
-const char *Rainbow::RainbowDashAnalyzer::kName = "Rainbow Dash";
-const float Rainbow::RainbowAnalyzer::kPixelScale = 0.02F;
+namespace {
+constexpr int kFrameIntervalMs = 150;
+constexpr int kRainbowHeight[] = { 21, 16 };
+constexpr int kRainbowOverlap[] = { 13, 15 };
+constexpr float kPixelScale = 0.02F;
+}  // namespace
 
-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),
@@ -67,8 +68,8 @@ Rainbow::RainbowAnalyzer::RainbowAnalyzer(const RainbowType rbtype, QWidget *par
       background_brush_(QColor(0x0f, 0x43, 0x73)) {
 
   rainbowtype = rbtype;
-  cat_dash_[0] = QPixmap(":/pictures/nyancat.png");
-  cat_dash_[1] = QPixmap(":/pictures/rainbowdash.png");
+  cat_dash_[0] = QPixmap(QStringLiteral(":/pictures/nyancat.png"));
+  cat_dash_[1] = QPixmap(QStringLiteral(":/pictures/rainbowdash.png"));
   memset(history_, 0, sizeof(history_));
 
   for (int i = 0; i < kRainbowBands; ++i) {
@@ -81,20 +82,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 +109,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, const bool new_frame) {
 
   // Discard the second half of the transform
   const int scope_size = static_cast<int>(s.size() / 2);
@@ -203,8 +204,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:
@@ -50,44 +49,37 @@ class RainbowAnalyzer : public Analyzer::Base {
     Dash = 1
   };
 
-  RainbowAnalyzer(const RainbowType rbtype, QWidget *parent);
+  explicit 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 &s) override;
+  void analyze(QPainter &p, const Scope &s, const bool new_frame) override;
 
   void timerEvent(QTimerEvent *e) override;
   void resizeEvent(QResizeEvent *e) override;
 
  private:
+  static const int kRainbowBands = 6;
+  static const int kHistorySize = 128;
+  static RainbowType rainbowtype;
   static const int kHeight[];
   static const int kWidth[];
   static const int kFrameCount[];
-  static const int kRainbowHeight[];
-  static const int kRainbowOverlap[];
   static const int kSleepingHeight[];
 
-  static const int kHistorySize = 128;
-  static const int kRainbowBands = 6;
-  static const float kPixelScale;
-
-  static const int kFrameIntervalMs = 150;
-
-  static RainbowType rainbowtype;
-
-  inline QRect SourceRect(RainbowType _rainbowtype) const {
+  inline QRect SourceRect(const RainbowType _rainbowtype) const {
     return QRect(0, kHeight[_rainbowtype] * frame_, kWidth[_rainbowtype], kHeight[_rainbowtype]);
   }
 
-  inline QRect SleepingSourceRect(RainbowType _rainbowtype) const {
+  inline QRect SleepingSourceRect(const RainbowType _rainbowtype) const {
     return QRect(0, kHeight[_rainbowtype] * kFrameCount[_rainbowtype], kWidth[_rainbowtype], kSleepingHeight[_rainbowtype]);
   }
 
-  inline QRect DestRect(RainbowType _rainbowtype) const {
+  inline QRect DestRect(const RainbowType _rainbowtype) const {
     return QRect(width() - kWidth[_rainbowtype], (height() - kHeight[_rainbowtype]) / 2, kWidth[_rainbowtype], kHeight[_rainbowtype]);
   }
 
-  inline QRect SleepingDestRect(RainbowType _rainbowtype) const {
+  inline QRect SleepingDestRect(const RainbowType _rainbowtype) const {
     return QRect(width() - kWidth[_rainbowtype], (height() - kSleepingHeight[_rainbowtype]) / 2, kWidth[_rainbowtype], kSleepingHeight[_rainbowtype]);
   }
 
@@ -142,6 +134,5 @@ class RainbowDashAnalyzer : public RainbowAnalyzer {
 
   static const char *kName;
 };
-}  // namespace Rainbow
 
 #endif  // RAINBOWANALYZER_H

src/analyzer/sonogramanalyzer.cpp

@@ -0,0 +1,94 @@
+/*
+   Strawberry Music Player
+   This file was part of Clementine.
+   Copyright 2004, Melchior FRANZ <mfranz@kde.org>
+   Copyright 2009-2010, David Sansome <davidsansome@gmail.com>
+   Copyright 2010, 2014, John Maguire <john.maguire@gmail.com>
+   Copyright 2014-2015, Mark Furneaux <mark@furneaux.ca>
+   Copyright 2014, Krzysztof Sobiecki <sobkas@gmail.com>
+
+   Strawberry is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   Strawberry is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <QPainter>
+#include <QResizeEvent>
+
+#include "engine/enginebase.h"
+
+#include "sonogramanalyzer.h"
+
+const char *SonogramAnalyzer::kName = QT_TRANSLATE_NOOP("AnalyzerContainer", "Sonogram");
+
+SonogramAnalyzer::SonogramAnalyzer(QWidget *parent)
+    : AnalyzerBase(parent, 9) {}
+
+void SonogramAnalyzer::resizeEvent(QResizeEvent *e) {
+
+  Q_UNUSED(e)
+
+  canvas_ = QPixmap(size());
+  canvas_.fill(palette().color(QPalette::Window));
+
+}
+
+void SonogramAnalyzer::analyze(QPainter &p, const Scope &s, const bool new_frame) {
+
+  if (!new_frame || engine_->state() == EngineBase::State::Paused) {
+    p.drawPixmap(0, 0, canvas_);
+    return;
+  }
+
+  QPainter canvas_painter(&canvas_);
+  canvas_painter.drawPixmap(0, 0, canvas_, 1, 0, width() - 1, -1);
+
+  Scope::const_iterator it = s.begin(), end = s.end();
+
+  for (int y = height() - 1; y;) {
+    QColor c;
+    if (it >= end || *it < .005) {
+      c = palette().color(QPalette::Window);
+    }
+    else if (*it < .05) {
+      c.setHsv(95, 255, 255 - static_cast<int>(*it * 4000.0));
+    }
+    else if (*it < 1.0) {
+      c.setHsv(95 - static_cast<int>(*it * 90.0), 255, 255);
+    }
+    else {
+      c = Qt::red;
+    }
+
+    canvas_painter.setPen(c);
+    canvas_painter.drawPoint(width() - 1, y--);
+
+    if (it < end) ++it;
+  }
+
+  canvas_painter.end();
+
+  p.drawPixmap(0, 0, canvas_);
+
+}
+
+void SonogramAnalyzer::transform(Scope &scope) {
+
+  fht_->power2(scope.data());
+  fht_->scale(scope.data(), 1.0 / 256);
+  scope.resize(fht_->size() / 2);
+
+}
+
+void SonogramAnalyzer::demo(QPainter &p) {
+  analyze(p, Scope(fht_->size(), 0), new_frame_);
+}

src/analyzer/sonogramanalyzer.h

@@ -0,0 +1,50 @@
+/*
+   Strawberry Music Player
+   This file was part of Clementine.
+   Copyright 2004, Melchior FRANZ <mfranz@kde.org>
+   Copyright 2009-2010, David Sansome <davidsansome@gmail.com>
+   Copyright 2014, Krzysztof Sobiecki <sobkas@gmail.com>
+   Copyright 2014, John Maguire <john.maguire@gmail.com>
+   Copyright 2015, Mark Furneaux <mark@furneaux.ca>
+
+   Strawberry is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   Strawberry is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef SONOGRAMANALYZER_H
+#define SONOGRAMANALYZER_H
+
+#include <QPixmap>
+#include <QPainter>
+
+#include "analyzerbase.h"
+
+class SonogramAnalyzer : public AnalyzerBase {
+  Q_OBJECT
+
+ public:
+  Q_INVOKABLE explicit SonogramAnalyzer(QWidget *parent);
+
+  static const char *kName;
+
+ protected:
+  void resizeEvent(QResizeEvent *e) override;
+  void analyze(QPainter &p, const Scope &s, const bool new_frame) override;
+  void transform(Scope &scope) override;
+  void demo(QPainter &p) override;
+
+ private:
+  QPixmap canvas_;
+};
+
+#endif  // SONOGRAMANALYZER_H