oysteikt/mpd
oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge release 0.15.15 from branch 'v0.15.x'

Browse Source 
Conflicts:
	NEWS
	configure.ac
This commit is contained in:
Max Kellermann 2010-11-08 18:50:22 +01:00
commit f384f8da93
3 changed files with 9 additions and 2 deletions

7
NEWS

@ -109,6 +109,13 @@ ver 0.16 (20??/??/??)
* make single mode 'sticky' * 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) ver 0.15.14 (2010/11/06)
* player_thread: fix assertion failure due to wrong music pipe on seek * player_thread: fix assertion failure due to wrong music pipe on seek
* output_thread: fix assertion failure due to race condition in OPEN * output_thread: fix assertion failure due to race condition in OPEN

2
src/input/rewind_input_plugin.c

@ -81,7 +81,7 @@ copy_attributes(struct input_rewind *r)
const struct input_stream *src = r->input; const struct input_stream *src = r->input;
assert(dest != src); assert(dest != src);
assert(dest->mime != src->mime); assert(src->mime == NULL || dest->mime != src->mime);
dest->ready = src->ready; dest->ready = src->ready;
dest->seekable = src->seekable; dest->seekable = src->seekable;

2
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, static void my_shout_set_tag(void *data,