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

Merge branch 'v0.15.x' into v0.16.x

Browse Source 
Conflicts:
	NEWS
	configure.ac
	src/listen.c
This commit is contained in:
Max Kellermann 2011-04-12 07:39:01 +02:00
commit def2fe8805
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
NEWS
View File

@ -147,6 +147,13 @@ ver 0.16 (2010/12/11)
* make single mode 'sticky' * make single mode 'sticky'
ver 0.15.17 (2011/??/??)
* encoder:
- vorbis: reset the Ogg stream after flush
* decoders:
- vorbis: fix tremor support
ver 0.15.16 (2011/03/13) ver 0.15.16 (2011/03/13)
* output: * output:
- ao: initialize the ao_sample_format struct - ao: initialize the ao_sample_format struct

2
configure.ac
View File

@ -1081,7 +1081,7 @@ if
fi fi
AM_CONDITIONAL(HAVE_OGG_COMMON, AM_CONDITIONAL(HAVE_OGG_COMMON,
test x$enable_vorbis = xyes || test x$enable_oggflac = xyes || test x$enable_flac = xyes) test x$enable_vorbis = xyes || test x$enable_tremor = xyes || test x$enable_oggflac = xyes || test x$enable_flac = xyes)
AM_CONDITIONAL(HAVE_FLAC_COMMON, AM_CONDITIONAL(HAVE_FLAC_COMMON,
test x$enable_flac = xyes || test x$enable_oggflac = xyes) test x$enable_flac = xyes || test x$enable_oggflac = xyes)

2
src/command.c
View File

@ -464,7 +464,7 @@ handle_currentsong(struct client *client,
G_GNUC_UNUSED int argc, G_GNUC_UNUSED char *argv[]) G_GNUC_UNUSED int argc, G_GNUC_UNUSED char *argv[])
{ {
playlist_print_current(client, &g_playlist); playlist_print_current(client, &g_playlist);
return PLAYLIST_RESULT_SUCCESS; return COMMAND_RETURN_OK;
} }
static enum command_return static enum command_return