release v0.20.1

input/curl: wake up client thread after seek to end of file
Call SeekDone() to avoid the freeze bug.
2017-01-09 18:10:18 +01:00 · 2017-01-09 18:08:33 +01:00 · 2017-01-09 17:19:15 +01:00 · 2017-01-09 17:13:28 +01:00 · 2017-01-09 17:13:28 +01:00 · 2017-01-09 17:13:28 +01:00
1369 changed files with 95110 additions and 54230 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -6,76 +6,83 @@
 *.lo
 *.o
 *.exe
-.deps
-.dirstamp
-Makefile
-Makefile.in
-aclocal.m4
-autom4te.cache
-compile
-config.guess
-config.h
-config.h.in
-config.log
-config.mk
-config.status
-config.sub
-config_detected.h
-config_detected.mk
-configure
-configure.lineno
-depcomp
-depmode
-install-sh
-libtool
-ltmain.sh
-missing
-mkinstalldirs
-/test-driver
-mpd
-mpd.service
-stamp-h1
-tags
+
 *~
+
 .#*
 .stgit*
-src/dsd2pcm/dsd2pcm
-src/win/mpd_win32_rc.rc
-doc/doxygen.conf
-doc/protocol.html
-doc/protocol
-doc/user
-doc/developer
-doc/sticker
-doc/api
-test/software_volume
-test/run_convert
-test/run_decoder
-test/read_tags
-test/run_filter
-test/run_encoder
-test/run_output
-test/read_conf
-test/run_input
-test/read_mixer
-test/dump_playlist
-test/run_normalize
-test/tmp
-test/run_inotify
-test/test_queue_priority
-test/run_ntp_server
-test/run_resolver
-test/run_tcp_connect
-test/test_pcm
-test/dump_rva2
-test/dump_text_file
-test/test_util
-test/test_byte_reverse
-test/test_mixramp
-test/test_vorbis_encoder
-test/DumpDatabase
+.deps
+.dirstamp
+
+tags
+
+/Makefile
+/Makefile.in
+/aclocal.m4
+/autom4te.cache
+/config.h
+/config.h.in
+/config.log
+/config.mk
+/config.status
+/config_detected.h
+/config_detected.mk
+/configure
+/configure.lineno
+/depmode
+/libtool
+/ltmain.sh
+/mkinstalldirs
+/build
+/src/mpd
+/systemd/system/mpd.service
+/systemd/user/mpd.service
+/stamp-h1
+
+/src/dsd2pcm/dsd2pcm
+/src/win32/mpd_win32_rc.rc
+
+/doc/doxygen.conf
+/doc/protocol.html
+/doc/protocol
+/doc/user
+/doc/developer
+/doc/sticker
+/doc/api
+
+/test/software_volume
+/test/run_convert
+/test/run_decoder
+/test/read_tags
+/test/run_filter
+/test/run_encoder
+/test/run_output
+/test/read_conf
+/test/run_input
+/test/read_mixer
+/test/dump_playlist
+/test/run_normalize
+/test/tmp
+/test/run_inotify
+/test/test_queue_priority
+/test/test_protocol
+/test/run_ntp_server
+/test/run_resolver
+/test/run_tcp_connect
+/test/test_pcm
+/test/dump_rva2
+/test/dump_text_file
+/test/test_util
+/test/test_byte_reverse
+/test/test_mixramp
+/test/test_vorbis_encoder
+/test/DumpDatabase
+
+/lib/

 /*.tar.gz
 /*.tar.bz2
 /*.tar.xz
 /mpd-*/
+
+__pycache__/
--- a/3
+++ b/3
@@ -1,5 +1,5 @@
 Music Player Daemon - http://www.musicpd.org
-Copyright (C) 2003-2013 The Music Player Daemon Project
+Copyright 2003-2017 The Music Player Daemon Project

 The following people have contributed code to MPD:

@@ -29,3 +29,4 @@ The following people have contributed code to MPD:
 Denis Krjuchkov <denis@crazydev.net>
 Jurgen Kramer <gtmkramer@xs4all.nl>
 Jean-Francois Dockes <jf@dockes.org>
+ Yue Wang <yuleopen@gmail.com>
--- a/8
+++ b/8
@@ -12,12 +12,11 @@ install MPD.  If more information is desired, read the user manual:
 Dependencies
 ------------

-gcc 4.6 or later - http://gcc.gnu.org/
+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.

-GLib 2.28 - http://www.gtk.org/
-General-purpose utility library.
+Boost 1.46 - http://www.boost.org/


 Optional Output Dependencies
@@ -114,9 +113,6 @@ For WavPack playback.
 libadplug - http://adplug.sourceforge.net/
 For AdLib playback.

-despotify - https://github.com/SimonKagstrom/despotify
-For Spotify playback.
-

 Optional Miscellaneous Dependencies
 -----------------------------------
--- a/Makefile.am
+++ b/Makefile.am
--- a/474
+++ b/474
@@ -1,3 +1,477 @@
+ver 0.20.1 (2017/01/09)
+* input
+  - curl: fix crash bug
+  - curl: fix freeze bug
+* decoder
+  - wavpack: fix crash bug
+* storage
+  - curl: new storage plugin for WebDAV (work in progress)
+* mixer
+  - alsa: normalize displayed volume according to human perception
+* fix crash with volume_normalization enabled
+
+ver 0.20 (2017/01/04)
+* protocol
+  - "commands" returns playlist commands only if playlist_directory configured
+  - "search"/"find" have a "window" parameter
+  - report song duration with milliseconds precision
+  - "sticker find" can match sticker values
+  - drop the "file:///" prefix for absolute file paths
+  - add range parameter to command "plchanges" and "plchangesposid"
+  - send verbose error message to client
+* input
+  - curl: fix memory leak
+* tags
+  - ape, ogg: drop support for non-standard tag "album artist"
+    affected filetypes: vorbis, flac, opus & all files with ape2 tags
+    (most importantly some mp3s)
+  - id3: remove the "id3v1_encoding" setting; by definition, all ID3v1 tags
+    are ISO-Latin-1
+  - ape: support APE replay gain on remote files
+  - read ID3 tags from NFS/SMB
+* decoder
+  - improved error logging
+  - report I/O errors to clients
+  - ffmpeg: support ReplayGain and MixRamp
+  - ffmpeg: support stream tags
+  - gme: add option "accuracy"
+  - gme: provide the TRACK tag
+  - gme: faster scanning
+  - mad: reduce memory usage while scanning tags
+  - mpcdec: read the bit rate
+  - pcm: support audio/L16 (RFC 2586) and audio/x-mpd-float
+  - sidplay: faster scanning
+  - wavpack: large file support
+  - wavpack: support DSD (WavPack 5)
+  - wavpack: archive support
+* playlist
+  - cue: don't skip pregap
+  - embcue: fix last track
+  - flac: new plugin which reads the "CUESHEET" metadata block
+* output
+  - alsa: fix multi-channel order
+  - alsa: remove option "use_mmap"
+  - alsa: support DSD_U32
+  - alsa: disable DoP if it fails
+  - jack: reduce CPU usage
+  - pulse: set channel map to WAVE-EX
+  - recorder: record tags
+  - recorder: allow dynamic file names
+  - sndio: new output plugin
+* mixer
+  - null: new plugin
+* resampler
+  - new block "resampler" in configuration file
+    replacing the old "samplerate_converter" setting
+  - soxr: allow multi-threaded resampling
+* player
+  - reset song priority on playback
+  - reduce xruns
+* write database and state file atomically
+* always write UTF-8 to the log file.
+* remove dependency on GLib
+* support libsystemd (instead of the older libsystemd-daemon)
+* database
+  - proxy: add TCP keepalive option
+* update
+  - apply .mpdignore matches to subdirectories
+* switch the code base to C++14
+  - GCC 4.9 or clang 3.4 (or newer) recommended
+
+ver 0.19.21 (2016/12/13)
+* decoder
+  - ffmpeg: fix crash bug
+* fix unit test failure after recent "setprio" change
+* systemd: add user unit
+
+ver 0.19.20 (2016/12/09)
+* protocol
+  - "setprio" re-enqueues old song if priority has been raised
+* decoder
+  - ffmpeg: ignore empty packets
+  - pcm: fix corruption bug with partial frames (after short read)
+  - sidplay: fix playback speed with libsidplayfp
+* output
+  - winmm: fix 8 bit playback
+* fix gcc 7.0 -Wimplicit-fallthrough
+* systemd: paranoid security settings
+
+ver 0.19.19 (2016/08/23)
+* decoder
+  - ffmpeg: bug fix for FFmpeg 3.1 support
+  - wildmidi: support libWildMidi 0.4
+* output
+  - pulse: support 32 bit, 24 bit and floating point playback
+* support non-x86 NetBSD
+* fix clang 3.9 warnings
+
+ver 0.19.18 (2016/08/05)
+* decoder
+  - ffmpeg: fix crash with older FFmpeg versions (< 3.0)
+  - ffmpeg: log detailed error message
+  - ffmpeg: support FFmpeg 3.1
+  - sidplay: detect libsidplay2 with pkg-config
+  - sidplay: log detailed error message
+  - sidplay: read the "date" tag
+  - sidplay: allow building with libsidplayfp instead of libsidplay2
+* output
+  - shout: recognize setting "encoder" instead of "encoding"
+* fix memory leak after stream failure
+* fix build failure with Boost 1.61
+* require gcc 4.7 or newer
+
+ver 0.19.17 (2016/07/09)
+* decoder
+  - flac: fix assertion failure while seeking
+  - flac: fix stream duration indicator
+  - fix seek problems in several plugins
+* fix spurious seek error "Failed to allocate silence buffer"
+* replay gain: fix "replay_gain_handler mixer" setting
+* DSD: use 0x69 as silence pattern
+* fix use-after-free bug on "close" and "kill"
+
+ver 0.19.16 (2016/06/13)
+* faster seeking
+* fix system include path order
+* add missing DocBook file to tarball
+
+ver 0.19.15 (2016/04/30)
+* decoder
+  - ffmpeg: support FFmpeg 3.0
+  - ffmpeg: use as fallback instead of "mad" if no plugin matches
+  - opus: support bigger OpusTags packets
+* fix more build failures on non-glibc builds due to constexpr Mutex
+* fix build failure due to missing include
+* fix unit test on Alpha
+
+ver 0.19.14 (2016/03/18)
+* decoder
+  - dsdiff: fix off-by-one buffer overflow
+  - opus: limit tag size to 64 kB
+* archive
+  - iso9660: fix buffer overflow
+* fix quadratic runtime bug in the tag pool
+* fix build failures on non-glibc builds due to constexpr Mutex
+
+ver 0.19.13 (2016/02/23)
+* tags
+  - aiff, riff: fix ID3 chunk padding
+* decoder
+  - ffmpeg: support the TAK codec
+* fix disappearing duration of remote songs during playback
+* initialize supplementary groups with glibc 2.19+
+
+ver 0.19.12 (2015/12/15)
+* fix assertion failure on malformed UTF-8 tag
+* fix build failure on non-Linux systems
+* fix LimitRTTIME in systemd unit file
+
+ver 0.19.11 (2015/10/27)
+* tags
+  - ape: fix buffer overflow
+* decoder
+  - ffmpeg: fix crash due to wrong avio_alloc_context() call
+  - gme: don't loop forever, fall back to GME's default play length
+* encoder
+  - flac: fix crash with 32 bit playback
+* mixer
+  - fix mixer lag after enabling/disabling output
+
+ver 0.19.10 (2015/06/21)
+* input
+  - curl: fix deadlock on small responses
+  - smbclient: fix DFF playback
+* decoder
+  - ffmpeg: improve seeking accuracy
+  - fix stuck stream tags
+* encoder
+  - opus: fix bogus granulepos
+* output
+  - fix failure to open device right after booting
+* neighbor
+  - nfs: fix deadlock when connecting
+* fix "single" mode breakage due to queue edits
+
+ver 0.19.9 (2015/02/06)
+* decoder
+  - dsdiff, dsf: raise ID3 tag limit to 1 MB
+* playlist: fix loading duplicate tag types from state file
+* despotify: remove defunct plugin
+* fix clock integer overflow on OS X
+* fix gcc 5.0 warnings
+* fix build failure with uClibc
+* fix build failure on non-POSIX operating systems
+* fix dependency issue on parallel Android build
+* fix database/state file saving on Windows
+
+ver 0.19.8 (2015/01/14)
+* input
+  - curl: fix bug after rewinding from end-of-file
+  - mms: reduce delay at the beginning of playback
+* decoder
+  - dsdiff, dsf: allow ID3 tags larger than 4 kB
+  - ffmpeg: support interleaved floating point
+* fix clang 3.6 warnings
+* fix build failure on NetBSD
+
+ver 0.19.7 (2014/12/17)
+* input
+  - nfs: fix crash while canceling a failing file open operation
+  - nfs: fix memory leak on connection failure
+  - nfs: fix reconnect after mount failure
+  - nfs: implement mount timeout (60 seconds)
+* storage
+  - nfs: implement I/O timeout (60 seconds)
+* playlist
+  - embcue: fix filename suffix detection
+  - don't skip non-existent songs in "listplaylist"
+* decoder
+  - ffmpeg: fix time stamp underflow
+* fix memory allocator bug on Windows
+
+ver 0.19.6 (2014/12/08)
+* decoder
+  - ffmpeg: support FFmpeg 2.5
+* fix build failure with musl
+* android
+  - update libFLAC to 1.3.1
+  - update FFmpeg to 2.5
+
+ver 0.19.5 (2014/11/26)
+* input
+  - nfs: fix crash on connection failure
+* archive
+  - zzip: fix crash after seeking
+* decoder
+  - dsdiff, dsf, opus: fix deadlock while seeking
+  - mp4v2: remove because of incompatible license
+
+ver 0.19.4 (2014/11/18)
+* protocol
+  - workaround for buggy clients that send "add /"
+* decoder
+  - ffmpeg: support opus
+  - opus: add MIME types audio/ogg and application/ogg
+* fix crash on failed filename charset conversion
+* fix local socket detection from uid=0 (root)
+
+ver 0.19.3 (2014/11/11)
+* protocol
+  - fix "(null)" result string to "list" when AlbumArtist is disabled
+* database
+  - upnp: fix breakage due to malformed URIs
+* input
+  - curl: another fix for redirected streams
+* decoder
+  - audiofile: fix crash while playing streams
+  - audiofile: fix bit rate calculation
+  - ffmpeg: support opus
+  - opus: fix bogus duration on streams
+  - opus: support chained streams
+  - opus: improved error logging
+* fix distorted audio with soxr resampler
+* fix build failure on Mac OS X with non-Apple compilers
+
+ver 0.19.2 (2014/11/02)
+* input
+  - curl: fix redirected streams
+* playlist
+  - don't allow empty playlist name
+  - m3u: don't ignore unterminated last line
+  - m3u: recognize the file suffix ".m3u8"
+* decoder
+  - ignore URI query string for plugin detection
+  - faad: remove workaround for ancient libfaad2 ABI bug
+  - ffmpeg: recognize MIME type audio/aacp
+  - mad: fix negative replay gain values
+* output
+  - fix memory leak after filter initialization error
+  - fall back to PCM if given DSD sample rate is not supported
+* fix assertion failure on unsupported PCM conversion
+* auto-disable plugins that require GLib when --disable-glib is used
+
+ver 0.19.1 (2014/10/19)
+* input
+  - mms: fix deadlock bug
+* playlist
+  - extm3u: fix Extended M3U detection
+  - m3u, extm3u, cue: fix truncated lines
+* fix build failure on Mac OS X
+* add missing file systemd/mpd.socket to tarball
+
+ver 0.19 (2014/10/10)
+* protocol
+  - new commands "addtagid", "cleartagid", "listfiles", "listmounts",
+    "listneighbors", "mount", "rangeid", "unmount"
+  - "lsinfo" and "readcomments" allowed for remote files
+  - "listneighbors" lists file servers on the local network
+  - "playlistadd" supports file:///
+  - "idle" with unrecognized event name fails
+  - "list" on album artist falls back to the artist tag
+  - "list" and "count" allow grouping
+  - new "search"/"find" filter "modified-since"
+  - "seek*" allows fractional position
+  - close connection after syntax error
+* database
+  - proxy: forward "idle" events
+  - proxy: forward the "update" command
+  - proxy: copy "Last-Modified" from remote directories
+  - simple: compress the database file using gzip
+  - upnp: new plugin
+  - cancel the update on shutdown
+* storage
+  - music_directory can point to a remote file server
+  - nfs: new plugin
+  - smbclient: new plugin
+* playlist
+  - cue: fix bogus duration of the last track
+  - cue: restore CUE tracks from state file
+  - soundcloud: use https instead of http
+  - soundcloud: add default API key
+* archive
+  - read tags from songs in an archive
+* input
+  - alsa: new input plugin
+  - curl: options "verify_peer" and "verify_host"
+  - ffmpeg: update offset after seeking
+  - ffmpeg: improved error messages
+  - mms: non-blocking I/O
+  - nfs: new input plugin
+  - smbclient: new input plugin
+* filter
+  - volume: improved software volume dithering
+* decoder:
+  - vorbis, flac, opus: honor DESCRIPTION= tag in Xiph-based files as a comment to the song
+  - audiofile: support scanning remote files
+  - audiofile: log libaudiofile errors
+  - dsdiff, dsf: report bit rate
+  - dsdiff, dsf: implement seeking
+  - dsf: support DSD512
+  - dsf: support multi-channel files
+  - dsf: fix big-endian bugs
+  - dsf: fix noise at end of malformed file
+  - mpg123: support ID3v2, ReplayGain and MixRamp
+  - sndfile: support scanning remote files
+  - sndfile: support tags "comment", "album", "track", "genre"
+  - sndfile: native floating point playback
+  - sndfile: optimized 16 bit playback
+  - mp4v2: support playback of MP4 files.
+* encoder:
+  - shine: new encoder plugin
+* output
+  - alsa: support native DSD playback
+  - alsa: rename "DSD over USB" to "DoP"
+  - osx: fix hang after (un)plugging headphones
+* threads:
+  - the update thread runs at "idle" priority
+  - the output thread runs at "real-time" priority
+  - increase kernel timer slack on Linux
+  - name each thread (for debugging)
+* configuration
+  - allow playlist directory without music directory
+  - use XDG to auto-detect "music_directory" and "db_file"
+* add tags "AlbumSort", "MUSICBRAINZ_RELEASETRACKID"
+* disable global Latin-1 fallback for tag values
+* new resampler option using libsoxr
+* ARM NEON optimizations
+* install systemd unit for socket activation
+* Android port
+
+ver 0.18.23 (2015/02/06)
+* despotify: remove defunct plugin
+* fix clock integer overflow on OS X
+* fix gcc 5.0 warnings
+
+ver 0.18.22 (2015/01/14)
+* fix clang 3.6 warnings
+
+ver 0.18.21 (2014/12/17)
+* playlist
+  - embcue: fix filename suffix detection
+* decoder
+  - ffmpeg: fix time stamp underflow
+
+ver 0.18.20 (2014/12/08)
+* decoder
+  - ffmpeg: support FFmpeg 2.5
+* fix build failure with musl
+
+ver 0.18.19 (2014/11/26)
+* archive
+  - zzip: fix crash after seeking
+
+ver 0.18.18 (2014/11/18)
+* decoder
+  - ffmpeg: support opus
+* fix crash on failed filename charset conversion
+* fix local socket detection from uid=0 (root)
+
+ver 0.18.17 (2014/11/02)
+* playlist
+  - don't allow empty playlist name
+  - m3u: recognize the file suffix ".m3u8"
+* decoder
+  - ignore URI query string for plugin detection
+  - faad: remove workaround for ancient libfaad2 ABI bug
+  - ffmpeg: recognize MIME type audio/aacp
+
+ver 0.18.16 (2014/09/26)
+* fix DSD breakage due to typo in configure.ac
+
+ver 0.18.15 (2014/09/26)
+* command
+  - list: reset used size after the list has been processed
+* fix MixRamp
+* work around build failure on NetBSD
+
+ver 0.18.14 (2014/09/11)
+* protocol
+  - fix range parser bug on certain 32 bit architectures
+* decoder
+  - audiofile: fix crash after seeking
+  - ffmpeg: fix crash with ffmpeg/libav version 11
+  - fix assertion failure after seeking
+
+ver 0.18.13 (2014/08/31)
+* protocol
+  - don't change song on "seekcur" in random mode
+
+* decoder
+  - dsdiff, dsf: fix endless loop on malformed file
+  - ffmpeg: support ffmpeg/libav version 11
+  - gme: fix song duration
+* output
+  - alsa: fix endless loop at end of file in dsd_usb mode
+* fix state file saver
+* fix build failure on Darwin
+
+ver 0.18.12 (2014/07/30)
+* database
+  - proxy: fix build failure with libmpdclient 2.2
+  - proxy: fix add/search and other commands with libmpdclient < 2.9
+* decoder
+  - audiofile: improve responsiveness
+  - audiofile: fix WAV stream playback
+  - dsdiff, dsf: fix stream playback
+  - dsdiff: fix metadata parser bug (uninitialized variables)
+  - faad: estimate song duration for remote files
+  - sndfile: improve responsiveness
+* randomize next song when enabling "random" mode while not playing
+* randomize next song when adding to single-song queue
+
+ver 0.18.11 (2014/05/12)
+* decoder
+  - opus: fix missing song length on high-latency files
+* fix race condition when using GLib event loop (non-Linux)
+
+ver 0.18.10 (2014/04/10)
+* decoder
+  - ffmpeg: fix seeking bug
+  - ffmpeg: handle unknown stream start time
+  - gme: fix memory leak
+  - sndfile: work around libsndfile bug on partial read
+* don't interrupt playback when current song gets deleted
+
 ver 0.18.9 (2014/03/02)
 * protocol
  - "findadd" requires the "add" permission
--- a/17
+++ b/17
@@ -1,17 +0,0 @@
-
-		       Music Player Daemon (MPD)
-			http://www.musicpd.org
-
-A daemon for playing music of various formats.  Music is played through the 
-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.
-
-MPD is released under the GNU General Public License version 2, which is
-distributed in the COPYING file.
-
-You should have received a copy of the GNU General Public License along with
-this program.  If not, see <http://www.gnu.org/licenses/>.
-
--- a/README.md
+++ b/README.md
@@ -0,0 +1,28 @@
+# Music Player Daemon
+
+http://www.musicpd.org
+
+A daemon for playing music of various formats.  Music is played through the 
+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.
+
+# 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/)
+
+# Developers
+
+- [Protocol specification](http://www.musicpd.org/doc/protocol/)
+- [Developer manual](http://www.musicpd.org/doc/developer/)
+
+# Legal
+
+MPD is released under the
+[GNU General Public License version 2](https://www.gnu.org/licenses/gpl-2.0.txt),
+which is distributed in the COPYING file.
--- a/92
+++ b/92
@@ -1,92 +0,0 @@
-                       Music Player Daemon (MPD) - UPGRADING
-
-Upgrading to 0.14
-----------------
-
-The filesystem character set is determined by GLib, if it is not
-configured.  GLib has an affinity towards UTF-8, while older MPD
-versions used to choose ISO-Latin-1.
-
-
-Upgrading to 0.13.0
-------------------
-
-JACK, Avahi, and libsamplerate have been added as optional dependencies.
-FLAC/OggFLAC now supports the 1.1.3 API, and libmikmod 3.2.0 betas are
-supported as well.
-
-New mpd.conf parameters include zeroconf_name, samplerate_converter, and
-gapless_mp3_playback.  See the mpd.conf man page or updated mpconf.example for
-more information on these parameters.
-
-Support for the ID3v2 "Original Artist/Performer" tag has been added.  Your
-MP3s will need to be rescanned for these tags to be included in the database.
-This can be done by running mpd --create-db.
-
-Upgrading to 0.12.0
-------------------
-
-The ao_driver and ao_driver_options config parameters have been removed and
-replaced with the audio_output config section.  You will have to update your
-config file to use this instead.  See the mpd.conf man page or the new
-mpdconf.example for details on specifying audio_output sections.
-
-The db_file parameter is no longer optional.  If you did not specify it in your
-old config file then you will have to add it in order to run 0.12.0.
-
-Support for OggFLAC and Musepack audio files has been added.  Additionally,
-scanning of MP3 files has been improved.  To make use of these updates it is
-highly recommended that you run mpd --create-db to recreate your entire
-database.
-
-Upgrading to 0.11.0
-------------------
-
-The database format has changed a little bit, but in a backward compatible way.
-This means that if you upgrade to 0.11.0 from 0.10.x, you do not need to make
-any changes.  However, if you downgrade back to 0.10.x, then you will need
-to recreate your db.
-
-The default port for MPD is now 6600, so update your mpd and client
-configurations appropriately.
-
-Upgrading to 0.10.0
-------------------
-
-All information is now stored in the db in UTF-8 format, and the character
-set used for the filesystem is stored in the db.  Thus, it is highly
-recommended that you recreate the db.  To do so, run mpd with the 
-"--create-db" command line option.  Also, note that the filesystem
-character set will be determined from your current locale settings.
-If your locale settings are not the same as those used for the filesystem,
-then use the config file parameter "filesystem_charset" to specify the
-correct character set (this maybe necessary if you create the db with root).
-
-Upgrading to 0.9.3
------------------
-
-Wave support was added, so to have your wave files added, update the db (mpc
-update).  
-
-Also, song lengths are now stored in the db.  To get this stuff
-added to the db, you will need to recreate the db from scratch.  To do this,
-run mpd with the "--create-db" commandline option. 
-
-Upgrading to 0.9.0
------------------
-
-The "stop_on_error" config parameter was removed, so be sure to remove this
-parameter from your config file.
-
-Upgrading to 0.8.x
------------------
-
-If you have FLACs, then to have them added to your list of available music,
-just use "update".
-
-Upgrading from 0.5.x to 0.6.x
-----------------------------
-If you have not compiled MPD with "make ogg", then nothing is needed.
-
-If you compiled with "make ogg", just use "update" (available via the phpMp
-interface) to add your OGGs to MPD's list of available music.
--- a/android/.gitignore
+++ b/android/.gitignore
@@ -0,0 +1 @@
+/build
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="org.musicpd"
+          android:installLocation="auto"
+          android:versionCode="13"
+          android:versionName="0.19.9">
+
+  <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="17"/>
+
+  <application android:icon="@drawable/icon" android:label="@string/app_name">
+    <activity android:name=".Main"
+              android:label="@string/app_name"
+              android:launchMode="singleInstance">
+      <intent-filter>
+        <action android:name="android.intent.action.MAIN" />
+        <category android:name="android.intent.category.LAUNCHER" />
+      </intent-filter>
+    </activity>
+  </application>
+
+  <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+  <uses-permission android:name="android.permission.WAKE_LOCK"/>
+  <uses-permission android:name="android.permission.INTERNET"/>
+</manifest>
--- a/android/build.py
+++ b/android/build.py
@@ -0,0 +1,153 @@
+#!/usr/bin/env python3
+
+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)
+    sys.exit(1)
+
+sdk_path = sys.argv[1]
+ndk_path = sys.argv[2]
+configure_args = sys.argv[3:]
+
+if not os.path.isfile(os.path.join(sdk_path, 'tools', 'android')):
+    print("SDK not found in", ndk_path, file=sys.stderr)
+    sys.exit(1)
+
+if not os.path.isdir(ndk_path):
+    print("NDK not found in", ndk_path, file=sys.stderr)
+    sys.exit(1)
+
+# select the NDK target
+arch = 'arm-linux-androideabi'
+
+# the path to the MPD sources
+mpd_path = os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]) or '.', '..'))
+sys.path[0] = os.path.join(mpd_path, 'python')
+
+# output directories
+from build.dirs import lib_path, tarball_path, src_path
+
+arch_path = os.path.join(lib_path, arch)
+build_path = os.path.join(arch_path, 'build')
+
+# build host configuration
+build_arch = 'linux-x86_64'
+
+# set up the NDK toolchain
+
+class AndroidNdkToolchain:
+    def __init__(self, tarball_path, src_path, build_path,
+                 use_cxx):
+        self.tarball_path = tarball_path
+        self.src_path = src_path
+        self.build_path = build_path
+
+        self.ndk_arch = 'arm'
+        android_abi = 'armeabi-v7a'
+        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)
+
+        install_prefix = os.path.join(arch_path, 'root')
+
+        self.arch = arch
+        self.install_prefix = install_prefix
+        self.sysroot = sysroot
+
+        toolchain_path = os.path.join(ndk_path, 'toolchains', arch + '-' + gcc_version, 'prebuilt', build_arch)
+        llvm_path = os.path.join(ndk_path, 'toolchains', 'llvm', 'prebuilt', build_arch)
+        llvm_triple = 'armv7-none-linux-androideabi'
+
+        common_flags = '-march=armv7-a -mfloat-abi=softfp'
+
+        toolchain_bin = os.path.join(toolchain_path, 'bin')
+        llvm_bin = os.path.join(llvm_path, 'bin')
+        self.cc = os.path.join(llvm_bin, 'clang')
+        self.cxx = os.path.join(llvm_bin, 'clang++')
+        common_flags += ' -target ' + llvm_triple + ' -integrated-as -gcc-toolchain ' + toolchain_path
+
+        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.libs = ''
+
+        self.is_arm = self.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')
+
+        if use_cxx:
+            self.libs += ' ' + libstdcxx_ldadd
+            self.cppflags += ' ' + libstdcxx_cppflags
+
+        self.env = dict(os.environ)
+
+        # redirect pkg-config to use our root directory instead of the
+        # default one on the build host
+        self.env['PKG_CONFIG_LIBDIR'] = os.path.join(install_prefix, 'lib/pkgconfig')
+
+# a list of third-party libraries to be used by MPD on Android
+from build.libs import *
+thirdparty_libs = [
+    libogg,
+    libvorbis,
+    opus,
+    flac,
+    libid3tag,
+    libmad,
+    ffmpeg,
+    curl,
+    boost,
+]
+
+# build the third-party libraries
+for x in thirdparty_libs:
+    toolchain = AndroidNdkToolchain(tarball_path, src_path, build_path,
+                                    use_cxx=x.use_cxx)
+    if not x.is_installed(toolchain):
+        x.build(toolchain)
+
+# configure and build MPD
+toolchain = AndroidNdkToolchain(tarball_path, src_path, build_path,
+                                use_cxx=True)
+
+configure = [
+    os.path.join(mpd_path, 'configure'),
+    'CC=' + toolchain.cc,
+    'CXX=' + toolchain.cxx,
+    'CFLAGS=' + toolchain.cflags,
+    'CXXFLAGS=' + toolchain.cxxflags,
+    'CPPFLAGS=' + toolchain.cppflags,
+    'LDFLAGS=' + toolchain.ldflags,
+    'LIBS=' + toolchain.libs,
+    'AR=' + toolchain.ar,
+    'RANLIB=' + toolchain.ranlib,
+    'STRIP=' + toolchain.strip,
+    '--host=' + toolchain.arch,
+    '--prefix=' + toolchain.install_prefix,
+    '--with-sysroot=' + toolchain.sysroot,
+    '--with-android-sdk=' + sdk_path,
+
+    '--enable-silent-rules',
+
+    '--disable-icu',
+
+] + configure_args
+
+subprocess.check_call(configure, env=toolchain.env)
+subprocess.check_call(['/usr/bin/make', '--quiet', '-j12'], env=toolchain.env)
--- a/android/custom_rules.xml
+++ b/android/custom_rules.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="mpd_rules">
+  <!-- setting these two properties works around a bug in Android
+       SDK's build.xml, which deletes all .class files every time -->
+  <property name="build.last.is.packaging.debug" value="true" />
+  <property name="build.is.packaging.debug" value="true" />
+
+  <target name="compile-jni-classes"
+          depends="-set-debug-mode,-compile"/>
+</project>
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<resources>
+  <string name="app_name">MPD</string>
+</resources>
--- a/android/src/Bridge.java
+++ b/android/src/Bridge.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2003-2017 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+package org.musicpd;
+
+import android.content.Context;
+
+/**
+ * Bridge to native code.
+ */
+public class Bridge {
+	public static native void run(Context context);
+	public static native void shutdown();
+}
--- a/android/src/Loader.java
+++ b/android/src/Loader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2013 The Music Player Daemon Project
+ * Copyright 2003-2017 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -17,9 +17,23 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#include "TagSettings.h"
+package org.musicpd;

-bool ignore_tag_items[TAG_NUM_OF_ITEM_TYPES] = {
-	/* ignore comments by default */
-	[TAG_COMMENT] = true,
-};
+import android.util.Log;
+
+public class Loader {
+	private static final String TAG = "MPD";
+
+	public static boolean loaded = false;
+	public static String error;
+
+	static {
+		try {
+			System.loadLibrary("mpd");
+			loaded = true;
+		} catch (UnsatisfiedLinkError e) {
+			Log.e(TAG, e.getMessage());
+			error = e.getMessage();
+		}
+	}
+}
--- a/android/src/Main.java
+++ b/android/src/Main.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2003-2017 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+package org.musicpd;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.os.Build;
+import android.os.Handler;
+import android.os.Message;
+import android.widget.TextView;
+import android.util.Log;
+
+public class Main extends Activity implements Runnable {
+	private static final String TAG = "MPD";
+
+	Thread thread;
+
+	TextView textView;
+
+	final Handler quitHandler = new Handler() {
+			public void handleMessage(Message msg) {
+				textView.setText("Music Player Daemon has quit");
+
+				// TODO: what now?  restart?
+			}
+		};
+
+	@Override protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+
+		if (!Loader.loaded) {
+			TextView tv = new TextView(this);
+			tv.setText("Failed to load the native MPD libary.\n" +
+				   "Report this problem to us, and include the following information:\n" +
+				   "ABI=" + Build.CPU_ABI + "\n" +
+				   "PRODUCT=" + Build.PRODUCT + "\n" +
+				   "FINGERPRINT=" + Build.FINGERPRINT + "\n" +
+				   "error=" + Loader.error);
+			setContentView(tv);
+			return;
+		}
+
+		if (thread == null || !thread.isAlive()) {
+			thread = new Thread(this, "NativeMain");
+			thread.start();
+		}
+
+		textView = new TextView(this);
+		textView.setText("Music Player Daemon is running"
+				 + "\nCAUTION: this version is EXPERIMENTAL!");
+		setContentView(textView);
+	}
+
+	@Override public void run() {
+		Bridge.run(this);
+		quitHandler.sendMessage(quitHandler.obtainMessage());
+	}
+}
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,137 +1,11 @@
 #!/bin/sh
-# Run this to set up the build system: configure, makefiles, etc.
-# (at one point this was based on the version in enlightenment's cvs)

-package="mpd"
+set -e

-olddir="`pwd`"
-srcdir="`dirname $0`"
-test -z "$srcdir" && srcdir=.
-cd "$srcdir"
-DIE=
-AM_VERSIONGREP="sed -e s/.*[^0-9\.]\([0-9]\.[0-9][0-9]*\).*/\1/"
-AC_VERSIONGREP="sed -e s/.*[^0-9\.]\([0-9]\.[0-9][0-9]\).*/\1/"
-VERSIONMKINT="sed -e s/[^0-9]//"
-if test -n "$AM_FORCE_VERSION"
-then
-	AM_VERSIONS="$AM_FORCE_VERSION"
-else
-	AM_VERSIONS='1.11'
-fi
-if test -n "$AC_FORCE_VERSION"
-then
-	AC_VERSIONS="$AC_FORCE_VERSION"
-else
-	AC_VERSIONS='2.60 2.61'
-fi
+rm -rf config.cache build
+mkdir build

-versioned_bins ()
-{
-	bin="$1"
-	needed_int=`echo $VERNEEDED | $VERSIONMKINT`
-	for i in $VERSIONS
-	do
-		i_int=`echo $i | $VERSIONMKINT`
-		if test $i_int -ge $needed_int
-		then
-			echo $bin-$i $bin$i $bin-$i_int $bin$i_int
-		fi
-	done
-	echo $bin
-}
-
-for c in autoconf autoheader automake aclocal
-do
-	uc=`echo $c | tr '[:lower:]' '[:upper:]'`
-	eval "val=`echo '$'$uc`"
-	if test -n "$val"
-	then
-		echo "$uc=$val in environment, will not attempt to auto-detect"
-		continue
-	fi
-
-	case "$c" in
-	autoconf|autoheader)
-		VERNEEDED=`fgrep AC_PREREQ configure.ac | $AC_VERSIONGREP`
-		VERSIONS="$AC_VERSIONS"
-		pkg=autoconf
-		;;
-	automake|aclocal)
-		VERNEEDED=`fgrep AUTOMAKE_OPTIONS Makefile.am | $AM_VERSIONGREP`
-		VERSIONS="$AM_VERSIONS"
-		pkg=automake
-		;;
-	esac
-	printf "checking for $c ... "
-	for x in `versioned_bins $c`; do
-		($x --version < /dev/null > /dev/null 2>&1) > /dev/null 2>&1
-		if test $? -eq 0
-		then
-			echo $x
-			eval $uc=$x
-			break
-		fi
-	done
-	eval "val=`echo '$'$uc`"
-	if test -z "$val"
-	then
-		if test $c = $pkg
-		then
-			DIE="$DIE $c=$VERNEEDED"
-		else
-			DIE="$DIE $c($pkg)=$VERNEEDED"
-		fi
-	fi
-done
-
-if test -n "$DIE"
-then
-	echo "You must have the following installed to compile $package:"
-	for i in $DIE
-	do
-		printf '  '
-		echo $i | sed -e 's/(/ (from /' -e 's/=\(.*\)/ (>= \1)/'
-	done
-	echo "Download the appropriate package(s) for your system,"
-	echo "or get the source from one of the GNU ftp sites"
-	echo "listed in http://www.gnu.org/order/ftp.html"
-        exit 1
-fi
-
-echo "Generating configuration files for $package, please wait...."
-
-ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I m4"
-
-# /usr/share/aclocal is most likely included by default, already...
-ac_local_paths='
-/usr/local/share/aclocal
-/sw/share/aclocal
-/usr/pkg/share/aclocal
-/opt/share/aclocal
-/usr/gnu/share/aclocal
-'
-
-for i in $ac_local_paths; do
-	if test -d "$i"; then
-		ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I $i"
-		# we probably only want one of these...
-		break
-	fi
-done
-
-echo "  $ACLOCAL $ACLOCAL_FLAGS"
-$ACLOCAL $ACLOCAL_FLAGS || exit 1
-
-echo "  $AUTOHEADER"
-$AUTOHEADER || exit 1
-
-echo "  $AUTOMAKE --add-missing $AUTOMAKE_FLAGS"
-$AUTOMAKE --add-missing $AUTOMAKE_FLAGS || exit 1
-
-echo "  $AUTOCONF"
-$AUTOCONF || exit 1
-
-cd "$olddir"
-if test x$NOCONFIGURE = x; then
-	"$srcdir"/configure "$@" || exit 1
-fi
+aclocal -I m4 $ACLOCAL_FLAGS
+autoheader
+automake --add-missing $AUTOMAKE_FLAGS
+autoconf
--- a/configure.ac
+++ b/configure.ac
--- a/doc/developer.xml
+++ b/doc/developer.xml
@@ -1,16 +1,17 @@
 <?xml version='1.0' encoding="utf-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-               "docbook/dtd/xml/4.2/docbookx.dtd">
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+                      "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+
 <book>
  <title>The Music Player Daemon - Developer's Manual</title>

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

    <para>
      This is a guide for those who wish to hack on the MPD source
      code.  MPD is an open project, and we are always happy about
-      contributions.  So far, more than 50 people have contributed
+      contributions.  So far, more than 150 people have contributed
      patches.
    </para>

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

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

    <itemizedlist>
@@ -39,9 +40,35 @@

      <listitem>
        <para>
-          the code should be C++11 compliant, and must compile with
-          <application>GCC</application> 4.6 and
-          <application>clang</application> 3.2
+          comment your code, document your APIs
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          the code should be C++14 compliant, and must compile with
+          <application>GCC</application> 4.9 and
+          <application>clang</application> 3.4
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          report error conditions with C++ exceptions, preferable
+          derived from <varname>std::runtime_error</varname>
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          all code must be exception-safe
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          classes and functions names use CamelCase; variables are
+          lower-case with words separated by underscore
        </para>
      </listitem>

@@ -51,9 +78,9 @@
        </para>

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

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

    <para>
@@ -150,12 +177,65 @@ foo(const char *abc, int xyz)
    </section>
  </chapter>

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

    <para>
      Send your patches to the mailing list:
-      mpd-devel@musicpd.org
+      <email>mpd-devel@musicpd.org</email> (<ulink
+      url="http://mailman.blarg.de/listinfo/mpd-devel">subscribe
+      here</ulink>)
+    </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.
    </para>
  </chapter>
+
+  <chapter id="tools">
+    <title>Development Tools</title>
+
+    <section>
+      <title>Clang Static Analyzer</title>
+
+      <para>
+        The <ulink url="http://clang-analyzer.llvm.org/">clang static
+        analyzer</ulink> is a tool that helps find bugs.  To run it on
+        the MPD code base, install LLVM and clang.  Configure MPD to
+        use clang:
+      </para>
+
+      <programlisting>./configure --enable-debug CXX=clang++ CC=clang ...</programlisting>
+
+      <para>
+        It is recommended to use <option>--enable-debug</option>,
+        because the analyzer takes advantage of
+        <function>assert()</function> calls, which are only enabled in
+        the debug build.
+      </para>
+
+      <para>
+        Now run the analyzer:
+      </para>
+
+      <programlisting>scan-build --use-c++=clang++ --use-cc=clang make</programlisting>
+
+      <para>
+        The options <option>--use-c++</option> and
+        <option>--use-cc</option> are necessary because it invokes
+        <command>cc</command> for actually compiling the sources by
+        default.  That breaks, because MPD requires a C99 compiler.
+      </para>
+    </section>
+  </chapter>
 </book>
--- a/doc/doxygen.conf.in
+++ b/doc/doxygen.conf.in
--- a/doc/include/tags.xml
+++ b/doc/include/tags.xml
@@ -0,0 +1,154 @@
+<?xml version='1.0' encoding="utf-8"?>
+<!DOCTYPE itemizedlist PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+                              "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+
+<itemizedlist>
+  <listitem>
+    <para>
+      <varname>artist</varname>: the artist name.  Its meaning is not
+      well-defined; see <varname>composer</varname> and
+      <varname>performer</varname> for more specific tags.
+    </para>
+  </listitem>
+
+  <listitem>
+    <para>
+      <varname>artistsort</varname>: same as
+      <varname>artist</varname>, but for sorting.  This usually omits
+      prefixes such as "The".
+    </para>
+  </listitem>
+
+  <listitem>
+    <para>
+      <varname>album</varname>: the album name.
+    </para>
+  </listitem>
+
+  <listitem>
+    <para>
+      <varname>albumsort</varname>: same as <varname>album</varname>,
+      but for sorting.
+    </para>
+  </listitem>
+
+  <listitem>
+    <para>
+      <varname>albumartist</varname>: on multi-artist albums, this is
+      the artist name which shall be used for the whole album.  The
+      exact meaning of this tag is not well-defined.
+    </para>
+  </listitem>
+
+  <listitem>
+    <para>
+      <varname>albumartistsort</varname>: same as
+      <varname>albumartist</varname>, but for sorting.
+    </para>
+  </listitem>
+
+  <listitem>
+    <para>
+      <varname>title</varname>: the song title.
+    </para>
+  </listitem>
+
+  <listitem>
+    <para>
+      <varname>track</varname>: the track number within the album.
+    </para>
+  </listitem>
+
+  <listitem>
+    <para>
+      <varname>name</varname>: a name for this song.  This is not the
+      song title.  The exact meaning of this tag is not well-defined.
+      It is often used by badly configured internet radio stations
+      with broken tags to squeeze both the artist name and the song
+      title in one tag.
+    </para>
+  </listitem>
+
+  <listitem>
+    <para>
+      <varname>genre</varname>: the music genre.
+    </para>
+  </listitem>
+
+  <listitem>
+    <para>
+      <varname>date</varname>: the song's release date.  This is
+      usually a 4-digit year.
+    </para>
+  </listitem>
+
+  <listitem>
+    <para>
+      <varname>composer</varname>: the artist who composed the song.
+    </para>
+  </listitem>
+
+  <listitem>
+    <para>
+      <varname>performer</varname>: the artist who performed the song.
+    </para>
+  </listitem>
+
+  <listitem>
+    <para>
+      <varname>comment</varname>: a human-readable comment about this
+      song.  The exact meaning of this tag is not well-defined.
+    </para>
+  </listitem>
+
+  <listitem>
+    <para>
+      <varname>disc</varname>: the disc number in a multi-disc album.
+    </para>
+  </listitem>
+
+  <listitem>
+    <para>
+      <varname>musicbrainz_artistid</varname>: the artist id in the
+      <ulink
+      url="http://musicbrainz.org/doc/MusicBrainzTag">MusicBrainz</ulink>
+      database.
+    </para>
+  </listitem>
+
+  <listitem>
+    <para>
+      <varname>musicbrainz_albumid</varname>: the album id in the
+      <ulink
+      url="http://musicbrainz.org/doc/MusicBrainzTag">MusicBrainz</ulink>
+      database.
+    </para>
+  </listitem>
+
+  <listitem>
+    <para>
+      <varname>musicbrainz_albumartistid</varname>: the album artist
+      id in the <ulink
+      url="http://musicbrainz.org/doc/MusicBrainzTag">MusicBrainz</ulink>
+      database.
+    </para>
+  </listitem>
+
+  <listitem>
+    <para>
+      <varname>musicbrainz_trackid</varname>: the track id in the
+      <ulink
+      url="http://musicbrainz.org/doc/MusicBrainzTag">MusicBrainz</ulink>
+      database.
+    </para>
+  </listitem>
+
+  <listitem>
+    <para>
+      <varname>musicbrainz_releasetrackid</varname>: the release track
+      id in the <ulink
+      url="http://musicbrainz.org/doc/MusicBrainzTag">MusicBrainz</ulink>
+      database.
+    </para>
+  </listitem>
+</itemizedlist>
--- a/doc/mpd.conf.5
+++ b/doc/mpd.conf.5
@@ -136,53 +136,6 @@ for the format of this parameter.  Multiple audio_output sections may be
 specified.  If no audio_output section is specified, then MPD will scan for a
 usable audio output.
 .TP
-.B audio_output_format <sample_rate:bits:channels>
-This specifies the sample rate, bits per sample, and number of channels of
-audio that is sent to each audio output.  Note that audio outputs may specify
-their own audio format which will be used for actual output to the audio
-device.  An example is "44100:16:2" for 44100Hz, 16 bits, and 2 channels.  The
-default is to use the audio format of the input file.
-Any of the three attributes may be an asterisk to specify that this
-attribute should not be enforced
-.TP
-.B samplerate_converter <integer or prefix>
-This specifies the libsamplerate converter to use.  The supplied value should
-either be an integer or a prefix of the name of a converter.  The default is
-"Fastest Sinc Interpolator".
-
-At the time of this writing, the following converters are available:
-.RS
-.TP
-Best Sinc Interpolator (0)
-
-Band limited sinc interpolation, best quality, 97dB SNR, 96% BW.
-.TP
-Medium Sinc Interpolator (1)
-
-Band limited sinc interpolation, medium quality, 97dB SNR, 90% BW.
-.TP
-Fastest Sinc Interpolator (2)
-
-Band limited sinc interpolation, fastest, 97dB SNR, 80% BW.
-.TP
-ZOH Interpolator (3)
-
-Zero order hold interpolator, very fast, very poor quality with audible
-distortions.
-.TP
-Linear Interpolator (4)
-
-Linear interpolator, very fast, poor quality.
-.TP
-internal
-
-Poor quality, no floating point operations.  This is the default (and
-only choice) if MPD was compiled without libsamplerate.
-.RE
-.IP
-For an up-to-date list of available converters, please see the libsamplerate
-documentation (available online at <\fBhttp://www.mega\-nerd.com/SRC/\fP>).
-.TP
 .B replaygain <off or album or track or auto>
 If specified, mpd will adjust the volume of songs played using ReplayGain tags
 (see <\fBhttp://www.replaygain.org/\fP>).  Setting this to "album" will adjust
@@ -198,50 +151,11 @@ This is the gain (in dB) applied to songs with ReplayGain tags.
 .B volume_normalization <yes or no>
 If yes, mpd will normalize the volume of songs as they play.  The default is no.
 .TP
-.B audio_buffer_size <size in KiB>
-This specifies the size of the audio buffer in kibibytes.  The default is 4096,
-large enough for nearly 12 seconds of CD-quality audio.
-.TP
-.B buffer_before_play <0-100%>
-This specifies how much of the audio buffer should be filled before playing a
-song.  Try increasing this if you hear skipping when manually changing songs.
-The default is 10%, a little over 1 second of CD-quality audio with the default
-buffer size.
-.TP
-.B http_proxy_host <hostname>
-This setting is deprecated.  Use the "proxy" setting in the "curl"
-input block.  See MPD user manual for details.
-.TP
-.B connection_timeout <seconds>
-If a client does not send any new data in this time period, the connection is
-closed.  The default is 60.
-.TP
-.B max_connections <number>
-This specifies the maximum number of clients that can be connected to mpd.  The
-default is 5.
-.TP
-.B max_playlist_length <number>
-This specifies the maximum number of songs that can be in the playlist.  The
-default is 16384.
-.TP
-.B max_command_list_size <size in KiB>
-This specifies the maximum size a command list can be.  The default is 2048.
-.TP
-.B max_output_buffer_size <size in KiB>
-This specifies the maximum size of the output buffer to a client.  The default
-is 8192.
-.TP
 .B filesystem_charset <charset>
 This specifies the character set used for the filesystem.  A list of supported
 character sets can be obtained by running "iconv \-l".  The default is
 determined from the locale when the db was originally created.
 .TP
-.B id3v1_encoding <charset>
-This specifies the character set which ID3v1 tags are encoded in.  A list of
-supported character sets can be obtained by running "iconv \-l".  The default is
-to let libid3tag convert them (from ISO-8859-1, as the standard specifies) and
-do no additional conversion.
-.TP
 .B gapless_mp3_playback <yes or no>
 This specifies whether to support gapless playback of MP3s which have the
 necessary headers.  Useful if your MP3s have headers with incorrect
@@ -254,17 +168,6 @@ MP3 playback.
 This specifies whether relative or absolute paths for song filenames are used
 when saving playlists.  The default is "no".
 .TP
-.B metadata_to_use <tags>
-This specifies the tag types that will be scanned for and made available to
-clients.  Note that you must recreate (not update) your database for changes to
-this parameter to take effect.  Possible values are artist, album, title,
-track, name, genre, date, composer, performer, comment, disc,
-musicbrainz_artistid, musicbrainz_albumid, musicbrainz_albumartistid,
-musicbrainz_trackid.  Multiple tags may be specified as a comma separated list.
-An example value is "artist,album,title,track".  The special value "none" may
-be used alone to disable all metadata.  The default is to use all known tag
-types except for comments and those starting with "musicbrainz".
-.TP
 .B auto_update <yes or no>
 This specifies the whether to support automatic update of music database when
 files are changed in music_directory. The default is to disable autoupdate
@@ -274,16 +177,6 @@ of database.
 Limit the depth of the directories being watched, 0 means only watch
 the music directory itself.  There is no limit by default.
 .TP
-.B despotify_user <name>
-This specifies the user to use when logging in to Spotify using the despotify plugins.
-.TP
-.B despotify_password <name>
-This specifies the password to use when logging in to Spotify using the despotify plugins.
-.TP
-.B despotify_high_bitrate <yes or no>
-This specifies if the requested bitrate for Spotify should be high or not. Higher sounds
-better but requires more processing and higher bandwidth. Default is yes.
-.TP
 .SH REQUIRED AUDIO OUTPUT PARAMETERS
 .TP
 .B type <type>
@@ -333,11 +226,6 @@ probably only useful if your alsa device has more than one
 identically\-named mixer control.  The default is "0".  Use "amixer
 scontrols" to see the list of controls with their indexes.
 .TP
-.B use_mmap <yes or no>
-Setting this allows you to use memory-mapped I/O.  Certain hardware setups may
-benefit from this, but most do not.  Most users do not need to set this.  The
-default is to not use memory-mapped I/O.
-.TP
 .B auto_resample <yes or no>
 Setting this to "no" disables ALSA's software resampling, if the
 hardware does not support a specific sample rate.  This lets MPD do
--- a/doc/mpdconf.example
+++ b/doc/mpdconf.example
@@ -75,7 +75,8 @@
 #
 # This setting sets the address for the daemon to listen on. Careful attention
 # should be paid if this is assigned to anything other then the default, any.
-# This setting can deny access to control of the daemon.
+# This setting can deny access to control of the daemon. Not effective if
+# systemd socket activiation is in use.
 #
 # For network
 #bind_to_address		"any"
@@ -115,7 +116,7 @@
 #
 # This setting defines a list of tag types that will be extracted during the
 # audio file discovery process. The complete list of possible values can be
-# found in the mpd.conf man page.
+# found in the user manual.
 #metadata_to_use	"artist,album,title,track,name,genre,date,composer,performer,disc"
 #
 # This setting enables automatic update of MPD's database when files in 
@@ -164,7 +165,7 @@
 # Permissions #################################################################
 #
 # If this setting is set, MPD will require password authorization. The password
-# can setting can be specified multiple times for different password profiles.
+# setting can be specified multiple times for different password profiles.
 #
 #password                        "password@read,add,control,admin"
 #
@@ -231,7 +232,7 @@ input {
 #
 #audio_output {
 #	type		"shout"
-#	encoding	"ogg"			# optional
+#	encoder		"vorbis"		# optional
 #	name		"My Shout Stream"
 #	host		"localhost"
 #	port		"8000"
@@ -304,6 +305,23 @@ input {
 ##	device		"Digital Audio (S/PDIF) (High Definition Audio Device)" # optional
 #}
 #
+# An example of an sndio output.
+#
+#audio_output {
+#	type		"sndio"
+#	name		"sndio output"
+#	mixer_type	"software"
+#}
+#
+# An example of an OS X output:
+#
+#audio_output {
+#	type		"osx"
+#	name		"My OS X Device"
+##	device		"Built-in Output"	# optional
+##	channel_map      "-1,-1,0,1"	# optional
+#}
+#
 ## Example "pipe" output:
 #
 #audio_output {
@@ -325,13 +343,6 @@ input {
 #	mixer_type      "none"			# optional
 #}
 #
-# If MPD has been compiled with libsamplerate support, this setting specifies 
-# the sample rate converter to use.  Possible values can be found in the 
-# mpd.conf man page or the libsamplerate documentation. By default, this is
-# setting is disabled.
-#
-#samplerate_converter		"Fastest Sinc Interpolator"
-#
 ###############################################################################


@@ -373,38 +384,6 @@ input {
 #
 ###############################################################################

-
-# MPD Internal Buffering ######################################################
-#
-# This setting adjusts the size of internal decoded audio buffering. Changing
-# this may have undesired effects. Don't change this if you don't know what you
-# are doing.
-#
-#audio_buffer_size		"4096"
-#
-# This setting controls the percentage of the buffer which is filled before 
-# beginning to play. Increasing this reduces the chance of audio file skipping, 
-# at the cost of increased time prior to audio playback.
-#
-#buffer_before_play		"10%"
-#
-###############################################################################
-
-
-# Resource Limitations ########################################################
-#
-# These settings are various limitations to prevent MPD from using too many
-# resources. Generally, these settings should be minimized to prevent security
-# risks, depending on the operating resources.
-#
-#connection_timeout		"60"
-#max_connections		"10"
-#max_playlist_length		"16384"
-#max_command_list_size		"2048"
-#max_output_buffer_size		"8192"
-#
-###############################################################################
-
 # Character Encoding ##########################################################
 #
 # If file or directory names do not display correctly for your locale then you 
@@ -412,34 +391,4 @@ input {
 #
 #filesystem_charset		"UTF-8"
 #
-# This setting controls the encoding that ID3v1 tags should be converted from.
-#
-#id3v1_encoding			"ISO-8859-1"
-#
 ###############################################################################
-
-
-# SIDPlay decoder #############################################################
-#
-# songlength_database:
-#  Location of your songlengths file, as distributed with the HVSC.
-#  The sidplay plugin checks this for matching MD5 fingerprints.
-#  See http://www.c64.org/HVSC/DOCUMENTS/Songlengths.faq
-#
-# default_songlength:
-#  This is the default playing time in seconds for songs not in the
-#  songlength database, or in case you're not using a database.
-#  A value of 0 means play indefinitely.
-#
-# filter:
-#  Turns the SID filter emulation on or off.
-#
-#decoder {
-#	plugin			"sidplay"
-#	songlength_database	"/media/C64Music/DOCUMENTS/Songlengths.txt"
-#	default_songlength	"120"
-#	filter "true"
-#}
-#
-###############################################################################
-
--- a/doc/protocol.xml
+++ b/doc/protocol.xml
@@ -1,21 +1,22 @@
 <?xml version='1.0' encoding="utf-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-               "docbook/dtd/xml/4.2/docbookx.dtd">
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+                      "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+
 <book>
  <title>The Music Player Daemon protocol</title>

-  <chapter>
+  <chapter id="syntax">
    <title>General protocol syntax</title>

    <section>
      <title>Protocol overview</title>

      <para>
-        The MPD command protocol exchanges line-based text records
-        between client and server over TCP.  Once the client is
-        connected to the server, they conduct a conversation until the
-        client closes the connection. The conversation flow is always
-        initiated by the client.
+        The <application>MPD</application> command protocol exchanges
+        line-based text records between client and server over TCP.
+        Once the client is connected to the server, they conduct a
+        conversation until the client closes the connection. The
+        conversation flow is always initiated by the client.
      </para>

      <para>
@@ -38,7 +39,7 @@
      </para>
    </section>

-    <section>
+    <section id="request_syntax">
      <title>Requests</title>

      <cmdsynopsis>
@@ -65,12 +66,12 @@
        <function>strcpy</function> just fine with UTF-8 encoded
        strings. For example: <returnvalue>OK</returnvalue> encoded in
        UTF-8 is simply <returnvalue>OK</returnvalue>.  For more
-        information on UTF=8:
-        http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8)
+        information on UTF-8:
+        <ulink url="http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8"/>)
      </para>
    </section>

-    <section>
+    <section id="response_syntax">
      <title>Responses</title>

      <para>
@@ -79,7 +80,7 @@
        denote the end of command execution.
      </para>

-      <section>
+      <section id="failure_response_syntax">
        <title>Failure responses</title>

        <para>
@@ -188,7 +189,7 @@
      </para>
    </section>

-    <section>
+    <section id="range_syntax">
      <title>Ranges</title>

      <para>
@@ -201,23 +202,42 @@
        omitted, then the maximum possible value is assumed.
      </para>
    </section>
+
+    <section id="tags">
+      <title>Tags</title>
+
+      <para>
+        The following tags are supported by
+        <application>MPD</application>:
+      </para>
+
+      <xi:include href="include/tags.xml"
+                  xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+      <para>
+        There can be multiple values for some of these tags.  For
+        example, <application>MPD</application> may return multiple
+        lines with a <varname>performer</varname> tag.  A tag value is
+        a UTF-8 string.
+      </para>
+    </section>
  </chapter>

-  <chapter>
+  <chapter id="recipes">
    <title>Recipes</title>

-    <section>
+    <section id="queuing_recipe">
      <title>Queuing</title>

      <para>
-        Often, users run MPD with "<link
+        Often, users run <application>MPD</application> with "<link
        linkend="command_random">random</link>" enabled, but want to
        be able to insert songs "before" the rest of the playlist.
        That is commonly called "queuing".
      </para>

      <para>
-        MPD implements this by allowing the client to specify a
+        <application>MPD</application> implements this by allowing the client to specify a
        "priority" for each song in the playlist (commands <link
        linkend="command_prio"><command>prio</command></link> and
        <link
@@ -227,24 +247,26 @@
      </para>

      <para>
-        In "random" mode, MPD maintains an internal randomized
-        sequence of songs.  In this sequence, songs with a higher
-        priority come first, and all songs with the same priority are
-        shuffled (by default, all songs are shuffled, because all have
-        the same priority "0").  When you increase the priority of a
-        song, it is moved to the front of the sequence according to
-        its new priority, but always after the current one.  A song
-        that has been played already (it's "before" the current song
-        in that sequence) will only be scheduled for repeated playback
-        if its priority has become bigger than the priority of the
-        current song.  Decreasing the priority of a song will moved it
-        farther to the end of the sequence.  Changing the priority of
-        the current song has no effect on the sequence.
+        In "random" mode, <application>MPD</application> maintains an
+        internal randomized sequence of songs.  In this sequence,
+        songs with a higher priority come first, and all songs with
+        the same priority are shuffled (by default, all songs are
+        shuffled, because all have the same priority "0").  When you
+        increase the priority of a song, it is moved to the front of
+        the sequence according to its new priority, but always after
+        the current one.  A song that has been played already (it's
+        "before" the current song in that sequence) will only be
+        scheduled for repeated playback if its priority has become
+        bigger than the priority of the current song.  Decreasing the
+        priority of a song will move it farther to the end of the
+        sequence.  Changing the priority of the current song has no
+        effect on the sequence.  During playback, a song's priority is
+        reset to zero.
      </para>
    </section>
  </chapter>

-  <chapter>
+  <chapter id="command_reference">
    <title>Command reference</title>

    <note>
@@ -255,12 +277,12 @@
        commands using song ids should be used instead of the commands
        that manipulate and control playback based on playlist
        position. Using song ids is a safer method when multiple
-        clients are interacting with MPD.
+        clients are interacting with <application>MPD</application>.
      </para>
    </note>

-    <section>
-      <title>Querying MPD's status</title>
+    <section id="status_commands">
+      <title>Querying <application>MPD</application>'s status</title>

      <variablelist>
        <varlistentry id="command_clearerror">
@@ -298,12 +320,14 @@
          </term>
          <listitem>
            <para>
-              <footnote id="since_0_14"><simpara>Introduced with MPD 0.14</simpara></footnote>
+              <footnote id="since_0_14"><simpara>Introduced with
+              <application>MPD</application> 0.14</simpara></footnote>
              Waits until there is a noteworthy change in one or more
-              of MPD's subsystems.  As soon as there is one, it lists
-              all changed systems in a line in the format
-              <returnvalue>changed: SUBSYSTEM</returnvalue>, where
-              SUBSYSTEM is one of the following:
+              of <application>MPD</application>'s subsystems.  As soon
+              as there is one, it lists all changed systems in a line
+              in the format <returnvalue>changed:
+              SUBSYSTEM</returnvalue>, where SUBSYSTEM is one of the
+              following:
            </para>
            <itemizedlist>
              <listitem>
@@ -385,14 +409,15 @@
              to wait for events as long as mpd runs.  The
              <command>idle</command> command can be canceled by
              sending the command <command>noidle</command> (no other
-              commands are allowed). MPD will then leave
-              <command>idle</command> mode and print results
-              immediately; might be empty at this time.
+              commands are allowed). <application>MPD</application>
+              will then leave <command>idle</command> mode and print
+              results immediately; might be empty at this time.
            </para>
            <para>
-              If the optional <varname>SUBSYSTEMS</varname> argument is used,
-              MPD will only send notifications when something changed in
-              one of the specified subsytems.
+              If the optional <varname>SUBSYSTEMS</varname> argument
+              is used, <application>MPD</application> will only send
+              notifications when something changed in one of the
+              specified subsytems.
            </para>
          </listitem>
        </varlistentry>
@@ -429,7 +454,7 @@
              <listitem>
               <para>
                <varname>single</varname>:
-                <footnote id="since_0_15"><simpara>Introduced with MPD 0.15</simpara></footnote>
+                <footnote id="since_0_15"><simpara>Introduced with <application>MPD</application> 0.15</simpara></footnote>
                <returnvalue>0 or 1</returnvalue>
               </para>
              </listitem>
@@ -504,13 +529,22 @@
              <listitem>
                <para>
                  <varname>elapsed</varname>:
-                  <footnote id="since_0_16"><simpara>Introduced with MPD 0.16</simpara></footnote>
+                  <footnote id="since_0_16"><simpara>Introduced with <application>MPD</application> 0.16</simpara></footnote>
                  <returnvalue>
                    Total time elapsed within the current song, but
                    with higher resolution.
                  </returnvalue>
                </para>
              </listitem>
+              <listitem>
+                <para>
+                  <varname>duration</varname>:
+                  <footnote id="since_0_20"><simpara>Introduced with <application>MPD</application> 0.20</simpara></footnote>
+                  <returnvalue>
+                    Duration of the current song in seconds.
+                  </returnvalue>
+                </para>
+              </listitem>
              <listitem>
                <para>
                  <varname>bitrate</varname>:
@@ -576,7 +610,12 @@
              </listitem>
              <listitem>
                <para>
-                  <varname>songs</varname>: number of albums
+                  <varname>albums</varname>: number of albums
+                </para>
+              </listitem>
+              <listitem>
+                <para>
+                  <varname>songs</varname>: number of songs
                </para>
              </listitem>
              <listitem>
@@ -607,7 +646,7 @@
      </variablelist>
    </section>

-    <section>
+    <section id="playback_option_commands">
      <title>Playback options</title>

      <variablelist>
@@ -740,7 +779,7 @@
              <parameter>album</parameter>,
              <parameter>auto</parameter><footnote
                        id="replay_gain_auto_since_0_16">
-                <simpara>added in MPD 0.16</simpara>
+                <simpara>added in <application>MPD</application> 0.16</simpara>
              </footnote>.
            </para>
            <para>
@@ -790,7 +829,7 @@
      </variablelist>
    </section>

-    <section>
+    <section id="playback_commands">
      <title>Controlling playback</title>

      <variablelist>
@@ -877,8 +916,8 @@
          <listitem>
            <para>
              Seeks to the position <varname>TIME</varname> (in
-              seconds) of entry <varname>SONGPOS</varname> in the
-              playlist.
+              seconds; fractions allowed) of entry
+              <varname>SONGPOS</varname> in the playlist.
            </para>
          </listitem>
        </varlistentry>
@@ -893,7 +932,8 @@
          <listitem>
            <para>
              Seeks to the position <varname>TIME</varname> (in
-              seconds) of song <varname>SONGID</varname>.
+              seconds; fractions allowed) of song
+              <varname>SONGID</varname>.
            </para>
          </listitem>
        </varlistentry>
@@ -907,9 +947,10 @@
          </term>
          <listitem>
            <para>
-              Seeks to the position <varname>TIME</varname> within the
-              current song.  If prefixed by '+' or '-', then the time
-              is relative to the current playing position.
+              Seeks to the position <varname>TIME</varname> (in
+              seconds; fractions allowed) within the current song.  If
+              prefixed by '+' or '-', then the time is relative to the
+              current playing position.
            </para>
          </listitem>
        </varlistentry>
@@ -929,7 +970,7 @@
      </variablelist>
    </section>

-    <section>
+    <section id="queue">
      <title>The current playlist</title>

      <variablelist>
@@ -1030,7 +1071,7 @@ OK
              at <varname>START:END</varname> to <varname>TO</varname>
              in the playlist.
              <footnote id="range_since_0_15">
-                <simpara>Ranges are supported since MPD 0.15</simpara>
+                <simpara>Ranges are supported since <application>MPD</application> 0.15</simpara>
              </footnote>
            </para>
          </listitem>
@@ -1130,7 +1171,7 @@ OK
          </term>
          <listitem>
            <para>
-              Searches case-sensitively for partial matches in the
+              Searches case-insensitively for partial matches in the
              current playlist.
            </para>
          </listitem>
@@ -1140,12 +1181,15 @@ OK
            <cmdsynopsis>
              <command>plchanges</command>
              <arg choice="req"><replaceable>VERSION</replaceable></arg>
+              <arg><replaceable>START:END</replaceable></arg>
            </cmdsynopsis>
          </term>
          <listitem>
            <para>
              Displays changed songs currently in the playlist since
-              <varname>VERSION</varname>.
+              <varname>VERSION</varname>.  Start and end positions may
+              be given to limit the output to changes in the given
+              range.
            </para>
            <para>
              To detect songs that were deleted at the end of the
@@ -1158,6 +1202,7 @@ OK
            <cmdsynopsis>
              <command>plchangesposid</command>
              <arg choice="req"><replaceable>VERSION</replaceable></arg>
+              <arg><replaceable>START:END</replaceable></arg>
            </cmdsynopsis>
          </term>
          <listitem>
@@ -1213,6 +1258,28 @@ OK
          </listitem>
        </varlistentry>

+        <varlistentry id="command_rangeid">
+          <term>
+            <cmdsynopsis>
+              <command>rangeid</command>
+              <arg choice="req"><replaceable>ID</replaceable></arg>
+              <arg choice="req"><replaceable>START:END</replaceable></arg>
+            </cmdsynopsis>
+          </term>
+          <listitem>
+            <para>
+              <footnote id="since_0_19"><simpara>Since <application>MPD</application>
+              0.19</simpara></footnote> Specifies the portion of the
+              song that shall be played.  <varname>START</varname> and
+              <varname>END</varname> are offsets in seconds
+              (fractional seconds allowed); both are optional.
+              Omitting both (i.e. sending just ":") means "remove the
+              range, play everything".  A song that is currently
+              playing cannot be manipulated this way.
+            </para>
+          </listitem>
+        </varlistentry>
+
        <varlistentry id="command_shuffle">
          <term>
            <cmdsynopsis>
@@ -1258,10 +1325,48 @@ OK
            </para>
          </listitem>
        </varlistentry>
+
+        <varlistentry id="command_addtagid">
+          <term>
+            <cmdsynopsis>
+              <command>addtagid</command>
+              <arg choice="req"><replaceable>SONGID</replaceable></arg>
+              <arg choice="req"><replaceable>TAG</replaceable></arg>
+              <arg choice="req"><replaceable>VALUE</replaceable></arg>
+            </cmdsynopsis>
+          </term>
+          <listitem>
+            <para>
+              Adds a tag to the specified song.  Editing song tags is
+              only possible for remote songs.  This change is
+              volatile: it may be overwritten by tags received from
+              the server, and the data is gone when the song gets
+              removed from the queue.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry id="command_cleartagid">
+          <term>
+            <cmdsynopsis>
+              <command>cleartagid</command>
+              <arg choice="req"><replaceable>SONGID</replaceable></arg>
+              <arg choice="opt"><replaceable>TAG</replaceable></arg>
+            </cmdsynopsis>
+          </term>
+          <listitem>
+            <para>
+              Removes tags from the specified song.  If
+              <varname>TAG</varname> is not specified, then all tag
+              values will be removed.  Editing song tags is only
+              possible for remote songs.
+            </para>
+          </listitem>
+        </varlistentry>
      </variablelist>
    </section>

-    <section>
+    <section id="playlist_files">
      <title>Stored playlists</title>

      <para>
@@ -1394,15 +1499,15 @@ OK
            <cmdsynopsis>
              <command>playlistmove</command>
              <arg choice="req"><replaceable>NAME</replaceable></arg>
-              <arg choice="req"><replaceable>SONGID</replaceable></arg>
-              <arg choice="req"><replaceable>SONGPOS</replaceable></arg>
+              <arg choice="req"><replaceable>FROM</replaceable></arg>
+              <arg choice="req"><replaceable>TO</replaceable></arg>
            </cmdsynopsis>
          </term>
          <listitem>
            <para>
-              Moves <varname>SONGID</varname> in the playlist
-              <filename>NAME.m3u</filename> to the position
-              <varname>SONGPOS</varname>.
+              Moves the song at position <varname>FROM</varname> in
+              the playlist <filename>NAME.m3u</filename> to the
+              position <varname>TO</varname>.
            </para>
          </listitem>
        </varlistentry>
@@ -1451,16 +1556,20 @@ OK
      </variablelist>
    </section>

-    <section>
+    <section id="database">
      <title>The music database</title>

      <variablelist>
+
        <varlistentry id="command_count">
          <term>
            <cmdsynopsis>
              <command>count</command>
              <arg choice="req"><replaceable>TAG</replaceable></arg>
              <arg choice="req"><replaceable>NEEDLE</replaceable></arg>
+              <arg choice="opt"><replaceable>...</replaceable></arg>
+              <arg choice="opt">group</arg>
+              <arg choice="opt"><replaceable>GROUPTYPE</replaceable></arg>
            </cmdsynopsis>
          </term>
          <listitem>
@@ -1468,8 +1577,15 @@ OK
              Counts the number of songs and their total playtime in
              the db matching <varname>TAG</varname> exactly.
            </para>
+            <para>
+              The <parameter>group</parameter> keyword may be used to
+              group the results by a tag.  The following prints
+              per-artist counts:
+            </para>
+            <programlisting>count group artist</programlisting>
          </listitem>
        </varlistentry>
+
        <varlistentry id="command_find">
          <term>
            <cmdsynopsis>
@@ -1477,21 +1593,57 @@ OK
              <arg choice="req"><replaceable>TYPE</replaceable></arg>
              <arg choice="req"><replaceable>WHAT</replaceable></arg>
              <arg choice="opt"><replaceable>...</replaceable></arg>
+              <arg choice="opt">window <replaceable>START</replaceable>:<replaceable>END</replaceable></arg>
            </cmdsynopsis>
          </term>
          <listitem>
            <para>
              Finds songs in the db that are exactly
              <varname>WHAT</varname>.  <varname>TYPE</varname> can
-              be any tag supported by MPD, or one of the three special
-              parameters — <parameter>file</parameter> to search by
+              be any tag supported by <application>MPD</application>, or one of the special
+              parameters:
+            </para>

-              full path (relative to the music directory),
-              <parameter>in</parameter> to restrict the search to
-              songs in the given directory (also relative to the music
-              directory) and
-              <parameter>any</parameter> to match against all
-              available tags.  <varname>WHAT</varname> is what to find.
+            <itemizedlist>
+              <listitem>
+                <para>
+                  <parameter>any</parameter> checks all tag values
+                </para>
+              </listitem>
+
+              <listitem>
+                <para>
+                  <parameter>file</parameter> checks the full path
+                  (relative to the music directory)
+                </para>
+              </listitem>
+
+              <listitem>
+                <para>
+                  <parameter>base</parameter> restricts the search to
+                  songs in the given directory (also relative to the
+                  music directory)
+                </para>
+              </listitem>
+
+              <listitem>
+                <para>
+                  <parameter>modified-since</parameter> compares the
+                  file's time stamp with the given value (ISO 8601 or
+                  UNIX time stamp)
+                </para>
+              </listitem>
+            </itemizedlist>
+
+            <para>
+              <varname>WHAT</varname> is what to find.
+            </para>
+
+            <para>
+              <varname>window</varname> can be used to query only a
+              portion of the real response.  The parameter is two
+              zero-based record numbers; a start number and an end
+              number.
            </para>
          </listitem>
        </varlistentry>
@@ -1512,27 +1664,43 @@ OK
            </para>
          </listitem>
        </varlistentry>
+
        <varlistentry id="command_list">
          <term>
            <cmdsynopsis>
              <command>list</command>
              <arg choice="req"><replaceable>TYPE</replaceable></arg>
-              <arg><replaceable>ARTIST</replaceable></arg>
+              <arg choice="opt"><replaceable>FILTERTYPE</replaceable></arg>
+              <arg choice="opt"><replaceable>FILTERWHAT</replaceable></arg>
+              <arg choice="opt"><replaceable>...</replaceable></arg>
+              <arg choice="opt">group</arg>
+              <arg choice="opt"><replaceable>GROUPTYPE</replaceable></arg>
+              <arg choice="opt"><replaceable>...</replaceable></arg>
            </cmdsynopsis>
          </term>
          <listitem>
            <para>
-              Lists all tags of the specified type.
-              <varname>TYPE</varname> can be any tag supported by MPD or
+              Lists unique tags values of the specified type.
+              <varname>TYPE</varname> can be any tag supported by
+              <application>MPD</application> or
              <parameter>file</parameter>.
            </para>
            <para>
-              <varname>ARTIST</varname> is an optional parameter when
-              type is album, this specifies to list albums by an
-              artist.
+              Additional arguments may specify a filter like the one
+              in the <link
+              linkend="command_find"><command>find</command>
+              command</link>.
            </para>
+            <para>
+              The <parameter>group</parameter> keyword may be used
+              (repeatedly) to group the results by one or more tags.
+              The following example lists all album names,
+              grouped by their respective (album) artist:
+            </para>
+            <programlisting>list album group albumartist</programlisting>
          </listitem>
        </varlistentry>
+
        <varlistentry id="command_listall">
          <term>
            <cmdsynopsis>
@@ -1545,6 +1713,14 @@ OK
              Lists all songs and directories in
              <varname>URI</varname>.
            </para>
+            <para>
+              Do not use this command.  Do not manage a client-side
+              copy of <application>MPD</application>'s database.  That
+              is fragile and adds huge overhead.  It will break with
+              large databases.  Instead, query
+              <application>MPD</application> whenever you need
+              something.
+            </para>
          </listitem>
        </varlistentry>
        <varlistentry id="command_listallinfo">
@@ -1560,6 +1736,40 @@ OK
              returns metadata info in the same format as
              <command>lsinfo</command>.
            </para>
+            <para>
+              Do not use this command.  Do not manage a client-side
+              copy of <application>MPD</application>'s database.  That
+              is fragile and adds huge overhead.  It will break with
+              large databases.  Instead, query
+              <application>MPD</application> whenever you need
+              something.
+            </para>
+          </listitem>
+        </varlistentry>
+        <varlistentry id="command_listfiles">
+          <term>
+            <cmdsynopsis>
+              <command>listfiles</command>
+              <arg><replaceable>URI</replaceable></arg>
+            </cmdsynopsis>
+          </term>
+          <listitem>
+            <para>
+              Lists the contents of the directory
+              <varname>URI</varname>, including files are not
+              recognized by <application>MPD</application>.
+              <varname>URI</varname> can be a path relative to the
+              music directory or an URI understood by one of the
+              storage plugins.  The response contains at least one
+              line for each directory entry with the prefix "file: "
+              or "directory: ", and may be followed by file attributes
+              such as "Last-Modified" and "size".
+            </para>
+            <para>
+              For example, "smb://SERVER" returns a list of all shares
+              on the given SMB/CIFS server; "nfs://servername/path"
+              obtains a directory listing from the NFS server.
+            </para>
          </listitem>
        </varlistentry>
        <varlistentry id="command_lsinfo">
@@ -1579,10 +1789,14 @@ OK
              the list of stored playlists.  This behavior is
              deprecated; use "listplaylists" instead.
            </para>
+            <para>
+              This command may be used to list metadata of remote
+              files (e.g. URI beginning with "http://" or "smb://").
+            </para>
            <para>
              Clients that are connected via UNIX domain socket may
              use this command to read the tags of an arbitrary local
-              file (URI beginning with "file:///").
+              file (URI is an absolute path).
            </para>
          </listitem>
        </varlistentry>
@@ -1597,8 +1811,11 @@ OK
            <para>
              Read "comments" (i.e. key-value pairs) from the file
              specified by "URI".  This "URI" can be a path relative
-              to the music directory or a URL in the form
-              "file:///foo/bar.ogg".
+              to the music directory or an absolute path.
+            </para>
+            <para>
+              This command may be used to list metadata of remote
+              files (e.g. URI beginning with "http://" or "smb://").
            </para>
            <para>
              The response consists of lines in the form "KEY: VALUE".
@@ -1619,6 +1836,7 @@ OK
              <arg choice="req"><replaceable>TYPE</replaceable></arg>
              <arg choice="req"><replaceable>WHAT</replaceable></arg>
              <arg choice="opt"><replaceable>...</replaceable></arg>
+              <arg choice="opt">window <replaceable>START</replaceable>:<replaceable>END</replaceable></arg>
            </cmdsynopsis>
          </term>
          <listitem>
@@ -1717,22 +1935,131 @@ OK
      </variablelist>
    </section>

-    <section>
+    <section id="mount">
+      <title>Mounts and neighbors</title>
+
+      <para>
+        A "storage" provides access to files in a directory tree.  The
+        most basic storage plugin is the "local" storage plugin which
+        accesses the local file system, and there are plugins to
+        access NFS and SMB servers.
+      </para>
+
+      <para>
+        Multiple storages can be "mounted" together, similar to the
+        <application>mount</application> command on many operating
+        systems, but without cooperation from the kernel.  No
+        superuser privileges are necessary, beause this mapping exists
+        only inside the <application>MPD</application> process
+      </para>
+
+      <variablelist>
+
+        <varlistentry id="command_mount">
+          <term>
+            <cmdsynopsis>
+              <command>mount</command>
+              <arg choice="req"><replaceable>PATH</replaceable></arg>
+              <arg choice="req"><replaceable>URI</replaceable></arg>
+            </cmdsynopsis>
+          </term>
+
+          <listitem>
+            <para>
+              Mount the specified remote storage URI at the given
+              path.  Example:
+            </para>
+
+            <programlisting>mount foo nfs://192.168.1.4/export/mp3</programlisting>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry id="command_umount">
+          <term>
+            <cmdsynopsis>
+              <command>unmount</command>
+              <arg choice="req"><replaceable>PATH</replaceable></arg>
+            </cmdsynopsis>
+          </term>
+
+          <listitem>
+            <para>
+              Unmounts the specified path.  Example:
+            </para>
+
+            <programlisting>unmount foo</programlisting>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry id="command_listmounts">
+          <term>
+            <cmdsynopsis>
+              <command>listmounts</command>
+            </cmdsynopsis>
+          </term>
+
+          <listitem>
+            <para>
+              Queries a list of all mounts.  By default, this contains
+              just the configured <varname>music_directory</varname>.
+              Example:
+            </para>
+
+            <programlisting>listmounts
+mount: 
+storage: /home/foo/music
+mount: foo
+storage: nfs://192.168.1.4/export/mp3
+OK
+</programlisting>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry id="command_listneighbors">
+          <term>
+            <cmdsynopsis>
+              <command>listneighbors</command>
+            </cmdsynopsis>
+          </term>
+
+          <listitem>
+            <para>
+              Queries a list of "neighbors" (e.g. accessible file
+              servers on the local net).  Items on that list may be
+              used with the <link
+              linkend="command_mount"><command>mount</command></link>
+              command.  Example:
+            </para>
+
+            <programlisting>listneighbors
+neighbor: smb://FOO
+name: FOO (Samba 4.1.11-Debian)
+OK
+</programlisting>
+          </listitem>
+        </varlistentry>
+
+      </variablelist>
+    </section>
+
+    <section id="stickers">
      <title>Stickers</title>

      <para>
        "Stickers"<footnoteref linkend="since_0_15"/> are pieces of
-        information attached to existing MPD objects (e.g. song files,
+        information attached to existing
+        <application>MPD</application> objects (e.g. song files,
        directories, albums).  Clients can create arbitrary name/value
-        pairs.  MPD itself does not assume any special meaning in
-        them.
+        pairs.  <application>MPD</application> itself does not assume
+        any special meaning in them.
      </para>

      <para>
        The goal is to allow clients to share additional (possibly
        dynamic) information about songs, which is neither stored on
        the client (not available to other clients), nor stored in the
-        song files (MPD has no write access).
+        song files (<application>MPD</application> has no write
+        access).
      </para>

      <para>
@@ -1834,10 +2161,34 @@ OK
            </para>
          </listitem>
        </varlistentry>
+
+        <varlistentry id="command_sticker_find_equals">
+          <term>
+            <cmdsynopsis>
+              <command>sticker</command>
+              <arg choice="plain">find</arg>
+              <arg choice="req"><replaceable>TYPE</replaceable></arg>
+              <arg choice="req"><replaceable>URI</replaceable></arg>
+              <arg choice="req"><replaceable>NAME</replaceable></arg>
+              <arg choice="plain">=</arg>
+              <arg choice="req"><replaceable>VALUE</replaceable></arg>
+            </cmdsynopsis>
+          </term>
+          <listitem>
+            <para>
+              Searches for stickers with the given value.
+            </para>
+
+            <para>
+              Other supported operators are:
+              "<function>&lt;</function>", "<function>&gt;</function>"
+            </para>
+          </listitem>
+        </varlistentry>
      </variablelist>
    </section>

-    <section>
+    <section id="connection_commands">
      <title>Connection settings</title>

      <variablelist>
@@ -1849,7 +2200,8 @@ OK
          </term>
          <listitem>
            <para>
-              Closes the connection to MPD.  MPD will try to send the
+              Closes the connection to <application>MPD</application>.
+              <application>MPD</application> will try to send the
              remaining output buffer before it actually closes the
              connection, but that cannot be guaranteed.  This command
              will not generate a response.
@@ -1864,7 +2216,7 @@ OK
          </term>
          <listitem>
            <para>
-              Kills MPD.
+              Kills <application>MPD</application>.
            </para>
          </listitem>
        </varlistentry>
@@ -1898,7 +2250,7 @@ OK
      </variablelist>
    </section>

-    <section>
+    <section id="output_commands">
      <title>Audio output devices</title>

      <variablelist>
@@ -1952,12 +2304,38 @@ OK
            <para>
              Shows information about all outputs.
            </para>
+            <screen>
+outputid: 0
+outputname: My ALSA Device
+outputenabled: 0
+OK
+            </screen>
+            <para>
+              Return information:
+            </para>
+            <itemizedlist>
+              <listitem>
+                <para>
+                  <varname>outputid</varname>: ID of the output. May change between executions
+                </para>
+              </listitem>
+              <listitem>
+                <para>
+                  <varname>outputname</varname>: Name of the output. It can be any.
+                </para>
+              </listitem>
+              <listitem>
+                <para>
+                  <varname>outputenabled</varname>: Status of the output. 0 if disabled, 1 if enabled.
+                </para>
+              </listitem>
+            </itemizedlist>
          </listitem>
        </varlistentry>
      </variablelist>
    </section>

-    <section>
+    <section id="reflection_commands">
      <title>Reflection</title>

      <variablelist>
@@ -2073,7 +2451,7 @@ suffix: mpc</programlisting>
      </variablelist>
    </section>

-    <section>
+    <section id="client_to_client">
      <title>Client to client</title>

      <para>
--- a/doc/user.xml
+++ b/doc/user.xml
--- a/m4/ax_append_compile_flags.m4
+++ b/m4/ax_append_compile_flags.m4
@@ -4,7 +4,7 @@
 #
 # SYNOPSIS
 #
-#   AX_APPEND_COMPILE_FLAGS([FLAG1 FLAG2 ...], [FLAGS-VARIABLE], [EXTRA-FLAGS])
+#   AX_APPEND_COMPILE_FLAGS([FLAG1 FLAG2 ...], [FLAGS-VARIABLE], [EXTRA-FLAGS], [INPUT])
 #
 # DESCRIPTION
 #
@@ -20,6 +20,8 @@
 #   the flags: "CFLAGS EXTRA-FLAGS FLAG".  This can for example be used to
 #   force the compiler to issue an error when a bad flag is given.
 #
+#   INPUT gives an alternative input source to AC_COMPILE_IFELSE.
+#
 #   NOTE: This macro depends on the AX_APPEND_FLAG and
 #   AX_CHECK_COMPILE_FLAG. Please keep this macro in sync with
 #   AX_APPEND_LINK_FLAGS.
@@ -54,10 +56,12 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.

-#serial 2
+#serial 5

 AC_DEFUN([AX_APPEND_COMPILE_FLAGS],
-[for flag in $1; do
-  AX_CHECK_COMPILE_FLAG([$flag], [AX_APPEND_FLAG([$flag], [$2])], [], [$3])
+[AX_REQUIRE_DEFINED([AX_CHECK_COMPILE_FLAG])
+AX_REQUIRE_DEFINED([AX_APPEND_FLAG])
+for flag in $1; do
+  AX_CHECK_COMPILE_FLAG([$flag], [AX_APPEND_FLAG([$flag], [$2])], [], [$3], [$4])
 done
 ])dnl AX_APPEND_COMPILE_FLAGS
--- a/m4/ax_append_flag.m4
+++ b/m4/ax_append_flag.m4
@@ -49,21 +49,23 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.

-#serial 2
+#serial 6

 AC_DEFUN([AX_APPEND_FLAG],
-[AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX
-AS_VAR_PUSHDEF([FLAGS], [m4_default($2,_AC_LANG_PREFIX[FLAGS])])dnl
-AS_VAR_SET_IF(FLAGS,
-  [case " AS_VAR_GET(FLAGS) " in
-    *" $1 "*)
-      AC_RUN_LOG([: FLAGS already contains $1])
-      ;;
-    *)
-      AC_RUN_LOG([: FLAGS="$FLAGS $1"])
-      AS_VAR_SET(FLAGS, ["AS_VAR_GET(FLAGS) $1"])
-      ;;
-   esac],
-  [AS_VAR_SET(FLAGS,["$1"])])
+[dnl
+AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_SET_IF
+AS_VAR_PUSHDEF([FLAGS], [m4_default($2,_AC_LANG_PREFIX[FLAGS])])
+AS_VAR_SET_IF(FLAGS,[
+  AS_CASE([" AS_VAR_GET(FLAGS) "],
+    [*" $1 "*], [AC_RUN_LOG([: FLAGS already contains $1])],
+    [
+     AS_VAR_APPEND(FLAGS,[" $1"])
+     AC_RUN_LOG([: FLAGS="$FLAGS"])
+    ])
+  ],
+  [
+  AS_VAR_SET(FLAGS,[$1])
+  AC_RUN_LOG([: FLAGS="$FLAGS"])
+  ])
 AS_VAR_POPDEF([FLAGS])dnl
 ])dnl AX_APPEND_FLAG
--- a/m4/ax_append_link_flags.m4
+++ b/m4/ax_append_link_flags.m4
@@ -4,7 +4,7 @@
 #
 # SYNOPSIS
 #
-#   AX_APPEND_LINK_FLAGS([FLAG1 FLAG2 ...], [FLAGS-VARIABLE], [EXTRA-FLAGS])
+#   AX_APPEND_LINK_FLAGS([FLAG1 FLAG2 ...], [FLAGS-VARIABLE], [EXTRA-FLAGS], [INPUT])
 #
 # DESCRIPTION
 #
@@ -19,6 +19,8 @@
 #   EXTRA-FLAGS FLAG".  This can for example be used to force the linker to
 #   issue an error when a bad flag is given.
 #
+#   INPUT gives an alternative input source to AC_COMPILE_IFELSE.
+#
 #   NOTE: This macro depends on the AX_APPEND_FLAG and AX_CHECK_LINK_FLAG.
 #   Please keep this macro in sync with AX_APPEND_COMPILE_FLAGS.
 #
@@ -52,10 +54,12 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.

-#serial 2
+#serial 5

 AC_DEFUN([AX_APPEND_LINK_FLAGS],
-[for flag in $1; do
-  AX_CHECK_LINK_FLAG([$flag], [AX_APPEND_FLAG([$flag], [m4_default([$2], [LDFLAGS])])], [], [$3])
+[AX_REQUIRE_DEFINED([AX_CHECK_LINK_FLAG])
+AX_REQUIRE_DEFINED([AX_APPEND_FLAG])
+for flag in $1; do
+  AX_CHECK_LINK_FLAG([$flag], [AX_APPEND_FLAG([$flag], [m4_default([$2], [LDFLAGS])])], [], [$3], [$4])
 done
 ])dnl AX_APPEND_LINK_FLAGS
--- a/m4/ax_boost_base.m4
+++ b/m4/ax_boost_base.m4
@@ -0,0 +1,285 @@
+# ===========================================================================
+#       http://www.gnu.org/software/autoconf-archive/ax_boost_base.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_BOOST_BASE([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+#
+# DESCRIPTION
+#
+#   Test for the Boost C++ libraries of a particular version (or newer)
+#
+#   If no path to the installed boost library is given the macro searchs
+#   under /usr, /usr/local, /opt and /opt/local and evaluates the
+#   $BOOST_ROOT environment variable. Further documentation is available at
+#   <http://randspringer.de/boost/index.html>.
+#
+#   This macro calls:
+#
+#     AC_SUBST(BOOST_CPPFLAGS) / AC_SUBST(BOOST_LDFLAGS)
+#
+#   And sets:
+#
+#     HAVE_BOOST
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Thomas Porschberg <thomas@randspringer.de>
+#   Copyright (c) 2009 Peter Adolphs
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved. This file is offered as-is, without any
+#   warranty.
+
+#serial 27
+
+AC_DEFUN([AX_BOOST_BASE],
+[
+AC_ARG_WITH([boost],
+  [AS_HELP_STRING([--with-boost@<:@=ARG@:>@],
+    [use Boost library from a standard location (ARG=yes),
+     from the specified location (ARG=<path>),
+     or disable it (ARG=no)
+     @<:@ARG=yes@:>@ ])],
+    [
+    if test "$withval" = "no"; then
+        want_boost="no"
+    elif test "$withval" = "yes"; then
+        want_boost="yes"
+        ac_boost_path=""
+    else
+        want_boost="yes"
+        ac_boost_path="$withval"
+    fi
+    ],
+    [want_boost="yes"])
+
+
+AC_ARG_WITH([boost-libdir],
+        AS_HELP_STRING([--with-boost-libdir=LIB_DIR],
+        [Force given directory for boost libraries. Note that this will override library path detection, so use this parameter only if default library detection fails and you know exactly where your boost libraries are located.]),
+        [
+        if test -d "$withval"
+        then
+                ac_boost_lib_path="$withval"
+        else
+                AC_MSG_ERROR(--with-boost-libdir expected directory name)
+        fi
+        ],
+        [ac_boost_lib_path=""]
+)
+
+if test "x$want_boost" = "xyes"; then
+    boost_lib_version_req=ifelse([$1], ,1.20.0,$1)
+    boost_lib_version_req_shorten=`expr $boost_lib_version_req : '\([[0-9]]*\.[[0-9]]*\)'`
+    boost_lib_version_req_major=`expr $boost_lib_version_req : '\([[0-9]]*\)'`
+    boost_lib_version_req_minor=`expr $boost_lib_version_req : '[[0-9]]*\.\([[0-9]]*\)'`
+    boost_lib_version_req_sub_minor=`expr $boost_lib_version_req : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'`
+    if test "x$boost_lib_version_req_sub_minor" = "x" ; then
+        boost_lib_version_req_sub_minor="0"
+        fi
+    WANT_BOOST_VERSION=`expr $boost_lib_version_req_major \* 100000 \+  $boost_lib_version_req_minor \* 100 \+ $boost_lib_version_req_sub_minor`
+    AC_MSG_CHECKING(for boostlib >= $boost_lib_version_req)
+    succeeded=no
+
+    dnl On 64-bit systems check for system libraries in both lib64 and lib.
+    dnl The former is specified by FHS, but e.g. Debian does not adhere to
+    dnl this (as it rises problems for generic multi-arch support).
+    dnl The last entry in the list is chosen by default when no libraries
+    dnl are found, e.g. when only header-only libraries are installed!
+    libsubdirs="lib"
+    ax_arch=`uname -m`
+    case $ax_arch in
+      x86_64)
+        libsubdirs="lib64 libx32 lib lib64"
+        ;;
+      ppc64|s390x|sparc64|aarch64|ppc64le)
+        libsubdirs="lib64 lib lib64"
+        ;;
+    esac
+
+    dnl allow for real multi-arch paths e.g. /usr/lib/x86_64-linux-gnu. Give
+    dnl them priority over the other paths since, if libs are found there, they
+    dnl are almost assuredly the ones desired.
+    AC_REQUIRE([AC_CANONICAL_HOST])
+    libsubdirs="lib/${host_cpu}-${host_os} $libsubdirs"
+
+    case ${host_cpu} in
+      i?86)
+        libsubdirs="lib/i386-${host_os} $libsubdirs"
+        ;;
+    esac
+
+    dnl first we check the system location for boost libraries
+    dnl this location ist chosen if boost libraries are installed with the --layout=system option
+    dnl or if you install boost with RPM
+    if test "$ac_boost_path" != ""; then
+        BOOST_CPPFLAGS="-I$ac_boost_path/include"
+        for ac_boost_path_tmp in $libsubdirs; do
+                if test -d "$ac_boost_path"/"$ac_boost_path_tmp" ; then
+                        BOOST_LDFLAGS="-L$ac_boost_path/$ac_boost_path_tmp"
+                        break
+                fi
+        done
+    elif test "$cross_compiling" != yes; then
+        for ac_boost_path_tmp in /usr /usr/local /opt /opt/local ; do
+            if test -d "$ac_boost_path_tmp/include/boost" && test -r "$ac_boost_path_tmp/include/boost"; then
+                for libsubdir in $libsubdirs ; do
+                    if ls "$ac_boost_path_tmp/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi
+                done
+                BOOST_LDFLAGS="-L$ac_boost_path_tmp/$libsubdir"
+                BOOST_CPPFLAGS="-I$ac_boost_path_tmp/include"
+                break;
+            fi
+        done
+    fi
+
+    dnl overwrite ld flags if we have required special directory with
+    dnl --with-boost-libdir parameter
+    if test "$ac_boost_lib_path" != ""; then
+       BOOST_LDFLAGS="-L$ac_boost_lib_path"
+    fi
+
+    CPPFLAGS_SAVED="$CPPFLAGS"
+    CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+    export CPPFLAGS
+
+    LDFLAGS_SAVED="$LDFLAGS"
+    LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
+    export LDFLAGS
+
+    AC_REQUIRE([AC_PROG_CXX])
+    AC_LANG_PUSH(C++)
+        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+    @%:@include <boost/version.hpp>
+    ]], [[
+    #if BOOST_VERSION >= $WANT_BOOST_VERSION
+    // Everything is okay
+    #else
+    #  error Boost version is too old
+    #endif
+    ]])],[
+        AC_MSG_RESULT(yes)
+    succeeded=yes
+    found_system=yes
+        ],[
+        ])
+    AC_LANG_POP([C++])
+
+
+
+    dnl if we found no boost with system layout we search for boost libraries
+    dnl built and installed without the --layout=system option or for a staged(not installed) version
+    if test "x$succeeded" != "xyes"; then
+        CPPFLAGS="$CPPFLAGS_SAVED"
+        LDFLAGS="$LDFLAGS_SAVED"
+        BOOST_CPPFLAGS=
+        BOOST_LDFLAGS=
+        _version=0
+        if test "$ac_boost_path" != ""; then
+            if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then
+                for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do
+                    _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'`
+                    V_CHECK=`expr $_version_tmp \> $_version`
+                    if test "$V_CHECK" = "1" ; then
+                        _version=$_version_tmp
+                    fi
+                    VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
+                    BOOST_CPPFLAGS="-I$ac_boost_path/include/boost-$VERSION_UNDERSCORE"
+                done
+                dnl if nothing found search for layout used in Windows distributions
+                if test -z "$BOOST_CPPFLAGS"; then
+                    if test -d "$ac_boost_path/boost" && test -r "$ac_boost_path/boost"; then
+                        BOOST_CPPFLAGS="-I$ac_boost_path"
+                    fi
+                fi
+            fi
+        else
+            if test "$cross_compiling" != yes; then
+                for ac_boost_path in /usr /usr/local /opt /opt/local ; do
+                    if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then
+                        for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do
+                            _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'`
+                            V_CHECK=`expr $_version_tmp \> $_version`
+                            if test "$V_CHECK" = "1" ; then
+                                _version=$_version_tmp
+                                best_path=$ac_boost_path
+                            fi
+                        done
+                    fi
+                done
+
+                VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
+                BOOST_CPPFLAGS="-I$best_path/include/boost-$VERSION_UNDERSCORE"
+                if test "$ac_boost_lib_path" = ""; then
+                    for libsubdir in $libsubdirs ; do
+                        if ls "$best_path/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi
+                    done
+                    BOOST_LDFLAGS="-L$best_path/$libsubdir"
+                fi
+            fi
+
+            if test "x$BOOST_ROOT" != "x"; then
+                for libsubdir in $libsubdirs ; do
+                    if ls "$BOOST_ROOT/stage/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi
+                done
+                if test -d "$BOOST_ROOT" && test -r "$BOOST_ROOT" && test -d "$BOOST_ROOT/stage/$libsubdir" && test -r "$BOOST_ROOT/stage/$libsubdir"; then
+                    version_dir=`expr //$BOOST_ROOT : '.*/\(.*\)'`
+                    stage_version=`echo $version_dir | sed 's/boost_//' | sed 's/_/./g'`
+                        stage_version_shorten=`expr $stage_version : '\([[0-9]]*\.[[0-9]]*\)'`
+                    V_CHECK=`expr $stage_version_shorten \>\= $_version`
+                    if test "$V_CHECK" = "1" -a "$ac_boost_lib_path" = "" ; then
+                        AC_MSG_NOTICE(We will use a staged boost library from $BOOST_ROOT)
+                        BOOST_CPPFLAGS="-I$BOOST_ROOT"
+                        BOOST_LDFLAGS="-L$BOOST_ROOT/stage/$libsubdir"
+                    fi
+                fi
+            fi
+        fi
+
+        CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+        export CPPFLAGS
+        LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
+        export LDFLAGS
+
+        AC_LANG_PUSH(C++)
+            AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+        @%:@include <boost/version.hpp>
+        ]], [[
+        #if BOOST_VERSION >= $WANT_BOOST_VERSION
+        // Everything is okay
+        #else
+        #  error Boost version is too old
+        #endif
+        ]])],[
+            AC_MSG_RESULT(yes)
+        succeeded=yes
+        found_system=yes
+            ],[
+            ])
+        AC_LANG_POP([C++])
+    fi
+
+    if test "$succeeded" != "yes" ; then
+        if test "$_version" = "0" ; then
+            AC_MSG_NOTICE([[We could not detect the boost libraries (version $boost_lib_version_req_shorten or higher). If you have a staged boost library (still not installed) please specify \$BOOST_ROOT in your environment and do not give a PATH to --with-boost option.  If you are sure you have boost installed, then check your version number looking in <boost/version.hpp>. See http://randspringer.de/boost for more documentation.]])
+        else
+            AC_MSG_NOTICE([Your boost libraries seems to old (version $_version).])
+        fi
+        # execute ACTION-IF-NOT-FOUND (if present):
+        ifelse([$3], , :, [$3])
+    else
+        AC_SUBST(BOOST_CPPFLAGS)
+        AC_SUBST(BOOST_LDFLAGS)
+        AC_DEFINE(HAVE_BOOST,,[define if the Boost library is available])
+        # execute ACTION-IF-FOUND (if present):
+        ifelse([$2], , :, [$2])
+    fi
+
+    CPPFLAGS="$CPPFLAGS_SAVED"
+    LDFLAGS="$LDFLAGS_SAVED"
+fi
+
+])
--- a/m4/ax_check_compile_flag.m4
+++ b/m4/ax_check_compile_flag.m4
@@ -4,7 +4,7 @@
 #
 # SYNOPSIS
 #
-#   AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS])
+#   AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT])
 #
 # DESCRIPTION
 #
@@ -19,6 +19,8 @@
 #   the flags: "CFLAGS EXTRA-FLAGS FLAG".  This can for example be used to
 #   force the compiler to issue an error when a bad flag is given.
 #
+#   INPUT gives an alternative input source to AC_COMPILE_IFELSE.
+#
 #   NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this
 #   macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG.
 #
@@ -53,19 +55,19 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.

-#serial 2
+#serial 4

 AC_DEFUN([AX_CHECK_COMPILE_FLAG],
-[AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX
+[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF
 AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl
 AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [
  ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS
  _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1"
-  AC_COMPILE_IFELSE([AC_LANG_PROGRAM()],
+  AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])],
    [AS_VAR_SET(CACHEVAR,[yes])],
    [AS_VAR_SET(CACHEVAR,[no])])
  _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags])
-AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes],
+AS_VAR_IF(CACHEVAR,yes,
  [m4_default([$2], :)],
  [m4_default([$3], :)])
 AS_VAR_POPDEF([CACHEVAR])dnl
--- a/m4/ax_check_link_flag.m4
+++ b/m4/ax_check_link_flag.m4
@@ -4,7 +4,7 @@
 #
 # SYNOPSIS
 #
-#   AX_CHECK_LINK_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS])
+#   AX_CHECK_LINK_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT])
 #
 # DESCRIPTION
 #
@@ -19,6 +19,8 @@
 #   EXTRA-FLAGS FLAG".  This can for example be used to force the linker to
 #   issue an error when a bad flag is given.
 #
+#   INPUT gives an alternative input source to AC_LINK_IFELSE.
+#
 #   NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this
 #   macro in sync with AX_CHECK_{PREPROC,COMPILE}_FLAG.
 #
@@ -53,18 +55,19 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.

-#serial 2
+#serial 4

 AC_DEFUN([AX_CHECK_LINK_FLAG],
-[AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_ldflags_$4_$1])dnl
+[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF
+AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_ldflags_$4_$1])dnl
 AC_CACHE_CHECK([whether the linker accepts $1], CACHEVAR, [
  ax_check_save_flags=$LDFLAGS
  LDFLAGS="$LDFLAGS $4 $1"
-  AC_LINK_IFELSE([AC_LANG_PROGRAM()],
+  AC_LINK_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])],
    [AS_VAR_SET(CACHEVAR,[yes])],
    [AS_VAR_SET(CACHEVAR,[no])])
  LDFLAGS=$ax_check_save_flags])
-AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes],
+AS_VAR_IF(CACHEVAR,yes,
  [m4_default([$2], :)],
  [m4_default([$3], :)])
 AS_VAR_POPDEF([CACHEVAR])dnl
--- a/m4/ax_cxx_compile_stdcxx.m4
+++ b/m4/ax_cxx_compile_stdcxx.m4
@@ -0,0 +1,564 @@
+# ===========================================================================
+#   http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_CXX_COMPILE_STDCXX(VERSION, [ext|noext], [mandatory|optional])
+#
+# DESCRIPTION
+#
+#   Check for baseline language coverage in the compiler for the specified
+#   version of the C++ standard.  If necessary, add switches to CXX and
+#   CXXCPP to enable support.  VERSION may be '11' (for the C++11 standard)
+#   or '14' (for the C++14 standard).
+#
+#   The second argument, if specified, indicates whether you insist on an
+#   extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g.
+#   -std=c++11).  If neither is specified, you get whatever works, with
+#   preference for an extended mode.
+#
+#   The third argument, if specified 'mandatory' or if left unspecified,
+#   indicates that baseline support for the specified C++ standard is
+#   required and that the macro should error out if no mode with that
+#   support is found.  If specified 'optional', then configuration proceeds
+#   regardless, after defining HAVE_CXX${VERSION} if and only if a
+#   supporting mode is found.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com>
+#   Copyright (c) 2012 Zack Weinberg <zackw@panix.com>
+#   Copyright (c) 2013 Roy Stogner <roystgnr@ices.utexas.edu>
+#   Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov <sokolov@google.com>
+#   Copyright (c) 2015 Paul Norman <penorman@mac.com>
+#   Copyright (c) 2015 Moritz Klammler <moritz@klammler.eu>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved.  This file is offered as-is, without any
+#   warranty.
+
+#serial 4
+
+dnl  This macro is based on the code from the AX_CXX_COMPILE_STDCXX_11 macro
+dnl  (serial version number 13).
+
+AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl
+  m4_if([$1], [11], [],
+        [$1], [14], [],
+        [$1], [17], [m4_fatal([support for C++17 not yet implemented in AX_CXX_COMPILE_STDCXX])],
+        [m4_fatal([invalid first argument `$1' to AX_CXX_COMPILE_STDCXX])])dnl
+  m4_if([$2], [], [],
+        [$2], [ext], [],
+        [$2], [noext], [],
+        [m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX])])dnl
+  m4_if([$3], [], [ax_cxx_compile_cxx$1_required=true],
+        [$3], [mandatory], [ax_cxx_compile_cxx$1_required=true],
+        [$3], [optional], [ax_cxx_compile_cxx$1_required=false],
+        [m4_fatal([invalid third argument `$3' to AX_CXX_COMPILE_STDCXX])])
+  AC_LANG_PUSH([C++])dnl
+  ac_success=no
+  AC_CACHE_CHECK(whether $CXX supports C++$1 features by default,
+  ax_cv_cxx_compile_cxx$1,
+  [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
+    [ax_cv_cxx_compile_cxx$1=yes],
+    [ax_cv_cxx_compile_cxx$1=no])])
+  if test x$ax_cv_cxx_compile_cxx$1 = xyes; then
+    ac_success=yes
+  fi
+
+  m4_if([$2], [noext], [], [dnl
+  if test x$ac_success = xno; then
+    for switch in -std=gnu++$1 -std=gnu++0x; do
+      cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch])
+      AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch,
+                     $cachevar,
+        [ac_save_CXX="$CXX"
+         CXX="$CXX $switch"
+         AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
+          [eval $cachevar=yes],
+          [eval $cachevar=no])
+         CXX="$ac_save_CXX"])
+      if eval test x\$$cachevar = xyes; then
+        CXX="$CXX $switch"
+        if test -n "$CXXCPP" ; then
+          CXXCPP="$CXXCPP $switch"
+        fi
+        ac_success=yes
+        break
+      fi
+    done
+  fi])
+
+  m4_if([$2], [ext], [], [dnl
+  if test x$ac_success = xno; then
+    dnl HP's aCC needs +std=c++11 according to:
+    dnl http://h21007.www2.hp.com/portal/download/files/unprot/aCxx/PDF_Release_Notes/769149-001.pdf
+    dnl Cray's crayCC needs "-h std=c++11"
+    for switch in -std=c++$1 -std=c++0x +std=c++$1 "-h std=c++$1"; do
+      cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch])
+      AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch,
+                     $cachevar,
+        [ac_save_CXX="$CXX"
+         CXX="$CXX $switch"
+         AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
+          [eval $cachevar=yes],
+          [eval $cachevar=no])
+         CXX="$ac_save_CXX"])
+      if eval test x\$$cachevar = xyes; then
+        CXX="$CXX $switch"
+        if test -n "$CXXCPP" ; then
+          CXXCPP="$CXXCPP $switch"
+        fi
+        ac_success=yes
+        break
+      fi
+    done
+  fi])
+  AC_LANG_POP([C++])
+  if test x$ax_cxx_compile_cxx$1_required = xtrue; then
+    if test x$ac_success = xno; then
+      AC_MSG_ERROR([*** A compiler with support for C++$1 language features is required.])
+    fi
+  fi
+  if test x$ac_success = xno; then
+    HAVE_CXX$1=0
+    AC_MSG_NOTICE([No compiler with C++$1 support was found])
+  else
+    HAVE_CXX$1=1
+    AC_DEFINE(HAVE_CXX$1,1,
+              [define if the compiler supports basic C++$1 syntax])
+  fi
+  AC_SUBST(HAVE_CXX$1)
+])
+
+
+dnl  Test body for checking C++11 support
+
+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_11],
+  _AX_CXX_COMPILE_STDCXX_testbody_new_in_11
+)
+
+
+dnl  Test body for checking C++14 support
+
+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_14],
+  _AX_CXX_COMPILE_STDCXX_testbody_new_in_11
+  _AX_CXX_COMPILE_STDCXX_testbody_new_in_14
+)
+
+
+dnl  Tests for new features in C++11
+
+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_11], [[
+
+// If the compiler admits that it is not ready for C++11, why torture it?
+// Hopefully, this will speed up the test.
+
+#ifndef __cplusplus
+
+#error "This is not a C++ compiler"
+
+#elif __cplusplus < 201103L
+
+#error "This is not a C++11 compiler"
+
+#else
+
+namespace cxx11
+{
+
+  namespace test_static_assert
+  {
+
+    template <typename T>
+    struct check
+    {
+      static_assert(sizeof(int) <= sizeof(T), "not big enough");
+    };
+
+  }
+
+  namespace test_final_override
+  {
+
+    struct Base
+    {
+      virtual void f() {}
+    };
+
+    struct Derived : public Base
+    {
+      virtual void f() override {}
+    };
+
+  }
+
+  namespace test_double_right_angle_brackets
+  {
+
+    template < typename T >
+    struct check {};
+
+    typedef check<void> single_type;
+    typedef check<check<void>> double_type;
+    typedef check<check<check<void>>> triple_type;
+    typedef check<check<check<check<void>>>> quadruple_type;
+
+  }
+
+  namespace test_decltype
+  {
+
+    int
+    f()
+    {
+      int a = 1;
+      decltype(a) b = 2;
+      return a + b;
+    }
+
+  }
+
+  namespace test_type_deduction
+  {
+
+    template < typename T1, typename T2 >
+    struct is_same
+    {
+      static const bool value = false;
+    };
+
+    template < typename T >
+    struct is_same<T, T>
+    {
+      static const bool value = true;
+    };
+
+    template < typename T1, typename T2 >
+    auto
+    add(T1 a1, T2 a2) -> decltype(a1 + a2)
+    {
+      return a1 + a2;
+    }
+
+    int
+    test(const int c, volatile int v)
+    {
+      static_assert(is_same<int, decltype(0)>::value == true, "");
+      static_assert(is_same<int, decltype(c)>::value == false, "");
+      static_assert(is_same<int, decltype(v)>::value == false, "");
+      auto ac = c;
+      auto av = v;
+      auto sumi = ac + av + 'x';
+      auto sumf = ac + av + 1.0;
+      static_assert(is_same<int, decltype(ac)>::value == true, "");
+      static_assert(is_same<int, decltype(av)>::value == true, "");
+      static_assert(is_same<int, decltype(sumi)>::value == true, "");
+      static_assert(is_same<int, decltype(sumf)>::value == false, "");
+      static_assert(is_same<int, decltype(add(c, v))>::value == true, "");
+      return (sumf > 0.0) ? sumi : add(c, v);
+    }
+
+  }
+
+  namespace test_noexcept
+  {
+
+    int f() { return 0; }
+    int g() noexcept { return 0; }
+
+    static_assert(noexcept(f()) == false, "");
+    static_assert(noexcept(g()) == true, "");
+
+  }
+
+  namespace test_constexpr
+  {
+
+    template < typename CharT >
+    unsigned long constexpr
+    strlen_c_r(const CharT *const s, const unsigned long acc) noexcept
+    {
+      return *s ? strlen_c_r(s + 1, acc + 1) : acc;
+    }
+
+    template < typename CharT >
+    unsigned long constexpr
+    strlen_c(const CharT *const s) noexcept
+    {
+      return strlen_c_r(s, 0UL);
+    }
+
+    static_assert(strlen_c("") == 0UL, "");
+    static_assert(strlen_c("1") == 1UL, "");
+    static_assert(strlen_c("example") == 7UL, "");
+    static_assert(strlen_c("another\0example") == 7UL, "");
+
+  }
+
+  namespace test_rvalue_references
+  {
+
+    template < int N >
+    struct answer
+    {
+      static constexpr int value = N;
+    };
+
+    answer<1> f(int&)       { return answer<1>(); }
+    answer<2> f(const int&) { return answer<2>(); }
+    answer<3> f(int&&)      { return answer<3>(); }
+
+    void
+    test()
+    {
+      int i = 0;
+      const int c = 0;
+      static_assert(decltype(f(i))::value == 1, "");
+      static_assert(decltype(f(c))::value == 2, "");
+      static_assert(decltype(f(0))::value == 3, "");
+    }
+
+  }
+
+  namespace test_uniform_initialization
+  {
+
+    struct test
+    {
+      static const int zero {};
+      static const int one {1};
+    };
+
+    static_assert(test::zero == 0, "");
+    static_assert(test::one == 1, "");
+
+  }
+
+  namespace test_lambdas
+  {
+
+    void
+    test1()
+    {
+      auto lambda1 = [](){};
+      auto lambda2 = lambda1;
+      lambda1();
+      lambda2();
+    }
+
+    int
+    test2()
+    {
+      auto a = [](int i, int j){ return i + j; }(1, 2);
+      auto b = []() -> int { return '0'; }();
+      auto c = [=](){ return a + b; }();
+      auto d = [&](){ return c; }();
+      auto e = [a, &b](int x) mutable {
+        const auto identity = [](int y){ return y; };
+        for (auto i = 0; i < a; ++i)
+          a += b--;
+        return x + identity(a + b);
+      }(0);
+      return a + b + c + d + e;
+    }
+
+    int
+    test3()
+    {
+      const auto nullary = [](){ return 0; };
+      const auto unary = [](int x){ return x; };
+      using nullary_t = decltype(nullary);
+      using unary_t = decltype(unary);
+      const auto higher1st = [](nullary_t f){ return f(); };
+      const auto higher2nd = [unary](nullary_t f1){
+        return [unary, f1](unary_t f2){ return f2(unary(f1())); };
+      };
+      return higher1st(nullary) + higher2nd(nullary)(unary);
+    }
+
+  }
+
+  namespace test_variadic_templates
+  {
+
+    template <int...>
+    struct sum;
+
+    template <int N0, int... N1toN>
+    struct sum<N0, N1toN...>
+    {
+      static constexpr auto value = N0 + sum<N1toN...>::value;
+    };
+
+    template <>
+    struct sum<>
+    {
+      static constexpr auto value = 0;
+    };
+
+    static_assert(sum<>::value == 0, "");
+    static_assert(sum<1>::value == 1, "");
+    static_assert(sum<23>::value == 23, "");
+    static_assert(sum<1, 2>::value == 3, "");
+    static_assert(sum<5, 5, 11>::value == 21, "");
+    static_assert(sum<2, 3, 5, 7, 11, 13>::value == 41, "");
+
+  }
+
+  // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae
+  // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function
+  // because of this.
+  namespace test_template_alias_sfinae
+  {
+
+    struct foo {};
+
+    template<typename T>
+    using member = typename T::member_type;
+
+    template<typename T>
+    void func(...) {}
+
+    template<typename T>
+    void func(member<T>*) {}
+
+    void test();
+
+    void test() { func<foo>(0); }
+
+  }
+
+}  // namespace cxx11
+
+#endif  // __cplusplus >= 201103L
+
+]])
+
+
+dnl  Tests for new features in C++14
+
+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_14], [[
+
+// If the compiler admits that it is not ready for C++14, why torture it?
+// Hopefully, this will speed up the test.
+
+#ifndef __cplusplus
+
+#error "This is not a C++ compiler"
+
+#elif __cplusplus < 201300L
+
+#error "This is not a C++14 compiler"
+
+#else
+
+namespace cxx14
+{
+
+  namespace test_polymorphic_lambdas
+  {
+
+    int
+    test()
+    {
+      const auto lambda = [](auto&&... args){
+        const auto istiny = [](auto x){
+          return (sizeof(x) == 1UL) ? 1 : 0;
+        };
+        const int aretiny[] = { istiny(args)... };
+        return aretiny[0];
+      };
+      return lambda(1, 1L, 1.0f, '1');
+    }
+
+  }
+
+  namespace test_binary_literals
+  {
+
+    constexpr auto ivii = 0b0000000000101010;
+    static_assert(ivii == 42, "wrong value");
+
+  }
+
+#ifdef DISALLOW_GCC48
+  namespace test_generalized_constexpr
+  {
+
+    template < typename CharT >
+    constexpr unsigned long
+    strlen_c(const CharT *const s) noexcept
+    {
+      auto length = 0UL;
+      for (auto p = s; *p; ++p)
+        ++length;
+      return length;
+    }
+
+    static_assert(strlen_c("") == 0UL, "");
+    static_assert(strlen_c("x") == 1UL, "");
+    static_assert(strlen_c("test") == 4UL, "");
+    static_assert(strlen_c("another\0test") == 7UL, "");
+
+  }
+#endif
+
+  namespace test_lambda_init_capture
+  {
+
+    int
+    test()
+    {
+      auto x = 0;
+      const auto lambda1 = [a = x](int b){ return a + b; };
+      const auto lambda2 = [a = lambda1(x)](){ return a; };
+      return lambda2();
+    }
+
+  }
+
+  namespace test_digit_seperators
+  {
+
+    constexpr auto ten_million = 100'000'000;
+    static_assert(ten_million == 100000000, "");
+
+  }
+
+  namespace test_return_type_deduction
+  {
+
+    auto f(int& x) { return x; }
+    decltype(auto) g(int& x) { return x; }
+
+    template < typename T1, typename T2 >
+    struct is_same
+    {
+      static constexpr auto value = false;
+    };
+
+    template < typename T >
+    struct is_same<T, T>
+    {
+      static constexpr auto value = true;
+    };
+
+    int
+    test()
+    {
+      auto x = 0;
+      static_assert(is_same<int, decltype(f(x))>::value, "");
+      static_assert(is_same<int&, decltype(g(x))>::value, "");
+      return x;
+    }
+
+  }
+
+}  // namespace cxx14
+
+#endif  // __cplusplus >= 201402L
+
+]])
--- a/m4/ax_cxx_compile_stdcxx_0x.m4
+++ b/m4/ax_cxx_compile_stdcxx_0x.m4
@@ -1,107 +0,0 @@
-# ============================================================================
-#  http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx_0x.html
-# ============================================================================
-#
-# SYNOPSIS
-#
-#   AX_CXX_COMPILE_STDCXX_0X
-#
-# DESCRIPTION
-#
-#   Check for baseline language coverage in the compiler for the C++0x
-#   standard.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 7
-
-AU_ALIAS([AC_CXX_COMPILE_STDCXX_0X], [AX_CXX_COMPILE_STDCXX_0X])
-AC_DEFUN([AX_CXX_COMPILE_STDCXX_0X], [
-  AC_CACHE_CHECK(if g++ supports C++0x features without additional flags,
-  ax_cv_cxx_compile_cxx0x_native,
-  [AC_LANG_SAVE
-  AC_LANG_CPLUSPLUS
-  AC_TRY_COMPILE([
-  template <typename T>
-    struct check
-    {
-      static_assert(sizeof(int) <= sizeof(T), "not big enough");
-    };
-
-    typedef check<check<bool>> right_angle_brackets;
-
-    int a;
-    decltype(a) b;
-
-    typedef check<int> check_type;
-    check_type c;
-    check_type&& cr = static_cast<check_type&&>(c);],,
-  ax_cv_cxx_compile_cxx0x_native=yes, ax_cv_cxx_compile_cxx0x_native=no)
-  AC_LANG_RESTORE
-  ])
-
-  AC_CACHE_CHECK(if g++ supports C++0x features with -std=c++0x,
-  ax_cv_cxx_compile_cxx0x_cxx,
-  [AC_LANG_SAVE
-  AC_LANG_CPLUSPLUS
-  ac_save_CXXFLAGS="$CXXFLAGS"
-  CXXFLAGS="$CXXFLAGS -std=c++0x"
-  AC_TRY_COMPILE([
-  template <typename T>
-    struct check
-    {
-      static_assert(sizeof(int) <= sizeof(T), "not big enough");
-    };
-
-    typedef check<check<bool>> right_angle_brackets;
-
-    int a;
-    decltype(a) b;
-
-    typedef check<int> check_type;
-    check_type c;
-    check_type&& cr = static_cast<check_type&&>(c);],,
-  ax_cv_cxx_compile_cxx0x_cxx=yes, ax_cv_cxx_compile_cxx0x_cxx=no)
-  CXXFLAGS="$ac_save_CXXFLAGS"
-  AC_LANG_RESTORE
-  ])
-
-  AC_CACHE_CHECK(if g++ supports C++0x features with -std=gnu++0x,
-  ax_cv_cxx_compile_cxx0x_gxx,
-  [AC_LANG_SAVE
-  AC_LANG_CPLUSPLUS
-  ac_save_CXXFLAGS="$CXXFLAGS"
-  CXXFLAGS="$CXXFLAGS -std=gnu++0x"
-  AC_TRY_COMPILE([
-  template <typename T>
-    struct check
-    {
-      static_assert(sizeof(int) <= sizeof(T), "not big enough");
-    };
-
-    typedef check<check<bool>> right_angle_brackets;
-
-    int a;
-    decltype(a) b;
-
-    typedef check<int> check_type;
-    check_type c;
-    check_type&& cr = static_cast<check_type&&>(c);],,
-  ax_cv_cxx_compile_cxx0x_gxx=yes, ax_cv_cxx_compile_cxx0x_gxx=no)
-  CXXFLAGS="$ac_save_CXXFLAGS"
-  AC_LANG_RESTORE
-  ])
-
-  if test "$ax_cv_cxx_compile_cxx0x_native" = yes ||
-     test "$ax_cv_cxx_compile_cxx0x_cxx" = yes ||
-     test "$ax_cv_cxx_compile_cxx0x_gxx" = yes; then
-    AC_DEFINE(HAVE_STDCXX_0X,,[Define if g++ supports C++0x features. ])
-  fi
-])
--- a/m4/ax_cxx_compile_stdcxx_14.m4
+++ b/m4/ax_cxx_compile_stdcxx_14.m4
@@ -0,0 +1,34 @@
+# ============================================================================
+#  http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx_14.html
+# ============================================================================
+#
+# SYNOPSIS
+#
+#   AX_CXX_COMPILE_STDCXX_14([ext|noext], [mandatory|optional])
+#
+# DESCRIPTION
+#
+#   Check for baseline language coverage in the compiler for the C++14
+#   standard; if necessary, add switches to CXX and CXXCPP to enable
+#   support.
+#
+#   This macro is a convenience alias for calling the AX_CXX_COMPILE_STDCXX
+#   macro with the version set to C++14.  The two optional arguments are
+#   forwarded literally as the second and third argument respectively.
+#   Please see the documentation for the AX_CXX_COMPILE_STDCXX macro for
+#   more information.  If you want to use this macro, you also need to
+#   download the ax_cxx_compile_stdcxx.m4 file.
+#
+# LICENSE
+#
+#   Copyright (c) 2015 Moritz Klammler <moritz@klammler.eu>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved. This file is offered as-is, without any
+#   warranty.
+
+#serial 4
+
+AX_REQUIRE_DEFINED([AX_CXX_COMPILE_STDCXX])
+AC_DEFUN([AX_CXX_COMPILE_STDCXX_14], [AX_CXX_COMPILE_STDCXX([14], [$1], [$2])])
--- a/m4/ax_pthread.m4
+++ b/m4/ax_pthread.m4
@@ -0,0 +1,485 @@
+# ===========================================================================
+#        http://www.gnu.org/software/autoconf-archive/ax_pthread.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+#
+# DESCRIPTION
+#
+#   This macro figures out how to build C programs using POSIX threads. It
+#   sets the PTHREAD_LIBS output variable to the threads library and linker
+#   flags, and the PTHREAD_CFLAGS output variable to any special C compiler
+#   flags that are needed. (The user can also force certain compiler
+#   flags/libs to be tested by setting these environment variables.)
+#
+#   Also sets PTHREAD_CC to any special C compiler that is needed for
+#   multi-threaded programs (defaults to the value of CC otherwise). (This
+#   is necessary on AIX to use the special cc_r compiler alias.)
+#
+#   NOTE: You are assumed to not only compile your program with these flags,
+#   but also to link with them as well. For example, you might link with
+#   $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS
+#
+#   If you are only building threaded programs, you may wish to use these
+#   variables in your default LIBS, CFLAGS, and CC:
+#
+#     LIBS="$PTHREAD_LIBS $LIBS"
+#     CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+#     CC="$PTHREAD_CC"
+#
+#   In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant
+#   has a nonstandard name, this macro defines PTHREAD_CREATE_JOINABLE to
+#   that name (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
+#
+#   Also HAVE_PTHREAD_PRIO_INHERIT is defined if pthread is found and the
+#   PTHREAD_PRIO_INHERIT symbol is defined when compiling with
+#   PTHREAD_CFLAGS.
+#
+#   ACTION-IF-FOUND is a list of shell commands to run if a threads library
+#   is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it
+#   is not found. If ACTION-IF-FOUND is not specified, the default action
+#   will define HAVE_PTHREAD.
+#
+#   Please let the authors know if this macro fails on any platform, or if
+#   you have any other suggestions or comments. This macro was based on work
+#   by SGJ on autoconf scripts for FFTW (http://www.fftw.org/) (with help
+#   from M. Frigo), as well as ac_pthread and hb_pthread macros posted by
+#   Alejandro Forero Cuervo to the autoconf macro repository. We are also
+#   grateful for the helpful feedback of numerous users.
+#
+#   Updated for Autoconf 2.68 by Daniel Richard G.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu>
+#   Copyright (c) 2011 Daniel Richard G. <skunk@iSKUNK.ORG>
+#
+#   This program is free software: you can redistribute it and/or modify it
+#   under the terms of the GNU General Public License as published by the
+#   Free Software Foundation, either version 3 of the License, or (at your
+#   option) any later version.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+#   Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License along
+#   with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+#   As a special exception, the respective Autoconf Macro's copyright owner
+#   gives unlimited permission to copy, distribute and modify the configure
+#   scripts that are the output of Autoconf when processing the Macro. You
+#   need not follow the terms of the GNU General Public License when using
+#   or distributing such scripts, even though portions of the text of the
+#   Macro appear in them. The GNU General Public License (GPL) does govern
+#   all other use of the material that constitutes the Autoconf Macro.
+#
+#   This special exception to the GPL applies to versions of the Autoconf
+#   Macro released by the Autoconf Archive. When you make and distribute a
+#   modified version of the Autoconf Macro, you may extend this special
+#   exception to the GPL to apply to your modified version as well.
+
+#serial 23
+
+AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD])
+AC_DEFUN([AX_PTHREAD], [
+AC_REQUIRE([AC_CANONICAL_HOST])
+AC_REQUIRE([AC_PROG_CC])
+AC_REQUIRE([AC_PROG_SED])
+AC_LANG_PUSH([C])
+ax_pthread_ok=no
+
+# We used to check for pthread.h first, but this fails if pthread.h
+# requires special compiler flags (e.g. on Tru64 or Sequent).
+# It gets checked for in the link test anyway.
+
+# First of all, check if the user has set any of the PTHREAD_LIBS,
+# etcetera environment variables, and if threads linking works using
+# them:
+if test "x$PTHREAD_CFLAGS$PTHREAD_LIBS" != "x"; then
+        ax_pthread_save_CC="$CC"
+        ax_pthread_save_CFLAGS="$CFLAGS"
+        ax_pthread_save_LIBS="$LIBS"
+        AS_IF([test "x$PTHREAD_CC" != "x"], [CC="$PTHREAD_CC"])
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+        LIBS="$PTHREAD_LIBS $LIBS"
+        AC_MSG_CHECKING([for pthread_join using $CC $PTHREAD_CFLAGS $PTHREAD_LIBS])
+        AC_LINK_IFELSE([AC_LANG_CALL([], [pthread_join])], [ax_pthread_ok=yes])
+        AC_MSG_RESULT([$ax_pthread_ok])
+        if test "x$ax_pthread_ok" = "xno"; then
+                PTHREAD_LIBS=""
+                PTHREAD_CFLAGS=""
+        fi
+        CC="$ax_pthread_save_CC"
+        CFLAGS="$ax_pthread_save_CFLAGS"
+        LIBS="$ax_pthread_save_LIBS"
+fi
+
+# We must check for the threads library under a number of different
+# names; the ordering is very important because some systems
+# (e.g. DEC) have both -lpthread and -lpthreads, where one of the
+# libraries is broken (non-POSIX).
+
+# Create a list of thread flags to try.  Items starting with a "-" are
+# C compiler flags, and other items are library names, except for "none"
+# which indicates that we try without any flags at all, and "pthread-config"
+# which is a program returning the flags for the Pth emulation library.
+
+ax_pthread_flags="pthreads none -Kthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
+
+# The ordering *is* (sometimes) important.  Some notes on the
+# individual items follow:
+
+# pthreads: AIX (must check this before -lpthread)
+# none: in case threads are in libc; should be tried before -Kthread and
+#       other compiler flags to prevent continual compiler warnings
+# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
+# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads), Tru64
+#           (Note: HP C rejects this with "bad form for `-t' option")
+# -pthreads: Solaris/gcc (Note: HP C also rejects)
+# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
+#      doesn't hurt to check since this sometimes defines pthreads and
+#      -D_REENTRANT too), HP C (must be checked before -lpthread, which
+#      is present but should not be used directly; and before -mthreads,
+#      because the compiler interprets this as "-mt" + "-hreads")
+# -mthreads: Mingw32/gcc, Lynx/gcc
+# pthread: Linux, etcetera
+# --thread-safe: KAI C++
+# pthread-config: use pthread-config program (for GNU Pth library)
+
+case $host_os in
+
+        freebsd*)
+
+        # -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
+        # lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
+
+        ax_pthread_flags="-kthread lthread $ax_pthread_flags"
+        ;;
+
+        hpux*)
+
+        # From the cc(1) man page: "[-mt] Sets various -D flags to enable
+        # multi-threading and also sets -lpthread."
+
+        ax_pthread_flags="-mt -pthread pthread $ax_pthread_flags"
+        ;;
+
+        openedition*)
+
+        # IBM z/OS requires a feature-test macro to be defined in order to
+        # enable POSIX threads at all, so give the user a hint if this is
+        # not set. (We don't define these ourselves, as they can affect
+        # other portions of the system API in unpredictable ways.)
+
+        AC_EGREP_CPP([AX_PTHREAD_ZOS_MISSING],
+            [
+#            if !defined(_OPEN_THREADS) && !defined(_UNIX03_THREADS)
+             AX_PTHREAD_ZOS_MISSING
+#            endif
+            ],
+            [AC_MSG_WARN([IBM z/OS requires -D_OPEN_THREADS or -D_UNIX03_THREADS to enable pthreads support.])])
+        ;;
+
+        solaris*)
+
+        # On Solaris (at least, for some versions), libc contains stubbed
+        # (non-functional) versions of the pthreads routines, so link-based
+        # tests will erroneously succeed. (N.B.: The stubs are missing
+        # pthread_cleanup_push, or rather a function called by this macro,
+        # so we could check for that, but who knows whether they'll stub
+        # that too in a future libc.)  So we'll check first for the
+        # standard Solaris way of linking pthreads (-mt -lpthread).
+
+        ax_pthread_flags="-mt,pthread pthread $ax_pthread_flags"
+        ;;
+esac
+
+# GCC generally uses -pthread, or -pthreads on some platforms (e.g. SPARC)
+
+AS_IF([test "x$GCC" = "xyes"],
+      [ax_pthread_flags="-pthread -pthreads $ax_pthread_flags"])
+
+# The presence of a feature test macro requesting re-entrant function
+# definitions is, on some systems, a strong hint that pthreads support is
+# correctly enabled
+
+case $host_os in
+        darwin* | hpux* | linux* | osf* | solaris*)
+        ax_pthread_check_macro="_REENTRANT"
+        ;;
+
+        aix*)
+        ax_pthread_check_macro="_THREAD_SAFE"
+        ;;
+
+        *)
+        ax_pthread_check_macro="--"
+        ;;
+esac
+AS_IF([test "x$ax_pthread_check_macro" = "x--"],
+      [ax_pthread_check_cond=0],
+      [ax_pthread_check_cond="!defined($ax_pthread_check_macro)"])
+
+# Are we compiling with Clang?
+
+AC_CACHE_CHECK([whether $CC is Clang],
+    [ax_cv_PTHREAD_CLANG],
+    [ax_cv_PTHREAD_CLANG=no
+     # Note that Autoconf sets GCC=yes for Clang as well as GCC
+     if test "x$GCC" = "xyes"; then
+        AC_EGREP_CPP([AX_PTHREAD_CC_IS_CLANG],
+            [/* Note: Clang 2.7 lacks __clang_[a-z]+__ */
+#            if defined(__clang__) && defined(__llvm__)
+             AX_PTHREAD_CC_IS_CLANG
+#            endif
+            ],
+            [ax_cv_PTHREAD_CLANG=yes])
+     fi
+    ])
+ax_pthread_clang="$ax_cv_PTHREAD_CLANG"
+
+ax_pthread_clang_warning=no
+
+# Clang needs special handling, because older versions handle the -pthread
+# option in a rather... idiosyncratic way
+
+if test "x$ax_pthread_clang" = "xyes"; then
+
+        # Clang takes -pthread; it has never supported any other flag
+
+        # (Note 1: This will need to be revisited if a system that Clang
+        # supports has POSIX threads in a separate library.  This tends not
+        # to be the way of modern systems, but it's conceivable.)
+
+        # (Note 2: On some systems, notably Darwin, -pthread is not needed
+        # to get POSIX threads support; the API is always present and
+        # active.  We could reasonably leave PTHREAD_CFLAGS empty.  But
+        # -pthread does define _REENTRANT, and while the Darwin headers
+        # ignore this macro, third-party headers might not.)
+
+        PTHREAD_CFLAGS="-pthread"
+        PTHREAD_LIBS=
+
+        ax_pthread_ok=yes
+
+        # However, older versions of Clang make a point of warning the user
+        # that, in an invocation where only linking and no compilation is
+        # taking place, the -pthread option has no effect ("argument unused
+        # during compilation").  They expect -pthread to be passed in only
+        # when source code is being compiled.
+        #
+        # Problem is, this is at odds with the way Automake and most other
+        # C build frameworks function, which is that the same flags used in
+        # compilation (CFLAGS) are also used in linking.  Many systems
+        # supported by AX_PTHREAD require exactly this for POSIX threads
+        # support, and in fact it is often not straightforward to specify a
+        # flag that is used only in the compilation phase and not in
+        # linking.  Such a scenario is extremely rare in practice.
+        #
+        # Even though use of the -pthread flag in linking would only print
+        # a warning, this can be a nuisance for well-run software projects
+        # that build with -Werror.  So if the active version of Clang has
+        # this misfeature, we search for an option to squash it.
+
+        AC_CACHE_CHECK([whether Clang needs flag to prevent "argument unused" warning when linking with -pthread],
+            [ax_cv_PTHREAD_CLANG_NO_WARN_FLAG],
+            [ax_cv_PTHREAD_CLANG_NO_WARN_FLAG=unknown
+             # Create an alternate version of $ac_link that compiles and
+             # links in two steps (.c -> .o, .o -> exe) instead of one
+             # (.c -> exe), because the warning occurs only in the second
+             # step
+             ax_pthread_save_ac_link="$ac_link"
+             ax_pthread_sed='s/conftest\.\$ac_ext/conftest.$ac_objext/g'
+             ax_pthread_link_step=`$as_echo "$ac_link" | sed "$ax_pthread_sed"`
+             ax_pthread_2step_ac_link="($ac_compile) && (echo ==== >&5) && ($ax_pthread_link_step)"
+             ax_pthread_save_CFLAGS="$CFLAGS"
+             for ax_pthread_try in '' -Qunused-arguments -Wno-unused-command-line-argument unknown; do
+                AS_IF([test "x$ax_pthread_try" = "xunknown"], [break])
+                CFLAGS="-Werror -Wunknown-warning-option $ax_pthread_try -pthread $ax_pthread_save_CFLAGS"
+                ac_link="$ax_pthread_save_ac_link"
+                AC_LINK_IFELSE([AC_LANG_SOURCE([[int main(void){return 0;}]])],
+                    [ac_link="$ax_pthread_2step_ac_link"
+                     AC_LINK_IFELSE([AC_LANG_SOURCE([[int main(void){return 0;}]])],
+                         [break])
+                    ])
+             done
+             ac_link="$ax_pthread_save_ac_link"
+             CFLAGS="$ax_pthread_save_CFLAGS"
+             AS_IF([test "x$ax_pthread_try" = "x"], [ax_pthread_try=no])
+             ax_cv_PTHREAD_CLANG_NO_WARN_FLAG="$ax_pthread_try"
+            ])
+
+        case "$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" in
+                no | unknown) ;;
+                *) PTHREAD_CFLAGS="$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG $PTHREAD_CFLAGS" ;;
+        esac
+
+fi # $ax_pthread_clang = yes
+
+if test "x$ax_pthread_ok" = "xno"; then
+for ax_pthread_try_flag in $ax_pthread_flags; do
+
+        case $ax_pthread_try_flag in
+                none)
+                AC_MSG_CHECKING([whether pthreads work without any flags])
+                ;;
+
+                -mt,pthread)
+                AC_MSG_CHECKING([whether pthreads work with -mt -lpthread])
+                PTHREAD_CFLAGS="-mt"
+                PTHREAD_LIBS="-lpthread"
+                ;;
+
+                -*)
+                AC_MSG_CHECKING([whether pthreads work with $ax_pthread_try_flag])
+                PTHREAD_CFLAGS="$ax_pthread_try_flag"
+                ;;
+
+                pthread-config)
+                AC_CHECK_PROG([ax_pthread_config], [pthread-config], [yes], [no])
+                AS_IF([test "x$ax_pthread_config" = "xno"], [continue])
+                PTHREAD_CFLAGS="`pthread-config --cflags`"
+                PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
+                ;;
+
+                *)
+                AC_MSG_CHECKING([for the pthreads library -l$ax_pthread_try_flag])
+                PTHREAD_LIBS="-l$ax_pthread_try_flag"
+                ;;
+        esac
+
+        ax_pthread_save_CFLAGS="$CFLAGS"
+        ax_pthread_save_LIBS="$LIBS"
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+        LIBS="$PTHREAD_LIBS $LIBS"
+
+        # Check for various functions.  We must include pthread.h,
+        # since some functions may be macros.  (On the Sequent, we
+        # need a special flag -Kthread to make this header compile.)
+        # We check for pthread_join because it is in -lpthread on IRIX
+        # while pthread_create is in libc.  We check for pthread_attr_init
+        # due to DEC craziness with -lpthreads.  We check for
+        # pthread_cleanup_push because it is one of the few pthread
+        # functions on Solaris that doesn't have a non-functional libc stub.
+        # We try pthread_create on general principles.
+
+        AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>
+#                       if $ax_pthread_check_cond
+#                        error "$ax_pthread_check_macro must be defined"
+#                       endif
+                        static void routine(void *a) { a = 0; }
+                        static void *start_routine(void *a) { return a; }],
+                       [pthread_t th; pthread_attr_t attr;
+                        pthread_create(&th, 0, start_routine, 0);
+                        pthread_join(th, 0);
+                        pthread_attr_init(&attr);
+                        pthread_cleanup_push(routine, 0);
+                        pthread_cleanup_pop(0) /* ; */])],
+            [ax_pthread_ok=yes],
+            [])
+
+        CFLAGS="$ax_pthread_save_CFLAGS"
+        LIBS="$ax_pthread_save_LIBS"
+
+        AC_MSG_RESULT([$ax_pthread_ok])
+        AS_IF([test "x$ax_pthread_ok" = "xyes"], [break])
+
+        PTHREAD_LIBS=""
+        PTHREAD_CFLAGS=""
+done
+fi
+
+# Various other checks:
+if test "x$ax_pthread_ok" = "xyes"; then
+        ax_pthread_save_CFLAGS="$CFLAGS"
+        ax_pthread_save_LIBS="$LIBS"
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+        LIBS="$PTHREAD_LIBS $LIBS"
+
+        # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
+        AC_CACHE_CHECK([for joinable pthread attribute],
+            [ax_cv_PTHREAD_JOINABLE_ATTR],
+            [ax_cv_PTHREAD_JOINABLE_ATTR=unknown
+             for ax_pthread_attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
+                 AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>],
+                                                 [int attr = $ax_pthread_attr; return attr /* ; */])],
+                                [ax_cv_PTHREAD_JOINABLE_ATTR=$ax_pthread_attr; break],
+                                [])
+             done
+            ])
+        AS_IF([test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xunknown" && \
+               test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xPTHREAD_CREATE_JOINABLE" && \
+               test "x$ax_pthread_joinable_attr_defined" != "xyes"],
+              [AC_DEFINE_UNQUOTED([PTHREAD_CREATE_JOINABLE],
+                                  [$ax_cv_PTHREAD_JOINABLE_ATTR],
+                                  [Define to necessary symbol if this constant
+                                   uses a non-standard name on your system.])
+               ax_pthread_joinable_attr_defined=yes
+              ])
+
+        AC_CACHE_CHECK([whether more special flags are required for pthreads],
+            [ax_cv_PTHREAD_SPECIAL_FLAGS],
+            [ax_cv_PTHREAD_SPECIAL_FLAGS=no
+             case $host_os in
+             solaris*)
+             ax_cv_PTHREAD_SPECIAL_FLAGS="-D_POSIX_PTHREAD_SEMANTICS"
+             ;;
+             esac
+            ])
+        AS_IF([test "x$ax_cv_PTHREAD_SPECIAL_FLAGS" != "xno" && \
+               test "x$ax_pthread_special_flags_added" != "xyes"],
+              [PTHREAD_CFLAGS="$ax_cv_PTHREAD_SPECIAL_FLAGS $PTHREAD_CFLAGS"
+               ax_pthread_special_flags_added=yes])
+
+        AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT],
+            [ax_cv_PTHREAD_PRIO_INHERIT],
+            [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]],
+                                             [[int i = PTHREAD_PRIO_INHERIT;]])],
+                            [ax_cv_PTHREAD_PRIO_INHERIT=yes],
+                            [ax_cv_PTHREAD_PRIO_INHERIT=no])
+            ])
+        AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes" && \
+               test "x$ax_pthread_prio_inherit_defined" != "xyes"],
+              [AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], [1], [Have PTHREAD_PRIO_INHERIT.])
+               ax_pthread_prio_inherit_defined=yes
+              ])
+
+        CFLAGS="$ax_pthread_save_CFLAGS"
+        LIBS="$ax_pthread_save_LIBS"
+
+        # More AIX lossage: compile with *_r variant
+        if test "x$GCC" != "xyes"; then
+            case $host_os in
+                aix*)
+                AS_CASE(["x/$CC"],
+                    [x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6],
+                    [#handle absolute path differently from PATH based program lookup
+                     AS_CASE(["x$CC"],
+                         [x/*],
+                         [AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])],
+                         [AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])])])
+                ;;
+            esac
+        fi
+fi
+
+test -n "$PTHREAD_CC" || PTHREAD_CC="$CC"
+
+AC_SUBST([PTHREAD_LIBS])
+AC_SUBST([PTHREAD_CFLAGS])
+AC_SUBST([PTHREAD_CC])
+
+# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
+if test "x$ax_pthread_ok" = "xyes"; then
+        ifelse([$1],,[AC_DEFINE([HAVE_PTHREAD],[1],[Define if you have POSIX threads libraries and header files.])],[$1])
+        :
+else
+        ax_pthread_ok=no
+        $2
+fi
+AC_LANG_POP
+])dnl AX_PTHREAD
--- a/m4/ax_require_defined.m4
+++ b/m4/ax_require_defined.m4
@@ -0,0 +1,37 @@
+# ===========================================================================
+#    http://www.gnu.org/software/autoconf-archive/ax_require_defined.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_REQUIRE_DEFINED(MACRO)
+#
+# DESCRIPTION
+#
+#   AX_REQUIRE_DEFINED is a simple helper for making sure other macros have
+#   been defined and thus are available for use.  This avoids random issues
+#   where a macro isn't expanded.  Instead the configure script emits a
+#   non-fatal:
+#
+#     ./configure: line 1673: AX_CFLAGS_WARN_ALL: command not found
+#
+#   It's like AC_REQUIRE except it doesn't expand the required macro.
+#
+#   Here's an example:
+#
+#     AX_REQUIRE_DEFINED([AX_CHECK_LINK_FLAG])
+#
+# LICENSE
+#
+#   Copyright (c) 2014 Mike Frysinger <vapier@gentoo.org>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved. This file is offered as-is, without any
+#   warranty.
+
+#serial 1
+
+AC_DEFUN([AX_REQUIRE_DEFINED], [dnl
+  m4_ifndef([$1], [m4_fatal([macro ]$1[ is not defined; is a m4 file missing?])])
+])dnl AX_REQUIRE_DEFINED
--- a/m4/faad.m4
+++ b/m4/faad.m4
@@ -1,102 +0,0 @@
-AC_DEFUN([AM_PATH_FAAD],
-[dnl ##
-dnl faad
-dnl ##
-
-AC_ARG_ENABLE(aac,
-	AS_HELP_STRING([--disable-aac],
-		[disable AAC support (default: enable)]),,
-	enable_aac=yes)
-
-if test x$enable_aac = xyes; then
-	FAAD_LIBS="-lfaad"
-	FAAD_CFLAGS=""
-
-	oldcflags=$CFLAGS
-	oldlibs=$LIBS
-	oldcppflags=$CPPFLAGS
-	CFLAGS="$CFLAGS $FAAD_CFLAGS"
-	LIBS="$LIBS $FAAD_LIBS"
-	CPPFLAGS=$CFLAGS
-	AC_CHECK_HEADER(faad.h,,enable_aac=no)
-	if test x$enable_aac = xyes; then
-		AC_CHECK_DECL(FAAD2_VERSION,,enable_aac=no,[#include <faad.h>])
-	fi
-	if test x$enable_aac = xyes; then
-		AC_CHECK_LIB(faad,NeAACDecInit2,,enable_aac=no)
-	fi
-	if test x$enable_aac = xyes; then
-		AC_MSG_CHECKING(that FAAD2 can even be used)
-		AC_COMPILE_IFELSE([AC_LANG_SOURCE([
-#include <faad.h>
-
-int main() {
-	char buffer;
-	NeAACDecHandle decoder;
-	NeAACDecFrameInfo frameInfo;
-	NeAACDecConfigurationPtr config;
-	unsigned char channels;
-	long sampleRate;
-	long bufferlen = 0;
-
-	decoder = NeAACDecOpen();
-	config = NeAACDecGetCurrentConfiguration(decoder);
-	config->outputFormat = FAAD_FMT_16BIT;
-	NeAACDecSetConfiguration(decoder,config);
-	NeAACDecInit(decoder,&buffer,bufferlen,&sampleRate,&channels);
-	NeAACDecInit2(decoder,&buffer,bufferlen,&sampleRate,&channels);
-	NeAACDecDecode(decoder,&frameInfo,&buffer,bufferlen);
-	NeAACDecClose(decoder);
-
-	return 0;
-}
-])],AC_MSG_RESULT(yes),[AC_MSG_RESULT(no);enable_aac=no])
-	fi
-	if test x$enable_aac = xyes; then
-		AC_DEFINE(HAVE_FAAD,1,[Define to use FAAD2 for AAC decoding])
-	else
-		AC_MSG_WARN([faad2 lib needed for MP4/AAC support -- disabling MP4/AAC support])
-	fi
-	CFLAGS=$oldcflags
-	LIBS=$oldlibs
-	CPPFLAGS=$oldcppflags
-fi
-
-if test x$enable_aac = xyes; then
-	oldcflags=$CFLAGS
-	oldlibs=$LIBS
-	oldcppflags=$CPPFLAGS
-	CFLAGS="$CFLAGS $FAAD_CFLAGS -Werror"
-	LIBS="$LIBS $FAAD_LIBS"
-	CPPFLAGS=$CFLAGS
-
-	AC_MSG_CHECKING(for broken libfaad headers)
-	AC_COMPILE_IFELSE([AC_LANG_SOURCE([
-#include <faad.h>
-#include <stddef.h>
-#include <stdint.h>
-
-int main() {
-	unsigned char channels;
-	uint32_t sample_rate;
-
-	NeAACDecInit2(NULL, NULL, 0, &sample_rate, &channels);
-	return 0;
-}
-	])],
-		[AC_MSG_RESULT(correct)],
-		[AC_MSG_RESULT(broken);
-		AC_DEFINE(HAVE_FAAD_LONG, 1, [Define if faad.h uses the broken "unsigned long" pointers])])
-
-	CFLAGS=$oldcflags
-	LIBS=$oldlibs
-	CPPFLAGS=$oldcppflags
-else
-	FAAD_LIBS=""
-	FAAD_CFLAGS=""
-fi
-
-AC_SUBST(FAAD_CFLAGS)
-AC_SUBST(FAAD_LIBS)
-
-])
--- a/m4/mpd_auto.m4
+++ b/m4/mpd_auto.m4
@@ -1,23 +1,18 @@
+dnl Parameters: varname1, description
 AC_DEFUN([MPD_AUTO_ENABLED], [
-	var="enable_$1"
-	feature="$2"
-
-	if eval "test x`echo '$'$var` = xauto"; then
-		AC_MSG_NOTICE([auto-detected $feature])
-		eval "$var=yes"
+	if test x$[]enable_$1 = xauto; then
+		AC_MSG_NOTICE([auto-detected $2])
+		enable_$1=yes
 	fi
 ])

+dnl Parameters: varname1, description, errmsg
 AC_DEFUN([MPD_AUTO_DISABLED], [
-	var="enable_$1"
-	feature="$2"
-	msg="$3"
-
-	if eval "test x`echo '$'$var` = xauto"; then
-		AC_MSG_WARN([$msg -- disabling $feature])
-		eval "$var=no"
-	elif eval "test x`echo '$'$var` = xyes"; then
-		AC_MSG_ERROR([$feature: $msg])
+	if test x$[]enable_$1 = xauto; then
+		AC_MSG_WARN([$3 -- disabling $2])
+		enable_$1=no
+	elif test x$[]enable_$1 = xyes; then
+		AC_MSG_ERROR([$2: $3])
 	fi
 ])

@@ -25,59 +20,59 @@ dnl Check whether a prerequisite for a feature was found.  This is
 dnl very similar to MPD_AUTO_RESULT, but does not finalize the
 dnl detection; it assumes that more checks will follow.
 AC_DEFUN([MPD_AUTO_PRE], [
-	name="$1"
-	var="enable_$1"
-	found="found_$name"
-	feature="$2"
-	msg="$3"
-
-	if eval "test x`echo '$'$var` != xno" && eval "test x`echo '$'$found` = xno"; then
-                MPD_AUTO_DISABLED([$name], [$feature], [$msg])
+	if test x$[]enable_$1 != xno && test x$[]found_$1 = xno; then
+                MPD_AUTO_DISABLED([$1], [$2], [$3])
 	fi
 ])

+dnl Evaluate a check's result.  Abort if the feature was requested
+dnl explicitly but is unavailable.
+dnl
+dnl Parameters: varname1, description, errmsg
 AC_DEFUN([MPD_AUTO_RESULT], [
-	name="$1"
-	var="enable_$1"
-	found="found_$name"
-	feature="$2"
-	msg="$3"
-
-	if eval "test x`echo '$'$var` = xno"; then
-		eval "$found=no"
+	if test x$[]enable_$1 = xno; then
+		found_$1=no
 	fi

-	if eval "test x`echo '$'$found` = xyes"; then
-                MPD_AUTO_ENABLED([$name], [$feature])
+	if test x$[]found_$1 = xyes; then
+                MPD_AUTO_ENABLED([$1], [$2])
 	else
-                MPD_AUTO_DISABLED([$name], [$feature], [$msg])
+                MPD_AUTO_DISABLED([$1], [$2], [$3])
 	fi
 ])

-AC_DEFUN([MPD_AUTO_PKG], [
-	if eval "test x`echo '$'enable_$1` != xno"; then
-		PKG_CHECK_MODULES([$2], [$3],
-			[eval "found_$1=yes"],
-			[eval "found_$1=no"])
+dnl Invoke a check if its configuration is "yes" or "auto" and call
+dnl MPD_AUTO_RESULT.
+dnl
+dnl Parameters: varname1, description, errmsg, check
+AC_DEFUN([MPD_AUTO], [
+	if test x$[]enable_$1 != xno; then
+		$4
 	fi
+	MPD_AUTO_RESULT([$1], [$2], [$3])
+])

-	MPD_AUTO_RESULT([$1], [$4], [$5])
+dnl Wrapper for MPD_AUTO and PKG_CHECK_MODULES.
+dnl
+dnl Parameters: varname1, varname2, pkgname, description, errmsg
+AC_DEFUN([MPD_AUTO_PKG], [
+	MPD_AUTO([$1], [$4], [$5],
+		[PKG_CHECK_MODULES([$2], [$3],
+			[found_$1=yes],
+			[found_$1=no])])
 ])

 dnl Check with pkg-config first, fall back to AC_CHECK_LIB.
 dnl
 dnl Parameters: varname1, varname2, pkgname, libname, symname, libs, cflags, description, errmsg
 AC_DEFUN([MPD_AUTO_PKG_LIB], [
-	if eval "test x`echo '$'enable_$1` != xno"; then
-		PKG_CHECK_MODULES([$2], [$3],
-			[eval "found_$1=yes"],
+	MPD_AUTO([$1], [$8], [$9],
+		[PKG_CHECK_MODULES([$2], [$3],
+			[found_$1=yes],
 			AC_CHECK_LIB($4, $5,
-				[eval "found_$1=yes $2_LIBS='$6' $2_CFLAGS='$7'"],
-				[eval "found_$1=no"],
-				[$6]))
-	fi
-
-	MPD_AUTO_RESULT([$1], [$8], [$9])
+				[found_$1=yes $2_LIBS='$6' $2_CFLAGS='$7'],
+				[found_$1=no],
+				[$6]))])
 ])

 dnl Wrapper for AC_CHECK_LIB.
@@ -87,12 +82,104 @@ AC_DEFUN([MPD_AUTO_LIB], [
 	AC_SUBST([$2_LIBS], [])
 	AC_SUBST([$2_CFLAGS], [])

-	if eval "test x`echo '$'enable_$1` != xno"; then
-		AC_CHECK_LIB($3, $4,
-			[eval "found_$1=yes $2_LIBS='$5' $2_CFLAGS='$6'"],
-			[eval "found_$1=no"],
-			[$5])
-	fi
-
-	MPD_AUTO_RESULT([$1], [$7], [$8])
+	MPD_AUTO([$1], [$7], [$8],
+		[AC_CHECK_LIB($3, $4,
+			[found_$1=yes $2_LIBS='$5' $2_CFLAGS='$6'],
+			[found_$1=no],
+			[$5])])
+])
+
+dnl Wrapper for AC_CHECK_HEADER.
+dnl
+dnl Parameters: varname1, varname2, header, libs, cflags, description, errmsg
+AC_DEFUN([MPD_AUTO_HEADER], [
+	AC_SUBST([$2_LIBS], [])
+	AC_SUBST([$2_CFLAGS], [])
+
+	MPD_AUTO([$1], [$6], [$7],
+		[AC_CHECK_HEADER([$3],
+			[found_$1=yes $2_LIBS='$4' $2_CFLAGS='$5'],
+			[found_$1=no])])
+])
+
+dnl Convert the given string into a string for the "default value" in
+dnl the help text.  If the string is a literal, then it is returned
+dnl as-is; if it contains a variable reference, just "auto" is
+dnl emitted.
+dnl
+dnl Parameters: varname1
+AC_DEFUN([MPD_FORMAT_DEFAULT],
+	[ifelse([$1], [], [auto],
+		index([$1], [$]), [-1], [$1],
+		[auto])])
+
+dnl Wrapper for AC_ARG_ENABLE, AC_DEFINE and AM_CONDITIONAL
+dnl
+dnl Parameters: varname1, varname2, description, default, check
+AC_DEFUN([MPD_ARG_ENABLE], [
+	AC_ARG_ENABLE(translit([$1], [_], [-]),
+		AS_HELP_STRING([--enable-]translit([$1], [_], [-]),
+			[enable $3 (default: ]MPD_FORMAT_DEFAULT([$4])[)]),,
+		[enable_$1=]ifelse([$4], [], [auto], [$4]))
+
+	$5
+
+	MPD_DEFINE_CONDITIONAL(enable_$1, ENABLE_$2, [$3])
+])
+
+dnl Wrapper for MPD_ARG_ENABLE and MPD_AUTO
+dnl
+dnl Parameters: varname1, varname2, description, errmsg, default, check
+AC_DEFUN([MPD_ENABLE_AUTO], [
+	MPD_ARG_ENABLE([$1], [$2], [$3], [$5], [
+		MPD_AUTO([$1], [$3], [$4], [$6])
+	])
+])
+
+dnl Wrapper for AC_ARG_ENABLE and MPD_AUTO_PKG
+dnl
+dnl Parameters: varname1, varname2, pkg, description, errmsg, default, pre
+AC_DEFUN([MPD_ENABLE_AUTO_PKG], [
+	MPD_ARG_ENABLE([$1], [$2], [$4], [$6], [
+		$7
+		MPD_AUTO_PKG($1, $2, $3, $4, $5)
+	])
+])
+
+dnl Wrapper for AC_ARG_ENABLE and MPD_AUTO_PKG_LIB
+dnl
+dnl Parameters: varname1, varname2, pkg, libname, symname, libs, cflags, description, errmsg, default, pre
+AC_DEFUN([MPD_ENABLE_AUTO_PKG_LIB], [
+	MPD_ARG_ENABLE([$1], [$2], [$8], [$10], [
+		$11
+		MPD_AUTO_PKG_LIB($1, $2, $3, $4, $5, $6, $7, $8, $9)
+	])
+])
+
+dnl Wrapper for AC_ARG_ENABLE and MPD_AUTO_LIB
+dnl
+dnl Parameters: varname1, varname2, libname, symname, libs, cflags, description, errmsg, default, pre
+AC_DEFUN([MPD_ENABLE_AUTO_LIB], [
+	MPD_ARG_ENABLE([$1], [$2], [$7], [$9], [
+		$10
+		MPD_AUTO_LIB($1, $2, $3, $4, $5, $6, $7, $8)
+	])
+])
+
+dnl Wrapper for AC_ARG_ENABLE and MPD_AUTO_HEADER
+dnl
+dnl Parameters: varname1, varname2, header, libs, cflags, description, errmsg, default, pre
+AC_DEFUN([MPD_ENABLE_AUTO_HEADER], [
+	MPD_ARG_ENABLE([$1], [$2], [$6], [$8], [
+		$9
+		MPD_AUTO_HEADER($1, $2, $3, $4, $5, $6, $7)
+	])
+])
+
+dnl Wrapper for MPD_ENABLE_AUTO_PKG and MPD_DEPENDS
+dnl
+dnl Parameters: varname1, varname2, pkg, description, errmsg, default, dep_variable, dep_errmsg
+AC_DEFUN([MPD_ENABLE_AUTO_PKG_DEPENDS], [
+	MPD_ENABLE_AUTO_PKG([$1], [$2], [$3], [$4], [$5], [$6],
+		[MPD_DEPENDS([enable_$1], [$7], [$8])])
 ])
--- a/m4/mpd_define_conditional.m4
+++ b/m4/mpd_define_conditional.m4
@@ -0,0 +1,8 @@
+dnl Wrapper for AC_DEFINE and AM_CONDITIONAL
+dnl
+dnl Parameters: varname1, varname2, description
+AC_DEFUN([MPD_DEFINE_CONDITIONAL], [dnl
+	AM_CONDITIONAL($2, test x$[]$1 = xyes)
+	if test x$[]$1 = xyes; then
+		AC_DEFINE($2, 1, [Define to enable $3])
+	fi])
--- a/m4/mpd_depends.m4
+++ b/m4/mpd_depends.m4
@@ -0,0 +1,9 @@
+AC_DEFUN([MPD_DEPENDS], [
+	if test x$$2 = xno; then
+		if test x$$1 = xauto; then
+			$1=no
+		elif test x$$1 = xyes; then
+			AC_MSG_ERROR([$3])
+		fi
+	fi
+])
--- a/m4/mpd_func.m4
+++ b/m4/mpd_func.m4
@@ -6,7 +6,20 @@ AC_DEFUN([MPD_OPTIONAL_FUNC], [
 	AC_ARG_ENABLE([$1],
 		AS_HELP_STRING([--enable-$1],
 			[use the function "$1" (default: auto)]),
-		[test xenable_$1 = xyes && AC_DEFINE([$3], 1, [Define to use $1])],
+		[test x$[]enable_$1 = xyes && AC_DEFINE([$3], 1, [Define to use $1])],
 		[AC_CHECK_FUNC([$2],
 			[AC_DEFINE([$3], 1, [Define to use $1])],)])
 ])
+
+dnl MPD_OPTIONAL_FUNC_NODEF(name, func)
+dnl
+dnl Allow the user to enable or disable the use of a function.
+dnl Works similar to MPD_OPTIONAL_FUNC, however MPD_OPTIONAL_FUNC_NODEF
+dnl does not invoke AC_DEFINE when function is enabled. Shell variable
+dnl enable_$name is set to "yes" instead.
+AC_DEFUN([MPD_OPTIONAL_FUNC_NODEF], [
+	AC_ARG_ENABLE([$1],
+		AS_HELP_STRING([--enable-$1],
+			[use the function "$1" (default: auto)]),,
+		[AC_CHECK_FUNC([$2], [enable_$1=yes],)])
+])
--- a/m4/mpd_with_flags.m4
+++ b/m4/mpd_with_flags.m4
@@ -0,0 +1,23 @@
+dnl Run code with the specified CFLAGS/CXXFLAGS and LIBS appended.
+dnl Restores the old values afterwards.
+dnl
+dnl Parameters: cflags, libs, code
+AC_DEFUN([MPD_WITH_FLAGS], [
+	ac_save_CFLAGS="$[]CFLAGS"
+	ac_save_CXXFLAGS="$[]CXXFLAGS"
+	ac_save_LIBS="$[]LIBS"
+	CFLAGS="$[]CFLAGS $1"
+	CXXFLAGS="$[]CXXFLAGS $1"
+	LIBS="$[]LIBS $2"
+	$3
+	CFLAGS="$[]ac_save_CFLAGS"
+	CXXFLAGS="$[]ac_save_CXXFLAGS"
+	LIBS="$[]ac_save_LIBS"
+])
+
+dnl Run code with the specified library's CFLAGS/CXXFLAGS and LIBS
+dnl appended.  Restores the old values afterwards.
+dnl
+dnl Parameters: libname, code
+AC_DEFUN([MPD_WITH_LIBRARY],
+	[MPD_WITH_FLAGS([$[]$1_CFLAGS], [$[]$1_LIBS], [$2])])
--- a/m4/pkg.m4
+++ b/m4/pkg.m4
@@ -1,32 +1,68 @@
-# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
-# 
-# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
+dnl pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-
+dnl serial 11 (pkg-config-0.29)
+dnl
+dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
+dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful, but
+dnl WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+dnl General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+dnl 02111-1307, USA.
+dnl
+dnl As a special exception to the GNU General Public License, if you
+dnl distribute this file as part of a program that contains a
+dnl configuration script generated by Autoconf, you may include it under
+dnl the same distribution terms that you use for the rest of that
+dnl program.

-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-# ----------------------------------
+dnl PKG_PREREQ(MIN-VERSION)
+dnl -----------------------
+dnl Since: 0.29
+dnl
+dnl Verify that the version of the pkg-config macros are at least
+dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's
+dnl installed version of pkg-config, this checks the developer's version
+dnl of pkg.m4 when generating configure.
+dnl
+dnl To ensure that this macro is defined, also add:
+dnl m4_ifndef([PKG_PREREQ],
+dnl     [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])])
+dnl
+dnl See the "Since" comment for each macro you use to see what version
+dnl of the macros you require.
+m4_defun([PKG_PREREQ],
+[m4_define([PKG_MACROS_VERSION], [0.29])
+m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
+    [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
+])dnl PKG_PREREQ
+
+dnl PKG_PROG_PKG_CONFIG([MIN-VERSION])
+dnl ----------------------------------
+dnl Since: 0.16
+dnl
+dnl Search for the pkg-config tool and set the PKG_CONFIG variable to
+dnl first found in the path. Checks that the version of pkg-config found
+dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is
+dnl used since that's the first version where most current features of
+dnl pkg-config existed.
 AC_DEFUN([PKG_PROG_PKG_CONFIG],
 [m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
+
 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
 	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
 fi
@@ -39,48 +75,49 @@ if test -n "$PKG_CONFIG"; then
 		AC_MSG_RESULT([no])
 		PKG_CONFIG=""
 	fi
-		
 fi[]dnl
-])# PKG_PROG_PKG_CONFIG
+])dnl PKG_PROG_PKG_CONFIG

-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-#
-# Check to see whether a particular set of modules exists.  Similar
-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
-#
-#
-# Similar to PKG_CHECK_MODULES, make sure that the first instance of
-# this or PKG_CHECK_MODULES is called, or make sure to call
-# PKG_CHECK_EXISTS manually
-# --------------------------------------------------------------
+dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+dnl -------------------------------------------------------------------
+dnl Since: 0.18
+dnl
+dnl Check to see whether a particular set of modules exists. Similar to
+dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
+dnl
+dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+dnl only at the first occurence in configure.ac, so if the first place
+dnl it's called might be skipped (such as if it is within an "if", you
+dnl have to call PKG_CHECK_EXISTS manually
 AC_DEFUN([PKG_CHECK_EXISTS],
 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
 if test -n "$PKG_CONFIG" && \
    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
-  m4_ifval([$2], [$2], [:])
+  m4_default([$2], [:])
 m4_ifvaln([$3], [else
  $3])dnl
 fi])

-
-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-# ---------------------------------------------
+dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+dnl ---------------------------------------------
+dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting
+dnl pkg_failed based on the result.
 m4_define([_PKG_CONFIG],
-[if test -n "$PKG_CONFIG"; then
-    if test -n "$$1"; then
-        pkg_cv_[]$1="$$1"
-    else
-        PKG_CHECK_EXISTS([$3],
-                         [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
-			 [pkg_failed=yes])
-    fi
-else
-	pkg_failed=untried
+[if test -n "$$1"; then
+    pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+    PKG_CHECK_EXISTS([$3],
+                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes ],
+		     [pkg_failed=yes])
+ else
+    pkg_failed=untried
 fi[]dnl
-])# _PKG_CONFIG
+])dnl _PKG_CONFIG

-# _PKG_SHORT_ERRORS_SUPPORTED
-# -----------------------------
+dnl _PKG_SHORT_ERRORS_SUPPORTED
+dnl ---------------------------
+dnl Internal check to see if pkg-config supports short errors.
 AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -88,19 +125,17 @@ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
 else
        _pkg_short_errors_supported=no
 fi[]dnl
-])# _PKG_SHORT_ERRORS_SUPPORTED
+])dnl _PKG_SHORT_ERRORS_SUPPORTED


-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-# [ACTION-IF-NOT-FOUND])
-#
-#
-# Note that if there is a possibility the first call to
-# PKG_CHECK_MODULES might not happen, you should be sure to include an
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-#
-#
-# --------------------------------------------------------------
+dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+dnl   [ACTION-IF-NOT-FOUND])
+dnl --------------------------------------------------------------
+dnl Since: 0.4.0
+dnl
+dnl Note that if there is a possibility the first call to
+dnl PKG_CHECK_MODULES might not happen, you should be sure to include an
+dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
 AC_DEFUN([PKG_CHECK_MODULES],
 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
 AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
@@ -117,16 +152,17 @@ and $1[]_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.])

 if test $pkg_failed = yes; then
+   	AC_MSG_RESULT([no])
        _PKG_SHORT_ERRORS_SUPPORTED
        if test $_pkg_short_errors_supported = yes; then
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
        else 
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
        fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD

-	ifelse([$4], , [AC_MSG_ERROR(dnl
+	m4_default([$4], [AC_MSG_ERROR(
 [Package requirements ($2) were not met:

 $$1_PKG_ERRORS
@@ -134,24 +170,106 @@ $$1_PKG_ERRORS
 Consider adjusting the PKG_CONFIG_PATH environment variable if you
 installed software in a non-standard prefix.

-_PKG_TEXT
-])],
-		[AC_MSG_RESULT([no])
-                $4])
+_PKG_TEXT])[]dnl
+        ])
 elif test $pkg_failed = untried; then
-	ifelse([$4], , [AC_MSG_FAILURE(dnl
+     	AC_MSG_RESULT([no])
+	m4_default([$4], [AC_MSG_FAILURE(
 [The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.

 _PKG_TEXT

-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
-		[$4])
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
+        ])
 else
 	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
 	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
        AC_MSG_RESULT([yes])
-	ifelse([$3], , :, [$3])
+	$3
 fi[]dnl
-])# PKG_CHECK_MODULES
+])dnl PKG_CHECK_MODULES
+
+
+dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+dnl   [ACTION-IF-NOT-FOUND])
+dnl ---------------------------------------------------------------------
+dnl Since: 0.29
+dnl
+dnl Checks for existence of MODULES and gathers its build flags with
+dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags
+dnl and VARIABLE-PREFIX_LIBS from --libs.
+dnl
+dnl Note that if there is a possibility the first call to
+dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to
+dnl include an explicit call to PKG_PROG_PKG_CONFIG in your
+dnl configure.ac.
+AC_DEFUN([PKG_CHECK_MODULES_STATIC],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+_save_PKG_CONFIG=$PKG_CONFIG
+PKG_CONFIG="$PKG_CONFIG --static"
+PKG_CHECK_MODULES($@)
+PKG_CONFIG=$_save_PKG_CONFIG[]dnl
+])dnl PKG_CHECK_MODULES_STATIC
+
+
+dnl PKG_INSTALLDIR([DIRECTORY])
+dnl -------------------------
+dnl Since: 0.27
+dnl
+dnl Substitutes the variable pkgconfigdir as the location where a module
+dnl should install pkg-config .pc files. By default the directory is
+dnl $libdir/pkgconfig, but the default can be changed by passing
+dnl DIRECTORY. The user can override through the --with-pkgconfigdir
+dnl parameter.
+AC_DEFUN([PKG_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+    [pkg-config installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([pkgconfigdir],
+    [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
+    [with_pkgconfigdir=]pkg_default)
+AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+])dnl PKG_INSTALLDIR
+
+
+dnl PKG_NOARCH_INSTALLDIR([DIRECTORY])
+dnl --------------------------------
+dnl Since: 0.27
+dnl
+dnl Substitutes the variable noarch_pkgconfigdir as the location where a
+dnl module should install arch-independent pkg-config .pc files. By
+dnl default the directory is $datadir/pkgconfig, but the default can be
+dnl changed by passing DIRECTORY. The user can override through the
+dnl --with-noarch-pkgconfigdir parameter.
+AC_DEFUN([PKG_NOARCH_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+    [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([noarch-pkgconfigdir],
+    [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
+    [with_noarch_pkgconfigdir=]pkg_default)
+AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+])dnl PKG_NOARCH_INSTALLDIR
+
+
+dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
+dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+dnl -------------------------------------------
+dnl Since: 0.28
+dnl
+dnl Retrieves the value of the pkg-config variable for the given module.
+AC_DEFUN([PKG_CHECK_VAR],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
+
+_PKG_CONFIG([$1], [variable="][$3]["], [$2])
+AS_VAR_COPY([$1], [pkg_cv_][$1])
+
+AS_VAR_IF([$1], [""], [$5], [$4])dnl
+])dnl PKG_CHECK_VAR
--- a/m4/pretty_print.m4
+++ b/m4/pretty_print.m4
@@ -1,16 +1,6 @@
 AC_DEFUN([results], [
-	dnl This is a hack to allow "with" names, otherwise "enable".
-	num=`expr $1 : 'with'`
-	if test "$num" != "0"; then
-		var="`echo '$'$1`"
-	else
-		var="`echo '$'enable_$1`"
-	fi
-
 	printf '('
-	if eval "test x$var = xyes"; then
-		printf '+'
-	elif test -n "$3" && eval "test x$var = x$3"; then
+	if test x$[]enable_$1 = xyes; then
 		printf '+'
 	else
 		printf '-'
--- a/m4/ucred.m4
+++ b/m4/ucred.m4
@@ -1,5 +1,4 @@
-# Check if "struct ucred" is available.  If not, try harder with
-# _GNU_SOURCE.
+# Check if "struct ucred" is available.
 #
 # Author: Max Kellermann <max@duempel.org>

@@ -10,19 +9,6 @@ AC_DEFUN([STRUCT_UCRED],[
 			[struct ucred cred;],
 			mpd_cv_have_struct_ucred=yes,
 			mpd_cv_have_struct_ucred=no)
-		if test x$mpd_cv_have_struct_ucred = xno; then
-			# glibc 2.8 forces _GNU_SOURCE on us
-			AC_TRY_COMPILE(
-				[#define _GNU_SOURCE
-				 #include <sys/socket.h>],
-				[struct ucred cred;],
-				mpd_cv_have_struct_ucred=yes,
-				mpd_cv_have_struct_ucred=no)
-			if test x$mpd_cv_have_struct_ucred = xyes; then
-				# :(
-				CFLAGS="$CFLAGS -D_GNU_SOURCE"
-			fi
-		fi
 		])

 	AC_MSG_RESULT($mpd_cv_have_struct_ucred)
--- a/mpd.service.in
+++ b/mpd.service.in
@@ -1,9 +0,0 @@
-[Unit]
-Description=Music Player Daemon
-After=network.target sound.target
-
-[Service]
-ExecStart=@prefix@/bin/mpd --no-daemon
-
-[Install]
-WantedBy=multi-user.target
--- a/mpd.svg
+++ b/mpd.svg
@@ -0,0 +1,857 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Sodipodi ("http://www.sodipodi.com/") -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   x="0"
+   y="0"
+   width="128"
+   height="128"
+   id="svg1"
+   sodipodi:version="0.32"
+   sodipodi:docname="mpd.svg"
+   inkscape:version="0.47pre4 r22446"
+   inkscape:export-filename="/cowserver/documents/httpd/vhosts/images/mpd-test5.png"
+   inkscape:export-xdpi="76.799988"
+   inkscape:export-ydpi="76.799988">
+  <sodipodi:namedview
+     id="base"
+     inkscape:zoom="2.6884788"
+     inkscape:cx="71.610485"
+     inkscape:cy="61.484977"
+     inkscape:window-width="1680"
+     inkscape:window-height="994"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     showgrid="false"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg1" />
+  <defs
+     id="defs3">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 80 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="160 : 80 : 1"
+       inkscape:persp3d-origin="80 : 53.333333 : 1"
+       id="perspective118" />
+    <linearGradient
+       id="linearGradient919">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.86092716;"
+         offset="0.0000000"
+         id="stop920" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.0000000;"
+         offset="1.0000000"
+         id="stop921" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient1068">
+      <stop
+         offset="0.0000000"
+         style="stop-color:#d2d2d2;stop-opacity:1.0000000;"
+         id="stop1070" />
+      <stop
+         offset="1.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         id="stop1069" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient1065">
+      <stop
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         id="stop1067" />
+      <stop
+         offset="1.0000000"
+         style="stop-color:#c2bfbf;stop-opacity:0.99607843;"
+         id="stop1066" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient1060">
+      <stop
+         offset="0.0000000"
+         style="stop-color:#878787;stop-opacity:1.0000000;"
+         id="stop1063" />
+      <stop
+         offset="1.0000000"
+         style="stop-color:#000000;stop-opacity:0.99607843;"
+         id="stop1061" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient645">
+      <stop
+         style="stop-color:#aca597;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop646" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop647" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient593">
+      <stop
+         style="stop-color:#478acf;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop594" />
+      <stop
+         style="stop-color:#65c6f7;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop595" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient574">
+      <stop
+         style="stop-color:#85ad92;stop-opacity:1.0000;"
+         offset="0"
+         id="stop575" />
+      <stop
+         style="stop-color:#559db2;stop-opacity:0.7725;"
+         offset="1"
+         id="stop576" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient570">
+      <stop
+         style="stop-color:#999999;stop-opacity:0.7176;"
+         offset="0"
+         id="stop571" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.3725;"
+         offset="1"
+         id="stop572" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient573"
+       xlink:href="#linearGradient1068"
+       x1="40.458553"
+       y1="389.65582"
+       x2="36.063946"
+       y2="357.28375"
+       gradientTransform="matrix(2.3025192,0,0,0.29683004,-0.91913426,-1.5117091)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient1213"
+       xlink:href="#linearGradient1068"
+       x1="123.71407"
+       y1="141.41566"
+       x2="98.353867"
+       y2="113.41083"
+       gradientTransform="matrix(0.91680324,0,0,0.74547827,-0.91913426,-1.5117091)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       id="radialGradient581"
+       xlink:href="#linearGradient919"
+       cx="0.095785439"
+       cy="0.16814159"
+       r="1.5409589"
+       fx="0.095785439"
+       fy="0.16814159" />
+    <linearGradient
+       id="linearGradient580"
+       xlink:href="#linearGradient1068"
+       x1="132.0352"
+       y1="135.68469"
+       x2="119.62381"
+       y2="111.07157"
+       gradientTransform="matrix(0.90170536,0,0,0.75796032,-0.91913426,-1.5117091)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#linearGradient1060"
+       id="linearGradient901"
+       x1="0.93491787"
+       y1="0.92044502"
+       x2="-0.052546836"
+       y2="0.20347559" />
+    <linearGradient
+       xlink:href="#linearGradient593"
+       id="linearGradient902" />
+    <linearGradient
+       xlink:href="#linearGradient1068"
+       id="linearGradient916"
+       x1="0.14831461"
+       y1="-1.6875"
+       x2="0.43370786"
+       y2="1.8125" />
+    <defs
+       id="defs890">
+      <linearGradient
+         id="linearGradient922"
+         x1="0"
+         y1="0.5"
+         x2="1"
+         y2="0.5"
+         gradientUnits="objectBoundingBox"
+         spreadMethod="pad"
+         xlink:href="#linearGradient1065" />
+      <linearGradient
+         id="linearGradient908"
+         x1="0"
+         y1="0.5"
+         x2="1"
+         y2="0.5"
+         gradientUnits="objectBoundingBox"
+         spreadMethod="pad"
+         xlink:href="#linearGradient1060" />
+      <linearGradient
+         id="linearGradient894"
+         x1="0"
+         y1="0.5"
+         x2="1"
+         y2="0.5"
+         gradientUnits="objectBoundingBox"
+         spreadMethod="pad"
+         xlink:href="#linearGradient1068" />
+      <linearGradient
+         xlink:href="#linearGradient894"
+         id="linearGradient897"
+         x1="0.5955056"
+         y1="-0.33587787"
+         x2="0.61348313"
+         y2="1.1908396" />
+      <linearGradient
+         xlink:href="#linearGradient894"
+         id="linearGradient898"
+         x1="0.96449792"
+         y1="1.0278323"
+         x2="0.46738392"
+         y2="0.21800731" />
+      <linearGradient
+         xlink:href="#linearGradient908"
+         id="linearGradient907"
+         x1="0.57078654"
+         y1="2.3770492"
+         x2="0.33258426"
+         y2="0.49180329" />
+      <linearGradient
+         xlink:href="#linearGradient922"
+         id="linearGradient921"
+         x1="0.47058824"
+         y1="0.15384616"
+         x2="0.46547315"
+         y2="0.98380566" />
+      <linearGradient
+         xlink:href="#linearGradient922"
+         id="linearGradient948" />
+      <defs
+         id="defs987">
+        <linearGradient
+           id="linearGradient855"
+           x1="0"
+           y1="0.5"
+           x2="1"
+           y2="0.5"
+           gradientUnits="objectBoundingBox"
+           spreadMethod="pad"
+           xlink:href="#linearGradient908" />
+        <linearGradient
+           id="linearGradient1188"
+           x1="0"
+           y1="0.5"
+           x2="1"
+           y2="0.5"
+           gradientUnits="objectBoundingBox"
+           spreadMethod="pad"
+           xlink:href="#linearGradient922" />
+        <linearGradient
+           id="linearGradient831">
+          <stop
+             style="stop-color:#94897f;stop-opacity:1.0000000;"
+             offset="0.0000000"
+             id="stop832" />
+          <stop
+             style="stop-color:#fff5fe;stop-opacity:1.0000000;"
+             offset="1.0000000"
+             id="stop833" />
+        </linearGradient>
+        <linearGradient
+           xlink:href="#linearGradient1188"
+           id="linearGradient834"
+           x1="0.87550199"
+           y1="0.34817815"
+           x2="-0.29317269"
+           y2="0.93522269"
+           gradientUnits="objectBoundingBox"
+           spreadMethod="pad" />
+        <radialGradient
+           xlink:href="#linearGradient1188"
+           id="radialGradient835"
+           r="0.55628061"
+           fy="0.28125"
+           fx="0.59090906"
+           cy="0.28125"
+           cx="0.59090906"
+           spreadMethod="pad" />
+        <linearGradient
+           xlink:href="#linearGradient1188"
+           id="linearGradient893"
+           x1="0.12793733"
+           y1="0.76923078"
+           x2="0.49608356"
+           y2="0.70850199" />
+        <linearGradient
+           xlink:href="#linearGradient855"
+           id="linearGradient625"
+           x1="0.035955057"
+           y1="1.0276498"
+           x2="0.053932585"
+           y2="-0.359447" />
+        <linearGradient
+           xlink:href="#linearGradient1188"
+           id="linearGradient627"
+           x1="1.2826855"
+           y1="0.12550607"
+           x2="-0.15547703"
+           y2="0.96356273" />
+        <radialGradient
+           xlink:href="#linearGradient1188"
+           id="radialGradient628"
+           r="1.5982224"
+           fy="0.4866707"
+           fx="0.36789617"
+           cy="0.4866707"
+           cx="0.36789617"
+           gradientTransform="scale(0.877379,1.139758)" />
+        <linearGradient
+           xlink:href="#linearGradient1188"
+           id="linearGradient628"
+           x1="0.76923078"
+           y1="0.14979757"
+           x2="0.41909814"
+           y2="0.73279351" />
+      </defs>
+      <sodipodi:namedview
+         id="namedview898"
+         pagecolor="#ffffff"
+         bordercolor="#666666"
+         borderopacity="1.0"
+         inkscape:pageopacity="0.0"
+         inkscape:pageshadow="2"
+         inkscape:zoom="3.4732669"
+         inkscape:cx="50.051177"
+         inkscape:cy="18.096983"
+         inkscape:window-width="1022"
+         inkscape:window-height="670"
+         showguides="false"
+         snaptoguides="false"
+         showgrid="false"
+         snaptogrid="false"
+         inkscape:window-x="0"
+         inkscape:window-y="25">
+        <sodipodi:guide
+           orientation="vertical"
+           position="28.705556"
+           id="guide879" />
+        <sodipodi:guide
+           orientation="horizontal"
+           position="30.130655"
+           id="guide880" />
+      </sodipodi:namedview>
+    </defs>
+    <sodipodi:namedview
+       id="namedview1003"
+       pagecolor="#ffffff"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="1.3368738"
+       inkscape:cx="24.541029"
+       inkscape:cy="14.368596"
+       inkscape:window-width="640"
+       inkscape:window-height="499"
+       showguides="true"
+       snaptoguides="true"
+       inkscape:window-x="138"
+       inkscape:window-y="169" />
+    <linearGradient
+       xlink:href="#linearGradient1060"
+       id="linearGradient1304"
+       x1="-0.20218579"
+       y1="0.21681416"
+       x2="0.67759562"
+       y2="0.57522124" />
+    <linearGradient
+       xlink:href="#linearGradient1065"
+       id="linearGradient1322"
+       x1="0.32404181"
+       y1="0.77876109"
+       x2="0.24041812"
+       y2="0.26548672" />
+    <defs
+       id="defs989">
+      <linearGradient
+         id="linearGradient850">
+        <stop
+           style="stop-color:#eed680;stop-opacity:1.0000000;"
+           offset="0.0000000"
+           id="stop852" />
+        <stop
+           style="stop-color:#dfb546;stop-opacity:1.0000000;"
+           offset="0.68035328"
+           id="stop858" />
+        <stop
+           style="stop-color:#d8a429;stop-opacity:1.0000000;"
+           offset="0.77277374"
+           id="stop859" />
+        <stop
+           style="stop-color:#d1940c;stop-opacity:1.0000000;"
+           offset="1.0000000"
+           id="stop857" />
+      </linearGradient>
+      <linearGradient
+         xlink:href="#linearGradient850"
+         id="linearGradient569"
+         x1="0.11875"
+         y1="0.12612613"
+         x2="0.59375"
+         y2="0.66066068"
+         spreadMethod="pad" />
+      <linearGradient
+         id="linearGradient839">
+        <stop
+           style="stop-color:#46a046;stop-opacity:1.0000000;"
+           offset="0.0000000"
+           id="stop840" />
+        <stop
+           style="stop-color:#df421e;stop-opacity:1.0000000;"
+           offset="0.39364964"
+           id="stop841" />
+        <stop
+           style="stop-color:#ada7c8;stop-opacity:1.0000000;"
+           offset="0.72036445"
+           id="stop842" />
+        <stop
+           style="stop-color:#eed680;stop-opacity:1.0000000;"
+           offset="1.0000000"
+           id="stop843" />
+      </linearGradient>
+      <linearGradient
+         xlink:href="#linearGradient839"
+         id="linearGradient836"
+         x1="1.3267924e-17"
+         y1="0.5"
+         x2="1"
+         y2="0.5" />
+      <defs
+         id="defs604">
+        <linearGradient
+           id="linearGradient622">
+          <stop
+             style="stop-color:#f8e29d;stop-opacity:0.4471;"
+             offset="0"
+             id="stop623" />
+          <stop
+             style="stop-color:#272d2d;stop-opacity:0.4784;"
+             offset="1"
+             id="stop624" />
+        </linearGradient>
+        <linearGradient
+           id="linearGradient617">
+          <stop
+             style="stop-color:#ffffff;stop-opacity:1;"
+             offset="0"
+             id="stop618" />
+          <stop
+             style="stop-color:#000000;stop-opacity:1;"
+             offset="1"
+             id="stop619" />
+        </linearGradient>
+        <linearGradient
+           id="linearGradient613">
+          <stop
+             style="stop-color:#ffffff;stop-opacity:0.6235;"
+             offset="0"
+             id="stop614" />
+          <stop
+             style="stop-color:#5d6567;stop-opacity:1;"
+             offset="1"
+             id="stop615" />
+        </linearGradient>
+        <linearGradient
+           id="linearGradient607">
+          <stop
+             style="stop-color:#d7d5d5;stop-opacity:1;"
+             offset="0"
+             id="stop608" />
+          <stop
+             style="stop-color:#000000;stop-opacity:0.4039;"
+             offset="1"
+             id="stop609" />
+        </linearGradient>
+        <radialGradient
+           xlink:href="#linearGradient607"
+           id="radialGradient610"
+           cx="1.4287461"
+           cy="0.75323397"
+           r="0.85534656"
+           fx="1.4287461"
+           fy="0.75323397"
+           gradientTransform="matrix(1,2.268336e-6,-1.975559e-5,1,5.713033e-8,3.856326e-8)" />
+        <linearGradient
+           xlink:href="#linearGradient617"
+           id="linearGradient612"
+           x1="7.7024956"
+           y1="-2.0263922"
+           x2="62.759903"
+           y2="56.137772"
+           gradientTransform="scale(0.9953779,1.0046436)"
+           gradientUnits="userSpaceOnUse" />
+        <radialGradient
+           xlink:href="#linearGradient613"
+           id="radialGradient616"
+           cx="58.70882"
+           cy="53.831562"
+           r="43.551846"
+           fx="58.70882"
+           fy="53.831562"
+           gradientTransform="scale(0.99517298,1.0048504)"
+           gradientUnits="userSpaceOnUse" />
+        <linearGradient
+           xlink:href="#linearGradient617"
+           id="linearGradient621" />
+        <linearGradient
+           xlink:href="#linearGradient617"
+           id="linearGradient626"
+           x1="72.060211"
+           y1="55.161442"
+           x2="32.409"
+           y2="12.126946"
+           gradientTransform="matrix(0.995134,-1.068631e-5,-1.31398e-7,1.00489,0,0)"
+           gradientUnits="userSpaceOnUse" />
+        <linearGradient
+           xlink:href="#linearGradient607"
+           id="linearGradient687"
+           x1="67.707405"
+           y1="49.314793"
+           x2="-10.031048"
+           y2="4.6068792"
+           gradientTransform="scale(0.99522839,1.0047945)"
+           gradientUnits="userSpaceOnUse" />
+        <linearGradient
+           xlink:href="#linearGradient617"
+           id="linearGradient742"
+           x1="-7.4378386"
+           y1="25.923714"
+           x2="18.009745"
+           y2="10.089797"
+           gradientTransform="scale(0.889853,1.123781)" />
+      </defs>
+      <sodipodi:namedview
+         id="namedview889"
+         showguides="true"
+         snaptoguides="true"
+         inkscape:zoom="7.5625000"
+         inkscape:cx="24.000000"
+         inkscape:cy="24.000000"
+         inkscape:window-width="640"
+         inkscape:window-height="496"
+         inkscape:window-x="0"
+         inkscape:window-y="26" />
+    </defs>
+    <sodipodi:namedview
+       id="namedview1023"
+       pagecolor="#ffffff"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="3.5521067"
+       inkscape:cx="66.459318"
+       inkscape:cy="62.629296"
+       inkscape:window-width="1150"
+       inkscape:window-height="752"
+       showgrid="true"
+       snaptogrid="true"
+       inkscape:window-x="0"
+       inkscape:window-y="29">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1.0000000mm"
+         spacingy="1.0000000mm"
+         color="#0000ff"
+         empcolor="#0000ff"
+         opacity="0.2"
+         empopacity="0.4"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1068"
+       id="linearGradient2924"
+       x1="41.673889"
+       y1="320.40921"
+       x2="36.082947"
+       y2="279.22458"
+       gradientTransform="matrix(2.3376099,0,0,0.29237422,-0.91913426,-1.5117091)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1068"
+       id="linearGradient2926"
+       x1="134.95444"
+       y1="108.16693"
+       x2="102.05431"
+       y2="71.835884"
+       gradientTransform="matrix(0.91680324,0,0,0.74547824,-0.91913426,-1.5117091)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1068"
+       id="linearGradient2928"
+       x1="145.32188"
+       y1="101.97199"
+       x2="129.22044"
+       y2="70.041069"
+       gradientTransform="matrix(0.90170536,0,0,0.75796032,-0.91913426,-1.5117091)"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <rect
+     style="fill-opacity:0.47154475;fill-rule:evenodd;stroke-width:3pt"
+     id="rect918"
+     width="48.72493"
+     height="42.16835"
+     ry="0.74231374"
+     x="67.536102"
+     y="66.474693"
+     inkscape:export-filename="/cowserver/documents/httpd/vhosts/images/mpd-big7.png"
+     inkscape:export-xdpi="721.66998"
+     inkscape:export-ydpi="721.66998"
+     rx="0.7811048" />
+  <rect
+     style="fill-opacity:0.47154475;fill-rule:evenodd;stroke-width:3pt"
+     id="rect1006"
+     width="63.211483"
+     height="54.705563"
+     ry="0.74231374"
+     x="64.47226"
+     y="30.558294"
+     inkscape:export-filename="/cowserver/documents/httpd/vhosts/images/mpd-big7.png"
+     inkscape:export-xdpi="721.66998"
+     inkscape:export-ydpi="721.66998"
+     rx="0.7811048" />
+  <rect
+     style="fill:#000000;fill-opacity:0.47058824;fill-rule:evenodd"
+     id="rect1005"
+     width="57.843418"
+     height="9.0050545"
+     ry="0.62889248"
+     x="65.398254"
+     y="82.153206"
+     inkscape:export-filename="/cowserver/documents/httpd/vhosts/images/mpd-big7.png"
+     inkscape:export-xdpi="721.66998"
+     inkscape:export-ydpi="721.66998"
+     rx="0.66175652" />
+  <rect
+     style="fill:url(#linearGradient2924);fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:0.82671446"
+     id="rect1007"
+     width="54.910637"
+     height="6.1445785"
+     ry="0.42912331"
+     x="64.622299"
+     y="82.282539"
+     inkscape:export-filename="/cowserver/documents/httpd/vhosts/images/mpd-big7.png"
+     inkscape:export-xdpi="721.66998"
+     inkscape:export-ydpi="721.66998"
+     rx="0.44939452" />
+  <rect
+     width="57.905403"
+     height="47.084496"
+     ry="1.7822117"
+     x="63.784973"
+     y="32.456562"
+     style="font-size:12px;fill:url(#linearGradient2926);fill-rule:evenodd;stroke:#000000;stroke-width:0"
+     id="rect1009"
+     inkscape:export-filename="/cowserver/documents/httpd/vhosts/images/mpd-big7.png"
+     inkscape:export-xdpi="721.66998"
+     inkscape:export-ydpi="721.66998"
+     rx="1.6336281" />
+  <rect
+     style="fill:#000000;fill-opacity:0.47058824;fill-rule:evenodd"
+     id="rect971"
+     width="44.58709"
+     height="6.9413123"
+     ry="0.62889248"
+     x="68.249886"
+     y="106.24529"
+     inkscape:export-filename="/cowserver/documents/httpd/vhosts/images/mpd-big7.png"
+     inkscape:export-xdpi="721.66998"
+     inkscape:export-ydpi="721.66998"
+     rx="0.66175652" />
+  <rect
+     width="64.637024"
+     height="54.068516"
+     ry="1.4120796"
+     x="59.853096"
+     y="28.740753"
+     style="font-size:12px;fill:url(#linearGradient2928);fill-rule:evenodd;stroke:#000000;stroke-width:1.65869105"
+     id="rect1008"
+     inkscape:export-filename="/cowserver/documents/httpd/vhosts/images/mpd-big7.png"
+     inkscape:export-xdpi="721.66998"
+     inkscape:export-ydpi="721.66998"
+     rx="1.3970968" />
+  <rect
+     width="51.129478"
+     height="39.964478"
+     ry="0.5422883"
+     x="66.358932"
+     y="34.89621"
+     style="font-size:12px;fill:#00b4ed;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.79054338;stroke-linejoin:round"
+     id="rect976"
+     inkscape:export-filename="/cowserver/documents/httpd/vhosts/images/mpd-big7.png"
+     inkscape:export-xdpi="721.66998"
+     inkscape:export-ydpi="721.66998"
+     rx="0.5422883" />
+  <metadata
+     id="metadata982">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <rect
+     width="44.634872"
+     height="36.293858"
+     ry="1.7822117"
+     x="67.006332"
+     y="67.937927"
+     style="font-size:12px;fill:url(#linearGradient1213);fill-rule:evenodd;stroke:#000000;stroke-width:0"
+     id="rect575"
+     inkscape:export-filename="/cowserver/documents/httpd/vhosts/images/mpd-big7.png"
+     inkscape:export-xdpi="721.66998"
+     inkscape:export-ydpi="721.66998"
+     rx="1.633628" />
+  <path
+     sodipodi:type="arc"
+     style="font-size:12px;fill:#444040;fill-opacity:0.47058824;fill-rule:evenodd"
+     id="path672"
+     d="m 68.473,57.85183 a 23.629898,3.2222576 0 1 1 -47.259797,0 23.629898,3.2222576 0 1 1 47.259797,0 z"
+     sodipodi:cx="44.843102"
+     sodipodi:cy="57.85183"
+     sodipodi:rx="23.629898"
+     sodipodi:ry="3.2222576"
+     transform="matrix(1.4221482,0,-0.30247168,1.9834766,9.6201687,-10.428817)"
+     inkscape:export-filename="/cowserver/documents/httpd/vhosts/images/mpd-big2.png"
+     inkscape:export-xdpi="721.66998"
+     inkscape:export-ydpi="721.66998" />
+  <path
+     sodipodi:type="arc"
+     style="font-size:12px;fill:#4e4d4b;fill-rule:evenodd;stroke:#000000;stroke-width:2.30019999;stroke-opacity:0.9565"
+     id="path625"
+     d="m 58.291138,27.531645 a 19.367088,19.556963 0 1 1 -38.734177,0 19.367088,19.556963 0 1 1 38.734177,0 z"
+     sodipodi:cx="38.924049"
+     sodipodi:cy="27.531645"
+     sodipodi:rx="19.367088"
+     sodipodi:ry="19.556963"
+     transform="matrix(-1.0172416,-0.47376693,-0.5523759,1.3286212,116.84611,57.272851)"
+     inkscape:export-filename="/cowserver/documents/httpd/vhosts/images/mpd-big2.png"
+     inkscape:export-xdpi="721.66998"
+     inkscape:export-ydpi="721.66998" />
+  <path
+     sodipodi:type="arc"
+     style="font-size:12px;fill:url(#linearGradient612);fill-rule:evenodd;stroke:#000000;stroke-width:2.06100011;stroke-opacity:0.9565"
+     id="path605"
+     d="m 58.291138,27.531645 a 19.367088,19.556963 0 1 1 -38.734177,0 19.367088,19.556963 0 1 1 38.734177,0 z"
+     sodipodi:cx="38.924049"
+     sodipodi:cy="27.531645"
+     sodipodi:rx="19.367088"
+     sodipodi:ry="19.556963"
+     transform="matrix(-1.4321234,-0.79696518,-1.1299666,2.2349846,128.07685,29.383033)"
+     inkscape:export-filename="/cowserver/documents/httpd/vhosts/images/mpd-big2.png"
+     inkscape:export-xdpi="721.66998"
+     inkscape:export-ydpi="721.66998" />
+  <path
+     sodipodi:type="arc"
+     style="font-size:12px;fill:url(#radialGradient616);fill-rule:evenodd;stroke:#000000;stroke-width:0.317;stroke-opacity:0.97829997"
+     id="path606"
+     d="m 58.291138,27.531645 a 19.367088,19.556963 0 1 1 -38.734177,0 19.367088,19.556963 0 1 1 38.734177,0 z"
+     sodipodi:cx="38.924049"
+     sodipodi:cy="27.531645"
+     sodipodi:rx="19.367088"
+     sodipodi:ry="19.556963"
+     transform="matrix(-1.1546358,-0.69851175,-0.95634664,1.9588777,108.06887,31.115628)"
+     inkscape:export-filename="/cowserver/documents/httpd/vhosts/images/mpd-big2.png"
+     inkscape:export-xdpi="721.66998"
+     inkscape:export-ydpi="721.66998" />
+  <path
+     sodipodi:type="arc"
+     style="font-size:12px;fill-rule:evenodd;stroke-width:1.63499999"
+     id="path686"
+     d="m 58.291138,27.531645 a 19.367088,19.556963 0 1 1 -38.734177,0 19.367088,19.556963 0 1 1 38.734177,0 z"
+     sodipodi:cx="38.924049"
+     sodipodi:cy="27.531645"
+     sodipodi:rx="19.367088"
+     sodipodi:ry="19.556963"
+     transform="matrix(-0.39495459,-0.4546194,-0.52881207,0.94219495,73.198184,52.427791)"
+     inkscape:export-filename="/cowserver/documents/httpd/vhosts/images/mpd-big2.png"
+     inkscape:export-xdpi="721.66998"
+     inkscape:export-ydpi="721.66998" />
+  <path
+     sodipodi:type="arc"
+     style="font-size:12px;fill:url(#linearGradient687);fill-rule:evenodd;stroke:#3f3b3b;stroke-width:0.77380002"
+     id="path611"
+     d="m 58.291138,27.531645 a 19.367088,19.556963 0 1 1 -38.734177,0 19.367088,19.556963 0 1 1 38.734177,0 z"
+     sodipodi:cx="38.924049"
+     sodipodi:cy="27.531645"
+     sodipodi:rx="19.367088"
+     sodipodi:ry="19.556963"
+     transform="matrix(-0.36949013,-0.40957751,-0.49471918,0.84885391,70.248021,52.066881)"
+     inkscape:export-filename="/cowserver/documents/httpd/vhosts/images/mpd-big2.png"
+     inkscape:export-xdpi="721.66998"
+     inkscape:export-ydpi="721.66998" />
+  <rect
+     style="fill:url(#linearGradient573);fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:0.82671446"
+     id="rect934"
+     width="42.326431"
+     height="4.7363882"
+     ry="0.42912331"
+     x="67.651756"
+     y="106.34497"
+     inkscape:export-filename="/cowserver/documents/httpd/vhosts/images/mpd-big7.png"
+     inkscape:export-xdpi="721.66998"
+     inkscape:export-ydpi="721.66998"
+     rx="0.44939449" />
+  <rect
+     width="49.823761"
+     height="41.677303"
+     ry="1.4120796"
+     x="63.975548"
+     y="65.073692"
+     style="font-size:12px;fill:url(#linearGradient580);fill-rule:evenodd;stroke:#000000;stroke-width:1.27855873;stroke-opacity:1"
+     id="rect562"
+     inkscape:export-filename="/cowserver/documents/httpd/vhosts/images/mpd-big7.png"
+     inkscape:export-xdpi="721.66998"
+     inkscape:export-ydpi="721.66998"
+     rx="1.3970969" />
+  <rect
+     width="39.411831"
+     height="30.805574"
+     ry="0.5422883"
+     x="68.990387"
+     y="70.097008"
+     style="font-size:12px;fill:#003d88;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.61407685;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.93023257"
+     id="rect975"
+     inkscape:export-filename="/cowserver/documents/httpd/vhosts/images/mpd-big7.png"
+     inkscape:export-xdpi="721.66998"
+     inkscape:export-ydpi="721.66998"
+     rx="0.5422883" />
+</svg>
--- a/python/build/autotools.py
+++ b/python/build/autotools.py
@@ -0,0 +1,46 @@
+import os.path, subprocess
+
+from build.project import Project
+
+class AutotoolsProject(Project):
+    def __init__(self, url, md5, installed, configure_args=[],
+                 autogen=False,
+                 cppflags='',
+                 **kwargs):
+        Project.__init__(self, url, md5, installed, **kwargs)
+        self.configure_args = configure_args
+        self.autogen = autogen
+        self.cppflags = cppflags
+
+    def build(self, toolchain):
+        src = self.unpack(toolchain)
+        if self.autogen:
+            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)
+
+        build = self.make_build_path(toolchain)
+
+        configure = [
+            os.path.join(src, 'configure'),
+            'CC=' + toolchain.cc,
+            'CXX=' + toolchain.cxx,
+            'CFLAGS=' + toolchain.cflags,
+            'CXXFLAGS=' + toolchain.cxxflags,
+            'CPPFLAGS=' + toolchain.cppflags + ' ' + self.cppflags,
+            'LDFLAGS=' + toolchain.ldflags,
+            'LIBS=' + toolchain.libs,
+            'AR=' + toolchain.ar,
+            'RANLIB=' + toolchain.ranlib,
+            'STRIP=' + toolchain.strip,
+            '--host=' + toolchain.arch,
+            '--prefix=' + toolchain.install_prefix,
+            '--enable-silent-rules',
+        ] + 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)
--- a/python/build/boost.py
+++ b/python/build/boost.py
@@ -0,0 +1,23 @@
+import os, shutil
+import re
+
+from build.project import Project
+
+class BoostProject(Project):
+    def __init__(self, url, md5, installed,
+                 **kwargs):
+        m = re.match(r'.*/boost_(\d+)_(\d+)_(\d+)\.tar\.bz2$', url)
+        version = "%s.%s.%s" % (m.group(1), m.group(2), m.group(3))
+        Project.__init__(self, url, md5, installed,
+                         name='boost', version=version,
+                         **kwargs)
+
+    def build(self, toolchain):
+        src = self.unpack(toolchain)
+
+        # install the headers manually; don't build any library
+        # (because right now, we only use header-only libraries)
+        includedir = os.path.join(toolchain.install_prefix, 'include')
+        dest = os.path.join(includedir, 'boost')
+        shutil.rmtree(dest, ignore_errors=True)
+        shutil.copytree(os.path.join(src, 'boost'), dest)
--- a/python/build/dirs.py
+++ b/python/build/dirs.py
@@ -0,0 +1,9 @@
+import os.path
+
+lib_path = os.path.abspath('lib')
+
+shared_path = lib_path
+if 'MPD_SHARED_LIB' in os.environ:
+    shared_path = os.environ['MPD_SHARED_LIB']
+tarball_path = os.path.join(shared_path, 'download')
+src_path = os.path.join(shared_path, 'src')
--- a/python/build/download.py
+++ b/python/build/download.py
@@ -0,0 +1,26 @@
+from build.verify import verify_file_digest
+import os
+import urllib.request
+
+def download_and_verify(url, md5, parent_path):
+    """Download a file, verify its MD5 checksum and return the local path."""
+
+    os.makedirs(parent_path, exist_ok=True)
+    path = os.path.join(parent_path, os.path.basename(url))
+
+    try:
+        if verify_file_digest(path, md5): return path
+        os.unlink(path)
+    except FileNotFoundError:
+        pass
+
+    tmp_path = path + '.tmp'
+
+    print("download", url)
+    urllib.request.urlretrieve(url, tmp_path)
+    if not verify_file_digest(tmp_path, md5):
+        os.unlink(tmp_path)
+        raise RuntimeError("Digest mismatch")
+
+    os.rename(tmp_path, path)
+    return path
--- a/python/build/ffmpeg.py
+++ b/python/build/ffmpeg.py
@@ -0,0 +1,54 @@
+import os.path, subprocess
+
+from build.project import Project
+
+class FfmpegProject(Project):
+    def __init__(self, url, md5, installed, configure_args=[],
+                 cppflags='',
+                 **kwargs):
+        Project.__init__(self, url, md5, installed, **kwargs)
+        self.configure_args = configure_args
+        self.cppflags = cppflags
+
+    def _filter_cflags(self, flags):
+        # FFmpeg expects the GNU as syntax
+        flags = flags.replace(' -integrated-as ', ' -no-integrated-as ')
+        return flags
+
+    def build(self, toolchain):
+        src = self.unpack(toolchain)
+        build = self.make_build_path(toolchain)
+
+        if toolchain.is_arm:
+            arch = 'arm'
+        else:
+            arch = 'x86'
+
+        if toolchain.is_windows:
+            target_os = 'mingw32'
+        else:
+            target_os = 'linux'
+
+        configure = [
+            os.path.join(src, 'configure'),
+            '--cc=' + toolchain.cc,
+            '--cxx=' + toolchain.cxx,
+            '--nm=' + toolchain.nm,
+            '--extra-cflags=' + self._filter_cflags(toolchain.cflags) + ' ' + toolchain.cppflags + ' ' + self.cppflags,
+            '--extra-cxxflags=' + self._filter_cflags(toolchain.cxxflags) + ' ' + toolchain.cppflags + ' ' + self.cppflags,
+            '--extra-ldflags=' + toolchain.ldflags,
+            '--extra-libs=' + toolchain.libs,
+            '--ar=' + toolchain.ar,
+            '--ranlib=' + toolchain.ranlib,
+            '--enable-cross-compile',
+            '--arch=' + arch,
+            '--target-os=' + target_os,
+            '--prefix=' + toolchain.install_prefix,
+        ] + self.configure_args
+
+        if toolchain.is_armv7:
+            configure.append('--cpu=cortex-a8')
+
+        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)
--- a/python/build/libs.py
+++ b/python/build/libs.py
@@ -0,0 +1,109 @@
+from build.project import Project
+from build.zlib import ZlibProject
+from build.autotools import AutotoolsProject
+from build.ffmpeg import FfmpegProject
+from build.boost import BoostProject
+
+libogg = AutotoolsProject(
+    'http://downloads.xiph.org/releases/ogg/libogg-1.3.2.tar.xz',
+    '5c3a34309d8b98640827e5d0991a4015',
+    'lib/libogg.a',
+    ['--disable-shared', '--enable-static'],
+)
+
+libvorbis = AutotoolsProject(
+    'http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.5.tar.xz',
+    '28cb28097c07a735d6af56e598e1c90f',
+    'lib/libvorbis.a',
+    ['--disable-shared', '--enable-static'],
+)
+
+opus = AutotoolsProject(
+    'http://downloads.xiph.org/releases/opus/opus-1.1.3.tar.gz',
+    '32bbb6b557fe1b6066adc0ae1f08b629',
+    'lib/libopus.a',
+    ['--disable-shared', '--enable-static'],
+)
+
+flac = AutotoolsProject(
+    'http://downloads.xiph.org/releases/flac/flac-1.3.2.tar.xz',
+    '91cfc3ed61dc40f47f050a109b08610667d73477af6ef36dcad31c31a4a8d53f',
+    'lib/libFLAC.a',
+    [
+        '--disable-shared', '--enable-static',
+        '--disable-xmms-plugin', '--disable-cpplibs',
+    ],
+)
+
+zlib = ZlibProject(
+    'http://zlib.net/zlib-1.2.8.tar.xz',
+    '28f1205d8dd2001f26fec1e8c2cebe37',
+    'lib/libz.a',
+)
+
+libid3tag = AutotoolsProject(
+    'ftp://ftp.mars.org/pub/mpeg/libid3tag-0.15.1b.tar.gz',
+    'e5808ad997ba32c498803822078748c3',
+    'lib/libid3tag.a',
+    ['--disable-shared', '--enable-static'],
+    autogen=True,
+)
+
+libmad = AutotoolsProject(
+    'ftp://ftp.mars.org/pub/mpeg/libmad-0.15.1b.tar.gz',
+    '1be543bc30c56fb6bea1d7bf6a64e66c',
+    'lib/libmad.a',
+    ['--disable-shared', '--enable-static'],
+    autogen=True,
+)
+
+ffmpeg = FfmpegProject(
+    'http://ffmpeg.org/releases/ffmpeg-3.2.2.tar.xz',
+    '3f01bd1fe1a17a277f8c84869e5d9192b4b978cb660872aa2b54c3cc8a2fedfc',
+    'lib/libavcodec.a',
+    [
+        '--disable-shared', '--enable-static',
+        '--enable-gpl',
+        '--enable-small',
+        '--disable-pthreads',
+        '--disable-programs',
+        '--disable-doc',
+        '--disable-avdevice',
+        '--disable-swresample',
+        '--disable-swscale',
+        '--disable-postproc',
+        '--disable-avfilter',
+        '--disable-network',
+        '--disable-encoders',
+        '--disable-protocols',
+        '--disable-outdevs',
+        '--disable-filters',
+    ],
+)
+
+curl = AutotoolsProject(
+    'http://curl.haxx.se/download/curl-7.52.1.tar.lzma',
+    '44286d4b825936e2430fc44ad730ce899afb736a5d328cbb8b5d42462f3f2365',
+    'lib/libcurl.a',
+    [
+        '--disable-shared', '--enable-static',
+        '--disable-debug',
+        '--enable-http',
+        '--enable-ipv6',
+        '--disable-ftp', '--disable-file',
+        '--disable-ldap', '--disable-ldaps',
+        '--disable-rtsp', '--disable-proxy', '--disable-dict', '--disable-telnet',
+        '--disable-tftp', '--disable-pop3', '--disable-imap', '--disable-smtp',
+        '--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',
+    ],
+)
+
+boost = BoostProject(
+    'http://downloads.sourceforge.net/project/boost/boost/1.63.0/boost_1_63_0.tar.bz2',
+    'beae2529f759f6b3bf3f4969a19c2e9d6f0c503edcb2de4a61d1428519fcb3b0',
+    'include/boost/version.hpp',
+)
--- a/python/build/project.py
+++ b/python/build/project.py
@@ -0,0 +1,59 @@
+import os, shutil
+import re
+
+from build.download import download_and_verify
+from build.tar import untar
+
+class Project:
+    def __init__(self, url, md5, installed, name=None, version=None,
+                 base=None,
+                 use_cxx=False):
+        if base is None:
+            basename = os.path.basename(url)
+            m = re.match(r'^(.+)\.(tar(\.(gz|bz2|xz|lzma))?|zip)$', basename)
+            if not m: raise
+            self.base = m.group(1)
+        else:
+            self.base = base
+
+        if name is None or version is None:
+            m = re.match(r'^([-\w]+)-(\d[\d.]*[a-z]?)$', self.base)
+            if name is None: name = m.group(1)
+            if version is None: version = m.group(2)
+
+        self.name = name
+        self.version = version
+
+        self.url = url
+        self.md5 = md5
+        self.installed = installed
+
+        self.use_cxx = use_cxx
+
+    def download(self, toolchain):
+        return download_and_verify(self.url, self.md5, toolchain.tarball_path)
+
+    def is_installed(self, toolchain):
+        tarball = self.download(toolchain)
+        installed = os.path.join(toolchain.install_prefix, self.installed)
+        tarball_mtime = os.path.getmtime(tarball)
+        try:
+            return os.path.getmtime(installed) >= tarball_mtime
+        except FileNotFoundError:
+            return False
+
+    def unpack(self, toolchain, out_of_tree=True):
+        if out_of_tree:
+            parent_path = toolchain.src_path
+        else:
+            parent_path = toolchain.build_path
+        return untar(self.download(toolchain), parent_path, self.base)
+
+    def make_build_path(self, toolchain):
+        path = os.path.join(toolchain.build_path, self.base)
+        try:
+            shutil.rmtree(path)
+        except FileNotFoundError:
+            pass
+        os.makedirs(path, exist_ok=True)
+        return path
--- a/python/build/tar.py
+++ b/python/build/tar.py
@@ -0,0 +1,11 @@
+import os, shutil, subprocess
+
+def untar(tarball_path, parent_path, base):
+    path = os.path.join(parent_path, base)
+    try:
+        shutil.rmtree(path)
+    except FileNotFoundError:
+        pass
+    os.makedirs(parent_path, exist_ok=True)
+    subprocess.check_call(['/bin/tar', 'xfC', tarball_path, parent_path])
+    return path
--- a/python/build/verify.py
+++ b/python/build/verify.py
@@ -0,0 +1,42 @@
+import hashlib
+
+def feed_file(h, f):
+    """Feed data read from an open file into the hashlib instance."""
+
+    while True:
+        data = f.read(65536)
+        if len(data) == 0:
+            # end of file
+            break
+        h.update(data)
+
+def feed_file_path(h, path):
+    """Feed data read from a file (to be opened by this function) into the hashlib instance."""
+
+    with open(path, 'rb') as f:
+        feed_file(h, f)
+
+def file_digest(algorithm, path):
+    """Calculate the digest of a file and return it in hexadecimal notation."""
+
+    h = algorithm()
+    feed_file_path(h, path)
+    return h.hexdigest()
+
+def guess_digest_algorithm(digest):
+    l = len(digest)
+    if l == 32:
+        return hashlib.md5
+    elif l == 40:
+        return hashlib.sha1
+    elif l == 64:
+        return hashlib.sha256
+    else:
+        return None
+
+def verify_file_digest(path, expected_digest):
+    """Verify the digest of a file, and return True if the digest matches with the given expected digest."""
+
+    algorithm = guess_digest_algorithm(expected_digest)
+    assert(algorithm is not None)
+    return file_digest(algorithm, path) == expected_digest
--- a/python/build/zlib.py
+++ b/python/build/zlib.py
@@ -0,0 +1,22 @@
+import os.path, subprocess
+
+from build.project import Project
+
+class ZlibProject(Project):
+    def __init__(self, url, md5, installed,
+                 **kwargs):
+        Project.__init__(self, url, md5, installed, **kwargs)
+
+    def build(self, toolchain):
+        src = self.unpack(toolchain, out_of_tree=False)
+
+        subprocess.check_call(['/usr/bin/make', '--quiet',
+            '-f', 'win32/Makefile.gcc',
+            'PREFIX=' + toolchain.arch + '-',
+            '-j12',
+            'install',
+            'INCLUDE_PATH='+ os.path.join(toolchain.install_prefix, 'include'),
+            'LIBRARY_PATH=' + os.path.join(toolchain.install_prefix, 'lib'),
+            'BINARY_PATH=' + os.path.join(toolchain.install_prefix, 'bin'),
+            'SHARED_MODE=1'],
+            cwd=src, env=toolchain.env)
--- a/src/AudioConfig.cxx
+++ b/src/AudioConfig.cxx
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2003-2013 The Music Player Daemon Project
- * http://www.musicpd.org
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include "config.h"
-#include "AudioConfig.hxx"
-#include "AudioFormat.hxx"
-#include "AudioParser.hxx"
-#include "ConfigData.hxx"
-#include "ConfigGlobal.hxx"
-#include "ConfigOption.hxx"
-#include "util/Error.hxx"
-#include "system/FatalError.hxx"
-
-static AudioFormat configured_audio_format;
-
-AudioFormat
-getOutputAudioFormat(AudioFormat inAudioFormat)
-{
-	AudioFormat out_audio_format = inAudioFormat;
-	out_audio_format.ApplyMask(configured_audio_format);
-	return out_audio_format;
-}
-
-void initAudioConfig(void)
-{
-	const struct config_param *param = config_get_param(CONF_AUDIO_OUTPUT_FORMAT);
-
-	if (param == nullptr)
-		return;
-
-	Error error;
-	if (!audio_format_parse(configured_audio_format, param->value.c_str(),
-				true, error))
-		FormatFatalError("error parsing line %i: %s",
-				 param->line, error.GetMessage());
-}
--- a/src/AudioFormat.cxx
+++ b/src/AudioFormat.cxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2013 The Music Player Daemon Project
+ * Copyright 2003-2017 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
--- a/src/AudioFormat.hxx
+++ b/src/AudioFormat.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2013 The Music Player Daemon Project
+ * Copyright 2003-2017 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -82,8 +82,19 @@ struct AudioFormat {
 	SampleFormat format;

 	/**
-	 * The number of channels.  Only mono (1) and stereo (2) are
-	 * fully supported currently.
+	 * The number of channels.
+	 *
+	 * Channel order follows the FLAC convention
+	 * (https://xiph.org/flac/format.html):
+	 *
+	 * - 1 channel: mono
+	 * - 2 channels: left, right
+	 * - 3 channels: left, right, center
+	 * - 4 channels: front left, front right, back left, back right
+	 * - 5 channels: front left, front right, front center, back/surround left, back/surround right
+	 * - 6 channels: front left, front right, front center, LFE, back/surround left, back/surround right
+	 * - 7 channels: front left, front right, front center, LFE, back center, side left, side right
+	 * - 8 channels: front left, front right, front center, LFE, back left, back right, side left, side right
 	 */
 	uint8_t channels;

@@ -99,8 +110,8 @@ struct AudioFormat {
 	}

 	/**
-	 * Clears the #audio_format object, i.e. sets all attributes to an
-	 * undefined (invalid) value.
+	 * Clears the object, i.e. sets all attributes to an undefined
+	 * (invalid) value.
 	 */
 	void Clear() {
 		sample_rate = 0;
@@ -148,6 +159,13 @@ struct AudioFormat {

 	void ApplyMask(AudioFormat mask);

+	gcc_pure
+	AudioFormat WithMask(AudioFormat mask) const {
+		AudioFormat result = *this;
+		result.ApplyMask(mask);
+		return result;
+	}
+
 	/**
 	 * Returns the size of each (mono) sample in bytes.
 	 */
@@ -185,8 +203,6 @@ audio_valid_sample_rate(unsigned sample_rate)

 /**
 * Checks whether the sample format is valid.
- *
- * @param bits the number of significant bits per sample
 */
 static inline bool
 audio_valid_sample_format(SampleFormat format)
@@ -289,10 +305,10 @@ AudioFormat::GetTimeToSize() const
 }

 /**
- * Renders a #sample_format enum into a string, e.g. for printing it
+ * Renders a #SampleFormat enum into a string, e.g. for printing it
 * in a log file.
 *
- * @param format a #sample_format enum value
+ * @param format a #SampleFormat enum value
 * @return the string
 */
 gcc_pure gcc_malloc
@@ -300,12 +316,12 @@ const char *
 sample_format_to_string(SampleFormat format);

 /**
- * Renders the #audio_format object into a string, e.g. for printing
+ * Renders the #AudioFormat object into a string, e.g. for printing
 * it in a log file.
 *
- * @param af the #audio_format object
+ * @param af the #AudioFormat object
 * @param s a buffer to print into
- * @return the string, or nullptr if the #audio_format object is invalid
+ * @return the string, or nullptr if the #AudioFormat object is invalid
 */
 gcc_pure gcc_malloc
 const char *
--- a/src/AudioParser.cxx
+++ b/src/AudioParser.cxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2013 The Music Player Daemon Project
+ * Copyright 2003-2017 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -25,73 +25,59 @@
 #include "config.h"
 #include "AudioParser.hxx"
 #include "AudioFormat.hxx"
-#include "CheckAudioFormat.hxx"
-#include "util/Error.hxx"
-#include "Compiler.h"
+#include "util/RuntimeError.hxx"

 #include <assert.h>
 #include <string.h>
 #include <stdlib.h>

-static bool
-parse_sample_rate(const char *src, bool mask, uint32_t *sample_rate_r,
-		  const char **endptr_r, Error &error)
+static uint32_t
+ParseSampleRate(const char *src, bool mask, const char **endptr_r)
 {
 	unsigned long value;
 	char *endptr;

 	if (mask && *src == '*') {
-		*sample_rate_r = 0;
 		*endptr_r = src + 1;
-		return true;
+		return 0;
 	}

 	value = strtoul(src, &endptr, 10);
 	if (endptr == src) {
-		error.Set(audio_format_domain,
-			  "Failed to parse the sample rate");
-		return false;
-	} else if (!audio_check_sample_rate(value, error))
-		return false;
+		throw std::runtime_error("Failed to parse the sample rate");
+	} else if (!audio_valid_sample_rate(value))
+		throw FormatRuntimeError("Invalid sample rate: %lu",
+					 value);

-	*sample_rate_r = value;
 	*endptr_r = endptr;
-	return true;
+	return value;
 }

-static bool
-parse_sample_format(const char *src, bool mask,
-		    SampleFormat *sample_format_r,
-		    const char **endptr_r, Error &error)
+static SampleFormat
+ParseSampleFormat(const char *src, bool mask, const char **endptr_r)
 {
 	unsigned long value;
 	char *endptr;
 	SampleFormat sample_format;

 	if (mask && *src == '*') {
-		*sample_format_r = SampleFormat::UNDEFINED;
 		*endptr_r = src + 1;
-		return true;
+		return SampleFormat::UNDEFINED;
 	}

 	if (*src == 'f') {
-		*sample_format_r = SampleFormat::FLOAT;
 		*endptr_r = src + 1;
-		return true;
+		return SampleFormat::FLOAT;
 	}

 	if (memcmp(src, "dsd", 3) == 0) {
-		*sample_format_r = SampleFormat::DSD;
 		*endptr_r = src + 3;
-		return true;
+		return SampleFormat::DSD;
 	}

 	value = strtoul(src, &endptr, 10);
-	if (endptr == src) {
-		error.Set(audio_format_domain,
-			  "Failed to parse the sample format");
-		return false;
-	}
+	if (endptr == src)
+		throw std::runtime_error("Failed to parse the sample format");

 	switch (value) {
 	case 8:
@@ -115,99 +101,65 @@ parse_sample_format(const char *src, bool mask,
 		break;

 	default:
-		error.Format(audio_format_domain,
-			     "Invalid sample format: %lu", value);
-		return false;
+		throw FormatRuntimeError("Invalid sample format: %lu", value);
 	}

 	assert(audio_valid_sample_format(sample_format));

-	*sample_format_r = sample_format;
 	*endptr_r = endptr;
-	return true;
+	return sample_format;
 }

-static bool
-parse_channel_count(const char *src, bool mask, uint8_t *channels_r,
-		    const char **endptr_r, Error &error)
+static uint8_t
+ParseChannelCount(const char *src, bool mask, const char **endptr_r)
 {
 	unsigned long value;
 	char *endptr;

 	if (mask && *src == '*') {
-		*channels_r = 0;
 		*endptr_r = src + 1;
-		return true;
+		return 0;
 	}

 	value = strtoul(src, &endptr, 10);
-	if (endptr == src) {
-		error.Set(audio_format_domain,
-			  "Failed to parse the channel count");
-		return false;
-	} else if (!audio_check_channel_count(value, error))
-		return false;
+	if (endptr == src)
+		throw std::runtime_error("Failed to parse the channel count");
+	else if (!audio_valid_channel_count(value))
+		throw FormatRuntimeError("Invalid channel count: %u", value);

-	*channels_r = value;
 	*endptr_r = endptr;
-	return true;
+	return value;
 }

-bool
-audio_format_parse(AudioFormat &dest, const char *src,
-		   bool mask, Error &error)
+AudioFormat
+ParseAudioFormat(const char *src, bool mask)
 {
-	uint32_t rate;
-	SampleFormat sample_format;
-	uint8_t channels;
-
+	AudioFormat dest;
 	dest.Clear();

 	/* parse sample rate */

-#if GCC_CHECK_VERSION(4,7)
-	/* workaround -Wmaybe-uninitialized false positive */
-	rate = 0;
-#endif
+	dest.sample_rate = ParseSampleRate(src, mask, &src);

-	if (!parse_sample_rate(src, mask, &rate, &src, error))
-		return false;
-
-	if (*src++ != ':') {
-		error.Set(audio_format_domain, "Sample format missing");
-		return false;
-	}
+	if (*src++ != ':')
+		throw std::runtime_error("Sample format missing");

 	/* parse sample format */

-#if GCC_CHECK_VERSION(4,7)
-	/* workaround -Wmaybe-uninitialized false positive */
-	sample_format = SampleFormat::UNDEFINED;
-#endif
+	dest.format = ParseSampleFormat(src, mask, &src);

-	if (!parse_sample_format(src, mask, &sample_format, &src, error))
-		return false;
-
-	if (*src++ != ':') {
-		error.Set(audio_format_domain, "Channel count missing");
-		return false;
-	}
+	if (*src++ != ':')
+		throw std::runtime_error("Channel count missing");

 	/* parse channel count */

-	if (!parse_channel_count(src, mask, &channels, &src, error))
-		return false;
+	dest.channels = ParseChannelCount(src, mask, &src);

-	if (*src != 0) {
-		error.Format(audio_format_domain,
-			    "Extra data after channel count: %s", src);
-		return false;
-	}
+	if (*src != 0)
+		throw FormatRuntimeError("Extra data after channel count: %s", src);

-	dest = AudioFormat(rate, sample_format, channels);
 	assert(mask
 	       ? dest.IsMaskValid()
 	       : dest.IsValid());
-
-	return true;
+	return dest;
 }
--- a/src/AudioParser.hxx
+++ b/src/AudioParser.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2013 The Music Player Daemon Project
+ * Copyright 2003-2017 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -25,22 +25,21 @@
 #ifndef MPD_AUDIO_PARSER_HXX
 #define MPD_AUDIO_PARSER_HXX

+#include "Compiler.h"
+
 struct AudioFormat;
-class Error;

 /**
 * Parses a string in the form "SAMPLE_RATE:BITS:CHANNELS" into an
- * #audio_format.
+ * #AudioFormat.
+ *
+ * Throws #std::runtime_error on error.
 *
- * @param dest the destination #audio_format struct
 * @param src the input string
 * @param mask if true, then "*" is allowed for any number of items
- * @param error_r location to store the error occurring, or NULL to
- * ignore errors
- * @return true on success
 */
-bool
-audio_format_parse(AudioFormat &dest, const char *src,
-		   bool mask, Error &error);
+gcc_pure
+AudioFormat
+ParseAudioFormat(const char *src, bool mask);

 #endif
--- a/src/BulkEdit.hxx
+++ b/src/BulkEdit.hxx
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2003-2017 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef MPD_BULK_EDIT_HXX
+#define MPD_BULK_EDIT_HXX
+
+#include "Partition.hxx"
+
+/**
+ * Begin a "bulk edit" and commit it automatically.
+ */
+class ScopeBulkEdit {
+	Partition &partition;
+
+public:
+	ScopeBulkEdit(Partition &_partition):partition(_partition) {
+		partition.playlist.BeginBulk();
+	}
+
+	~ScopeBulkEdit() {
+		partition.playlist.CommitBulk(partition.pc);
+	}
+};
+
+#endif
--- a/src/CheckAudioFormat.cxx
+++ b/src/CheckAudioFormat.cxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2013 The Music Player Daemon Project
+ * Copyright 2003-2017 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -20,61 +20,43 @@
 #include "config.h"
 #include "CheckAudioFormat.hxx"
 #include "AudioFormat.hxx"
-#include "util/Error.hxx"
-#include "util/Domain.hxx"
+#include "util/RuntimeError.hxx"
+
+#include <stdexcept>

 #include <assert.h>

-const Domain audio_format_domain("audio_format");
-
-bool
-audio_check_sample_rate(unsigned long sample_rate, Error &error)
+void
+CheckSampleRate(unsigned long sample_rate)
 {
-	if (!audio_valid_sample_rate(sample_rate)) {
-		error.Format(audio_format_domain,
-			     "Invalid sample rate: %lu", sample_rate);
-		return false;
-	}
-
-	return true;
+	if (!audio_valid_sample_rate(sample_rate))
+		throw FormatRuntimeError("Invalid sample rate: %lu",
+					 sample_rate);
 }

-bool
-audio_check_sample_format(SampleFormat sample_format, Error &error)
+void
+CheckSampleFormat(SampleFormat sample_format)
 {
-	if (!audio_valid_sample_format(sample_format)) {
-		error.Format(audio_format_domain,
-			     "Invalid sample format: %u",
-			     unsigned(sample_format));
-		return false;
-	}
-
-	return true;
+	if (!audio_valid_sample_format(sample_format))
+		throw FormatRuntimeError("Invalid sample format: %u",
+					 unsigned(sample_format));
 }

-bool
-audio_check_channel_count(unsigned channels, Error &error)
+void
+CheckChannelCount(unsigned channels)
 {
-	if (!audio_valid_channel_count(channels)) {
-		error.Format(audio_format_domain,
-			     "Invalid channel count: %u", channels);
-		return false;
-	}
-
-	return true;
+	if (!audio_valid_channel_count(channels))
+		throw FormatRuntimeError("Invalid channel count: %u",
+					 channels);
 }

-bool
-audio_format_init_checked(AudioFormat &af, unsigned long sample_rate,
-			  SampleFormat sample_format, unsigned channels,
-			  Error &error)
+AudioFormat
+CheckAudioFormat(unsigned long sample_rate,
+		 SampleFormat sample_format, unsigned channels)
 {
-	if (audio_check_sample_rate(sample_rate, error) &&
-	    audio_check_sample_format(sample_format, error) &&
-	    audio_check_channel_count(channels, error)) {
-		af = AudioFormat(sample_rate, sample_format, channels);
-		assert(af.IsValid());
-		return true;
-	} else
-		return false;
+	CheckSampleRate(sample_rate);
+	CheckSampleFormat(sample_format);
+	CheckChannelCount(channels);
+
+	return AudioFormat(sample_rate, sample_format, channels);
 }
--- a/src/CheckAudioFormat.hxx
+++ b/src/CheckAudioFormat.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2013 The Music Player Daemon Project
+ * Copyright 2003-2017 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -22,25 +22,23 @@

 #include "AudioFormat.hxx"

-class Error;
+void
+CheckSampleRate(unsigned long sample_rate);

-extern const class Domain audio_format_domain;
+void
+CheckSampleFormat(SampleFormat sample_format);

-bool
-audio_check_sample_rate(unsigned long sample_rate, Error &error);
-
-bool
-audio_check_sample_format(SampleFormat sample_format, Error &error);
-
-bool
-audio_check_channel_count(unsigned sample_format, Error &error);
+void
+CheckChannelCount(unsigned sample_format);

 /**
- * Wrapper for audio_format_init(), which checks all attributes.
+ * Check #AudioFormat attributes and construct an #AudioFormat
+ * instance.
+ *
+ * Throws #std::runtime_error on error.
 */
-bool
-audio_format_init_checked(AudioFormat &af, unsigned long sample_rate,
-			  SampleFormat sample_format, unsigned channels,
-			  Error &error);
+AudioFormat
+CheckAudioFormat(unsigned long sample_rate,
+		 SampleFormat sample_format, unsigned channels);

 #endif
--- a/src/Chrono.hxx
+++ b/src/Chrono.hxx
@@ -0,0 +1,215 @@
+/*
+ * Copyright 2003-2017 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef MPD_CHRONO_HXX
+#define MPD_CHRONO_HXX
+
+#include <chrono>
+#include <utility>
+#include <cstdint>
+
+/**
+ * A time stamp within a song.  Granularity is 1 millisecond and the
+ * maximum value is about 49 days.
+ */
+class SongTime : public std::chrono::duration<std::uint32_t, std::milli> {
+	typedef std::chrono::duration<std::uint32_t, std::milli> Base;
+	typedef Base::rep rep;
+
+public:
+	SongTime() = default;
+
+	template<typename T>
+	explicit constexpr SongTime(T t):Base(t) {}
+
+	static constexpr SongTime zero() {
+		return SongTime(Base::zero());
+	}
+
+	static constexpr SongTime FromS(unsigned s) {
+		return SongTime(rep(s) * 1000);
+	}
+
+	static constexpr SongTime FromS(float s) {
+		return SongTime(rep(s * 1000));
+	}
+
+	static constexpr SongTime FromS(double s) {
+		return SongTime(rep(s * 1000));
+	}
+
+	static constexpr SongTime FromMS(rep ms) {
+		return SongTime(ms);
+	}
+
+	constexpr rep ToS() const {
+		return count() / rep(1000);
+	}
+
+	constexpr rep RoundS() const {
+		return (count() + 500) / rep(1000);
+	}
+
+	constexpr rep ToMS() const {
+		return count();
+	}
+
+	template<typename T=rep>
+	constexpr T ToScale(unsigned scale) const {
+		return count() * T(scale) / 1000;
+	}
+
+	/**
+	 * Convert a scalar value with the given scale to a #SongTime
+	 * instance.
+	 *
+	 * @param value the input value
+	 * @param scale the value's scale in Hz
+	 */
+	template<typename T=rep>
+	static constexpr SongTime FromScale(T value, unsigned scale) {
+		return SongTime(value * T(1000) / T(scale));
+	}
+
+	constexpr double ToDoubleS() const {
+		return double(count()) / 1000.;
+	};
+
+	constexpr bool IsZero() const {
+		return count() == 0;
+	}
+
+	constexpr bool IsPositive() const {
+		return count() > 0;
+	}
+
+	constexpr SongTime operator+(const SongTime &other) const {
+		return SongTime(*(const Base *)this + (const Base &)other);
+	}
+
+	constexpr SongTime operator-(const SongTime &other) const {
+		return SongTime(*(const Base *)this - (const Base &)other);
+	}
+};
+
+/**
+ * A variant of #SongTime that is based on a signed integer.  It can
+ * be used for relative values.
+ */
+class SignedSongTime : public std::chrono::duration<std::int32_t, std::milli> {
+	typedef std::chrono::duration<std::int32_t, std::milli> Base;
+	typedef Base::rep rep;
+
+public:
+	SignedSongTime() = default;
+
+	template<typename T>
+	explicit constexpr SignedSongTime(T t):Base(t) {}
+
+	/**
+	 * Allow implicit conversion from SongTime to SignedSongTime.
+	 */
+	constexpr SignedSongTime(SongTime t):Base(t) {}
+
+	static constexpr SignedSongTime zero() {
+		return SignedSongTime(Base::zero());
+	}
+
+	/**
+	 * Generate a negative value.
+	 */
+	static constexpr SignedSongTime Negative() {
+		return SignedSongTime(-1);
+	}
+
+	static constexpr SignedSongTime FromS(int s) {
+		return SignedSongTime(rep(s) * 1000);
+	}
+
+	static constexpr SignedSongTime FromS(unsigned s) {
+		return SignedSongTime(rep(s) * 1000);
+	}
+
+	static constexpr SignedSongTime FromS(float s) {
+		return SignedSongTime(rep(s * 1000));
+	}
+
+	static constexpr SignedSongTime FromS(double s) {
+		return SignedSongTime(rep(s * 1000));
+	}
+
+	static constexpr SignedSongTime FromMS(rep ms) {
+		return SignedSongTime(ms);
+	}
+
+	constexpr rep ToS() const {
+		return count() / rep(1000);
+	}
+
+	constexpr rep RoundS() const {
+		return (count() + 500) / rep(1000);
+	}
+
+	constexpr rep ToMS() const {
+		return count();
+	}
+
+	template<typename T=rep>
+	constexpr T ToScale(unsigned scale) const {
+		return count() * T(scale) / 1000;
+	}
+
+	/**
+	 * Convert a scalar value with the given scale to a
+	 * #SignedSongTime instance.
+	 *
+	 * @param value the input value
+	 * @param scale the value's scale in Hz
+	 */
+	template<typename T=rep>
+	static constexpr SignedSongTime FromScale(T value, unsigned scale) {
+		return SignedSongTime(value * T(1000) / T(scale));
+	}
+
+	constexpr double ToDoubleS() const {
+		return double(count()) / 1000.;
+	};
+
+	constexpr bool IsZero() const {
+		return count() == 0;
+	}
+
+	constexpr bool IsPositive() const {
+		return count() > 0;
+	}
+
+	constexpr bool IsNegative() const {
+		return count() < 0;
+	}
+
+	constexpr SignedSongTime operator+(const SignedSongTime &other) const {
+		return SignedSongTime(*(const Base *)this + (const Base &)other);
+	}
+
+	constexpr SignedSongTime operator-(const SignedSongTime &other) const {
+		return SignedSongTime(*(const Base *)this - (const Base &)other);
+	}
+};
+
+#endif
--- a/src/CommandLine.cxx
+++ b/src/CommandLine.cxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2013 The Music Player Daemon Project
+ * Copyright 2003-2017 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -22,58 +22,122 @@
 #include "ls.hxx"
 #include "LogInit.hxx"
 #include "Log.hxx"
-#include "ConfigGlobal.hxx"
-#include "DecoderList.hxx"
-#include "DecoderPlugin.hxx"
-#include "OutputList.hxx"
-#include "OutputPlugin.hxx"
-#include "InputRegistry.hxx"
-#include "InputPlugin.hxx"
-#include "PlaylistRegistry.hxx"
-#include "PlaylistPlugin.hxx"
+#include "config/ConfigGlobal.hxx"
+#include "decoder/DecoderList.hxx"
+#include "decoder/DecoderPlugin.hxx"
+#include "output/Registry.hxx"
+#include "output/OutputPlugin.hxx"
+#include "input/Registry.hxx"
+#include "input/InputPlugin.hxx"
+#include "playlist/PlaylistRegistry.hxx"
+#include "playlist/PlaylistPlugin.hxx"
 #include "fs/AllocatedPath.hxx"
 #include "fs/Traits.hxx"
 #include "fs/FileSystem.hxx"
-#include "util/Error.hxx"
+#include "fs/StandardDirectory.hxx"
+#include "system/Error.hxx"
+#include "util/Macros.hxx"
+#include "util/RuntimeError.hxx"
 #include "util/Domain.hxx"
-#include "system/FatalError.hxx"
+#include "util/OptionDef.hxx"
+#include "util/OptionParser.hxx"
+
+#ifdef ENABLE_DATABASE
+#include "db/Registry.hxx"
+#include "db/DatabasePlugin.hxx"
+#include "storage/Registry.hxx"
+#include "storage/StoragePlugin.hxx"
+#endif
+
+#ifdef ENABLE_NEIGHBOR_PLUGINS
+#include "neighbor/Registry.hxx"
+#include "neighbor/NeighborPlugin.hxx"
+#endif

 #ifdef ENABLE_ENCODER
-#include "EncoderList.hxx"
-#include "EncoderPlugin.hxx"
+#include "encoder/EncoderList.hxx"
+#include "encoder/EncoderPlugin.hxx"
 #endif

 #ifdef ENABLE_ARCHIVE
-#include "ArchiveList.hxx"
-#include "ArchivePlugin.hxx"
+#include "archive/ArchiveList.hxx"
+#include "archive/ArchivePlugin.hxx"
 #endif

-#include <glib.h>
-
 #include <stdio.h>
 #include <stdlib.h>

 #ifdef WIN32
-#define CONFIG_FILE_LOCATION		"\\mpd\\mpd.conf"
+#define CONFIG_FILE_LOCATION PATH_LITERAL("mpd\\mpd.conf")
+#define APP_CONFIG_FILE_LOCATION PATH_LITERAL("conf\\mpd.conf")
 #else
-#define USER_CONFIG_FILE_LOCATION1	".mpdconf"
-#define USER_CONFIG_FILE_LOCATION2	".mpd/mpd.conf"
-#define USER_CONFIG_FILE_LOCATION_XDG	"mpd/mpd.conf"
+#define USER_CONFIG_FILE_LOCATION1 PATH_LITERAL(".mpdconf")
+#define USER_CONFIG_FILE_LOCATION2 PATH_LITERAL(".mpd/mpd.conf")
+#define USER_CONFIG_FILE_LOCATION_XDG PATH_LITERAL("mpd/mpd.conf")
 #endif

+static constexpr OptionDef opt_kill(
+	"kill", "kill the currently running mpd session");
+static constexpr OptionDef opt_no_config(
+	"no-config", "don't read from config");
+static constexpr OptionDef opt_no_daemon(
+	"no-daemon", "don't detach from console");
+static constexpr OptionDef opt_stdout(
+	"stdout", nullptr); // hidden, compatibility with old versions
+static constexpr OptionDef opt_stderr(
+	"stderr", "print messages to stderr");
+static constexpr OptionDef opt_verbose(
+	"verbose", 'v', "verbose logging");
+static constexpr OptionDef opt_version(
+	"version", 'V', "print version number");
+static constexpr OptionDef opt_help(
+	"help", 'h', "show help options");
+static constexpr OptionDef opt_help_alt(
+	nullptr, '?', nullptr); // hidden, standard alias for --help
+
 static constexpr Domain cmdline_domain("cmdline");

 gcc_noreturn
 static void version(void)
 {
-	puts("Music Player Daemon " VERSION "\n"
-	     "\n"
-	     "Copyright (C) 2003-2007 Warren Dukes <warren.dukes@gmail.com>\n"
-	     "Copyright (C) 2008-2013 Max Kellermann <max@duempel.org>\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"
-	     "\n"
-	     "Decoders plugins:");
+	printf("Music Player Daemon " VERSION
+#ifdef GIT_COMMIT
+	       " (" GIT_COMMIT ")"
+#endif
+	       "\n"
+	       "\n"
+	       "Copyright (C) 2003-2007 Warren Dukes <warren.dukes@gmail.com>\n"
+	       "Copyright (C) 2008-2015 Max Kellermann <max@duempel.org>\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"
+
+#ifdef ENABLE_DATABASE
+	       "\n"
+	       "Database plugins:\n");
+
+	for (auto i = database_plugins; *i != nullptr; ++i)
+		printf(" %s", (*i)->name);
+
+	printf("\n\n"
+	       "Storage plugins:\n");
+
+	for (auto i = storage_plugins; *i != nullptr; ++i)
+		printf(" %s", (*i)->name);
+
+	printf("\n"
+#endif
+
+#ifdef ENABLE_NEIGHBOR_PLUGINS
+	       "\n"
+	       "Neighbor plugins:\n");
+	for (auto i = neighbor_plugins; *i != nullptr; ++i)
+		printf(" %s", (*i)->name);
+
+	printf("\n"
+#endif
+
+	       "\n"
+	       "Decoders plugins:\n");

 	decoder_plugins_for_each([](const DecoderPlugin &plugin){
 			printf(" [%s]", plugin.name);
@@ -83,26 +147,39 @@ static void version(void)
 				for (; *suffixes != nullptr; ++suffixes)
 					printf(" %s", *suffixes);

-			puts("");
+			printf("\n");
 		});

-	puts("\n"
-	     "Output plugins:");
+	printf("\n"
+	       "Filters:\n"
+#ifdef ENABLE_LIBSAMPLERATE
+	       " libsamplerate"
+#endif
+#ifdef ENABLE_SOXR
+	       " soxr"
+#endif
+	       "\n\n"
+	       "Tag plugins:\n"
+#ifdef ENABLE_ID3TAG
+	       " id3tag"
+#endif
+	       "\n\n"
+	       "Output plugins:\n");
 	audio_output_plugins_for_each(plugin)
 		printf(" %s", plugin->name);
-	puts("");
+	printf("\n"

 #ifdef ENABLE_ENCODER
-	puts("\n"
-	     "Encoder plugins:");
+	       "\n"
+	       "Encoder plugins:\n");
 	encoder_plugins_for_each(plugin)
 		printf(" %s", plugin->name);
-	puts("");
+	printf("\n"
 #endif

 #ifdef ENABLE_ARCHIVE
-	puts("\n"
-	     "Archive plugins:");
+	       "\n"
+	       "Archive plugins:\n");
 	archive_plugins_for_each(plugin) {
 		printf(" [%s]", plugin->name);

@@ -111,143 +188,218 @@ static void version(void)
 			for (; *suffixes != nullptr; ++suffixes)
 				printf(" %s", *suffixes);

-		puts("");
+		printf("\n");
 	}
+
+	printf(""
 #endif

-	puts("\n"
-	     "Input plugins:");
+	       "\n"
+	       "Input plugins:\n");
 	input_plugins_for_each(plugin)
 		printf(" %s", plugin->name);

-	puts("\n\n"
-	     "Playlist plugins:");
+	printf("\n\n"
+	       "Playlist plugins:\n");
 	playlist_plugins_for_each(plugin)
 		printf(" %s", plugin->name);

-	puts("\n\n"
-	     "Protocols:");
+	printf("\n\n"
+	       "Protocols:\n");
 	print_supported_uri_schemes_to_fp(stdout);

+	printf("\n"
+	       "Other features:\n"
+#ifdef HAVE_AVAHI
+	       " avahi"
+#endif
+#ifdef USE_EPOLL
+	       " epoll"
+#endif
+#ifdef HAVE_ICONV
+	       " iconv"
+#endif
+#ifdef HAVE_ICU
+	       " icu"
+#endif
+#ifdef ENABLE_INOTIFY
+	       " inotify"
+#endif
+#ifdef HAVE_IPV6
+	       " ipv6"
+#endif
+#ifdef ENABLE_SYSTEMD_DAEMON
+	       " systemd"
+#endif
+#ifdef HAVE_TCP
+	       " tcp"
+#endif
+#ifdef HAVE_UN
+	       " un"
+#endif
+	       "\n");
+
 	exit(EXIT_SUCCESS);
 }

-static const char *summary =
-	"Music Player Daemon - a daemon for playing music.";
-
-gcc_pure
-static AllocatedPath
-PathBuildChecked(const AllocatedPath &a, PathTraits::const_pointer b)
+static void PrintOption(const OptionDef &opt)
 {
-	if (a.IsNull())
-		return AllocatedPath::Null();
-
-	return AllocatedPath::Build(a, b);
+	if (opt.HasShortOption())
+		printf("  -%c, --%-12s%s\n",
+		       opt.GetShortOption(),
+		       opt.GetLongOption(),
+		       opt.GetDescription());
+	else
+		printf("  --%-16s%s\n",
+		       opt.GetLongOption(),
+		       opt.GetDescription());
 }

-bool
-parse_cmdline(int argc, char **argv, struct options *options,
-	      Error &error)
+gcc_noreturn
+static void help(void)
 {
-	GOptionContext *context;
-	bool ret;
-	static gboolean option_version,
-		option_no_daemon,
-		option_no_config;
-	const GOptionEntry entries[] = {
-		{ "kill", 0, 0, G_OPTION_ARG_NONE, &options->kill,
-		  "kill the currently running mpd session", nullptr },
-		{ "no-config", 0, 0, G_OPTION_ARG_NONE, &option_no_config,
-		  "don't read from config", nullptr },
-		{ "no-daemon", 0, 0, G_OPTION_ARG_NONE, &option_no_daemon,
-		  "don't detach from console", nullptr },
-		{ "stdout", 0, 0, G_OPTION_ARG_NONE, &options->log_stderr,
-		  nullptr, nullptr },
-		{ "stderr", 0, 0, G_OPTION_ARG_NONE, &options->log_stderr,
-		  "print messages to stderr", nullptr },
-		{ "verbose", 'v', 0, G_OPTION_ARG_NONE, &options->verbose,
-		  "verbose logging", nullptr },
-		{ "version", 'V', 0, G_OPTION_ARG_NONE, &option_version,
-		  "print version number", nullptr },
-		{ nullptr, 0, 0, G_OPTION_ARG_NONE, nullptr, nullptr, nullptr }
-	};
+	printf("Usage:\n"
+	       "  mpd [OPTION...] [path/to/mpd.conf]\n"
+	       "\n"
+	       "Music Player Daemon - a daemon for playing music.\n"
+	       "\n"
+	       "Options:\n");

+	PrintOption(opt_help);
+	PrintOption(opt_kill);
+	PrintOption(opt_no_config);
+	PrintOption(opt_no_daemon);
+	PrintOption(opt_stderr);
+	PrintOption(opt_verbose);
+	PrintOption(opt_version);
+
+	exit(EXIT_SUCCESS);
+}
+
+class ConfigLoader
+{
+public:
+	bool TryFile(const Path path);
+	bool TryFile(const AllocatedPath &base_path,
+		     PathTraitsFS::const_pointer_type path);
+};
+
+bool ConfigLoader::TryFile(Path path)
+{
+	if (FileExists(path)) {
+		ReadConfigFile(path);
+		return true;
+	}
+	return false;
+}
+
+bool ConfigLoader::TryFile(const AllocatedPath &base_path,
+			   PathTraitsFS::const_pointer_type path)
+{
+	if (base_path.IsNull())
+		return false;
+	auto full_path = AllocatedPath::Build(base_path, path);
+	return TryFile(full_path);
+}
+
+void
+ParseCommandLine(int argc, char **argv, struct options *options)
+{
+	bool use_config_file = true;
 	options->kill = false;
 	options->daemon = true;
 	options->log_stderr = false;
 	options->verbose = false;

-	context = g_option_context_new("[path/to/mpd.conf]");
-	g_option_context_add_main_entries(context, entries, nullptr);
+	// First pass: handle command line options
+	OptionParser parser(argc, argv);
+	while (parser.HasEntries()) {
+		if (!parser.ParseNext())
+			continue;
+		if (parser.CheckOption(opt_kill)) {
+			options->kill = true;
+			continue;
+		}
+		if (parser.CheckOption(opt_no_config)) {
+			use_config_file = false;
+			continue;
+		}
+		if (parser.CheckOption(opt_no_daemon)) {
+			options->daemon = false;
+			continue;
+		}
+		if (parser.CheckOption(opt_stderr, opt_stdout)) {
+			options->log_stderr = true;
+			continue;
+		}
+		if (parser.CheckOption(opt_verbose)) {
+			options->verbose = true;
+			continue;
+		}
+		if (parser.CheckOption(opt_version))
+			version();
+		if (parser.CheckOption(opt_help, opt_help_alt))
+			help();

-	g_option_context_set_summary(context, summary);
-
-	GError *gerror = nullptr;
-	ret = g_option_context_parse(context, &argc, &argv, &gerror);
-	g_option_context_free(context);
-
-	if (!ret)
-		FatalError("option parsing failed", gerror);
-
-	if (option_version)
-		version();
+		throw FormatRuntimeError("invalid option: %s",
+					 parser.GetOption());
+	}

 	/* initialize the logging library, so the configuration file
 	   parser can use it already */
 	log_early_init(options->verbose);

-	options->daemon = !option_no_daemon;
-
-	if (option_no_config) {
+	if (!use_config_file) {
 		LogDebug(cmdline_domain,
 			 "Ignoring config, using daemon defaults");
-		return true;
-	} else if (argc <= 1) {
-		/* default configuration file path */
-
-#ifdef WIN32
-		AllocatedPath path = PathBuildChecked(AllocatedPath::FromUTF8(g_get_user_config_dir()),
-					     CONFIG_FILE_LOCATION);
-		if (!path.IsNull() && FileExists(path))
-			return ReadConfigFile(path, error);
-
-		const char *const*system_config_dirs =
-			g_get_system_config_dirs();
-
-		for (unsigned i = 0; system_config_dirs[i] != nullptr; ++i) {
-			path = PathBuildChecked(AllocatedPath::FromUTF8(system_config_dirs[i]),
-						CONFIG_FILE_LOCATION);
-			if (!path.IsNull() && FileExists(path))
-				return ReadConfigFile(path, error);
-		}
-#else
-		AllocatedPath path = PathBuildChecked(AllocatedPath::FromUTF8(g_get_user_config_dir()),
-						      USER_CONFIG_FILE_LOCATION_XDG);
-		if (!path.IsNull() && FileExists(path))
-			return ReadConfigFile(path, error);
-
-		path = PathBuildChecked(AllocatedPath::FromUTF8(g_get_home_dir()),
-					     USER_CONFIG_FILE_LOCATION1);
-		if (!path.IsNull() && FileExists(path))
-			return ReadConfigFile(path, error);
-
-		path = PathBuildChecked(AllocatedPath::FromUTF8(g_get_home_dir()),
-					USER_CONFIG_FILE_LOCATION2);
-		if (!path.IsNull() && FileExists(path))
-			return ReadConfigFile(path, error);
-
-		path = AllocatedPath::FromUTF8(SYSTEM_CONFIG_FILE_LOCATION);
-		if (!path.IsNull() && FileExists(path))
-			return ReadConfigFile(path, error);
-#endif
-
-		error.Set(cmdline_domain, "No configuration file found");
-		return false;
-	} else if (argc == 2) {
-		/* specified configuration file */
-		return ReadConfigFile(Path::FromFS(argv[1]), error);
-	} else {
-		error.Set(cmdline_domain, "too many arguments");
-		return false;
+		return;
 	}
+
+	// Second pass: find non-option parameters (i.e. config file)
+	const char *config_file = nullptr;
+	for (int i = 1; i < argc; ++i) {
+		if (OptionParser::IsOption(argv[i]))
+			continue;
+		if (config_file == nullptr) {
+			config_file = argv[i];
+			continue;
+		}
+
+		throw std::runtime_error("too many arguments");
+	}
+
+	if (config_file != nullptr) {
+		/* use specified configuration file */
+#ifdef _UNICODE
+		wchar_t buffer[MAX_PATH];
+		auto result = MultiByteToWideChar(CP_ACP, 0, config_file, -1,
+						  buffer, ARRAY_SIZE(buffer));
+		if (result <= 0)
+			throw MakeLastError("MultiByteToWideChar() failed");
+
+		ReadConfigFile(Path::FromFS(buffer));
+#else
+		ReadConfigFile(Path::FromFS(config_file));
+#endif
+		return;
+	}
+
+	/* use default configuration file path */
+
+	ConfigLoader loader;
+
+	bool found =
+#ifdef WIN32
+		loader.TryFile(GetUserConfigDir(), CONFIG_FILE_LOCATION) ||
+		loader.TryFile(GetSystemConfigDir(), CONFIG_FILE_LOCATION) ||
+		loader.TryFile(GetAppBaseDir(), APP_CONFIG_FILE_LOCATION);
+#else
+		loader.TryFile(GetUserConfigDir(),
+			       USER_CONFIG_FILE_LOCATION_XDG) ||
+		loader.TryFile(GetHomeDir(), USER_CONFIG_FILE_LOCATION1) ||
+		loader.TryFile(GetHomeDir(), USER_CONFIG_FILE_LOCATION2) ||
+		loader.TryFile(Path::FromFS(SYSTEM_CONFIG_FILE_LOCATION));
+#endif
+	if (!found)
+		throw std::runtime_error("No configuration file found");
 }
--- a/src/CommandLine.hxx
+++ b/src/CommandLine.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2013 The Music Player Daemon Project
+ * Copyright 2003-2017 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -20,19 +20,14 @@
 #ifndef MPD_COMMAND_LINE_HXX
 #define MPD_COMMAND_LINE_HXX

-#include <glib.h>
-
-class Error;
-
 struct options {
-	gboolean kill;
-	gboolean daemon;
-	gboolean log_stderr;
-	gboolean verbose;
+	bool kill;
+	bool daemon;
+	bool log_stderr;
+	bool verbose;
 };

-bool
-parse_cmdline(int argc, char **argv, struct options *options,
-	      Error &error);
+void
+ParseCommandLine(int argc, char **argv, struct options *options);

 #endif
--- a/src/Compiler.h
+++ b/src/Compiler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2013 The Music Player Daemon Project
+ * Copyright 2003-2017 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -20,34 +20,62 @@
 #ifndef COMPILER_H
 #define COMPILER_H

-#define GCC_CHECK_VERSION(major, minor) \
-  (defined(__GNUC__) &&                                                 \
-   (__GNUC__ > (major) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor))))
+#define GCC_MAKE_VERSION(major, minor, patchlevel) ((major) * 10000 + (minor) * 100 + patchlevel)

 #ifdef __GNUC__
-#define GCC_VERSION (__GNUC__ * 10000 \
-                     + __GNUC_MINOR__ * 100 \
-                     + __GNUC_PATCHLEVEL__)
+#define GCC_VERSION GCC_MAKE_VERSION(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__)
 #else
 #define GCC_VERSION 0
 #endif

 #ifdef __clang__
-#  define CLANG_VERSION (__clang_major__ * 10000 \
-			 + __clang_minor__ * 100 \
-			 + __clang_patchlevel__)
+#  define CLANG_VERSION GCC_MAKE_VERSION(__clang_major__, __clang_minor__, __clang_patchlevel__)
+#elif defined(__GNUC__)
+#  define CLANG_VERSION 0
+#endif
+
+/**
+ * Are we building with the specified version of gcc (not clang or any
+ * other compiler) or newer?
+ */
+#define GCC_CHECK_VERSION(major, minor) \
+	(CLANG_VERSION == 0 && \
+	 GCC_VERSION >= GCC_MAKE_VERSION(major, minor, 0))
+
+/**
+ * Are we building with clang (any version) or at least the specified
+ * gcc version?
+ */
+#define CLANG_OR_GCC_VERSION(major, minor) \
+	(CLANG_VERSION > 0 || GCC_CHECK_VERSION(major, minor))
+
+/**
+ * Are we building with gcc (not clang or any other compiler) and a
+ * version older than the specified one?
+ */
+#define GCC_OLDER_THAN(major, minor) \
+	(GCC_VERSION > 0 && CLANG_VERSION == 0 && \
+	 GCC_VERSION < GCC_MAKE_VERSION(major, minor, 0))
+
+#ifdef __clang__
 #  if __clang_major__ < 3
 #    error Sorry, your clang version is too old.  You need at least version 3.1.
 #  endif
 #elif defined(__GNUC__)
-#  if !GCC_CHECK_VERSION(4,6)
-#    error Sorry, your gcc version is too old.  You need at least version 4.6.
+#  if GCC_OLDER_THAN(4,9)
+#    error Sorry, your gcc version is too old.  You need at least version 4.9.
 #  endif
 #else
 #  warning Untested compiler.  Use at your own risk!
 #endif

-#if GCC_CHECK_VERSION(4,0)
+/**
+ * Are we building with the specified version of clang or newer?
+ */
+#define CLANG_CHECK_VERSION(major, minor) \
+	(CLANG_VERSION >= GCC_MAKE_VERSION(major, minor, 0))
+
+#if CLANG_OR_GCC_VERSION(4,0)

 /* GCC 4.x */

@@ -69,8 +97,6 @@
 #define gcc_likely(x) __builtin_expect (!!(x), 1)
 #define gcc_unlikely(x) __builtin_expect (!!(x), 0)

-#define gcc_aligned(n) __attribute__((aligned(n)))
-
 #define gcc_visibility_hidden __attribute__((visibility("hidden")))
 #define gcc_visibility_default __attribute__((visibility("default")))

@@ -98,8 +124,6 @@
 #define gcc_likely(x) (x)
 #define gcc_unlikely(x) (x)

-#define gcc_aligned(n)
-
 #define gcc_visibility_hidden
 #define gcc_visibility_default

@@ -107,7 +131,7 @@

 #endif

-#if GCC_CHECK_VERSION(4,3)
+#if CLANG_OR_GCC_VERSION(4,3)

 #define gcc_hot __attribute__((hot))
 #define gcc_cold __attribute__((cold))
@@ -119,7 +143,7 @@

 #endif /* ! GCC_UNUSED >= 40300 */

-#if GCC_CHECK_VERSION(4,6) && !defined(__clang__)
+#if GCC_CHECK_VERSION(4,6)
 #define gcc_flatten __attribute__((flatten))
 #else
 #define gcc_flatten
@@ -128,7 +152,7 @@
 #ifndef __cplusplus
 /* plain C99 has "restrict" */
 #define gcc_restrict restrict
-#elif GCC_CHECK_VERSION(4,0)
+#elif CLANG_OR_GCC_VERSION(4,0)
 /* "__restrict__" is a GCC extension for C++ */
 #define gcc_restrict __restrict__
 #else
@@ -136,24 +160,6 @@
 #define gcc_restrict
 #endif

-/* C++11 features */
-
-#if defined(__cplusplus)
-
-/* support for C++11 "override" was added in gcc 4.7 */
-#if !defined(__clang__) && !GCC_CHECK_VERSION(4,7)
-#define override
-#define final
-#endif
-
-#if defined(__clang__) || GCC_CHECK_VERSION(4,8)
-#define gcc_alignas(T, fallback) alignas(T)
-#else
-#define gcc_alignas(T, fallback) gcc_aligned(fallback)
-#endif
-
-#endif
-
 #ifndef __has_feature
  // define dummy macro for non-clang compilers
  #define __has_feature(x) 0
--- a/src/ConfigFile.cxx
+++ b/src/ConfigFile.cxx
@@ -1,272 +0,0 @@
-/*
- * Copyright (C) 2003-2013 The Music Player Daemon Project
- * http://www.musicpd.org
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include "config.h"
-#include "ConfigFile.hxx"
-#include "ConfigError.hxx"
-#include "ConfigData.hxx"
-#include "ConfigTemplates.hxx"
-#include "util/Tokenizer.hxx"
-#include "util/StringUtil.hxx"
-#include "util/Error.hxx"
-#include "util/Domain.hxx"
-#include "fs/Limits.hxx"
-#include "fs/Path.hxx"
-#include "fs/FileSystem.hxx"
-#include "Log.hxx"
-
-#include <assert.h>
-#include <string.h>
-#include <stdio.h>
-#include <errno.h>
-
-#define MAX_STRING_SIZE	MPD_PATH_MAX+80
-
-#define CONF_COMMENT		'#'
-
-static constexpr Domain config_file_domain("config_file");
-
-static bool
-config_read_name_value(struct config_param *param, char *input, unsigned line,
-		       Error &error)
-{
-	Tokenizer tokenizer(input);
-
-	const char *name = tokenizer.NextWord(error);
-	if (name == nullptr) {
-		assert(!tokenizer.IsEnd());
-		return false;
-	}
-
-	const char *value = tokenizer.NextString(error);
-	if (value == nullptr) {
-		if (tokenizer.IsEnd()) {
-			error.Set(config_file_domain, "Value missing");
-		} else {
-			assert(error.IsDefined());
-		}
-
-		return false;
-	}
-
-	if (!tokenizer.IsEnd() && tokenizer.CurrentChar() != CONF_COMMENT) {
-		error.Set(config_file_domain, "Unknown tokens after value");
-		return false;
-	}
-
-	const struct block_param *bp = param->GetBlockParam(name);
-	if (bp != nullptr) {
-		error.Format(config_file_domain,
-			     "\"%s\" is duplicate, first defined on line %i",
-			     name, bp->line);
-		return false;
-	}
-
-	param->AddBlockParam(name, value, line);
-	return true;
-}
-
-static struct config_param *
-config_read_block(FILE *fp, int *count, char *string, Error &error)
-{
-	struct config_param *ret = new config_param(*count);
-
-	while (true) {
-		char *line;
-
-		line = fgets(string, MAX_STRING_SIZE, fp);
-		if (line == nullptr) {
-			delete ret;
-			error.Set(config_file_domain,
-				  "Expected '}' before end-of-file");
-			return nullptr;
-		}
-
-		(*count)++;
-		line = strchug_fast(line);
-		if (*line == 0 || *line == CONF_COMMENT)
-			continue;
-
-		if (*line == '}') {
-			/* end of this block; return from the function
-			   (and from this "while" loop) */
-
-			line = strchug_fast(line + 1);
-			if (*line != 0 && *line != CONF_COMMENT) {
-				delete ret;
-				error.Format(config_file_domain,
-					     "line %i: Unknown tokens after '}'",
-					     *count);
-				return nullptr;
-			}
-
-			return ret;
-		}
-
-		/* parse name and value */
-
-		if (!config_read_name_value(ret, line, *count, error)) {
-			assert(*line != 0);
-			delete ret;
-			error.FormatPrefix("line %i: ", *count);
-			return nullptr;
-		}
-	}
-}
-
-gcc_nonnull_all
-static void
-Append(config_param *&head, config_param *p)
-{
-	assert(p->next == nullptr);
-
-	config_param **i = &head;
-	while (*i != nullptr)
-		i = &(*i)->next;
-
-	*i = p;
-}
-
-static bool
-ReadConfigFile(ConfigData &config_data, FILE *fp, Error &error)
-{
-	assert(fp != nullptr);
-
-	char string[MAX_STRING_SIZE + 1];
-	int count = 0;
-	struct config_param *param;
-
-	while (fgets(string, MAX_STRING_SIZE, fp)) {
-		char *line;
-		const char *name, *value;
-
-		count++;
-
-		line = strchug_fast(string);
-		if (*line == 0 || *line == CONF_COMMENT)
-			continue;
-
-		/* the first token in each line is the name, followed
-		   by either the value or '{' */
-
-		Tokenizer tokenizer(line);
-		name = tokenizer.NextWord(error);
-		if (name == nullptr) {
-			assert(!tokenizer.IsEnd());
-			error.FormatPrefix("line %i: ", count);
-			return false;
-		}
-
-		/* get the definition of that option, and check the
-		   "repeatable" flag */
-
-		const ConfigOption o = ParseConfigOptionName(name);
-		if (o == CONF_MAX) {
-			error.Format(config_file_domain,
-				     "unrecognized parameter in config file at "
-				     "line %i: %s\n", count, name);
-			return false;
-		}
-
-		const unsigned i = unsigned(o);
-		const ConfigTemplate &option = config_templates[i];
-		config_param *&head = config_data.params[i];
-
-		if (head != nullptr && !option.repeatable) {
-			param = head;
-			error.Format(config_file_domain,
-				     "config parameter \"%s\" is first defined "
-				     "on line %i and redefined on line %i\n",
-				     name, param->line, count);
-			return false;
-		}
-
-		/* now parse the block or the value */
-
-		if (option.block) {
-			/* it's a block, call config_read_block() */
-
-			if (tokenizer.CurrentChar() != '{') {
-				error.Format(config_file_domain,
-					     "line %i: '{' expected", count);
-				return false;
-			}
-
-			line = strchug_fast(tokenizer.Rest() + 1);
-			if (*line != 0 && *line != CONF_COMMENT) {
-				error.Format(config_file_domain,
-					     "line %i: Unknown tokens after '{'",
-					     count);
-				return false;
-			}
-
-			param = config_read_block(fp, &count, string, error);
-			if (param == nullptr) {
-				return false;
-			}
-		} else {
-			/* a string value */
-
-			value = tokenizer.NextString(error);
-			if (value == nullptr) {
-				if (tokenizer.IsEnd())
-					error.Format(config_file_domain,
-						     "line %i: Value missing",
-						     count);
-				else
-					error.FormatPrefix("line %i: ", count);
-
-				return false;
-			}
-
-			if (!tokenizer.IsEnd() &&
-			    tokenizer.CurrentChar() != CONF_COMMENT) {
-				error.Format(config_file_domain,
-					     "line %i: Unknown tokens after value",
-					     count);
-				return false;
-			}
-
-			param = new config_param(value, count);
-		}
-
-		Append(head, param);
-	}
-
-	return true;
-}
-
-bool
-ReadConfigFile(ConfigData &config_data, Path path, Error &error)
-{
-	assert(!path.IsNull());
-	const std::string path_utf8 = path.ToUTF8();
-
-	FormatDebug(config_file_domain, "loading file %s", path_utf8.c_str());
-
-	FILE *fp = FOpen(path, FOpenMode::ReadText);
-	if (fp == nullptr) {
-		error.FormatErrno("Failed to open %s", path_utf8.c_str());
-		return false;
-	}
-
-	bool result = ReadConfigFile(config_data, fp, error);
-	fclose(fp);
-	return result;
-}
--- a/src/ConfigOption.hxx
+++ b/src/ConfigOption.hxx
@@ -1,90 +0,0 @@
-/*
- * Copyright (C) 2003-2013 The Music Player Daemon Project
- * http://www.musicpd.org
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef MPD_CONFIG_OPTION_HXX
-#define MPD_CONFIG_OPTION_HXX
-
-#include "Compiler.h"
-
-enum ConfigOption {
-	CONF_MUSIC_DIR,
-	CONF_PLAYLIST_DIR,
-	CONF_FOLLOW_INSIDE_SYMLINKS,
-	CONF_FOLLOW_OUTSIDE_SYMLINKS,
-	CONF_DB_FILE,
-	CONF_STICKER_FILE,
-	CONF_LOG_FILE,
-	CONF_PID_FILE,
-	CONF_STATE_FILE,
-	CONF_RESTORE_PAUSED,
-	CONF_USER,
-	CONF_GROUP,
-	CONF_BIND_TO_ADDRESS,
-	CONF_PORT,
-	CONF_LOG_LEVEL,
-	CONF_ZEROCONF_NAME,
-	CONF_ZEROCONF_ENABLED,
-	CONF_PASSWORD,
-	CONF_DEFAULT_PERMS,
-	CONF_AUDIO_OUTPUT,
-	CONF_AUDIO_OUTPUT_FORMAT,
-	CONF_MIXER_TYPE,
-	CONF_REPLAYGAIN,
-	CONF_REPLAYGAIN_PREAMP,
-	CONF_REPLAYGAIN_MISSING_PREAMP,
-	CONF_REPLAYGAIN_LIMIT,
-	CONF_VOLUME_NORMALIZATION,
-	CONF_SAMPLERATE_CONVERTER,
-	CONF_AUDIO_BUFFER_SIZE,
-	CONF_BUFFER_BEFORE_PLAY,
-	CONF_HTTP_PROXY_HOST,
-	CONF_HTTP_PROXY_PORT,
-	CONF_HTTP_PROXY_USER,
-	CONF_HTTP_PROXY_PASSWORD,
-	CONF_CONN_TIMEOUT,
-	CONF_MAX_CONN,
-	CONF_MAX_PLAYLIST_LENGTH,
-	CONF_MAX_COMMAND_LIST_SIZE,
-	CONF_MAX_OUTPUT_BUFFER_SIZE,
-	CONF_FS_CHARSET,
-	CONF_ID3V1_ENCODING,
-	CONF_METADATA_TO_USE,
-	CONF_SAVE_ABSOLUTE_PATHS,
-	CONF_DECODER,
-	CONF_INPUT,
-	CONF_GAPLESS_MP3_PLAYBACK,
-	CONF_PLAYLIST_PLUGIN,
-	CONF_AUTO_UPDATE,
-	CONF_AUTO_UPDATE_DEPTH,
-	CONF_DESPOTIFY_USER,
-	CONF_DESPOTIFY_PASSWORD,
-	CONF_DESPOTIFY_HIGH_BITRATE,
-	CONF_AUDIO_FILTER,
-	CONF_DATABASE,
-	CONF_MAX
-};
-
-/**
- * @return #CONF_MAX if not found
- */
-gcc_pure
-enum ConfigOption
-ParseConfigOptionName(const char *name);
-
-#endif
--- a/src/ConfigTemplates.cxx
+++ b/src/ConfigTemplates.cxx
@@ -1,96 +0,0 @@
-/*
- * Copyright (C) 2003-2013 The Music Player Daemon Project
- * http://www.musicpd.org
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include "ConfigTemplates.hxx"
-#include "ConfigOption.hxx"
-
-#include <string.h>
-
-const ConfigTemplate config_templates[] = {
-	{ "music_directory", false, false },
-	{ "playlist_directory", false, false },
-	{ "follow_inside_symlinks", false, false },
-	{ "follow_outside_symlinks", false, false },
-	{ "db_file", false, false },
-	{ "sticker_file", false, false },
-	{ "log_file", false, false },
-	{ "pid_file", false, false },
-	{ "state_file", false, false },
-	{ "restore_paused", false, false },
-	{ "user", false, false },
-	{ "group", false, false },
-	{ "bind_to_address", true, false },
-	{ "port", false, false },
-	{ "log_level", false, false },
-	{ "zeroconf_name", false, false },
-	{ "zeroconf_enabled", false, false },
-	{ "password", true, false },
-	{ "default_permissions", false, false },
-	{ "audio_output", true, true },
-	{ "audio_output_format", false, false },
-	{ "mixer_type", false, false },
-	{ "replaygain", false, false },
-	{ "replaygain_preamp", false, false },
-	{ "replaygain_missing_preamp", false, false },
-	{ "replaygain_limit", false, false },
-	{ "volume_normalization", false, false },
-	{ "samplerate_converter", false, false },
-	{ "audio_buffer_size", false, false },
-	{ "buffer_before_play", false, false },
-	{ "http_proxy_host", false, false },
-	{ "http_proxy_port", false, false },
-	{ "http_proxy_user", false, false },
-	{ "http_proxy_password", false, false },
-	{ "connection_timeout", false, false },
-	{ "max_connections", false, false },
-	{ "max_playlist_length", false, false },
-	{ "max_command_list_size", false, false },
-	{ "max_output_buffer_size", false, false },
-	{ "filesystem_charset", false, false },
-	{ "id3v1_encoding", false, false },
-	{ "metadata_to_use", false, false },
-	{ "save_absolute_paths_in_playlists", false, false },
-	{ "decoder", true, true },
-	{ "input", true, true },
-	{ "gapless_mp3_playback", false, false },
-	{ "playlist_plugin", true, true },
-	{ "auto_update", false, false },
-	{ "auto_update_depth", false, false },
-	{ "despotify_user", false, false },
-	{ "despotify_password", false, false},
-	{ "despotify_high_bitrate", false, false },
-	{ "filter", true, true },
-	{ "database", false, true },
-};
-
-static constexpr unsigned n_config_templates =
-	sizeof(config_templates) / sizeof(config_templates[0]);
-
-static_assert(n_config_templates == unsigned(CONF_MAX),
-	      "Wrong number of config_templates");
-
-ConfigOption
-ParseConfigOptionName(const char *name)
-{
-	for (unsigned i = 0; i < n_config_templates; ++i)
-		if (strcmp(config_templates[i].name, name) == 0)
-			return ConfigOption(i);
-
-	return CONF_MAX;
-}
--- a/src/DatabaseGlue.cxx
+++ b/src/DatabaseGlue.cxx
@@ -1,159 +0,0 @@
-/*
- * Copyright (C) 2003-2013 The Music Player Daemon Project
- * http://www.musicpd.org
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include "config.h"
-#include "DatabaseGlue.hxx"
-#include "DatabaseSimple.hxx"
-#include "DatabaseRegistry.hxx"
-#include "DatabaseSave.hxx"
-#include "DatabaseError.hxx"
-#include "Directory.hxx"
-#include "util/Error.hxx"
-#include "ConfigData.hxx"
-#include "Stats.hxx"
-#include "DatabasePlugin.hxx"
-#include "db/SimpleDatabasePlugin.hxx"
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <assert.h>
-#include <string.h>
-#include <errno.h>
-
-
-static Database *db;
-static bool db_is_open;
-static bool is_simple;
-
-bool
-DatabaseGlobalInit(const config_param &param, Error &error)
-{
-	assert(db == nullptr);
-	assert(!db_is_open);
-
-	const char *plugin_name =
-		param.GetBlockValue("plugin", "simple");
-	is_simple = strcmp(plugin_name, "simple") == 0;
-
-	const DatabasePlugin *plugin = GetDatabasePluginByName(plugin_name);
-	if (plugin == nullptr) {
-		error.Format(db_domain,
-			     "No such database plugin: %s", plugin_name);
-		return false;
-	}
-
-	db = plugin->create(param, error);
-	return db != nullptr;
-}
-
-void
-DatabaseGlobalDeinit(void)
-{
-	if (db_is_open)
-		db->Close();
-
-	if (db != nullptr)
-		delete db;
-}
-
-const Database *
-GetDatabase()
-{
-	assert(db == nullptr || db_is_open);
-
-	return db;
-}
-
-const Database *
-GetDatabase(Error &error)
-{
-	assert(db == nullptr || db_is_open);
-
-	if (db == nullptr)
-		error.Set(db_domain, DB_DISABLED, "No database");
-
-	return db;
-}
-
-bool
-db_is_simple(void)
-{
-	assert(db == nullptr || db_is_open);
-
-	return is_simple;
-}
-
-Directory *
-db_get_root(void)
-{
-	assert(db != nullptr);
-	assert(db_is_simple());
-
-	return ((SimpleDatabase *)db)->GetRoot();
-}
-
-Directory *
-db_get_directory(const char *name)
-{
-	if (db == nullptr)
-		return nullptr;
-
-	Directory *music_root = db_get_root();
-	if (name == nullptr)
-		return music_root;
-
-	return music_root->LookupDirectory(name);
-}
-
-bool
-db_save(Error &error)
-{
-	assert(db != nullptr);
-	assert(db_is_open);
-	assert(db_is_simple());
-
-	return ((SimpleDatabase *)db)->Save(error);
-}
-
-bool
-DatabaseGlobalOpen(Error &error)
-{
-	assert(db != nullptr);
-	assert(!db_is_open);
-
-	if (!db->Open(error))
-		return false;
-
-	db_is_open = true;
-
-	stats_update();
-
-	return true;
-}
-
-bool
-db_exists()
-{
-	assert(db != nullptr);
-	assert(db_is_open);
-	assert(db_is_simple());
-
-	return ((SimpleDatabase *)db)->GetUpdateStamp() > 0;
-}
--- a/src/DatabaseGlue.hxx
+++ b/src/DatabaseGlue.hxx
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2003-2013 The Music Player Daemon Project
- * http://www.musicpd.org
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef MPD_DATABASE_GLUE_HXX
-#define MPD_DATABASE_GLUE_HXX
-
-#include "Compiler.h"
-
-struct config_param;
-class Database;
-class Error;
-
-/**
- * Initialize the database library.
- *
- * @param param the database configuration block
- */
-bool
-DatabaseGlobalInit(const config_param &param, Error &error);
-
-void
-DatabaseGlobalDeinit(void);
-
-bool
-DatabaseGlobalOpen(Error &error);
-
-/**
- * Returns the global #Database instance.  May return nullptr if this MPD
- * configuration has no database (no music_directory was configured).
- */
-gcc_pure
-const Database *
-GetDatabase();
-
-/**
- * Returns the global #Database instance.  May return nullptr if this MPD
- * configuration has no database (no music_directory was configured).
- */
-gcc_pure
-const Database *
-GetDatabase(Error &error);
-
-#endif
--- a/src/DatabasePlugin.hxx
+++ b/src/DatabasePlugin.hxx
@@ -1,156 +0,0 @@
-/*
- * Copyright (C) 2003-2013 The Music Player Daemon Project
- * http://www.musicpd.org
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-/** \file
- *
- * This header declares the db_plugin class.  It describes a
- * plugin API for databases of song metadata.
- */
-
-#ifndef MPD_DATABASE_PLUGIN_HXX
-#define MPD_DATABASE_PLUGIN_HXX
-
-#include "DatabaseVisitor.hxx"
-#include "tag/TagType.h"
-#include "Compiler.h"
-
-#include <time.h>
-
-struct config_param;
-struct DatabaseSelection;
-struct db_visitor;
-struct Song;
-class Error;
-
-struct DatabaseStats {
-	/**
-	 * Number of songs.
-	 */
-	unsigned song_count;
-
-	/**
-	 * Total duration of all songs (in seconds).
-	 */
-	unsigned long total_duration;
-
-	/**
-	 * Number of distinct artist names.
-	 */
-	unsigned artist_count;
-
-	/**
-	 * Number of distinct album names.
-	 */
-	unsigned album_count;
-
-	void Clear() {
-		song_count = 0;
-		total_duration = 0;
-		artist_count = album_count = 0;
-	}
-};
-
-class Database {
-public:
-	/**
-	 * Free instance data.
-         */
-	virtual ~Database() {}
-
-	/**
-         * Open the database.  Read it into memory if applicable.
-	 */
-	virtual bool Open(gcc_unused Error &error) {
-		return true;
-	}
-
-	/**
-         * Close the database, free allocated memory.
-	 */
-	virtual void Close() {}
-
-	/**
-         * Look up a song (including tag data) in the database.  When
-         * you don't need this anymore, call ReturnSong().
-	 *
-	 * @param uri_utf8 the URI of the song within the music
-	 * directory (UTF-8)
-	 */
-	virtual Song *GetSong(const char *uri_utf8,
-			      Error &error) const = 0;
-
-	/**
-	 * Mark the song object as "unused".  Call this on objects
-	 * returned by GetSong().
-	 */
-	virtual void ReturnSong(Song *song) const = 0;
-
-	/**
-	 * Visit the selected entities.
-	 */
-	virtual bool Visit(const DatabaseSelection &selection,
-			   VisitDirectory visit_directory,
-			   VisitSong visit_song,
-			   VisitPlaylist visit_playlist,
-			   Error &error) const = 0;
-
-	bool Visit(const DatabaseSelection &selection,
-		   VisitDirectory visit_directory,
-		   VisitSong visit_song,
-		   Error &error) const {
-		return Visit(selection, visit_directory, visit_song,
-			     VisitPlaylist(), error);
-	}
-
-	bool Visit(const DatabaseSelection &selection, VisitSong visit_song,
-		   Error &error) const {
-		return Visit(selection, VisitDirectory(), visit_song, error);
-	}
-
-	/**
-	 * Visit all unique tag values.
-	 */
-	virtual bool VisitUniqueTags(const DatabaseSelection &selection,
-				     TagType tag_type,
-				     VisitString visit_string,
-				     Error &error) const = 0;
-
-	virtual bool GetStats(const DatabaseSelection &selection,
-			      DatabaseStats &stats,
-			      Error &error) const = 0;
-
-	/**
-	 * Returns the time stamp of the last database update.
-	 * Returns 0 if that is not not known/available.
-	 */
-	gcc_pure
-	virtual time_t GetUpdateStamp() const = 0;
-};
-
-struct DatabasePlugin {
-	const char *name;
-
-	/**
-	 * Allocates and configures a database.
-	 */
-	Database *(*create)(const config_param &param,
-			    Error &error);
-};
-
-#endif
--- a/src/DatabasePrint.cxx
+++ b/src/DatabasePrint.cxx
@@ -1,241 +0,0 @@
-/*
- * Copyright (C) 2003-2013 The Music Player Daemon Project
- * http://www.musicpd.org
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include "config.h"
-#include "DatabasePrint.hxx"
-#include "DatabaseSelection.hxx"
-#include "SongFilter.hxx"
-#include "PlaylistVector.hxx"
-#include "SongPrint.hxx"
-#include "TimePrint.hxx"
-#include "Directory.hxx"
-#include "Client.hxx"
-#include "tag/Tag.hxx"
-#include "Song.hxx"
-#include "DatabaseGlue.hxx"
-#include "DatabasePlugin.hxx"
-
-#include <functional>
-
-static bool
-PrintDirectoryBrief(Client &client, const Directory &directory)
-{
-	if (!directory.IsRoot())
-		client_printf(client, "directory: %s\n", directory.GetPath());
-
-	return true;
-}
-
-static bool
-PrintDirectoryFull(Client &client, const Directory &directory)
-{
-	if (!directory.IsRoot()) {
-		client_printf(client, "directory: %s\n", directory.GetPath());
-		time_print(client, "Last-Modified", directory.mtime);
-	}
-
-	return true;
-}
-
-
-static void
-print_playlist_in_directory(Client &client,
-			    const Directory &directory,
-			    const char *name_utf8)
-{
-	if (directory.IsRoot())
-		client_printf(client, "playlist: %s\n", name_utf8);
-	else
-		client_printf(client, "playlist: %s/%s\n",
-			      directory.GetPath(), name_utf8);
-}
-
-static bool
-PrintSongBrief(Client &client, const Song &song)
-{
-	assert(song.parent != nullptr);
-
-	song_print_uri(client, song);
-
-	if (song.tag != nullptr && song.tag->has_playlist)
-		/* this song file has an embedded CUE sheet */
-		print_playlist_in_directory(client, *song.parent, song.uri);
-
-	return true;
-}
-
-static bool
-PrintSongFull(Client &client, const Song &song)
-{
-	assert(song.parent != nullptr);
-
-	song_print_info(client, song);
-
-	if (song.tag != nullptr && song.tag->has_playlist)
-		/* this song file has an embedded CUE sheet */
-		print_playlist_in_directory(client, *song.parent, song.uri);
-
-	return true;
-}
-
-static bool
-PrintPlaylistBrief(Client &client,
-		   const PlaylistInfo &playlist,
-		   const Directory &directory)
-{
-	print_playlist_in_directory(client, directory, playlist.name.c_str());
-	return true;
-}
-
-static bool
-PrintPlaylistFull(Client &client,
-		  const PlaylistInfo &playlist,
-		  const Directory &directory)
-{
-	print_playlist_in_directory(client, directory, playlist.name.c_str());
-
-	if (playlist.mtime > 0)
-		time_print(client, "Last-Modified", playlist.mtime);
-
-	return true;
-}
-
-bool
-db_selection_print(Client &client, const DatabaseSelection &selection,
-		   bool full, Error &error)
-{
-	const Database *db = GetDatabase(error);
-	if (db == nullptr)
-		return false;
-
-	using namespace std::placeholders;
-	const auto d = selection.filter == nullptr
-		? std::bind(full ? PrintDirectoryFull : PrintDirectoryBrief,
-			    std::ref(client), _1)
-		: VisitDirectory();
-	const auto s = std::bind(full ? PrintSongFull : PrintSongBrief,
-				 std::ref(client), _1);
-	const auto p = selection.filter == nullptr
-		? std::bind(full ? PrintPlaylistFull : PrintPlaylistBrief,
-			    std::ref(client), _1, _2)
-		: VisitPlaylist();
-
-	return db->Visit(selection, d, s, p, error);
-}
-
-struct SearchStats {
-	int numberOfSongs;
-	unsigned long playTime;
-};
-
-static void printSearchStats(Client &client, SearchStats *stats)
-{
-	client_printf(client, "songs: %i\n", stats->numberOfSongs);
-	client_printf(client, "playtime: %li\n", stats->playTime);
-}
-
-static bool
-stats_visitor_song(SearchStats &stats, Song &song)
-{
-	stats.numberOfSongs++;
-	stats.playTime += song.GetDuration();
-
-	return true;
-}
-
-bool
-searchStatsForSongsIn(Client &client, const char *name,
-		      const SongFilter *filter,
-		      Error &error)
-{
-	const Database *db = GetDatabase(error);
-	if (db == nullptr)
-		return false;
-
-	const DatabaseSelection selection(name, true, filter);
-
-	SearchStats stats;
-	stats.numberOfSongs = 0;
-	stats.playTime = 0;
-
-	using namespace std::placeholders;
-	const auto f = std::bind(stats_visitor_song, std::ref(stats),
-				 _1);
-	if (!db->Visit(selection, f, error))
-		return false;
-
-	printSearchStats(client, &stats);
-	return true;
-}
-
-bool
-printAllIn(Client &client, const char *uri_utf8, Error &error)
-{
-	const DatabaseSelection selection(uri_utf8, true);
-	return db_selection_print(client, selection, false, error);
-}
-
-bool
-printInfoForAllIn(Client &client, const char *uri_utf8,
-		  Error &error)
-{
-	const DatabaseSelection selection(uri_utf8, true);
-	return db_selection_print(client, selection, true, error);
-}
-
-static bool
-PrintSongURIVisitor(Client &client, Song &song)
-{
-	song_print_uri(client, song);
-
-	return true;
-}
-
-static bool
-PrintUniqueTag(Client &client, TagType tag_type,
-	       const char *value)
-{
-	client_printf(client, "%s: %s\n", tag_item_names[tag_type], value);
-	return true;
-}
-
-bool
-listAllUniqueTags(Client &client, int type,
-		  const SongFilter *filter,
-		  Error &error)
-{
-	const Database *db = GetDatabase(error);
-	if (db == nullptr)
-		return false;
-
-	const DatabaseSelection selection("", true, filter);
-
-	if (type == LOCATE_TAG_FILE_TYPE) {
-		using namespace std::placeholders;
-		const auto f = std::bind(PrintSongURIVisitor,
-					 std::ref(client), _1);
-		return db->Visit(selection, f, error);
-	} else {
-		using namespace std::placeholders;
-		const auto f = std::bind(PrintUniqueTag, std::ref(client),
-					 (TagType)type, _1);
-		return db->VisitUniqueTags(selection, (TagType)type,
-					   f, error);
-	}
-}
--- a/src/DatabaseSave.cxx
+++ b/src/DatabaseSave.cxx
@@ -1,157 +0,0 @@
-/*
- * Copyright (C) 2003-2013 The Music Player Daemon Project
- * http://www.musicpd.org
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include "config.h"
-#include "DatabaseSave.hxx"
-#include "DatabaseLock.hxx"
-#include "DatabaseError.hxx"
-#include "Directory.hxx"
-#include "DirectorySave.hxx"
-#include "Song.hxx"
-#include "TextFile.hxx"
-#include "tag/Tag.hxx"
-#include "tag/TagSettings.h"
-#include "fs/Charset.hxx"
-#include "util/Error.hxx"
-#include "Log.hxx"
-
-#include <glib.h>
-
-#include <assert.h>
-#include <string.h>
-#include <stdlib.h>
-
-#define DIRECTORY_INFO_BEGIN "info_begin"
-#define DIRECTORY_INFO_END "info_end"
-#define DB_FORMAT_PREFIX "format: "
-#define DIRECTORY_MPD_VERSION "mpd_version: "
-#define DIRECTORY_FS_CHARSET "fs_charset: "
-#define DB_TAG_PREFIX "tag: "
-
-static constexpr unsigned DB_FORMAT = 1;
-
-void
-db_save_internal(FILE *fp, const Directory &music_root)
-{
-	fprintf(fp, "%s\n", DIRECTORY_INFO_BEGIN);
-	fprintf(fp, DB_FORMAT_PREFIX "%u\n", DB_FORMAT);
-	fprintf(fp, "%s%s\n", DIRECTORY_MPD_VERSION, VERSION);
-	fprintf(fp, "%s%s\n", DIRECTORY_FS_CHARSET, GetFSCharset());
-
-	for (unsigned i = 0; i < TAG_NUM_OF_ITEM_TYPES; ++i)
-		if (!ignore_tag_items[i])
-			fprintf(fp, DB_TAG_PREFIX "%s\n", tag_item_names[i]);
-
-	fprintf(fp, "%s\n", DIRECTORY_INFO_END);
-
-	directory_save(fp, music_root);
-}
-
-bool
-db_load_internal(TextFile &file, Directory &music_root, Error &error)
-{
-	char *line;
-	unsigned format = 0;
-	bool found_charset = false, found_version = false;
-	bool success;
-	bool tags[TAG_NUM_OF_ITEM_TYPES];
-
-	/* get initial info */
-	line = file.ReadLine();
-	if (line == nullptr || strcmp(DIRECTORY_INFO_BEGIN, line) != 0) {
-		error.Set(db_domain, "Database corrupted");
-		return false;
-	}
-
-	memset(tags, false, sizeof(tags));
-
-	while ((line = file.ReadLine()) != nullptr &&
-	       strcmp(line, DIRECTORY_INFO_END) != 0) {
-		if (g_str_has_prefix(line, DB_FORMAT_PREFIX)) {
-			format = atoi(line + sizeof(DB_FORMAT_PREFIX) - 1);
-		} else if (g_str_has_prefix(line, DIRECTORY_MPD_VERSION)) {
-			if (found_version) {
-				error.Set(db_domain, "Duplicate version line");
-				return false;
-			}
-
-			found_version = true;
-		} else if (g_str_has_prefix(line, DIRECTORY_FS_CHARSET)) {
-			const char *new_charset;
-
-			if (found_charset) {
-				error.Set(db_domain, "Duplicate charset line");
-				return false;
-			}
-
-			found_charset = true;
-
-			new_charset = line + sizeof(DIRECTORY_FS_CHARSET) - 1;
-			const char *const old_charset = GetFSCharset();
-			if (*old_charset != 0
-			    && strcmp(new_charset, old_charset) != 0) {
-				error.Format(db_domain,
-					     "Existing database has charset "
-					     "\"%s\" instead of \"%s\"; "
-					     "discarding database file",
-					     new_charset, old_charset);
-				return false;
-			}
-		} else if (g_str_has_prefix(line, DB_TAG_PREFIX)) {
-			const char *name = line + sizeof(DB_TAG_PREFIX) - 1;
-			TagType tag = tag_name_parse(name);
-			if (tag == TAG_NUM_OF_ITEM_TYPES) {
-				error.Format(db_domain,
-					     "Unrecognized tag '%s', "
-					     "discarding database file",
-					     name);
-				return false;
-			}
-
-			tags[tag] = true;
-		} else {
-			error.Format(db_domain, "Malformed line: %s", line);
-			return false;
-		}
-	}
-
-	if (format != DB_FORMAT) {
-		error.Set(db_domain,
-			  "Database format mismatch, "
-			  "discarding database file");
-		return false;
-	}
-
-	for (unsigned i = 0; i < TAG_NUM_OF_ITEM_TYPES; ++i) {
-		if (!ignore_tag_items[i] && !tags[i]) {
-			error.Set(db_domain,
-				  "Tag list mismatch, "
-				  "discarding database file");
-			return false;
-		}
-	}
-
-	LogDebug(db_domain, "reading DB");
-
-	db_lock();
-	success = directory_load(file, music_root, error);
-	db_unlock();
-
-	return success;
-}
--- a/src/DatabaseSimple.hxx
+++ b/src/DatabaseSimple.hxx
@@ -1,74 +0,0 @@
-/*
- * Copyright (C) 2003-2013 The Music Player Daemon Project
- * http://www.musicpd.org
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef MPD_DATABASE_SIMPLE_HXX
-#define MPD_DATABASE_SIMPLE_HXX
-
-#include "Compiler.h"
-
-#include <sys/time.h>
-
-struct config_param;
-struct Directory;
-struct db_selection;
-struct db_visitor;
-class Error;
-
-/**
- * Check whether the default #SimpleDatabasePlugin is used.  This
- * allows using db_get_root(), db_save(), db_get_mtime() and
- * db_exists().
- */
-bool
-db_is_simple(void);
-
-/**
- * Returns the root directory object.  Returns NULL if there is no
- * configured music directory.
- *
- * May only be used if db_is_simple() returns true.
- */
-gcc_pure
-Directory *
-db_get_root(void);
-
-/**
- * Caller must lock the #db_mutex.
- */
-gcc_nonnull(1)
-gcc_pure
-Directory *
-db_get_directory(const char *name);
-
-/**
- * May only be used if db_is_simple() returns true.
- */
-bool
-db_save(Error &error);
-
-/**
- * Returns true if there is a valid database file on the disk.
- *
- * May only be used if db_is_simple() returns true.
- */
-gcc_pure
-bool
-db_exists();
-
-#endif
--- a/src/DecoderAPI.cxx
+++ b/src/DecoderAPI.cxx
@@ -1,547 +0,0 @@
-/*
- * Copyright (C) 2003-2013 The Music Player Daemon Project
- * http://www.musicpd.org
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include "config.h"
-#include "DecoderAPI.hxx"
-#include "DecoderError.hxx"
-#include "AudioConfig.hxx"
-#include "ReplayGainConfig.hxx"
-#include "MusicChunk.hxx"
-#include "MusicBuffer.hxx"
-#include "MusicPipe.hxx"
-#include "DecoderControl.hxx"
-#include "DecoderInternal.hxx"
-#include "Song.hxx"
-#include "InputStream.hxx"
-#include "util/Error.hxx"
-#include "Log.hxx"
-
-#include <assert.h>
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
-
-void
-decoder_initialized(Decoder &decoder,
-		    const AudioFormat audio_format,
-		    bool seekable, float total_time)
-{
-	DecoderControl &dc = decoder.dc;
-	struct audio_format_string af_string;
-
-	assert(dc.state == DecoderState::START);
-	assert(dc.pipe != nullptr);
-	assert(decoder.stream_tag == nullptr);
-	assert(decoder.decoder_tag == nullptr);
-	assert(!decoder.seeking);
-	assert(audio_format.IsDefined());
-	assert(audio_format.IsValid());
-
-	dc.in_audio_format = audio_format;
-	dc.out_audio_format = getOutputAudioFormat(audio_format);
-
-	dc.seekable = seekable;
-	dc.total_time = total_time;
-
-	dc.Lock();
-	dc.state = DecoderState::DECODE;
-	dc.client_cond.signal();
-	dc.Unlock();
-
-	FormatDebug(decoder_domain, "audio_format=%s, seekable=%s",
-		    audio_format_to_string(dc.in_audio_format, &af_string),
-		    seekable ? "true" : "false");
-
-	if (dc.in_audio_format != dc.out_audio_format)
-		FormatDebug(decoder_domain, "converting to %s",
-			    audio_format_to_string(dc.out_audio_format,
-						   &af_string));
-}
-
-/**
- * Checks if we need an "initial seek".  If so, then the initial seek
- * is prepared, and the function returns true.
- */
-gcc_pure
-static bool
-decoder_prepare_initial_seek(Decoder &decoder)
-{
-	const DecoderControl &dc = decoder.dc;
-	assert(dc.pipe != nullptr);
-
-	if (dc.state != DecoderState::DECODE)
-		/* wait until the decoder has finished initialisation
-		   (reading file headers etc.) before emitting the
-		   virtual "SEEK" command */
-		return false;
-
-	if (decoder.initial_seek_running)
-		/* initial seek has already begun - override any other
-		   command */
-		return true;
-
-	if (decoder.initial_seek_pending) {
-		if (!dc.seekable) {
-			/* seeking is not possible */
-			decoder.initial_seek_pending = false;
-			return false;
-		}
-
-		if (dc.command == DecoderCommand::NONE) {
-			/* begin initial seek */
-
-			decoder.initial_seek_pending = false;
-			decoder.initial_seek_running = true;
-			return true;
-		}
-
-		/* skip initial seek when there's another command
-		   (e.g. STOP) */
-
-		decoder.initial_seek_pending = false;
-	}
-
-	return false;
-}
-
-/**
- * Returns the current decoder command.  May return a "virtual"
- * synthesized command, e.g. to seek to the beginning of the CUE
- * track.
- */
-gcc_pure
-static DecoderCommand
-decoder_get_virtual_command(Decoder &decoder)
-{
-	const DecoderControl &dc = decoder.dc;
-	assert(dc.pipe != nullptr);
-
-	if (decoder_prepare_initial_seek(decoder))
-		return DecoderCommand::SEEK;
-
-	return dc.command;
-}
-
-DecoderCommand
-decoder_get_command(Decoder &decoder)
-{
-	return decoder_get_virtual_command(decoder);
-}
-
-void
-decoder_command_finished(Decoder &decoder)
-{
-	DecoderControl &dc = decoder.dc;
-
-	dc.Lock();
-
-	assert(dc.command != DecoderCommand::NONE ||
-	       decoder.initial_seek_running);
-	assert(dc.command != DecoderCommand::SEEK ||
-	       decoder.initial_seek_running ||
-	       dc.seek_error || decoder.seeking);
-	assert(dc.pipe != nullptr);
-
-	if (decoder.initial_seek_running) {
-		assert(!decoder.seeking);
-		assert(decoder.chunk == nullptr);
-		assert(dc.pipe->IsEmpty());
-
-		decoder.initial_seek_running = false;
-		decoder.timestamp = dc.start_ms / 1000.;
-		dc.Unlock();
-		return;
-	}
-
-	if (decoder.seeking) {
-		decoder.seeking = false;
-
-		/* delete frames from the old song position */
-
-		if (decoder.chunk != nullptr) {
-			dc.buffer->Return(decoder.chunk);
-			decoder.chunk = nullptr;
-		}
-
-		dc.pipe->Clear(*dc.buffer);
-
-		decoder.timestamp = dc.seek_where;
-	}
-
-	dc.command = DecoderCommand::NONE;
-	dc.client_cond.signal();
-	dc.Unlock();
-}
-
-double decoder_seek_where(gcc_unused Decoder & decoder)
-{
-	const DecoderControl &dc = decoder.dc;
-
-	assert(dc.pipe != nullptr);
-
-	if (decoder.initial_seek_running)
-		return dc.start_ms / 1000.;
-
-	assert(dc.command == DecoderCommand::SEEK);
-
-	decoder.seeking = true;
-
-	return dc.seek_where;
-}
-
-void decoder_seek_error(Decoder & decoder)
-{
-	DecoderControl &dc = decoder.dc;
-
-	assert(dc.pipe != nullptr);
-
-	if (decoder.initial_seek_running) {
-		/* d'oh, we can't seek to the sub-song start position,
-		   what now? - no idea, ignoring the problem for now. */
-		decoder.initial_seek_running = false;
-		return;
-	}
-
-	assert(dc.command == DecoderCommand::SEEK);
-
-	dc.seek_error = true;
-	decoder.seeking = false;
-
-	decoder_command_finished(decoder);
-}
-
-/**
- * Should be read operation be cancelled?  That is the case when the
- * player thread has sent a command such as "STOP".
- */
-gcc_pure
-static inline bool
-decoder_check_cancel_read(const Decoder *decoder)
-{
-	if (decoder == nullptr)
-		return false;
-
-	const DecoderControl &dc = decoder->dc;
-	if (dc.command == DecoderCommand::NONE)
-		return false;
-
-	/* ignore the SEEK command during initialization, the plugin
-	   should handle that after it has initialized successfully */
-	if (dc.command == DecoderCommand::SEEK &&
-	    (dc.state == DecoderState::START || decoder->seeking))
-		return false;
-
-	return true;
-}
-
-size_t
-decoder_read(Decoder *decoder,
-	     InputStream &is,
-	     void *buffer, size_t length)
-{
-	/* XXX don't allow decoder==nullptr */
-
-	assert(decoder == nullptr ||
-	       decoder->dc.state == DecoderState::START ||
-	       decoder->dc.state == DecoderState::DECODE);
-	assert(buffer != nullptr);
-
-	if (length == 0)
-		return 0;
-
-	is.Lock();
-
-	while (true) {
-		if (decoder_check_cancel_read(decoder)) {
-			is.Unlock();
-			return 0;
-		}
-
-		if (is.IsAvailable())
-			break;
-
-		is.cond.wait(is.mutex);
-	}
-
-	Error error;
-	size_t nbytes = is.Read(buffer, length, error);
-	assert(nbytes == 0 || !error.IsDefined());
-	assert(nbytes > 0 || error.IsDefined() || is.IsEOF());
-
-	is.Unlock();
-
-	if (gcc_unlikely(nbytes == 0 && error.IsDefined()))
-		LogError(error);
-
-	return nbytes;
-}
-
-void
-decoder_timestamp(Decoder &decoder, double t)
-{
-	assert(t >= 0);
-
-	decoder.timestamp = t;
-}
-
-/**
- * Sends a #tag as-is to the music pipe.  Flushes the current chunk
- * (decoder.chunk) if there is one.
- */
-static DecoderCommand
-do_send_tag(Decoder &decoder, const Tag &tag)
-{
-	struct music_chunk *chunk;
-
-	if (decoder.chunk != nullptr) {
-		/* there is a partial chunk - flush it, we want the
-		   tag in a new chunk */
-		decoder_flush_chunk(decoder);
-	}
-
-	assert(decoder.chunk == nullptr);
-
-	chunk = decoder_get_chunk(decoder);
-	if (chunk == nullptr) {
-		assert(decoder.dc.command != DecoderCommand::NONE);
-		return decoder.dc.command;
-	}
-
-	chunk->tag = new Tag(tag);
-	return DecoderCommand::NONE;
-}
-
-static bool
-update_stream_tag(Decoder &decoder, InputStream *is)
-{
-	Tag *tag;
-
-	tag = is != nullptr
-		? is->LockReadTag()
-		: nullptr;
-	if (tag == nullptr) {
-		tag = decoder.song_tag;
-		if (tag == nullptr)
-			return false;
-
-		/* no stream tag present - submit the song tag
-		   instead */
-		decoder.song_tag = nullptr;
-	}
-
-	delete decoder.stream_tag;
-	decoder.stream_tag = tag;
-	return true;
-}
-
-DecoderCommand
-decoder_data(Decoder &decoder,
-	     InputStream *is,
-	     const void *data, size_t length,
-	     uint16_t kbit_rate)
-{
-	DecoderControl &dc = decoder.dc;
-	DecoderCommand cmd;
-
-	assert(dc.state == DecoderState::DECODE);
-	assert(dc.pipe != nullptr);
-	assert(length % dc.in_audio_format.GetFrameSize() == 0);
-
-	dc.Lock();
-	cmd = decoder_get_virtual_command(decoder);
-	dc.Unlock();
-
-	if (cmd == DecoderCommand::STOP || cmd == DecoderCommand::SEEK ||
-	    length == 0)
-		return cmd;
-
-	/* send stream tags */
-
-	if (update_stream_tag(decoder, is)) {
-		if (decoder.decoder_tag != nullptr) {
-			/* merge with tag from decoder plugin */
-			Tag *tag = Tag::Merge(*decoder.decoder_tag,
-					      *decoder.stream_tag);
-			cmd = do_send_tag(decoder, *tag);
-			delete tag;
-		} else
-			/* send only the stream tag */
-			cmd = do_send_tag(decoder, *decoder.stream_tag);
-
-		if (cmd != DecoderCommand::NONE)
-			return cmd;
-	}
-
-	if (dc.in_audio_format != dc.out_audio_format) {
-		Error error;
-		data = decoder.conv_state.Convert(dc.in_audio_format,
-						   data, length,
-						   dc.out_audio_format,
-						   &length,
-						   error);
-		if (data == nullptr) {
-			/* the PCM conversion has failed - stop
-			   playback, since we have no better way to
-			   bail out */
-			LogError(error);
-			return DecoderCommand::STOP;
-		}
-	}
-
-	while (length > 0) {
-		struct music_chunk *chunk;
-		bool full;
-
-		chunk = decoder_get_chunk(decoder);
-		if (chunk == nullptr) {
-			assert(dc.command != DecoderCommand::NONE);
-			return dc.command;
-		}
-
-		const auto dest =
-			chunk->Write(dc.out_audio_format,
-				     decoder.timestamp -
-				     dc.song->start_ms / 1000.0,
-				     kbit_rate);
-		if (dest.IsNull()) {
-			/* the chunk is full, flush it */
-			decoder_flush_chunk(decoder);
-			continue;
-		}
-
-		size_t nbytes = dest.size;
-		assert(nbytes > 0);
-
-		if (nbytes > length)
-			nbytes = length;
-
-		/* copy the buffer */
-
-		memcpy(dest.data, data, nbytes);
-
-		/* expand the music pipe chunk */
-
-		full = chunk->Expand(dc.out_audio_format, nbytes);
-		if (full) {
-			/* the chunk is full, flush it */
-			decoder_flush_chunk(decoder);
-		}
-
-		data = (const uint8_t *)data + nbytes;
-		length -= nbytes;
-
-		decoder.timestamp += (double)nbytes /
-			dc.out_audio_format.GetTimeToSize();
-
-		if (dc.end_ms > 0 &&
-		    decoder.timestamp >= dc.end_ms / 1000.0)
-			/* the end of this range has been reached:
-			   stop decoding */
-			return DecoderCommand::STOP;
-	}
-
-	return DecoderCommand::NONE;
-}
-
-DecoderCommand
-decoder_tag(Decoder &decoder, InputStream *is,
-	    Tag &&tag)
-{
-	gcc_unused const DecoderControl &dc = decoder.dc;
-	DecoderCommand cmd;
-
-	assert(dc.state == DecoderState::DECODE);
-	assert(dc.pipe != nullptr);
-
-	/* save the tag */
-
-	delete decoder.decoder_tag;
-	decoder.decoder_tag = new Tag(tag);
-
-	/* check for a new stream tag */
-
-	update_stream_tag(decoder, is);
-
-	/* check if we're seeking */
-
-	if (decoder_prepare_initial_seek(decoder))
-		/* during initial seek, no music chunk must be created
-		   until seeking is finished; skip the rest of the
-		   function here */
-		return DecoderCommand::SEEK;
-
-	/* send tag to music pipe */
-
-	if (decoder.stream_tag != nullptr) {
-		/* merge with tag from input stream */
-		Tag *merged;
-
-		merged = Tag::Merge(*decoder.stream_tag,
-				    *decoder.decoder_tag);
-		cmd = do_send_tag(decoder, *merged);
-		delete merged;
-	} else
-		/* send only the decoder tag */
-		cmd = do_send_tag(decoder, *decoder.decoder_tag);
-
-	return cmd;
-}
-
-void
-decoder_replay_gain(Decoder &decoder,
-		    const ReplayGainInfo *replay_gain_info)
-{
-	if (replay_gain_info != nullptr) {
-		static unsigned serial;
-		if (++serial == 0)
-			serial = 1;
-
-		if (REPLAY_GAIN_OFF != replay_gain_mode) {
-			ReplayGainMode rgm = replay_gain_mode;
-			if (rgm != REPLAY_GAIN_ALBUM)
-				rgm = REPLAY_GAIN_TRACK;
-
-			const auto &tuple = replay_gain_info->tuples[rgm];
-			const auto scale =
-				tuple.CalculateScale(replay_gain_preamp,
-						     replay_gain_missing_preamp,
-						     replay_gain_limit);
-			decoder.dc.replay_gain_db = 20.0 * log10f(scale);
-		}
-
-		decoder.replay_gain_info = *replay_gain_info;
-		decoder.replay_gain_serial = serial;
-
-		if (decoder.chunk != nullptr) {
-			/* flush the current chunk because the new
-			   replay gain values affect the following
-			   samples */
-			decoder_flush_chunk(decoder);
-		}
-	} else
-		decoder.replay_gain_serial = 0;
-}
-
-void
-decoder_mixramp(Decoder &decoder, MixRampInfo &&mix_ramp)
-{
-	DecoderControl &dc = decoder.dc;
-
-	dc.SetMixRamp(std::move(mix_ramp));
-}
--- a/src/DecoderAPI.hxx
+++ b/src/DecoderAPI.hxx
@@ -1,190 +0,0 @@
-/*
- * Copyright (C) 2003-2013 The Music Player Daemon Project
- * http://www.musicpd.org
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-/*! \file
- * \brief The MPD Decoder API
- *
- * This is the public API which is used by decoder plugins to
- * communicate with the mpd core.
- */
-
-#ifndef MPD_DECODER_API_HXX
-#define MPD_DECODER_API_HXX
-
-#include "check.h"
-#include "DecoderCommand.hxx"
-#include "DecoderPlugin.hxx"
-#include "ReplayGainInfo.hxx"
-#include "tag/Tag.hxx"
-#include "AudioFormat.hxx"
-#include "MixRampInfo.hxx"
-#include "ConfigData.hxx"
-
-/**
- * Notify the player thread that it has finished initialization and
- * that it has read the song's meta data.
- *
- * @param decoder the decoder object
- * @param audio_format the audio format which is going to be sent to
- * decoder_data()
- * @param seekable true if the song is seekable
- * @param total_time the total number of seconds in this song; -1 if unknown
- */
-void
-decoder_initialized(Decoder &decoder,
-		    AudioFormat audio_format,
-		    bool seekable, float total_time);
-
-/**
- * Determines the pending decoder command.
- *
- * @param decoder the decoder object
- * @return the current command, or DecoderCommand::NONE if there is no
- * command pending
- */
-gcc_pure
-DecoderCommand
-decoder_get_command(Decoder &decoder);
-
-/**
- * Called by the decoder when it has performed the requested command
- * (dc->command).  This function resets dc->command and wakes up the
- * player thread.
- *
- * @param decoder the decoder object
- */
-void
-decoder_command_finished(Decoder &decoder);
-
-/**
- * Call this when you have received the DecoderCommand::SEEK command.
- *
- * @param decoder the decoder object
- * @return the destination position for the week
- */
-gcc_pure
-double
-decoder_seek_where(Decoder &decoder);
-
-/**
- * Call this instead of decoder_command_finished() when seeking has
- * failed.
- *
- * @param decoder the decoder object
- */
-void
-decoder_seek_error(Decoder &decoder);
-
-/**
- * Blocking read from the input stream.
- *
- * @param decoder the decoder object
- * @param is the input stream to read from
- * @param buffer the destination buffer
- * @param length the maximum number of bytes to read
- * @return the number of bytes read, or 0 if one of the following
- * occurs: end of file; error; command (like SEEK or STOP).
- */
-size_t
-decoder_read(Decoder *decoder, InputStream &is,
-	     void *buffer, size_t length);
-
-static inline size_t
-decoder_read(Decoder &decoder, InputStream &is,
-	     void *buffer, size_t length)
-{
-	return decoder_read(&decoder, is, buffer, length);
-}
-
-/**
- * Sets the time stamp for the next data chunk [seconds].  The MPD
- * core automatically counts it up, and a decoder plugin only needs to
- * use this function if it thinks that adding to the time stamp based
- * on the buffer size won't work.
- */
-void
-decoder_timestamp(Decoder &decoder, double t);
-
-/**
- * This function is called by the decoder plugin when it has
- * successfully decoded block of input data.
- *
- * @param decoder the decoder object
- * @param is an input stream which is buffering while we are waiting
- * for the player
- * @param data the source buffer
- * @param length the number of bytes in the buffer
- * @return the current command, or DecoderCommand::NONE if there is no
- * command pending
- */
-DecoderCommand
-decoder_data(Decoder &decoder, InputStream *is,
-	     const void *data, size_t length,
-	     uint16_t kbit_rate);
-
-static inline DecoderCommand
-decoder_data(Decoder &decoder, InputStream &is,
-	     const void *data, size_t length,
-	     uint16_t kbit_rate)
-{
-	return decoder_data(decoder, &is, data, length, kbit_rate);
-}
-
-/**
- * This function is called by the decoder plugin when it has
- * successfully decoded a tag.
- *
- * @param decoder the decoder object
- * @param is an input stream which is buffering while we are waiting
- * for the player
- * @param tag the tag to send
- * @return the current command, or DecoderCommand::NONE if there is no
- * command pending
- */
-DecoderCommand
-decoder_tag(Decoder &decoder, InputStream *is, Tag &&tag);
-
-static inline DecoderCommand
-decoder_tag(Decoder &decoder, InputStream &is, Tag &&tag)
-{
-	return decoder_tag(decoder, &is, std::move(tag));
-}
-
-/**
- * Set replay gain values for the following chunks.
- *
- * @param decoder the decoder object
- * @param rgi the replay_gain_info object; may be nullptr to invalidate
- * the previous replay gain values
- */
-void
-decoder_replay_gain(Decoder &decoder,
-		    const ReplayGainInfo *replay_gain_info);
-
-/**
- * Store MixRamp tags.
- *
- * @param decoder the decoder object
- * @param mixramp_start the mixramp_start tag; may be nullptr to invalidate
- * @param mixramp_end the mixramp_end tag; may be nullptr to invalidate
- */
-void
-decoder_mixramp(Decoder &decoder, MixRampInfo &&mix_ramp);
-
-#endif
--- a/src/DecoderBuffer.cxx
+++ b/src/DecoderBuffer.cxx
@@ -1,167 +0,0 @@
-/*
- * Copyright (C) 2003-2013 The Music Player Daemon Project
- * http://www.musicpd.org
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include "config.h"
-#include "DecoderBuffer.hxx"
-#include "DecoderAPI.hxx"
-
-#include <glib.h>
-
-#include <assert.h>
-#include <string.h>
-
-struct DecoderBuffer {
-	Decoder *decoder;
-	InputStream *is;
-
-	/** the allocated size of the buffer */
-	size_t size;
-
-	/** the current length of the buffer */
-	size_t length;
-
-	/** number of bytes already consumed at the beginning of the
-	    buffer */
-	size_t consumed;
-
-	/** the actual buffer (dynamic size) */
-	unsigned char data[sizeof(size_t)];
-};
-
-DecoderBuffer *
-decoder_buffer_new(Decoder *decoder, InputStream &is,
-		   size_t size)
-{
-	DecoderBuffer *buffer = (DecoderBuffer *)
-		g_malloc(sizeof(*buffer) - sizeof(buffer->data) + size);
-
-	assert(size > 0);
-
-	buffer->decoder = decoder;
-	buffer->is = &is;
-	buffer->size = size;
-	buffer->length = 0;
-	buffer->consumed = 0;
-
-	return buffer;
-}
-
-void
-decoder_buffer_free(DecoderBuffer *buffer)
-{
-	assert(buffer != nullptr);
-
-	g_free(buffer);
-}
-
-bool
-decoder_buffer_is_empty(const DecoderBuffer *buffer)
-{
-	return buffer->consumed == buffer->length;
-}
-
-bool
-decoder_buffer_is_full(const DecoderBuffer *buffer)
-{
-	return buffer->consumed == 0 && buffer->length == buffer->size;
-}
-
-static void
-decoder_buffer_shift(DecoderBuffer *buffer)
-{
-	assert(buffer->consumed > 0);
-
-	buffer->length -= buffer->consumed;
-	memmove(buffer->data, buffer->data + buffer->consumed, buffer->length);
-	buffer->consumed = 0;
-}
-
-bool
-decoder_buffer_fill(DecoderBuffer *buffer)
-{
-	size_t nbytes;
-
-	if (buffer->consumed > 0)
-		decoder_buffer_shift(buffer);
-
-	if (buffer->length >= buffer->size)
-		/* buffer is full */
-		return false;
-
-	nbytes = decoder_read(buffer->decoder, *buffer->is,
-			      buffer->data + buffer->length,
-			      buffer->size - buffer->length);
-	if (nbytes == 0)
-		/* end of file, I/O error or decoder command
-		   received */
-		return false;
-
-	buffer->length += nbytes;
-	assert(buffer->length <= buffer->size);
-
-	return true;
-}
-
-const void *
-decoder_buffer_read(const DecoderBuffer *buffer, size_t *length_r)
-{
-	if (buffer->consumed >= buffer->length)
-		/* buffer is empty */
-		return nullptr;
-
-	*length_r = buffer->length - buffer->consumed;
-	return buffer->data + buffer->consumed;
-}
-
-void
-decoder_buffer_consume(DecoderBuffer *buffer, size_t nbytes)
-{
-	/* just move the "consumed" pointer - decoder_buffer_shift()
-	   will do the real work later (called by
-	   decoder_buffer_fill()) */
-	buffer->consumed += nbytes;
-
-	assert(buffer->consumed <= buffer->length);
-}
-
-bool
-decoder_buffer_skip(DecoderBuffer *buffer, size_t nbytes)
-{
-	size_t length;
-	const void *data;
-	bool success;
-
-	/* this could probably be optimized by seeking */
-
-	while (true) {
-		data = decoder_buffer_read(buffer, &length);
-		if (data != nullptr) {
-			if (length > nbytes)
-				length = nbytes;
-			decoder_buffer_consume(buffer, length);
-			nbytes -= length;
-			if (nbytes == 0)
-				return true;
-		}
-
-		success = decoder_buffer_fill(buffer);
-		if (!success)
-			return false;
-	}
-}
--- a/src/DecoderBuffer.hxx
+++ b/src/DecoderBuffer.hxx
@@ -1,105 +0,0 @@
-/*
- * Copyright (C) 2003-2013 The Music Player Daemon Project
- * http://www.musicpd.org
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef MPD_DECODER_BUFFER_HXX
-#define MPD_DECODER_BUFFER_HXX
-
-#include <stddef.h>
-
-/**
- * This objects handles buffered reads in decoder plugins easily.  You
- * create a buffer object, and use its high-level methods to fill and
- * read it.  It will automatically handle shifting the buffer.
- */
-struct DecoderBuffer;
-
-struct Decoder;
-struct InputStream;
-
-/**
- * Creates a new buffer.
- *
- * @param decoder the decoder object, used for decoder_read(), may be nullptr
- * @param is the input stream object where we should read from
- * @param size the maximum size of the buffer
- * @return the new decoder_buffer object
- */
-DecoderBuffer *
-decoder_buffer_new(Decoder *decoder, InputStream &is,
-		   size_t size);
-
-/**
- * Frees resources used by the decoder_buffer object.
- */
-void
-decoder_buffer_free(DecoderBuffer *buffer);
-
-bool
-decoder_buffer_is_empty(const DecoderBuffer *buffer);
-
-bool
-decoder_buffer_is_full(const DecoderBuffer *buffer);
-
-/**
- * Read data from the input_stream and append it to the buffer.
- *
- * @return true if data was appended; false if there is no data
- * available (yet), end of file, I/O error or a decoder command was
- * received
- */
-bool
-decoder_buffer_fill(DecoderBuffer *buffer);
-
-/**
- * Reads data from the buffer.  This data is not yet consumed, you
- * have to call decoder_buffer_consume() to do that.  The returned
- * buffer becomes invalid after a decoder_buffer_fill() or a
- * decoder_buffer_consume() call.
- *
- * @param buffer the decoder_buffer object
- * @param length_r pointer to a size_t where you will receive the
- * number of bytes available
- * @return a pointer to the read buffer, or nullptr if there is no data
- * available
- */
-const void *
-decoder_buffer_read(const DecoderBuffer *buffer, size_t *length_r);
-
-/**
- * Consume (delete, invalidate) a part of the buffer.  The "nbytes"
- * parameter must not be larger than the length returned by
- * decoder_buffer_read().
- *
- * @param buffer the decoder_buffer object
- * @param nbytes the number of bytes to consume
- */
-void
-decoder_buffer_consume(DecoderBuffer *buffer, size_t nbytes);
-
-/**
- * Skips the specified number of bytes, discarding its data.
- *
- * @param buffer the decoder_buffer object
- * @param nbytes the number of bytes to skip
- * @return true on success, false on error
- */
-bool
-decoder_buffer_skip(DecoderBuffer *buffer, size_t nbytes);
-
-#endif
--- a/src/DecoderInternal.cxx
+++ b/src/DecoderInternal.cxx
@@ -1,100 +0,0 @@
-/*
- * Copyright (C) 2003-2013 The Music Player Daemon Project
- * http://www.musicpd.org
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include "config.h"
-#include "DecoderInternal.hxx"
-#include "DecoderControl.hxx"
-#include "MusicPipe.hxx"
-#include "MusicBuffer.hxx"
-#include "MusicChunk.hxx"
-#include "tag/Tag.hxx"
-
-#include <assert.h>
-
-Decoder::~Decoder()
-{
-	/* caller must flush the chunk */
-	assert(chunk == nullptr);
-
-	delete song_tag;
-	delete stream_tag;
-	delete decoder_tag;
-}
-
-/**
- * All chunks are full of decoded data; wait for the player to free
- * one.
- */
-static DecoderCommand
-need_chunks(DecoderControl &dc)
-{
-	if (dc.command == DecoderCommand::NONE)
-		dc.Wait();
-
-	return dc.command;
-}
-
-struct music_chunk *
-decoder_get_chunk(Decoder &decoder)
-{
-	DecoderControl &dc = decoder.dc;
-	DecoderCommand cmd;
-
-	if (decoder.chunk != nullptr)
-		return decoder.chunk;
-
-	do {
-		decoder.chunk = dc.buffer->Allocate();
-		if (decoder.chunk != nullptr) {
-			decoder.chunk->replay_gain_serial =
-				decoder.replay_gain_serial;
-			if (decoder.replay_gain_serial != 0)
-				decoder.chunk->replay_gain_info =
-					decoder.replay_gain_info;
-
-			return decoder.chunk;
-		}
-
-		dc.Lock();
-		cmd = need_chunks(dc);
-		dc.Unlock();
-	} while (cmd == DecoderCommand::NONE);
-
-	return nullptr;
-}
-
-void
-decoder_flush_chunk(Decoder &decoder)
-{
-	DecoderControl &dc = decoder.dc;
-
-	assert(decoder.chunk != nullptr);
-
-	if (decoder.chunk->IsEmpty())
-		dc.buffer->Return(decoder.chunk);
-	else
-		dc.pipe->Push(decoder.chunk);
-
-	decoder.chunk = nullptr;
-
-	dc.Lock();
-	if (dc.client_is_waiting)
-		dc.client_cond.signal();
-	dc.Unlock();
-}
--- a/src/DecoderInternal.hxx
+++ b/src/DecoderInternal.hxx
@@ -1,117 +0,0 @@
-/*
- * Copyright (C) 2003-2013 The Music Player Daemon Project
- * http://www.musicpd.org
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef MPD_DECODER_INTERNAL_HXX
-#define MPD_DECODER_INTERNAL_HXX
-
-#include "DecoderCommand.hxx"
-#include "pcm/PcmConvert.hxx"
-#include "ReplayGainInfo.hxx"
-
-struct DecoderControl;
-struct InputStream;
-struct Tag;
-
-struct Decoder {
-	DecoderControl &dc;
-
-	PcmConvert conv_state;
-
-	/**
-	 * The time stamp of the next data chunk, in seconds.
-	 */
-	double timestamp;
-
-	/**
-	 * Is the initial seek (to the start position of the sub-song)
-	 * pending, or has it been performed already?
-	 */
-	bool initial_seek_pending;
-
-	/**
-	 * Is the initial seek currently running?  During this time,
-	 * the decoder command is SEEK.  This flag is set by
-	 * decoder_get_virtual_command(), when the virtual SEEK
-	 * command is generated for the first time.
-	 */
-	bool initial_seek_running;
-
-	/**
-	 * This flag is set by decoder_seek_where(), and checked by
-	 * decoder_command_finished().  It is used to clean up after
-	 * seeking.
-	 */
-	bool seeking;
-
-	/**
-	 * The tag from the song object.  This is only used for local
-	 * files, because we expect the stream server to send us a new
-	 * tag each time we play it.
-	 */
-	Tag *song_tag;
-
-	/** the last tag received from the stream */
-	Tag *stream_tag;
-
-	/** the last tag received from the decoder plugin */
-	Tag *decoder_tag;
-
-	/** the chunk currently being written to */
-	struct music_chunk *chunk;
-
-	ReplayGainInfo replay_gain_info;
-
-	/**
-	 * A positive serial number for checking if replay gain info
-	 * has changed since the last check.
-	 */
-	unsigned replay_gain_serial;
-
-	Decoder(DecoderControl &_dc, bool _initial_seek_pending, Tag *_tag)
-		:dc(_dc),
-		 timestamp(0),
-		 initial_seek_pending(_initial_seek_pending),
-		 initial_seek_running(false),
-		 seeking(false),
-		 song_tag(_tag), stream_tag(nullptr), decoder_tag(nullptr),
-		 chunk(nullptr),
-		 replay_gain_serial(0) {
-	}
-
-	~Decoder();
-};
-
-/**
- * Returns the current chunk the decoder writes to, or allocates a new
- * chunk if there is none.
- *
- * @return the chunk, or NULL if we have received a decoder command
- */
-struct music_chunk *
-decoder_get_chunk(Decoder &decoder);
-
-/**
- * Flushes the current chunk.
- *
- * Caller must not lock the #DecoderControl object.
- */
-void
-decoder_flush_chunk(Decoder &decoder);
-
-#endif
--- a/src/DecoderList.cxx
+++ b/src/DecoderList.cxx
@@ -1,237 +0,0 @@
-/*
- * Copyright (C) 2003-2013 The Music Player Daemon Project
- * http://www.musicpd.org
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include "config.h"
-#include "DecoderList.hxx"
-#include "DecoderPlugin.hxx"
-#include "ConfigGlobal.hxx"
-#include "ConfigData.hxx"
-#include "decoder/AudiofileDecoderPlugin.hxx"
-#include "decoder/PcmDecoderPlugin.hxx"
-#include "decoder/DsdiffDecoderPlugin.hxx"
-#include "decoder/DsfDecoderPlugin.hxx"
-#include "decoder/FlacDecoderPlugin.h"
-#include "decoder/OpusDecoderPlugin.h"
-#include "decoder/VorbisDecoderPlugin.h"
-#include "decoder/AdPlugDecoderPlugin.h"
-#include "decoder/WavpackDecoderPlugin.hxx"
-#include "decoder/FfmpegDecoderPlugin.hxx"
-#include "decoder/GmeDecoderPlugin.hxx"
-#include "decoder/FaadDecoderPlugin.hxx"
-#include "decoder/MadDecoderPlugin.hxx"
-#include "decoder/SndfileDecoderPlugin.hxx"
-#include "decoder/Mpg123DecoderPlugin.hxx"
-#include "decoder/WildmidiDecoderPlugin.hxx"
-#include "decoder/MikmodDecoderPlugin.hxx"
-#include "decoder/ModplugDecoderPlugin.hxx"
-#include "decoder/MpcdecDecoderPlugin.hxx"
-#include "decoder/FluidsynthDecoderPlugin.hxx"
-#include "decoder/SidplayDecoderPlugin.hxx"
-#include "system/FatalError.hxx"
-#include "util/Macros.hxx"
-
-#include <string.h>
-
-const struct DecoderPlugin *const decoder_plugins[] = {
-#ifdef HAVE_MAD
-	&mad_decoder_plugin,
-#endif
-#ifdef HAVE_MPG123
-	&mpg123_decoder_plugin,
-#endif
-#ifdef ENABLE_VORBIS_DECODER
-	&vorbis_decoder_plugin,
-#endif
-#if defined(HAVE_FLAC)
-	&oggflac_decoder_plugin,
-#endif
-#ifdef HAVE_FLAC
-	&flac_decoder_plugin,
-#endif
-#ifdef HAVE_OPUS
-	&opus_decoder_plugin,
-#endif
-#ifdef ENABLE_SNDFILE
-	&sndfile_decoder_plugin,
-#endif
-#ifdef HAVE_AUDIOFILE
-	&audiofile_decoder_plugin,
-#endif
-	&dsdiff_decoder_plugin,
-	&dsf_decoder_plugin,
-#ifdef HAVE_FAAD
-	&faad_decoder_plugin,
-#endif
-#ifdef HAVE_MPCDEC
-	&mpcdec_decoder_plugin,
-#endif
-#ifdef HAVE_WAVPACK
-	&wavpack_decoder_plugin,
-#endif
-#ifdef HAVE_MODPLUG
-	&modplug_decoder_plugin,
-#endif
-#ifdef ENABLE_MIKMOD_DECODER
-	&mikmod_decoder_plugin,
-#endif
-#ifdef ENABLE_SIDPLAY
-	&sidplay_decoder_plugin,
-#endif
-#ifdef ENABLE_WILDMIDI
-	&wildmidi_decoder_plugin,
-#endif
-#ifdef ENABLE_FLUIDSYNTH
-	&fluidsynth_decoder_plugin,
-#endif
-#ifdef HAVE_ADPLUG
-	&adplug_decoder_plugin,
-#endif
-#ifdef HAVE_FFMPEG
-	&ffmpeg_decoder_plugin,
-#endif
-#ifdef HAVE_GME
-	&gme_decoder_plugin,
-#endif
-	&pcm_decoder_plugin,
-	nullptr
-};
-
-static constexpr unsigned num_decoder_plugins =
-	ARRAY_SIZE(decoder_plugins) - 1;
-
-/** which plugins have been initialized successfully? */
-bool decoder_plugins_enabled[num_decoder_plugins];
-
-static unsigned
-decoder_plugin_index(const struct DecoderPlugin *plugin)
-{
-	unsigned i = 0;
-
-	while (decoder_plugins[i] != plugin)
-		++i;
-
-	return i;
-}
-
-static unsigned
-decoder_plugin_next_index(const struct DecoderPlugin *plugin)
-{
-	return plugin == 0
-		? 0 /* start with first plugin */
-		: decoder_plugin_index(plugin) + 1;
-}
-
-const struct DecoderPlugin *
-decoder_plugin_from_suffix(const char *suffix,
-			   const struct DecoderPlugin *plugin)
-{
-	if (suffix == nullptr)
-		return nullptr;
-
-	for (unsigned i = decoder_plugin_next_index(plugin);
-	     decoder_plugins[i] != nullptr; ++i) {
-		plugin = decoder_plugins[i];
-		if (decoder_plugins_enabled[i] &&
-		    plugin->SupportsSuffix(suffix))
-			return plugin;
-	}
-
-	return nullptr;
-}
-
-const struct DecoderPlugin *
-decoder_plugin_from_mime_type(const char *mimeType, unsigned int next)
-{
-	static unsigned i = num_decoder_plugins;
-
-	if (mimeType == nullptr)
-		return nullptr;
-
-	if (!next)
-		i = 0;
-	for (; decoder_plugins[i] != nullptr; ++i) {
-		const struct DecoderPlugin *plugin = decoder_plugins[i];
-		if (decoder_plugins_enabled[i] &&
-		    plugin->SupportsMimeType(mimeType)) {
-			++i;
-			return plugin;
-		}
-	}
-
-	return nullptr;
-}
-
-const struct DecoderPlugin *
-decoder_plugin_from_name(const char *name)
-{
-	return decoder_plugins_find([=](const DecoderPlugin &plugin){
-			return strcmp(plugin.name, name) == 0;
-		});
-}
-
-/**
- * Find the "decoder" configuration block for the specified plugin.
- *
- * @param plugin_name the name of the decoder plugin
- * @return the configuration block, or nullptr if none was configured
- */
-static const struct config_param *
-decoder_plugin_config(const char *plugin_name)
-{
-	const struct config_param *param = nullptr;
-
-	while ((param = config_get_next_param(CONF_DECODER, param)) != nullptr) {
-		const char *name = param->GetBlockValue("plugin");
-		if (name == nullptr)
-			FormatFatalError("decoder configuration without 'plugin' name in line %d",
-					 param->line);
-
-		if (strcmp(name, plugin_name) == 0)
-			return param;
-	}
-
-	return nullptr;
-}
-
-void decoder_plugin_init_all(void)
-{
-	struct config_param empty;
-
-	for (unsigned i = 0; decoder_plugins[i] != nullptr; ++i) {
-		const DecoderPlugin &plugin = *decoder_plugins[i];
-		const struct config_param *param =
-			decoder_plugin_config(plugin.name);
-
-		if (param == nullptr)
-			param = &empty;
-		else if (!param->GetBlockValue("enabled", true))
-			/* the plugin is disabled in mpd.conf */
-			continue;
-
-		if (plugin.Init(*param))
-			decoder_plugins_enabled[i] = true;
-	}
-}
-
-void decoder_plugin_deinit_all(void)
-{
-	decoder_plugins_for_each_enabled([=](const DecoderPlugin &plugin){
-			plugin.Finish();
-		});
-}
--- a/src/DecoderThread.cxx
+++ b/src/DecoderThread.cxx
@@ -1,450 +0,0 @@
-/*
- * Copyright (C) 2003-2013 The Music Player Daemon Project
- * http://www.musicpd.org
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include "config.h"
-#include "DecoderThread.hxx"
-#include "DecoderControl.hxx"
-#include "DecoderInternal.hxx"
-#include "DecoderError.hxx"
-#include "DecoderPlugin.hxx"
-#include "Song.hxx"
-#include "system/FatalError.hxx"
-#include "Mapper.hxx"
-#include "fs/Traits.hxx"
-#include "fs/AllocatedPath.hxx"
-#include "DecoderAPI.hxx"
-#include "tag/Tag.hxx"
-#include "InputStream.hxx"
-#include "DecoderList.hxx"
-#include "util/UriUtil.hxx"
-#include "util/Error.hxx"
-#include "util/Domain.hxx"
-#include "tag/ApeReplayGain.hxx"
-#include "Log.hxx"
-
-#include <functional>
-
-static constexpr Domain decoder_thread_domain("decoder_thread");
-
-/**
- * Marks the current decoder command as "finished" and notifies the
- * player thread.
- *
- * @param dc the #DecoderControl object; must be locked
- */
-static void
-decoder_command_finished_locked(DecoderControl &dc)
-{
-	assert(dc.command != DecoderCommand::NONE);
-
-	dc.command = DecoderCommand::NONE;
-
-	dc.client_cond.signal();
-}
-
-/**
- * Opens the input stream with input_stream::Open(), and waits until
- * the stream gets ready.  If a decoder STOP command is received
- * during that, it cancels the operation (but does not close the
- * stream).
- *
- * Unlock the decoder before calling this function.
- *
- * @return an input_stream on success or if #DecoderCommand::STOP is
- * received, nullptr on error
- */
-static InputStream *
-decoder_input_stream_open(DecoderControl &dc, const char *uri)
-{
-	Error error;
-
-	InputStream *is = InputStream::Open(uri, dc.mutex, dc.cond, error);
-	if (is == nullptr) {
-		if (error.IsDefined())
-			LogError(error);
-
-		return nullptr;
-	}
-
-	/* wait for the input stream to become ready; its metadata
-	   will be available then */
-
-	dc.Lock();
-
-	is->Update();
-	while (!is->ready &&
-	       dc.command != DecoderCommand::STOP) {
-		dc.Wait();
-
-		is->Update();
-	}
-
-	if (!is->Check(error)) {
-		dc.Unlock();
-
-		LogError(error);
-		return nullptr;
-	}
-
-	dc.Unlock();
-
-	return is;
-}
-
-static bool
-decoder_stream_decode(const DecoderPlugin &plugin,
-		      Decoder &decoder,
-		      InputStream &input_stream)
-{
-	assert(plugin.stream_decode != nullptr);
-	assert(decoder.stream_tag == nullptr);
-	assert(decoder.decoder_tag == nullptr);
-	assert(input_stream.ready);
-	assert(decoder.dc.state == DecoderState::START);
-
-	FormatDebug(decoder_thread_domain, "probing plugin %s", plugin.name);
-
-	if (decoder.dc.command == DecoderCommand::STOP)
-		return true;
-
-	/* rewind the stream, so each plugin gets a fresh start */
-	input_stream.Rewind(IgnoreError());
-
-	decoder.dc.Unlock();
-
-	plugin.StreamDecode(decoder, input_stream);
-
-	decoder.dc.Lock();
-
-	assert(decoder.dc.state == DecoderState::START ||
-	       decoder.dc.state == DecoderState::DECODE);
-
-	return decoder.dc.state != DecoderState::START;
-}
-
-static bool
-decoder_file_decode(const DecoderPlugin &plugin,
-		    Decoder &decoder, const char *path)
-{
-	assert(plugin.file_decode != nullptr);
-	assert(decoder.stream_tag == nullptr);
-	assert(decoder.decoder_tag == nullptr);
-	assert(path != nullptr);
-	assert(PathTraits::IsAbsoluteFS(path));
-	assert(decoder.dc.state == DecoderState::START);
-
-	FormatDebug(decoder_thread_domain, "probing plugin %s", plugin.name);
-
-	if (decoder.dc.command == DecoderCommand::STOP)
-		return true;
-
-	decoder.dc.Unlock();
-
-	plugin.FileDecode(decoder, path);
-
-	decoder.dc.Lock();
-
-	assert(decoder.dc.state == DecoderState::START ||
-	       decoder.dc.state == DecoderState::DECODE);
-
-	return decoder.dc.state != DecoderState::START;
-}
-
-gcc_pure
-static bool
-decoder_check_plugin_mime(const DecoderPlugin &plugin, const InputStream &is)
-{
-	assert(plugin.stream_decode != nullptr);
-
-	return !is.mime.empty() && plugin.SupportsMimeType(is.mime.c_str());
-}
-
-gcc_pure
-static bool
-decoder_check_plugin_suffix(const DecoderPlugin &plugin, const char *suffix)
-{
-	assert(plugin.stream_decode != nullptr);
-
-	return suffix != nullptr && plugin.SupportsSuffix(suffix);
-}
-
-gcc_pure
-static bool
-decoder_check_plugin(const DecoderPlugin &plugin, const InputStream &is,
-		     const char *suffix)
-{
-	return plugin.stream_decode != nullptr &&
-		(decoder_check_plugin_mime(plugin, is) ||
-		 decoder_check_plugin_suffix(plugin, suffix));
-}
-
-static bool
-decoder_run_stream_plugin(Decoder &decoder, InputStream &is,
-			  const char *suffix,
-			  const DecoderPlugin &plugin,
-			  bool &tried_r)
-{
-	if (!decoder_check_plugin(plugin, is, suffix))
-		return false;
-
-	tried_r = true;
-	return decoder_stream_decode(plugin, decoder, is);
-}
-
-static bool
-decoder_run_stream_locked(Decoder &decoder, InputStream &is,
-			  const char *uri, bool &tried_r)
-{
-	const char *const suffix = uri_get_suffix(uri);
-
-	using namespace std::placeholders;
-	const auto f = std::bind(decoder_run_stream_plugin,
-				 std::ref(decoder), std::ref(is), suffix,
-				 _1, std::ref(tried_r));
-	return decoder_plugins_try(f);
-}
-
-/**
- * Try decoding a stream, using the fallback plugin.
- */
-static bool
-decoder_run_stream_fallback(Decoder &decoder, InputStream &is)
-{
-	const struct DecoderPlugin *plugin;
-
-	plugin = decoder_plugin_from_name("mad");
-	return plugin != nullptr && plugin->stream_decode != nullptr &&
-		decoder_stream_decode(*plugin, decoder, is);
-}
-
-/**
- * Try decoding a stream.
- */
-static bool
-decoder_run_stream(Decoder &decoder, const char *uri)
-{
-	DecoderControl &dc = decoder.dc;
-	InputStream *input_stream;
-	bool success;
-
-	dc.Unlock();
-
-	input_stream = decoder_input_stream_open(dc, uri);
-	if (input_stream == nullptr) {
-		dc.Lock();
-		return false;
-	}
-
-	dc.Lock();
-
-	bool tried = false;
-	success = dc.command == DecoderCommand::STOP ||
-		decoder_run_stream_locked(decoder, *input_stream, uri,
-					  tried) ||
-		/* fallback to mp3: this is needed for bastard streams
-		   that don't have a suffix or set the mimeType */
-		(!tried &&
-		 decoder_run_stream_fallback(decoder, *input_stream));
-
-	dc.Unlock();
-	input_stream->Close();
-	dc.Lock();
-
-	return success;
-}
-
-/**
- * Attempt to load replay gain data, and pass it to
- * decoder_replay_gain().
- */
-static void
-decoder_load_replay_gain(Decoder &decoder, const char *path_fs)
-{
-	ReplayGainInfo info;
-	if (replay_gain_ape_read(Path::FromFS(path_fs), info))
-		decoder_replay_gain(decoder, &info);
-}
-
-/**
- * Try decoding a file.
- */
-static bool
-decoder_run_file(Decoder &decoder, const char *path_fs)
-{
-	DecoderControl &dc = decoder.dc;
-	const char *suffix = uri_get_suffix(path_fs);
-	const struct DecoderPlugin *plugin = nullptr;
-
-	if (suffix == nullptr)
-		return false;
-
-	dc.Unlock();
-
-	decoder_load_replay_gain(decoder, path_fs);
-
-	while ((plugin = decoder_plugin_from_suffix(suffix, plugin)) != nullptr) {
-		if (plugin->file_decode != nullptr) {
-			dc.Lock();
-
-			if (decoder_file_decode(*plugin, decoder, path_fs))
-				return true;
-
-			dc.Unlock();
-		} else if (plugin->stream_decode != nullptr) {
-			InputStream *input_stream;
-			bool success;
-
-			input_stream = decoder_input_stream_open(dc, path_fs);
-			if (input_stream == nullptr)
-				continue;
-
-			dc.Lock();
-
-			success = decoder_stream_decode(*plugin, decoder,
-							*input_stream);
-
-			dc.Unlock();
-
-			input_stream->Close();
-
-			if (success) {
-				dc.Lock();
-				return true;
-			}
-		}
-	}
-
-	dc.Lock();
-	return false;
-}
-
-static void
-decoder_run_song(DecoderControl &dc,
-		 const Song *song, const char *uri)
-{
-	Decoder decoder(dc, dc.start_ms > 0,
-			song->tag != nullptr && song->IsFile()
-			? new Tag(*song->tag) : nullptr);
-	int ret;
-
-	dc.state = DecoderState::START;
-
-	decoder_command_finished_locked(dc);
-
-	ret = song->IsFile()
-		? decoder_run_file(decoder, uri)
-		: decoder_run_stream(decoder, uri);
-
-	dc.Unlock();
-
-	/* flush the last chunk */
-
-	if (decoder.chunk != nullptr)
-		decoder_flush_chunk(decoder);
-
-	dc.Lock();
-
-	if (ret)
-		dc.state = DecoderState::STOP;
-	else {
-		dc.state = DecoderState::ERROR;
-
-		const char *error_uri = song->uri;
-		const std::string allocated = uri_remove_auth(error_uri);
-		if (!allocated.empty())
-			error_uri = allocated.c_str();
-
-		dc.error.Format(decoder_domain,
-				 "Failed to decode %s", error_uri);
-	}
-
-	dc.client_cond.signal();
-}
-
-static void
-decoder_run(DecoderControl &dc)
-{
-	dc.ClearError();
-
-	const Song *song = dc.song;
-	assert(song != nullptr);
-
-	const std::string uri = song->IsFile()
-		? std::string(map_song_fs(*song).c_str())
-		: song->GetURI();
-
-	if (uri.empty()) {
-		dc.state = DecoderState::ERROR;
-		dc.error.Set(decoder_domain, "Failed to map song");
-
-		decoder_command_finished_locked(dc);
-		return;
-	}
-
-	decoder_run_song(dc, song, uri.c_str());
-
-}
-
-static void
-decoder_task(void *arg)
-{
-	DecoderControl &dc = *(DecoderControl *)arg;
-
-	dc.Lock();
-
-	do {
-		assert(dc.state == DecoderState::STOP ||
-		       dc.state == DecoderState::ERROR);
-
-		switch (dc.command) {
-		case DecoderCommand::START:
-			dc.CycleMixRamp();
-			dc.replay_gain_prev_db = dc.replay_gain_db;
-			dc.replay_gain_db = 0;
-
-			/* fall through */
-
-		case DecoderCommand::SEEK:
-			decoder_run(dc);
-			break;
-
-		case DecoderCommand::STOP:
-			decoder_command_finished_locked(dc);
-			break;
-
-		case DecoderCommand::NONE:
-			dc.Wait();
-			break;
-		}
-	} while (dc.command != DecoderCommand::NONE || !dc.quit);
-
-	dc.Unlock();
-}
-
-void
-decoder_thread_start(DecoderControl &dc)
-{
-	assert(!dc.thread.IsDefined());
-
-	dc.quit = false;
-
-	Error error;
-	if (!dc.thread.Start(decoder_task, &dc, error))
-		FatalError(error);
-}
--- a/src/DespotifyUtils.cxx
+++ b/src/DespotifyUtils.cxx
@@ -1,154 +0,0 @@
-/*
- * Copyright (C) 2003-2013 The Music Player Daemon Project
- * http://www.musicpd.org
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include "DespotifyUtils.hxx"
-#include "tag/Tag.hxx"
-#include "ConfigGlobal.hxx"
-#include "ConfigOption.hxx"
-#include "util/Domain.hxx"
-#include "Log.hxx"
-
-extern "C" {
-#include <despotify.h>
-}
-
-#include <stdio.h>
-
-const Domain despotify_domain("despotify");
-
-static struct despotify_session *g_session;
-static void (*registered_callbacks[8])(struct despotify_session *,
-		int, void *, void *);
-static void *registered_callback_data[8];
-
-static void
-callback(struct despotify_session* ds, int sig,
-	 void *data, gcc_unused void *callback_data)
-{
-	size_t i;
-
-	for (i = 0; i < sizeof(registered_callbacks) / sizeof(registered_callbacks[0]); i++) {
-		void (*cb)(struct despotify_session *, int, void *, void *) = registered_callbacks[i];
-		void *cb_data = registered_callback_data[i];
-
-		if (cb)
-			cb(ds, sig, data, cb_data);
-	}
-}
-
-bool mpd_despotify_register_callback(void (*cb)(struct despotify_session *, int, void *, void *),
-		void *cb_data)
-{
-	size_t i;
-
-	for (i = 0; i < sizeof(registered_callbacks) / sizeof(registered_callbacks[0]); i++) {
-
-		if (!registered_callbacks[i]) {
-			registered_callbacks[i] = cb;
-			registered_callback_data[i] = cb_data;
-
-			return true;
-		}
-	}
-
-	return false;
-}
-
-void mpd_despotify_unregister_callback(void (*cb)(struct despotify_session *, int, void *, void *))
-{
-	size_t i;
-
-	for (i = 0; i < sizeof(registered_callbacks) / sizeof(registered_callbacks[0]); i++) {
-
-		if (registered_callbacks[i] == cb) {
-			registered_callbacks[i] = nullptr;
-		}
-	}
-}
-
-
-Tag *
-mpd_despotify_tag_from_track(struct ds_track *track)
-{
-	char tracknum[20];
-	char comment[80];
-	char date[20];
-
-	Tag *tag = new Tag();
-
-	if (!track->has_meta_data)
-		return tag;
-
-	snprintf(tracknum, sizeof(tracknum), "%d", track->tracknumber);
-	snprintf(date, sizeof(date), "%d", track->year);
-	snprintf(comment, sizeof(comment), "Bitrate %d Kbps, %sgeo restricted",
-		 track->file_bitrate / 1000,
-		 track->geo_restricted ? "" : "not ");
-	tag->AddItem(TAG_TITLE, track->title);
-	tag->AddItem(TAG_ARTIST, track->artist->name);
-	tag->AddItem(TAG_TRACK, tracknum);
-	tag->AddItem(TAG_ALBUM, track->album);
-	tag->AddItem(TAG_DATE, date);
-	tag->AddItem(TAG_COMMENT, comment);
-	tag->time = track->length / 1000;
-
-	return tag;
-}
-
-struct despotify_session *mpd_despotify_get_session(void)
-{
-	const char *user;
-	const char *passwd;
-	bool high_bitrate;
-
-	if (g_session)
-		return g_session;
-
-	user = config_get_string(CONF_DESPOTIFY_USER, nullptr);
-	passwd = config_get_string(CONF_DESPOTIFY_PASSWORD, nullptr);
-	high_bitrate = config_get_bool(CONF_DESPOTIFY_HIGH_BITRATE, true);
-
-	if (user == nullptr || passwd == nullptr) {
-		LogDebug(despotify_domain,
-			 "disabling despotify because account is not configured");
-		return nullptr;
-	}
-
-	if (!despotify_init()) {
-		LogWarning(despotify_domain, "Can't initialize despotify");
-		return nullptr;
-	}
-
-	g_session = despotify_init_client(callback, nullptr,
-					  high_bitrate, true);
-	if (!g_session) {
-		LogWarning(despotify_domain,
-			   "Can't initialize despotify client");
-		return nullptr;
-	}
-
-	if (!despotify_authenticate(g_session, user, passwd)) {
-		LogWarning(despotify_domain,
-			   "Can't authenticate despotify session");
-		despotify_exit(g_session);
-		return nullptr;
-	}
-
-	return g_session;
-}
--- a/src/DespotifyUtils.hxx
+++ b/src/DespotifyUtils.hxx
@@ -1,71 +0,0 @@
-/*
- * Copyright (C) 2003-2013 The Music Player Daemon Project
- * http://www.musicpd.org
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef MPD_DESPOTIFY_H
-#define MPD_DESPOTIFY_H
-
-struct Tag;
-struct despotify_session;
-struct ds_track;
-
-extern const class Domain despotify_domain;
-
-/**
- * Return the current despotify session.
- *
- * If the session isn't initialized, this function will initialize
- * it and connect to Spotify.
- *
- * @return a pointer to the despotify session, or nullptr if it can't
- *         be initialized (e.g., if the configuration isn't supplied)
- */
-struct despotify_session *mpd_despotify_get_session(void);
-
-/**
- * Create a MPD tags structure from a spotify track
- *
- * @param track the track to convert
- *
- * @return a pointer to the filled in tags structure
- */
-Tag *
-mpd_despotify_tag_from_track(struct ds_track *track);
-
-/**
- * Register a despotify callback.
- *
- * Despotify calls this e.g., when a track ends.
- *
- * @param cb the callback
- * @param cb_data the data to pass to the callback
- *
- * @return true if the callback could be registered
- */
-bool mpd_despotify_register_callback(void (*cb)(struct despotify_session *, int, void *, void *),
-		void *cb_data);
-
-/**
- * Unregister a despotify callback.
- *
- * @param cb the callback to unregister.
- */
-void mpd_despotify_unregister_callback(void (*cb)(struct despotify_session *, int, void *, void *));
-
-#endif
-
--- a/src/DetachedSong.cxx
+++ b/src/DetachedSong.cxx
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2003-2017 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "config.h"
+#include "DetachedSong.hxx"
+#include "db/LightSong.hxx"
+#include "util/UriUtil.hxx"
+#include "fs/Traits.hxx"
+
+DetachedSong::DetachedSong(const LightSong &other)
+	:uri(other.GetURI().c_str()),
+	 real_uri(other.real_uri != nullptr ? other.real_uri : ""),
+	 tag(*other.tag),
+	 mtime(other.mtime),
+	 start_time(other.start_time),
+	 end_time(other.end_time) {}
+
+DetachedSong::~DetachedSong()
+{
+	/* this destructor exists here just so it won't  inlined */
+}
+
+bool
+DetachedSong::IsRemote() const
+{
+	return uri_has_scheme(GetRealURI());
+}
+
+bool
+DetachedSong::IsAbsoluteFile() const
+{
+	return PathTraitsUTF8::IsAbsolute(GetRealURI());
+}
+
+bool
+DetachedSong::IsInDatabase() const
+{
+	/* here, we use GetURI() and not GetRealURI() because
+	   GetRealURI() is never relative */
+
+	const char *_uri = GetURI();
+	return !uri_has_scheme(_uri) && !PathTraitsUTF8::IsAbsolute(_uri);
+}
+
+SignedSongTime
+DetachedSong::GetDuration() const
+{
+	SongTime a = start_time, b = end_time;
+	if (!b.IsPositive()) {
+		if (tag.duration.IsNegative())
+			return tag.duration;
+
+		b = SongTime(tag.duration);
+	}
+
+	return SignedSongTime(b - a);
+}
--- a/src/DetachedSong.hxx
+++ b/src/DetachedSong.hxx
@@ -0,0 +1,239 @@
+/*
+ * Copyright 2003-2017 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef MPD_DETACHED_SONG_HXX
+#define MPD_DETACHED_SONG_HXX
+
+#include "check.h"
+#include "tag/Tag.hxx"
+#include "Chrono.hxx"
+#include "Compiler.h"
+
+#include <string>
+#include <utility>
+
+#include <time.h>
+
+struct LightSong;
+class Storage;
+class Path;
+
+class DetachedSong {
+	friend DetachedSong DatabaseDetachSong(const Storage &db,
+					       const LightSong &song);
+
+	/**
+	 * An UTF-8-encoded URI referring to the song file.  This can
+	 * be one of:
+	 *
+	 * - an absolute URL with a scheme
+	 *   (e.g. "http://example.com/foo.mp3")
+	 *
+	 * - an absolute file name
+	 *
+	 * - a file name relative to the music directory
+	 */
+	std::string uri;
+
+	/**
+	 * The "real" URI, the one to be used for opening the
+	 * resource.  If this attribute is empty, then #uri shall be
+	 * used.
+	 *
+	 * This attribute is used for songs from the database which
+	 * have a relative URI.
+	 */
+	std::string real_uri;
+
+	Tag tag;
+
+	time_t mtime;
+
+	/**
+	 * Start of this sub-song within the file.
+	 */
+	SongTime start_time;
+
+	/**
+	 * End of this sub-song within the file.
+	 * Unused if zero.
+	 */
+	SongTime end_time;
+
+	explicit DetachedSong(const LightSong &other);
+
+public:
+	explicit DetachedSong(const DetachedSong &) = default;
+
+	explicit DetachedSong(const char *_uri)
+		:uri(_uri),
+		 mtime(0),
+		 start_time(SongTime::zero()), end_time(SongTime::zero()) {}
+
+	explicit DetachedSong(const std::string &_uri)
+		:uri(_uri),
+		 mtime(0),
+		 start_time(SongTime::zero()), end_time(SongTime::zero()) {}
+
+	explicit DetachedSong(std::string &&_uri)
+		:uri(std::move(_uri)),
+		 mtime(0),
+		 start_time(SongTime::zero()), end_time(SongTime::zero()) {}
+
+	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()) {}
+
+	DetachedSong(DetachedSong &&) = default;
+
+	~DetachedSong();
+
+	gcc_pure
+	const char *GetURI() const {
+		return uri.c_str();
+	}
+
+	template<typename T>
+	void SetURI(T &&_uri) {
+		uri = std::forward<T>(_uri);
+	}
+
+	/**
+	 * Does this object have a "real" URI different from the
+	 * displayed URI?
+	 */
+	gcc_pure
+	bool HasRealURI() const {
+		return !real_uri.empty();
+	}
+
+	/**
+	 * Returns "real" URI (#real_uri) and falls back to just
+	 * GetURI().
+	 */
+	gcc_pure
+	const char *GetRealURI() const {
+		return (HasRealURI() ? real_uri : uri).c_str();
+	}
+
+	template<typename T>
+	void SetRealURI(T &&_uri) {
+		real_uri = std::forward<T>(_uri);
+	}
+
+	/**
+	 * Returns true if both objects refer to the same physical
+	 * song.
+	 */
+	gcc_pure
+	bool IsSame(const DetachedSong &other) const {
+		return uri == other.uri;
+	}
+
+	gcc_pure gcc_nonnull_all
+	bool IsURI(const char *other_uri) const {
+		return uri == other_uri;
+	}
+
+	gcc_pure
+	bool IsRemote() const;
+
+	gcc_pure
+	bool IsFile() const {
+		return !IsRemote();
+	}
+
+	gcc_pure
+	bool IsAbsoluteFile() const;
+
+	gcc_pure
+	bool IsInDatabase() const;
+
+	const Tag &GetTag() const {
+		return tag;
+	}
+
+	Tag &WritableTag() {
+		return tag;
+	}
+
+	void SetTag(const Tag &_tag) {
+		tag = Tag(_tag);
+	}
+
+	void SetTag(Tag &&_tag) {
+		tag = std::move(_tag);
+	}
+
+	void MoveTagFrom(DetachedSong &&other) {
+		tag = std::move(other.tag);
+	}
+
+	/**
+	 * Similar to the MoveTagFrom(), but move only the #TagItem
+	 * array.
+	 */
+	void MoveTagItemsFrom(DetachedSong &&other) {
+		tag.MoveItemsFrom(std::move(other.tag));
+	}
+
+	time_t GetLastModified() const {
+		return mtime;
+	}
+
+	void SetLastModified(time_t _value) {
+		mtime = _value;
+	}
+
+	SongTime GetStartTime() const {
+		return start_time;
+	}
+
+	void SetStartTime(SongTime _value) {
+		start_time = _value;
+	}
+
+	SongTime GetEndTime() const {
+		return end_time;
+	}
+
+	void SetEndTime(SongTime _value) {
+		end_time = _value;
+	}
+
+	gcc_pure
+	SignedSongTime GetDuration() const;
+
+	/**
+	 * Update the #tag and #mtime.
+	 *
+	 * @return true on success
+	 */
+	bool Update();
+
+	/**
+	 * Load #tag and #mtime from a local file.
+	 */
+	bool LoadFile(Path path);
+};
+
+#endif
--- a/src/Directory.cxx
+++ b/src/Directory.cxx
@@ -1,331 +0,0 @@
-/*
- * Copyright (C) 2003-2013 The Music Player Daemon Project
- * http://www.musicpd.org
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include "config.h"
-#include "Directory.hxx"
-#include "SongFilter.hxx"
-#include "PlaylistVector.hxx"
-#include "DatabaseLock.hxx"
-#include "SongSort.hxx"
-#include "Song.hxx"
-#include "fs/Traits.hxx"
-#include "util/Error.hxx"
-
-extern "C" {
-#include "util/list_sort.h"
-}
-
-#include <glib.h>
-
-#include <assert.h>
-#include <string.h>
-#include <stdlib.h>
-
-inline Directory *
-Directory::Allocate(const char *path)
-{
-	assert(path != nullptr);
-
-	const size_t path_size = strlen(path) + 1;
-	Directory *directory =
-		(Directory *)g_malloc0(sizeof(*directory)
-				       - sizeof(directory->path)
-				       + path_size);
-	new(directory) Directory(path);
-
-	return directory;
-}
-
-Directory::Directory()
-{
-	INIT_LIST_HEAD(&children);
-	INIT_LIST_HEAD(&songs);
-
-	path[0] = 0;
-}
-
-Directory::Directory(const char *_path)
-{
-	INIT_LIST_HEAD(&children);
-	INIT_LIST_HEAD(&songs);
-
-	strcpy(path, _path);
-}
-
-Directory::~Directory()
-{
-	Song *song, *ns;
-	directory_for_each_song_safe(song, ns, *this)
-		song->Free();
-
-	Directory *child, *n;
-	directory_for_each_child_safe(child, n, *this)
-		child->Free();
-}
-
-Directory *
-Directory::NewGeneric(const char *path, Directory *parent)
-{
-	assert(path != nullptr);
-	assert((*path == 0) == (parent == nullptr));
-
-	Directory *directory = Allocate(path);
-
-	directory->parent = parent;
-
-	return directory;
-}
-
-void
-Directory::Free()
-{
-	this->Directory::~Directory();
-	g_free(this);
-}
-
-void
-Directory::Delete()
-{
-	assert(holding_db_lock());
-	assert(parent != nullptr);
-
-	list_del(&siblings);
-	Free();
-}
-
-const char *
-Directory::GetName() const
-{
-	assert(!IsRoot());
-
-	return PathTraits::GetBaseUTF8(path);
-}
-
-Directory *
-Directory::CreateChild(const char *name_utf8)
-{
-	assert(holding_db_lock());
-	assert(name_utf8 != nullptr);
-	assert(*name_utf8 != 0);
-
-	char *allocated;
-	const char *path_utf8;
-	if (IsRoot()) {
-		allocated = nullptr;
-		path_utf8 = name_utf8;
-	} else {
-		allocated = g_strconcat(GetPath(),
-					"/", name_utf8, nullptr);
-		path_utf8 = allocated;
-	}
-
-	Directory *child = NewGeneric(path_utf8, this);
-	g_free(allocated);
-
-	list_add_tail(&child->siblings, &children);
-	return child;
-}
-
-const Directory *
-Directory::FindChild(const char *name) const
-{
-	assert(holding_db_lock());
-
-	const Directory *child;
-	directory_for_each_child(child, *this)
-		if (strcmp(child->GetName(), name) == 0)
-			return child;
-
-	return nullptr;
-}
-
-void
-Directory::PruneEmpty()
-{
-	assert(holding_db_lock());
-
-	Directory *child, *n;
-	directory_for_each_child_safe(child, n, *this) {
-		child->PruneEmpty();
-
-		if (child->IsEmpty())
-			child->Delete();
-	}
-}
-
-Directory *
-Directory::LookupDirectory(const char *uri)
-{
-	assert(holding_db_lock());
-	assert(uri != nullptr);
-
-	if (isRootDirectory(uri))
-		return this;
-
-	char *duplicated = g_strdup(uri), *name = duplicated;
-
-	Directory *d = this;
-	while (1) {
-		char *slash = strchr(name, '/');
-		if (slash == name) {
-			d = nullptr;
-			break;
-		}
-
-		if (slash != nullptr)
-			*slash = '\0';
-
-		d = d->FindChild(name);
-		if (d == nullptr || slash == nullptr)
-			break;
-
-		name = slash + 1;
-	}
-
-	g_free(duplicated);
-
-	return d;
-}
-
-void
-Directory::AddSong(Song *song)
-{
-	assert(holding_db_lock());
-	assert(song != nullptr);
-	assert(song->parent == this);
-
-	list_add_tail(&song->siblings, &songs);
-}
-
-void
-Directory::RemoveSong(Song *song)
-{
-	assert(holding_db_lock());
-	assert(song != nullptr);
-	assert(song->parent == this);
-
-	list_del(&song->siblings);
-}
-
-const Song *
-Directory::FindSong(const char *name_utf8) const
-{
-	assert(holding_db_lock());
-	assert(name_utf8 != nullptr);
-
-	Song *song;
-	directory_for_each_song(song, *this) {
-		assert(song->parent == this);
-
-		if (strcmp(song->uri, name_utf8) == 0)
-			return song;
-	}
-
-	return nullptr;
-}
-
-Song *
-Directory::LookupSong(const char *uri)
-{
-	char *duplicated, *base;
-
-	assert(holding_db_lock());
-	assert(uri != nullptr);
-
-	duplicated = g_strdup(uri);
-	base = strrchr(duplicated, '/');
-
-	Directory *d = this;
-	if (base != nullptr) {
-		*base++ = 0;
-		d = d->LookupDirectory(duplicated);
-		if (d == nullptr) {
-			g_free(duplicated);
-			return nullptr;
-		}
-	} else
-		base = duplicated;
-
-	Song *song = d->FindSong(base);
-	assert(song == nullptr || song->parent == d);
-
-	g_free(duplicated);
-	return song;
-
-}
-
-static int
-directory_cmp(gcc_unused void *priv,
-	      struct list_head *_a, struct list_head *_b)
-{
-	const Directory *a = (const Directory *)_a;
-	const Directory *b = (const Directory *)_b;
-	return g_utf8_collate(a->path, b->path);
-}
-
-void
-Directory::Sort()
-{
-	assert(holding_db_lock());
-
-	list_sort(nullptr, &children, directory_cmp);
-	song_list_sort(&songs);
-
-	Directory *child;
-	directory_for_each_child(child, *this)
-		child->Sort();
-}
-
-bool
-Directory::Walk(bool recursive, const SongFilter *filter,
-		VisitDirectory visit_directory, VisitSong visit_song,
-		VisitPlaylist visit_playlist,
-		Error &error) const
-{
-	assert(!error.IsDefined());
-
-	if (visit_song) {
-		Song *song;
-		directory_for_each_song(song, *this)
-			if ((filter == nullptr || filter->Match(*song)) &&
-			    !visit_song(*song, error))
-				return false;
-	}
-
-	if (visit_playlist) {
-		for (const PlaylistInfo &p : playlists)
-			if (!visit_playlist(p, *this, error))
-				return false;
-	}
-
-	Directory *child;
-	directory_for_each_child(child, *this) {
-		if (visit_directory &&
-		    !visit_directory(*child, error))
-			return false;
-
-		if (recursive &&
-		    !child->Walk(recursive, filter,
-				 visit_directory, visit_song, visit_playlist,
-				 error))
-			return false;
-	}
-
-	return true;
-}
--- a/src/DirectorySave.cxx
+++ b/src/DirectorySave.cxx
@@ -1,171 +0,0 @@
-/*
- * Copyright (C) 2003-2013 The Music Player Daemon Project
- * http://www.musicpd.org
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include "config.h"
-#include "DirectorySave.hxx"
-#include "Directory.hxx"
-#include "Song.hxx"
-#include "SongSave.hxx"
-#include "PlaylistDatabase.hxx"
-#include "TextFile.hxx"
-#include "util/NumberParser.hxx"
-#include "util/Error.hxx"
-#include "util/Domain.hxx"
-
-#include <glib.h>
-
-#include <assert.h>
-#include <string.h>
-
-#define DIRECTORY_DIR "directory: "
-#define DIRECTORY_MTIME "mtime: "
-#define DIRECTORY_BEGIN "begin: "
-#define DIRECTORY_END "end: "
-
-static constexpr Domain directory_domain("directory");
-
-void
-directory_save(FILE *fp, const Directory &directory)
-{
-	if (!directory.IsRoot()) {
-		fprintf(fp, DIRECTORY_MTIME "%lu\n",
-			(unsigned long)directory.mtime);
-
-		fprintf(fp, "%s%s\n", DIRECTORY_BEGIN, directory.GetPath());
-	}
-
-	Directory *cur;
-	directory_for_each_child(cur, directory) {
-		fprintf(fp, DIRECTORY_DIR "%s\n", cur->GetName());
-
-		directory_save(fp, *cur);
-
-		if (ferror(fp))
-			return;
-	}
-
-	Song *song;
-	directory_for_each_song(song, directory)
-		song_save(fp, *song);
-
-	playlist_vector_save(fp, directory.playlists);
-
-	if (!directory.IsRoot())
-		fprintf(fp, DIRECTORY_END "%s\n", directory.GetPath());
-}
-
-static Directory *
-directory_load_subdir(TextFile &file, Directory &parent, const char *name,
-		      Error &error)
-{
-	bool success;
-
-	if (parent.FindChild(name) != nullptr) {
-		error.Format(directory_domain,
-			     "Duplicate subdirectory '%s'", name);
-		return nullptr;
-	}
-
-	Directory *directory = parent.CreateChild(name);
-
-	const char *line = file.ReadLine();
-	if (line == nullptr) {
-		error.Set(directory_domain, "Unexpected end of file");
-		directory->Delete();
-		return nullptr;
-	}
-
-	if (g_str_has_prefix(line, DIRECTORY_MTIME)) {
-		directory->mtime =
-			ParseUint64(line + sizeof(DIRECTORY_MTIME) - 1);
-
-		line = file.ReadLine();
-		if (line == nullptr) {
-			error.Set(directory_domain, "Unexpected end of file");
-			directory->Delete();
-			return nullptr;
-		}
-	}
-
-	if (!g_str_has_prefix(line, DIRECTORY_BEGIN)) {
-		error.Format(directory_domain, "Malformed line: %s", line);
-		directory->Delete();
-		return nullptr;
-	}
-
-	success = directory_load(file, *directory, error);
-	if (!success) {
-		directory->Delete();
-		return nullptr;
-	}
-
-	return directory;
-}
-
-bool
-directory_load(TextFile &file, Directory &directory, Error &error)
-{
-	const char *line;
-
-	while ((line = file.ReadLine()) != nullptr &&
-	       !g_str_has_prefix(line, DIRECTORY_END)) {
-		if (g_str_has_prefix(line, DIRECTORY_DIR)) {
-			Directory *subdir =
-				directory_load_subdir(file, directory,
-						      line + sizeof(DIRECTORY_DIR) - 1,
-						      error);
-			if (subdir == nullptr)
-				return false;
-		} else if (g_str_has_prefix(line, SONG_BEGIN)) {
-			const char *name = line + sizeof(SONG_BEGIN) - 1;
-			Song *song;
-
-			if (directory.FindSong(name) != nullptr) {
-				error.Format(directory_domain,
-					     "Duplicate song '%s'", name);
-				return false;
-			}
-
-			song = song_load(file, &directory, name, error);
-			if (song == nullptr)
-				return false;
-
-			directory.AddSong(song);
-		} else if (g_str_has_prefix(line, PLAYLIST_META_BEGIN)) {
-			/* duplicate the name, because
-			   playlist_metadata_load() will overwrite the
-			   buffer */
-			char *name = g_strdup(line + sizeof(PLAYLIST_META_BEGIN) - 1);
-
-			if (!playlist_metadata_load(file, directory.playlists,
-						    name, error)) {
-				g_free(name);
-				return false;
-			}
-
-			g_free(name);
-		} else {
-			error.Format(directory_domain,
-				     "Malformed line: %s", line);
-			return false;
-		}
-	}
-
-	return true;
-}
--- a/src/EncoderPlugin.hxx
+++ b/src/EncoderPlugin.hxx
@@ -1,321 +0,0 @@
-/*
- * Copyright (C) 2003-2013 The Music Player Daemon Project
- * http://www.musicpd.org
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef MPD_ENCODER_PLUGIN_HXX
-#define MPD_ENCODER_PLUGIN_HXX
-
-#include <assert.h>
-#include <stdbool.h>
-#include <stddef.h>
-
-struct EncoderPlugin;
-struct AudioFormat;
-struct config_param;
-struct Tag;
-class Error;
-
-struct Encoder {
-	const EncoderPlugin &plugin;
-
-#ifndef NDEBUG
-	bool open, pre_tag, tag, end;
-#endif
-
-	explicit Encoder(const EncoderPlugin &_plugin)
-		:plugin(_plugin)
-#ifndef NDEBUG
-		, open(false)
-#endif
-	{}
-};
-
-struct EncoderPlugin {
-	const char *name;
-
-	Encoder *(*init)(const config_param &param,
-			 Error &error);
-
-	void (*finish)(Encoder *encoder);
-
-	bool (*open)(Encoder *encoder,
-		     AudioFormat &audio_format,
-		     Error &error);
-
-	void (*close)(Encoder *encoder);
-
-	bool (*end)(Encoder *encoder, Error &error);
-
-	bool (*flush)(Encoder *encoder, Error &error);
-
-	bool (*pre_tag)(Encoder *encoder, Error &error);
-
-	bool (*tag)(Encoder *encoder, const Tag *tag,
-		    Error &error);
-
-	bool (*write)(Encoder *encoder,
-		      const void *data, size_t length,
-		      Error &error);
-
-	size_t (*read)(Encoder *encoder, void *dest, size_t length);
-
-	const char *(*get_mime_type)(Encoder *encoder);
-};
-
-/**
- * Creates a new encoder object.
- *
- * @param plugin the encoder plugin
- * @param param optional configuration
- * @param error location to store the error occurring, or nullptr to ignore errors.
- * @return an encoder object on success, nullptr on failure
- */
-static inline Encoder *
-encoder_init(const EncoderPlugin &plugin, const config_param &param,
-	     Error &error_r)
-{
-	return plugin.init(param, error_r);
-}
-
-/**
- * Frees an encoder object.
- *
- * @param encoder the encoder
- */
-static inline void
-encoder_finish(Encoder *encoder)
-{
-	assert(!encoder->open);
-
-	encoder->plugin.finish(encoder);
-}
-
-/**
- * Opens an encoder object.  You must call this prior to using it.
- * Before you free it, you must call encoder_close().  You may open
- * and close (reuse) one encoder any number of times.
- *
- * After this function returns successfully and before the first
- * encoder_write() call, you should invoke encoder_read() to obtain
- * the file header.
- *
- * @param encoder the encoder
- * @param audio_format the encoder's input audio format; the plugin
- * may modify the struct to adapt it to its abilities
- * @return true on success
- */
-static inline bool
-encoder_open(Encoder *encoder, AudioFormat &audio_format,
-	     Error &error)
-{
-	assert(!encoder->open);
-
-	bool success = encoder->plugin.open(encoder, audio_format, error);
-#ifndef NDEBUG
-	encoder->open = success;
-	encoder->pre_tag = encoder->tag = encoder->end = false;
-#endif
-	return success;
-}
-
-/**
- * Closes an encoder object.  This disables the encoder, and readies
- * it for reusal by calling encoder_open() again.
- *
- * @param encoder the encoder
- */
-static inline void
-encoder_close(Encoder *encoder)
-{
-	assert(encoder->open);
-
-	if (encoder->plugin.close != nullptr)
-		encoder->plugin.close(encoder);
-
-#ifndef NDEBUG
-	encoder->open = false;
-#endif
-}
-
-/**
- * Ends the stream: flushes the encoder object, generate an
- * end-of-stream marker (if applicable), make everything which might
- * currently be buffered available by encoder_read().
- *
- * After this function has been called, the encoder may not be usable
- * for more data, and only encoder_read() and encoder_close() can be
- * called.
- *
- * @param encoder the encoder
- * @return true on success
- */
-static inline bool
-encoder_end(Encoder *encoder, Error &error)
-{
-	assert(encoder->open);
-	assert(!encoder->end);
-
-#ifndef NDEBUG
-	encoder->end = true;
-#endif
-
-	/* this method is optional */
-	return encoder->plugin.end != nullptr
-		? encoder->plugin.end(encoder, error)
-		: true;
-}
-
-/**
- * Flushes an encoder object, make everything which might currently be
- * buffered available by encoder_read().
- *
- * @param encoder the encoder
- * @return true on success
- */
-static inline bool
-encoder_flush(Encoder *encoder, Error &error)
-{
-	assert(encoder->open);
-	assert(!encoder->pre_tag);
-	assert(!encoder->tag);
-	assert(!encoder->end);
-
-	/* this method is optional */
-	return encoder->plugin.flush != nullptr
-		? encoder->plugin.flush(encoder, error)
-		: true;
-}
-
-/**
- * Prepare for sending a tag to the encoder.  This is used by some
- * encoders to flush the previous sub-stream, in preparation to begin
- * a new one.
- *
- * @param encoder the encoder
- * @param tag the tag object
- * @return true on success
- */
-static inline bool
-encoder_pre_tag(Encoder *encoder, Error &error)
-{
-	assert(encoder->open);
-	assert(!encoder->pre_tag);
-	assert(!encoder->tag);
-	assert(!encoder->end);
-
-	/* this method is optional */
-	bool success = encoder->plugin.pre_tag != nullptr
-		? encoder->plugin.pre_tag(encoder, error)
-		: true;
-
-#ifndef NDEBUG
-	encoder->pre_tag = success;
-#endif
-	return success;
-}
-
-/**
- * Sends a tag to the encoder.
- *
- * Instructions: call encoder_pre_tag(); then obtain flushed data with
- * encoder_read(); finally call encoder_tag().
- *
- * @param encoder the encoder
- * @param tag the tag object
- * @return true on success
- */
-static inline bool
-encoder_tag(Encoder *encoder, const Tag *tag, Error &error)
-{
-	assert(encoder->open);
-	assert(!encoder->pre_tag);
-	assert(encoder->tag);
-	assert(!encoder->end);
-
-#ifndef NDEBUG
-	encoder->tag = false;
-#endif
-
-	/* this method is optional */
-	return encoder->plugin.tag != nullptr
-		? encoder->plugin.tag(encoder, tag, error)
-		: true;
-}
-
-/**
- * Writes raw PCM data to the encoder.
- *
- * @param encoder the encoder
- * @param data the buffer containing PCM samples
- * @param length the length of the buffer in bytes
- * @return true on success
- */
-static inline bool
-encoder_write(Encoder *encoder, const void *data, size_t length,
-	      Error &error)
-{
-	assert(encoder->open);
-	assert(!encoder->pre_tag);
-	assert(!encoder->tag);
-	assert(!encoder->end);
-
-	return encoder->plugin.write(encoder, data, length, error);
-}
-
-/**
- * Reads encoded data from the encoder.
- *
- * Call this repeatedly until no more data is returned.
- *
- * @param encoder the encoder
- * @param dest the destination buffer to copy to
- * @param length the maximum length of the destination buffer
- * @return the number of bytes written to #dest
- */
-static inline size_t
-encoder_read(Encoder *encoder, void *dest, size_t length)
-{
-	assert(encoder->open);
-	assert(!encoder->pre_tag || !encoder->tag);
-
-#ifndef NDEBUG
-	if (encoder->pre_tag) {
-		encoder->pre_tag = false;
-		encoder->tag = true;
-	}
-#endif
-
-	return encoder->plugin.read(encoder, dest, length);
-}
-
-/**
- * Get mime type of encoded content.
- *
- * @param plugin the encoder plugin
- * @return an constant string, nullptr on failure
- */
-static inline const char *
-encoder_get_mime_type(Encoder *encoder)
-{
-	/* this method is optional */
-	return encoder->plugin.get_mime_type != nullptr
-		? encoder->plugin.get_mime_type(encoder)
-		: nullptr;
-}
-
-#endif
--- a/src/FilterConfig.cxx
+++ b/src/FilterConfig.cxx
@@ -1,110 +0,0 @@
-/*
- * Copyright (C) 2003-2013 The Music Player Daemon Project
- * http://www.musicpd.org
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include "config.h"
-#include "FilterConfig.hxx"
-#include "filter/ChainFilterPlugin.hxx"
-#include "FilterPlugin.hxx"
-#include "FilterInternal.hxx"
-#include "FilterRegistry.hxx"
-#include "ConfigData.hxx"
-#include "ConfigOption.hxx"
-#include "ConfigGlobal.hxx"
-#include "ConfigError.hxx"
-#include "util/Error.hxx"
-
-#include <algorithm>
-
-#include <string.h>
-
-/**
- * Find the "filter" configuration block for the specified name.
- *
- * @param filter_template_name the name of the filter template
- * @param error space to return an error description
- * @return the configuration block, or nullptr if none was configured
- */
-static const struct config_param *
-filter_plugin_config(const char *filter_template_name, Error &error)
-{
-	const struct config_param *param = nullptr;
-
-	while ((param = config_get_next_param(CONF_AUDIO_FILTER, param)) != nullptr) {
-		const char *name = param->GetBlockValue("name");
-		if (name == nullptr) {
-			error.Format(config_domain,
-				     "filter configuration without 'name' name in line %d",
-				     param->line);
-			return nullptr;
-		}
-
-		if (strcmp(name, filter_template_name) == 0)
-			return param;
-	}
-
-	error.Format(config_domain,
-		     "filter template not found: %s",
-		     filter_template_name);
-	return nullptr;
-}
-
-static bool
-filter_chain_append_new(Filter &chain, const char *template_name, Error &error)
-{
-	const struct config_param *cfg =
-		filter_plugin_config(template_name, error);
-	if (cfg == nullptr)
-		// The error has already been set, just stop.
-		return false;
-
-	// Instantiate one of those filter plugins with the template name as a hint
-	Filter *f = filter_configured_new(*cfg, error);
-	if (f == nullptr)
-		// The error has already been set, just stop.
-		return false;
-
-	const char *plugin_name = cfg->GetBlockValue("plugin",
-						     "unknown");
-	filter_chain_append(chain, plugin_name, f);
-
-	return true;
-}
-
-bool
-filter_chain_parse(Filter &chain, const char *spec, Error &error)
-{
-	const char *const end = spec + strlen(spec);
-
-	while (true) {
-		const char *comma = std::find(spec, end, ',');
-		if (comma > spec) {
-			const std::string name(spec, comma);
-			if (!filter_chain_append_new(chain, name.c_str(),
-						     error))
-				return false;
-		}
-
-		if (comma == end)
-			break;
-
-		spec = comma + 1;
-	}
-
-	return true;
-}
--- a/src/GlobalEvents.cxx
+++ b/src/GlobalEvents.cxx
@@ -1,97 +0,0 @@
-/*
- * Copyright (C) 2003-2013 The Music Player Daemon Project
- * http://www.musicpd.org
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include "config.h"
-#include "GlobalEvents.hxx"
-#include "util/Manual.hxx"
-#include "event/DeferredMonitor.hxx"
-#include "Compiler.h"
-
-#include <atomic>
-
-#include <assert.h>
-
-namespace GlobalEvents {
-	class Monitor final : public DeferredMonitor {
-	public:
-		Monitor(EventLoop &_loop):DeferredMonitor(_loop) {}
-
-	protected:
-		virtual void RunDeferred() override;
-	};
-
-	static Manual<Monitor> monitor;
-
-	static std::atomic_uint flags;
-	static Handler handlers[MAX];
-}
-
-/**
- * Invoke the callback for a certain event.
- */
-static void
-InvokeGlobalEvent(GlobalEvents::Event event)
-{
-	assert((unsigned)event < GlobalEvents::MAX);
-	assert(GlobalEvents::handlers[event] != nullptr);
-
-	GlobalEvents::handlers[event]();
-}
-
-void
-GlobalEvents::Monitor::RunDeferred()
-{
-	const unsigned f = flags.exchange(0);
-
-	for (unsigned i = 0; i < MAX; ++i)
-		if (f & (1u << i))
-			/* invoke the event handler */
-			InvokeGlobalEvent(Event(i));
-}
-
-void
-GlobalEvents::Initialize(EventLoop &loop)
-{
-	monitor.Construct(loop);
-}
-
-void
-GlobalEvents::Deinitialize()
-{
-	monitor.Destruct();
-}
-
-void
-GlobalEvents::Register(Event event, Handler callback)
-{
-	assert((unsigned)event < MAX);
-	assert(handlers[event] == nullptr);
-
-	handlers[event] = callback;
-}
-
-void
-GlobalEvents::Emit(Event event)
-{
-	assert((unsigned)event < MAX);
-
-	const unsigned mask = 1u << unsigned(event);
-	if (GlobalEvents::flags.fetch_or(mask) == 0)
-		monitor->Schedule();
-}
--- a/src/GlobalEvents.hxx
+++ b/src/GlobalEvents.hxx
@@ -1,73 +0,0 @@
-/*
- * Copyright (C) 2003-2013 The Music Player Daemon Project
- * http://www.musicpd.org
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef MPD_GLOBAL_EVENTS_HXX
-#define MPD_GLOBAL_EVENTS_HXX
-
-#ifdef WIN32
-#include <windows.h>
-/* DELETE is a WIN32 macro that poisons our namespace; this is a
-   kludge to allow us to use it anyway */
-#ifdef DELETE
-#undef DELETE
-#endif
-#endif
-
-class EventLoop;
-
-namespace GlobalEvents {
-	enum Event {
-		/** database update was finished */
-		UPDATE,
-
-		/** during database update, a song was deleted */
-		DELETE,
-
-		/** an idle event was emitted */
-		IDLE,
-
-		/** must call playlist_sync() */
-		PLAYLIST,
-
-		/** the current song's tag has changed */
-		TAG,
-
-		/** a hardware mixer plugin has detected a change */
-		MIXER,
-
-#ifdef WIN32
-		/** shutdown requested */
-		SHUTDOWN,
-#endif
-
-		MAX
-	};
-
-	typedef void (*Handler)();
-
-	void Initialize(EventLoop &loop);
-
-	void Deinitialize();
-
-	void Register(Event event, Handler handler);
-
-	void Emit(Event event);
-}
-
-#endif /* MAIN_NOTIFY_H */
--- a/src/IOThread.cxx
+++ b/src/IOThread.cxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2013 The Music Player Daemon Project
+ * Copyright 2003-2017 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -22,9 +22,8 @@
 #include "thread/Mutex.hxx"
 #include "thread/Cond.hxx"
 #include "thread/Thread.hxx"
+#include "thread/Name.hxx"
 #include "event/Loop.hxx"
-#include "system/FatalError.hxx"
-#include "util/Error.hxx"

 #include <assert.h>

@@ -48,6 +47,8 @@ io_thread_run(void)
 static void
 io_thread_func(gcc_unused void *arg)
 {
+	SetThreadName("io");
+
 	/* lock+unlock to synchronize with io_thread_start(), to be
 	   sure that io.thread is set */
 	io.mutex.lock();
@@ -71,11 +72,8 @@ io_thread_start()
 	assert(io.loop != nullptr);
 	assert(!io.thread.IsDefined());

-	const ScopeLock protect(io.mutex);
-
-	Error error;
-	if (!io.thread.Start(io_thread_func, nullptr, error))
-		FatalError(error);
+	const std::lock_guard<Mutex> protect(io.mutex);
+	io.thread.Start(io_thread_func, nullptr);
 }

 void
--- a/src/IOThread.hxx
+++ b/src/IOThread.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2013 The Music Player Daemon Project
+ * Copyright 2003-2017 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -25,7 +25,7 @@
 class EventLoop;

 void
-io_thread_init(void);
+io_thread_init();

 void
 io_thread_start();
@@ -36,7 +36,7 @@ io_thread_start();
 * only.
 */
 void
-io_thread_run(void);
+io_thread_run();

 /**
 * Ask the I/O thread to quit, but does not wait for it.  Usually, you
@@ -44,12 +44,12 @@ io_thread_run(void);
 * includes this.
 */
 void
-io_thread_quit(void);
+io_thread_quit();

 void
-io_thread_deinit(void);
+io_thread_deinit();

-gcc_pure
+gcc_const
 EventLoop &
 io_thread_get();

@@ -58,6 +58,6 @@ io_thread_get();
 */
 gcc_pure
 bool
-io_thread_inside(void);
+io_thread_inside();

 #endif
--- a/src/IcyMetaDataParser.cxx
+++ b/src/IcyMetaDataParser.cxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2013 The Music Player Daemon Project
+ * Copyright 2003-2017 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -20,11 +20,11 @@
 #include "config.h"
 #include "IcyMetaDataParser.hxx"
 #include "tag/Tag.hxx"
+#include "tag/TagBuilder.hxx"
 #include "util/Domain.hxx"
+#include "util/StringView.hxx"
 #include "Log.hxx"

-#include <glib.h>
-
 #include <assert.h>
 #include <string.h>

@@ -37,7 +37,7 @@ IcyMetaDataParser::Reset()
 		return;

 	if (data_rest == 0 && meta_size > 0)
-		g_free(meta_data);
+		delete[] meta_data;

 	delete tag;

@@ -66,7 +66,7 @@ IcyMetaDataParser::Data(size_t length)
 }

 static void
-icy_add_item(Tag &tag, TagType type, const char *value)
+icy_add_item(TagBuilder &tag, TagType type, const char *value)
 {
 	size_t length = strlen(value);

@@ -77,11 +77,11 @@ icy_add_item(Tag &tag, TagType type, const char *value)
 	}

 	if (length > 0)
-		tag.AddItem(type, value, length);
+		tag.AddItem(type, {value, length});
 }

 static void
-icy_parse_tag_item(Tag &tag, const char *name, const char *value)
+icy_parse_tag_item(TagBuilder &tag, const char *name, const char *value)
 {
 	if (strcmp(name, "StreamTitle") == 0)
 		icy_add_item(tag, TAG_TITLE, value);
@@ -122,7 +122,7 @@ icy_parse_tag(char *p, char *const end)
 	assert(end != nullptr);
 	assert(p <= end);

-	Tag *tag = new Tag();
+	TagBuilder tag;

 	while (p != end) {
 		const char *const name = p;
@@ -153,7 +153,7 @@ icy_parse_tag(char *p, char *const end)
 		*quote = 0;
 		p = quote + 1;

-		icy_parse_tag_item(*tag, name, value);
+		icy_parse_tag_item(tag, name, value);

 		char *semicolon = std::find(p, end, ';');
 		if (semicolon == end)
@@ -161,7 +161,7 @@ icy_parse_tag(char *p, char *const end)
 		p = semicolon + 1;
 	}

-	return tag;
+	return tag.CommitNew();
 }

 size_t
@@ -190,7 +190,7 @@ IcyMetaDataParser::Meta(const void *data, size_t length)
 		/* initialize metadata reader, allocate enough
 		   memory (+1 for the null terminator) */
 		meta_position = 0;
-		meta_data = (char *)g_malloc(meta_size + 1);
+		meta_data = new char[meta_size + 1];
 	}

 	assert(meta_position < meta_size);
@@ -211,7 +211,7 @@ IcyMetaDataParser::Meta(const void *data, size_t length)
 		delete tag;

 		tag = icy_parse_tag(meta_data, meta_data + meta_size);
-		g_free(meta_data);
+		delete[] meta_data;

 		/* change back to normal data mode */

@@ -221,3 +221,32 @@ IcyMetaDataParser::Meta(const void *data, size_t length)

 	return length;
 }
+
+size_t
+IcyMetaDataParser::ParseInPlace(void *data, size_t length)
+{
+	uint8_t *const dest0 = (uint8_t *)data;
+	uint8_t *dest = dest0;
+	const uint8_t *src = dest0;
+
+	while (length > 0) {
+		size_t chunk = Data(length);
+		if (chunk > 0) {
+			memmove(dest, src, chunk);
+			dest += chunk;
+			src += chunk;
+			length -= chunk;
+
+			if (length == 0)
+				break;
+		}
+
+		chunk = Meta(src, length);
+		if (chunk > 0) {
+			src += chunk;
+			length -= chunk;
+		}
+	}
+
+	return dest - dest0;
+}
--- a/src/IcyMetaDataParser.hxx
+++ b/src/IcyMetaDataParser.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2013 The Music Player Daemon Project
+ * Copyright 2003-2017 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -75,6 +75,13 @@ public:
 	 */
 	size_t Meta(const void *data, size_t length);

+	/**
+	 * Parse data and eliminate metadata.
+	 *
+	 * @return the number of data bytes remaining in the buffer
+	 */
+	size_t ParseInPlace(void *data, size_t length);
+
 	Tag *ReadTag() {
 		Tag *result = tag;
 		tag = nullptr;
--- a/Show More
+++ b/Show More