Add support for librespot without --autoplay

kraxarn · Sep 10, 2022 · 7694741 · 7694741
1 parent b7d2fc5
commit 7694741
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 1 deletion.
diff --git a/src/spotifyclient/helper.cpp b/src/spotifyclient/helper.cpp
@@ -142,3 +142,17 @@ auto SpotifyClient::Helper::running(const QString &path) -> bool
 	auto out = ps.readAllStandardOutput();
 	return QString(out).contains(path);
 }
+
+auto SpotifyClient::Helper::supportsAutoplay(const QString &path) -> bool
+{
+	if (clientType(path) != lib::client_type::librespot)
+	{
+		return false;
+	}
+
+	const auto help = clientExec(path, {
+		"--help"
+	});
+
+	return help.contains("--autoplay");
+}
diff --git a/src/spotifyclient/helper.hpp b/src/spotifyclient/helper.hpp
@@ -19,6 +19,13 @@ namespace SpotifyClient
 		static auto version(const QString &path) -> QString;
 		static auto running(const QString &path) -> bool;
 
+		/**
+		 * Client supports --autoplay argument
+		 * (librespot 0.4.2 and older only)
+		 * @param path Path to client
+		 */
+		static auto supportsAutoplay(const QString &path) -> bool;
+
 	private:
 		Helper() = default;
 

diff --git a/src/spotifyclient/runner.cpp b/src/spotifyclient/runner.cpp
@@ -102,9 +102,13 @@ auto SpotifyClient::Runner::start() -> QString
 		arguments.append({
 			"--name", QString("%1 (librespot)").arg(APP_NAME),
 			"--initial-volume", "100",
-			"--autoplay",
 			"--cache", QString::fromStdString((paths.cache() / "librespot").string()),
 		});
+
+		if (SpotifyClient::Helper::supportsAutoplay(path))
+		{
+			arguments.append(QStringLiteral("--autoplay"));
+		}
 	}
 	else if (clientType == lib::client_type::spotifyd)
 	{