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

Merge tag 'v0.19.16'

Browse Source 
release v0.19.16
This commit is contained in:
Max Kellermann
2016-06-13 19:03:59 +02:00
parent 021519f295 faf0c950fe
commit 8b903626c2
4 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.am
View File

@@ -2331,8 +2331,9 @@ EXTRA_DIST = $(doc_DATA) autogen.sh \
test/test_archive_bzip2.sh \ test/test_archive_bzip2.sh \
test/test_archive_iso9660.sh \ test/test_archive_iso9660.sh \
test/test_archive_zzip.sh \ test/test_archive_zzip.sh \
$(wildcard scripts/*.sh) \ $(wildcard $(srcdir)/scripts/*.rb) \
$(man_MANS) $(DOCBOOK_FILES) doc/mpdconf.example doc/doxygen.conf \ $(man_MANS) $(DOCBOOK_FILES) doc/mpdconf.example doc/doxygen.conf \
$(wildcard $(srcdir)/doc/include/*.xml) \
systemd/mpd.socket \ systemd/mpd.socket \
android/AndroidManifest.xml \ android/AndroidManifest.xml \
android/build.py \ android/build.py \

5
NEWS
View File

@@ -53,6 +53,11 @@ ver 0.20 (not yet released)
* update * update
- apply .mpdignore matches to subdirectories - apply .mpdignore matches to subdirectories
ver 0.19.16 (2016/06/13)
* faster seeking
* fix system include path order
* add missing DocBook file to tarball
ver 0.19.15 (2016/04/30) ver 0.19.15 (2016/04/30)
* decoder * decoder
- ffmpeg: support FFmpeg 3.0 - ffmpeg: support FFmpeg 3.0

9
src/decoder/plugins/FlacIOHandle.cxx
View File

@@ -20,6 +20,7 @@
#include "config.h" #include "config.h"
#include "FlacIOHandle.hxx" #include "FlacIOHandle.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"
#include "Log.hxx"
#include "Compiler.h" #include "Compiler.h"
#include <errno.h> #include <errno.h>
@@ -87,7 +88,13 @@ FlacIOSeek(FLAC__IOHandle handle, FLAC__int64 _offset, int whence)
return -1; return -1;
} }
return is->LockSeek(offset, IgnoreError()) ? 0 : -1; Error error;
if (!is->LockSeek(offset, error)) {
LogError(error);
return -1;
}
return 0;
} }
static FLAC__int64 static FLAC__int64

4
src/player/Thread.cxx
View File

@@ -565,6 +565,8 @@ Player::SeekDecoder()
{ {
assert(pc.next_song != nullptr); assert(pc.next_song != nullptr);
pc.outputs.Cancel();
const SongTime start_time = pc.next_song->GetStartTime(); const SongTime start_time = pc.next_song->GetStartTime();
if (!dc.LockIsCurrentSong(*pc.next_song)) { if (!dc.LockIsCurrentSong(*pc.next_song)) {
@@ -628,8 +630,6 @@ Player::SeekDecoder()
/* re-fill the buffer after seeking */ /* re-fill the buffer after seeking */
buffering = true; buffering = true;
pc.outputs.Cancel();
return true; return true;
} }