release v0.20.7

Main: cap buffer_before_play at 80% to prevent deadlock
Closes #34
2017-05-15 22:51:08 +02:00 · 2017-05-15 22:49:31 +02:00 · 2017-05-15 22:44:18 +02:00 · 2017-05-15 22:40:23 +02:00 · 2017-05-15 21:49:18 +02:00 · 2017-05-15 21:48:03 +02:00
440 changed files with 4477 additions and 1763 deletions
--- a/2
+++ b/2
@@ -5,7 +5,7 @@ The following people have contributed code to MPD:

 Warren Dukes <warren.dukes@gmail.com>
 Avuton Olrich <avuton@gmail.com>
- Max Kellermann <max@duempel.org>
+ Max Kellermann <max.kellermann@gmail.com>
 Laszlo Ashin <kodest@gmail.com>
 Viliam Mateicka <viliam.mateicka@gmail.com>
 Eric Wollesen <encoded@xmtp.net>
--- a/Makefile.am
+++ b/Makefile.am
@@ -233,6 +233,15 @@ libmpd_a_SOURCES += \
 	src/db/Selection.cxx src/db/Selection.hxx
 endif

+CURL_SOURCES = \
+	src/lib/curl/Version.cxx src/lib/curl/Version.hxx \
+	src/lib/curl/Global.cxx src/lib/curl/Global.hxx \
+	src/lib/curl/Request.cxx src/lib/curl/Request.hxx \
+	src/lib/curl/Handler.hxx \
+	src/lib/curl/Easy.hxx \
+	src/lib/curl/Multi.hxx \
+	src/lib/curl/Slist.hxx
+
 UPNP_SOURCES = \
 	src/lib/upnp/Init.cxx src/lib/upnp/Init.hxx \
 	src/lib/upnp/ClientInit.cxx src/lib/upnp/ClientInit.hxx \
@@ -406,6 +415,7 @@ libutil_a_SOURCES = \
 	src/util/CharUtil.hxx \
 	src/util/NumberParser.hxx \
 	src/util/MimeType.cxx src/util/MimeType.hxx \
+	src/util/StringBuffer.hxx \
 	src/util/StringPointer.hxx \
 	src/util/StringView.cxx src/util/StringView.hxx \
 	src/util/AllocatedString.cxx src/util/AllocatedString.hxx \
@@ -420,6 +430,7 @@ libutil_a_SOURCES = \
 	src/util/FormatString.cxx src/util/FormatString.hxx \
 	src/util/Tokenizer.cxx src/util/Tokenizer.hxx \
 	src/util/TextFile.hxx \
+	src/util/TimeParser.cxx src/util/TimeParser.hxx \
 	src/util/UriUtil.cxx src/util/UriUtil.hxx \
 	src/util/Manual.hxx \
 	src/util/RefCount.hxx \
@@ -529,6 +540,10 @@ ICU_LDADD = libicu.a $(ICU_LIBS)
 # PCM library

 libpcm_a_SOURCES = \
+	src/CheckAudioFormat.cxx src/CheckAudioFormat.hxx \
+	src/AudioFormat.cxx src/AudioFormat.hxx \
+	src/AudioParser.cxx src/AudioParser.hxx \
+	src/pcm/SampleFormat.cxx src/pcm/SampleFormat.hxx \
 	src/pcm/Traits.hxx \
 	src/pcm/Interleave.cxx src/pcm/Interleave.hxx \
 	src/pcm/PcmBuffer.cxx src/pcm/PcmBuffer.hxx \
@@ -565,6 +580,8 @@ PCM_LIBS = \

 if ENABLE_DSD
 libpcm_a_SOURCES += \
+	src/pcm/Dsd16.cxx src/pcm/Dsd16.hxx \
+	src/pcm/Dsd32.cxx src/pcm/Dsd32.hxx \
 	src/pcm/PcmDsd.cxx src/pcm/PcmDsd.hxx \
 	src/pcm/dsd2pcm/dsd2pcm.c src/pcm/dsd2pcm/dsd2pcm.h
 endif
@@ -603,7 +620,8 @@ libxiph_a_SOURCES += \
 	src/lib/xiph/OggStreamState.hxx
 endif

-XIPH_LIBS = libxiph.a
+XIPH_LIBS = libxiph.a \
+	$(OGG_LIBS)

 endif

@@ -689,6 +707,8 @@ libstorage_a_CPPFLAGS = $(AM_CPPFLAGS) \

 STORAGE_LIBS = \
 	libstorage.a \
+	$(CURL_LIBS) \
+	$(EXPAT_LIBS) \
 	$(NFS_LIBS) \
 	$(SMBCLIENT_LIBS)

@@ -704,6 +724,12 @@ libstorage_a_SOURCES += \
 	src/storage/plugins/NfsStorage.cxx src/storage/plugins/NfsStorage.hxx
 endif

+if ENABLE_WEBDAV
+libstorage_a_SOURCES += \
+	src/lib/expat/ExpatParser.cxx \
+	src/storage/plugins/CurlStorage.cxx src/storage/plugins/CurlStorage.hxx
+endif
+
 endif

 # neighbor plugins
@@ -851,9 +877,6 @@ ARCHIVE_LIBS =
 endif

 libbasic_a_SOURCES = \
-	src/CheckAudioFormat.cxx src/CheckAudioFormat.hxx \
-	src/AudioFormat.cxx src/AudioFormat.hxx \
-	src/AudioParser.cxx src/AudioParser.hxx \
 	src/ReplayGainConfig.hxx \
 	src/ReplayGainMode.cxx src/ReplayGainMode.hxx \
 	src/ReplayGainInfo.cxx src/ReplayGainInfo.hxx
@@ -1279,12 +1302,7 @@ if ENABLE_CURL
 libinput_a_SOURCES += \
 	src/input/IcyInputStream.cxx src/input/IcyInputStream.hxx \
 	src/input/plugins/CurlInputPlugin.cxx src/input/plugins/CurlInputPlugin.hxx \
-	src/lib/curl/Version.cxx src/lib/curl/Version.hxx \
-	src/lib/curl/Global.cxx src/lib/curl/Global.hxx \
-	src/lib/curl/Request.cxx src/lib/curl/Request.hxx \
-	src/lib/curl/Handler.hxx \
-	src/lib/curl/Easy.hxx \
-	src/lib/curl/Multi.hxx \
+	$(CURL_SOURCES) \
 	src/IcyMetaDataParser.cxx src/IcyMetaDataParser.hxx
 endif

@@ -1382,6 +1400,7 @@ libmixer_plugins_a_SOURCES = \
 	src/mixer/plugins/NullMixerPlugin.cxx \
 	src/mixer/plugins/SoftwareMixerPlugin.cxx \
 	src/mixer/plugins/SoftwareMixerPlugin.hxx
+
 libmixer_plugins_a_CPPFLAGS = $(AM_CPPFLAGS) \
 	$(ALSA_CFLAGS) \
 	$(PULSE_CFLAGS)
@@ -1390,7 +1409,10 @@ if ENABLE_ALSA
 liboutput_plugins_a_SOURCES += \
 	src/output/plugins/AlsaOutputPlugin.cxx \
 	src/output/plugins/AlsaOutputPlugin.hxx
-libmixer_plugins_a_SOURCES += src/mixer/plugins/AlsaMixerPlugin.cxx
+libmixer_plugins_a_SOURCES += \
+	src/mixer/plugins/volume_mapping.h \
+	src/mixer/plugins/volume_mapping.c \
+	src/mixer/plugins/AlsaMixerPlugin.cxx
 endif

 if ANDROID
@@ -1573,6 +1595,7 @@ endif

 if ENABLE_EXPAT
 libplaylist_plugins_a_SOURCES += \
+	src/lib/expat/StreamExpatParser.cxx \
 	src/lib/expat/ExpatParser.cxx src/lib/expat/ExpatParser.hxx \
 	src/playlist/plugins/XspfPlaylistPlugin.cxx \
 	src/playlist/plugins/XspfPlaylistPlugin.hxx \
@@ -1758,6 +1781,10 @@ test_run_storage_SOURCES = \
 	test/ScopeIOThread.hxx \
 	test/run_storage.cxx

+if ENABLE_WEBDAV
+test_run_storage_SOURCES += $(CURL_SOURCES)
+endif
+
 endif

 test_run_input_LDADD = \
@@ -2203,6 +2230,7 @@ test_test_icy_parser_LDADD = \
 endif

 test_test_pcm_SOURCES = \
+	test/TestAudioFormat.cxx test/TestAudioFormat.hxx \
 	test/test_pcm_util.hxx \
 	test/test_pcm_dither.cxx \
 	test/test_pcm_pack.cxx \
