release v0.20.20

android/AndroidManifest.xml: increment version number to 0.20.20
Makefile.am: invoke javac with source/target 1.6
2018-05-22 12:40:18 +02:00 · 2018-05-22 12:40:11 +02:00 · 2018-05-22 12:37:01 +02:00 · 2018-05-22 12:31:37 +02:00 · 2018-05-22 11:17:19 +02:00 · 2018-05-12 16:24:24 +02:00
573 changed files with 6574 additions and 2965 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -0,0 +1,36 @@
+dist: trusty
+language: cpp
+
+addons:
+  apt:
+    packages:
+      - libcppunit-dev
+      - libboost-dev
+
+os:
+  - linux
+  - osx
+
+env:
+  global:
+    - MAKEFLAGS="-j2"
+
+before_install:
+  # C++14
+  - test "$TRAVIS_OS_NAME" != "linux" || sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
+  - test "$TRAVIS_OS_NAME" != "linux" || sudo apt-get update -qq
+  - test "$TRAVIS_OS_NAME" != "osx" || brew update
+
+install:
+  # C++14
+  - test "$TRAVIS_OS_NAME" != "linux" || sudo apt-get install -qq g++-5
+  - test "$TRAVIS_OS_NAME" != "osx" || brew install cppunit
+
+script:
+  - OPTIONS="--enable-test"
+  - test "$TRAVIS_OS_NAME" != "linux" || export CC=gcc-5 CXX=g++-5
+  - test "$TRAVIS_OS_NAME" != "osx" || OPTIONS="$OPTIONS --enable-osx"
+  - ./autogen.sh
+  - ./configure --disable-silent-rules --disable-dependency-tracking $OPTIONS
+  - make
+  - make check
--- a/8
+++ b/8
@@ -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>
@@ -30,3 +30,9 @@ The following people have contributed code to MPD:
 Jurgen Kramer <gtmkramer@xs4all.nl>
 Jean-Francois Dockes <jf@dockes.org>
 Yue Wang <yuleopen@gmail.com>
+ Matthew Leon Grinshpun <ml@matthewleon.com>
+ Dimitris Papastamos <sin@2f30.org>
+ Florian Schlichting <fsfs@debian.org>
+ François Revol <revol@free.fr>
+ Jacob Vosmaer <contact@jacobvosmaer.nl>
+ Thomas Guillem <thomas@gllm.fr>
--- a/206
+++ b/206
@@ -1,206 +0,0 @@
-                       Music Player Daemon (MPD) - INSTALL
-
-
-Introduction
------------
-
-This document is a very small amount of documentation about what is needed to 
-install MPD.  If more information is desired, read the user manual:
-
- http://www.musicpd.org/doc/user/
-
-Dependencies
------------
-
-gcc 4.7 or later - http://gcc.gnu.org/
-clang 3.2 or later - http://clang.llvm.org/
-Any other C++11 compliant compiler should also work.
-
-Boost 1.46 - http://www.boost.org/
-
-
-Optional Output Dependencies
----------------------------
-
-You will need at least one of these to compile MPD.
-
-Most of these are available as packages on major distributions.  Be sure to
-install both the library package as well as the development package.
-
-AO - http://www.xiph.org/ao/
-A portable library that abstracts many audio output types as one API.  Should
-be used only if there is no native plugin available or if the native plugin
-doesn't work.  You will need libao.
-
-ALSA - http://www.alsa-project.org/
-The Advanced Linux Sound Architecture.  Recommended audio output if you use
-Linux.  You will need libasound.
-
-FIFO
-This is a mostly undocumented, developer plugin to transmit raw data.
-
-OSS - http://www.opensound.com
-Open Sound System.
-
-PulseAudio - http://www.pulseaudio.org/
-An advanced sound daemon.  You will need libpulse.
-
-JACK - http://www.jackaudio.org/
-A low-latency sound daemon.
-
-libshout - http://www.icecast.org/
-For streaming to an Icecast or Shoutcast server.
-You also need an encoder: either libvorbisenc (ogg), or liblame (mp3).
-
-OpenAL - http://kcat.strangesoft.net/openal.html
-Open Audio Library
-
-
-Optional Input Dependencies
---------------------------
-
-You will need at least one of these to compile MPD.
-
-Most of these are available as packages on major distributions.  Be sure to
-install both the library package as well as the development package.
-
-MAD - http://www.underbit.com/products/mad/
-For MP3 support.  You will need libmad, and optionally libid3tag if you want
-ID3 tag support.
-
-libmpg123 - http://www.mpg123.de/
-Alternative for MP3 support.
-
-Ogg Vorbis - http://www.xiph.org/ogg/vorbis/
-For Ogg Vorbis support.  You will need libogg and libvorbis.
-
-libopus - http://www.opus-codec.org/
-Opus codec support
-
-FLAC - http://flac.sourceforge.net/
-For FLAC support.  You will need version 1.2 or higher of libFLAC.
-
-Audio File - http://www.68k.org/~michael/audiofile/
-For WAVE, AIFF, and AU support.  You will need libaudiofile.
-
-FAAD2 - http://www.audiocoding.com/
-For MP4/AAC support.
-
-libmpcdec - http://www.musepack.net/
-For Musepack support.
-
-MikMod - http://mikmod.raphnet.net/
-For MOD support.  You will need libmikmod.
-
-libavcodec, libavformat (ffmpeg or libav) - http://ffmpeg.mplayerhq.hu/ http://libav.org/
-Multi-codec library.
-
-libsidplay2 - http://sidplay2.sourceforge.net/
-For C64 SID support.
-
-libfluidsynth - http://fluidsynth.resonance.org/
-For MIDI support.
-
-libwildmidi 0.2.3 - http://wildmidi.sourceforge.net/
-For MIDI support.
-
-libsndfile - http://www.mega-nerd.com/libsndfile/
-WAVE, AIFF, and many others.
-
-libwavpack - http://www.wavpack.com/
-For WavPack playback.
-
-libadplug - http://adplug.sourceforge.net/
-For AdLib playback.
-
-
-Optional Miscellaneous Dependencies
-----------------------------------
-
-Avahi - http://www.avahi.org/
-For Zeroconf support.
-
-libsamplerate - http://www.mega-nerd.com/SRC/
-For advanced samplerate conversions.
-
-libcurl - http://curl.haxx.se/
-For playing HTTP streams.
-
-libmms - https://launchpad.net/libmms
-For playing MMS streams.
-
-SQLite - http://www.sqlite.org/
-For the sticker database.
-
-libcdio - http://www.gnu.org/software/libcdio/
-For playing audio CDs.
-
-libsystemd-daemon - http://freedesktop.org/wiki/Software/systemd/
-For systemd activation.
-
-
-pkg-config
----------
-
-MPD uses pkg-config to locate most external libraries.  If you do not
-have pkg-config, or if your version of the library does not ship the
-".pc" file, you have to provide the library's build options in
-environment variables.  These variables are documented in "./configure
--help".  Example:
-
- FLAC_CFLAGS=-I/usr/include/FLAC FLAC_LIBS=-lFLAC ./configure
-
-
-Download
--------
-
-Get the latest release from of MPD from <http://www.musicpd.org/>.
-
-Compile
-------
-
-1) unpack the archive
-
-$ tar xf mpd-x.x.x.tar.xz
-
-2) change to directory created
-
-$ cd mpd-x.x.x
-
-3) Run configure script (this will determine what dependencies you have)
-
-$ ./configure
-
-4) Compile
-
-$ make
-
-Install (Optional)
-------
-
-(as root)
-$ make install
-
-Run
---
-
-1) run mpd:
-
-$ mpd <config file>
-
-First default is $XDG_CONFIG_HOME/mpd/mpd.conf then ~/.mpdconf then
-~/.mpd/mpd.conf then /etc/mpd.conf. If neither of these exist a mpd
-configuration file must be specified at runtime.
-
-A sample config file is included with the source of MPD, mpdconf.example.
-
-The first time MPD is run it will attempt to discover all music in your
-music root, recursively. This can be affected by the symbolic link 
-options specified in the example mpd.conf.
-
-Using MPD
---------
-
-You can download many different interfaces for MPD at 
-
- http://www.musicpd.org/clients/
--- a/Makefile.am
+++ b/Makefile.am
@@ -61,8 +61,8 @@ src_mpd_LDADD = \
 	libnet.a \
 	$(FS_LIBS) \
 	libsystem.a \
-	libutil.a \
 	$(ICU_LDADD) \
+	libutil.a \
 	$(SYSTEMD_DAEMON_LIBS)

 src_mpd_SOURCES = \
@@ -243,6 +243,7 @@ CURL_SOURCES = \
 	src/lib/curl/Slist.hxx

 UPNP_SOURCES = \
+	src/lib/upnp/Compat.hxx \
 	src/lib/upnp/Init.cxx src/lib/upnp/Init.hxx \
 	src/lib/upnp/ClientInit.cxx src/lib/upnp/ClientInit.hxx \
 	src/lib/upnp/Device.cxx src/lib/upnp/Device.hxx \
@@ -284,30 +285,62 @@ libmain_a_CPPFLAGS = $(AM_CPPFLAGS) -Iandroid/build/include

 src_mpd_LDADD += libandroid.a libjava.a

-all-local: android/build/bin/$(APK_NAME)-debug.apk
+all-local: android/build/$(APK_NAME)-debug.apk
 clean-local:
 	rm -rf android/build

 libmpd.so: $(filter %.a,$(src_mpd_LDADD)) libmain.a
 	$(AM_V_CXXLD)$(CXXLD) -shared -Wl,--no-undefined,-shared,-Bsymbolic -llog -lz -o $@ $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) src/libmain_a-Main.o $(src_mpd_LDADD) $(LIBS)

-android/build/build.xml: android/AndroidManifest.xml
-	rm -rf android/build
-	mkdir -p android/build/include android/build/res android/build/src/org
-	ln -s $(abs_srcdir)/android/AndroidManifest.xml $(abs_srcdir)/android/custom_rules.xml android/build
-	ln -s $(abs_srcdir)/android/src android/build/src/org/musicpd
-	ln -s $(abs_srcdir)/android/res/values $(abs_srcdir)/android/res/layout android/build/res
-	$(ANDROID_SDK)/tools/android update project --path android/build --target android-17 --name $(APK_NAME)
+ANDROID_SDK_BUILD_TOOLS_VERSION = 27.0.0
+ANDROID_SDK_PLATFORM = android-17

-android/build/bin/classes/org/musicpd/Bridge.class: android/src/Bridge.java android/build/build.xml android/build/res/drawable/icon.png
-	cd android/build && ant compile-jni-classes
+ANDROID_BUILD_TOOLS_DIR = $(ANDROID_SDK)/build-tools/$(ANDROID_SDK_BUILD_TOOLS_VERSION)
+ANDROID_SDK_PLATFORM_DIR = $(ANDROID_SDK)/platforms/$(ANDROID_SDK_PLATFORM)

