diff options
| author | Max Kellermann <max@duempel.org> | 2011-04-12 07:39:01 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2011-04-12 07:39:01 +0200 |
| commit | def2fe8805d575c4be403f1c28aac70d87759d55 (patch) | |
| tree | c649067a4984b1ef20daf7e8f2f813d5342046d2 | |
| parent | f680b0a431b35fa5a005fec27899d4b18f664f3c (diff) | |
| parent | d4b00ff11cf102d8982ef342371acfa16ed2e515 (diff) | |
| download | mpd-def2fe8805d575c4be403f1c28aac70d87759d55.tar.gz mpd-def2fe8805d575c4be403f1c28aac70d87759d55.tar.xz mpd-def2fe8805d575c4be403f1c28aac70d87759d55.zip | |
Merge branch 'v0.15.x' into v0.16.x
Conflicts:
NEWS
configure.ac
src/listen.c
Diffstat (limited to '')
| -rw-r--r-- | NEWS | 7 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/command.c | 2 |
3 files changed, 9 insertions, 2 deletions
@@ -147,6 +147,13 @@ ver 0.16 (2010/12/11) * 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) * output: - ao: initialize the ao_sample_format struct diff --git a/configure.ac b/configure.ac index cc907a31c..184f0dcb0 100644 --- a/configure.ac +++ b/configure.ac @@ -1081,7 +1081,7 @@ if fi 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, test x$enable_flac = xyes || test x$enable_oggflac = xyes) diff --git a/src/command.c b/src/command.c index ce0aa97b7..64f161805 100644 --- a/src/command.c +++ b/src/command.c @@ -464,7 +464,7 @@ handle_currentsong(struct client *client, G_GNUC_UNUSED int argc, G_GNUC_UNUSED char *argv[]) { playlist_print_current(client, &g_playlist); - return PLAYLIST_RESULT_SUCCESS; + return COMMAND_RETURN_OK; } static enum command_return |