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

[http] Change name of struct field for StreamUrl

Browse Source 
Should not be called artwork_url, since it also can link to other ressources.

Also some fixup, e.g. use new macros.
This commit is contained in:
ejurgensen 2020-05-13 23:20:14 +02:00
parent d073781445
commit d2ac216f47
3 changed files with 17 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/http.c
View File

@ -667,9 +667,9 @@ metadata_packet_get(struct http_icy_metadata *metadata, AVFormatContext *fmtctx)
else else
metadata->title = strdup(metadata->title); metadata->title = strdup(metadata->title);
} }
else if ((strncmp(icy_token, "StreamUrl", strlen("StreamUrl")) == 0) && !metadata->artwork_url && strlen(ptr) > 0) else if ((strncmp(icy_token, "StreamUrl", strlen("StreamUrl")) == 0) && !metadata->url && strlen(ptr) > 0)
{ {
metadata->artwork_url = strdup(ptr); metadata->url = strdup(ptr);
} }
if (end) if (end)
@ -741,10 +741,7 @@ http_icy_metadata_get(AVFormatContext *fmtctx, int packet_only)
int got_packet; int got_packet;
int got_header; int got_header;
metadata = malloc(sizeof(struct http_icy_metadata)); CHECK_NULL(L_HTTP, metadata = calloc(1, sizeof(struct http_icy_metadata)));
if (!metadata)
return NULL;
memset(metadata, 0, sizeof(struct http_icy_metadata));
got_packet = (metadata_packet_get(metadata, fmtctx) == 0); got_packet = (metadata_packet_get(metadata, fmtctx) == 0);
got_header = (!packet_only) && (metadata_header_get(metadata, fmtctx) == 0); got_header = (!packet_only) && (metadata_header_get(metadata, fmtctx) == 0);
@ -761,7 +758,7 @@ http_icy_metadata_get(AVFormatContext *fmtctx, int packet_only)
metadata->genre, metadata->genre,
metadata->title, metadata->title,
metadata->artist, metadata->artist,
metadata->artwork_url, metadata->url,
metadata->hash metadata->hash
); );
*/ */
@ -816,10 +813,7 @@ http_icy_metadata_get(AVFormatContext *fmtctx, int packet_only)
return NULL; return NULL;
} }
metadata = malloc(sizeof(struct http_icy_metadata)); CHECK_NULL(L_HTTP, metadata = calloc(1, sizeof(struct http_icy_metadata)));
if (!metadata)
return NULL;
memset(metadata, 0, 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")) )
@ -853,7 +847,7 @@ http_icy_metadata_get(AVFormatContext *fmtctx, int packet_only)
metadata->genre, metadata->genre,
metadata->title, metadata->title,
metadata->artist, metadata->artist,
metadata->artwork_url, metadata->url,
metadata->hash metadata->hash
);*/ );*/
@ -864,24 +858,14 @@ http_icy_metadata_get(AVFormatContext *fmtctx, int packet_only)
void void
http_icy_metadata_free(struct http_icy_metadata *metadata, int content_only) http_icy_metadata_free(struct http_icy_metadata *metadata, int content_only)
{ {
if (metadata->name) if (!metadata)
return;
free(metadata->name); free(metadata->name);
if (metadata->description)
free(metadata->description); free(metadata->description);
if (metadata->genre)
free(metadata->genre); free(metadata->genre);
if (metadata->title)
free(metadata->title); free(metadata->title);
if (metadata->artist)
free(metadata->artist); free(metadata->artist);
free(metadata->url);
if (metadata->artwork_url)
free(metadata->artwork_url);
if (!content_only)
free(metadata); free(metadata);
} }

2
src/http.h
View File

@ -49,7 +49,7 @@ struct http_icy_metadata
/* Track specific, comes from icy_metadata_packet */ /* Track specific, comes from icy_metadata_packet */
char *title; char *title;
char *artist; char *artist;
char *artwork_url; char *url;
uint32_t hash; uint32_t hash;
}; };

2
src/inputs/file_http.c
View File

@ -147,7 +147,7 @@ metadata_get_http(struct input_metadata *metadata, struct input_source *source)
swap_pointers(&metadata->artist, &m->artist); swap_pointers(&metadata->artist, &m->artist);
// Note we map title to album, because clients should show stream name as titel // Note we map title to album, because clients should show stream name as titel
swap_pointers(&metadata->album, &m->title); swap_pointers(&metadata->album, &m->title);
swap_pointers(&metadata->artwork_url, &m->artwork_url); swap_pointers(&metadata->artwork_url, &m->url);
http_icy_metadata_free(m, 0); http_icy_metadata_free(m, 0);
return 0; return 0;