-android/build/include/org_musicpd_Bridge.h: android/build/bin/classes/org/musicpd/Bridge.class
-	javah -classpath $(ANDROID_SDK)/platforms/android-17/android.jar:android/build/bin/classes -d $(@D) org.musicpd.Bridge
+JAVAC = javac
+AAPT = $(ANDROID_BUILD_TOOLS_DIR)/aapt
+DX = $(ANDROID_BUILD_TOOLS_DIR)/dx
+ZIPALIGN = $(ANDROID_BUILD_TOOLS_DIR)/zipalign
+
+ANDROID_XML_RES := $(wildcard $(srcdir)/android/res/*/*.xml)
+ANDROID_XML_RES_COPIES := $(patsubst $(srcdir)/android/%,android/build/%,$(ANDROID_XML_RES))
+
+JAVA_SOURCE_NAMES = Bridge.java Loader.java Main.java
+JAVA_SOURCE_PATHS = $(addprefix $(srcdir)/android/src/,$(JAVA_SOURCE_NAMES))
+
+JAVA_CLASSFILES_DIR = android/build/classes
+
+$(ANDROID_XML_RES_COPIES): $(ANDROID_XML_RES)
+	@$(MKDIR_P) $(dir $@)
+	cp $(patsubst android/build/%,$(srcdir)/android/%,$@) $@
+
+android/build/resources.apk: $(ANDROID_XML_RES_COPIES) android/build/res/drawable/icon.png
+	@$(MKDIR_P) android/build/gen
+	$(AAPT) package -f -m --auto-add-overlay \
+		--custom-package org.musicpd \
+		-M $(srcdir)/android/AndroidManifest.xml \
+		-S android/build/res \
+		-J android/build/gen \
+		-I $(ANDROID_SDK_PLATFORM_DIR)/android.jar \
+		-F android/build/resources.apk
+
+# R.java is generated by aapt, when resources.apk is generated
+android/build/gen/org/musicpd/R.java: android/build/resources.apk
+
+android/build/classes.dex: $(JAVA_SOURCE_PATHS) android/build/gen/org/musicpd/R.java
+	@$(MKDIR_P) $(JAVA_CLASSFILES_DIR)
+	$(JAVAC) -source 1.6 -target 1.6 -Xlint:-options \
+		-cp $(ANDROID_SDK_PLATFORM_DIR)/android.jar:$(JAVA_CLASSFILES_DIR) \
+		-d $(JAVA_CLASSFILES_DIR) $^
+	$(DX) --dex --output $@ $(JAVA_CLASSFILES_DIR)
+
+android/build/include/org_musicpd_Bridge.h: android/build/classes.dex
+	javah -classpath $(ANDROID_SDK_PLATFORM_DIR)/android.jar:$(JAVA_CLASSFILES_DIR) -d $(@D) org.musicpd.Bridge

 BUILT_SOURCES = android/build/include/org_musicpd_Bridge.h

-android/build/libs/armeabi-v7a/libmpd.so: libmpd.so android/build/build.xml
+android/build/lib/armeabi-v7a/libmpd.so: libmpd.so
 	mkdir -p $(@D)
 	rm -f $@
 	$(STRIP) -o $@ $<
@@ -316,24 +349,19 @@ android/build/res/drawable/icon.png: mpd.svg
 	mkdir -p $(@D)
 	rsvg-convert --width=48 --height=48 $< -o $@

-APK_DEPS = android/build/res/drawable/icon.png \
-	android/build/libs/armeabi-v7a/libmpd.so \
-	$(wildcard $(srcdir)/android/src/*.java) \
-	android/build/build.xml
+.DELETE_ON_ERROR: android/build/unsigned.apk
+android/build/unsigned.apk: android/build/classes.dex android/build/resources.apk android/build/lib/armeabi-v7a/libmpd.so
+	cp android/build/resources.apk $@
+	cd $(dir $@) && zip -q -r $(notdir $@) classes.dex lib

-android/build/bin/$(APK_NAME)-debug.apk: $(APK_DEPS)
-	cd android/build && ant nodeps debug
+android/build/$(APK_NAME)-debug.apk: android/build/unsigned.apk
+	jarsigner -keystore $(HOME)/.android/debug.keystore -storepass android -signedjar $@ $< androiddebugkey

-android/build/bin/$(APK_NAME)-release-unsigned.apk: $(APK_DEPS)
-	cd android/build && ant nodeps release
-
-android/build/bin/$(APK_NAME)-release-unaligned.apk: android/build/bin/$(APK_NAME)-release-unsigned.apk
+android/build/$(APK_NAME)-release-unaligned.apk: android/build/unsigned.apk
 	jarsigner -digestalg SHA1 -sigalg MD5withRSA -storepass:env ANDROID_KEYSTORE_PASS -keystore $(ANDROID_KEYSTORE) -signedjar $@ $< $(ANDROID_KEY_ALIAS)

-ANDROID_SDK_BUILD_TOOLS_VERSION = 20.0.0
-
-android/build/bin/$(APK_NAME).apk: android/build/bin/$(APK_NAME)-release-unaligned.apk
-	$(ANDROID_SDK)/build-tools/$(ANDROID_SDK_BUILD_TOOLS_VERSION)/zipalign -f 4 $< $@
+android/build/$(APK_NAME).apk: android/build/$(APK_NAME)-release-unaligned.apk
+	$(ZIPALIGN) -f 4 $< $@

 endif

@@ -415,6 +443,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 \
@@ -468,6 +497,7 @@ libthread_a_SOURCES = \

 libnet_a_SOURCES = \
 	src/net/Features.hxx \
+	src/net/Init.hxx \
 	src/net/ToString.cxx src/net/ToString.hxx \
 	src/net/Resolver.cxx src/net/Resolver.hxx \
 	src/net/StaticSocketAddress.cxx src/net/StaticSocketAddress.hxx \
@@ -517,6 +547,8 @@ libevent_a_SOURCES = \
 # UTF-8 library

 libicu_a_SOURCES = \
+	src/lib/icu/CaseFold.cxx src/lib/icu/CaseFold.hxx \
+	src/lib/icu/Compare.cxx src/lib/icu/Compare.hxx \
 	src/lib/icu/Collate.cxx src/lib/icu/Collate.hxx \
 	src/lib/icu/Converter.cxx src/lib/icu/Converter.hxx

@@ -539,6 +571,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 \
@@ -575,6 +611,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
@@ -613,7 +651,8 @@ libxiph_a_SOURCES += \
 	src/lib/xiph/OggStreamState.hxx
 endif

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

 endif

@@ -691,6 +730,7 @@ libstorage_a_SOURCES = \
 	src/storage/MemoryDirectoryReader.cxx src/storage/MemoryDirectoryReader.hxx \
 	src/storage/Configured.cxx src/storage/Configured.hxx \
 	src/storage/plugins/LocalStorage.cxx src/storage/plugins/LocalStorage.hxx \
+	src/storage/StorageState.cxx src/storage/StorageState.hxx \
 	src/storage/FileInfo.hxx

 libstorage_a_CPPFLAGS = $(AM_CPPFLAGS) \
@@ -743,6 +783,7 @@ libneighbor_a_SOURCES = \
 	src/neighbor/NeighborPlugin.hxx

 libneighbor_a_CPPFLAGS = $(AM_CPPFLAGS) \
+	$(UPNP_CFLAGS) \
 	$(SMBCLIENT_CFLAGS)

 if ENABLE_SMBCLIENT
@@ -792,6 +833,8 @@ libdb_plugins_a_SOURCES = \
 	src/db/plugins/simple/PrefixedLightSong.hxx \
 	src/db/plugins/simple/SimpleDatabasePlugin.cxx \
 	src/db/plugins/simple/SimpleDatabasePlugin.hxx
+libdb_plugins_a_CPPFLAGS = $(AM_CPPFLAGS) \
+	$(UPNP_CFLAGS)

 if ENABLE_LIBMPDCLIENT
 libdb_plugins_a_SOURCES += \
@@ -869,9 +912,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
@@ -918,6 +958,7 @@ libtag_a_SOURCES =\
 	src/tag/ReplayGain.cxx src/tag/ReplayGain.hxx \
 	src/tag/MixRamp.cxx src/tag/MixRamp.hxx \
 	src/tag/Generic.cxx src/tag/Generic.hxx \
+	src/tag/Id3MusicBrainz.cxx src/tag/Id3MusicBrainz.hxx \
 	src/tag/ApeLoader.cxx src/tag/ApeLoader.hxx \
 	src/tag/ApeReplayGain.cxx src/tag/ApeReplayGain.hxx \
 	src/tag/ApeTag.cxx src/tag/ApeTag.hxx
@@ -1484,6 +1525,8 @@ liboutput_plugins_a_SOURCES += \
 	src/output/plugins/OSXOutputPlugin.cxx \
 	src/output/plugins/OSXOutputPlugin.hxx
 endif
+libmixer_plugins_a_SOURCES += \
+	src/mixer/plugins/OSXMixerPlugin.cxx

 if ENABLE_PULSE
 liboutput_plugins_a_SOURCES += \
@@ -2117,6 +2160,7 @@ test_run_output_LDADD = $(MPD_LIBS) \
 	libutil.a
 test_run_output_SOURCES = test/run_output.cxx \
 	test/ScopeIOThread.hxx \
+	test/NullMixerListener.hxx \
 	src/Log.cxx src/LogBackend.cxx \
 	src/IOThread.cxx \
 	src/output/Domain.cxx \
@@ -2140,6 +2184,7 @@ test_read_mixer_LDADD = \
 	libsystem.a \
 	libutil.a
 test_read_mixer_SOURCES = test/read_mixer.cxx \
+	test/NullMixerListener.hxx \
 	src/Log.cxx src/LogBackend.cxx \
 	src/mixer/MixerControl.cxx \
 	src/filter/FilterPlugin.cxx \
@@ -2225,6 +2270,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 \
@@ -2400,6 +2446,7 @@ EXTRA_DIST = $(doc_DATA) autogen.sh \
 	$(man_MANS) $(DOCBOOK_FILES) doc/mpdconf.example doc/doxygen.conf \
 	$(wildcard $(srcdir)/doc/include/*.xml) \
 	systemd/system/mpd.socket \
+	$(wildcard $(srcdir)/python/build/*.py) \
 	android/AndroidManifest.xml \
 	android/build.py \
 	android/custom_rules.xml \
@@ -2407,5 +2454,6 @@ EXTRA_DIST = $(doc_DATA) autogen.sh \
 	android/src/Bridge.java \
 	android/src/Loader.java \
 	android/src/Main.java \
+	win32/build.py \
 	win32/res/mpd.rc.in win32/res/mpd.ico \
 	src/haiku/App_MusicPD
--- a/204
+++ b/204
@@ -1,3 +1,207 @@
+ver 0.20.20 (2018/05/22)
+* protocol
+  - fix "modified-since" filter regression
+* output
+  - pulse: cork stream when paused due to "single" mode
+* decoder
+  - dsdiff, dsf: support more MIME types
+  - dsdiff, dsf: allow 4 MB ID3 tags
+  - opus: support R128_ALBUM_GAIN tag
+* Android, Windows
+  - enable the "proxy" database plugin
+
+ver 0.20.19 (2018/04/26)
+* protocol
+  - validate absolute seek time, reject negative values
+* database
+  - proxy: fix "search already in progress" errors
+  - proxy: implement "list ... group"
+* input
+  - mms: fix lockup bug and a crash bug
+* decoder
+  - ffmpeg: fix av_register_all() deprecation warning (FFmpeg 4.0)
+* player
+  - fix spurious "Not seekable" error when switching radio streams
+* macOS: fix crash bug
+
+ver 0.20.18 (2018/02/24)
+* input
+  - curl: allow authentication methods other than "Basic"
+* decoder
+  - flac: improve seeking precision
+* fix gapless CUE song transitions
+* Android, Windows
+  - enable the NFS storage plugin
+
+ver 0.20.17 (2018/02/11)
+* output
+  - alsa: fix crash bug with 8 channels
+* mixer
+  - alsa: fix rounding error at volume 0
+* fix real-time and idle scheduling with Musl
+* Android
+  - fix compatibility with Android 4.0
+
+ver 0.20.16 (2018/02/03)
+* output
+  - pulse: fix crash during auto-detection
+* database
+  - simple: fix search within mount points
+  - upnp: enable IPv6
+* archive
+  - iso9660: libcdio 2.0 compatibility
+* fix crash in debug build on Haiku and other operating systems
+
+ver 0.20.15 (2018/01/05)
+* queue: fix crash after seek failure
+* resampler
+  - soxr: clear internal state after manual song change
+* state file
+  - make mount point restore errors non-fatal
+  - fix crash when restoring mounts with incompatible database plugin
+* Android
+  - build without Ant
+  - fix for SIGSYS crash
+
+ver 0.20.14 (2018/01/01)
+* database
+  - simple: fix file corruption in the presence of mount points
+* archive
+  - bz2: fix deadlock
+  - reduce lock contention, fixing lots of xrun problems
+* fix Solaris build failure
+
+ver 0.20.13 (2017/12/18)
+* output
+  - osx: set up ring buffer to hold at least 100ms
+* mixer
+  - alsa: fix rounding errors
+* database
+  - simple: don't purge mount points on update/rescan
+  - simple: fix "mount" bug caused by bad compiler optimization
+  - simple: fix "lsinfo" into mount points
+  - upnp: work around libupnp 1.6.24 API breakage
+* queue: fix spuriously misplaced prioritized songs
+* save and restore mountpoints within the state file
+* include Windows cross-build script in source tarball
+* fix Windows build failures
+
+ver 0.20.12 (2017/11/25)
+* database
+  - upnp: adapt to libupnp 1.8 API changes
+* input
+  - cdio_paranoia, ffmpeg, file, smbclient: reduce lock contention,
+    fixing lots of xrun problems
+  - curl: fix seeking
+* decoder
+  - ffmpeg: fix GCC 8 warning
+  - vorbis: fix Tremor support
+* player
+  - log message when decoder is too slow
+* encoder
+  - vorbis: default to quality 3
+* output
+  - fix hanging playback with soxr resampler
+  - httpd: flush encoder after tag; fixes corrupt Vorbis stream
+
+ver 0.20.11 (2017/10/18)
+* storage
+  - curl: support Content-Type application/xml
+* decoder
+  - ffmpeg: more reliable song duration
+  - gme: fix track numbering
+* improve random song order when switching songs manually
+* fix case insensitive search without libicu
+* fix Unicode file names in playlists on Windows
+* fix endless loop when accessing malformed file names in ZIP files
+
+ver 0.20.10 (2017/08/24)
+* decoder
+  - ffmpeg: support MusicBrainz ID3v2 tags
+* tags
+  - aiff: fix FORM chunk size endianess (is big-endian)
+* mixer
+  - osx: add a mixer for OSX.
+* fix crash when resuming playback before decoder is ready
+* fix crash on Windows
+
+ver 0.20.9 (2017/06/04)
+* decoder
+  - ffmpeg: support *.adx
+* fix byte order detection on FreeBSD/aarch64
+* fix more random crashes when compiled with clang
+
+ver 0.20.8 (2017/05/19)
+* output
+  - osx: fix build failure due to missing "noexcept"
+* playlist
+  - m3u: support MIME type `audio/mpegurl`
+* fix build failure with GCC 4.x
+
+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
--- a/README.md
+++ b/README.md
@@ -7,14 +7,15 @@ server's audio device.  The daemon stores info about all available music,
 and this info can be easily searched and retrieved.  Player control, info
 retrieval, and playlist management can all be managed remotely.

-For basic installation information see the INSTALL file.
+For basic installation instructions
+[read the manual](https://www.musicpd.org/doc/user/install.html).

 # Users

 - [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/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -2,10 +2,10 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
          package="org.musicpd"
          android:installLocation="auto"
-          android:versionCode="13"
-          android:versionName="0.19.9">
+          android:versionCode="19"
+          android:versionName="0.20.20">

-  <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="17"/>
+  <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="17"/>

  <application android:icon="@drawable/icon" android:label="@string/app_name">
    <activity android:name=".Main"
--- a/android/build.py
+++ b/android/build.py
@@ -3,13 +3,14 @@
 import os, os.path
 import sys, subprocess

-if len(sys.argv) < 3:
-    print("Usage: build.py SDK_PATH NDK_PATH [configure_args...]", file=sys.stderr)
+if len(sys.argv) < 4:
+    print("Usage: build.py SDK_PATH NDK_PATH ABI [configure_args...]", file=sys.stderr)
    sys.exit(1)

 sdk_path = sys.argv[1]
 ndk_path = sys.argv[2]
-configure_args = sys.argv[3:]
+android_abi = sys.argv[3]
+configure_args = sys.argv[4:]

 if not os.path.isfile(os.path.join(sdk_path, 'tools', 'android')):
    print("SDK not found in", ndk_path, file=sys.stderr)
@@ -19,8 +20,27 @@ if not os.path.isdir(ndk_path):
    print("NDK not found in", ndk_path, file=sys.stderr)
    sys.exit(1)

+android_abis = {
+    'armeabi-v7a': {
+        'arch': 'arm-linux-androideabi',
+        'ndk_arch': 'arm',
+        'toolchain_arch': 'arm-linux-androideabi',
+        'llvm_triple': 'armv7-none-linux-androideabi',
+        'cflags': '-march=armv7-a -mfpu=vfp -mfloat-abi=softfp',
+    },
+
+    'x86': {
+        'arch': 'i686-linux-android',
+        'ndk_arch': 'x86',
+        'toolchain_arch': 'x86',
+        'llvm_triple': 'i686-none-linux-android',
+        'cflags': '-march=i686 -mtune=intel -mssse3 -mfpmath=sse -m32',
+    },
+}
+
 # select the NDK target
-arch = 'arm-linux-androideabi'
+abi_info = android_abis[android_abi]
+arch = abi_info['arch']

 # the path to the MPD sources
 mpd_path = os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]) or '.', '..'))
@@ -44,15 +64,15 @@ class AndroidNdkToolchain:
        self.src_path = src_path
        self.build_path = build_path

-        self.ndk_arch = 'arm'
-        android_abi = 'armeabi-v7a'
+        ndk_arch = abi_info['ndk_arch']
        ndk_platform = 'android-14'

        # select the NDK compiler
        gcc_version = '4.9'

        ndk_platform_path = os.path.join(ndk_path, 'platforms', ndk_platform)
-        sysroot = os.path.join(ndk_platform_path, 'arch-' + self.ndk_arch)
+        sysroot = os.path.join(ndk_path, 'sysroot')
+        target_root = os.path.join(ndk_platform_path, 'arch-' + ndk_arch)

        install_prefix = os.path.join(arch_path, 'root')

@@ -60,11 +80,13 @@ class AndroidNdkToolchain:
        self.install_prefix = install_prefix
        self.sysroot = sysroot

-        toolchain_path = os.path.join(ndk_path, 'toolchains', arch + '-' + gcc_version, 'prebuilt', build_arch)
+        toolchain_path = os.path.join(ndk_path, 'toolchains', abi_info['toolchain_arch'] + '-' + gcc_version, 'prebuilt', build_arch)
        llvm_path = os.path.join(ndk_path, 'toolchains', 'llvm', 'prebuilt', build_arch)
-        llvm_triple = 'armv7-none-linux-androideabi'
+        llvm_triple = abi_info['llvm_triple']

-        common_flags = '-march=armv7-a -mfloat-abi=softfp'
+        common_flags = '-Os -g'
+        common_flags += ' -fPIC'
+        common_flags += ' ' + abi_info['cflags']

        toolchain_bin = os.path.join(toolchain_path, 'bin')
        llvm_bin = os.path.join(llvm_path, 'bin')
@@ -72,28 +94,40 @@ class AndroidNdkToolchain:
        self.cxx = os.path.join(llvm_bin, 'clang++')
        common_flags += ' -target ' + llvm_triple + ' -integrated-as -gcc-toolchain ' + toolchain_path

+        common_flags += ' -fvisibility=hidden -fdata-sections -ffunction-sections'
+
        self.ar = os.path.join(toolchain_bin, arch + '-ar')
        self.ranlib = os.path.join(toolchain_bin, arch + '-ranlib')
        self.nm = os.path.join(toolchain_bin, arch + '-nm')
        self.strip = os.path.join(toolchain_bin, arch + '-strip')

-        self.cflags = '-Os -g ' + common_flags
-        self.cxxflags = '-Os -g ' + common_flags
-        self.cppflags = '--sysroot=' + self.sysroot + ' -isystem ' + os.path.join(install_prefix, 'include')
-        self.ldflags = '--sysroot=' + self.sysroot + ' ' + common_flags + ' -L' + os.path.join(install_prefix, 'lib')
+        self.cflags = common_flags
+        self.cxxflags = common_flags
+        self.cppflags = '--sysroot=' + sysroot + \
+            ' -isystem ' + os.path.join(install_prefix, 'include') + \
+            ' -isystem ' + os.path.join(sysroot, 'usr', 'include', arch) + \
+            ' -D__ANDROID_API__=14'
+        self.ldflags = '--sysroot=' + sysroot + \
+            ' -L' + os.path.join(install_prefix, 'lib') + \
+            ' -L' + os.path.join(target_root, 'usr', 'lib') + \
+            ' -B' + os.path.join(target_root, 'usr', 'lib') + \
+            ' ' + common_flags
        self.libs = ''

-        self.is_arm = self.ndk_arch == 'arm'
+        self.is_arm = ndk_arch == 'arm'
        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_flags = '-stdlib=libc++'
+        libstdcxx_cxxflags = libstdcxx_flags + ' -isystem ' + os.path.join(libcxx_path, 'include') + ' -isystem ' + os.path.join(ndk_path, 'sources/android/support/include')
+        libstdcxx_ldflags = libstdcxx_flags + ' -static-libstdc++ -L' + libcxx_libs_path

        if use_cxx:
-            self.libs += ' ' + libstdcxx_ldadd
-            self.cppflags += ' ' + libstdcxx_cppflags
+            self.cxxflags += ' ' + libstdcxx_cxxflags
+            self.ldflags += ' ' + libstdcxx_ldflags

        self.env = dict(os.environ)

@@ -104,14 +138,15 @@ class AndroidNdkToolchain:
 # a list of third-party libraries to be used by MPD on Android
 from build.libs import *
 thirdparty_libs = [
+    libmpdclient,
    libogg,
    libvorbis,
    opus,
    flac,
    libid3tag,
-    libmad,
    ffmpeg,
    curl,
+    libnfs,
    boost,
 ]

@@ -149,5 +184,9 @@ configure = [

 ] + configure_args

+from build.cmdline import concatenate_cmdline_variables
+configure = concatenate_cmdline_variables(configure,
+    set(('CFLAGS', 'CXXFLAGS', 'CPPFLAGS', 'LDFLAGS', 'LIBS')))
+
 subprocess.check_call(configure, env=toolchain.env)
 subprocess.check_call(['/usr/bin/make', '--quiet', '-j12'], env=toolchain.env)
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,10 @@
 AC_PREREQ(2.60)

-AC_INIT(mpd, 0.20.1, musicpd-dev-team@lists.sourceforge.net)
+AC_INIT(mpd, 0.20.20, musicpd-dev-team@lists.sourceforge.net)

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

 AC_CONFIG_SRCDIR([src/Main.cxx])
@@ -241,6 +241,7 @@ AC_CHECK_FUNCS(getpwnam_r getpwuid_r)
 AC_CHECK_FUNCS(initgroups)
 AC_CHECK_FUNCS(fnmatch)
 AC_CHECK_FUNCS(strndup)
+AC_CHECK_FUNCS(strcasestr)

 if test x$host_is_linux = xyes; then
 	MPD_OPTIONAL_FUNC(eventfd, eventfd, USE_EVENTFD)
@@ -453,7 +454,7 @@ dnl ---------------------------------------------------------------------------
 dnl Mandatory Libraries
 dnl ---------------------------------------------------------------------------

-AX_BOOST_BASE([1.46],, [AC_MSG_ERROR([Boost not found])])
+AX_BOOST_BASE([1.54],, [AC_MSG_ERROR([Boost not found])])

 AC_ARG_ENABLE(icu,
 	AS_HELP_STRING([--enable-icu],
@@ -491,7 +492,7 @@ if test x$enable_ipv6 = xyes; then
 	AC_EGREP_CPP([AP_maGiC_VALUE],
 	[
 #include <sys/types.h>
-#ifdef WIN32
+#ifdef _WIN32
 #include <winsock2.h>
 #else
 #include <sys/socket.h>
@@ -992,7 +993,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
@@ -1384,6 +1385,11 @@ then
 	AX_APPEND_COMPILE_FLAGS([-Wcast-qual])
 	AX_APPEND_COMPILE_FLAGS([-Wwrite-strings])
 	AX_APPEND_COMPILE_FLAGS([-Wsign-compare])
+
+	dnl This GCC8 warning for C++17 ABI compatibility is of no
+	dnl interest for us, because we're not a shared library.
+	AX_APPEND_COMPILE_FLAGS([-Wno-noexcept-type])
+
 	AC_LANG_POP
 fi

--- a/doc/developer.xml
+++ b/doc/developer.xml
@@ -97,20 +97,20 @@ Foo(const char *abc, int xyz)

    <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
@@ -188,17 +188,7 @@ 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.
-    </para>
-
-    <para>
-      There is <ulink url="https://github.com/MaxKellermann/MPD">a
-      mirror of the <application>MPD</application> git repository on
-      GitHub</ulink>, and you can use that as well to submit pull
-      requests.
+      <command>git pull</command> requests are preferred.
    </para>
  </chapter>

--- 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>

@@ -111,7 +113,7 @@
    <para>
      <varname>musicbrainz_artistid</varname>: the artist id in the
      <ulink
-      url="http://musicbrainz.org/doc/MusicBrainzTag">MusicBrainz</ulink>
+      url="https://picard.musicbrainz.org/docs/mappings/">MusicBrainz</ulink>
      database.
    </para>
  </listitem>
@@ -120,7 +122,7 @@
    <para>
      <varname>musicbrainz_albumid</varname>: the album id in the
      <ulink
-      url="http://musicbrainz.org/doc/MusicBrainzTag">MusicBrainz</ulink>
+      url="https://picard.musicbrainz.org/docs/mappings/">MusicBrainz</ulink>
      database.
    </para>
  </listitem>
@@ -129,7 +131,7 @@
    <para>
      <varname>musicbrainz_albumartistid</varname>: the album artist
      id in the <ulink
-      url="http://musicbrainz.org/doc/MusicBrainzTag">MusicBrainz</ulink>
+      url="https://picard.musicbrainz.org/docs/mappings/">MusicBrainz</ulink>
      database.
    </para>
  </listitem>
@@ -138,7 +140,7 @@
    <para>
      <varname>musicbrainz_trackid</varname>: the track id in the
      <ulink
-      url="http://musicbrainz.org/doc/MusicBrainzTag">MusicBrainz</ulink>
+      url="https://picard.musicbrainz.org/docs/mappings/">MusicBrainz</ulink>
      database.
    </para>
  </listitem>
@@ -147,7 +149,7 @@
    <para>
      <varname>musicbrainz_releasetrackid</varname>: the release track
      id in the <ulink
-      url="http://musicbrainz.org/doc/MusicBrainzTag">MusicBrainz</ulink>
+      url="https://picard.musicbrainz.org/docs/mappings/">MusicBrainz</ulink>
      database.
    </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
@@ -403,6 +403,15 @@
                </para>
              </listitem>
            </itemizedlist>
+
+            <para>
+              Change events accumulate, even while the connection is
+              not in "idle" mode; no events gets lost while the client
+              is doing something else with the connection.  If an
+              event had already occurred since the last call, the new
+              <command>idle</command> command will return immediately.
+            </para>
+
            <para>
              While a client is waiting for <command>idle</command>
              results, the server disables timeouts, allowing a client
@@ -436,7 +445,9 @@
              <listitem>
                <para>
                  <varname>volume</varname>:
-                  <returnvalue>0-100</returnvalue>
+                  <returnvalue>0-100</returnvalue> or
+                  <returnvalue>-1</returnvalue> if the volume cannot
+                  be determined
                </para>
              </listitem>
              <listitem>
@@ -573,7 +584,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
@@ -66,6 +66,26 @@
      </para>
    </section>

+    <section id="install_android">
+      <title>Installing on Android</title>
+
+      <para>
+        An experimental Android build is available on <ulink
+        url="https://play.google.com/store/apps/details?id=org.musicpd">Google
+        Play</ulink>.  After installing and launching it, MPD will
+        scan the music in your <filename>Music</filename> directory
+        and you can control it as usual with a MPD client.
+      </para>
+
+      <para>
+        If you need to tweak the configuration, you can create a file
+        called <filename>mpd.conf</filename> on the data partition
+        (the directory which is returned by Android's <ulink
+        url="https://developer.android.com/reference/android/os/Environment.html#getExternalStorageDirectory()">getExternalStorageDirectory()</ulink>
+        API function).
+      </para>
+    </section>
+
    <section id="install_source">
      <title>Compiling from source</title>

@@ -80,13 +100,40 @@
 cd mpd-version</programlisting>

      <para>
-        Make sure that all the required libraries and build tools are
-        installed.  The <filename>INSTALL</filename> file has a list.
+        In any case, you need:
+      </para>
+
+      <itemizedlist>
+        <listitem>
+          <para>
+            a C++14 compiler (e.g. <ulink
+            url="http://gcc.gnu.org/">gcc 4.9</ulink> or <ulink
+            url="http://clang.llvm.org/">clang 3.9</ulink>)
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <ulink url="http://www.boost.org/">Boost 1.54</ulink>
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <ulink url="https://www.freedesktop.org/wiki/Software/pkg-config/">pkg-config</ulink>
+          </para>
+        </listitem>
+      </itemizedlist>
+
+      <para>
+        Each plugin usually needs a codec library, which you also need
+        to install.  Check the plugin reference for details about
+        required libraries.
      </para>

      <para>
        For example, the following installs a fairly complete list of
-        build dependencies on Debian Wheezy:
+        build dependencies on Debian Jessie:
      </para>

      <programlisting>
@@ -98,19 +145,20 @@ apt-get install g++ \
  libmpcdec-dev libwavpack-dev libwildmidi-dev \
  libsidplay2-dev libsidutils-dev libresid-builder-dev \
  libavcodec-dev libavformat-dev \
-  libmp3lame-dev \
+  libmp3lame-dev libtwolame-dev libshine-dev \
  libsamplerate0-dev libsoxr-dev \
  libbz2-dev libcdio-paranoia-dev libiso9660-dev libmms-dev \
  libzzip-dev \
  libcurl4-gnutls-dev libyajl-dev libexpat-dev \
  libasound2-dev libao-dev libjack-jackd2-dev libopenal-dev \
  libpulse-dev libroar-dev libshout3-dev \
+  libsndio-dev \
  libmpdclient-dev \
  libnfs-dev libsmbclient-dev \
  libupnp-dev \
  libavahi-client-dev \
  libsqlite3-dev \
-  libsystemd-daemon-dev libwrap0-dev \
+  libsystemd-dev libwrap0-dev \
  libcppunit-dev xmlto \
  libboost-dev \
  libicu-dev
@@ -135,6 +183,144 @@ 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 id="android_build">
+        <title>Compiling for Android</title>
+
+        <para>
+          MPD can be compiled as an Android app.  It can be installed
+          easily with <link linkend="install_android">Google
+          Play</link>, but if you want to build it from source, follow
+          this section.
+        </para>
+
+        <para>
+          You need:
+        </para>
+
+        <itemizedlist>
+          <listitem>
+            <para>
+              Android SDK
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <ulink
+              url="https://developer.android.com/ndk/downloads/index.html">Android
+              NDK</ulink>
+            </para>
+          </listitem>
+        </itemizedlist>
+
+        <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>./android/build.py SDK_PATH NDK_PATH ABI
+make android/build/mpd-debug.apk</programlisting>
+
+        <para>
+          <varname>SDK_PATH</varname> is the absolute path where you
+          installed the Android SDK; <varname>NDK_PATH</varname> is
+          the Android NDK installation path; <varname>ABI</varname> is
+          the Android ABI to be built, e.g. "armeabi-v7a".
+        </para>
+
+        <para>
+          This downloads various library sources, and then configures
+          and builds <application>MPD</application>.
+        </para>
+      </section>
    </section>

    <section id="systemd_socket">
@@ -210,7 +396,9 @@ systemctl start mpd.socket</programlisting>
        <application>MPD</application> as a user daemon (and not as a
        system daemon), the configuration is read from
        <filename>$XDG_CONFIG_HOME/mpd/mpd.conf</filename> (usually
-        <filename>~/.config/mpd/mpd.conf</filename>).
+        <filename>~/.config/mpd/mpd.conf</filename>).  On Android,
+        <filename>mpd.conf</filename> will be loaded from the
+        top-level directory of the data partition.
      </para>

      <para>
@@ -576,10 +764,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 +785,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 +944,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>
@@ -934,6 +1138,40 @@ systemctl start mpd.socket</programlisting>
        </informaltable>
      </section>

+      <section id="stickers">
+        <title>The Sticker Database</title>
+
+        <para>
+          "Stickers" are pieces of information attached to songs.
+          Some clients use them to store ratings and other volatile
+          data.  This feature requires <ulink
+          url="http://www.sqlite.org/">SQLite</ulink>, compile-time
+          configure option <parameter>--enable-sqlite</parameter>.
+        </para>
+
+        <informaltable>
+          <tgroup cols="2">
+            <thead>
+              <row>
+                <entry>Setting</entry>
+                <entry>Description</entry>
+              </row>
+            </thead>
+            <tbody>
+              <row>
+                <entry>
+                  <varname>sticker_file</varname>
+                  <parameter>PATH</parameter>
+                </entry>
+                <entry>
+                  The location of the sticker database.
+                </entry>
+              </row>
+            </tbody>
+          </tgroup>
+        </informaltable>
+      </section>
+
      <section>
        <title>Resource Limitations</title>

@@ -1064,6 +1302,55 @@ systemctl start mpd.socket</programlisting>
          </tgroup>
        </informaltable>
      </section>
+
+      <section id="zeroconf">
+        <title>Zeroconf</title>
+
+        <para>
+          If Zeroconf support (<ulink
+          url="http://avahi.org/">Avahi</ulink> or Apple's Bonjour)
+          was enabled at compile time with
+          <parameter>--with-zeroconf=...</parameter>, MPD can announce
+          its presence on the network.  The following settings control
+          this feature:
+        </para>
+
+        <informaltable>
+          <tgroup cols="2">
+            <thead>
+              <row>
+                <entry>Setting</entry>
+                <entry>Description</entry>
+              </row>
+            </thead>
+            <tbody>
+
+              <row>
+                <entry>
+                  <varname>zeroconf_enabled</varname>
+                  <parameter>yes|no</parameter>
+                </entry>
+                <entry>
+                  Enables or disables this feature.  Default is
+                  <parameter>yes</parameter>.
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  <varname>zeroconf_name</varname>
+                  <parameter>NAME</parameter>
+                </entry>
+                <entry>
+                  The service name to publish via Zeroconf.  The
+                  default is "<parameter>Music Player</parameter>".
+                </entry>
+              </row>
+
+            </tbody>
+          </tgroup>
+        </informaltable>
+      </section>
    </section>
  </chapter>

@@ -1646,7 +1933,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 +2087,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>
@@ -1970,7 +2264,9 @@ run</programlisting>
        <title><varname>cdio_paranoia</varname></title>

        <para>
-          Plays audio CDs.  The URI has the form:
+          Plays audio CDs using <ulink
+          url="http://www.gnu.org/software/libcdio/"><filename>libcdio</filename></ulink>.
+          The URI has the form:
          "<filename>cdda://[DEVICE][/TRACK]</filename>".  The
          simplest form <filename>cdda://</filename> plays the whole
          disc in the default drive.
@@ -2006,7 +2302,8 @@ run</programlisting>
        <title><varname>curl</varname></title>

        <para>
-          Opens remote files or streams over HTTP.
+          Opens remote files or streams over HTTP using <ulink
+          url="http://curl.haxx.se/"><filename>libcurl</filename></ulink>.
        </para>

        <para>
@@ -2099,7 +2396,8 @@ run</programlisting>
        <title><varname>mms</varname></title>

        <para>
-          Plays streams with the MMS protocol.
+          Plays streams with the MMS protocol using <ulink
+          url="https://launchpad.net/libmms"><filename>libmms</filename></ulink>.
        </para>
      </section>

@@ -2155,7 +2453,8 @@ run</programlisting>
        <title><varname>adplug</varname></title>

        <para>
-          Decodes AdLib files.
+          Decodes AdLib files using <ulink
+          url="http://adplug.sourceforge.net/">libadplug</ulink>.
        </para>

        <informaltable>
@@ -2186,8 +2485,8 @@ run</programlisting>
        <title><varname>audiofile</varname></title>

        <para>
-          Decodes WAV and AIFF files using
-          <filename>libaudiofile</filename>.
+          Decodes WAV and AIFF files using <ulink
+          url="http://audiofile.68k.org/"><filename>libaudiofile</filename></ulink>.
        </para>
      </section>

@@ -2195,7 +2494,8 @@ run</programlisting>
        <title><varname>faad</varname></title>

        <para>
-          Decodes AAC files using <filename>libfaad</filename>.
+          Decodes AAC files using <ulink
+          url="http://www.audiocoding.com/"><filename>libfaad</filename></ulink>.
        </para>
      </section>

@@ -2203,9 +2503,51 @@ run</programlisting>
        <title><varname>ffmpeg</varname></title>

        <para>
-          Decodes various codecs using
-          <application>FFmpeg</application>.
+          Decodes various codecs using <ulink
+          url="https://ffmpeg.org/"><application>FFmpeg</application></ulink>.
        </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">
@@ -2213,7 +2555,7 @@ run</programlisting>

        <para>
          Decodes FLAC files using
-          <application>libFLAC</application>.
+          <ulink url="https://xiph.org/flac/"><application>libFLAC</application></ulink>.
        </para>
      </section>

@@ -2333,7 +2675,8 @@ run</programlisting>
        <title><varname>mad</varname></title>

        <para>
-          Decodes MP3 files using <application>libmad</application>.
+          Decodes MP3 files using <ulink
+          url="http://www.underbit.com/products/mad/"><application>libmad</application></ulink>.
        </para>
      </section>

@@ -2413,8 +2756,8 @@ run</programlisting>
        <title><varname>mpcdec</varname></title>

        <para>
-          Decodes Musepack files using
-          <application>libmpcdec</application>.
+          Decodes Musepack files using <ulink
+          url="http://www.musepack.net/"><application>libmpcdec</application></ulink>.
        </para>
      </section>

@@ -2422,7 +2765,17 @@ run</programlisting>
        <title><varname>mpg123</varname></title>

        <para>
-          Decodes MP3 files using <application>libmpg123</application>.
+          Decodes MP3 files using <ulink
+          url="http://www.mpg123.de/"><application>libmpg123</application></ulink>.
+        </para>
+      </section>
+
+      <section id="opus_decoder">
+        <title><varname>opus</varname></title>
+
+        <para>
+          Decodes Opus files using <ulink
+          url="http://www.opus-codec.org/"><application>libopus</application></ulink>.
        </para>
      </section>

@@ -2442,8 +2795,8 @@ run</programlisting>
        <title><varname>sidplay</varname></title>

        <para>
-          C64 SID decoder based on
-          <application>libsidplay</application>.
+          C64 SID decoder based on <ulink
+          url="http://sidplay2.sourceforge.net/"><application>libsidplay</application></ulink>.
        </para>

        <informaltable>
@@ -2499,8 +2852,8 @@ run</programlisting>
        <title><varname>sndfile</varname></title>

        <para>
-          Decodes WAV and AIFF files using
-          <filename>libsndfile</filename>.
+          Decodes WAV and AIFF files using <ulink
+          url="http://www.mega-nerd.com/libsndfile/"><filename>libsndfile</filename></ulink>.
        </para>
      </section>

@@ -2508,8 +2861,8 @@ run</programlisting>
        <title><varname>vorbis</varname></title>

        <para>
-          Decodes Ogg-Vorbis files using
-          <application>libvorbis</application>.
+          Decodes Ogg-Vorbis files using <ulink
+          url="http://www.xiph.org/ogg/vorbis/"><application>libvorbis</application></ulink>.
        </para>
      </section>

@@ -2518,7 +2871,7 @@ run</programlisting>

        <para>
          Decodes WavPack files using
-          <application>libwavpack</application>.
+          <ulink url="http://www.wavpack.com/"><application>libwavpack</application></ulink>.
        </para>
      </section>

@@ -2713,6 +3066,60 @@ run</programlisting>
        </informaltable>
      </section>

+      <section id="opus_encoder">
+        <title><varname>opus</varname></title>
+
+        <para>
+          Encodes into <ulink
+          url="http://www.opus-codec.org/">Ogg Opus</ulink>.
+        </para>
+
+        <informaltable>
+          <tgroup cols="2">
+            <thead>
+              <row>
+                <entry>Setting</entry>
+                <entry>Description</entry>
+              </row>
+            </thead>
+            <tbody>
+              <row>
+                <entry>
+                  <varname>bitrate</varname>
+                </entry>
+                <entry>
+                  Sets the data rate in bit per second.  The special
+                  value "auto" lets <application>libopus</application>
+                  choose a rate (which is the default), and "max" uses
+                  the maximum possible data rate.
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  <varname>complexity</varname>
+                </entry>
+                <entry>
+                  Sets the <ulink
+                  url="https://wiki.xiph.org/OpusFAQ#What_is_the_complexity_of_Opus.3F">Opus
+                  complexity</ulink>.
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  <varname>signal</varname>
+                </entry>
+                <entry>
+                  Sets the Opus signal type.  Valid values are "auto"
+                  (the default), "voice" and "music".
+                </entry>
+              </row>
+            </tbody>
+          </tgroup>
+        </informaltable>
+      </section>
+
      <section id="vorbis_encoder">
        <title><varname>vorbis</varname></title>

@@ -2736,8 +3143,8 @@ run</programlisting>
                </entry>
                <entry>
                  Sets the quality for VBR.  -1 is the lowest quality,
-                  10 is the highest quality.  Cannot be used with
-                  <varname>bitrate</varname>.
+                  10 is the highest quality.  Defaults to 3.  Cannot
+                  be used with <varname>bitrate</varname>.
                </entry>
              </row>
              <row>
@@ -3342,7 +3749,7 @@ run</programlisting>
        </informaltable>
      </section>

-      <section>
+      <section id="jack_output">
        <title><varname>jack</varname></title>

        <para>
@@ -3622,7 +4029,7 @@ run</programlisting>
        </informaltable>
      </section>

-      <section>
+      <section id="openal_output">
        <title><varname>openal</varname></title>

        <para>
@@ -3773,7 +4180,7 @@ run</programlisting>
        <para>
          The <varname>pulse</varname> plugin connects to a <ulink
          url="http://www.freedesktop.org/wiki/Software/PulseAudio/"><application>PulseAudio</application></ulink>
-          server.
+          server.  Requires <filename>libpulse</filename>.
        </para>

        <informaltable>
@@ -3930,7 +4337,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>
@@ -3961,7 +4368,8 @@ run</programlisting>
          url="http://www.shoutcast.com/"><application>ShoutCast</application></ulink>
          or <ulink
          url="http://icecast.org/"><application>IceCast</application></ulink>
-          server.  It forwards tags to this server.
+          server using <filename>libshout</filename>.  It forwards
+          tags to this server.
        </para>

        <para>
@@ -4151,6 +4559,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>

@@ -4175,6 +4599,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>

@@ -4183,6 +4616,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/autotools.py
+++ b/python/build/autotools.py
@@ -1,24 +1,37 @@
-import os.path, subprocess
+import os.path, subprocess, sys

-from build.project import Project
+from build.makeproject import MakeProject

-class AutotoolsProject(Project):
+class AutotoolsProject(MakeProject):
    def __init__(self, url, md5, installed, configure_args=[],
                 autogen=False,
+                 autoreconf=False,
                 cppflags='',
+                 ldflags='',
+                 libs='',
+                 subdirs=None,
                 **kwargs):
-        Project.__init__(self, url, md5, installed, **kwargs)
+        MakeProject.__init__(self, url, md5, installed, **kwargs)
        self.configure_args = configure_args
        self.autogen = autogen
+        self.autoreconf = autoreconf
        self.cppflags = cppflags
+        self.ldflags = ldflags
+        self.libs = libs
+        self.subdirs = subdirs

-    def build(self, toolchain):
+    def configure(self, toolchain):
        src = self.unpack(toolchain)
        if self.autogen:
-            subprocess.check_call(['libtoolize', '--force'], cwd=src)
+            if sys.platform == 'darwin':
+                subprocess.check_call(['glibtoolize', '--force'], cwd=src)
+            else:
+                subprocess.check_call(['libtoolize', '--force'], cwd=src)
            subprocess.check_call(['aclocal'], cwd=src)
            subprocess.check_call(['automake', '--add-missing', '--force-missing', '--foreign'], cwd=src)
            subprocess.check_call(['autoconf'], cwd=src)
+        if self.autoreconf:
+            subprocess.check_call(['autoreconf', '-vif'], cwd=src)

        build = self.make_build_path(toolchain)

@@ -29,8 +42,8 @@ class AutotoolsProject(Project):
            'CFLAGS=' + toolchain.cflags,
            'CXXFLAGS=' + toolchain.cxxflags,
            'CPPFLAGS=' + toolchain.cppflags + ' ' + self.cppflags,
-            'LDFLAGS=' + toolchain.ldflags,
-            'LIBS=' + toolchain.libs,
+            'LDFLAGS=' + toolchain.ldflags + ' ' + self.ldflags,
+            'LIBS=' + toolchain.libs + ' ' + self.libs,
            'AR=' + toolchain.ar,
            'RANLIB=' + toolchain.ranlib,
            'STRIP=' + toolchain.strip,
@@ -40,7 +53,12 @@ class AutotoolsProject(Project):
        ] + self.configure_args

        subprocess.check_call(configure, cwd=build, env=toolchain.env)
-        subprocess.check_call(['/usr/bin/make', '--quiet', '-j12'],
-                              cwd=build, env=toolchain.env)
-        subprocess.check_call(['/usr/bin/make', '--quiet', 'install'],
-                              cwd=build, env=toolchain.env)
+        return build
+
+    def build(self, toolchain):
+        build = self.configure(toolchain)
+        if self.subdirs is not None:
+            for subdir in self.subdirs:
+                MakeProject.build(self, toolchain, os.path.join(build, subdir))
+        else:
+            MakeProject.build(self, toolchain, build)
--- a/python/build/cmdline.py
+++ b/python/build/cmdline.py
@@ -0,0 +1,29 @@
+def concatenate_cmdline_variables(src, names):
+    """Find duplicate variable declarations on the given source list, and
+    concatenate the values of those in the 'names' list."""
+
+    # the result list being constructed
+    dest = []
+
+    # a map of variable name to destination list index
+    positions = {}
+
+    for item in src:
+        i = item.find('=')
+        if i > 0:
+            # it's a variable
+            name = item[:i]
+            if name in names:
+                # it's a known variable
+                if name in positions:
+                    # already specified: concatenate instead of
+                    # appending it
+                    dest[positions[name]] += ' ' + item[i + 1:]
+                    continue
+                else:
+                    # not yet seen: append it and remember the list
+                    # index
+                    positions[name] = len(dest)
+        dest.append(item)
+
+    return dest
--- a/python/build/libs.py
+++ b/python/build/libs.py
@@ -1,28 +1,54 @@
+import re
+from os.path import abspath
+
 from build.project import Project
 from build.zlib import ZlibProject
+from build.meson import MesonProject
 from build.autotools import AutotoolsProject
 from build.ffmpeg import FfmpegProject
 from build.boost import BoostProject

+libmpdclient = MesonProject(
+    'https://www.musicpd.org/download/libmpdclient/2/libmpdclient-2.14.tar.xz',
+    '0a84e2791bfe3077cf22ee1784c805d5bb550803dffe56a39aa3690a38061372',
+    'lib/libmpdclient.a',
+)
+
 libogg = AutotoolsProject(
-    'http://downloads.xiph.org/releases/ogg/libogg-1.3.2.tar.xz',
-    '5c3a34309d8b98640827e5d0991a4015',
+    'http://downloads.xiph.org/releases/ogg/libogg-1.3.3.tar.xz',
+    '4f3fc6178a533d392064f14776b23c397ed4b9f48f5de297aba73b643f955c08',
    'lib/libogg.a',
-    ['--disable-shared', '--enable-static'],
+    [
+        '--disable-shared', '--enable-static',
+    ],
 )

 libvorbis = AutotoolsProject(
-    'http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.5.tar.xz',
-    '28cb28097c07a735d6af56e598e1c90f',
+    'http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.6.tar.xz',
+    'af00bb5a784e7c9e69f56823de4637c350643deedaf333d0fa86ecdba6fcb415',
    'lib/libvorbis.a',
-    ['--disable-shared', '--enable-static'],
+    [
+        '--disable-shared', '--enable-static',
+    ],
+
+    edits={
+        # this option is not understood by clang
+        'configure': lambda data: data.replace('-mno-ieee-fp', ' '),
+    }
 )

 opus = AutotoolsProject(
-    'http://downloads.xiph.org/releases/opus/opus-1.1.3.tar.gz',
-    '32bbb6b557fe1b6066adc0ae1f08b629',
+    'https://archive.mozilla.org/pub/opus/opus-1.2.1.tar.gz',
+    'cfafd339ccd9c5ef8d6ab15d7e1a412c054bf4cb4ecbbbcc78c12ef2def70732',
    'lib/libopus.a',
-    ['--disable-shared', '--enable-static'],
+    [
+        '--disable-shared', '--enable-static',
+        '--disable-doc',
+        '--disable-extra-programs',
+    ],
+
+    # suppress "visibility default" from opus_defines.h
+    cppflags='-DOPUS_EXPORT=',
 )

 flac = AutotoolsProject(
@@ -32,12 +58,14 @@ flac = AutotoolsProject(
    [
        '--disable-shared', '--enable-static',
        '--disable-xmms-plugin', '--disable-cpplibs',
+        '--disable-doxygen-docs',
    ],
+    subdirs=['include', 'src/libFLAC'],
 )

 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',
 )

@@ -45,21 +73,47 @@ libid3tag = AutotoolsProject(
    'ftp://ftp.mars.org/pub/mpeg/libid3tag-0.15.1b.tar.gz',
    'e5808ad997ba32c498803822078748c3',
    'lib/libid3tag.a',
-    ['--disable-shared', '--enable-static'],
+    [
+        '--disable-shared', '--enable-static',
+
+        # without this, libid3tag's configure.ac ignores -O* and -f*
+        '--disable-debugging',
+    ],
    autogen=True,
+
+    edits={
+        # fix bug in libid3tag's configure.ac which discards all but the last optimization flag
+        'configure.ac': lambda data: re.sub(r'optimize="\$1"', r'optimize="$optimize $1"', data, count=1),
+    }
 )

 libmad = AutotoolsProject(
    'ftp://ftp.mars.org/pub/mpeg/libmad-0.15.1b.tar.gz',
    '1be543bc30c56fb6bea1d7bf6a64e66c',
    'lib/libmad.a',
-    ['--disable-shared', '--enable-static'],
+    [
+        '--disable-shared', '--enable-static',
+
+        # without this, libmad's configure.ac ignores -O* and -f*
+        '--disable-debugging',
+    ],
    autogen=True,
 )

+liblame = AutotoolsProject(
+    'http://downloads.sourceforge.net/project/lame/lame/3.100/lame-3.100.tar.gz',
+    'ddfe36cab873794038ae2c1210557ad34857a4b6bdc515785d1da9e175b1da1e',
+    'lib/libmp3lame.a',
+    [
+        '--disable-shared', '--enable-static',
+        '--disable-gtktest', '--disable-analyzer-hooks',
+        '--disable-decoder', '--disable-frontend',
+    ],
+)
+
 ffmpeg = FfmpegProject(
-    'http://ffmpeg.org/releases/ffmpeg-3.2.2.tar.xz',
-    '3f01bd1fe1a17a277f8c84869e5d9192b4b978cb660872aa2b54c3cc8a2fedfc',
+    'http://ffmpeg.org/releases/ffmpeg-4.0.tar.xz',
+    'ed945daf40b124e77a685893cc025d086f638bc703183460aff49508edb3a43f',
    'lib/libavcodec.a',
    [
        '--disable-shared', '--enable-static',
@@ -73,17 +127,222 @@ ffmpeg = FfmpegProject(
        '--disable-swscale',
        '--disable-postproc',
        '--disable-avfilter',
+        '--disable-lzo',
+        '--disable-faan',
+        '--disable-pixelutils',
        '--disable-network',
        '--disable-encoders',
+        '--disable-muxers',
        '--disable-protocols',
-        '--disable-outdevs',
+        '--disable-devices',
        '--disable-filters',
+        '--disable-v4l2_m2m',
+
+        '--disable-parser=bmp',
+        '--disable-parser=cavsvideo',
+        '--disable-parser=dvbsub',
+        '--disable-parser=dvdsub',
+        '--disable-parser=dvd_nav',
+        '--disable-parser=flac',
+        '--disable-parser=g729',
+        '--disable-parser=gsm',
+        '--disable-parser=h261',
+        '--disable-parser=h263',
+        '--disable-parser=h264',
+        '--disable-parser=hevc',
+        '--disable-parser=mjpeg',
+        '--disable-parser=mlp',
+        '--disable-parser=mpeg4video',
+        '--disable-parser=mpegvideo',
+        '--disable-parser=opus',
+        '--disable-parser=vc1',
+        '--disable-parser=vp3',
+        '--disable-parser=vp8',
+        '--disable-parser=vp9',
+        '--disable-parser=png',
+        '--disable-parser=pnm',
+        '--disable-parser=xma',
+
+        '--disable-demuxer=aqtitle',
+        '--disable-demuxer=ass',
+        '--disable-demuxer=bethsoftvid',
+        '--disable-demuxer=bink',
+        '--disable-demuxer=cavsvideo',
+        '--disable-demuxer=cdxl',
+        '--disable-demuxer=dvbsub',
+        '--disable-demuxer=dvbtxt',
+        '--disable-demuxer=h261',
+        '--disable-demuxer=h263',
+        '--disable-demuxer=h264',
+        '--disable-demuxer=ico',
+        '--disable-demuxer=image2',
+        '--disable-demuxer=jacosub',
+        '--disable-demuxer=lrc',
+        '--disable-demuxer=microdvd',
+        '--disable-demuxer=mjpeg',
+        '--disable-demuxer=mjpeg_2000',
+        '--disable-demuxer=mpegps',
+        '--disable-demuxer=mpegvideo',
+        '--disable-demuxer=mpl2',
+        '--disable-demuxer=mpsub',
+        '--disable-demuxer=pjs',
+        '--disable-demuxer=rawvideo',
+        '--disable-demuxer=realtext',
+        '--disable-demuxer=sami',
+        '--disable-demuxer=scc',
+        '--disable-demuxer=srt',
+        '--disable-demuxer=stl',
+        '--disable-demuxer=subviewer',
+        '--disable-demuxer=subviewer1',
+        '--disable-demuxer=swf',
+        '--disable-demuxer=tedcaptions',
+        '--disable-demuxer=vobsub',
+        '--disable-demuxer=vplayer',
+        '--disable-demuxer=webvtt',
+        '--disable-demuxer=yuv4mpegpipe',
+
+        # we don't need these decoders, because we have the dedicated
+        # libraries
+        '--disable-decoder=flac',
+        '--disable-decoder=opus',
+        '--disable-decoder=vorbis',
+
+        # audio codecs nobody uses
+        '--disable-decoder=atrac1',
+        '--disable-decoder=atrac3',
+        '--disable-decoder=atrac3al',
+        '--disable-decoder=atrac3p',
+        '--disable-decoder=atrac3pal',
+        '--disable-decoder=binkaudio_dct',
+        '--disable-decoder=binkaudio_rdft',
+        '--disable-decoder=bmv_audio',
+        '--disable-decoder=dsicinaudio',
+        '--disable-decoder=dvaudio',
+        '--disable-decoder=metasound',
+        '--disable-decoder=paf_audio',
+        '--disable-decoder=ra_144',
+        '--disable-decoder=ra_288',
+        '--disable-decoder=ralf',
+        '--disable-decoder=qdm2',
+        '--disable-decoder=qdmc',
+
+        # disable lots of image and video codecs
+        '--disable-decoder=ass',
+        '--disable-decoder=asv1',
+        '--disable-decoder=asv2',
+        '--disable-decoder=apng',
+        '--disable-decoder=avrn',
+        '--disable-decoder=avrp',
+        '--disable-decoder=bethsoftvid',
+        '--disable-decoder=bink',
+        '--disable-decoder=bmp',
+        '--disable-decoder=bmv_video',
+        '--disable-decoder=cavs',
+        '--disable-decoder=ccaption',
+        '--disable-decoder=cdgraphics',
+        '--disable-decoder=clearvideo',
+        '--disable-decoder=dirac',
+        '--disable-decoder=dsicinvideo',
+        '--disable-decoder=dvbsub',
+        '--disable-decoder=dvdsub',
+        '--disable-decoder=dvvideo',
+        '--disable-decoder=exr',
+        '--disable-decoder=ffv1',
+        '--disable-decoder=ffvhuff',
+        '--disable-decoder=ffwavesynth',
+        '--disable-decoder=flic',
+        '--disable-decoder=flv',
+        '--disable-decoder=fraps',
+        '--disable-decoder=gif',
+        '--disable-decoder=h261',
+        '--disable-decoder=h263',
+        '--disable-decoder=h263i',
+        '--disable-decoder=h263p',
+        '--disable-decoder=h264',
+        '--disable-decoder=hevc',
+        '--disable-decoder=hnm4_video',
+        '--disable-decoder=hq_hqa',
+        '--disable-decoder=hqx',
+        '--disable-decoder=idcin',
+        '--disable-decoder=iff_ilbm',
+        '--disable-decoder=indeo2',
+        '--disable-decoder=indeo3',
+        '--disable-decoder=indeo4',
+        '--disable-decoder=indeo5',
+        '--disable-decoder=interplay_video',
+        '--disable-decoder=jacosub',
+        '--disable-decoder=jpeg2000',
+        '--disable-decoder=jpegls',
+        '--disable-decoder=microdvd',
+        '--disable-decoder=mimic',
+        '--disable-decoder=mjpeg',
+        '--disable-decoder=mmvideo',
+        '--disable-decoder=mpl2',
+        '--disable-decoder=motionpixels',
+        '--disable-decoder=mpeg1video',
+        '--disable-decoder=mpeg2video',
+        '--disable-decoder=mpeg4',
+        '--disable-decoder=mpegvideo',
+        '--disable-decoder=mscc',
+        '--disable-decoder=msmpeg4_crystalhd',
+        '--disable-decoder=msmpeg4v1',
+        '--disable-decoder=msmpeg4v2',
+        '--disable-decoder=msmpeg4v3',
+        '--disable-decoder=msvideo1',
+        '--disable-decoder=mszh',
+        '--disable-decoder=mvc1',
+        '--disable-decoder=mvc2',
+        '--disable-decoder=on2avc',
+        '--disable-decoder=paf_video',
+        '--disable-decoder=png',
+        '--disable-decoder=qdraw',
+        '--disable-decoder=qpeg',
+        '--disable-decoder=rawvideo',
+        '--disable-decoder=realtext',
+        '--disable-decoder=roq',
+        '--disable-decoder=roq_dpcm',
+        '--disable-decoder=rscc',
+        '--disable-decoder=rv10',
+        '--disable-decoder=rv20',
+        '--disable-decoder=rv30',
+        '--disable-decoder=rv40',
+        '--disable-decoder=sami',
+        '--disable-decoder=sheervideo',
+        '--disable-decoder=snow',
+        '--disable-decoder=srt',
+        '--disable-decoder=stl',
+        '--disable-decoder=subrip',
+        '--disable-decoder=subviewer',
+        '--disable-decoder=subviewer1',
+        '--disable-decoder=svq1',
+        '--disable-decoder=svq3',
+        '--disable-decoder=tiff',
+        '--disable-decoder=tiertexseqvideo',
+        '--disable-decoder=truemotion1',
+        '--disable-decoder=truemotion2',
+        '--disable-decoder=truemotion2rt',
+        '--disable-decoder=twinvq',
+        '--disable-decoder=utvideo',
+        '--disable-decoder=vc1',
+        '--disable-decoder=vmdvideo',
+        '--disable-decoder=vp3',
+        '--disable-decoder=vp5',
+        '--disable-decoder=vp6',
+        '--disable-decoder=vp7',
+        '--disable-decoder=vp8',
+        '--disable-decoder=vp9',
+        '--disable-decoder=vqa',
+        '--disable-decoder=webvtt',
+        '--disable-decoder=wmv1',
+        '--disable-decoder=wmv2',
+        '--disable-decoder=wmv3',
+        '--disable-decoder=yuv4',
    ],
 )

 curl = AutotoolsProject(
-    'http://curl.haxx.se/download/curl-7.52.1.tar.lzma',
-    '44286d4b825936e2430fc44ad730ce899afb736a5d328cbb8b5d42462f3f2365',
+    'http://curl.haxx.se/download/curl-7.60.0.tar.xz',
+    '8736ff8ded89ddf7e926eec7b16f82597d029fc1469f3a551f1fafaac164e6a0',
    'lib/libcurl.a',
    [
        '--disable-shared', '--enable-static',
@@ -94,16 +353,34 @@ curl = AutotoolsProject(
        '--disable-ldap', '--disable-ldaps',
        '--disable-rtsp', '--disable-proxy', '--disable-dict', '--disable-telnet',
        '--disable-tftp', '--disable-pop3', '--disable-imap', '--disable-smtp',
+        '--disable-smb',
        '--disable-gopher',
        '--disable-manual',
        '--disable-threaded-resolver', '--disable-verbose', '--disable-sspi',
        '--disable-crypto-auth', '--disable-ntlm-wb', '--disable-tls-srp', '--disable-cookies',
        '--without-ssl', '--without-gnutls', '--without-nss', '--without-libssh2',
    ],
+
+    patches='src/lib/curl/patches',
+)
+
+libnfs = AutotoolsProject(
+    'https://github.com/sahlberg/libnfs/archive/libnfs-2.0.0.tar.gz',
+    '7ea6cd8fa6c461d01091e584d424d28e137d23ff4b65b95d01a3fd0ef95d120e',
+    'lib/libnfs.a',
+    [
+        '--disable-shared', '--enable-static',
+        '--disable-debug',
+
+        # work around -Wtautological-compare
+        '--disable-werror',
+    ],
+    base='libnfs-libnfs-2.0.0',
+    autoreconf=True,
 )

 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.66.0/boost_1_66_0.tar.bz2',
+    '5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9',
    'include/boost/version.hpp',
 )
--- a/python/build/makeproject.py
+++ b/python/build/makeproject.py
@@ -0,0 +1,28 @@
+import subprocess
+
+from build.project import Project
+
+class MakeProject(Project):
+    def __init__(self, url, md5, installed,
+                 install_target='install',
+                 **kwargs):
+        Project.__init__(self, url, md5, installed, **kwargs)
+        self.install_target = install_target
+
+    def get_simultaneous_jobs(self):
+        return 12
+
+    def get_make_args(self, toolchain):
+        return ['--quiet', '-j' + str(self.get_simultaneous_jobs())]
+
+    def get_make_install_args(self, toolchain):
+        return ['--quiet', self.install_target]
+
+    def make(self, toolchain, wd, args):
+        subprocess.check_call(['/usr/bin/make'] + args,
+                              cwd=wd, env=toolchain.env)
+
+    def build(self, toolchain, wd, install=True):
+        self.make(toolchain, wd, self.get_make_args(toolchain))
+        if install:
+            self.make(toolchain, wd, self.get_make_install_args(toolchain))
--- a/python/build/meson.py
+++ b/python/build/meson.py
@@ -0,0 +1,96 @@
+import os.path, subprocess, sys
+
+from build.project import Project
+
+class MesonProject(Project):
+    def __init__(self, url, md5, installed, configure_args=[],
+                 **kwargs):
+        Project.__init__(self, url, md5, installed, **kwargs)
+        self.configure_args = configure_args
+
+    def _make_cross_file(self, toolchain):
+        if toolchain.is_windows:
+            system = 'windows'
+        else:
+            system = 'linux'
+
+        if toolchain.is_arm:
+            cpu_family = 'arm'
+            if toolchain.is_armv7:
+                cpu = 'armv7'
+            else:
+                cpu = 'armv6'
+        else:
+            cpu_family = 'x86'
+            if 'x86_64' in toolchain.arch:
+                cpu = 'x86_64'
+            else:
+                cpu = 'i686'
+
+        # TODO: support more CPUs
+        endian = 'little'
+
+        # TODO: write pkg-config wrapper
+
+        path = os.path.join(toolchain.build_path, 'meson.cross')
+        os.makedirs(toolchain.build_path, exist_ok=True)
+        with open(path, 'w') as f:
+            f.write("""
+[binaries]
+c = '%s'
+cpp = '%s'
+ar = '%s'
+strip = '%s'
+
+[properties]
+root = '%s'
+
+c_args = %s
+c_link_args = %s
+
+cpp_args = %s
+cpp_link_args = %s
+
+[host_machine]
+system = '%s'
+cpu_family = '%s'
+cpu = '%s'
+endian = '%s'
+            """ % (toolchain.cc, toolchain.cxx, toolchain.ar, toolchain.strip,
+                   toolchain.install_prefix,
+                   repr((toolchain.cppflags + ' ' + toolchain.cflags).split()),
+                   repr(toolchain.ldflags.split()),
+                   repr((toolchain.cppflags + ' ' + toolchain.cxxflags).split()),
+                   repr(toolchain.ldflags.split()),
+                   system, cpu_family, cpu, endian))
+        return path
+
+    def configure(self, toolchain):
+        src = self.unpack(toolchain)
+        cross_file = self._make_cross_file(toolchain)
+        build = self.make_build_path(toolchain)
+        configure = [
+            'meson',
+            src, build,
+
+            '--prefix', toolchain.install_prefix,
+
+            # this is necessary because Meson uses Debian's build machine
+            # MultiArch path (e.g. "lib/x86_64-linux-gnu") for cross
+            # builds, which is obviously wrong
+            '--libdir', 'lib',
+
+            '--buildtype', 'plain',
+
+            '--default-library=static',
+
+            '--cross-file', cross_file,
+        ] + self.configure_args
+
+        subprocess.check_call(configure, env=toolchain.env)
+        return build
+
+    def build(self, toolchain):
+        build = self.configure(toolchain)
+        subprocess.check_call(['ninja', 'install'],
+                              cwd=build, env=toolchain.env)
--- a/python/build/project.py
+++ b/python/build/project.py
@@ -3,10 +3,13 @@ import re

 from build.download import download_and_verify
 from build.tar import untar
+from build.quilt import push_all

 class Project:
    def __init__(self, url, md5, installed, name=None, version=None,
                 base=None,
+                 patches=None,
+                 edits=None,
                 use_cxx=False):
        if base is None:
            basename = os.path.basename(url)
@@ -17,7 +20,7 @@ class Project:
            self.base = base

        if name is None or version is None:
-            m = re.match(r'^([-\w]+)-(\d[\d.]*[a-z]?)$', self.base)
+            m = re.match(r'^([-\w]+)-(\d[\d.]*[a-z]?[\d.]*)$', self.base)
            if name is None: name = m.group(1)
            if version is None: version = m.group(2)

@@ -28,6 +31,11 @@ class Project:
        self.md5 = md5
        self.installed = installed

+        if patches is not None:
+            srcdir = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
+            patches = os.path.join(srcdir, patches)
+        self.patches = patches
+        self.edits = edits
        self.use_cxx = use_cxx

    def download(self, toolchain):
@@ -47,7 +55,21 @@ class Project:
            parent_path = toolchain.src_path
        else:
            parent_path = toolchain.build_path
-        return untar(self.download(toolchain), parent_path, self.base)
+        path = untar(self.download(toolchain), parent_path, self.base)
+
+        if self.patches is not None:
+            push_all(toolchain, path, self.patches)
+
+        if self.edits is not None:
+            for filename, function in self.edits.items():
+                with open(os.path.join(path, filename), 'r+t') as f:
+                    old_data = f.read()
+                    new_data = function(old_data)
+                    f.seek(0)
+                    f.truncate(0)
+                    f.write(new_data)
+
+        return path

    def make_build_path(self, toolchain):
        path = os.path.join(toolchain.build_path, self.base)
--- a/python/build/quilt.py
+++ b/python/build/quilt.py
@@ -0,0 +1,9 @@
+import subprocess
+
+def run_quilt(toolchain, cwd, patches_path, *args):
+    env = dict(toolchain.env)
+    env['QUILT_PATCHES'] = patches_path
+    subprocess.check_call(['quilt'] + list(args), cwd=cwd, env=env)
+
+def push_all(toolchain, src_path, patches_path):
+    run_quilt(toolchain, src_path, patches_path, 'push', '-a')
--- 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,10 +124,10 @@ struct AudioFormat {
 		return !(*this == other);
 	}

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

 	gcc_pure
-	AudioFormat WithMask(AudioFormat mask) const {
+	AudioFormat WithMask(AudioFormat mask) const noexcept {
 		AudioFormat result = *this;
 		result.ApplyMask(mask);
 		return result;
@@ -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
@@ -67,7 +67,7 @@
 #include <stdio.h>
 #include <stdlib.h>

-#ifdef WIN32
+#ifdef _WIN32
 #define CONFIG_FILE_LOCATION PATH_LITERAL("mpd\\mpd.conf")
 #define APP_CONFIG_FILE_LOCATION PATH_LITERAL("conf\\mpd.conf")
 #else
@@ -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"

@@ -389,7 +389,7 @@ ParseCommandLine(int argc, char **argv, struct options *options)
 	ConfigLoader loader;

 	bool found =
-#ifdef WIN32
+#ifdef _WIN32
 		loader.TryFile(GetUserConfigDir(), CONFIG_FILE_LOCATION) ||
 		loader.TryFile(GetSystemConfigDir(), CONFIG_FILE_LOCATION) ||
 		loader.TryFile(GetAppBaseDir(), APP_CONFIG_FILE_LOCATION);
--- 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,34 +137,36 @@ 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 {
+	bool IsFile() const noexcept {
 		return !IsRemote();
 	}

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

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

-	const Tag &GetTag() const {
+	const Tag &GetTag() const noexcept {
 		return tag;
 	}

-	Tag &WritableTag() {
+	Tag &WritableTag() noexcept {
 		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
@@ -27,12 +27,17 @@

 #include <assert.h>

-static struct {
+static struct IOThread {
 	Mutex mutex;
 	Cond cond;

 	EventLoop *loop;
 	Thread thread;
+
+	IOThread():thread(BIND_THIS_METHOD(Run)) {}
+
+private:
+	void Run() noexcept;
 } io;

 void
@@ -44,15 +49,15 @@ io_thread_run(void)
 	io.loop->Run();
 }

-static void
-io_thread_func(gcc_unused void *arg)
+inline void
+IOThread::Run() noexcept
 {
 	SetThreadName("io");

 	/* lock+unlock to synchronize with io_thread_start(), to be
 	   sure that io.thread is set */
-	io.mutex.lock();
-	io.mutex.unlock();
+	mutex.lock();
+	mutex.unlock();

 	io_thread_run();
 }
