From dc57966dc3402862413a66facd65a03e73da980c Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 2 May 2016 08:57:53 +0200 Subject: [PATCH 1/8] configure.ac: prepare for 0.19.16 --- NEWS | 2 ++ configure.ac | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 051f808a9..63014bd40 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,5 @@ +ver 0.19.16 (not yet released) + ver 0.19.15 (2016/04/30) * decoder - ffmpeg: support FFmpeg 3.0 diff --git a/configure.ac b/configure.ac index c94c724dd..c05d075ad 100644 --- a/configure.ac +++ b/configure.ac @@ -1,10 +1,10 @@ AC_PREREQ(2.60) -AC_INIT(mpd, 0.19.15, musicpd-dev-team@lists.sourceforge.net) +AC_INIT(mpd, 0.19.16, musicpd-dev-team@lists.sourceforge.net) VERSION_MAJOR=0 VERSION_MINOR=19 -VERSION_REVISION=15 +VERSION_REVISION=16 VERSION_EXTRA=0 AC_CONFIG_SRCDIR([src/Main.cxx]) From d6d9dc9d957e6776985c8832cbd2f46e547b594c Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 2 May 2016 08:58:17 +0200 Subject: [PATCH 2/8] Makefile.am: include scripts/*.rb in tarball Fix out-of-tree build by prepending $(srcdir)/, and change *.sh to *.rb. --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 00b425d0d..d5337cc94 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2152,7 +2152,7 @@ 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 \ systemd/mpd.socket \ android/AndroidManifest.xml \ From 15735552f4fee4bd9b97bfcd61cbd61e403d62fb Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 2 May 2016 08:56:21 +0200 Subject: [PATCH 3/8] Makefile.am: include doc/include/tags.xml in tarball See https://bugs.musicpd.org/view.php?id=4523 --- Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.am b/Makefile.am index d5337cc94..91f0f326c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2154,6 +2154,7 @@ EXTRA_DIST = $(doc_DATA) autogen.sh \ test/test_archive_zzip.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 \ From aa5d05eaa4d482aa8f8df954335d0aba151eeff9 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 2 May 2016 22:05:21 +0200 Subject: [PATCH 4/8] configure.ac: don't suppress GLib warnings by changing -I to -isystem This is a kludge which may break system include path order, see https://bugs.musicpd.org/view.php?id=4524 --- configure.ac | 6 ------ 1 file changed, 6 deletions(-) diff --git a/configure.ac b/configure.ac index c05d075ad..35ecb7b19 100644 --- a/configure.ac +++ b/configure.ac @@ -703,12 +703,6 @@ AC_ARG_ENABLE(glib, if test x$enable_glib = xyes; then PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.28 gthread-2.0],, [AC_MSG_ERROR([GLib 2.28 is required])]) - - if test x$GCC = xyes; then - # suppress warnings in the GLib headers - GLIB_CFLAGS=`echo $GLIB_CFLAGS |sed -e 's,-I/,-isystem /,g'` - fi - AC_DEFINE(HAVE_GLIB, 1, [Define if GLib is used]) fi AM_CONDITIONAL(HAVE_GLIB, test x$enable_glib = xyes) From 75c8aecffa938658a5ffc1192a257110c8245639 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 11 May 2016 17:09:46 +0200 Subject: [PATCH 5/8] NEWS: add missing lines --- NEWS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/NEWS b/NEWS index 63014bd40..d0f9a6266 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,6 @@ ver 0.19.16 (not yet released) +* fix system include path order +* add missing DocBook file to tarball ver 0.19.15 (2016/04/30) * decoder From 5771d67202b0a7b155b4859e57a15118473443ef Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 13 Jun 2016 09:13:56 +0200 Subject: [PATCH 6/8] player/Thread: cancel outputs before seeking .. instead of doing it after seeking. After seeking, the command had no effect, because CheckDecoderStartup() waits for all outputs to finish. This caused a very long delay while seeking and switching songs (https://bugs.musicpd.org/view.php?id=4534). --- NEWS | 1 + src/PlayerThread.cxx | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index d0f9a6266..0def4e530 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,5 @@ ver 0.19.16 (not yet released) +* faster seeking * fix system include path order * add missing DocBook file to tarball diff --git a/src/PlayerThread.cxx b/src/PlayerThread.cxx index eeebcdb96..30e509b3b 100644 --- a/src/PlayerThread.cxx +++ b/src/PlayerThread.cxx @@ -518,6 +518,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)) { @@ -583,8 +585,6 @@ Player::SeekDecoder() /* re-fill the buffer after seeking */ buffering = true; - pc.outputs.Cancel(); - return true; } From 4ecd32537104f494062eea91b7e03e87a70c917c Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 13 Jun 2016 18:37:45 +0200 Subject: [PATCH 7/8] decoder/flac: log seek errors --- src/decoder/plugins/FlacIOHandle.cxx | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/decoder/plugins/FlacIOHandle.cxx b/src/decoder/plugins/FlacIOHandle.cxx index 0dd895798..875387d66 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 From faf0c950fe95047922da052f8301db010907eff8 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 13 Jun 2016 18:59:07 +0200 Subject: [PATCH 8/8] release v0.19.16 --- NEWS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 0def4e530..73d22444e 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -ver 0.19.16 (not yet released) +ver 0.19.16 (2016/06/13) * faster seeking * fix system include path order * add missing DocBook file to tarball