--- a/76
+++ b/76
@@ -1,3 +1,79 @@
+ver 0.20.7 (2017/05/15)
+* database
+  - simple: fix false positive directory loop detection with NFS
+* enforce a reasonable minimum audio_buffer_size setting
+* cap buffer_before_play at 80% to prevent deadlock
+* fix random crashes when compiled with clang
+
+ver 0.20.6 (2017/03/10)
+* input
+  - curl: fix headers after HTTP redirect to Shoutcast server
+* decoder
+  - ffmpeg: re-enable as fallback
+  - mpcdec: fix crash (division by zero) after seeking
+  - sidplay: make compatible with libsidplayfp < 1.8
+* fix stream tags after automatic song change
+* workaround for GCC 4.9.4 / libstdc++ bug (build failure)
+
+ver 0.20.5 (2017/02/20)
+* tags
+  - id3: fix memory leak on corrupt ID3 tags
+* decoder
+  - sidplay: don't require libsidutils when building with libsidplayfp
+* output
+  - httpd: fix two buffer overflows in IcyMetaData length calculation
+* mixer
+  - alsa: fix crash bug
+
+ver 0.20.4 (2017/02/01)
+* input
+  - nfs: fix freeze after reconnect
+* output
+  - sndio: work around a libroar C++ incompatibility
+* workaround for GCC 4.9 "constexpr" bug
+* fix FreeBSD build failure
+
+ver 0.20.3 (2017/01/25)
+* protocol
+  - "playlistadd" creates new playlist if it does not exist, as documented
+* database
+  - proxy: fix error "terminate called after throwing ..."
+  - proxy: make connect errors during startup non-fatal
+* neighbor
+  - upnp: fix premature expiry
+* replay gain: don't reset ReplayGain levels when unpausing playback
+* silence surround channels when converting from stereo
+* use shortcuts such as "dsd64" in log messages
+
+ver 0.20.2 (2017/01/15)
+* input
+  - alsa: fix crash bug
+  - alsa: fix buffer overruns
+* decoder
+  - flac: add options "probesize" and "analyzeduration"
+* resampler
+  - libsamplerate: reset state after seeking
+* output
+  - fix static noise after changing to a different audio format
+  - alsa: fix the DSD_U32 sample rate
+  - alsa: fix the DSD_U32 byte order
+  - alsa: support DSD_U16
+  - recorder: fix error "Failed to create : No such file or directory"
+* playlist
+  - cue: fix skipping songs
+
+ver 0.20.1 (2017/01/09)
+* input
+  - curl: fix crash bug
+  - curl: fix freeze bug
+* decoder
+  - wavpack: fix crash bug
+* storage
+  - curl: new storage plugin for WebDAV (work in progress)
+* mixer
+  - alsa: normalize displayed volume according to human perception
+* fix crash with volume_normalization enabled
+
 ver 0.20 (2017/01/04)
 * protocol
  - "commands" returns playlist commands only if playlist_directory configured
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ For basic installation information see the INSTALL file.
 - [Manual](http://www.musicpd.org/doc/user/)
 - [Forum](http://forum.musicpd.org/)
 - [IRC](irc://chat.freenode.net/#mpd)
- [Bug tracker](http://bugs.musicpd.org/)
+- [Bug tracker](https://github.com/MusicPlayerDaemon/MPD/issues/)

 # Developers

--- a/android/build.py
+++ b/android/build.py
@@ -87,9 +87,14 @@ class AndroidNdkToolchain:
        self.is_armv7 = self.is_arm and 'armv7' in self.cflags
        self.is_windows = False

-        libstdcxx_path = os.path.join(ndk_path, 'sources/cxx-stl/gnu-libstdc++', gcc_version)
-        libstdcxx_cppflags = '-isystem ' + os.path.join(libstdcxx_path, 'include') + ' -isystem ' + os.path.join(libstdcxx_path, 'libs', android_abi, 'include')
-        libstdcxx_ldadd = os.path.join(libstdcxx_path, 'libs', android_abi, 'libgnustl_static.a')
+        libcxx_path = os.path.join(ndk_path, 'sources/cxx-stl/llvm-libc++')
+        libcxx_libs_path = os.path.join(libcxx_path, 'libs', android_abi)
+
+        libstdcxx_cppflags = '-nostdinc++ -isystem ' + os.path.join(libcxx_path, 'include') + ' -isystem ' + os.path.join(ndk_path, 'sources/android/support/include')
+        libstdcxx_ldadd = os.path.join(libcxx_libs_path, 'libc++_static.a') + ' ' + os.path.join(libcxx_libs_path, 'libc++abi.a')
+
+        if self.is_armv7:
+            libstdcxx_ldadd += ' ' + os.path.join(libcxx_libs_path, 'libunwind.a')

        if use_cxx:
            self.libs += ' ' + libstdcxx_ldadd
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,10 @@
 AC_PREREQ(2.60)

-AC_INIT(mpd, 0.20, musicpd-dev-team@lists.sourceforge.net)
+AC_INIT(mpd, 0.20.7, musicpd-dev-team@lists.sourceforge.net)

 VERSION_MAJOR=0
 VERSION_MINOR=20
-VERSION_REVISION=0
+VERSION_REVISION=7
 VERSION_EXTRA=0

 AC_CONFIG_SRCDIR([src/Main.cxx])
@@ -720,6 +720,19 @@ fi
 MPD_ENABLE_AUTO_PKG(mms, MMS, [libmms >= 0.4],
 	[libmms mms:// protocol support], [libmms not found])

+dnl ---------------------------------------------------------------------------
+dnl Storage Plugins
+dnl ---------------------------------------------------------------------------
+
+MPD_ENABLE_AUTO(webdav, WEBDAV, [WebDAV storage plugin],
+	[WebDAV requires libcurl and libexpat],
+	[auto],
+	[if test x$enable_curl = xyes && test x$enable_expat = xyes; then
+		found_webdav=yes
+	else
+		found_webdav=no
+	fi])
+
 dnl ---------------------------------------------------------------------------
 dnl Playlist Plugins
 dnl ---------------------------------------------------------------------------
@@ -979,7 +992,7 @@ AM_CONDITIONAL(ENABLE_VORBIS_DECODER, test x$enable_vorbis = xyes || test x$enab
 dnl --------------------------------- sidplay ---------------------------------
 if test x$enable_sidplay != xno; then
 	dnl Check for libsidplayfp first
-	PKG_CHECK_MODULES([SIDPLAY], [libsidplayfp libsidutils],
+	PKG_CHECK_MODULES([SIDPLAY], [libsidplayfp],
 		[found_sidplayfp=yes],
 		[found_sidplayfp=no])
 	found_sidplay=$found_sidplayfp
--- a/doc/developer.xml
+++ b/doc/developer.xml
@@ -5,7 +5,7 @@
 <book>
  <title>The Music Player Daemon - Developer's Manual</title>

-  <chapter>
+  <chapter id="introduction">
    <title>Introduction</title>

    <para>
@@ -21,7 +21,7 @@
    </para>
  </chapter>

-  <chapter>
+  <chapter id="code_style">
    <title>Code Style</title>

    <itemizedlist>
@@ -40,21 +40,47 @@

      <listitem>
        <para>
-          the code should be C++11 compliant, and must compile with
+          comment your code, document your APIs
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          the code should be C++14 compliant, and must compile with
          <application>GCC</application> 4.9 and
          <application>clang</application> 3.4
        </para>
      </listitem>

+      <listitem>
+        <para>
+          report error conditions with C++ exceptions, preferable
+          derived from <varname>std::runtime_error</varname>
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          all code must be exception-safe
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          classes and functions names use CamelCase; variables are
+          lower-case with words separated by underscore
+        </para>
+      </listitem>
+
      <listitem>
        <para>
          Some example code:
        </para>

        <programlisting lang="C">static inline int
-foo(const char *abc, int xyz)
+Foo(const char *abc, int xyz)
 {
-        if (abc == NULL) {
+        if (abc == nullptr) {
                LogWarning("Foo happened!");
                return -1;
        }
@@ -66,25 +92,25 @@ foo(const char *abc, int xyz)
    </itemizedlist>
  </chapter>

-  <chapter>
+  <chapter id="hacking">
    <title>Hacking The Source</title>

    <para>
      MPD sources are managed in a git repository on <ulink
-      url="http://git.musicpd.org/">git.musicpd.org</ulink>.
+      url="https://github.com/MusicPlayerDaemon/">GitHub</ulink>.
    </para>

    <para>
      Always write your code against the latest git:
    </para>

-    <programlisting>git clone git://git.musicpd.org/master/mpd.git</programlisting>
+    <programlisting>git clone git://github.com/MusicPlayerDaemon/MPD</programlisting>

    <para>
      If you already have a clone, update it:
    </para>

-    <programlisting>git pull --rebase git://git.musicpd.org/master/mpd.git master</programlisting>
+    <programlisting>git pull --rebase git://github.com/MusicPlayerDaemon/MPD master</programlisting>

    <para>
      You can do without "--rebase", but we recommend that you rebase
@@ -151,7 +177,7 @@ foo(const char *abc, int xyz)
    </section>
  </chapter>

-  <chapter>
+  <chapter id="submitting_patches">
    <title>Submitting Patches</title>

    <para>
@@ -162,14 +188,11 @@ foo(const char *abc, int xyz)
    </para>

    <para>
-      <command>git pull</command> requests are preferred.  Regular
-      contributors can get <ulink
-      url="http://git.musicpd.org/account-policy.html">an account on
-      git.musicpd.org</ulink>, but any public git repository will do.
+      <command>git pull</command> requests are preferred.
    </para>
  </chapter>

-  <chapter>
+  <chapter id="tools">
    <title>Development Tools</title>

    <section>
--- a/doc/include/tags.xml
+++ b/doc/include/tags.xml
@@ -55,7 +55,8 @@

  <listitem>
    <para>
-      <varname>track</varname>: the track number within the album.
+      <varname>track</varname>: the decimal track number within the
+      album.
    </para>
  </listitem>

@@ -103,7 +104,8 @@

  <listitem>
    <para>
-      <varname>disc</varname>: the disc number in a multi-disc album.
+      <varname>disc</varname>: the decimal disc number in a multi-disc
+      album.
    </para>
  </listitem>

--- a/doc/mpd.1
+++ b/doc/mpd.1
@@ -48,8 +48,8 @@ mpd.conf(5), mpc(1)
 .SH BUGS
 If you find a bug, please report it at
 .br
-<\fBhttp://bugs.musicpd.org/bug_report_page.php\fP>.
+<\fBhttps://github.com/MusicPlayerDaemon/MPD/issues/\fP>.
 .SH AUTHORS
-Max Kellermann <max@duempel.org>
+Max Kellermann <max.kellermann@gmail.com>

 Special thanks to all the people that provided feedback and patches.
--- a/doc/protocol.xml
+++ b/doc/protocol.xml
@@ -573,7 +573,12 @@
              <listitem>
                <para>
                  <varname>audio</varname>:
-                  <returnvalue>sampleRate:bits:channels</returnvalue>
+                  <returnvalue>
+                    The format emitted by the decoder plugin during
+                    playback, format:
+                    "<replaceable>samplerate:bits:channels</replaceable>".
+                    Check the user manual for a detailed explanation.
+                  </returnvalue>
                </para>
              </listitem>
              <listitem>
--- a/doc/user.xml
+++ b/doc/user.xml
@@ -135,6 +135,91 @@ apt-get install g++ \
      </para>

      <programlisting>make install</programlisting>
+
+      <section id="windows_build">
+        <title>Compiling for Windows</title>
+
+        <para>
+          Even though it does not "feel" like a Windows application,
+          <application>MPD</application> works well under Windows.
+          Its build process follows the "Linux style", and may seem
+          awkward for Windows people (who are not used to compiling
+          their software, anyway).
+        </para>
+
+        <para>
+          Basically, there are three ways to compile
+          <application>MPD</application> for Windows:
+        </para>
+
+        <orderedlist>
+          <listitem>
+            <para>
+              Build on Windows for Windows.  All you need to do is
+              described above already: configure and make.
+            </para>
+
+            <para>
+              For Windows users, this is kind of unusual, because few
+              Windows users have a GNU toolchain and a UNIX shell
+              installed.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              Build on Linux for Windows.  This is described above
+              already: configure and make.  You need the <ulink
+              url="https://mingw-w64.org/"><application>mingw-w64</application>
+              cross compiler</ulink>.  Pass
+              <parameter>--host=i686-w64-mingw32</parameter> (32 bit)
+              or <parameter>--host=x86_64-w64-mingw32</parameter> (64
+              bit) to configure.
+            </para>
+
+            <para>
+              This is somewhat natural for Linux users.  Many
+              distributions have <application>mingw-w64</application>
+              packages.  The remaining difficulty here is installing
+              all the external libraries.  And
+              <application>MPD</application> usually needs many,
+              making this method cumbersome for the casual user.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              Build on Linux for Windows using the
+              <application>MPD</application>'s library build script.
+            </para>
+          </listitem>
+        </orderedlist>
+
+        <para>
+          This section is about the latter.
+        </para>
+
+        <para>
+          Just like with the native build, unpack the
+          <application>MPD</application> source tarball and change
+          into the directory.  Then, instead of
+          <command>./configure</command>, type:
+        </para>
+
+        <programlisting>./win32/build.py --64</programlisting>
+
+        <para>
+          This downloads various library sources, and then configures
+          and builds <application>MPD</application> (for x64; to build
+          a 32 bit binary, pass <parameter>--32</parameter>).  The
+          resulting EXE files is linked statically, i.e. it contains
+          all the libraries already, and you do not need carry DLLs
+          around.  It is large, but easy to use.  If you wish to have
+          a small <filename>mpd.exe</filename> with DLLs, you need to
+          compile manually, without the <filename>build.py</filename>
+          script.
+        </para>
+      </section>
    </section>

    <section id="systemd_socket">
@@ -576,10 +661,11 @@ systemctl start mpd.socket</programlisting>
              </entry>
              <entry>
                <para>
-                  Always open the audio output with the specified audio
-                  format (samplerate:bits:channels), regardless of the
-                  format of the input file.  This is optional for most
-                  plugins.
+                  Always open the audio output with the specified
+                  audio format
+                  (<replaceable>samplerate:bits:channels</replaceable>),
+                  regardless of the format of the input file.  This is
+                  optional for most plugins.
                </para>
                <para>
                  Any of the three attributes may be an asterisk to
@@ -596,7 +682,20 @@ systemctl start mpd.socket</programlisting>
                  24 bit integer samples padded to 32 bit),
                  <varname>32</varname> (signed 32 bit integer
                  samples), <varname>f</varname> (32 bit floating
-                  point, -1.0 to 1.0).
+                  point, -1.0 to 1.0), "<varname>dsd</varname>" means
+                  DSD (Direct Stream Digital).  For DSD, there are
+                  special cases such as "<varname>dsd64</varname>",
+                  which allows you to omit the sample rate
+                  (e.g. <parameter>dsd512:2</parameter> for stereo
+                  DSD512, i.e. 22.5792 MHz).
+                </para>
+                <para>
+                  The sample rate is special for DSD:
+                  <application>MPD</application> counts the number of
+                  bytes, not bits.  Thus, a DSD "bit" rate of 22.5792
+                  MHz (DSD512) is 2822400 from
+                  <application>MPD</application>'s point of view
+                  (44100*512/8).
                </para>
              </entry>
            </row>
@@ -742,9 +841,11 @@ systemctl start mpd.socket</programlisting>
      <title>Configuring playlist plugins</title>

      <para>
-        Playlist plugins are used to load remote playlists.  This is
-        not related to <application>MPD</application>'s playlist
-        directory.
+        Playlist plugins are used to load remote playlists (protocol
+        commands <command>load</command>,
+        <command>listplaylist</command> and
+        <command>listplaylistinfo</command>).  This is not related to
+        <application>MPD</application>'s playlist directory.
      </para>

      <para>
@@ -1646,7 +1747,7 @@ buffer_size: 16384</programlisting>
      <para>
        If you believe you found a bug in
        <application>MPD</application>, report it on <ulink
-        url="https://bugs.musicpd.org/my_view_page.php">the bug
+        url="https://github.com/MusicPlayerDaemon/MPD/issues/">the bug
        tracker</ulink>.
      </para>

@@ -1800,6 +1901,13 @@ run</programlisting>
          database.
        </para>

+        <para>
+          Note that unless overridden by the below settings (e.g. by
+          setting them to a blank value), general curl configuration
+          from environment variables such as http_proxy or specified
+          in ~/.curlrc will be in effect.
+        </para>
+
        <informaltable>
          <tgroup cols="2">
            <thead>
@@ -1868,11 +1976,23 @@ run</programlisting>
        </para>
      </section>

+      <section id="curl_storage">
+        <title><varname>curl</varname></title>
+
+        <para>
+          A WebDAV client using <filename>libcurl</filename>.  It is
+          used when <varname>music_directory</varname> contains a
+          <parameter>http://</parameter> or
+          <parameter>https://</parameter> URI, for example
+          "<parameter>https://the.server/dav/</parameter>".
+        </para>
+      </section>
+
      <section id="smbclient_storage">
        <title><varname>smbclient</varname></title>

        <para>
-          Load music files from a SMB/CIFS server.  It used used when
+          Load music files from a SMB/CIFS server.  It is used when
          <varname>music_directory</varname> contains a
          <parameter>smb://</parameter> URI, for example
          "<parameter>smb://myfileserver/Music</parameter>".
@@ -1883,7 +2003,7 @@ run</programlisting>
        <title><varname>nfs</varname></title>

        <para>
-          Load music files from a NFS server.  It used used when
+          Load music files from a NFS server.  It is used when
          <varname>music_directory</varname> contains a
          <parameter>nfs://</parameter> URI according to <ulink
          url="http://tools.ietf.org/html/rfc2224">RFC2224</ulink>,
@@ -2194,6 +2314,48 @@ run</programlisting>
          Decodes various codecs using
          <application>FFmpeg</application>.
        </para>
+
+        <informaltable>
+          <tgroup cols="2">
+            <thead>
+              <row>
+                <entry>Setting</entry>
+                <entry>Description</entry>
+              </row>
+            </thead>
+            <tbody>
+              <row>
+                <entry>
+                  <varname>analyzeduration</varname>
+                  <parameter>VALUE</parameter>
+                </entry>
+                <entry>
+                  Sets the FFmpeg muxer option
+                  <varname>analyzeduration</varname>, which specifies
+                  how many microseconds are analyzed to probe the
+                  input.  The <ulink
+                  url="https://ffmpeg.org/ffmpeg-formats.html">FFmpeg
+                  formats documentation</ulink> has more information.
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  <varname>probesize</varname>
+                  <parameter>VALUE</parameter>
+                </entry>
+                <entry>
+                  Sets the FFmpeg muxer option
+                  <varname>probesize</varname>, which specifies
+                  probing size in bytes, i.e. the size of the data to
+                  analyze to get stream information.  The <ulink
+                  url="https://ffmpeg.org/ffmpeg-formats.html">FFmpeg
+                  formats documentation</ulink> has more information.
+                </entry>
+              </row>
+            </tbody>
+          </tgroup>
+        </informaltable>
      </section>

      <section id="flac_decoder">
@@ -3918,7 +4080,7 @@ run</programlisting>
                    (logical "and") can be used to select portions of
                    the format string depending on the existing tag
                    values.  Example:
-                    <parameter>~/.mpd/recorder/[%title|%name%].ogg</parameter>
+                    <parameter>~/.mpd/recorder/[%title%|%name%].ogg</parameter>
                    (use the "name" tag if no title exists)
                  </para>
                </entry>
@@ -4139,6 +4301,22 @@ run</programlisting>
    <section id="playlist_plugins">
      <title>Playlist plugins</title>

+      <section>
+        <title><varname>asx</varname></title>
+
+        <para>
+          Reads <filename>.asx</filename> playlist files.
+        </para>
+      </section>
+
+      <section>
+        <title><varname>cue</varname></title>
+
+        <para>
+          Reads <filename>.cue</filename> files.
+        </para>
+      </section>
+
      <section>
        <title><varname>embcue</varname></title>

@@ -4163,6 +4341,15 @@ run</programlisting>
        </para>
      </section>

+      <section>
+        <title><varname>flac</varname></title>
+
+        <para>
+          Reads the <varname>cuesheet</varname> metablock from a FLAC
+          file.
+        </para>
+      </section>
+
      <section>
        <title><varname>pls</varname></title>

@@ -4171,6 +4358,45 @@ run</programlisting>
        </para>
      </section>

+      <section>
+        <title><varname>rss</varname></title>
+
+        <para>
+          Reads music links from <filename>.rss</filename> files.
+        </para>
+      </section>
+
+      <section>
+        <title><varname>soundcloud</varname></title>
+
+        <para>
+          Download playlist from SoundCloud.  It accepts URIs starting
+          with <filename>soundcloud://</filename>.
+        </para>
+
+        <informaltable>
+          <tgroup cols="2">
+            <thead>
+              <row>
+                <entry>Setting</entry>
+                <entry>Description</entry>
+              </row>
+            </thead>
+            <tbody>
+              <row>
+                <entry>
+                  <varname>apikey</varname>
+                  <parameter>KEY</parameter>
+                </entry>
+                <entry>
+                  An API key to access the SoundCloud servers.
+                </entry>
+              </row>
+            </tbody>
+          </tgroup>
+        </informaltable>
+      </section>
+
      <section>
        <title><varname>xspf</varname></title>

--- a/m4/ucred.m4
+++ b/m4/ucred.m4
@@ -1,6 +1,6 @@
 # Check if "struct ucred" is available.
 #
-# Author: Max Kellermann <max@duempel.org>
+# Author: Max Kellermann <max.kellermann@gmail.com>

 AC_DEFUN([STRUCT_UCRED],[
 	AC_MSG_CHECKING([for struct ucred])
--- a/python/build/libs.py
+++ b/python/build/libs.py
@@ -19,8 +19,8 @@ libvorbis = AutotoolsProject(
 )

 opus = AutotoolsProject(
-    'http://downloads.xiph.org/releases/opus/opus-1.1.3.tar.gz',
-    '32bbb6b557fe1b6066adc0ae1f08b629',
+    'http://downloads.xiph.org/releases/opus/opus-1.1.4.tar.gz',
+    '9122b6b380081dd2665189f97bfd777f04f92dc3ab6698eea1dbb27ad59d8692',
    'lib/libopus.a',
    ['--disable-shared', '--enable-static'],
 )
@@ -36,8 +36,8 @@ flac = AutotoolsProject(
 )

 zlib = ZlibProject(
-    'http://zlib.net/zlib-1.2.8.tar.xz',
-    '28f1205d8dd2001f26fec1e8c2cebe37',
+    'http://zlib.net/zlib-1.2.11.tar.xz',
+    '4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066',
    'lib/libz.a',
 )

@@ -58,8 +58,8 @@ libmad = AutotoolsProject(
 )

 ffmpeg = FfmpegProject(
-    'http://ffmpeg.org/releases/ffmpeg-3.2.2.tar.xz',
-    '3f01bd1fe1a17a277f8c84869e5d9192b4b978cb660872aa2b54c3cc8a2fedfc',
+    'http://ffmpeg.org/releases/ffmpeg-3.3.tar.xz',
+    '599e7f7c017221c22011c4037b88bdcd1c47cd40c1e466838bc3c465f3e9569d',
    'lib/libavcodec.a',
    [
        '--disable-shared', '--enable-static',
@@ -82,8 +82,8 @@ ffmpeg = FfmpegProject(
 )

 curl = AutotoolsProject(
-    'http://curl.haxx.se/download/curl-7.52.1.tar.lzma',
-    '44286d4b825936e2430fc44ad730ce899afb736a5d328cbb8b5d42462f3f2365',
+    'http://curl.haxx.se/download/curl-7.54.0.tar.lzma',
+    'cd6aa6039f13e0b06e0a93e1b93754f6dc07f444812bb6c32be75a8f28c4070a',
    'lib/libcurl.a',
    [
        '--disable-shared', '--enable-static',
@@ -103,7 +103,7 @@ curl = AutotoolsProject(
 )

 boost = BoostProject(
-    'http://downloads.sourceforge.net/project/boost/boost/1.63.0/boost_1_63_0.tar.bz2',
-    'beae2529f759f6b3bf3f4969a19c2e9d6f0c503edcb2de4a61d1428519fcb3b0',
+    'http://downloads.sourceforge.net/project/boost/boost/1.64.0/boost_1_64_0.tar.bz2',
+    '7bcc5caace97baa948931d712ea5f37038dbb1c5d89b43ad4def4ed7cb683332',
    'include/boost/version.hpp',
 )
--- a/src/AudioFormat.cxx
+++ b/src/AudioFormat.cxx
@@ -18,12 +18,13 @@
 */

 #include "AudioFormat.hxx"
+#include "util/StringBuffer.hxx"

 #include <assert.h>
 #include <stdio.h>

 void
-AudioFormat::ApplyMask(AudioFormat mask)
+AudioFormat::ApplyMask(AudioFormat mask) noexcept
 {
 	assert(IsValid());
 	assert(mask.IsMaskValid());
@@ -40,46 +41,24 @@ AudioFormat::ApplyMask(AudioFormat mask)
 	assert(IsValid());
 }

-const char *
-sample_format_to_string(SampleFormat format)
+StringBuffer<24>
+ToString(const AudioFormat af) noexcept
 {
-	switch (format) {
-	case SampleFormat::UNDEFINED:
-		return "?";
+	StringBuffer<24> buffer;

-	case SampleFormat::S8:
-		return "8";
-
-	case SampleFormat::S16:
-		return "16";
-
-	case SampleFormat::S24_P32:
-		return "24";
-
-	case SampleFormat::S32:
-		return "32";
-
-	case SampleFormat::FLOAT:
-		return "f";
-
-	case SampleFormat::DSD:
-		return "dsd";
+	if (af.format == SampleFormat::DSD && af.sample_rate > 0 &&
+	    af.sample_rate % 44100 == 0) {
+		/* use shortcuts such as "dsd64" which implies the
+		   sample rate */
+		snprintf(buffer.data(), buffer.capacity(), "dsd%u:%u",
+			 af.sample_rate * 8 / 44100,
+			 af.channels);
+		return buffer;
 	}

-	/* unreachable */
-	assert(false);
-	gcc_unreachable();
-}
-
-const char *
-audio_format_to_string(const AudioFormat af,
-		       struct audio_format_string *s)
-{
-	assert(s != nullptr);
-
-	snprintf(s->buffer, sizeof(s->buffer), "%u:%s:%u",
+	snprintf(buffer.data(), buffer.capacity(), "%u:%s:%u",
 		 af.sample_rate, sample_format_to_string(af.format),
 		 af.channels);

-	return s->buffer;
+	return buffer;
 }
--- a/src/AudioFormat.hxx
+++ b/src/AudioFormat.hxx
@@ -20,47 +20,14 @@
 #ifndef MPD_AUDIO_FORMAT_HXX
 #define MPD_AUDIO_FORMAT_HXX

+#include "pcm/SampleFormat.hxx"
 #include "Compiler.h"

-#include <stdint.h>
 #include <assert.h>
+#include <stdint.h>
+#include <stddef.h>

-#if defined(WIN32) && GCC_CHECK_VERSION(4,6)
-/* on WIN32, "FLOAT" is already defined, and this triggers -Wshadow */
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wshadow"
-#endif
-
-enum class SampleFormat : uint8_t {
-	UNDEFINED = 0,
-
-	S8,
-	S16,
-
-	/**
-	 * Signed 24 bit integer samples, packed in 32 bit integers
-	 * (the most significant byte is filled with the sign bit).
-	 */
-	S24_P32,
-
-	S32,
-
-	/**
-	 * 32 bit floating point samples in the host's format.  The
-	 * range is -1.0f to +1.0f.
-	 */
-	FLOAT,
-
-	/**
-	 * Direct Stream Digital.  1-bit samples; each frame has one
-	 * byte (8 samples) per channel.
-	 */
-	DSD,
-};
-
-#if defined(WIN32) && GCC_CHECK_VERSION(4,6)
-#pragma GCC diagnostic pop
-#endif
+template<size_t CAPACITY> class StringBuffer;

 static constexpr unsigned MAX_CHANNELS = 8;

@@ -157,7 +124,7 @@ struct AudioFormat {
 		return !(*this == other);
 	}

-	void ApplyMask(AudioFormat mask);
+	void ApplyMask(AudioFormat mask) noexcept;

 	gcc_pure
 	AudioFormat WithMask(AudioFormat mask) const {
@@ -183,13 +150,6 @@ struct AudioFormat {
 	double GetTimeToSize() const;
 };

-/**
- * Buffer for audio_format_string().
- */
-struct audio_format_string {
-	char buffer[24];
-};
-
 /**
 * Checks whether the sample rate is valid.
 *
@@ -201,28 +161,6 @@ audio_valid_sample_rate(unsigned sample_rate)
 	return sample_rate > 0 && sample_rate < (1 << 30);
 }

-/**
- * Checks whether the sample format is valid.
- */
-static inline bool
-audio_valid_sample_format(SampleFormat format)
-{
-	switch (format) {
-	case SampleFormat::S8:
-	case SampleFormat::S16:
-	case SampleFormat::S24_P32:
-	case SampleFormat::S32:
-	case SampleFormat::FLOAT:
-	case SampleFormat::DSD:
-		return true;
-
-	case SampleFormat::UNDEFINED:
-		break;
-	}
-
-	return false;
-}
-
 /**
 * Checks whether the number of channels is valid.
 */
@@ -258,34 +196,6 @@ AudioFormat::IsMaskValid() const
 		(channels == 0 || audio_valid_channel_count(channels));
 }

-gcc_const
-static inline unsigned
-sample_format_size(SampleFormat format)
-{
-	switch (format) {
-	case SampleFormat::S8:
-		return 1;
-
-	case SampleFormat::S16:
-		return 2;
-
-	case SampleFormat::S24_P32:
-	case SampleFormat::S32:
-	case SampleFormat::FLOAT:
-		return 4;
-
-	case SampleFormat::DSD:
-		/* each frame has 8 samples per channel */
-		return 1;
-
-	case SampleFormat::UNDEFINED:
-		return 0;
-	}
-
-	assert(false);
-	gcc_unreachable();
-}
-
 inline unsigned
 AudioFormat::GetSampleSize() const
 {
@@ -304,28 +214,15 @@ AudioFormat::GetTimeToSize() const
 	return sample_rate * GetFrameSize();
 }

-/**
- * Renders a #SampleFormat enum into a string, e.g. for printing it
- * in a log file.
- *
- * @param format a #SampleFormat enum value
- * @return the string
- */
-gcc_pure gcc_malloc
-const char *
-sample_format_to_string(SampleFormat format);
-
 /**
 * Renders the #AudioFormat object into a string, e.g. for printing
 * it in a log file.
 *
 * @param af the #AudioFormat object
- * @param s a buffer to print into
- * @return the string, or nullptr if the #AudioFormat object is invalid
+ * @return the string buffer
 */
-gcc_pure gcc_malloc
-const char *
-audio_format_to_string(AudioFormat af,
-		       struct audio_format_string *s);
+gcc_const
+StringBuffer<24>
+ToString(AudioFormat af) noexcept;

 #endif
--- a/src/AudioParser.cxx
+++ b/src/AudioParser.cxx
@@ -137,6 +137,26 @@ ParseAudioFormat(const char *src, bool mask)
 	AudioFormat dest;
 	dest.Clear();

+	if (strncmp(src, "dsd", 3) == 0) {
+		/* allow format specifications such as "dsd64" which
+		   implies the sample rate */
+
+		char *endptr;
+		auto dsd = strtoul(src + 3, &endptr, 10);
+		if (endptr > src + 3 && *endptr == ':' &&
+		    dsd >= 32 && dsd <= 4096 && dsd % 2 == 0) {
+			dest.sample_rate = dsd * 44100 / 8;
+			dest.format = SampleFormat::DSD;
+
+			src = endptr + 1;
+			dest.channels = ParseChannelCount(src, mask, &src);
+			if (*src != 0)
+				throw FormatRuntimeError("Extra data after channel count: %s", src);
+
+			return dest;
+		}
+	}
+
 	/* parse sample rate */

 	dest.sample_rate = ParseSampleRate(src, mask, &src);
--- a/src/AudioParser.hxx
+++ b/src/AudioParser.hxx
@@ -25,8 +25,6 @@
 #ifndef MPD_AUDIO_PARSER_HXX
 #define MPD_AUDIO_PARSER_HXX

-#include "Compiler.h"
-
 struct AudioFormat;

 /**
@@ -38,7 +36,6 @@ struct AudioFormat;
 * @param src the input string
 * @param mask if true, then "*" is allowed for any number of items
 */
-gcc_pure
 AudioFormat
 ParseAudioFormat(const char *src, bool mask);

--- a/src/CommandLine.cxx
+++ b/src/CommandLine.cxx
@@ -107,7 +107,7 @@ static void version(void)
 	       "\n"
 	       "\n"
 	       "Copyright (C) 2003-2007 Warren Dukes <warren.dukes@gmail.com>\n"
-	       "Copyright (C) 2008-2015 Max Kellermann <max@duempel.org>\n"
+	       "Copyright 2008-2017 Max Kellermann <max.kellermann@gmail.com>\n"
 	       "This is free software; see the source for copying conditions.  There is NO\n"
 	       "warranty; not even MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"

--- a/src/DetachedSong.cxx
+++ b/src/DetachedSong.cxx
@@ -37,19 +37,19 @@ DetachedSong::~DetachedSong()
 }

 bool
-DetachedSong::IsRemote() const
+DetachedSong::IsRemote() const noexcept
 {
 	return uri_has_scheme(GetRealURI());
 }

 bool
-DetachedSong::IsAbsoluteFile() const
+DetachedSong::IsAbsoluteFile() const noexcept
 {
 	return PathTraitsUTF8::IsAbsolute(GetRealURI());
 }

 bool
-DetachedSong::IsInDatabase() const
+DetachedSong::IsInDatabase() const noexcept
 {
 	/* here, we use GetURI() and not GetRealURI() because
 	   GetRealURI() is never relative */
@@ -59,7 +59,7 @@ DetachedSong::IsInDatabase() const
 }

 SignedSongTime
-DetachedSong::GetDuration() const
+DetachedSong::GetDuration() const noexcept
 {
 	SongTime a = start_time, b = end_time;
 	if (!b.IsPositive()) {
--- a/src/DetachedSong.hxx
+++ b/src/DetachedSong.hxx
@@ -63,18 +63,18 @@ class DetachedSong {

 	Tag tag;

-	time_t mtime;
+	time_t mtime = 0;

 	/**
 	 * Start of this sub-song within the file.
 	 */
-	SongTime start_time;
+	SongTime start_time = SongTime::zero();

 	/**
 	 * End of this sub-song within the file.
 	 * Unused if zero.
 	 */
-	SongTime end_time;
+	SongTime end_time = SongTime::zero();

 	explicit DetachedSong(const LightSong &other);

@@ -82,33 +82,25 @@ public:
 	explicit DetachedSong(const DetachedSong &) = default;

 	explicit DetachedSong(const char *_uri)
-		:uri(_uri),
-		 mtime(0),
-		 start_time(SongTime::zero()), end_time(SongTime::zero()) {}
+		:uri(_uri) {}

 	explicit DetachedSong(const std::string &_uri)
-		:uri(_uri),
-		 mtime(0),
-		 start_time(SongTime::zero()), end_time(SongTime::zero()) {}
+		:uri(_uri) {}

 	explicit DetachedSong(std::string &&_uri)
-		:uri(std::move(_uri)),
-		 mtime(0),
-		 start_time(SongTime::zero()), end_time(SongTime::zero()) {}
+		:uri(std::move(_uri)) {}

 	template<typename U>
 	DetachedSong(U &&_uri, Tag &&_tag)
 		:uri(std::forward<U>(_uri)),
-		 tag(std::move(_tag)),
-		 mtime(0),
-		 start_time(SongTime::zero()), end_time(SongTime::zero()) {}
+		 tag(std::move(_tag)) {}

 	DetachedSong(DetachedSong &&) = default;

 	~DetachedSong();

 	gcc_pure
-	const char *GetURI() const {
+	const char *GetURI() const noexcept {
 		return uri.c_str();
 	}

@@ -122,7 +114,7 @@ public:
 	 * displayed URI?
 	 */
 	gcc_pure
-	bool HasRealURI() const {
+	bool HasRealURI() const noexcept {
 		return !real_uri.empty();
 	}

@@ -131,7 +123,7 @@ public:
 	 * GetURI().
 	 */
 	gcc_pure
-	const char *GetRealURI() const {
+	const char *GetRealURI() const noexcept {
 		return (HasRealURI() ? real_uri : uri).c_str();
 	}

@@ -145,17 +137,19 @@ public:
 	 * song.
 	 */
 	gcc_pure
-	bool IsSame(const DetachedSong &other) const {
-		return uri == other.uri;
+	bool IsSame(const DetachedSong &other) const noexcept {
+		return uri == other.uri &&
+			start_time == other.start_time &&
+			end_time == other.end_time;
 	}

 	gcc_pure gcc_nonnull_all
-	bool IsURI(const char *other_uri) const {
+	bool IsURI(const char *other_uri) const noexcept {
 		return uri == other_uri;
 	}

 	gcc_pure
-	bool IsRemote() const;
+	bool IsRemote() const noexcept;

 	gcc_pure
 	bool IsFile() const {
@@ -163,10 +157,10 @@ public:
 	}

 	gcc_pure
-	bool IsAbsoluteFile() const;
+	bool IsAbsoluteFile() const noexcept;

 	gcc_pure
-	bool IsInDatabase() const;
+	bool IsInDatabase() const noexcept;

 	const Tag &GetTag() const {
 		return tag;
@@ -221,7 +215,7 @@ public:
 	}

 	gcc_pure
-	SignedSongTime GetDuration() const;
+	SignedSongTime GetDuration() const noexcept;

 	/**
 	 * Update the #tag and #mtime.
--- a/src/IOThread.cxx
+++ b/src/IOThread.cxx
@@ -96,7 +96,7 @@ io_thread_deinit(void)
 }

 EventLoop &
-io_thread_get()
+io_thread_get() noexcept
 {
 	assert(io.loop != nullptr);

@@ -104,7 +104,7 @@ io_thread_get()
 }

 bool
-io_thread_inside(void)
+io_thread_inside() noexcept
 {
 	return io.thread.IsInside();
 }
--- a/src/IOThread.hxx
+++ b/src/IOThread.hxx
@@ -51,13 +51,13 @@ io_thread_deinit();

 gcc_const
 EventLoop &
-io_thread_get();
+io_thread_get() noexcept;

 /**
 * Is the current thread the I/O thread?
 */
 gcc_pure
 bool
-io_thread_inside();
+io_thread_inside() noexcept;

 #endif
--- a/src/IdleFlags.cxx
+++ b/src/IdleFlags.cxx
@@ -46,13 +46,13 @@ static const char *const idle_names[] = {
 };

 const char*const*
-idle_get_names(void)
+idle_get_names() noexcept
 {
        return idle_names;
 }

 unsigned
-idle_parse_name(const char *name)
+idle_parse_name(const char *name) noexcept
 {
 #if !CLANG_CHECK_VERSION(3,6)
 	/* disabled on clang due to -Wtautological-pointer-compare */
--- a/src/IdleFlags.hxx
+++ b/src/IdleFlags.hxx
@@ -70,8 +70,9 @@ static constexpr unsigned IDLE_MOUNT = 0x1000;
 /**
 * Get idle names
 */
+gcc_const
 const char*const*
-idle_get_names();
+idle_get_names() noexcept;

 /**
 * Parse an idle name and return its mask.  Returns 0 if the given
@@ -79,6 +80,6 @@ idle_get_names();
 */
 gcc_nonnull_all gcc_pure
 unsigned
-idle_parse_name(const char *name);
+idle_parse_name(const char *name) noexcept;

 #endif
--- a/src/Instance.hxx
+++ b/src/Instance.hxx
@@ -117,7 +117,6 @@ struct Instance final
 	 * DatabaseError if this MPD configuration has no database (no
 	 * music_directory was configured).
 	 */
-	gcc_pure
 	const Database &GetDatabaseOrThrow() const;
 #endif

--- a/src/Main.cxx
+++ b/src/Main.cxx
@@ -117,7 +117,13 @@

 #include <limits.h>

-static constexpr unsigned DEFAULT_BUFFER_SIZE = 4096;
+static constexpr size_t KILOBYTE = 1024;
+static constexpr size_t MEGABYTE = 1024 * KILOBYTE;
+
+static constexpr size_t DEFAULT_BUFFER_SIZE = 4 * MEGABYTE;
+static constexpr size_t MIN_BUFFER_SIZE = std::max(CHUNK_SIZE * 32,
+						   64 * KILOBYTE);
+
 static constexpr unsigned DEFAULT_BUFFER_BEFORE_PLAY = 10;

 #ifdef ANDROID
@@ -130,7 +136,6 @@ struct Config {
 	ReplayGainConfig replay_gain;
 };

-gcc_const
 static Config
 LoadConfig()
 {
@@ -203,7 +208,11 @@ glue_db_init_and_load(void)
 				   "because the database does not need it");
 	}

-	instance->database->Open();
+	try {
+		instance->database->Open();
+	} catch (...) {
+		std::throw_with_nested(std::runtime_error("Failed to open database plugin"));
+	}

 	if (!instance->database->IsPlugin(simple_db_plugin))
 		return true;
@@ -303,12 +312,17 @@ initialize_decoder_and_player(const ReplayGainConfig &replay_gain_config)
 			FormatFatalError("buffer size \"%s\" is not a "
 					 "positive integer, line %i",
 					 param->value.c_str(), param->line);
-		buffer_size = tmp;
+		buffer_size = tmp * KILOBYTE;
+
+		if (buffer_size < MIN_BUFFER_SIZE) {
+			FormatWarning(config_domain, "buffer size %lu is too small, using %lu bytes instead",
+				      (unsigned long)buffer_size,
+				      (unsigned long)MIN_BUFFER_SIZE);
+			buffer_size = MIN_BUFFER_SIZE;
+		}
 	} else
 		buffer_size = DEFAULT_BUFFER_SIZE;

-	buffer_size *= 1024;
-
 	const unsigned buffered_chunks = buffer_size / CHUNK_SIZE;

 	if (buffered_chunks >= 1 << 15)
@@ -326,6 +340,19 @@ initialize_decoder_and_player(const ReplayGainConfig &replay_gain_config)
 					 "than 100 percent, line %i",
 					 param->value.c_str(), param->line);
 		}
+
+		if (perc > 80) {
+			/* this upper limit should avoid deadlocks
+			   which can occur because the DecoderThread
+			   cannot ever fill the music buffer to
+			   exactly 100%; a few chunks always need to
+			   be available to generate silence in
+			   Player::SendSilence() */
+			FormatError(config_domain,
+				    "buffer_before_play is too large (%f%%), capping at 80%%; please fix your configuration",
+				    perc);
+			perc = 80;
+		}
 	} else
 		perc = DEFAULT_BUFFER_BEFORE_PLAY;

--- a/src/Mapper.cxx
+++ b/src/Mapper.cxx
@@ -59,14 +59,14 @@ mapper_init(AllocatedPath &&_playlist_dir)
 }

 void
-mapper_finish()
+mapper_finish() noexcept
 {
 }

 #ifdef ENABLE_DATABASE

 AllocatedPath
-map_uri_fs(const char *uri)
+map_uri_fs(const char *uri) noexcept
 {
 	assert(uri != nullptr);
 	assert(*uri != '/');
@@ -86,7 +86,7 @@ map_uri_fs(const char *uri)
 }

 std::string
-map_fs_to_utf8(Path path_fs)
+map_fs_to_utf8(Path path_fs) noexcept
 {
 	if (path_fs.IsAbsolute()) {
 		if (instance->storage == nullptr)
@@ -109,13 +109,13 @@ map_fs_to_utf8(Path path_fs)
 #endif

 const AllocatedPath &
-map_spl_path()
+map_spl_path() noexcept
 {
 	return playlist_dir_fs;
 }

 AllocatedPath
-map_spl_utf8_to_fs(const char *name)
+map_spl_utf8_to_fs(const char *name) noexcept
 {
 	if (playlist_dir_fs.IsNull())
 		return AllocatedPath::Null();
--- a/src/Mapper.hxx
+++ b/src/Mapper.hxx
@@ -37,7 +37,7 @@ void
 mapper_init(AllocatedPath &&playlist_dir);

 void
-mapper_finish();
+mapper_finish() noexcept;

 #ifdef ENABLE_DATABASE

@@ -48,7 +48,7 @@ mapper_finish();
 */
 gcc_pure
 AllocatedPath
-map_uri_fs(const char *uri);
+map_uri_fs(const char *uri) noexcept;

 /**
 * Maps a file system path (relative to the music directory or
@@ -60,7 +60,7 @@ map_uri_fs(const char *uri);
 */
 gcc_pure
 std::string
-map_fs_to_utf8(Path path_fs);
+map_fs_to_utf8(Path path_fs) noexcept;

 #endif

@@ -69,7 +69,7 @@ map_fs_to_utf8(Path path_fs);
 */
 gcc_const
 const AllocatedPath &
-map_spl_path();
+map_spl_path() noexcept;

 /**
 * Maps a playlist name (without the ".m3u" suffix) to a file system
@@ -79,6 +79,6 @@ map_spl_path();
 */
 gcc_pure
 AllocatedPath
-map_spl_utf8_to_fs(const char *name);
+map_spl_utf8_to_fs(const char *name) noexcept;

 #endif
--- a/src/MusicBuffer.cxx
+++ b/src/MusicBuffer.cxx
@@ -23,19 +23,19 @@

 #include <assert.h>

-MusicBuffer::MusicBuffer(unsigned num_chunks)
+MusicBuffer::MusicBuffer(unsigned num_chunks) noexcept
 	:buffer(num_chunks) {
 }

 MusicChunk *
-MusicBuffer::Allocate()
+MusicBuffer::Allocate() noexcept
 {
 	const std::lock_guard<Mutex> protect(mutex);
 	return buffer.Allocate();
 }

 void
-MusicBuffer::Return(MusicChunk *chunk)
+MusicBuffer::Return(MusicChunk *chunk) noexcept
 {
 	assert(chunk != nullptr);

--- a/src/MusicBuffer.hxx
+++ b/src/MusicBuffer.hxx
@@ -41,7 +41,7 @@ public:
 	 * @param num_chunks the number of #MusicChunk reserved in
 	 * this buffer
 	 */
-	MusicBuffer(unsigned num_chunks);
+	MusicBuffer(unsigned num_chunks) noexcept;

 #ifndef NDEBUG
 	/**
@@ -71,13 +71,13 @@ public:
 	 * @return an empty chunk or nullptr if there are no chunks
 	 * available
 	 */
-	MusicChunk *Allocate();
+	MusicChunk *Allocate() noexcept;

 	/**
 	 * Returns a chunk to the buffer.  It can be reused by
 	 * Allocate() then.
 	 */
-	void Return(MusicChunk *chunk);
+	void Return(MusicChunk *chunk) noexcept;
 };

 #endif
--- a/src/MusicChunk.cxx
+++ b/src/MusicChunk.cxx
@@ -31,7 +31,7 @@ MusicChunk::~MusicChunk()

 #ifndef NDEBUG
 bool
-MusicChunk::CheckFormat(const AudioFormat other_format) const
+MusicChunk::CheckFormat(const AudioFormat other_format) const noexcept
 {
 	assert(other_format.IsValid());

@@ -41,7 +41,7 @@ MusicChunk::CheckFormat(const AudioFormat other_format) const

 WritableBuffer<void>
 MusicChunk::Write(const AudioFormat af,
-		  SongTime data_time, uint16_t _bit_rate)
+		  SongTime data_time, uint16_t _bit_rate) noexcept
 {
 	assert(CheckFormat(af));
 	assert(length == 0 || audio_format.IsValid());
@@ -64,7 +64,7 @@ MusicChunk::Write(const AudioFormat af,
 }

 bool
-MusicChunk::Expand(const AudioFormat af, size_t _length)
+MusicChunk::Expand(const AudioFormat af, size_t _length) noexcept
 {
 	const size_t frame_size = af.GetFrameSize();

--- a/src/MusicChunk.hxx
+++ b/src/MusicChunk.hxx
@@ -111,7 +111,7 @@ struct MusicChunk {
 	 * specified audio_format.
 	 */
 	gcc_pure
-	bool CheckFormat(AudioFormat audio_format) const;
+	bool CheckFormat(AudioFormat audio_format) const noexcept;
 #endif

 	/**
@@ -127,7 +127,7 @@ struct MusicChunk {
 	 */
 	WritableBuffer<void> Write(AudioFormat af,
 				   SongTime data_time,
-				   uint16_t bit_rate);
+				   uint16_t bit_rate) noexcept;

 	/**
 	 * Increases the length of the chunk after the caller has written to
@@ -138,7 +138,7 @@ struct MusicChunk {
 	 * @param length the number of bytes which were appended
 	 * @return true if the chunk is full
 	 */
-	bool Expand(AudioFormat af, size_t length);
+	bool Expand(AudioFormat af, size_t length) noexcept;
 };

 #endif
--- a/src/MusicPipe.cxx
+++ b/src/MusicPipe.cxx
@@ -25,7 +25,7 @@
 #ifndef NDEBUG

 bool
-MusicPipe::Contains(const MusicChunk *chunk) const
+MusicPipe::Contains(const MusicChunk *chunk) const noexcept
 {
 	const std::lock_guard<Mutex> protect(mutex);

--- a/src/MusicPipe.hxx
+++ b/src/MusicPipe.hxx
@@ -86,7 +86,7 @@ public:
 	 * Checks if the specified chunk is enqueued in the music pipe.
 	 */
 	gcc_pure
-	bool Contains(const MusicChunk *chunk) const;
+	bool Contains(const MusicChunk *chunk) const noexcept;
 #endif

 	/**
--- a/src/Partition.cxx
+++ b/src/Partition.cxx
@@ -141,9 +141,9 @@ Partition::OnMixerVolumeChanged(gcc_unused Mixer &mixer, gcc_unused int volume)
 void
 Partition::OnGlobalEvent(unsigned mask)
 {
-	if ((mask & TAG_MODIFIED) != 0)
-		TagModified();
-
 	if ((mask & SYNC_WITH_PLAYER) != 0)
 		SyncWithPlayer();
+
+	if ((mask & TAG_MODIFIED) != 0)
+		TagModified();
 }
--- a/src/Partition.hxx
+++ b/src/Partition.hxx
@@ -200,7 +200,6 @@ struct Partition final : QueueListener, PlayerListener, MixerListener {
 	 */
 	const Database *GetDatabase() const;

-	gcc_pure
 	const Database &GetDatabaseOrThrow() const;

 	/**
--- a/src/Permission.cxx
+++ b/src/Permission.cxx
@@ -49,7 +49,6 @@ static std::map<std::string, unsigned> permission_passwords;

 static unsigned permission_default;

-gcc_pure
 static unsigned
 ParsePermission(const char *p)
 {
--- a/src/PlaylistFile.cxx
+++ b/src/PlaylistFile.cxx
@@ -335,7 +335,7 @@ try {
 	const auto path_fs = spl_map_to_fs(utf8path);
 	assert(!path_fs.IsNull());

-	FileOutputStream fos(path_fs, FileOutputStream::Mode::APPEND_EXISTING);
+	FileOutputStream fos(path_fs, FileOutputStream::Mode::APPEND_OR_CREATE);

 	if (fos.Tell() / (MPD_PATH_MAX + 1) >= playlist_max_length)
 		throw PlaylistError(PlaylistResult::TOO_LARGE,
--- a/src/ReplayGainInfo.cxx
+++ b/src/ReplayGainInfo.cxx
@@ -24,7 +24,7 @@
 #include <math.h>

 float
-ReplayGainTuple::CalculateScale(const ReplayGainConfig &config) const
+ReplayGainTuple::CalculateScale(const ReplayGainConfig &config) const noexcept
 {
 	float scale;

--- a/src/ReplayGainInfo.hxx
+++ b/src/ReplayGainInfo.hxx
@@ -40,23 +40,23 @@ struct ReplayGainTuple {
 	}

 	gcc_pure
-	float CalculateScale(const ReplayGainConfig &config) const;
+	float CalculateScale(const ReplayGainConfig &config) const noexcept;
 };

 struct ReplayGainInfo {
 	ReplayGainTuple track, album;

-	constexpr bool IsDefined() const {
+	constexpr bool IsDefined() const noexcept {
 		return track.IsDefined() || album.IsDefined();
 	}

-	const ReplayGainTuple &Get(ReplayGainMode mode) const {
+	const ReplayGainTuple &Get(ReplayGainMode mode) const noexcept {
 		return mode == ReplayGainMode::ALBUM
 			? (album.IsDefined() ? album : track)
 			: (track.IsDefined() ? track : album);
 	}

-	void Clear() {
+	void Clear() noexcept {
 		track.Clear();
 		album.Clear();
 	}
--- a/src/ReplayGainMode.cxx
+++ b/src/ReplayGainMode.cxx
@@ -25,7 +25,7 @@
 #include <string.h>

 const char *
-ToString(ReplayGainMode mode)
+ToString(ReplayGainMode mode) noexcept
 {
 	switch (mode) {
 	case ReplayGainMode::AUTO:
--- a/src/ReplayGainMode.hxx
+++ b/src/ReplayGainMode.hxx
@@ -36,13 +36,12 @@ enum class ReplayGainMode : uint8_t {
 */
 gcc_pure
 const char *
-ToString(ReplayGainMode mode);
+ToString(ReplayGainMode mode) noexcept;

 /**
 * Parse a string to a #ReplayGainMode.  Throws std::runtime_error on
 * error.
 */
-gcc_pure
 ReplayGainMode
 FromString(const char *s);

--- a/src/SongFilter.cxx
+++ b/src/SongFilter.cxx
@@ -25,9 +25,12 @@
 #include "util/ConstBuffer.hxx"
 #include "util/StringAPI.hxx"
 #include "util/ASCII.hxx"
+#include "util/TimeParser.hxx"
 #include "util/UriUtil.hxx"
 #include "lib/icu/Collate.hxx"

+#include <stdexcept>
+
 #include <assert.h>
 #include <stdlib.h>

@@ -36,7 +39,7 @@
 #define LOCATE_TAG_ANY_KEY      "any"

 unsigned
-locate_parse_type(const char *str)
+locate_parse_type(const char *str) noexcept
 {
 	if (StringEqualsCaseASCII(str, LOCATE_TAG_FILE_KEY) ||
 	    StringEqualsCaseASCII(str, LOCATE_TAG_FILE_KEY_OLD))
@@ -54,7 +57,6 @@ locate_parse_type(const char *str)
 	return tag_name_parse_i(str);
 }

-gcc_pure
 static AllocatedString<>
 ImportString(const char *p, bool fold_case)
 {
@@ -75,7 +77,7 @@ SongFilter::Item::Item(unsigned _tag, time_t _time)
 }

 bool
-SongFilter::Item::StringMatch(const char *s) const
+SongFilter::Item::StringMatch(const char *s) const noexcept
 {
 #if !CLANG_CHECK_VERSION(3,6)
 	/* disabled on clang due to -Wtautological-pointer-compare */
@@ -94,14 +96,14 @@ SongFilter::Item::StringMatch(const char *s) const
 }

 bool
-SongFilter::Item::Match(const TagItem &item) const
+SongFilter::Item::Match(const TagItem &item) const noexcept
 {
 	return (tag == LOCATE_TAG_ANY_TYPE || (unsigned)item.type == tag) &&
 		StringMatch(item.value);
 }

 bool
-SongFilter::Item::Match(const Tag &_tag) const
+SongFilter::Item::Match(const Tag &_tag) const noexcept
 {
 	bool visited_types[TAG_NUM_OF_ITEM_TYPES];
 	std::fill_n(visited_types, size_t(TAG_NUM_OF_ITEM_TYPES), false);
@@ -137,7 +139,7 @@ SongFilter::Item::Match(const Tag &_tag) const
 }

 bool
-SongFilter::Item::Match(const DetachedSong &song) const
+SongFilter::Item::Match(const DetachedSong &song) const noexcept
 {
 	if (tag == LOCATE_TAG_BASE_TYPE)
 		return uri_is_child_or_same(value.c_str(), song.GetURI());
@@ -152,7 +154,7 @@ SongFilter::Item::Match(const DetachedSong &song) const
 }

 bool
-SongFilter::Item::Match(const LightSong &song) const
+SongFilter::Item::Match(const LightSong &song) const noexcept
 {
 	if (tag == LOCATE_TAG_BASE_TYPE) {
 		const auto uri = song.GetURI();
@@ -180,27 +182,9 @@ SongFilter::~SongFilter()
 	/* this destructor exists here just so it won't get inlined */
 }

-#if !defined(__GLIBC__) && !defined(WIN32)
-
-/**
- * Determine the time zone offset in a portable way.
- */
-gcc_const
-static time_t
-GetTimeZoneOffset()
-{
-	time_t t = 1234567890;
-	struct tm tm;
-	tm.tm_isdst = 0;
-	gmtime_r(&t, &tm);
-	return t - mktime(&tm);
-}
-
-#endif
-
 gcc_pure
 static time_t
-ParseTimeStamp(const char *s)
+ParseTimeStamp(const char *s) noexcept
 {
 	assert(s != nullptr);

@@ -210,26 +194,13 @@ ParseTimeStamp(const char *s)
 		/* it's an integral UNIX time stamp */
 		return (time_t)value;

-#ifdef WIN32
-	/* TODO: emulate strptime()? */
-	return 0;
-#else
-	/* try ISO 8601 */
-
-	struct tm tm;
-	const char *end = strptime(s, "%FT%TZ", &tm);
-	if (end == nullptr || *end != 0)
+	try {
+		/* try ISO 8601 */
+		const auto t = ParseTimePoint(s, "%FT%TZ");
+		return std::chrono::system_clock::to_time_t(t);
+	} catch (const std::runtime_error &) {
 		return 0;
-
-#ifdef __GLIBC__
-	/* timegm() is a GNU extension */
-	return timegm(&tm);
-#else
-	tm.tm_isdst = 0;
-	return mktime(&tm) + GetTimeZoneOffset();
-#endif /* !__GLIBC__ */
-
-#endif /* !WIN32 */
+	}
 }

 bool
@@ -274,7 +245,7 @@ SongFilter::Parse(ConstBuffer<const char *> args, bool fold_case)
 }

 bool
-SongFilter::Match(const DetachedSong &song) const
+SongFilter::Match(const DetachedSong &song) const noexcept
 {
 	for (const auto &i : items)
 		if (!i.Match(song))
@@ -284,7 +255,7 @@ SongFilter::Match(const DetachedSong &song) const
 }

 bool
-SongFilter::Match(const LightSong &song) const
+SongFilter::Match(const LightSong &song) const noexcept
 {
 	for (const auto &i : items)
 		if (!i.Match(song))
@@ -294,7 +265,7 @@ SongFilter::Match(const LightSong &song) const
 }

 bool
-SongFilter::HasOtherThanBase() const
+SongFilter::HasOtherThanBase() const noexcept
 {
 	for (const auto &i : items)
 		if (i.GetTag() != LOCATE_TAG_BASE_TYPE)
@@ -304,7 +275,7 @@ SongFilter::HasOtherThanBase() const
 }

 const char *
-SongFilter::GetBase() const
+SongFilter::GetBase() const noexcept
 {
 	for (const auto &i : items)
 		if (i.GetTag() == LOCATE_TAG_BASE_TYPE)
--- a/src/SongFilter.hxx
+++ b/src/SongFilter.hxx
@@ -80,19 +80,19 @@ public:
 		}

 		gcc_pure gcc_nonnull(2)
-		bool StringMatch(const char *s) const;
+		bool StringMatch(const char *s) const noexcept;

 		gcc_pure
-		bool Match(const TagItem &tag_item) const;
+		bool Match(const TagItem &tag_item) const noexcept;

 		gcc_pure
-		bool Match(const Tag &tag) const;
+		bool Match(const Tag &tag) const noexcept;

 		gcc_pure
-		bool Match(const DetachedSong &song) const;
+		bool Match(const DetachedSong &song) const noexcept;

 		gcc_pure
-		bool Match(const LightSong &song) const;
+		bool Match(const LightSong &song) const noexcept;
 	};

 private:
@@ -112,20 +112,20 @@ public:
 	bool Parse(ConstBuffer<const char *> args, bool fold_case=false);

 	gcc_pure
-	bool Match(const Tag &tag) const;
+	bool Match(const Tag &tag) const noexcept;

 	gcc_pure
-	bool Match(const DetachedSong &song) const;
+	bool Match(const DetachedSong &song) const noexcept;

 	gcc_pure
-	bool Match(const LightSong &song) const;
+	bool Match(const LightSong &song) const noexcept;

-	const std::list<Item> &GetItems() const {
+	const std::list<Item> &GetItems() const noexcept {
 		return items;
 	}

 	gcc_pure
-	bool IsEmpty() const {
+	bool IsEmpty() const noexcept {
 		return items.empty();
 	}

@@ -133,7 +133,7 @@ public:
 	 * Is there at least one item with "fold case" enabled?
 	 */
 	gcc_pure
-	bool HasFoldCase() const {
+	bool HasFoldCase() const noexcept {
 		for (const auto &i : items)
 			if (i.GetFoldCase())
 				return true;
@@ -145,14 +145,14 @@ public:
 	 * Does this filter contain constraints other than "base"?
 	 */
 	gcc_pure
-	bool HasOtherThanBase() const;
+	bool HasOtherThanBase() const noexcept;

 	/**
 	 * Returns the "base" specification (if there is one) or
 	 * nullptr.
 	 */
 	gcc_pure
-	const char *GetBase() const;
+	const char *GetBase() const noexcept;
 };

 /**
@@ -160,6 +160,6 @@ public:
 */
 gcc_pure
 unsigned
-locate_parse_type(const char *str);
+locate_parse_type(const char *str) noexcept;

 #endif
--- a/src/StateFile.cxx
+++ b/src/StateFile.cxx
@@ -50,7 +50,7 @@ StateFile::StateFile(AllocatedPath &&_path,
 }

 void
-StateFile::RememberVersions()
+StateFile::RememberVersions() noexcept
 {
 	prev_volume_version = sw_volume_state_get_hash();
 	prev_output_version = audio_output_state_get_version();
@@ -59,7 +59,7 @@ StateFile::RememberVersions()
 }

 bool
-StateFile::IsModified() const
+StateFile::IsModified() const noexcept
 {
 	return prev_volume_version != sw_volume_state_get_hash() ||
 		prev_output_version != audio_output_state_get_version() ||
--- a/src/StateFile.hxx
+++ b/src/StateFile.hxx
@@ -67,14 +67,14 @@ private:
 	/**
 	 * Save the current state versions for use with IsModified().
 	 */
-	void RememberVersions();
+	void RememberVersions() noexcept;

 	/**
 	 * Check if MPD's state was modified since the last
 	 * RememberVersions() call.
 	 */
 	gcc_pure
-	bool IsModified() const;
+	bool IsModified() const noexcept;

 	/* virtual methods from TimeoutMonitor */
 	void OnTimeout() override;
--- a/src/TagStream.cxx
+++ b/src/TagStream.cxx
@@ -40,7 +40,7 @@
 gcc_pure
 static bool
 CheckDecoderPlugin(const DecoderPlugin &plugin,
-		   const char *suffix, const char *mime)
+		   const char *suffix, const char *mime) noexcept
 {
 	return (mime != nullptr && plugin.SupportsMimeType(mime)) ||
 		(suffix != nullptr && plugin.SupportsSuffix(suffix));
--- a/src/archive/ArchiveLookup.cxx
+++ b/src/archive/ArchiveLookup.cxx
@@ -28,7 +28,7 @@

 gcc_pure
 static char *
-FindSlash(char *p, size_t i)
+FindSlash(char *p, size_t i) noexcept
 {
 	for (; i > 0; --i)
 		if (p[i] == '/')
@@ -39,7 +39,7 @@ FindSlash(char *p, size_t i)

 gcc_pure
 static const char *
-FindSuffix(const char *p, const char *i)
+FindSuffix(const char *p, const char *i) noexcept
 {
 	for (; i > p; --i) {
 		if (*i == '.')
--- a/src/archive/plugins/Bzip2ArchivePlugin.cxx
+++ b/src/archive/plugins/Bzip2ArchivePlugin.cxx
@@ -93,7 +93,7 @@ public:
 	~Bzip2InputStream();

 	/* virtual methods from InputStream */
-	bool IsEOF() override;
+	bool IsEOF() noexcept override;
 	size_t Read(void *ptr, size_t size) override;

 private:
@@ -205,7 +205,7 @@ Bzip2InputStream::Read(void *ptr, size_t length)
 }

 bool
-Bzip2InputStream::IsEOF()
+Bzip2InputStream::IsEOF() noexcept
 {
 	return eof;
 }
--- a/src/archive/plugins/Iso9660ArchivePlugin.cxx
+++ b/src/archive/plugins/Iso9660ArchivePlugin.cxx
@@ -162,7 +162,7 @@ public:
 	}

 	/* virtual methods from InputStream */
-	bool IsEOF() override;
+	bool IsEOF() noexcept override;
 	size_t Read(void *ptr, size_t size) override;
 };

@@ -213,7 +213,7 @@ Iso9660InputStream::Read(void *ptr, size_t read_size)
 }

 bool
-Iso9660InputStream::IsEOF()
+Iso9660InputStream::IsEOF() noexcept
 {
 	return offset == size;
 }
--- a/src/archive/plugins/ZzipArchivePlugin.cxx
+++ b/src/archive/plugins/ZzipArchivePlugin.cxx
@@ -116,7 +116,7 @@ struct ZzipInputStream final : public InputStream {
 	}

 	/* virtual methods from InputStream */
-	bool IsEOF() override;
+	bool IsEOF() noexcept override;
 	size_t Read(void *ptr, size_t size) override;
 	void Seek(offset_type offset) override;
 };
@@ -147,7 +147,7 @@ ZzipInputStream::Read(void *ptr, size_t read_size)
 }

 bool
-ZzipInputStream::IsEOF()
+ZzipInputStream::IsEOF() noexcept
 {
 	return offset_type(zzip_tell(file)) == size;
 }
--- a/src/client/Client.cxx
+++ b/src/client/Client.cxx
@@ -28,7 +28,7 @@ const Domain client_domain("client");
 #ifdef ENABLE_DATABASE

 const Database *
-Client::GetDatabase() const
+Client::GetDatabase() const noexcept
 {
 	return partition.instance.GetDatabase();
 }
@@ -40,7 +40,7 @@ Client::GetDatabaseOrThrow() const
 }

 const Storage *
-Client::GetStorage() const
+Client::GetStorage() const noexcept
 {
 	return partition.instance.storage;
 }
--- a/src/client/Client.hxx
+++ b/src/client/Client.hxx
@@ -160,7 +160,7 @@ public:
 	};

 	gcc_pure
-	bool IsSubscribed(const char *channel_name) const {
+	bool IsSubscribed(const char *channel_name) const noexcept {
 		return subscriptions.find(channel_name) != subscriptions.end();
 	}

@@ -186,16 +186,15 @@ public:
 	 * Wrapper for Instance::GetDatabase().
 	 */
 	gcc_pure
-	const Database *GetDatabase() const;
+	const Database *GetDatabase() const noexcept;

 	/**
 	 * Wrapper for Instance::GetDatabaseOrThrow().
 	 */
-	gcc_pure
 	const Database &GetDatabaseOrThrow() const;

 	gcc_pure
-	const Storage *GetStorage() const;
+	const Storage *GetStorage() const noexcept;

 private:
 	/* virtual methods from class BufferedSocket */
--- a/src/client/ClientMessage.cxx
+++ b/src/client/ClientMessage.cxx
@@ -23,14 +23,14 @@

 gcc_const
 static bool
-valid_channel_char(const char ch)
+valid_channel_char(const char ch) noexcept
 {
 	return IsAlphaNumericASCII(ch) ||
 		ch == '_' || ch == '-' || ch == '.' || ch == ':';
 }

 bool
-client_message_valid_channel_name(const char *name)
+client_message_valid_channel_name(const char *name) noexcept
 {
 	do {
 		if (!valid_channel_char(*name))
--- a/src/client/ClientMessage.hxx
+++ b/src/client/ClientMessage.hxx
@@ -53,6 +53,6 @@ public:

 gcc_pure
 bool
-client_message_valid_channel_name(const char *name);
+client_message_valid_channel_name(const char *name) noexcept;

 #endif
--- a/src/command/CommandError.cxx
+++ b/src/command/CommandError.cxx
@@ -29,9 +29,32 @@

 #include <assert.h>

+#define GLIBCXX_490 20140422
+#define GLIBCXX_491 20140716
+#define GLIBCXX_492 20141030
+#define GLIBCXX_492_Debian_9 20141220
+#define GLIBCXX_493 20150626
+#define GLIBCXX_494 20160803
+#define GLIBCXX_49X_NDK_r13b 20150123
+
+/* the big mess attempts to detect whether we're compiling with
+   libstdc++ 4.9.x; __GLIBCXX__ is a date tag and cannot be used to
+   check the major version; and just checking the compiler version
+   isn't enough, because somebody could use an old libstdc++ with
+   clang - SIGH! */
+#if GCC_OLDER_THAN(5,0) || (defined(__GLIBCXX__) &&		     \
+	(__GLIBCXX__ == GLIBCXX_490 || __GLIBCXX__ == GLIBCXX_491 || \
+	 __GLIBCXX__ == GLIBCXX_492 || \
+	 __GLIBCXX__ == GLIBCXX_492_Debian_9 || \
+	 __GLIBCXX__ == GLIBCXX_493 || \
+	 __GLIBCXX__ == GLIBCXX_494 || \
+	 __GLIBCXX__ == GLIBCXX_49X_NDK_r13b))
+#define GLIBCXX_49X
+#endif
+
 gcc_const
 static enum ack
-ToAck(PlaylistResult result)
+ToAck(PlaylistResult result) noexcept
 {
 	switch (result) {
 	case PlaylistResult::SUCCESS:
@@ -67,7 +90,7 @@ ToAck(PlaylistResult result)
 #ifdef ENABLE_DATABASE
 gcc_const
 static enum ack
-ToAck(DatabaseErrorCode code)
+ToAck(DatabaseErrorCode code) noexcept
 {
 	switch (code) {
 	case DatabaseErrorCode::DISABLED:
@@ -84,7 +107,7 @@ ToAck(DatabaseErrorCode code)

 gcc_pure
 static enum ack
-ToAck(std::exception_ptr ep)
+ToAck(std::exception_ptr ep) noexcept
 {
 	try {
 		std::rethrow_exception(ep);
@@ -100,13 +123,13 @@ ToAck(std::exception_ptr ep)
 		return ACK_ERROR_SYSTEM;
 	} catch (const std::invalid_argument &e) {
 		return ACK_ERROR_ARG;
-#if defined(__GLIBCXX__) && __GLIBCXX__ < 20151204
+#ifdef GLIBCXX_49X
 	} catch (const std::exception &e) {
 #else
 	} catch (...) {
 #endif
 		try {
-#if defined(__GLIBCXX__) && __GLIBCXX__ < 20151204
+#ifdef GLIBCXX_49X
 			/* workaround for g++ 4.x: no overload for
 			   rethrow_exception(exception_ptr) */
 			std::rethrow_if_nested(e);
--- a/src/command/FileCommands.cxx
+++ b/src/command/FileCommands.cxx
@@ -44,7 +44,7 @@

 gcc_pure
 static bool
-SkipNameFS(PathTraitsFS::const_pointer_type name_fs)
+SkipNameFS(PathTraitsFS::const_pointer_type name_fs) noexcept
 {
 	return name_fs[0] == '.' &&
 		(name_fs[1] == 0 ||
@@ -53,7 +53,7 @@ SkipNameFS(PathTraitsFS::const_pointer_type name_fs)

 gcc_pure
 static bool
-skip_path(Path name_fs)
+skip_path(Path name_fs) noexcept
 {
 	return name_fs.HasNewline();
 }
@@ -107,7 +107,7 @@ handle_listfiles_local(Response &r, Path path_fs)

 gcc_pure
 static bool
-IsValidName(const char *p)
+IsValidName(const char *p) noexcept
 {
 	if (!IsAlphaASCII(*p))
 		return false;
@@ -123,7 +123,7 @@ IsValidName(const char *p)

 gcc_pure
 static bool
-IsValidValue(const char *p)
+IsValidValue(const char *p) noexcept
 {
 	while (*p) {
 		const char ch = *p++;
--- a/src/command/NeighborCommands.cxx
+++ b/src/command/NeighborCommands.cxx
@@ -30,7 +30,7 @@
 #include <string>

 bool
-neighbor_commands_available(const Instance &instance)
+neighbor_commands_available(const Instance &instance) noexcept
 {
 	return instance.neighbors != nullptr;
 }
--- a/src/command/NeighborCommands.hxx
+++ b/src/command/NeighborCommands.hxx
@@ -30,7 +30,7 @@ class Response;

 gcc_pure
 bool
-neighbor_commands_available(const Instance &instance);
+neighbor_commands_available(const Instance &instance) noexcept;

 CommandResult
 handle_listneighbors(Client &client, Request request, Response &response);
--- a/src/command/PlayerCommands.cxx
+++ b/src/command/PlayerCommands.cxx
@@ -30,6 +30,7 @@
 #include "Instance.hxx"
 #include "Idle.hxx"
 #include "AudioFormat.hxx"
+#include "util/StringBuffer.hxx"
 #include "util/ScopeExit.hxx"
 #include "util/Exception.hxx"

@@ -171,13 +172,9 @@ handle_status(Client &client, gcc_unused Request args, Response &r)
 			r.Format("duration: %1.3f\n",
 				 player_status.total_time.ToDoubleS());

-		if (player_status.audio_format.IsDefined()) {
-			struct audio_format_string af_string;
-
+		if (player_status.audio_format.IsDefined())
 			r.Format(COMMAND_STATUS_AUDIO ": %s\n",
-				 audio_format_to_string(player_status.audio_format,
-							&af_string));
-		}
+				 ToString(player_status.audio_format).c_str());
 	}

 #ifdef ENABLE_DATABASE
--- a/src/command/PlaylistCommands.cxx
+++ b/src/command/PlaylistCommands.cxx
@@ -39,7 +39,7 @@
 #include "util/ConstBuffer.hxx"

 bool
-playlist_commands_available()
+playlist_commands_available() noexcept
 {
 	return !map_spl_path().IsNull();
 }
--- a/src/command/PlaylistCommands.hxx
+++ b/src/command/PlaylistCommands.hxx
@@ -29,7 +29,7 @@ class Response;

 gcc_const
 bool
-playlist_commands_available();
+playlist_commands_available() noexcept;

 CommandResult
 handle_save(Client &client, Request request, Response &response);
--- a/src/command/StorageCommands.cxx
+++ b/src/command/StorageCommands.cxx
@@ -45,7 +45,7 @@

 gcc_pure
 static bool
-skip_path(const char *name_utf8)
+skip_path(const char *name_utf8) noexcept
 {
 	return strchr(name_utf8, '\n') != nullptr;
 }
--- a/src/config/Block.cxx
+++ b/src/config/Block.cxx
@@ -68,7 +68,7 @@ ConfigBlock::~ConfigBlock()
 }

 const BlockParam *
-ConfigBlock::GetBlockParam(const char *name) const
+ConfigBlock::GetBlockParam(const char *name) const noexcept
 {
 	for (const auto &i : block_params) {
 		if (i.name == name) {
@@ -81,7 +81,8 @@ ConfigBlock::GetBlockParam(const char *name) const
 }

 const char *
-ConfigBlock::GetBlockValue(const char *name, const char *default_value) const
+ConfigBlock::GetBlockValue(const char *name,
+			   const char *default_value) const noexcept
 {
 	const BlockParam *bp = GetBlockParam(name);
 	if (bp == nullptr)
@@ -128,7 +129,6 @@ ConfigBlock::GetBlockValue(const char *name, unsigned default_value) const
 	return bp->GetUnsignedValue();
 }

-gcc_pure
 bool
 ConfigBlock::GetBlockValue(const char *name, bool default_value) const
 {
--- a/src/config/Block.hxx
+++ b/src/config/Block.hxx
@@ -44,13 +44,10 @@ struct BlockParam {
 	BlockParam(const char *_name, const char *_value, int _line=-1)
 		:name(_name), value(_value), line(_line), used(false) {}

-	gcc_pure
 	int GetIntValue() const;

-	gcc_pure
 	unsigned GetUnsignedValue() const;

-	gcc_pure
 	bool GetBoolValue() const;
 };

@@ -101,11 +98,11 @@ struct ConfigBlock {
 	}

 	gcc_nonnull_all gcc_pure
-	const BlockParam *GetBlockParam(const char *_name) const;
+	const BlockParam *GetBlockParam(const char *_name) const noexcept;

 	gcc_pure
 	const char *GetBlockValue(const char *name,
-				  const char *default_value=nullptr) const;
+				  const char *default_value=nullptr) const noexcept;

 	/**
 	 * Same as config_get_path(), but looks up the setting in the
@@ -116,13 +113,10 @@ struct ConfigBlock {
 	AllocatedPath GetPath(const char *name,
 			      const char *default_value=nullptr) const;

-	gcc_pure
 	int GetBlockValue(const char *name, int default_value) const;

-	gcc_pure
 	unsigned GetBlockValue(const char *name, unsigned default_value) const;

-	gcc_pure
 	bool GetBlockValue(const char *name, bool default_value) const;
 };

--- a/src/config/ConfigGlobal.cxx
+++ b/src/config/ConfigGlobal.cxx
@@ -75,7 +75,7 @@ void config_global_check(void)
 }

 const ConfigParam *
-config_get_param(ConfigOption option)
+config_get_param(ConfigOption option) noexcept
 {
 	auto *param = config_data.params[unsigned(option)];
 	if (param != nullptr)
@@ -84,7 +84,7 @@ config_get_param(ConfigOption option)
 }

 const ConfigBlock *
-config_get_block(ConfigBlockOption option)
+config_get_block(ConfigBlockOption option) noexcept
 {
 	ConfigBlock *block = config_data.blocks[unsigned(option)];
 	if (block != nullptr)
@@ -110,7 +110,7 @@ config_find_block(ConfigBlockOption option, const char *key, const char *value)
 }

 const char *
-config_get_string(ConfigOption option, const char *default_value)
+config_get_string(ConfigOption option, const char *default_value) noexcept
 {
 	const auto *param = config_get_param(option);

--- a/src/config/ConfigGlobal.hxx
+++ b/src/config/ConfigGlobal.hxx
@@ -48,11 +48,11 @@ ReadConfigFile(Path path);

 gcc_pure
 const ConfigParam *
-config_get_param(enum ConfigOption option);
+config_get_param(enum ConfigOption option) noexcept;

 gcc_pure
 const ConfigBlock *
-config_get_block(enum ConfigBlockOption option);
+config_get_block(enum ConfigBlockOption option) noexcept;

 /**
 * Find a block with a matching attribute.
@@ -61,20 +61,12 @@ config_get_block(enum ConfigBlockOption option);
 * @param key the attribute name
 * @param value the expected attribute value
 */
-gcc_pure
 const ConfigBlock *
 config_find_block(ConfigBlockOption option, const char *key, const char *value);

-/* Note on gcc_pure: Some of the functions declared pure are not
-   really pure in strict sense.  They have side effect such that they
-   validate parameter's value and signal an error if it's invalid.
-   However, if the argument was already validated or we don't care
-   about the argument at all, this may be ignored so in the end, we
-   should be fine with calling those functions pure.  */
-
-gcc_pure
 const char *
-config_get_string(enum ConfigOption option, const char *default_value=nullptr);
+config_get_string(enum ConfigOption option,
+		  const char *default_value=nullptr) noexcept;

 /**
 * Returns an optional configuration variable which contains an
@@ -86,11 +78,9 @@ config_get_string(enum ConfigOption option, const char *default_value=nullptr);
 AllocatedPath
 config_get_path(enum ConfigOption option);

-gcc_pure
 unsigned
 config_get_unsigned(enum ConfigOption option, unsigned default_value);

-gcc_pure
 static inline std::chrono::steady_clock::duration
 config_get_unsigned(ConfigOption option,
 		    std::chrono::steady_clock::duration default_value)
@@ -100,11 +90,9 @@ config_get_unsigned(ConfigOption option,
 	return std::chrono::steady_clock::duration(u);
 }

-gcc_pure
 unsigned
 config_get_positive(enum ConfigOption option, unsigned default_value);

-gcc_pure
 static inline std::chrono::steady_clock::duration
 config_get_positive(ConfigOption option,
 		    std::chrono::steady_clock::duration default_value)
@@ -114,7 +102,6 @@ config_get_positive(ConfigOption option,
 	return std::chrono::steady_clock::duration(u);
 }

-gcc_pure
 bool config_get_bool(enum ConfigOption option, bool default_value);

 #endif
--- a/src/config/ConfigOption.hxx
+++ b/src/config/ConfigOption.hxx
@@ -102,13 +102,13 @@ enum class ConfigBlockOption {
 */
 gcc_pure
 enum ConfigOption
-ParseConfigOptionName(const char *name);
+ParseConfigOptionName(const char *name) noexcept;

 /**
 * @return #ConfigOption::MAX if not found
 */
 gcc_pure
 enum ConfigBlockOption
-ParseConfigBlockOptionName(const char *name);
+ParseConfigBlockOptionName(const char *name) noexcept;

 #endif
--- a/src/config/ConfigTemplates.cxx
+++ b/src/config/ConfigTemplates.cxx
@@ -101,7 +101,7 @@ static_assert(n_config_block_templates == unsigned(ConfigBlockOption::MAX),
 gcc_pure
 static inline unsigned
 ParseConfigTemplateName(const ConfigTemplate templates[], unsigned count,
-			const char *name)
+			const char *name) noexcept
 {
 	unsigned i = 0;
 	for (; i < count; ++i)
@@ -112,7 +112,7 @@ ParseConfigTemplateName(const ConfigTemplate templates[], unsigned count,
 }

 ConfigOption
-ParseConfigOptionName(const char *name)
+ParseConfigOptionName(const char *name) noexcept
 {
 	return ConfigOption(ParseConfigTemplateName(config_param_templates,
 						    n_config_param_templates,
@@ -120,7 +120,7 @@ ParseConfigOptionName(const char *name)
 }

 ConfigBlockOption
-ParseConfigBlockOptionName(const char *name)
+ParseConfigBlockOptionName(const char *name) noexcept
 {
 	return ConfigBlockOption(ParseConfigTemplateName(config_block_templates,
 							 n_config_block_templates,
--- a/src/config/Param.hxx
+++ b/src/config/Param.hxx
@@ -71,7 +71,6 @@ struct ConfigParam {
 	 *
 	 * Throws #std::runtime_error on error.
 	 */
-	gcc_pure
 	AllocatedPath GetPath() const;
 };

--- a/src/db/Count.cxx
+++ b/src/db/Count.cxx
@@ -62,7 +62,7 @@ Print(Response &r, TagType group, const TagCountMap &m)
 	}
 }

-static bool
+static void
 stats_visitor_song(SearchStats &stats, const LightSong &song)
 {
 	stats.n_songs++;
@@ -70,8 +70,6 @@ stats_visitor_song(SearchStats &stats, const LightSong &song)
 	const auto duration = song.GetDuration();
 	if (!duration.IsNegative())
 		stats.total_duration += duration;
-
-	return true;
 }

 static bool
@@ -94,7 +92,7 @@ CollectGroupCounts(TagCountMap &map, TagType group, const Tag &tag)
 	return found;
 }

-static bool
+static void
 GroupCountVisitor(TagCountMap &map, TagType group, const LightSong &song)
 {
 	assert(song.tag != nullptr);
@@ -103,8 +101,6 @@ GroupCountVisitor(TagCountMap &map, TagType group, const LightSong &song)
 	if (!CollectGroupCounts(map, group, tag) && group == TAG_ALBUM_ARTIST)
 		/* fall back to "Artist" if no "AlbumArtist" was found */
 		CollectGroupCounts(map, TAG_ARTIST, tag);
-
-	return true;
 }

 void
--- a/src/db/DatabaseGlue.cxx
+++ b/src/db/DatabaseGlue.cxx
@@ -37,5 +37,10 @@ DatabaseGlobalInit(EventLoop &loop, DatabaseListener &listener,
 		throw FormatRuntimeError("No such database plugin: %s",
 					 plugin_name);

-	return plugin->create(loop, listener, block);
+	try {
+		return plugin->create(loop, listener, block);
+	} catch (...) {
+		std::throw_with_nested(FormatRuntimeError("Failed to initialize database plugin '%s'",
+							  plugin_name));
+	}
 }
--- a/src/db/DatabaseLock.hxx
+++ b/src/db/DatabaseLock.hxx
@@ -45,7 +45,7 @@ extern ThreadId db_mutex_holder;
 */
 gcc_pure
 static inline bool
-holding_db_lock(void)
+holding_db_lock() noexcept
 {
 	return db_mutex_holder.IsInside();
 }
--- a/src/db/DatabasePlaylist.cxx
+++ b/src/db/DatabasePlaylist.cxx
@@ -27,13 +27,12 @@

 #include <functional>

-static bool
+static void
 AddSong(const Storage &storage, const char *playlist_path_utf8,
 	const LightSong &song)
 {
 	spl_append_song(playlist_path_utf8,
 			DatabaseDetachSong(storage, song));
-	return true;
 }

 void
--- a/src/db/DatabasePrint.cxx
+++ b/src/db/DatabasePrint.cxx
@@ -49,16 +49,14 @@ PrintDirectoryURI(Response &r, bool base, const LightDirectory &directory)
 		 ApplyBaseFlag(directory.GetPath(), base));
 }

-static bool
+static void
 PrintDirectoryBrief(Response &r, bool base, const LightDirectory &directory)
 {
 	if (!directory.IsRoot())
 		PrintDirectoryURI(r, base, directory);
-
-	return true;
 }

-static bool
+static void
 PrintDirectoryFull(Response &r, bool base, const LightDirectory &directory)
 {
 	if (!directory.IsRoot()) {
@@ -67,8 +65,6 @@ PrintDirectoryFull(Response &r, bool base, const LightDirectory &directory)
 		if (directory.mtime > 0)
 			time_print(r, "Last-Modified", directory.mtime);
 	}
-
-	return true;
 }

 static void
@@ -96,7 +92,7 @@ print_playlist_in_directory(Response &r, bool base,
 			 directory->GetPath(), name_utf8);
 }

-static bool
+static void
 PrintSongBrief(Response &r, Partition &partition,
 	       bool base, const LightSong &song)
 {
@@ -106,11 +102,9 @@ PrintSongBrief(Response &r, Partition &partition,
 		/* this song file has an embedded CUE sheet */
 		print_playlist_in_directory(r, base,
 					    song.directory, song.uri);
-
-	return true;
 }

-static bool
+static void
 PrintSongFull(Response &r, Partition &partition,
 	      bool base, const LightSong &song)
 {
@@ -120,21 +114,18 @@ PrintSongFull(Response &r, Partition &partition,
 		/* this song file has an embedded CUE sheet */
 		print_playlist_in_directory(r, base,
 					    song.directory, song.uri);
-
-	return true;
 }

-static bool
+static void
 PrintPlaylistBrief(Response &r, bool base,
 		   const PlaylistInfo &playlist,
 		   const LightDirectory &directory)
 {
 	print_playlist_in_directory(r, base,
 				    &directory, playlist.name.c_str());
-	return true;
 }

-static bool
+static void
 PrintPlaylistFull(Response &r, bool base,
 		  const PlaylistInfo &playlist,
 		  const LightDirectory &directory)
@@ -144,8 +135,6 @@ PrintPlaylistFull(Response &r, bool base,

 	if (playlist.mtime > 0)
 		time_print(r, "Last-Modified", playlist.mtime);
-
-	return true;
 }

 void
@@ -191,15 +180,13 @@ db_selection_print(Response &r, Partition &partition,
 			   0, std::numeric_limits<int>::max());
 }

-static bool
+static void
 PrintSongURIVisitor(Response &r, Partition &partition, const LightSong &song)
 {
 	song_print_uri(r, partition, song);
-
-	return true;
 }

-static bool
+static void
 PrintUniqueTag(Response &r, TagType tag_type,
 	       const Tag &tag)
 {
@@ -211,8 +198,6 @@ PrintUniqueTag(Response &r, TagType tag_type,
 		if (item.type != tag_type)
 			r.Format("%s: %s\n",
 				 tag_item_names[item.type], item.value);
-
-	return true;
 }

 void
--- a/src/db/DatabaseQueue.cxx
+++ b/src/db/DatabaseQueue.cxx
@@ -27,14 +27,13 @@

 #include <functional>

-static bool
+static void
 AddToQueue(Partition &partition, const LightSong &song)
 {
 	const Storage &storage = *partition.instance.storage;
 	partition.playlist.AppendSong(partition.pc,
 				      DatabaseDetachSong(storage,
 							 song));
-	return true;
 }

 void
--- a/src/db/DatabaseSong.hxx
+++ b/src/db/DatabaseSong.hxx
@@ -31,7 +31,6 @@ class DetachedSong;
 * "Detach" the #Song object, i.e. convert it to a #DetachedSong
 * instance.
 */
-gcc_pure
 DetachedSong
 DatabaseDetachSong(const Storage &storage, const LightSong &song);

--- a/src/db/Helpers.cxx
+++ b/src/db/Helpers.cxx
@@ -67,15 +67,13 @@ StatsVisitTag(DatabaseStats &stats, StringSet &artists, StringSet &albums,
 	}
 }

-static bool
+static void
 StatsVisitSong(DatabaseStats &stats, StringSet &artists, StringSet &albums,
 	       const LightSong &song)
 {
 	++stats.song_count;

 	StatsVisitTag(stats, artists, albums, *song.tag);
-
-	return true;
 }

 DatabaseStats
--- a/src/db/LightSong.cxx
+++ b/src/db/LightSong.cxx
@@ -21,7 +21,7 @@
 #include "tag/Tag.hxx"

 SignedSongTime
-LightSong::GetDuration() const
+LightSong::GetDuration() const noexcept
 {
 	SongTime a = start_time, b = end_time;
 	if (!b.IsPositive()) {
--- a/src/db/LightSong.hxx
+++ b/src/db/LightSong.hxx
@@ -76,7 +76,7 @@ struct LightSong {
 	SongTime end_time;

 	gcc_pure
-	std::string GetURI() const {
+	std::string GetURI() const noexcept {
 		if (directory == nullptr)
 			return std::string(uri);

@@ -87,7 +87,7 @@ struct LightSong {
 	}

 	gcc_pure
-	SignedSongTime GetDuration() const;
+	SignedSongTime GetDuration() const noexcept;
 };

 #endif
--- a/src/db/PlaylistVector.cxx
+++ b/src/db/PlaylistVector.cxx
@@ -26,7 +26,7 @@
 #include <assert.h>

 PlaylistVector::iterator
-PlaylistVector::find(const char *name)
+PlaylistVector::find(const char *name) noexcept
 {
 	assert(holding_db_lock());
 	assert(name != nullptr);
--- a/src/db/PlaylistVector.hxx
+++ b/src/db/PlaylistVector.hxx
@@ -31,7 +31,7 @@ protected:
 	 * Caller must lock the #db_mutex.
 	 */
 	gcc_pure
-	iterator find(const char *name);
+	iterator find(const char *name) noexcept;

 public:
 	using std::list<PlaylistInfo>::empty;
--- a/src/db/Registry.cxx
+++ b/src/db/Registry.cxx
@@ -38,7 +38,7 @@ const DatabasePlugin *const database_plugins[] = {
 };

 const DatabasePlugin *
-GetDatabasePluginByName(const char *name)
+GetDatabasePluginByName(const char *name) noexcept
 {
 	for (auto i = database_plugins; *i != nullptr; ++i)
 		if (strcmp((*i)->name, name) == 0)
--- a/src/db/Registry.hxx
+++ b/src/db/Registry.hxx
@@ -32,6 +32,6 @@ extern const DatabasePlugin *const database_plugins[];

 gcc_pure
 const DatabasePlugin *
-GetDatabasePluginByName(const char *name);
+GetDatabasePluginByName(const char *name) noexcept;

 #endif
--- a/src/db/Selection.cxx
+++ b/src/db/Selection.cxx
@@ -34,19 +34,19 @@ DatabaseSelection::DatabaseSelection(const char *_uri, bool _recursive,
 }

 bool
-DatabaseSelection::IsEmpty() const
+DatabaseSelection::IsEmpty() const noexcept
 {
 	return uri.empty() && (filter == nullptr || filter->IsEmpty());
 }

 bool
-DatabaseSelection::HasOtherThanBase() const
+DatabaseSelection::HasOtherThanBase() const noexcept
 {
 	return filter != nullptr && filter->HasOtherThanBase();
 }

 bool
-DatabaseSelection::Match(const LightSong &song) const
+DatabaseSelection::Match(const LightSong &song) const noexcept
 {
 	return filter == nullptr || filter->Match(song);
 }
--- a/src/db/Selection.hxx
+++ b/src/db/Selection.hxx
@@ -45,16 +45,16 @@ struct DatabaseSelection {
 			  const SongFilter *_filter=nullptr);

 	gcc_pure
-	bool IsEmpty() const;
+	bool IsEmpty() const noexcept;

 	/**
 	 * Does this selection contain constraints other than "base"?
 	 */
 	gcc_pure
-	bool HasOtherThanBase() const;
+	bool HasOtherThanBase() const noexcept;

 	gcc_pure
-	bool Match(const LightSong &song) const;
+	bool Match(const LightSong &song) const noexcept;
 };

 #endif
--- a/src/db/plugins/ProxyDatabasePlugin.cxx
+++ b/src/db/plugins/ProxyDatabasePlugin.cxx
@@ -34,6 +34,7 @@
 #include "tag/TagBuilder.hxx"
 #include "tag/Tag.hxx"
 #include "util/ScopeExit.hxx"
+#include "util/RuntimeError.hxx"
 #include "protocol/Ack.hxx"
 #include "event/SocketMonitor.hxx"
 #include "event/IdleMonitor.hxx"
@@ -46,7 +47,7 @@
 #include <string>
 #include <list>

-class LibmpdclientError final : std::runtime_error {
+class LibmpdclientError final : public std::runtime_error {
 	enum mpd_error code;

 public:
@@ -108,8 +109,8 @@ public:
 	static Database *Create(EventLoop &loop, DatabaseListener &listener,
 				const ConfigBlock &block);

-	virtual void Open() override;
-	virtual void Close() override;
+	void Open() override;
+	void Close() override;
 	const LightSong *GetSong(const char *uri_utf8) const override;
 	void ReturnSong(const LightSong *song) const override;

@@ -126,7 +127,7 @@ public:

 	unsigned Update(const char *uri_utf8, bool discard) override;

-	virtual time_t GetUpdateStamp() const override {
+	time_t GetUpdateStamp() const override {
 		return update_stamp;
 	}

@@ -138,10 +139,10 @@ private:
 	void Disconnect();

 	/* virtual methods from SocketMonitor */
-	virtual bool OnSocketReady(unsigned flags) override;
+	bool OnSocketReady(unsigned flags) override;

 	/* virtual methods from IdleMonitor */
-	virtual void OnIdle() override;
+	void OnIdle() override;
 };

 static constexpr struct {
@@ -215,7 +216,7 @@ ProxySong::ProxySong(const mpd_song *song)

 gcc_const
 static enum mpd_tag_type
-Convert(TagType tag_type)
+Convert(TagType tag_type) noexcept
 {
 	for (auto i = &tag_table[0]; i->d != TAG_NUM_OF_ITEM_TYPES; ++i)
 		if (i->d == tag_type)
@@ -345,9 +346,15 @@ ProxyDatabase::Create(EventLoop &loop, DatabaseListener &listener,
 void
 ProxyDatabase::Open()
 {
-	Connect();
-
 	update_stamp = 0;
+
+	try {
+		Connect();
+	} catch (const std::runtime_error &error) {
+		/* this error is non-fatal, because this plugin will
+		   attempt to reconnect again automatically */
+		LogError(error);
+	}
 }

 void
@@ -371,7 +378,10 @@ ProxyDatabase::Connect()
 		mpd_connection_free(connection);
 		connection = nullptr;

-		throw;
+		std::throw_with_nested(host.empty()
+				       ? std::runtime_error("Failed to connect to remote MPD")
+				       : FormatRuntimeError("Failed to connect to remote MPD '%s'",
+							    host.c_str()));
 	}

 #if LIBMPDCLIENT_CHECK_VERSION(2, 10, 0)
@@ -564,7 +574,7 @@ Visit(struct mpd_connection *connection,

 gcc_pure
 static bool
-Match(const SongFilter *filter, const LightSong &song)
+Match(const SongFilter *filter, const LightSong &song) noexcept
 {
 	return filter == nullptr || filter->Match(song);
 }
@@ -707,7 +717,7 @@ SearchSongs(struct mpd_connection *connection,
 */
 gcc_pure
 static bool
-ServerSupportsSearchBase(const struct mpd_connection *connection)
+ServerSupportsSearchBase(const struct mpd_connection *connection) noexcept
 {
 #if LIBMPDCLIENT_CHECK_VERSION(2,9,0)
 	return mpd_connection_cmp_server_version(connection, 0, 18, 0) >= 0;
--- a/src/db/plugins/simple/Directory.cxx
+++ b/src/db/plugins/simple/Directory.cxx
@@ -65,7 +65,7 @@ Directory::Delete()
 }

 const char *
-Directory::GetName() const
+Directory::GetName() const noexcept
 {
 	assert(!IsRoot());

@@ -89,7 +89,7 @@ Directory::CreateChild(const char *name_utf8)
 }

 const Directory *
-Directory::FindChild(const char *name) const
+Directory::FindChild(const char *name) const noexcept
 {
 	assert(holding_db_lock());

@@ -101,7 +101,7 @@ Directory::FindChild(const char *name) const
 }

 void
-Directory::PruneEmpty()
+Directory::PruneEmpty() noexcept
 {
 	assert(holding_db_lock());

@@ -118,7 +118,7 @@ Directory::PruneEmpty()
 }

 Directory::LookupResult
-Directory::LookupDirectory(const char *uri)
+Directory::LookupDirectory(const char *uri) noexcept
 {
 	assert(holding_db_lock());
 	assert(uri != nullptr);
@@ -173,7 +173,7 @@ Directory::AddSong(Song *song)
 }

 void
-Directory::RemoveSong(Song *song)
+Directory::RemoveSong(Song *song) noexcept
 {
 	assert(holding_db_lock());
 	assert(song != nullptr);
@@ -183,7 +183,7 @@ Directory::RemoveSong(Song *song)
 }

 const Song *
-Directory::FindSong(const char *name_utf8) const
+Directory::FindSong(const char *name_utf8) const noexcept
 {
 	assert(holding_db_lock());
 	assert(name_utf8 != nullptr);
@@ -200,13 +200,13 @@ Directory::FindSong(const char *name_utf8) const

 gcc_pure
 static bool
-directory_cmp(const Directory &a, const Directory &b)
+directory_cmp(const Directory &a, const Directory &b) noexcept
 {
 	return IcuCollate(a.path.c_str(), b.path.c_str()) < 0;
 }

 void
-Directory::Sort()
+Directory::Sort() noexcept
 {
 	assert(holding_db_lock());

@@ -261,7 +261,7 @@ Directory::Walk(bool recursive, const SongFilter *filter,
 }

 LightDirectory
-Directory::Export() const
+Directory::Export() const noexcept
 {
 	return LightDirectory(GetPath(), mtime);
 }
--- a/src/db/plugins/simple/Directory.hxx
+++ b/src/db/plugins/simple/Directory.hxx
@@ -86,7 +86,7 @@ struct Directory {

 	Directory *parent;
 	time_t mtime;
-	unsigned inode, device;
+	uint64_t inode, device;

 	std::string path;

@@ -134,10 +134,10 @@ public:
 	 * Caller must lock the #db_mutex.
 	 */
 	gcc_pure
-	const Directory *FindChild(const char *name) const;
+	const Directory *FindChild(const char *name) const noexcept;

 	gcc_pure
-	Directory *FindChild(const char *name) {
+	Directory *FindChild(const char *name) noexcept {
 		const Directory *cthis = this;
 		return const_cast<Directory *>(cthis->FindChild(name));
 	}
@@ -177,10 +177,10 @@ public:
 	 * @return the Directory, or nullptr if none was found
 	 */
 	gcc_pure
-	LookupResult LookupDirectory(const char *uri);
+	LookupResult LookupDirectory(const char *uri) noexcept;

 	gcc_pure
-	bool IsEmpty() const {
+	bool IsEmpty() const noexcept {
 		return children.empty() &&
 			songs.empty() &&
 			playlists.empty();
@@ -195,13 +195,13 @@ public:
 	 * Returns the base name of the directory.
 	 */
 	gcc_pure
-	const char *GetName() const;
+	const char *GetName() const noexcept;

 	/**
 	 * Is this the root directory of the music database?
 	 */
 	gcc_pure
-	bool IsRoot() const {
+	bool IsRoot() const noexcept {
 		return parent == nullptr;
 	}

@@ -229,10 +229,10 @@ public:
 	 * Caller must lock the #db_mutex.
 	 */
 	gcc_pure
-	const Song *FindSong(const char *name_utf8) const;
+	const Song *FindSong(const char *name_utf8) const noexcept;

 	gcc_pure
-	Song *FindSong(const char *name_utf8) {
+	Song *FindSong(const char *name_utf8) noexcept {
 		const Directory *cthis = this;
 		return const_cast<Song *>(cthis->FindSong(name_utf8));
 	}
@@ -248,19 +248,19 @@ public:
 	 * invalidates the song object, because the "parent" attribute becomes
 	 * stale), but does not free it.
 	 */
-	void RemoveSong(Song *song);
+	void RemoveSong(Song *song) noexcept;

 	/**
 	 * Caller must lock the #db_mutex.
 	 */
-	void PruneEmpty();
+	void PruneEmpty() noexcept;

 	/**
 	 * Sort all directory entries recursively.
 	 *
 	 * Caller must lock the #db_mutex.
 	 */
-	void Sort();
+	void Sort() noexcept;

 	/**
 	 * Caller must lock #db_mutex.
@@ -270,7 +270,7 @@ public:
 		  VisitPlaylist visit_playlist) const;

 	gcc_pure
-	LightDirectory Export() const;
+	LightDirectory Export() const noexcept;
 };

 #endif
--- a/src/db/plugins/simple/DirectorySave.cxx
+++ b/src/db/plugins/simple/DirectorySave.cxx
@@ -40,7 +40,7 @@

 gcc_const
 static const char *
-DeviceToTypeString(unsigned device)
+DeviceToTypeString(unsigned device) noexcept
 {
 	switch (device) {
 	case DEVICE_INARCHIVE:
@@ -56,7 +56,7 @@ DeviceToTypeString(unsigned device)

 gcc_pure
 static unsigned
-ParseTypeString(const char *type)
+ParseTypeString(const char *type) noexcept
 {
 	if (strcmp(type, "archive") == 0)
 		return DEVICE_INARCHIVE;
--- a/src/db/plugins/simple/Mount.cxx
+++ b/src/db/plugins/simple/Mount.cxx
@@ -25,6 +25,13 @@
 #include "db/Interface.hxx"
 #include "fs/Traits.hxx"

+#ifdef _LIBCPP_VERSION
+/* workaround for "error: incomplete type 'PlaylistInfo' used in type
+   trait expression" with libc++ version 3900 (from Android NDK
+   r13b) */
+#include "db/PlaylistInfo.hxx"
+#endif
+
 #include <string>

 struct PrefixedLightDirectory : LightDirectory {
--- a/src/db/plugins/simple/SimpleDatabasePlugin.hxx
+++ b/src/db/plugins/simple/SimpleDatabasePlugin.hxx
@@ -108,8 +108,8 @@ public:
 	bool Unmount(const char *uri);

 	/* virtual methods from class Database */
-	virtual void Open() override;
-	virtual void Close() override;
+	void Open() override;
+	void Close() override;

 	const LightSong *GetSong(const char *uri_utf8) const override;
 	void ReturnSong(const LightSong *song) const override;
@@ -125,7 +125,7 @@ public:

 	DatabaseStats GetStats(const DatabaseSelection &selection) const override;

-	virtual time_t GetUpdateStamp() const override {
+	time_t GetUpdateStamp() const override {
 		return mtime;
 	}

--- a/src/db/plugins/simple/Song.cxx
+++ b/src/db/plugins/simple/Song.cxx
@@ -77,7 +77,7 @@ Song::Free()
 }

 std::string
-Song::GetURI() const
+Song::GetURI() const noexcept
 {
 	assert(*uri);

@@ -96,7 +96,7 @@ Song::GetURI() const
 }

 LightSong
-Song::Export() const
+Song::Export() const noexcept
 {
 	LightSong dest;
 	dest.directory = parent->IsRoot()
--- a/src/db/plugins/simple/Song.hxx
+++ b/src/db/plugins/simple/Song.hxx
@@ -123,10 +123,10 @@ struct Song {
 	 * location within the music directory.
 	 */
 	gcc_pure
-	std::string GetURI() const;
+	std::string GetURI() const noexcept;

 	gcc_pure
-	LightSong Export() const;
+	LightSong Export() const noexcept;
 };

 typedef boost::intrusive::list<Song,
--- a/src/db/plugins/simple/SongSort.cxx
+++ b/src/db/plugins/simple/SongSort.cxx
@@ -26,7 +26,7 @@
 #include <stdlib.h>

 static int
-compare_utf8_string(const char *a, const char *b)
+compare_utf8_string(const char *a, const char *b) noexcept
 {
 	if (a == nullptr)
 		return b == nullptr ? 0 : -1;
@@ -42,8 +42,7 @@ compare_utf8_string(const char *a, const char *b)
 * nullptr.
 */
 static int
-compare_string_tag_item(const Tag &a, const Tag &b,
-			TagType type)
+compare_string_tag_item(const Tag &a, const Tag &b, TagType type) noexcept
 {
 	return compare_utf8_string(a.GetValue(type),
 				   b.GetValue(type));
@@ -54,7 +53,7 @@ compare_string_tag_item(const Tag &a, const Tag &b,
 * (e.g. disc or track number).  Either one may be nullptr.
 */
 static int
-compare_number_string(const char *a, const char *b)
+compare_number_string(const char *a, const char *b) noexcept
 {
 	long ai = a == nullptr ? 0 : strtol(a, nullptr, 10);
 	long bi = b == nullptr ? 0 : strtol(b, nullptr, 10);
@@ -69,7 +68,7 @@ compare_number_string(const char *a, const char *b)
 }

 static int
-compare_tag_item(const Tag &a, const Tag &b, TagType type)
+compare_tag_item(const Tag &a, const Tag &b, TagType type) noexcept
 {
 	return compare_number_string(a.GetValue(type),
 				     b.GetValue(type));
@@ -78,7 +77,7 @@ compare_tag_item(const Tag &a, const Tag &b, TagType type)
 /* Only used for sorting/searchin a songvec, not general purpose compares */
 gcc_pure
 static bool
-song_cmp(const Song &a, const Song &b)
+song_cmp(const Song &a, const Song &b) noexcept
 {
 	int ret;

@@ -102,7 +101,7 @@ song_cmp(const Song &a, const Song &b)
 }

 void
-song_list_sort(SongList &songs)
+song_list_sort(SongList &songs) noexcept
 {
 	songs.sort(song_cmp);
 }
--- a/src/db/plugins/simple/SongSort.hxx
+++ b/src/db/plugins/simple/SongSort.hxx
@@ -23,6 +23,6 @@
 #include "Song.hxx"

 void
-song_list_sort(SongList &songs);
+song_list_sort(SongList &songs) noexcept;

 #endif
--- a/src/db/plugins/upnp/Directory.cxx
+++ b/src/db/plugins/upnp/Directory.cxx
@@ -39,7 +39,7 @@ UPnPDirContent::~UPnPDirContent()

 gcc_pure
 static UPnPDirObject::ItemClass
-ParseItemClass(StringView name)
+ParseItemClass(StringView name) noexcept
 {
 	if (name.EqualsLiteral("object.item.audioItem.musicTrack"))
 		return UPnPDirObject::ItemClass::MUSIC;
@@ -51,7 +51,7 @@ ParseItemClass(StringView name)

 gcc_pure
 static SignedSongTime
-ParseDuration(const char *duration)
+ParseDuration(const char *duration) noexcept
 {
 	char *endptr;

@@ -81,7 +81,7 @@ ParseDuration(const char *duration)
 */
 gcc_pure
 static std::string &&
-TitleToPathSegment(std::string &&s)
+TitleToPathSegment(std::string &&s) noexcept
 {
 	std::replace(s.begin(), s.end(), '/', '_');
 	return std::move(s);
@@ -124,7 +124,7 @@ public:
 	}

 protected:
-	virtual void StartElement(const XML_Char *name, const XML_Char **attrs)
+	void StartElement(const XML_Char *name, const XML_Char **attrs) override
 	{
 		if (object.type != UPnPDirObject::Type::UNKNOWN &&
 		    tag_type == TAG_NUM_OF_ITEM_TYPES) {
@@ -188,7 +188,7 @@ protected:
 		}
 	}

-	virtual void EndElement(const XML_Char *name)
+	void EndElement(const XML_Char *name) override
 	{
 		if (tag_type != TAG_NUM_OF_ITEM_TYPES) {
 			assert(object.type != UPnPDirObject::Type::UNKNOWN);
@@ -212,7 +212,7 @@ protected:
 		state = NONE;
 	}

-	virtual void CharacterData(const XML_Char *s, int len)
+	void CharacterData(const XML_Char *s, int len) override
 	{
 		if (tag_type != TAG_NUM_OF_ITEM_TYPES) {
 			assert(object.type != UPnPDirObject::Type::UNKNOWN);
--- a/src/db/plugins/upnp/Directory.hxx
+++ b/src/db/plugins/upnp/Directory.hxx
@@ -40,7 +40,7 @@ public:
 	~UPnPDirContent();

 	gcc_pure
-	UPnPDirObject *FindObject(const char *name) {
+	UPnPDirObject *FindObject(const char *name) noexcept {
 		for (auto &o : objects)
 			if (o.name == name)
 				return &o;
--- a/src/db/plugins/upnp/UpnpDatabasePlugin.cxx
+++ b/src/db/plugins/upnp/UpnpDatabasePlugin.cxx
@@ -77,9 +77,9 @@ public:
 	static Database *Create(EventLoop &loop, DatabaseListener &listener,
 				const ConfigBlock &block);

-	virtual void Open() override;
-	virtual void Close() override;
-	virtual const LightSong *GetSong(const char *uri_utf8) const override;
+	void Open() override;
+	void Close() override;
+	const LightSong *GetSong(const char *uri_utf8) const override;
 	void ReturnSong(const LightSong *song) const override;

 	void Visit(const DatabaseSelection &selection,
@@ -180,7 +180,7 @@ UpnpDatabase::ReturnSong(const LightSong *_song) const
 const LightSong *
 UpnpDatabase::GetSong(const char *uri) const
 {
-	auto vpath = stringToTokens(uri, "/", true);
+	auto vpath = stringToTokens(uri, '/');
 	if (vpath.size() < 2)
 		throw DatabaseError(DatabaseErrorCode::NOT_FOUND,
 				    "No such song");
@@ -577,7 +577,7 @@ UpnpDatabase::Visit(const DatabaseSelection &selection,
 		    VisitSong visit_song,
 		    VisitPlaylist visit_playlist) const
 {
-	auto vpath = stringToTokens(selection.uri, "/", true);
+	auto vpath = stringToTokens(selection.uri, '/');
 	if (vpath.empty()) {
 		for (const auto &server : discovery->GetDirectories()) {
 			if (visit_directory) {
--- a/src/db/update/InotifyQueue.cxx
+++ b/src/db/update/InotifyQueue.cxx
@@ -56,7 +56,7 @@ InotifyQueue::OnTimeout()

 gcc_pure
 static bool
-path_in(const char *path, const char *possible_parent)
+path_in(const char *path, const char *possible_parent) noexcept
 {
 	if (StringIsEmpty(path))
 		return true;
--- a/Show More
+++ b/Show More