@@ -73,7 +78,7 @@ io_thread_start()
 	assert(!io.thread.IsDefined());

 	const std::lock_guard<Mutex> protect(io.mutex);
-	io.thread.Start(io_thread_func, nullptr);
+	io.thread.Start();
 }

 void
@@ -96,15 +101,19 @@ io_thread_deinit(void)
 }

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

 	return *io.loop;
 }

+#ifndef NDEBUG
+
 bool
-io_thread_inside(void)
+io_thread_inside() noexcept
 {
 	return io.thread.IsInside();
 }
+
+#endif
--- a/src/IOThread.hxx
+++ b/src/IOThread.hxx
@@ -20,6 +20,7 @@
 #ifndef MPD_IO_THREAD_HXX
 #define MPD_IO_THREAD_HXX

+#include "check.h"
 #include "Compiler.h"

 class EventLoop;
@@ -51,13 +52,17 @@ io_thread_deinit();

 gcc_const
 EventLoop &
-io_thread_get();
+io_thread_get() noexcept;
+
+#ifndef NDEBUG

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

 #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/LocateUri.hxx
+++ b/src/LocateUri.hxx
@@ -24,7 +24,7 @@
 #include "Compiler.h"
 #include "fs/AllocatedPath.hxx"

-#ifdef WIN32
+#ifdef _WIN32
 #include <windows.h>
 /* damn you, windows.h! */
 #ifdef ABSOLUTE
