From 84d0fd39a3d675a69da0505fd4edd7ebb874e1fb Mon Sep 17 00:00:00 2001 From: Avuton Olrich Date: Sun, 13 Mar 2011 20:27:33 -0700 Subject: Modify version string to post-release version 0.15.17~git --- NEWS | 3 +++ configure.ac | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 38fc5a230..f89387fd4 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,6 @@ +ver 0.15.17 (2011/??/??) + + ver 0.15.16 (2011/03/13) * output: - ao: initialize the ao_sample_format struct diff --git a/configure.ac b/configure.ac index 9f212b583..1276f0f89 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.60) -AC_INIT(mpd, 0.15.16, musicpd-dev-team@lists.sourceforge.net) +AC_INIT(mpd, 0.15.17~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) -- cgit v1.2.3 From a28449a123cd1e49503e267f37c3c900f9c70b29 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 16 Mar 2011 19:13:46 +0100 Subject: encoder/vorbis: reset the Ogg stream after flush Without the ogg_stream_reset() call, the "e_o_s" flag never gets reset, and libogg writes EOS packets over and over. --- NEWS | 2 ++ src/encoder/vorbis_encoder.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/NEWS b/NEWS index f89387fd4..565468ff1 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,6 @@ ver 0.15.17 (2011/??/??) +* encoder: + - vorbis: reset the Ogg stream after flush ver 0.15.16 (2011/03/13) diff --git a/src/encoder/vorbis_encoder.c b/src/encoder/vorbis_encoder.c index a5f6387f6..3fbbe5b61 100644 --- a/src/encoder/vorbis_encoder.c +++ b/src/encoder/vorbis_encoder.c @@ -274,6 +274,8 @@ vorbis_encoder_flush(struct encoder *_encoder, G_GNUC_UNUSED GError **error) vorbis_analysis_init(&encoder->vd, &encoder->vi); vorbis_block_init(&encoder->vd, &encoder->vb); + ogg_stream_reset(&encoder->os); + encoder->flush = true; return true; } -- cgit v1.2.3 From a8f891efcdc4b4c27942cc05aa025497e7fd983b Mon Sep 17 00:00:00 2001 From: Simon Kagstrom Date: Sun, 20 Mar 2011 17:25:52 +0100 Subject: configure.ac: Enable HAVE_OGG_COMMON when using libtremor Otherwise OGGs can't be played. --- NEWS | 2 ++ configure.ac | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 565468ff1..a6deae06a 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,8 @@ 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) diff --git a/configure.ac b/configure.ac index 1276f0f89..853ea4326 100644 --- a/configure.ac +++ b/configure.ac @@ -904,7 +904,7 @@ AM_CONDITIONAL(HAVE_OGGFLAC, test x$enable_oggflac = xyes) AM_CONDITIONAL(HAVE_FLAC_COMMON, test x$enable_flac = xyes || test x$enable_oggflac = xyes) 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) if test x$enable_audiofile = xyes; then PKG_CHECK_MODULES(AUDIOFILE, [audiofile >= 0.1.7], -- cgit v1.2.3 From 87ad2f85428ed6fb30e38efbf4c04a9c758e5e5d Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 23 Mar 2011 22:16:46 +0100 Subject: command: fix return value of handle_currentsong() Thanks to clang for complaining. --- src/command.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/command.c b/src/command.c index d30b63594..dd812df50 100644 --- a/src/command.c +++ b/src/command.c @@ -430,7 +430,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 -- cgit v1.2.3 From d4b00ff11cf102d8982ef342371acfa16ed2e515 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 23 Mar 2011 22:27:31 +0100 Subject: listen: suppress "unused variable" warning --- src/listen.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/listen.c b/src/listen.c index d6cade855..a4822c104 100644 --- a/src/listen.c +++ b/src/listen.c @@ -413,6 +413,8 @@ static int get_remote_uid(int fd) if (getpeereid(fd, &euid, &egid) == 0) return euid; +#else + (void)fd; #endif return -1; #endif -- cgit v1.2.3