From ad52eb236d8746dffce0a5b07bf58a62bf0835d8 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 8 Nov 2010 10:37:09 +0100 Subject: input/rewind: fix assertion failure The assertion added in MPD 0.15.14 was too much, it failed when the MIME type of a stream was NULL. --- src/input/rewind_input_plugin.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/input/rewind_input_plugin.c b/src/input/rewind_input_plugin.c index 1927c525a..9e57e6999 100644 --- a/src/input/rewind_input_plugin.c +++ b/src/input/rewind_input_plugin.c @@ -84,7 +84,7 @@ copy_attributes(struct input_stream *dest) const struct input_stream *src = &r->input; assert(dest != src); - assert(dest->mime != src->mime); + assert(src->mime == NULL || dest->mime != src->mime); dest->ready = src->ready; dest->seekable = src->seekable; -- cgit v1.2.3 From cc1debc94893690b9bc951391be0e69977657be6 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 8 Nov 2010 18:46:14 +0100 Subject: output/shout: artist comes first in stream title After popular demand, I've switched the order of "artist" and "title" in the stream title. There is no standard, and there is no reliable way to parse those from the stream title. --- src/output/shout_plugin.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/output/shout_plugin.c b/src/output/shout_plugin.c index 4412d26ff..dbc56f337 100644 --- a/src/output/shout_plugin.c +++ b/src/output/shout_plugin.c @@ -483,7 +483,7 @@ shout_tag_to_metadata(const struct tag *tag, char *dest, size_t size) } } - snprintf(dest, size, "%s - %s", title, artist); + snprintf(dest, size, "%s - %s", artist, title); } static void my_shout_set_tag(void *data, -- cgit v1.2.3