--- a/src/LogBackend.cxx
+++ b/src/LogBackend.cxx
@@ -162,7 +162,7 @@ FileLog(const Domain &domain, const char *message)
 		domain.GetName(),
 		chomp_length(message), message);

-#ifdef WIN32
+#ifdef _WIN32
 	/* force-flush the log file, because setvbuf() does not seem
 	   to have an effect on WIN32 */
 	fflush(stderr);
--- a/src/LogInit.cxx
+++ b/src/LogInit.cxx
@@ -72,7 +72,7 @@ log_init_file(int line)

 	out_fd = open_log_file();
 	if (out_fd < 0) {
-#ifdef WIN32
+#ifdef _WIN32
 		const std::string out_path_utf8 = out_path.ToUTF8();
 		throw FormatRuntimeError("failed to open log file \"%s\" (config line %d)",
 					 out_path_utf8.c_str(), line);
@@ -182,7 +182,7 @@ void setup_log_output()
 	fflush(nullptr);

 	if (out_fd < 0) {
-#ifdef WIN32
+#ifdef _WIN32
 		return;
 #else
 		out_fd = open("/dev/null", O_WRONLY);
--- a/src/LogLevel.hxx
+++ b/src/LogLevel.hxx
@@ -20,7 +20,7 @@
 #ifndef MPD_LOG_LEVEL_HXX
 #define MPD_LOG_LEVEL_HXX

-#ifdef WIN32
+#ifdef _WIN32
 #include <windows.h>
 /* damn you, windows.h! */
 #ifdef ERROR
--- a/src/Main.cxx
+++ b/src/Main.cxx
@@ -50,6 +50,7 @@
 #include "unix/SignalHandlers.hxx"
 #include "system/FatalError.hxx"
 #include "thread/Slack.hxx"
+#include "net/Init.hxx"
 #include "lib/icu/Init.hxx"
 #include "config/ConfigGlobal.hxx"
 #include "config/Param.hxx"
@@ -106,18 +107,23 @@
 #include <locale.h>
 #endif

-#ifdef WIN32
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#endif
-
-#ifdef __BLOCKS__
-#include <dispatch/dispatch.h>
-#endif
-
 #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
+#if GCC_OLDER_THAN(5,0)
+/* gcc 4.x has no "constexpr" for std::max() */
+const
+#else
+constexpr
+#endif
+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;
@@ -267,25 +276,6 @@ glue_state_file_init()
 	instance->state_file->Read();
 }

-/**
- * Windows-only initialization of the Winsock2 library.
- */
-static void winsock_init(void)
-{
-#ifdef WIN32
-	WSADATA sockinfo;
-
-	int retval = WSAStartup(MAKEWORD(2, 2), &sockinfo);
-	if(retval != 0)
-		FormatFatalError("Attempt to open Winsock2 failed; error code %d",
-				 retval);
-
-	if (LOBYTE(sockinfo.wVersion) != 2)
-		FatalError("We use Winsock2 but your version is either too new "
-			   "or old; please install Winsock 2.x");
-#endif
-}
-
 /**
 * Initialize the decoder and player core, including the music pipe.
 */
@@ -303,12 +293,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 +321,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;

@@ -383,7 +391,7 @@ Instance::OnIdle(unsigned flags)

 int main(int argc, char *argv[])
 {
-#ifdef WIN32
+#ifdef _WIN32
 	return win32_main(argc, argv);
 #else
 	return mpd_main(argc, argv);
@@ -416,7 +424,8 @@ try {

 	IcuInit();

-	winsock_init();
+	const ScopeNetInit net_init;
+
 	io_thread_init();
 	config_global_init();

@@ -470,21 +479,8 @@ try {
 	daemonize_begin(options.daemon);
 #endif

-#ifdef __BLOCKS__
-	/* Runs the OS X native event loop in the main thread, and runs
-	   the rest of mpd_main on a new thread. This lets CoreAudio receive
-	   route change notifications (e.g. plugging or unplugging headphones).
-	   All hardware output on OS X ultimately uses CoreAudio internally.
-	   This must be run after forking; if dispatch is called before forking,
-	   the child process will have a broken internal dispatch state. */
-	dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-		exit(mpd_main_after_fork(config));
-	});
-	dispatch_main();
-	return EXIT_FAILURE; // unreachable, because dispatch_main never returns
-#else
 	return mpd_main_after_fork(config);
-#endif
+
 } catch (const std::exception &e) {
 	LogError(e);
 	return EXIT_FAILURE;
@@ -580,7 +576,7 @@ try {
 	   playlist_state_restore() */
 	instance->partition->pc.LockUpdateAudio();

-#ifdef WIN32
+#ifdef _WIN32
 	win32_app_started();
 #endif

@@ -595,7 +591,7 @@ try {
 	/* run the main loop */
 	instance->event_loop.Run();

-#ifdef WIN32
+#ifdef _WIN32
 	win32_app_stopping();
 #endif

@@ -667,10 +663,6 @@ try {
 	daemonize_finish();
 #endif

-#ifdef WIN32
-	WSACleanup();
-#endif
-
 	IcuFinish();

 	log_deinit();
--- a/src/Main.hxx
+++ b/src/Main.hxx
@@ -42,7 +42,7 @@ int mpd_main(int argc, char *argv[]);

 #endif

-#ifdef WIN32
+#ifdef _WIN32

 /**
 * If program is run as windows service performs nessesary initialization
--- 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/MixRampInfo.hxx
+++ b/src/MixRampInfo.hxx
@@ -31,45 +31,45 @@ class MixRampInfo {
 public:
 	MixRampInfo() = default;

-	void Clear() {
+	void Clear() noexcept {
 		start.clear();
 		end.clear();
 	}

 	gcc_pure
-	bool IsDefined() const {
+	bool IsDefined() const noexcept {
 		return !start.empty() || !end.empty();
 	}

 	gcc_pure
-	const char *GetStart() const {
+	const char *GetStart() const noexcept {
 		return start.empty() ? nullptr : start.c_str();
 	}

 	gcc_pure
-	const char *GetEnd() const {
+	const char *GetEnd() const noexcept {
 		return end.empty() ? nullptr : end.c_str();
 	}

-	void SetStart(const char *new_value) {
+	void SetStart(const char *new_value) noexcept {
 		if (new_value == nullptr)
 			start.clear();
 		else
 			start = new_value;
 	}

-	void SetStart(std::string &&new_value) {
+	void SetStart(std::string &&new_value) noexcept {
 		start = std::move(new_value);
 	}

-	void SetEnd(const char *new_value) {
+	void SetEnd(const char *new_value) noexcept {
 		if (new_value == nullptr)
 			end.clear();
 		else
 			end = new_value;
 	}

-	void SetEnd(std::string &&new_value) {
+	void SetEnd(std::string &&new_value) noexcept {
 		end = std::move(new_value);
 	}
 };
--- 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
 	/**
@@ -60,7 +60,7 @@ public:
 	 * music_buffer_new().
 	 */
 	gcc_pure
-	unsigned GetSize() const {
+	unsigned GetSize() const noexcept {
 		return buffer.GetCapacity();
 	}

@@ -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
@@ -79,12 +79,20 @@ struct MusicChunk {
 	 */
 	ReplayGainInfo replay_gain_info;

+	/**
+	 * A magic value for #replay_gain_serial which omits updating
+	 * the #ReplayGainFilter.  This is used by "silence" chunks
+	 * (see PlayerThread::SendSilence()) so they don't affect the
+	 * replay gain.
+	 */
+	static constexpr unsigned IGNORE_REPLAY_GAIN = ~0u;
+
 	/**
 	 * A serial number for checking if replay gain info has
 	 * changed since the last chunk.  The magic value 0 indicates
 	 * that there is no replay gain info available.
 	 */
-	unsigned replay_gain_serial = 0;
+	unsigned replay_gain_serial;

 	/** the data (probably PCM) */
 	uint8_t data[CHUNK_SIZE];
@@ -111,7 +119,7 @@ struct MusicChunk {
 	 * specified audio_format.
 	 */
 	gcc_pure
-	bool CheckFormat(AudioFormat audio_format) const;
+	bool CheckFormat(AudioFormat audio_format) const noexcept;
 #endif

 	/**
@@ -127,7 +135,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 +146,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);

@@ -39,7 +39,7 @@ MusicPipe::Contains(const MusicChunk *chunk) const
 #endif

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

@@ -73,7 +73,7 @@ MusicPipe::Shift()
 }

 void
-MusicPipe::Clear(MusicBuffer &buffer)
+MusicPipe::Clear(MusicBuffer &buffer) noexcept
 {
 	MusicChunk *chunk;

@@ -82,7 +82,7 @@ MusicPipe::Clear(MusicBuffer &buffer)
 }

 void
-MusicPipe::Push(MusicChunk *chunk)
+MusicPipe::Push(MusicChunk *chunk) noexcept
 {
 	assert(!chunk->IsEmpty());
 	assert(chunk->length == 0 || chunk->audio_format.IsValid());
--- a/src/MusicPipe.hxx
+++ b/src/MusicPipe.hxx
@@ -77,7 +77,7 @@ public:
 	 * audio_format.
 	 */
 	gcc_pure
-	bool CheckFormat(AudioFormat other) const {
+	bool CheckFormat(AudioFormat other) const noexcept {
 		return !audio_format.IsDefined() ||
 			audio_format == other;
 	}
@@ -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

 	/**
@@ -94,37 +94,39 @@ public:
 	 * nullptr if the pipe is empty.
 	 */
 	gcc_pure
-	const MusicChunk *Peek() const {
+	const MusicChunk *Peek() const noexcept {
+		const std::lock_guard<Mutex> protect(mutex);
 		return head;
 	}

 	/**
 	 * Removes the first chunk from the head, and returns it.
 	 */
-	MusicChunk *Shift();
+	MusicChunk *Shift() noexcept;

 	/**
 	 * Clears the whole pipe and returns the chunks to the buffer.
 	 *
 	 * @param buffer the buffer object to return the chunks to
 	 */
-	void Clear(MusicBuffer &buffer);
+	void Clear(MusicBuffer &buffer) noexcept;

 	/**
 	 * Pushes a chunk to the tail of the pipe.
 	 */
-	void Push(MusicChunk *chunk);
+	void Push(MusicChunk *chunk) noexcept;

 	/**
 	 * Returns the number of chunks currently in this pipe.
 	 */
 	gcc_pure
-	unsigned GetSize() const {
+	unsigned GetSize() const noexcept {
+		const std::lock_guard<Mutex> protect(mutex);
 		return size;
 	}

 	gcc_pure
-	bool IsEmpty() const {
+	bool IsEmpty() const noexcept {
 		return GetSize() == 0;
 	}
 };
--- 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
@@ -207,13 +207,12 @@ try {
 			continue;

 #ifdef _UNICODE
-		wchar_t buffer[MAX_PATH];
-		auto result = MultiByteToWideChar(CP_ACP, 0, s, -1,
-						  buffer, ARRAY_SIZE(buffer));
-		if (result <= 0)
+		/* on Windows, playlists always contain UTF-8, because
+		   its "narrow" charset (i.e. CP_ACP) is incapable of
+		   storing all Unicode paths */
+		const auto path = AllocatedPath::FromUTF8(s);
+		if (path.IsNull())
 			continue;
-
-		const Path path = Path::FromFS(buffer);
 #else
 		const Path path = Path::FromFS(s);
 #endif
@@ -335,7 +334,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/PlaylistSave.cxx
+++ b/src/PlaylistSave.cxx
@@ -28,13 +28,25 @@
 #include "fs/AllocatedPath.hxx"
 #include "fs/Traits.hxx"
 #include "fs/FileSystem.hxx"
-#include "fs/NarrowPath.hxx"
 #include "fs/io/FileOutputStream.hxx"
 #include "fs/io/BufferedOutputStream.hxx"
 #include "util/UriUtil.hxx"

 #include <stdexcept>

+static void
+playlist_print_path(BufferedOutputStream &os, const Path path)
+{
+#ifdef _UNICODE
+	/* on Windows, playlists always contain UTF-8, because its
+	   "narrow" charset (i.e. CP_ACP) is incapable of storing all
+	   Unicode paths */
+	os.Format("%s\n", path.ToUTF8().c_str());
+#else
+	os.Format("%s\n", path.c_str());
+#endif
+}
+
 void
 playlist_print_song(BufferedOutputStream &os, const DetachedSong &song)
 {
@@ -44,7 +56,7 @@ playlist_print_song(BufferedOutputStream &os, const DetachedSong &song)

 	try {
 		const auto uri_fs = AllocatedPath::FromUTF8Throw(uri_utf8);
-		os.Format("%s\n", NarrowPath(uri_fs).c_str());
+		playlist_print_path(os, uri_fs);
 	} catch (const std::runtime_error &) {
 	}
 }
@@ -63,7 +75,7 @@ playlist_print_uri(BufferedOutputStream &os, const char *uri)
 			AllocatedPath::FromUTF8Throw(uri);

 		if (!path.IsNull())
-			os.Format("%s\n", NarrowPath(path).c_str());
+			playlist_print_path(os, path);
 	} catch (const std::runtime_error &) {
 	}
 }
--- 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
@@ -24,10 +24,12 @@
 #include "tag/Tag.hxx"
 #include "util/ConstBuffer.hxx"
 #include "util/StringAPI.hxx"
+#include "util/StringCompare.hxx"
+#include "util/StringView.hxx"
 #include "util/ASCII.hxx"
 #include "util/TimeParser.hxx"
 #include "util/UriUtil.hxx"
-#include "lib/icu/Collate.hxx"
+#include "lib/icu/CaseFold.hxx"

 #include <stdexcept>

@@ -39,7 +41,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))
@@ -57,28 +59,20 @@ locate_parse_type(const char *str)
 	return tag_name_parse_i(str);
 }

-gcc_pure
-static AllocatedString<>
-ImportString(const char *p, bool fold_case)
-{
-	return fold_case
-		? IcuCaseFold(p)
-		: AllocatedString<>::Duplicate(p);
-}
-
 SongFilter::Item::Item(unsigned _tag, const char *_value, bool _fold_case)
-	:tag(_tag), fold_case(_fold_case),
-	 value(ImportString(_value, _fold_case))
+	:tag(_tag),
+	 value(_value),
+	 fold_case(_fold_case ? IcuCompare(value.c_str()) : IcuCompare())
 {
 }

 SongFilter::Item::Item(unsigned _tag, time_t _time)
-	:tag(_tag), value(nullptr), time(_time)
+	:tag(_tag), time(_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 */
@@ -88,23 +82,21 @@ SongFilter::Item::StringMatch(const char *s) const
 	assert(tag != LOCATE_TAG_MODIFIED_SINCE);

 	if (fold_case) {
-		const auto folded = IcuCaseFold(s);
-		assert(!folded.IsNull());
-		return StringFind(folded.c_str(), value.c_str()) != nullptr;
+		return fold_case.IsIn(s);
 	} else {
 		return StringIsEqual(s, value.c_str());
 	}
 }

 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);
@@ -140,7 +132,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());
@@ -155,7 +147,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();
@@ -185,7 +177,7 @@ SongFilter::~SongFilter()

 gcc_pure
 static time_t
-ParseTimeStamp(const char *s)
+ParseTimeStamp(const char *s) noexcept
 {
 	assert(s != nullptr);

@@ -246,7 +238,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))
@@ -256,7 +248,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))
@@ -266,7 +258,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)
@@ -276,7 +268,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)
@@ -284,3 +276,33 @@ SongFilter::GetBase() const

 	return nullptr;
 }
