MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-01-15 16:53:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

[http] Don't set ICY metadata if they are just empty strings

Browse Source 
An empty string will mean that m3u tags won't get used (unless m3u_override is
configured), but they should be used, since they are probably better than an
empty string.
This commit is contained in:
ejurgensen 2020-05-17 23:28:05 +02:00
parent a69cc65ff6
commit 8acb2a647d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/http.c
View File

@ -720,11 +720,11 @@ metadata_header_get(struct http_icy_metadata *metadata, AVFormatContext *fmtctx)
if (ptr[0] == ' ') if (ptr[0] == ' ')
ptr++; ptr++;
if ((strncmp(icy_token, "icy-name", strlen("icy-name")) == 0) && !metadata->name) if ((strncmp(icy_token, "icy-name", strlen("icy-name")) == 0) && ptr[0] != '\0' && !metadata->name)
metadata->name = strdup(ptr); metadata->name = strdup(ptr);
else if ((strncmp(icy_token, "icy-description", strlen("icy-description")) == 0) && !metadata->description) else if ((strncmp(icy_token, "icy-description", strlen("icy-description")) == 0) && ptr[0] != '\0' && !metadata->description)
metadata->description = strdup(ptr); metadata->description = strdup(ptr);
else if ((strncmp(icy_token, "icy-genre", strlen("icy-genre")) == 0) && !metadata->genre) else if ((strncmp(icy_token, "icy-genre", strlen("icy-genre")) == 0) && ptr[0] != '\0' && !metadata->genre)
metadata->genre = strdup(ptr); metadata->genre = strdup(ptr);
icy_token = strtok_r(NULL, "\r\n", &save_pr); icy_token = strtok_r(NULL, "\r\n", &save_pr);
@ -816,17 +816,17 @@ http_icy_metadata_get(AVFormatContext *fmtctx, int packet_only)
CHECK_NULL(L_HTTP, metadata = calloc(1, sizeof(struct http_icy_metadata))); CHECK_NULL(L_HTTP, metadata = calloc(1, sizeof(struct http_icy_metadata)));
got_header = 0; got_header = 0;
if ( (value = keyval_get(ctx.input_headers, "icy-name")) ) if ( (value = keyval_get(ctx.input_headers, "icy-name")) && value[0] != '\0' )
{ {
metadata->name = strdup(value); metadata->name = strdup(value);
got_header = 1; got_header = 1;
} }
if ( (value = keyval_get(ctx.input_headers, "icy-description")) ) if ( (value = keyval_get(ctx.input_headers, "icy-description")) && value[0] != '\0' )
{ {
metadata->description = strdup(value); metadata->description = strdup(value);
got_header = 1; got_header = 1;
} }
if ( (value = keyval_get(ctx.input_headers, "icy-genre")) ) if ( (value = keyval_get(ctx.input_headers, "icy-genre")) && value[0] != '\0' )
{ {
metadata->genre = strdup(value); metadata->genre = strdup(value);
got_header = 1; got_header = 1;