aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2010-11-08 18:50:22 +0100
committerMax Kellermann <max@duempel.org>2010-11-08 18:50:22 +0100
commitf384f8da9303c48bcb932398905a3389c8d83295 (patch)
treea8a365f77fefc9f03a8f78ddc37437c812ae61ef
parent5a3aa1262a471b842e95b2e6e1dcdfbce035b75c (diff)
parent23cd8a74bef28003514e1a3ce2b29126f96a0513 (diff)
downloadmpd-f384f8da9303c48bcb932398905a3389c8d83295.tar.gz
mpd-f384f8da9303c48bcb932398905a3389c8d83295.tar.xz
mpd-f384f8da9303c48bcb932398905a3389c8d83295.zip
Merge release 0.15.15 from branch 'v0.15.x'
Conflicts: NEWS configure.ac
-rw-r--r--NEWS7
-rw-r--r--src/input/rewind_input_plugin.c2
-rw-r--r--src/output/shout_plugin.c2
3 files changed, 9 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index c8f06e8ae..6e85e5283 100644
--- a/NEWS
+++ b/NEWS
@@ -109,6 +109,13 @@ ver 0.16 (20??/??/??)
* make single mode 'sticky'
+ver 0.15.15 (2010/11/08)
+* input:
+ - rewind: fix assertion failure
+* output:
+ - shout: artist comes first in stream title
+
+
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/src/input/rewind_input_plugin.c b/src/input/rewind_input_plugin.c
index cee0d3cd4..6325a978e 100644
--- a/src/input/rewind_input_plugin.c
+++ b/src/input/rewind_input_plugin.c
@@ -81,7 +81,7 @@ copy_attributes(struct input_rewind *r)
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;
diff --git a/src/output/shout_plugin.c b/src/output/shout_plugin.c
index 4b73bb334..baaeccf92 100644
--- a/src/output/shout_plugin.c
+++ b/src/output/shout_plugin.c
@@ -494,7 +494,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,