+
+SongFilter
+SongFilter::WithoutBasePrefix(const char *_prefix) const noexcept
+{
+	const StringView prefix(_prefix);
+	SongFilter result;
+
+	for (const auto &i : items) {
+		if (i.GetTag() == LOCATE_TAG_BASE_TYPE) {
+			const char *s = StringAfterPrefix(i.GetValue(), prefix);
+			if (s != nullptr) {
+				if (*s == 0)
+					continue;
+
+				if (*s == '/') {
+					++s;
+
+					if (*s != 0)
+						result.items.emplace_back(LOCATE_TAG_BASE_TYPE, s);
+
+					continue;
+				}
+			}
+		}
+
+		result.items.emplace_back(i);
+	}
+
+	return result;
+}
--- a/src/SongFilter.hxx
+++ b/src/SongFilter.hxx
@@ -20,9 +20,10 @@
 #ifndef MPD_SONG_FILTER_HXX
 #define MPD_SONG_FILTER_HXX

-#include "util/AllocatedString.hxx"
+#include "lib/icu/Compare.hxx"
 #include "Compiler.h"

+#include <string>
 #include <list>

 #include <stdint.h>
@@ -48,9 +49,12 @@ public:
 	class Item {
 		uint8_t tag;

-		bool fold_case;
+		std::string value;

-		AllocatedString<> value;
+		/**
+		 * This value is only set if case folding is enabled.
+		 */
+		IcuCompare fold_case;

 		/**
 		 * For #LOCATE_TAG_MODIFIED_SINCE
@@ -62,11 +66,6 @@ public:
 		Item(unsigned tag, const char *value, bool fold_case=false);
 		Item(unsigned tag, time_t time);

-		Item(const Item &other) = delete;
-		Item(Item &&) = default;
-
-		Item &operator=(const Item &other) = delete;
-
 		unsigned GetTag() const {
 			return tag;
 		}
@@ -80,19 +79,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 +111,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 +132,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 +144,21 @@ 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;
+
+	/**
+	 * Create a copy of the filter with the given prefix stripped
+	 * from all #LOCATE_TAG_BASE_TYPE items.  This is used to
+	 * filter songs in mounted databases.
+	 */
+	SongFilter WithoutBasePrefix(const char *prefix) const noexcept;
 };

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

 #endif
