From 0709065f50e4ae7e1745f6a36a72f4b296bdc6b8 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 24 Nov 2014 07:51:20 +0100 Subject: Java/File: fix include guard --- src/java/File.hxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') 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" -- cgit v1.2.3 From 951bad46e0638bd13c750fa92260dd9ccf424298 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 24 Nov 2014 08:54:30 +0100 Subject: decoder/{dsdiff,dsf,opus}: fix deadlock while seeking --- src/decoder/plugins/DsdLib.cxx | 4 ++-- src/decoder/plugins/OpusDecoderPlugin.cxx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') 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; } -- cgit v1.2.3