MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-11-09 05:34:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

[file/http/input] Implement metadata handling through input interface

Browse Source
This commit is contained in:
ejurgensen
2017-01-22 23:23:18 +01:00
parent 0b9b008a1a
commit 8b5cac0538
3 changed files with 51 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/inputs/file_http.c
View File

@@ -40,7 +40,7 @@ setup(struct player_source *ps)
}
static int
http_setup(struct player_source *ps)
setup_http(struct player_source *ps)
{
char *url;
@@ -103,6 +103,38 @@ seek(struct player_source *ps, int seek_ms)
return transcode_seek(ps->xcode, seek_ms);
}
static int
metadata_get_http(struct input_metadata *metadata, struct player_source *ps)
{
struct http_icy_metadata *m;
int changed;
m = transcode_metadata(ps->xcode, &changed);
if (!m)
return -1;
if (!changed)
{
http_icy_metadata_free(m, 0);
return -1; // TODO Perhaps a problem since this prohibits the player updating metadata
}
if (m->artist)
metadata->artist = m->artist;
// Note we map title to album, because clients should show stream name as titel
if (m->title)
metadata->album = m->title;
if (m->artwork_url)
metadata->artwork_url = m->artwork_url;
m->artist = NULL;
m->title = NULL;
m->artwork_url = NULL;
http_icy_metadata_free(m, 0);
return 0;
}
struct input_definition input_file =
{
.name = "file",
@@ -119,7 +151,8 @@ struct input_definition input_http =
.name = "http",
.type = INPUT_TYPE_HTTP,
.disabled = 0,
.setup = http_setup,
.setup = setup_http,
.start = start,
.stop = stop,
.metadata_get = metadata_get_http,
};