--- a/src/SongSave.cxx
+++ b/src/SongSave.cxx
@@ -28,6 +28,7 @@
 #include "tag/TagBuilder.hxx"
 #include "util/StringUtil.hxx"
 #include "util/RuntimeError.hxx"
+#include "util/NumberParser.hxx"

 #include <string.h>
 #include <stdlib.h>
@@ -94,7 +95,7 @@ song_load(TextFile &file, const char *uri)
 		if ((type = tag_name_parse(line)) != TAG_NUM_OF_ITEM_TYPES) {
 			tag.AddItem(type, value);
 		} else if (strcmp(line, "Time") == 0) {
-			tag.SetDuration(SignedSongTime::FromS(atof(value)));
+			tag.SetDuration(SignedSongTime::FromS(ParseDouble(value)));
 		} else if (strcmp(line, "Playlist") == 0) {
 			tag.SetHasPlaylist(strcmp(value, "yes") == 0);
 		} else if (strcmp(line, SONG_MTIME) == 0) {
--- a/src/StateFile.cxx
+++ b/src/StateFile.cxx
@@ -24,6 +24,7 @@
 #include "fs/io/TextFile.hxx"
 #include "fs/io/FileOutputStream.hxx"
 #include "fs/io/BufferedOutputStream.hxx"
+#include "storage/StorageState.hxx"
 #include "Partition.hxx"
 #include "Instance.hxx"
 #include "mixer/Volume.hxx"
@@ -50,21 +51,28 @@ 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();
 	prev_playlist_version = playlist_state_get_hash(partition.playlist,
 							partition.pc);
+#ifdef ENABLE_DATABASE
+	prev_storage_version = storage_state_get_hash(partition.instance);
+#endif
 }

 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() ||
 		prev_playlist_version != playlist_state_get_hash(partition.playlist,
-								 partition.pc);
+								 partition.pc)
+#ifdef ENABLE_DATABASE
+		|| prev_storage_version != storage_state_get_hash(partition.instance)
+#endif
+		;
 }

 inline void
