From 462bba8e2ffc46ec5c3daf4bb0c174a8d72ae1c3 Mon Sep 17 00:00:00 2001 From: Avuton Olrich Date: Sat, 6 Nov 2010 14:42:03 -0700 Subject: [PATCH 1/4] Modify version string to post-release version 0.15.15~git --- NEWS | 3 +++ configure.ac | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 0c8e03d88..db85d23fc 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,6 @@ +ver 0.15.15 (2010/??/??) + + ver 0.15.14 (2010/11/06) * player_thread: fix assertion failure due to wrong music pipe on seek * output_thread: fix assertion failure due to race condition in OPEN diff --git a/configure.ac b/configure.ac index b47360dad..e02dda557 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.60) -AC_INIT(mpd, 0.15.14, musicpd-dev-team@lists.sourceforge.net) +AC_INIT(mpd, 0.15.15~git, musicpd-dev-team@lists.sourceforge.net) AC_CONFIG_SRCDIR([src/main.c]) AM_INIT_AUTOMAKE([foreign 1.9 dist-bzip2]) AM_CONFIG_HEADER(config.h) From ad52eb236d8746dffce0a5b07bf58a62bf0835d8 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 8 Nov 2010 10:37:09 +0100 Subject: [PATCH 2/4] 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. --- NEWS | 2 ++ src/input/rewind_input_plugin.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index db85d23fc..1c7d4dc1e 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,6 @@ ver 0.15.15 (2010/??/??) +* input: + - rewind: fix assertion failure ver 0.15.14 (2010/11/06) 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; From cc1debc94893690b9bc951391be0e69977657be6 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 8 Nov 2010 18:46:14 +0100 Subject: [PATCH 3/4] 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. --- NEWS | 2 ++ src/output/shout_plugin.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 1c7d4dc1e..7068149c6 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,8 @@ ver 0.15.15 (2010/??/??) * input: - rewind: fix assertion failure +* output: + - shout: artist comes first in stream title ver 0.15.14 (2010/11/06) 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, From 23cd8a74bef28003514e1a3ce2b29126f96a0513 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 8 Nov 2010 18:48:28 +0100 Subject: [PATCH 4/4] mpd version 0.15.15 --- NEWS | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 7068149c6..82bf7ae3b 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -ver 0.15.15 (2010/??/??) +ver 0.15.15 (2010/11/08) * input: - rewind: fix assertion failure * output: diff --git a/configure.ac b/configure.ac index e02dda557..da0ec2d7f 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.60) -AC_INIT(mpd, 0.15.15~git, musicpd-dev-team@lists.sourceforge.net) +AC_INIT(mpd, 0.15.15, musicpd-dev-team@lists.sourceforge.net) AC_CONFIG_SRCDIR([src/main.c]) AM_INIT_AUTOMAKE([foreign 1.9 dist-bzip2]) AM_CONFIG_HEADER(config.h)