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

[input/file_http] Use swap_pointers to transfer ownership of metadata

Browse Source
This commit is contained in:
ejurgensen 2017-01-27 11:02:10 +01:00
parent 67d0504700
commit ea874154b2
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/inputs/file_http.c
View File

@ -25,6 +25,7 @@
#include "transcode.h" #include "transcode.h"
#include "http.h" #include "http.h"
#include "misc.h"
#include "input.h" #include "input.h"
static int static int
@ -120,16 +121,12 @@ metadata_get_http(struct input_metadata *metadata, struct player_source *ps)
} }
if (m->artist) if (m->artist)
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
if (m->title) if (m->title)
metadata->album = m->title; swap_pointers(&metadata->album, &m->title);
if (m->artwork_url) if (m->artwork_url)
metadata->artwork_url = m->artwork_url; swap_pointers(&metadata->artwork_url, &m->artwork_url);
m->artist = NULL;
m->title = NULL;
m->artwork_url = NULL;
http_icy_metadata_free(m, 0); http_icy_metadata_free(m, 0);
return 0; return 0;