@@ -72,6 +80,11 @@ StateFile::Write(BufferedOutputStream &os)
 {
 	save_sw_volume_state(os);
 	audio_output_state_save(os, partition.outputs);
+
+#ifdef ENABLE_DATABASE
+	storage_state_save(os, partition.instance);
+#endif
+
 	playlist_state_save(os, partition.playlist, partition.pc);
 }

@@ -123,6 +136,10 @@ try {
 			playlist_state_restore(line, file, song_loader,
 					       partition.playlist,
 					       partition.pc);
+#ifdef ENABLE_DATABASE
+		success = success || storage_state_restore(line, file, partition.instance);
+#endif
+
 		if (!success)
 			FormatError(state_file_domain,
 				    "Unrecognized line in state file: %s",
--- a/src/StateFile.hxx
+++ b/src/StateFile.hxx
@@ -46,6 +46,10 @@ class StateFile final : private TimeoutMonitor {
 	unsigned prev_volume_version = 0, prev_output_version = 0,
 		prev_playlist_version = 0;

+#ifdef ENABLE_DATABASE
+	unsigned prev_storage_version = 0;
+#endif
+
 public:
 	static constexpr std::chrono::steady_clock::duration DEFAULT_INTERVAL = std::chrono::minutes(2);

@@ -67,14 +71,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/Stats.cxx
+++ b/src/Stats.cxx
@@ -31,7 +31,7 @@

 #include <chrono>

-#ifndef WIN32
+#ifndef _WIN32
 /**
 * The monotonic time stamp when MPD was started.  It is used to
 * calculate the uptime.
@@ -114,7 +114,7 @@ stats_print(Response &r, const Partition &partition)
 {
 	r.Format("uptime: %u\n"
 		 "playtime: %lu\n",
-#ifdef WIN32
+#ifdef _WIN32
 		 GetProcessUptimeS(),
 #else
 		 (unsigned)std::chrono::duration_cast<std::chrono::seconds>(std::chrono::steady_clock::now() - start_time).count(),
--- 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/TimePrint.cxx
+++ b/src/TimePrint.cxx
@@ -24,7 +24,7 @@
 void
 time_print(Response &r, const char *name, time_t t)
 {
-#ifdef WIN32
+#ifdef _WIN32
 	const struct tm *tm2 = gmtime(&t);
 #else
 	struct tm tm;
@@ -35,7 +35,7 @@ time_print(Response &r, const char *name, time_t t)

 	char buffer[32];
 	strftime(buffer, sizeof(buffer),
-#ifdef WIN32
+#ifdef _WIN32
 		 "%Y-%m-%dT%H:%M:%SZ",
 #else
 		 "%FT%TZ",
--- 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:
@@ -162,7 +162,7 @@ Bzip2InputStream::FillBuffer()
 	if (bzstream.avail_in > 0)
 		return true;

-	size_t count = archive->istream->Read(buffer, sizeof(buffer));
+	size_t count = archive->istream->LockRead(buffer, sizeof(buffer));
 	if (count == 0)
 		return false;

@@ -174,6 +174,8 @@ Bzip2InputStream::FillBuffer()
 size_t
 Bzip2InputStream::Read(void *ptr, size_t length)
 {
+	const ScopeUnlock unlock(mutex);
+
 	int bz_result;
 	size_t nbytes = 0;

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

 bool
-Bzip2InputStream::IsEOF()
+Bzip2InputStream::IsEOF() noexcept
 {
 	return eof;
 }
@@ -224,4 +226,3 @@ const ArchivePlugin bz2_archive_plugin = {
 	bz2_open,
 	bz2_extensions,
 };
-
--- a/src/archive/plugins/Iso9660ArchivePlugin.cxx
+++ b/src/archive/plugins/Iso9660ArchivePlugin.cxx
@@ -115,7 +115,12 @@ Iso9660ArchiveFile::Visit(char *path, size_t length, size_t capacity,
 			visitor.VisitArchiveEntry(path + 1);
 		}
 	}
+
+#if LIBCDIO_VERSION_NUM >= 20000
+	iso9660_filelist_free(entlist);
+#else
 	_cdio_list_free (entlist, true);
+#endif
 }

 static ArchiveFile *
@@ -162,7 +167,7 @@ public:
 	}

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

@@ -182,6 +187,8 @@ Iso9660ArchiveFile::OpenStream(const char *pathname,
 size_t
 Iso9660InputStream::Read(void *ptr, size_t read_size)
 {
+	const ScopeUnlock unlock(mutex);
+
 	int readed = 0;
 	int no_blocks, cur_block;
 	size_t left_bytes = statbuf->size - offset;
@@ -213,7 +220,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;
 };
@@ -138,6 +138,8 @@ ZzipArchiveFile::OpenStream(const char *pathname,
 size_t
 ZzipInputStream::Read(void *ptr, size_t read_size)
 {
+	const ScopeUnlock unlock(mutex);
+
 	int ret = zzip_file_read(file, ptr, read_size);
 	if (ret < 0)
 		throw std::runtime_error("zzip_file_read() has failed");
@@ -147,7 +149,7 @@ ZzipInputStream::Read(void *ptr, size_t read_size)
 }

 bool
-ZzipInputStream::IsEOF()
+ZzipInputStream::IsEOF() noexcept
 {
 	return offset_type(zzip_tell(file)) == size;
 }
@@ -155,6 +157,8 @@ ZzipInputStream::IsEOF()
 void
 ZzipInputStream::Seek(offset_type new_offset)
 {
+	const ScopeUnlock unlock(mutex);
+
 	zzip_off_t ofs = zzip_seek(file, new_offset, SEEK_SET);
 	if (ofs < 0)
 		throw std::runtime_error("zzip_seek() has failed");
--- 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
@@ -100,7 +100,7 @@ public:
 	}

 	gcc_pure
-	bool IsExpired() const {
+	bool IsExpired() const noexcept {
 		return !FullyBufferedSocket::IsDefined();
 	}

@@ -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/ClientFile.cxx
+++ b/src/client/ClientFile.cxx
@@ -28,7 +28,7 @@
 void
 Client::AllowFile(Path path_fs) const
 {
-#ifdef WIN32
+#ifdef _WIN32
 	(void)path_fs;

 	throw ProtocolError(ACK_ERROR_PERMISSION, "Access denied");
--- 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
@@ -24,7 +24,7 @@

 #include <string>

-#ifdef WIN32
+#ifdef _WIN32
 /* fuck WIN32! */
 #include <windows.h>
 #undef GetMessage
@@ -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/client/ClientNew.cxx
+++ b/src/client/ClientNew.cxx
@@ -29,7 +29,7 @@
 #include "Log.hxx"

 #include <assert.h>
-#ifdef WIN32
+#ifdef _WIN32
 #include <winsock2.h>
 #else
 #include <sys/socket.h>
--- 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,17 @@ ToAck(std::exception_ptr ep)
 		return ACK_ERROR_SYSTEM;
 	} catch (const std::invalid_argument &e) {
 		return ACK_ERROR_ARG;
-#if defined(__GLIBCXX__) && __GLIBCXX__ < 20151204
+	} catch (const std::length_error &e) {
+		return ACK_ERROR_ARG;
+	} catch (const std::out_of_range &e) {
+		return ACK_ERROR_ARG;
+#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/CommandResult.hxx
+++ b/src/command/CommandResult.hxx
@@ -20,7 +20,7 @@
 #ifndef MPD_COMMAND_RESULT_HXX
 #define MPD_COMMAND_RESULT_HXX

-#ifdef WIN32
+#ifdef _WIN32
 #include <windows.h>
 /* damn you, windows.h! */
 #ifdef ERROR
--- 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,12 +53,12 @@ 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();
 }

-#if defined(WIN32) && GCC_CHECK_VERSION(4,6)
+#if defined(_WIN32) && GCC_CHECK_VERSION(4,6)
 /* PRIu64 causes bogus compiler warning */
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wformat"
@@ -101,13 +101,13 @@ handle_listfiles_local(Response &r, Path path_fs)
 	return CommandResult::OK;
 }

-#if defined(WIN32) && GCC_CHECK_VERSION(4,6)
+#if defined(_WIN32) && GCC_CHECK_VERSION(4,6)
 #pragma GCC diagnostic pop
 #endif

 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/Request.hxx
+++ b/src/command/Request.hxx
@@ -45,68 +45,57 @@ public:
 			     : default_value;
 	}

