From 0709065f50e4ae7e1745f6a36a72f4b296bdc6b8 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 24 Nov 2014 07:51:20 +0100 Subject: [PATCH 1/6] Java/File: fix include guard --- src/java/File.hxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/java/File.hxx b/src/java/File.hxx index 3636fc7c6..a569fe214 100644 --- a/src/java/File.hxx +++ b/src/java/File.hxx @@ -28,7 +28,7 @@ */ #ifndef JAVA_FILE_HXX -#define JAVA_FILE_HPP +#define JAVA_FILE_HXX #include "Object.hxx" From e972ae4afa50e3333cc7f743327f2aba88ec2347 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 20 Nov 2014 20:59:36 +0100 Subject: [PATCH 2/6] android: switch to gcc 4.9 / llvm 3.5 (NDK r10c) --- android/build.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/build.py b/android/build.py index db475b43d..634d9bffb 100755 --- a/android/build.py +++ b/android/build.py @@ -40,8 +40,8 @@ build_arch = 'linux-x86_64' os.environ['PKG_CONFIG_LIBDIR'] = os.path.join(root_path, 'lib/pkgconfig') # select the NDK compiler -gcc_version = '4.8' -llvm_version = '3.3' +gcc_version = '4.9' +llvm_version = '3.5' # select the NDK target ndk_arch = 'arm' From 11ead56d6dc9512a518e960522821c02ae2b0432 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 24 Nov 2014 07:35:32 +0100 Subject: [PATCH 3/6] android: release v0.19.4 Android releases were missing since 0.19.1. --- android/AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index e0aef7757..02401c699 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -2,8 +2,8 @@ + android:versionCode="8" + android:versionName="0.19.4"> From bbc618b8f9127ce286baf34368345e30e983f52a Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 24 Nov 2014 07:34:34 +0100 Subject: [PATCH 4/6] configure.ac: prepare for 0.19.5 --- NEWS | 2 ++ configure.ac | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 762d18086..d2b218330 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,5 @@ +ver 0.19.5 (not yet released) + ver 0.19.4 (2014/11/18) * protocol - workaround for buggy clients that send "add /" diff --git a/configure.ac b/configure.ac index bdbfa9beb..5a44fa5c8 100644 --- a/configure.ac +++ b/configure.ac @@ -1,10 +1,10 @@ AC_PREREQ(2.60) -AC_INIT(mpd, 0.19.4, musicpd-dev-team@lists.sourceforge.net) +AC_INIT(mpd, 0.19.5, musicpd-dev-team@lists.sourceforge.net) VERSION_MAJOR=0 VERSION_MINOR=19 -VERSION_REVISION=4 +VERSION_REVISION=5 VERSION_EXTRA=0 AC_CONFIG_SRCDIR([src/Main.cxx]) From 716225cd2f92ee0bb204de1d248dd2bc6c4c0221 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 24 Nov 2014 07:35:20 +0100 Subject: [PATCH 5/6] doc/protocol: mention that "count" can have multiple filters --- doc/protocol.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/protocol.xml b/doc/protocol.xml index 858ca0990..05468e535 100644 --- a/doc/protocol.xml +++ b/doc/protocol.xml @@ -1533,6 +1533,7 @@ OK count TAG NEEDLE + ... group GROUPTYPE From 951bad46e0638bd13c750fa92260dd9ccf424298 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 24 Nov 2014 08:54:30 +0100 Subject: [PATCH 6/6] decoder/{dsdiff,dsf,opus}: fix deadlock while seeking --- NEWS | 2 ++ src/decoder/plugins/DsdLib.cxx | 4 ++-- src/decoder/plugins/OpusDecoderPlugin.cxx | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index d2b218330..fb5fd19b5 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,6 @@ ver 0.19.5 (not yet released) +* decoder + - dsdiff, dsf, opus: fix deadlock while seeking ver 0.19.4 (2014/11/18) * protocol diff --git a/src/decoder/plugins/DsdLib.cxx b/src/decoder/plugins/DsdLib.cxx index d7eb5f7a3..8892ed387 100644 --- a/src/decoder/plugins/DsdLib.cxx +++ b/src/decoder/plugins/DsdLib.cxx @@ -53,7 +53,7 @@ dsdlib_skip_to(Decoder *decoder, InputStream &is, offset_type offset) { if (is.IsSeekable()) - return is.Seek(offset, IgnoreError()); + return is.LockSeek(offset, IgnoreError()); if (is.GetOffset() > offset) return false; @@ -72,7 +72,7 @@ dsdlib_skip(Decoder *decoder, InputStream &is, return true; if (is.IsSeekable()) - return is.Seek(is.GetOffset() + delta, IgnoreError()); + return is.LockSeek(is.GetOffset() + delta, IgnoreError()); if (delta > 1024 * 1024) /* don't skip more than one megabyte; it would be too diff --git a/src/decoder/plugins/OpusDecoderPlugin.cxx b/src/decoder/plugins/OpusDecoderPlugin.cxx index 25497fe8a..e14827e38 100644 --- a/src/decoder/plugins/OpusDecoderPlugin.cxx +++ b/src/decoder/plugins/OpusDecoderPlugin.cxx @@ -214,7 +214,7 @@ LoadEOSPacket(InputStream &is, Decoder *decoder, int serialno, ogg_stream_clear(&os); /* restore the previous file position */ - is.Seek(old_offset, IgnoreError()); + is.LockSeek(old_offset, IgnoreError()); return result; }