diff --git a/Makefile.am b/Makefile.am index bb60218d5..cd9c7a636 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2331,8 +2331,9 @@ EXTRA_DIST = $(doc_DATA) autogen.sh \ test/test_archive_bzip2.sh \ test/test_archive_iso9660.sh \ test/test_archive_zzip.sh \ - $(wildcard scripts/*.sh) \ + $(wildcard $(srcdir)/scripts/*.rb) \ $(man_MANS) $(DOCBOOK_FILES) doc/mpdconf.example doc/doxygen.conf \ + $(wildcard $(srcdir)/doc/include/*.xml) \ systemd/mpd.socket \ android/AndroidManifest.xml \ android/build.py \ diff --git a/NEWS b/NEWS index aba3c5609..e75a9fc10 100644 --- a/NEWS +++ b/NEWS @@ -53,6 +53,11 @@ ver 0.20 (not yet released) * update - 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) * decoder - ffmpeg: support FFmpeg 3.0 diff --git a/src/decoder/plugins/FlacIOHandle.cxx b/src/decoder/plugins/FlacIOHandle.cxx index 9e59fdc67..84f25ab48 100644 --- a/src/decoder/plugins/FlacIOHandle.cxx +++ b/src/decoder/plugins/FlacIOHandle.cxx @@ -20,6 +20,7 @@ #include "config.h" #include "FlacIOHandle.hxx" #include "util/Error.hxx" +#include "Log.hxx" #include "Compiler.h" #include @@ -87,7 +88,13 @@ FlacIOSeek(FLAC__IOHandle handle, FLAC__int64 _offset, int whence) 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 diff --git a/src/player/Thread.cxx b/src/player/Thread.cxx index a08caca2e..5631a97e2 100644 --- a/src/player/Thread.cxx +++ b/src/player/Thread.cxx @@ -565,6 +565,8 @@ Player::SeekDecoder() { assert(pc.next_song != nullptr); + pc.outputs.Cancel(); + const SongTime start_time = pc.next_song->GetStartTime(); if (!dc.LockIsCurrentSong(*pc.next_song)) { @@ -628,8 +630,6 @@ Player::SeekDecoder() /* re-fill the buffer after seeking */ buffering = true; - pc.outputs.Cancel(); - return true; }