-	gcc_pure
 	int ParseInt(unsigned idx) const {
 		assert(idx < size);
 		return ParseCommandArgInt(data[idx]);
 	}

-	gcc_pure
 	int ParseInt(unsigned idx, int min_value, int max_value) const {
 		assert(idx < size);
 		return ParseCommandArgInt(data[idx], min_value, max_value);
 	}

-	gcc_pure
 	int ParseUnsigned(unsigned idx) const {
 		assert(idx < size);
 		return ParseCommandArgUnsigned(data[idx]);
 	}

-	gcc_pure
 	int ParseUnsigned(unsigned idx, unsigned max_value) const {
 		assert(idx < size);
 		return ParseCommandArgUnsigned(data[idx], max_value);
 	}

-	gcc_pure
 	bool ParseBool(unsigned idx) const {
 		assert(idx < size);
 		return ParseCommandArgBool(data[idx]);
 	}

-	gcc_pure
 	RangeArg ParseRange(unsigned idx) const {
 		assert(idx < size);
 		return ParseCommandArgRange(data[idx]);
 	}

-	gcc_pure
 	float ParseFloat(unsigned idx) const {
 		assert(idx < size);
 		return ParseCommandArgFloat(data[idx]);
 	}

-	gcc_pure
 	SongTime ParseSongTime(unsigned idx) const {
 		assert(idx < size);
 		return ParseCommandArgSongTime(data[idx]);
 	}

-	gcc_pure
 	SignedSongTime ParseSignedSongTime(unsigned idx) const {
 		assert(idx < size);
 		return ParseCommandArgSignedSongTime(data[idx]);
 	}

-	gcc_pure
 	int ParseOptional(unsigned idx, int default_value) const {
 		return idx < size
 			? ParseInt(idx)
 			: default_value;
 	}

-	gcc_pure
 	RangeArg ParseOptional(unsigned idx, RangeArg default_value) const {
 		return idx < size
 			? ParseRange(idx)
--- a/src/command/StorageCommands.cxx
+++ b/src/command/StorageCommands.cxx
@@ -45,12 +45,12 @@

 gcc_pure
 static bool
-skip_path(const char *name_utf8)
+skip_path(const char *name_utf8) noexcept
 {
 	return strchr(name_utf8, '\n') != nullptr;
 }

-#if defined(WIN32) && GCC_CHECK_VERSION(4,6)
+#if defined(_WIN32) && GCC_CHECK_VERSION(4,6)
 /* PRIu64 causes bogus compiler warning */
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wformat"
@@ -94,7 +94,7 @@ handle_listfiles_storage(Response &r, StorageDirectoryReader &reader)
 	}
 }

-#if defined(WIN32) && GCC_CHECK_VERSION(4,6)
+#if defined(_WIN32) && GCC_CHECK_VERSION(4,6)
 #pragma GCC diagnostic pop
 #endif

--- 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;
 };

@@ -85,12 +82,12 @@ struct ConfigBlock {
 	 * object that was synthesized and not loaded from a
 	 * configuration file.
 	 */
-	bool IsNull() const {
+	bool IsNull() const noexcept {
 		return line < 0;
 	}

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

@@ -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
@@ -22,7 +22,7 @@

 #include "Compiler.h"

-#if defined(WIN32) && CLANG_OR_GCC_VERSION(4,7)
+#if defined(_WIN32) && CLANG_OR_GCC_VERSION(4,7)
 /* "INPUT" is declared by winuser.h */
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wshadow"
@@ -93,7 +93,7 @@ enum class ConfigBlockOption {
 	MAX
 };

-#if defined(WIN32) && CLANG_OR_GCC_VERSION(4,7)
+#if defined(_WIN32) && CLANG_OR_GCC_VERSION(4,7)
 #pragma GCC diagnostic pop
 #endif

@@ -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/ConfigPath.cxx
+++ b/src/config/ConfigPath.cxx
@@ -29,7 +29,7 @@
 #include <assert.h>
 #include <string.h>

-#ifndef WIN32
+#ifndef _WIN32
 #include <pwd.h>

 /**
@@ -79,7 +79,7 @@ ParsePath(const char *path)
 {
 	assert(path != nullptr);

-#ifndef WIN32
+#ifndef _WIN32
 	if (path[0] == '~') {
 		++path;

@@ -119,7 +119,7 @@ ParsePath(const char *path)
 	} else {
 #endif
 		return AllocatedPath::FromUTF8Throw(path);
-#ifndef WIN32
+#ifndef _WIN32
 	}
 #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/Show More
+++ b/Show More