oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'v0.19.x'

Browse Source
This commit is contained in:
Max Kellermann 2014-11-24 09:00:14 +01:00
commit bf15cac980
6 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NEWS
View File

@ -5,6 +5,10 @@ ver 0.20 (not yet released)
* output * output
- pulse: set channel map to WAVE-EX - pulse: set channel map to WAVE-EX
ver 0.19.5 (not yet released)
* decoder
- dsdiff, dsf, opus: fix deadlock while seeking
ver 0.19.4 (2014/11/18) ver 0.19.4 (2014/11/18)
* protocol * protocol
- workaround for buggy clients that send "add /" - workaround for buggy clients that send "add /"

4
android/AndroidManifest.xml
View File

@ -2,8 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.musicpd" package="org.musicpd"
android:installLocation="auto" android:installLocation="auto"
android:versionCode="7" android:versionCode="8"
android:versionName="0.19.1"> android:versionName="0.19.4">
<uses-sdk android:minSdkVersion="9" android:targetSdkVersion="17"/> <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="17"/>

1
doc/protocol.xml
View File

@ -1533,6 +1533,7 @@ OK
<command>count</command> <command>count</command>
<arg choice="req"><replaceable>TAG</replaceable></arg> <arg choice="req"><replaceable>TAG</replaceable></arg>
<arg choice="req"><replaceable>NEEDLE</replaceable></arg> <arg choice="req"><replaceable>NEEDLE</replaceable></arg>
<arg choice="opt"><replaceable>...</replaceable></arg>
<arg choice="opt">group</arg> <arg choice="opt">group</arg>
<arg choice="opt"><replaceable>GROUPTYPE</replaceable></arg> <arg choice="opt"><replaceable>GROUPTYPE</replaceable></arg>
</cmdsynopsis> </cmdsynopsis>

4
src/decoder/plugins/DsdLib.cxx
View File

@ -53,7 +53,7 @@ dsdlib_skip_to(Decoder *decoder, InputStream &is,
offset_type offset) offset_type offset)
{ {
if (is.IsSeekable()) if (is.IsSeekable())
return is.Seek(offset, IgnoreError()); return is.LockSeek(offset, IgnoreError());
if (is.GetOffset() > offset) if (is.GetOffset() > offset)
return false; return false;
@ -72,7 +72,7 @@ dsdlib_skip(Decoder *decoder, InputStream &is,
return true; return true;
if (is.IsSeekable()) if (is.IsSeekable())
return is.Seek(is.GetOffset() + delta, IgnoreError()); return is.LockSeek(is.GetOffset() + delta, IgnoreError());
if (delta > 1024 * 1024) if (delta > 1024 * 1024)
/* don't skip more than one megabyte; it would be too /* don't skip more than one megabyte; it would be too

2
src/decoder/plugins/OpusDecoderPlugin.cxx
View File

@ -214,7 +214,7 @@ LoadEOSPacket(InputStream &is, Decoder *decoder, int serialno,
ogg_stream_clear(&os); ogg_stream_clear(&os);
/* restore the previous file position */ /* restore the previous file position */
is.Seek(old_offset, IgnoreError()); is.LockSeek(old_offset, IgnoreError());
return result; return result;
} }

2
src/java/File.hxx
View File

@ -28,7 +28,7 @@
*/ */
#ifndef JAVA_FILE_HXX #ifndef JAVA_FILE_HXX
#define JAVA_FILE_HPP #define JAVA_FILE_HXX
#include "Object.hxx" #include "Object.hxx"