From fe77230d84ae9f1362f943e39e22297dfc5095ce Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sat, 8 Oct 2011 15:36:55 +0200 Subject: pcm_convert: fix typo in error message --- src/pcm_convert.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pcm_convert.c b/src/pcm_convert.c index 5fe89b53a..7bd4d7215 100644 --- a/src/pcm_convert.c +++ b/src/pcm_convert.c @@ -222,7 +222,7 @@ pcm_convert_32(struct pcm_convert_state *state, src_buffer, src_size, &len); if (buf == NULL) { g_set_error(error_r, pcm_convert_quark(), 0, - "Conversion from %s to 24 bit is not implemented", + "Conversion from %s to 32 bit is not implemented", sample_format_to_string(src_format->format)); return NULL; } -- cgit v1.2.3 From 71536eb4122c78ccf610531c86b86e86fb5b16ac Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sat, 8 Oct 2011 15:37:47 +0200 Subject: decoder/wavpack: don't call WavpackGetMode() twice Use local variable "is_float". --- src/decoder/wavpack_decoder_plugin.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/decoder/wavpack_decoder_plugin.c b/src/decoder/wavpack_decoder_plugin.c index 24d0c1703..61026842b 100644 --- a/src/decoder/wavpack_decoder_plugin.c +++ b/src/decoder/wavpack_decoder_plugin.c @@ -176,7 +176,7 @@ wavpack_decode(struct decoder *decoder, WavpackContext *wpc, bool can_seek) return; } - if ((WavpackGetMode(wpc) & MODE_FLOAT) == MODE_FLOAT) { + if (is_float) { format_samples = format_samples_float; } else { format_samples = format_samples_int; -- cgit v1.2.3 From 30414093349f15639374006e3be7136cd6642a59 Mon Sep 17 00:00:00 2001 From: Avuton Olrich Date: Sun, 9 Oct 2011 04:44:51 -0700 Subject: mpd version 0.16.5 --- NEWS | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 725d3801c..ab2eaf4dd 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -ver 0.16.5 (2010/??/??) +ver 0.16.5 (2010/10/09) * configure.ac - disable assertions in the non-debugging build - show solaris plugin result correctly diff --git a/configure.ac b/configure.ac index 9908e51fa..0ef99704e 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.60) -AC_INIT(mpd, 0.16.5~git, musicpd-dev-team@lists.sourceforge.net) +AC_INIT(mpd, 0.16.5, musicpd-dev-team@lists.sourceforge.net) AC_CONFIG_SRCDIR([src/main.c]) AM_INIT_AUTOMAKE([foreign 1.10 dist-bzip2 subdir-objects]) AM_CONFIG_HEADER(config.h) -- cgit v1.2.3