MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-10-30 00:05:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

[spotify] Fix misplaced librespot-c legacy mode selector

Browse Source 
OwnTone was supposed to default to the old raw tcp Spotify protocol, which
would have left it unaffected by Spotify breaking the http response to the
metadata request. However, the mechanism for defaulting was misplaced. This
should put it in the right place and fix #1912.

Of course, the new protocol is still broken, but hopefully that will be fixed
on Spotify's side.
This commit is contained in:
ejurgensen 2025-08-09 21:55:37 +02:00
parent 75c9db5f59
commit b612e12aca
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/inputs/spotify_librespotc.c
View File

@ -20,6 +20,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <stdbool.h>
#include <unistd.h>
#include <stdint.h>
#include <fcntl.h>
@ -109,6 +110,7 @@ static int
postlogin(struct global_ctx *ctx)
{
struct sp_credentials credentials;
bool use_legacy_mode;
char *db_stored_cred;
char *ptr;
int i;
@ -135,7 +137,13 @@ postlogin(struct global_ctx *ctx)
librespotc_bitrate_set(ctx->session, ctx->bitrate_preferred);
DPRINTF(E_LOG, L_SPOTIFY, "Logged into Spotify succesfully with username %s\n", credentials.username);
// For now, use old tcp based protocol as default unless configured not to.
// Note that setup() will switch the old protocol off on error.
use_legacy_mode = !cfg_getbool(cfg_getsec(cfg, "spotify"), "disable_legacy_mode");
if (use_legacy_mode)
librespotc_legacy_set(ctx->session, true);
DPRINTF(E_LOG, L_SPOTIFY, "Logged into Spotify succesfully with username %s (%s mode)\n", credentials.username, use_legacy_mode ? "tcp" : "http");
listener_notify(LISTENER_SPOTIFY);
@ -621,13 +629,6 @@ login(const char *username, const char *token, const char **errmsg)
if (!ctx->session)
goto error;
// For now, use old tcp based protocol as default unless configured not to.
// Note that setup() will switch the old protocol off on error.
if (!cfg_getbool(cfg_getsec(cfg, "spotify"), "disable_legacy_mode"))
librespotc_legacy_set(ctx->session, true);
else
DPRINTF(E_INFO, L_SPOTIFY, "Using experimental http protocol for Spotify\n");
ret = postlogin(ctx);
if (ret < 0)
goto error;