release v0.19.18

decoder/Thread: delete the InputStream on error
Fixes memory leak after stream failure. See https://bugs.musicpd.org/view.php?id=4562
2016-08-05 18:45:23 +02:00 · 2016-08-05 18:15:30 +02:00 · 2016-08-05 18:06:07 +02:00 · 2016-08-05 17:48:53 +02:00 · 2016-08-02 19:15:23 +02:00 · 2016-07-29 19:32:21 +02:00
1407 changed files with 115410 additions and 74615 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,69 +1,85 @@
 *.Plo
 *.Po
 *.a
-*.bz2
 *.d
-*.gz
 *.la
 *.lo
 *.o
-.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
-mpd
-mpd.exe
-mpd.service
-stamp-h1
-tags
+*.exe
+
 *~
+
 .#*
 .stgit*
-src/dsd2pcm/dsd2pcm
-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
+.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/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-*/
--- a/94
+++ b/94
@@ -1,67 +1,31 @@
-Current Developers
------------------
+Music Player Daemon - http://www.musicpd.org
+Copyright (C) 2003-2014 The Music Player Daemon Project

-Avuton Olrich <avuton@gmail.com>
-	release manager
+The following people have contributed code to MPD:

-Max Kellermann <max@duempel.org>
-	lead developer
-
-Laszlo Ashin <kodest@gmail.com>
-	WavPack support
-
-Viliam Mateicka <viliam.mateicka@gmail.com>
-	FFmpeg support, mixer and archive API
-
-Eric Wollesen <encoded@xmtp.net>
-	encoder API, shout output
-
-Thomas Jansen <mithi@mithi.net>
-	multithreading tweaks, miscellaneous
-
-Romain Bignon <romain@peerfuse.org>
-	playlist manipulation
-
-David Guibert <david.guibert@gmail.com>
-	PulseAudio mixer
-
-Jochen Keil <jochen.keil@gmail.com>
-	CUE sheet support
-
-Jeffrey Middleton <jefromi@gmail.com>
-	playlist manipulation
-
-Sean McNamara <smcnam@gmail.com>
-	WIN32 compatibility
-
-
-Former Developers
-----------------
-
-Warren Dukes <warren.dukes@gmail.com>
-	former lead developer and project founder
-
-Niklas Hofer
-	'next' and 'previous' patch
-
-Jim Ramsay <i.am@jimramsay.com>
-	Zerconf/avahi support
-
-Guus Sliepen <guus@sliepen.eu.org>
-	libsamplerate code
-
-J. Alexander Treuman <jat@spatialrift.net>
-	general, MP3, ID3, PulseAudio, format conversion, stored playlists
-	AudioCompress, much much more...
-
-Eric Wong
-	former lead developer
-
-José Anarch <anarchsss@gmail.com>
-	JACK plugin
-
-Patrik Weiskircher <pat@icore.at>
-	Stored playlist commands
-
-Nick Welch <mack@incise.org>
-	Sighandlers
+ Warren Dukes <warren.dukes@gmail.com>
+ Avuton Olrich <avuton@gmail.com>
+ Max Kellermann <max@duempel.org>
+ Laszlo Ashin <kodest@gmail.com>
+ Viliam Mateicka <viliam.mateicka@gmail.com>
+ Eric Wollesen <encoded@xmtp.net>
+ Thomas Jansen <mithi@mithi.net>
+ Romain Bignon <romain@peerfuse.org>
+ David Guibert <david.guibert@gmail.com>
+ Jochen Keil <jochen.keil@gmail.com>
+ Jeffrey Middleton <jefromi@gmail.com>
+ Sean McNamara <smcnam@gmail.com>
+ Niklas Hofer
+ Jim Ramsay <i.am@jimramsay.com>
+ Guus Sliepen <guus@sliepen.eu.org>
+ J. Alexander Treuman <jat@spatialrift.net>
+ Eric Wong
+ José Anarch <anarchsss@gmail.com>
+ Patrik Weiskircher <pat@icore.at>
+ Nick Welch <mack@incise.org>
+ Jonathan Neuschäfer <j.neuschaefer@gmx.net>
+ Anton Khirnov <anton@khirnov.net>
+ Simon Kagstrom <simon.kagstrom@gmail.com>
+ Denis Krjuchkov <denis@crazydev.net>
+ Jurgen Kramer <gtmkramer@xs4all.nl>
+ Jean-Francois Dockes <jf@dockes.org>
--- a/56
+++ b/56
@@ -3,17 +3,22 @@

 Introduction
 ------------
+
 This document is a very small amount of documentation about what is needed to 
-install MPD. If more information is desired see the community wiki at 
-http://mpd.wikia.com.
+install MPD.  If more information is desired, read the user manual:
+
+ http://www.musicpd.org/doc/user/

 Dependencies
 ------------

-gcc - http://gcc.gnu.org/
-Any other C99 compliant compiler should also work.
+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.16 - http://www.gtk.org/
+Boost 1.46 - http://www.boost.org/
+
+GLib 2.28 - http://www.gtk.org/
 General-purpose utility library.


@@ -37,15 +42,9 @@ Linux.  You will need libasound.
 FIFO
 This is a mostly undocumented, developer plugin to transmit raw data.

-MVP - http://en.wikipedia.org/wiki/Hauppauge_MediaMVP
-A network media player.
-
 OSS - http://www.opensound.com
 Open Sound System.

-OSX - http://www.apple.com
-Necessary if you are on Mac OSX.
-
 PulseAudio - http://www.pulseaudio.org/
 An advanced sound daemon.  You will need libpulse.

@@ -59,9 +58,6 @@ You also need an encoder: either libvorbisenc (ogg), or liblame (mp3).
 OpenAL - http://kcat.strangesoft.net/openal.html
 Open Audio Library

-libffado - http://www.ffado.org/
-For FireWire audio devices.
-

 Optional Input Dependencies
 ---------------------------
@@ -81,14 +77,17 @@ Alternative for MP3 support.
 Ogg Vorbis - http://www.xiph.org/ogg/vorbis/
 For Ogg Vorbis support.  You will need libogg and libvorbis.

+libopus - http://www.opus-codec.org/
+Opus codec support
+
 FLAC - http://flac.sourceforge.net/
-For FLAC support.  You will need version 1.1.0 or higher of libflac.
+For FLAC support.  You will need version 1.2 or higher of libFLAC.

 Audio File - http://www.68k.org/~michael/audiofile/
 For WAVE, AIFF, and AU support.  You will need libaudiofile.

 FAAD2 - http://www.audiocoding.com/
-For MP4/AAC support.  You will need libmp4ff.
+For MP4/AAC support.

 libmpcdec - http://www.musepack.net/
 For Musepack support.
@@ -103,9 +102,9 @@ libsidplay2 - http://sidplay2.sourceforge.net/
 For C64 SID support.

 libfluidsynth - http://fluidsynth.resonance.org/
-For MIDI support (DO NOT USE - use libwildmidi instead)
+For MIDI support.

-libwildmidi - http://wildmidi.sourceforge.net/
+libwildmidi 0.2.3 - http://wildmidi.sourceforge.net/
 For MIDI support.

 libsndfile - http://www.mega-nerd.com/libsndfile/
@@ -114,8 +113,8 @@ WAVE, AIFF, and many others.
 libwavpack - http://www.wavpack.com/
 For WavPack playback.

-despotify - https://github.com/SimonKagstrom/despotify
-For Spotify playback.
+libadplug - http://adplug.sourceforge.net/
+For AdLib playback.


 Optional Miscellaneous Dependencies
@@ -163,13 +162,9 @@ Get the latest release from of MPD from <http://www.musicpd.org/>.
 Compile
 -------

-1) unzip and untar the archive
+1) unpack the archive

-$ tar zxvf mpd-x.x.x.tar.gz
-
-or
-
-$ tar jxvf mpd-x.x.x.tar.bz2
+$ tar xf mpd-x.x.x.tar.xz

 2) change to directory created

@@ -196,9 +191,9 @@ Run

 $ mpd <config file>

-First default is ~/.mpdconf then ~/.mpd/mpd.conf then /etc/mpd.conf. If
-neither of these exist a mpd configuration file must be specified at
-runtime.
+First default is $XDG_CONFIG_HOME/mpd/mpd.conf then ~/.mpdconf then
+~/.mpd/mpd.conf then /etc/mpd.conf. If neither of these exist a mpd
+configuration file must be specified at runtime.

 A sample config file is included with the source of MPD, mpdconf.example.

@@ -210,6 +205,5 @@ Using MPD
 ---------

 You can download many different interfaces for MPD at 
-	<http://mpd.wikia.com/wiki/Clients>

-MPD can be interfaced directly using telnet (see COMMANDS, if you are brave).
+ http://www.musicpd.org/clients/
--- a/Makefile.am
+++ b/Makefile.am
--- a/578
+++ b/578
@@ -1,3 +1,581 @@
+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
+* output
+  - alsa: improved workaround for noise after manual song change
+* decoder
+  - vorbis: fix linker failure when libvorbis/libogg are static
+* encoder
+  - vorbis: fix another linker failure
+* output
+  - pipe: fix hanging child process due to blocked signals
+* fix build failure due to missing signal.h include
+
+ver 0.18.8 (2014/02/07)
+* decoder
+  - ffmpeg: support libav v10_alpha1
+* encoder
+  - vorbis: fix linker failure
+* output
+  - roar: documentation
+* more robust Icy-Metadata parser
+* fix Solaris build failure
+
+ver 0.18.7 (2014/01/13)
+* playlist
+  - pls: fix crash after parser error
+  - soundcloud: fix build failure with libyajl 2.0.1
+* decoder
+  - faad: fix memory leak
+  - mpcdec: reject libmpcdec SV7 in configure script
+* daemon: don't initialize supplementary groups when already running
+  as the configured user
+
+ver 0.18.6 (2013/12/24)
+* input
+  - cdio_paranoia: support libcdio-paranoia 0.90
+* tags
+  - riff: recognize upper-case "ID3" chunk name
+* decoder
+  - ffmpeg: use relative timestamps
+* output
+  - openal: fix build failure on Mac OS X
+  - osx: fix build failure
+* mixer
+  - alsa: fix build failure with uClibc
+* fix replay gain during cross-fade
+* accept files without metadata
+
+ver 0.18.5 (2013/11/23)
+* configuration
+  - fix crash when db_file is configured without music_directory
+  - fix crash on "stats" without db_file/music_directory
+* database
+  - proxy: auto-reload statistics
+  - proxy: provide "db_update" in "stats" response
+* input
+  - curl: work around stream resume bug (fixed in libcurl 7.32.0)
+* decoder
+  - fluidsynth: auto-detect by default
+* clip 24 bit data from libsamplerate
+* fix ia64, mipsel and other little-endian architectures
+* fix build failures due to missing includes
+* fix build failure with static libmpdclient
+
+ver 0.18.4 (2013/11/13)
+* decoder
+  - dsdiff: fix byte order bug
+* fix build failures due to missing includes
+* libc++ compatibility
+
+ver 0.18.3 (2013/11/08)
+* fix stuck MPD after song change (0.18.2 regression)
+
+ver 0.18.2 (2013/11/07)
+* protocol:
+  - "close" flushes the output buffer
+* input:
+  - cdio_paranoia: add setting "default_byte_order"
+  - curl: fix bug with redirected streams
+* playlist:
+  - pls: fix reversed song order
+* decoder:
+  - audiofile: require libaudiofile 0.3 due to API breakage
+  - dsf: enable DSD128
+* enable buffering when starting playback (regression fix)
+* fix build failures due to missing includes
+* fix big-endian support
+
+ver 0.18.1 (2013/11/04)
+* protocol:
+  - always ignore whitespace at the end of the line
+* networking:
+  - log UNIX domain path names instead of "localhost"
+  - open listener sockets in the order they were configured
+  - don't abort if IPv6 is not available
+* output:
+  - alsa: avoid endless loop in Raspberry Pi workaround
+* filter:
+  - autoconvert: fix "volume_normalization" with mp3 files
+* add missing files to source tarball
+
+ver 0.18 (2013/10/31)
+* configuration:
+  - allow tilde paths for socket
+  - default filesystem charset is UTF-8 instead of ISO-8859-1
+  - increase default buffer size to 4 MB
+* protocol:
+  - new command "readcomments" lists arbitrary file tags
+  - new command "toggleoutput"
+  - "find"/"search" with "any" does not match file name
+  - "search" and "find" with base URI (keyword "base")
+  - search for album artist falls back to the artist tag
+  - re-add the "volume" command
+* input:
+  - curl: enable https
+  - soup: plugin removed
+* playlist:
+  - lastfm: remove defunct Last.fm support
+* decoder:
+  - adplug: new decoder plugin using libadplug
+  - dsf: don't play junk at the end of the "data" chunk
+  - ffmpeg: drop support for pre-0.8 ffmpeg
+  - flac: require libFLAC 1.2 or newer
+  - flac: support FLAC files inside archives
+  - opus: new decoder plugin for the Opus codec
+  - vorbis: skip 16 bit quantisation, provide float samples
+  - mikmod: add "loop" configuration parameter
+  - modplug: add "loop_count" configuration parameter
+  - mp4ff: obsolete plugin removed
+* encoder:
+  - opus: new encoder plugin for the Opus codec
+  - vorbis: accept floating point input samples
+* output:
+  - new option "tags" may be used to disable sending tags to output
+  - alsa: workaround for noise after manual song change
+  - ffado: remove broken plugin
+  - httpd: support HEAD requests
+  - mvp: remove obsolete plugin
+  - osx: disabled by default because it's unmaintained and unsupported
+* improved decoder/output error reporting
+* eliminate timer wakeup on idle MPD
+* fix unresponsive MPD while waiting for stream
+* port of the source code to C++11
+
+ver 0.17.6 (2013/10/14)
+* mixer:
+  - alsa: fix busy loop when USB sound device gets unplugged
+* decoder:
+  - modplug: fix build with Debian package 1:0.8.8.4-4
+* stored playlists:
+  - fix loading playlists with references to local files
+  - obey filesystem_charset for URLs
+
+ver 0.17.5 (2013/08/04)
+* protocol:
+  - fix "playlistadd" with URI
+  - fix "move" relative to current when there is no current song
+* decoder:
+  - ffmpeg: support "application/flv"
+  - mikmod: adapt to libmikmod 3.2
+* configure.ac:
+  - detect system "ar"
+
+ver 0.17.4 (2013/04/08)
+* protocol:
+  - allow to omit END in ranges (START:END)
+  - don't emit IDLE_PLAYER before audio format is known
+* decoder:
+  - ffmpeg: support float planar audio (ffmpeg 1.1)
+  - ffmpeg: fix AVFrame allocation
+* player:
+  - implement missing "idle" events on output errors
+* clock: fix build failure
+
+ver 0.17.3 (2013/01/06)
+* output:
+  - osx: fix pops during playback
+  - recorder: fix I/O error check
+  - shout: fix memory leak in error handler
+  - recorder, shout: support Ogg packets that span more than one page
+* decoder:
+  - ffmpeg: ignore negative time stamps
+  - ffmpeg: support planar audio
+* playlist:
+  - cue: fix memory leak
+  - cue: fix CUE files with only one track
+
+ver 0.17.2 (2012/09/30)
+* protocol:
+  - fix crash in local file check
+* decoder:
+  - fluidsynth: remove throttle (requires libfluidsynth 1.1)
+  - fluidsynth: stop playback at end of file
+  - fluidsynth: check MIDI file format while scanning
+  - fluidsynth: add sample rate setting
+  - wavpack: support all APEv2 tags
+* output:
+  - httpd: use monotonic clock, avoid hiccups after system clock adjustment
+  - httpd: fix throttling bug after resuming playback
+* playlist:
+  - cue: map "PERFORMER" to "artist" or "album artist"
+* mapper: fix non-UTF8 music directory name
+* mapper: fix potential crash in file permission check
+* playlist: fix use-after-free bug
+* playlist: fix memory leak
+* state_file: save song priorities
+* player: disable cross-fading in "single" mode
+* update: fix unsafe readlink() usage
+* configure.ac:
+  - don't auto-detect the vorbis encoder when Tremor is enabled
+
 ver 0.17.1 (2012/07/31)
 * protocol:
  - require appropriate permissions for searchadd{,pl}
--- 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,433 @@
+#!/usr/bin/env python3
+
+import os, os.path
+import sys, shutil, subprocess
+import urllib.request
+import hashlib
+import re
+
+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)
+
+# the path to the MPD sources
+mpd_path = os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]) or '.', '..'))
+
+# output directories
+lib_path = os.path.abspath('lib')
+tarball_path = lib_path
+src_path = os.path.join(lib_path, 'src')
+build_path = os.path.join(lib_path, 'build')
+root_path = os.path.join(lib_path, 'root')
+
+# build host configuration
+build_arch = 'linux-x86_64'
+
+# redirect pkg-config to use our root directory instead of the default
+# one on the build host
+os.environ['PKG_CONFIG_LIBDIR'] = os.path.join(root_path, 'lib/pkgconfig')
+
+# select the NDK compiler
+gcc_version = '4.9'
+llvm_version = '3.5'
+
+# select the NDK target
+ndk_arch = 'arm'
+host_arch = 'arm-linux-androideabi'
+android_abi = 'armeabi-v7a'
+ndk_platform = 'android-14'
+
+# set up the NDK toolchain
+
+gcc_toolchain = os.path.join(ndk_path, 'toolchains', host_arch + '-' + gcc_version, 'prebuilt', build_arch)
+llvm_toolchain = os.path.join(ndk_path, 'toolchains', 'llvm-' + llvm_version, 'prebuilt', build_arch)
+ndk_platform_path = os.path.join(ndk_path, 'platforms', ndk_platform)
+target_root = os.path.join(ndk_platform_path, 'arch-' + ndk_arch)
+
+llvm_triple = 'armv7-none-linux-androideabi'
+
+def select_toolchain(use_cxx, use_clang):
+    global cc, cxx, ar, strip, cflags, cxxflags, cppflags, ldflags, libs
+
+    target_arch = '-march=armv7-a -mfloat-abi=softfp'
+    if use_clang:
+        cc = os.path.join(llvm_toolchain, 'bin/clang')
+        cxx = os.path.join(llvm_toolchain, 'bin/clang++')
+        target_arch += ' -target ' + llvm_triple + ' -integrated-as -gcc-toolchain ' + gcc_toolchain
+    else:
+        cc = os.path.join(gcc_toolchain, 'bin', host_arch + '-gcc')
+        cxx = os.path.join(gcc_toolchain, 'bin', host_arch + '-g++')
+    ar = os.path.join(gcc_toolchain, 'bin', host_arch + '-ar')
+    strip = os.path.join(gcc_toolchain, 'bin', host_arch + '-strip')
+
+    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')
+    if use_clang:
+        libstdcxx_cppflags += ' -D__STRICT_ANSI__'
+    libstdcxx_ldadd = os.path.join(libstdcxx_path, 'libs', android_abi, 'libgnustl_static.a')
+
+    cflags = '-Os -g ' + target_arch
+    cxxflags = '-Os -g ' + target_arch
+    cppflags = '--sysroot=' + target_root + ' -I' + root_path + '/include'
+    ldflags = '--sysroot=' + target_root + ' -L' + root_path + '/lib'
+    libs = ''
+
+    if use_cxx:
+        libs += ' ' + libstdcxx_ldadd
+        cppflags += ' ' + libstdcxx_cppflags
+
+def file_md5(path):
+    """Calculate the MD5 checksum of a file and return it in hexadecimal notation."""
+
+    with open(path, 'rb') as f:
+        m = hashlib.md5()
+        while True:
+            data = f.read(65536)
+            if len(data) == 0:
+                # end of file
+                return m.hexdigest()
+            m.update(data)
+
+def download_tarball(url, md5):
+    """Download a tarball, verify its MD5 checksum and return the local path."""
+
+    global tarball_path
+    os.makedirs(tarball_path, exist_ok=True)
+    path = os.path.join(tarball_path, os.path.basename(url))
+
+    try:
+        calculated_md5 = file_md5(path)
+        if md5 == calculated_md5: return path
+        os.unlink(path)
+    except FileNotFoundError:
+        pass
+
+    tmp_path = path + '.tmp'
+
+    print("download", url)
+    urllib.request.urlretrieve(url, tmp_path)
+    calculated_md5 = file_md5(tmp_path)
+    if calculated_md5 != md5:
+        os.unlink(tmp_path)
+        raise "MD5 mismatch"
+
+    os.rename(tmp_path, path)
+    return path
+
+class Project:
+    def __init__(self, url, md5, installed, name=None, version=None,
+                 base=None,
+                 use_cxx=False, use_clang=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
+        self.use_clang = use_clang
+
+    def download(self):
+        return download_tarball(self.url, self.md5)
+
+    def is_installed(self):
+        global root_path
+        tarball = self.download()
+        installed = os.path.join(root_path, self.installed)
+        tarball_mtime = os.path.getmtime(tarball)
+        try:
+            return os.path.getmtime(installed) >= tarball_mtime
+        except FileNotFoundError:
+            return False
+
+    def unpack(self):
+        global src_path
+        tarball = self.download()
+        path = os.path.join(src_path, self.base)
+        try:
+            shutil.rmtree(path)
+        except FileNotFoundError:
+            pass
+        os.makedirs(src_path, exist_ok=True)
+        subprocess.check_call(['/bin/tar', 'xfC', tarball, src_path])
+        return path
+
+    def make_build_path(self):
+        path = os.path.join(build_path, self.base)
+        try:
+            shutil.rmtree(path)
+        except FileNotFoundError:
+            pass
+        os.makedirs(path, exist_ok=True)
+        return path
+
+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):
+        src = self.unpack()
+        if self.autogen:
+            subprocess.check_call(['/usr/bin/aclocal'], cwd=src)
+            subprocess.check_call(['/usr/bin/automake', '--add-missing', '--force-missing', '--foreign'], cwd=src)
+            subprocess.check_call(['/usr/bin/autoconf'], cwd=src)
+            subprocess.check_call(['/usr/bin/libtoolize', '--force'], cwd=src)
+
+        build = self.make_build_path()
+
+        select_toolchain(use_cxx=self.use_cxx, use_clang=self.use_clang)
+        configure = [
+            os.path.join(src, 'configure'),
+            'CC=' + cc,
+            'CXX=' + cxx,
+            'CFLAGS=' + cflags,
+            'CXXFLAGS=' + cxxflags,
+            'CPPFLAGS=' + cppflags + ' ' + self.cppflags,
+            'LDFLAGS=' + ldflags,
+            'LIBS=' + libs,
+            'AR=' + ar,
+            'STRIP=' + strip,
+            '--host=' + host_arch,
+            '--prefix=' + root_path,
+            '--with-sysroot=' + target_root,
+            '--enable-silent-rules',
+        ] + self.configure_args
+
+        subprocess.check_call(configure, cwd=build)
+        subprocess.check_call(['/usr/bin/make', '--quiet', '-j12'], cwd=build)
+        subprocess.check_call(['/usr/bin/make', '--quiet', 'install'], cwd=build)
+
+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 build(self):
+        src = self.unpack()
+        build = self.make_build_path()
+
+        select_toolchain(use_cxx=self.use_cxx, use_clang=self.use_clang)
+        configure = [
+            os.path.join(src, 'configure'),
+            '--cc=' + cc,
+            '--cxx=' + cxx,
+            '--extra-cflags=' + cflags + ' ' + cppflags + ' ' + self.cppflags,
+            '--extra-cxxflags=' + cxxflags + ' ' + cppflags + ' ' + self.cppflags,
+            '--extra-ldflags=' + ldflags,
+            '--extra-libs=' + libs,
+            '--ar=' + ar,
+            '--enable-cross-compile',
+            '--target-os=linux',
+            '--arch=' + ndk_arch,
+            '--cpu=cortex-a8',
+            '--prefix=' + root_path,
+        ] + self.configure_args
+
+        subprocess.check_call(configure, cwd=build)
+        subprocess.check_call(['/usr/bin/make', '--quiet', '-j12'], cwd=build)
+        subprocess.check_call(['/usr/bin/make', '--quiet', 'install'], cwd=build)
+
+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):
+        src = self.unpack()
+
+        # install the headers manually; don't build any library
+        # (because right now, we only use header-only libraries)
+        includedir = os.path.join(root_path, 'include')
+        for dirpath, dirnames, filenames in os.walk(os.path.join(src, 'boost')):
+            relpath = dirpath[len(src)+1:]
+            destdir = os.path.join(includedir, relpath)
+            try:
+                os.mkdir(destdir)
+            except:
+                pass
+            for name in filenames:
+                if name[-4:] == '.hpp':
+                    shutil.copyfile(os.path.join(dirpath, name),
+                                    os.path.join(destdir, name))
+
+# a list of third-party libraries to be used by MPD on Android
+thirdparty_libs = [
+    AutotoolsProject(
+        'http://downloads.xiph.org/releases/ogg/libogg-1.3.2.tar.xz',
+        '5c3a34309d8b98640827e5d0991a4015',
+        'lib/libogg.a',
+        ['--disable-shared', '--enable-static'],
+    ),
+
+    AutotoolsProject(
+        'http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.4.tar.xz',
+        '55f2288055e44754275a17c9a2497391',
+        'lib/libvorbis.a',
+        ['--disable-shared', '--enable-static'],
+    ),
+
+    AutotoolsProject(
+        'http://downloads.xiph.org/releases/opus/opus-1.1.tar.gz',
+        'c5a8cf7c0b066759542bc4ca46817ac6',
+        'lib/libopus.a',
+        ['--disable-shared', '--enable-static'],
+        use_clang=True,
+    ),
+
+    AutotoolsProject(
+        'http://downloads.xiph.org/releases/flac/flac-1.3.1.tar.xz',
+        'b9922c9a0378c88d3e901b234f852698',
+        'lib/libFLAC.a',
+        [
+            '--disable-shared', '--enable-static',
+            '--disable-xmms-plugin', '--disable-cpplibs',
+        ],
+        use_clang=True,
+    ),
+
+    AutotoolsProject(
+        'ftp://ftp.mars.org/pub/mpeg/libid3tag-0.15.1b.tar.gz',
+        'e5808ad997ba32c498803822078748c3',
+        'lib/libid3tag.a',
+        ['--disable-shared', '--enable-static'],
+        autogen=True,
+    ),
+
+    AutotoolsProject(
+        'ftp://ftp.mars.org/pub/mpeg/libmad-0.15.1b.tar.gz',
+        '1be543bc30c56fb6bea1d7bf6a64e66c',
+        'lib/libmad.a',
+        ['--disable-shared', '--enable-static'],
+        autogen=True,
+    ),
+
+    FfmpegProject(
+        'http://ffmpeg.org/releases/ffmpeg-2.5.tar.bz2',
+        '4346fe710cc6bdd981f6534d2420d1ab',
+        'lib/libavcodec.a',
+        [
+            '--disable-shared', '--enable-static',
+            '--enable-gpl',
+            '--enable-small',
+            '--disable-pthreads',
+            '--disable-runtime-cpudetect',
+            '--disable-programs',
+            '--disable-doc',
+            '--disable-avdevice',
+            '--disable-swresample',
+            '--disable-swscale',
+            '--disable-postproc',
+            '--disable-avfilter',
+            '--disable-network',
+            '--disable-encoders',
+            '--disable-protocols',
+            '--disable-outdevs',
+            '--disable-filters',
+        ],
+    ),
+
+    AutotoolsProject(
+        'http://curl.haxx.se/download/curl-7.39.0.tar.lzma',
+        'e9aa6dec29920eba8ef706ea5823bad7',
+        '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',
+        ],
+        use_clang=True,
+    ),
+
+    BoostProject(
+        'http://netcologne.dl.sourceforge.net/project/boost/boost/1.55.0/boost_1_55_0.tar.bz2',
+        'd6eef4b4cacb2183f2bf265a5a03a354',
+        'include/boost/version.hpp',
+    ),
+]
+
+# build the third-party libraries
+for x in thirdparty_libs:
+    if not x.is_installed():
+        x.build()
+
+# configure and build MPD
+select_toolchain(use_cxx=True, use_clang=True)
+
+configure = [
+    os.path.join(mpd_path, 'configure'),
+    'CC=' + cc,
+    'CXX=' + cxx,
+    'CFLAGS=' + cflags,
+    'CXXFLAGS=' + cxxflags,
+    'CPPFLAGS=' + cppflags,
+    'LDFLAGS=' + ldflags,
+    'LIBS=' + libs,
+    'AR=' + ar,
+    'STRIP=' + strip,
+    '--host=' + host_arch,
+    '--prefix=' + root_path,
+    '--with-sysroot=' + target_root,
+    '--with-android-sdk=' + sdk_path,
+
+    '--enable-silent-rules',
+
+    '--disable-glib',
+    '--disable-icu',
+
+    # disabled for now because these features require GLib:
+    '--disable-httpd-output',
+    '--disable-vorbis-encoder',
+
+] + configure_args
+
+subprocess.check_call(configure)
+subprocess.check_call(['/usr/bin/make', '--quiet', '-j12'])
--- 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 (C) 2003-2014 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
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2003-2014 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.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 (C) 2003-2014 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,6 +1,7 @@
 <?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>

@@ -10,7 +11,7 @@
    <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>

@@ -32,23 +33,16 @@

      <listitem>
        <para>
-          don't write CPP when you can write C: use inline functions
-          and enums instead of macros
+          don't write CPP when you can write C++: use inline
+          functions and constexpr instead of macros
        </para>
      </listitem>

      <listitem>
        <para>
-          the code should be C99 compliant, and must compile with
-          <application>GCC</application>;
-          <application>clang</application> support is highly desirable
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          C++ is ok (for integrating C++ only libraries), but it
-          should be avoided
+          the code should be C++11 compliant, and must compile with
+          <application>GCC</application> 4.7 and
+          <application>clang</application> 3.2
        </para>
      </listitem>

@@ -61,7 +55,7 @@
 foo(const char *abc, int xyz)
 {
        if (abc == NULL) {
-                g_warning("Foo happened!\n");
+                LogWarning("Foo happened!");
                return -1;
        }

@@ -75,12 +69,28 @@ foo(const char *abc, int xyz)
  <chapter>
    <title>Hacking The Source</title>

+    <para>
+      MPD sources are managed in a git repository on <ulink
+      url="http://git.musicpd.org/">git.musicpd.org</ulink>.
+    </para>
+
    <para>
      Always write your code against the latest git:
    </para>

    <programlisting>git clone git://git.musicpd.org/master/mpd.git</programlisting>

+    <para>
+      If you already have a clone, update it:
+    </para>
+
+    <programlisting>git pull --rebase git://git.musicpd.org/master/mpd.git master</programlisting>
+
+    <para>
+      You can do without "--rebase", but we recommend that you rebase
+      your repository on the "master" repository all the time.
+    </para>
+
    <para>
      Configure with the options <option>--enable-debug
      --enable-werror</option>.  Enable as many plugins as possible,
@@ -90,8 +100,55 @@ foo(const char *abc, int xyz)
    <para>
      Don't mix several changes in one single patch.  Create a
      separate patch for every change.  Tools like
-      <application>stgit</application> help you with that.
+      <application>stgit</application> help you with that.  This way,
+      we can review your patches more easily, and we can pick the
+      patches we like most first.
    </para>
+
+
+    <section>
+      <title> Basic stgit usage</title>
+
+      <para>
+        stgit allows you to create a set of patches and refine all of
+        them: you can go back to any patch at any time, and re-edit it
+        (both the code and the commit message). You can reorder
+        patches and insert new patches at any position. It encourages
+        creating separate patches for tiny changes.
+      </para>
+
+      <para>
+        stgit needs to be initialized on a git repository: stg init
+      </para>
+
+      <para>
+        Before you edit the code, create a patch: stg new
+        my-patch-name (stgit now asks you for the commit message).
+      </para>
+
+      <para>
+        Now edit the code. Once you're finished, you have to "refresh"
+        the patch, i.e. your edits are incorporated into the patch you
+        have created: stg refresh
+      </para>
+
+      <para>
+        You may now continue editing the same patch, and refresh it as
+        often as you like. Create more patches, edit and refresh them.
+      </para>
+
+      <para>
+        To view the list of patches, type stg series. To go back to a
+        specific patch, type stg goto my-patch-name; now you can
+        re-edit it (don't forget stg refresh when you're finished with
+        that patch).
+      </para>
+
+      <para>
+        When the whole patch series is finished, convert stgit patches
+        to git commits: stg commit
+      </para>
+    </section>
  </chapter>

  <chapter>
@@ -99,7 +156,53 @@ foo(const char *abc, int xyz)

    <para>
      Send your patches to the mailing list:
-      musicpd-dev-team@lists.sourceforge.net
+      <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>
  </chapter>
+
+  <chapter>
+    <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
@@ -1158,7 +1158,7 @@ INCLUDE_FILE_PATTERNS  =
 # undefined via #undef or recursively expanded use the := operator
 # instead of the = operator.

-PREDEFINED             = G_GNUC_UNUSED=
+PREDEFINED             =

 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
 # this tag can be used to specify a list of macro names that should be expanded.
--- 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.1
+++ b/doc/mpd.1
@@ -12,29 +12,29 @@ 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.

-MPD searches for a config file in \fB~/.mpdconf\fP then \fB/etc/mpd.conf\fP or
-uses CONF_FILE.
+MPD searches for a config file in \fB$XDG_CONFIG_HOME/mpd/mpd.conf\fP then
+\fB~/.mpdconf\fP then \fB/etc/mpd.conf\fP or uses CONF_FILE.

 Read more about MPD at <\fBhttp://www.musicpd.org/\fP>.
 .SH OPTIONS
 .TP
-.BI --help
+.BI \-\-help
 Output a brief help message.
 .TP
-.BI --kill
+.BI \-\-kill
 Kill the currently running mpd session.  The pid_file parameter must be
 specified in the config file for this to work.
 .TP
-.BI --no-daemon
+.BI \-\-no\-daemon
 Don't detach from console.
 .TP
-.BI --stderr
+.BI \-\-stderr
 Print messages stderr.
 .TP
-.BI --verbose
+.BI \-\-verbose
 Verbose logging.
 .TP
-.BI --version
+.BI \-\-version
 Print version information.
 .SH FILES
 .TP
@@ -48,8 +48,8 @@ mpd.conf(5), mpc(1)
 .SH BUGS
 If you find a bug, please report it at
 .br
-<\fBhttp://www.musicpd.org/mantis/bug_report_page.php\fP>.
+<\fBhttp://bugs.musicpd.org/bug_report_page.php\fP>.
 .SH AUTHORS
-Warren Dukes <warren.dukes@gmail.com>
+Max Kellermann <max@duempel.org>

 Special thanks to all the people that provided feedback and patches.
--- a/doc/mpd.conf.5
+++ b/doc/mpd.conf.5
@@ -3,8 +3,9 @@
 mpd.conf \- Music Player Daemon configuration file
 .SH DESCRIPTION
 \fBmpd.conf\fP is the configuration file for mpd(1).  If not specified on the
-command line, MPD first searches for it at \fB~/.mpdconf\fP then at
-\fB~/.mpd/mpd.conf\fP and then in \fB/etc/mpd.conf\fP.
+command line, MPD first searches for it at \fB$XDG_CONFIG_HOME/mpd/mpd.conf\fP
+then at \fB~/.mpdconf\fP then at \fB~/.mpd/mpd.conf\fP and then in
+\fB/etc/mpd.conf\fP.

 Lines beginning with a "#" character are comments.  All other non-empty lines
 specify parameters and their values.  These lines contain the parameter name
@@ -27,31 +28,24 @@ paths.

 See \fBdocs/mpdconf.example\fP in the source tarball for an example
 configuration file.
+
+This manual is not complete, it lists only the most important options.
+Please read the MPD user manual for a complete configuration guide:
+<\fBhttp://www.musicpd.org/doc/user/\fP>
 .SH REQUIRED PARAMETERS
 .TP
-.B follow_outside_symlinks <yes or no>
-Control if MPD will follow symbolic links pointing outside the music dir.
-You must recreate the database after changing this option.
-The default is "yes".
-.TP
-.B follow_inside_symlinks <yes or no>
-Control if MPD will follow symbolic links pointing inside the music dir,
-potentially adding duplicates to the database.
-You must recreate the database after changing this option.
-The default is "yes".
-.TP
 .B db_file <file>
 This specifies where the db file will be stored.
 .TP
-.B sticker_file <file>
-The location of the sticker database.  This is a database which
-manages dynamic information attached to songs.
-.TP
 .B log_file <file>
 This specifies where the log file should be located.
 The special value "syslog" makes MPD use the local syslog daemon.
 .SH OPTIONAL PARAMETERS
 .TP
+.B sticker_file <file>
+The location of the sticker database.  This is a database which
+manages dynamic information attached to songs.
+.TP
 .B pid_file <file>
 This specifies the file to save mpd's process ID in.
 .TP
@@ -87,8 +81,9 @@ You can set a port that is different from the global port setting,
 e.g. "localhost:6602".  IPv6 addresses must be enclosed in square
 brackets if you want to configure a port, e.g. "[::1]:6602".

-To bind to a Unix domain socket, specify an absolute path.  For a
-system-wide MPD, we suggest the path "\fB/var/run/mpd/socket\fP".
+To bind to a Unix domain socket, specify an absolute path or a path starting
+with a tilde (~).  For a system-wide MPD, we suggest the path
+"\fB/var/run/mpd/socket\fP".
 .TP
 .B port <port>
 This specifies the port that mpd listens on.  The default is 6600.
@@ -99,6 +94,17 @@ reports from what address a connection is opened, and when it is closed, and
 "verbose" records excessive amounts of information for debugging purposes.  The
 default is "default".
 .TP
+.B follow_outside_symlinks <yes or no>
+Control if MPD will follow symbolic links pointing outside the music dir.
+You must recreate the database after changing this option.
+The default is "yes".
+.TP
+.B follow_inside_symlinks <yes or no>
+Control if MPD will follow symbolic links pointing inside the music dir,
+potentially adding duplicates to the database.
+You must recreate the database after changing this option.
+The default is "yes".
+.TP
 .B zeroconf_enabled <yes or no>
 If yes, and MPD has been compiled with support for Avahi or Bonjour, service
 information will be published with Zeroconf.  The default is yes.
@@ -130,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
@@ -186,53 +145,20 @@ tags if random play is activated otherwise the album ReplayGain tags. Currently
 only FLAC, Ogg Vorbis, Musepack, and MP3 (through ID3v2 ReplayGain tags, not
 APEv2) are supported.
 .TP
-.B replaygain_preamp <-15 to 15>
+.B replaygain_preamp <\-15 to 15>
 This is the gain (in dB) applied to songs with ReplayGain tags.
 .TP
 .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 2048,
-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 4096.
-.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
+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
+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
@@ -248,18 +174,8 @@ 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, and disc.  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.
-.TP
 .B auto_update <yes or no>
-This specifies the wheter to support automatic update of music database when
+This specifies the whether to support automatic update of music database when
 files are changed in music_directory. The default is to disable autoupdate
 of database.
 .TP
@@ -267,21 +183,11 @@ 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>
 This specifies the audio output type.  See the list of supported outputs in mpd
--version for possible values.
+\-\-version for possible values.
 .TP
 .B name <name>
 This specifies a unique name for the audio output.
@@ -356,152 +262,6 @@ errors on bandwidth-limited devices.  Some users have reported good results
 with this set to 50000, but not all devices support values this high.  Most
 users do not need to change this.  The default is 256000000 / sample_rate(kHz),
 or 5804 microseconds for CD-quality audio.
-.SH OPTIONAL OSS OUTPUT PARAMETERS
-.TP
-.B device <dev>
-This specifies the device to use for audio output.  The default is "/dev/dsp".
-.TP
-.B mixer_device <mixer dev>
-This specifies which mixer to use.  The default is "/dev/mixer".
-.TP
-.B mixer_control <mixer ctrl>
-This specifies which mixer control to use (sometimes referred to as the
-"device").  The default is to use the main PCM mixer.  An example is "Pcm".
-.SH OPTIONAL PULSE OUTPUT PARAMETERS
-.TP
-.B server <server list>
-A space separated list of servers to try to connect to.  See
-<\fBhttp://www.pulseaudio.org/wiki/ServerStrings\fP> for more details.  The
-default is to let PulseAudio choose a server.
-If you specify more than one server name, MPD tries to connect to one
-after another until it successfully establishes a connection.
-.TP
-.B sink <sink>
-The sink to output to.  The default is to let PulseAudio choose a sink.
-.SH OPTIONAL JACK OUTPUT PARAMETERS
-.TP
-.B client_name <name>
-The client name to use when connecting to JACK.  The output ports <name>:left
-and <name>:right will also be created for the left and right channels,
-respectively.
-.TP
-.B ports <left_port,right_port>
-This specifies the left and right ports to connect to for the left and right
-channels, respectively.  The default is to let JACK choose a pair of ports.
-.TP
-.B ringbuffer_size <size in bytes>
-This specifies the size of the ringbuffer in bytes.  The default is 32768.
-.SH OPTIONAL AO OUTPUT PARAMETERS
-.TP
-.B driver <driver>
-This specifies the libao driver to use for audio output.  Possible values
-depend on what libao drivers are available.  See
-<\fBhttp://www.xiph.org/ao/doc/drivers.html\fP> for information on some
-commonly used drivers.  Typical values for Linux include "oss" and "alsa09".
-The default is "default", which causes libao to select an appropriate plugin.
-.TP
-.B options <opts>
-This specifies the options to use for the selected libao driver.  For oss, the
-only option available is "dsp".  For alsa09, the available options are: "dev",
-"buf_size", and "periods".  See <\fBhttp://www.xiph.org/ao/doc/drivers.html\fP>
-for available options for some commonly used drivers.  Options are assigned
-using "=", and ";" is used to separate options.  An example for oss:
-"dsp=/dev/dsp".  An example for alsa09: "dev=hw:0,0;buf_size=4096".  The
-default is "".
-.TP
-.B write_size <size in bytes>
-This specifies how many bytes to write to the audio device at once.  This
-parameter is to work around a bug in older versions of libao on sound cards
-with very small buffers.  The default is 1024.
-.SH REQUIRED FIFO OUTPUT PARAMETERS
-.TP
-.B path <path>
-This specifies the path of the FIFO to output to.  Must be an absolute path.
-If the path does not exist it will be created when mpd is started, and removed
-when mpd is stopped.  The FIFO will be created with the same user and group as
-mpd is running as.  Default permissions can be modified by using the builtin
-shell command "umask".  If a FIFO already exists at the specified path it will
-be reused, and will \fBnot\fP be removed when mpd is stopped.  You can use the
-"mkfifo" command to create this, and then you may modify the permissions to
-your liking.
-.SH REQUIRED SHOUT OUTPUT PARAMETERS
-.TP
-.B name <name>
-This specifies not only the unique audio output name, but also the stream
-title.
-.TP
-.B host <hostname>
-This specifies the hostname of the icecast server to connect to.
-.TP
-.B port <port>
-This specifies the port of the icecast server to connect to.
-.TP
-.B mount <mountpoint>
-This specifies the icecast mountpoint to use.
-.TP
-.B password <password>
-This specifies the password to use when logging in to the icecast server.
-.TP
-.B quality <quality>
-This specifies the encoding quality to use.  The value must be between 0
-and 10.  Fractional values, such as 2.5, are permitted.  Either the quality or
-the bitrate parameter must be specified, but not both.  For Ogg, a
-higher quality number produces higher quality output.  For MP3, it's
-just the opposite, with lower numbers producing higher quality output.
-.TP
-.B bitrate <kbps>
-This specifies the bitrate to use for encoding.  Either the quality or the
-bitrate parameter must be specified, but not both.
-.TP
-.B format <sample_rate:bits:channels>
-This specifies the sample rate, bits per sample, and number of channels to use
-for encoding.
-.SH OPTIONAL SHOUT OUTPUT PARAMETERS
-.TP
-.B encoding <encoding>
-This specifies which output encoding to use.  Should be either "ogg"
-or "mp3",  "mp3" is needed for shoutcast streaming. The default is "ogg".
-.TP
-.B protocol <protocol>
-This specifies the protocol that wil be used to connect to the
-icecast/shoutcast server. The options are "shoutcast", "icecast1" and
-"icecast2". The default is "icecast2".
-.TP
-.B user <username>
-This specifies the username to use when logging in to the icecast server.  The
-default is "source".
-.TP
-.B public <yes or no>
-This specifies whether to request that the stream be listed in all public
-stream directories that the icecast server knows about.  The default is no.
-.TP
-.B timeout <seconds>
-This specifies the number of seconds to wait before giving up on trying to
-connect to the icecast server.  The default is 2 seconds.
-.TP
-.B description <description>
-This specifies a description of the stream.
-.TP
-.B url <url>
-This specifies a URL associated with the stream.
-.TP
-.B genre <genre>
-This specifies the genre(s) of the stream.
-.SH OPTIONAL TCP KEEPALIVE PARAMETERS
-.TP
-.B tcp_keep_alive <yes or no>
-Enable tcp keepalive on new client connections. (default is "no")
-.TP
-.B tcp_keep_alive_idle <seconds>
-Time in seconds since the last communication on the connection and before
-the keepalive probing is started. (default is 7200 seconds)
-.TP
-.B tcp_keep_alive_interval <seconds>
-Interval in seconds between keepalive probes, once a probe started. (default is 75 seconds)
-.TP
-.B tcp_keep_alive_count <number of times>
-Number of failed probes before the connection is pronounced dead and
-the connection is closed. (default is 9 times)
 .SH FILES
 .TP
 .BI ~/.mpdconf
--- a/doc/mpdconf.example
+++ b/doc/mpdconf.example
@@ -1,5 +1,5 @@
-# An example configuration file for MPD
-# See the mpd.conf man page for a more detailed description of each parameter.
+# An example configuration file for MPD.
+# Read the user manual for documentation: http://www.musicpd.org/doc/user/


 # Files and directories #######################################################
@@ -113,10 +113,9 @@
 #
 #save_absolute_paths_in_playlists	"no"
 #
-# This setting defines a list of tag types that will be extracted during the 
-# audio file discovery process. Optionally, 'comment' can be added to this
-# list.
-#
+# 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 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 
@@ -176,6 +175,15 @@
 ###############################################################################


+# Database #######################################################################
+#
+
+#database {
+#       plugin "proxy"
+#       host "other.mpd.host"
+#       port "6600"
+#}
+
 # Input #######################################################################
 #

@@ -196,16 +204,12 @@ input {
 # blocks. Setting this block is optional, though the server will only attempt
 # autodetection for one sound card.
 #
-# See <http://mpd.wikia.com/wiki/Configuration#Audio_Outputs> for examples of 
-# other audio outputs.
-#
 # An example of an ALSA output:
 #
 #audio_output {
 #	type		"alsa"
 #	name		"My ALSA Device"
 ##	device		"hw:0,0"	# optional
-##	format		"44100:16:2"	# optional
 ##	mixer_type      "hardware"	# optional
 ##	mixer_device	"default"	# optional
 ##	mixer_control	"PCM"		# optional
@@ -218,7 +222,6 @@ input {
 #	type		"oss"
 #	name		"My OSS Device"
 ##	device		"/dev/dsp"	# optional
-##	format		"44100:16:2"	# optional
 ##	mixer_type      "hardware"	# optional
 ##	mixer_device	"/dev/mixer"	# optional
 ##	mixer_control	"PCM"		# optional
@@ -228,7 +231,7 @@ input {
 #
 #audio_output {
 #	type		"shout"
-#	encoding	"ogg"			# optional
+#	encoder		"vorbis"		# optional
 #	name		"My Shout Stream"
 #	host		"localhost"
 #	port		"8000"
@@ -282,6 +285,25 @@ input {
 ##	sink		"remote_server_sink"	# optional
 #}
 #
+# An example of a winmm output (Windows multimedia API).
+#
+#audio_output {
+#	type		"winmm"
+#	name		"My WinMM output"
+##	device		"Digital Audio (S/PDIF) (High Definition Audio Device)" # optional
+#		or
+##	device		"0"		# optional
+##	mixer_type	"hardware"	# optional
+#}
+#
+# An example of an openal output.
+#
+#audio_output {
+#	type		"openal"
+#	name		"My OpenAL output"
+##	device		"Digital Audio (S/PDIF) (High Definition Audio Device)" # optional
+#}
+#
 ## Example "pipe" output:
 #
 #audio_output {
@@ -303,12 +325,6 @@ input {
 #	mixer_type      "none"			# optional
 #}
 #
-# This setting will change all decoded audio to be converted to the specified
-# format before being passed to the audio outputs. By default, this setting is
-# disabled.
-#
-#audio_output_format		"44100:16:2"
-#
 # 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
@@ -322,8 +338,11 @@ input {
 # Normalization automatic volume adjustments ##################################
 #
 # This setting specifies the type of ReplayGain to use. This setting can have
-# the argument "off", "album" or "track". See <http://www.replaygain.org>
-# for more details. This setting is off by default.
+# the argument "off", "album", "track" or "auto". "auto" is a special mode that
+# chooses between "track" and "album" depending on the current state of
+# random playback. If random playback is enabled then "track" mode is used.
+# See <http://www.replaygain.org> for more details about ReplayGain.
+# This setting is off by default.
 #
 #replaygain			"album"
 #
@@ -332,6 +351,20 @@ input {
 #
 #replaygain_preamp		"0"
 #
+# This setting sets the pre-amp used for files that do NOT have ReplayGain tags.
+# By default this setting is disabled.
+#
+#replaygain_missing_preamp	"0"
+#
+# This setting enables or disables ReplayGain limiting.
+# MPD calculates actual amplification based on the ReplayGain tags
+# and replaygain_preamp / replaygain_missing_preamp setting.
+# If replaygain_limit is enabled MPD will never amplify audio signal
+# above its original level. If replaygain_limit is disabled such amplification
+# might occur. By default this setting is enabled.
+#
+#replaygain_limit		"yes"
+#
 # This setting enables on-the-fly normalization volume adjustment. This will
 # result in the volume of all playing audio to be adjusted so the output has 
 # equal "loudness". This setting is disabled by default.
@@ -340,68 +373,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		"2048"
-#
-# 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"
-#
-###############################################################################
-
-# Client TCP keep alive #######################################################
-#
-# For clients connected by TCP on supported platforms.
-# Allows detection of dangling connections due to clients disappearing from
-# the network without closing their connections.
-#
-# This is not usually necessary but can be useful in cases such as wifi connectected
-# clients that go in and out of network range or turn off wifi without closing their
-# connections. Combined with low max_connections this can soon cause clients to not
-# be able to connect.
-#
-#
-# Enable tcp keepalive on new client connections (default is "no")
-#
-#tcp_keep_alive "no"
-#
-# Time in seconds since the last communication on the connection and before
-# the keepalive probing is started. (default is 7200 seconds)
-#tcp_keep_alive_idle "7200"
-#
-# Interval in seconds between keepalive probes, once a probe started.
-# (default is 75 seconds)
-#tcp_keep_alive_interval "75"
-#
-# Number of failed probes before the connection is pronounced dead and
-# the connection is closed. (default is 9 times)
-#tcp_keep_alive_count "9"
-#
-###############################################################################
-
 # Character Encoding ##########################################################
 #
 # If file or directory names do not display correctly for your locale then you 
--- 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>
@@ -70,7 +71,7 @@
      </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,25 @@
      </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 moved it farther to the end of the
+        sequence.  Changing the priority of the current song has no
+        effect on the sequence.
      </para>
    </section>
  </chapter>

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

    <note>
@@ -255,12 +276,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 +319,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 +408,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 +453,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,7 +528,7 @@
              <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.
@@ -576,7 +600,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 +636,7 @@
      </variablelist>
    </section>

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

      <variablelist>
@@ -740,7 +769,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>
@@ -768,10 +797,29 @@
            </para>
          </listitem>
        </varlistentry>
+        <varlistentry id="command_volume">
+          <term>
+            <cmdsynopsis>
+              <command>volume</command>
+              <arg choice="req"><replaceable>CHANGE</replaceable></arg>
+            </cmdsynopsis>
+          </term>
+          <listitem>
+            <para>
+              Changes volume by amount <varname>CHANGE</varname>.
+            </para>
+            <note>
+              <para>
+                <command>volume</command> is deprecated, use
+                <command>setvol</command> instead.
+              </para>
+            </note>
+          </listitem>
+        </varlistentry>
      </variablelist>
    </section>

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

      <variablelist>
@@ -858,8 +906,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>
@@ -874,7 +922,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>
@@ -888,9 +937,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>
@@ -910,7 +960,7 @@
      </variablelist>
    </section>

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

      <variablelist>
@@ -1011,7 +1061,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>
@@ -1111,7 +1161,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>
@@ -1194,6 +1244,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>
@@ -1239,10 +1311,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>
@@ -1432,16 +1542,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>
@@ -1449,8 +1563,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>
@@ -1464,11 +1585,43 @@ OK
            <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 two special
-              parameters — <parameter>file</parameter> to search by
-              full path (relative to database root), and
-              <parameter>any</parameter> to match against all
-              available tags.  <varname>WHAT</varname> is what to find.
+              be any tag supported by <application>MPD</application>, or one of the special
+              parameters:
+            </para>
+
+            <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>
          </listitem>
        </varlistentry>
@@ -1489,27 +1642,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>
@@ -1522,6 +1691,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">
@@ -1537,6 +1714,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">
@@ -1556,6 +1767,10 @@ 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
@@ -1563,6 +1778,36 @@ OK
            </para>
          </listitem>
        </varlistentry>
+        <varlistentry id="command_readcomments">
+          <term>
+            <cmdsynopsis>
+              <command>readcomments</command>
+              <arg><replaceable>URI</replaceable></arg>
+            </cmdsynopsis>
+          </term>
+          <listitem>
+            <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".
+            </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".
+              Comments with suspicious characters (e.g. newlines) are
+              ignored silently.
+            </para>
+            <para>
+              The meaning of these depends on the codec, and not all
+              decoder plugins support it.  For example, on Ogg files,
+              this lists the Vorbis comments.
+            </para>
+          </listitem>
+        </varlistentry>
        <varlistentry id="command_search">
          <term>
            <cmdsynopsis>
@@ -1668,22 +1913,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>
@@ -1788,7 +2142,7 @@ OK
      </variablelist>
    </section>

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

      <variablelist>
@@ -1800,7 +2154,11 @@ OK
          </term>
          <listitem>
            <para>
-              Closes the connection to MPD.
+              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.
            </para>
          </listitem>
        </varlistentry>
@@ -1812,7 +2170,7 @@ OK
          </term>
          <listitem>
            <para>
-              Kills MPD.
+              Kills <application>MPD</application>.
            </para>
          </listitem>
        </varlistentry>
@@ -1846,7 +2204,7 @@ OK
      </variablelist>
    </section>

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

      <variablelist>
@@ -1876,6 +2234,20 @@ OK
            </para>
          </listitem>
        </varlistentry>
+        <varlistentry id="command_toggleoutput">
+          <term>
+            <cmdsynopsis>
+              <command>toggleoutput</command>
+              <arg choice="req"><replaceable>ID</replaceable></arg>
+            </cmdsynopsis>
+          </term>
+          <listitem>
+            <para>
+              Turns an output on or off, depending on the current
+              state.
+            </para>
+          </listitem>
+        </varlistentry>
        <varlistentry id="command_outputs">
          <term>
            <cmdsynopsis>
@@ -1886,12 +2258,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>
@@ -2007,7 +2405,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
@@ -54,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 4

 AC_DEFUN([AX_APPEND_COMPILE_FLAGS],
-[for flag in $1; do
+[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])
 done
 ])dnl AX_APPEND_COMPILE_FLAGS
--- a/m4/ax_append_link_flags.m4
+++ b/m4/ax_append_link_flags.m4
@@ -0,0 +1,63 @@
+# ===========================================================================
+#   http://www.gnu.org/software/autoconf-archive/ax_append_link_flags.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_APPEND_LINK_FLAGS([FLAG1 FLAG2 ...], [FLAGS-VARIABLE], [EXTRA-FLAGS])
+#
+# DESCRIPTION
+#
+#   For every FLAG1, FLAG2 it is checked whether the linker works with the
+#   flag.  If it does, the flag is added FLAGS-VARIABLE
+#
+#   If FLAGS-VARIABLE is not specified, the linker's flags (LDFLAGS) is
+#   used. During the check the flag is always added to the linker's flags.
+#
+#   If EXTRA-FLAGS is defined, it is added to the linker's default flags
+#   when the check is done.  The check is thus made with the flags: "LDFLAGS
+#   EXTRA-FLAGS FLAG".  This can for example be used to force the linker to
+#   issue an error when a bad flag is given.
+#
+#   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.
+#
+# LICENSE
+#
+#   Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.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 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 4
+
+AC_DEFUN([AX_APPEND_LINK_FLAGS],
+[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])
+done
+])dnl AX_APPEND_LINK_FLAGS
--- a/m4/ax_boost_base.m4
+++ b/m4/ax_boost_base.m4
@@ -0,0 +1,272 @@
+# ===========================================================================
+#       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 23
+
+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|ppc64|s390x|sparc64|aarch64)
+        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
+        _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
+            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,7 +55,7 @@
 #   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 3

 AC_DEFUN([AX_CHECK_COMPILE_FLAG],
 [AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX
@@ -61,7 +63,7 @@ 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])
--- a/m4/ax_check_link_flag.m4
+++ b/m4/ax_check_link_flag.m4
@@ -0,0 +1,73 @@
+# ===========================================================================
+#    http://www.gnu.org/software/autoconf-archive/ax_check_link_flag.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_CHECK_LINK_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT])
+#
+# DESCRIPTION
+#
+#   Check whether the given FLAG works with the linker or gives an error.
+#   (Warnings, however, are ignored)
+#
+#   ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on
+#   success/failure.
+#
+#   If EXTRA-FLAGS is defined, it is added to the linker's default flags
+#   when the check is done.  The check is thus made with the flags: "LDFLAGS
+#   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.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
+#   Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.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 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 3
+
+AC_DEFUN([AX_CHECK_LINK_FLAG],
+[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([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],
+  [m4_default([$2], :)],
+  [m4_default([$3], :)])
+AS_VAR_POPDEF([CACHEVAR])dnl
+])dnl AX_CHECK_LINK_FLAGS
--- a/m4/ax_cxx_compile_stdcxx_0x.m4
+++ b/m4/ax_cxx_compile_stdcxx_0x.m4
@@ -0,0 +1,107 @@
+# ============================================================================
+#  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_pthread.m4
+++ b/m4/ax_pthread.m4
@@ -0,0 +1,332 @@
+# ===========================================================================
+#        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 link it with them as well. e.g. you should link with
+#   $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS
+#
+#   If you are only building threads 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, 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 21
+
+AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD])
+AC_DEFUN([AX_PTHREAD], [
+AC_REQUIRE([AC_CANONICAL_HOST])
+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 True64 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_LIBS$PTHREAD_CFLAGS" != x; then
+        save_CFLAGS="$CFLAGS"
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+        save_LIBS="$LIBS"
+        LIBS="$PTHREAD_LIBS $LIBS"
+        AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS])
+        AC_TRY_LINK_FUNC([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
+        LIBS="$save_LIBS"
+        CFLAGS="$save_CFLAGS"
+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 -kthread lthread -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)
+# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
+# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
+# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads)
+# -pthreads: Solaris/gcc
+# -mthreads: Mingw32/gcc, Lynx/gcc
+# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
+#      doesn't hurt to check since this sometimes defines pthreads too;
+#      also defines -D_REENTRANT)
+#      ... -mt is also the pthreads flag for HP/aCC
+# pthread: Linux, etcetera
+# --thread-safe: KAI C++
+# pthread-config: use pthread-config program (for GNU Pth library)
+
+case ${host_os} in
+        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.  (We need to link with -pthreads/-mt/
+        # -lpthread.)  (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 just look for -pthreads and -lpthread first:
+
+        ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags"
+        ;;
+
+        darwin*)
+        ax_pthread_flags="-pthread $ax_pthread_flags"
+        ;;
+esac
+
+# Clang doesn't consider unrecognized options an error unless we specify
+# -Werror. We throw in some extra Clang-specific options to ensure that
+# this doesn't happen for GCC, which also accepts -Werror.
+
+AC_MSG_CHECKING([if compiler needs -Werror to reject unknown flags])
+save_CFLAGS="$CFLAGS"
+ax_pthread_extra_flags="-Werror"
+CFLAGS="$CFLAGS $ax_pthread_extra_flags -Wunknown-warning-option -Wsizeof-array-argument"
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([int foo(void);],[foo()])],
+                  [AC_MSG_RESULT([yes])],
+                  [ax_pthread_extra_flags=
+                   AC_MSG_RESULT([no])])
+CFLAGS="$save_CFLAGS"
+
+if test x"$ax_pthread_ok" = xno; then
+for flag in $ax_pthread_flags; do
+
+        case $flag in
+                none)
+                AC_MSG_CHECKING([whether pthreads work without any flags])
+                ;;
+
+                -*)
+                AC_MSG_CHECKING([whether pthreads work with $flag])
+                PTHREAD_CFLAGS="$flag"
+                ;;
+
+                pthread-config)
+                AC_CHECK_PROG([ax_pthread_config], [pthread-config], [yes], [no])
+                if test x"$ax_pthread_config" = xno; then continue; fi
+                PTHREAD_CFLAGS="`pthread-config --cflags`"
+                PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
+                ;;
+
+                *)
+                AC_MSG_CHECKING([for the pthreads library -l$flag])
+                PTHREAD_LIBS="-l$flag"
+                ;;
+        esac
+
+        save_LIBS="$LIBS"
+        save_CFLAGS="$CFLAGS"
+        LIBS="$PTHREAD_LIBS $LIBS"
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS $ax_pthread_extra_flags"
+
+        # 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>
+                        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],
+                [])
+
+        LIBS="$save_LIBS"
+        CFLAGS="$save_CFLAGS"
+
+        AC_MSG_RESULT([$ax_pthread_ok])
+        if test "x$ax_pthread_ok" = xyes; then
+                break;
+        fi
+
+        PTHREAD_LIBS=""
+        PTHREAD_CFLAGS=""
+done
+fi
+
+# Various other checks:
+if test "x$ax_pthread_ok" = xyes; then
+        save_LIBS="$LIBS"
+        LIBS="$PTHREAD_LIBS $LIBS"
+        save_CFLAGS="$CFLAGS"
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+
+        # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
+        AC_MSG_CHECKING([for joinable pthread attribute])
+        attr_name=unknown
+        for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
+            AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>],
+                           [int attr = $attr; return attr /* ; */])],
+                [attr_name=$attr; break],
+                [])
+        done
+        AC_MSG_RESULT([$attr_name])
+        if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then
+            AC_DEFINE_UNQUOTED([PTHREAD_CREATE_JOINABLE], [$attr_name],
+                               [Define to necessary symbol if this constant
+                                uses a non-standard name on your system.])
+        fi
+
+        AC_MSG_CHECKING([if more special flags are required for pthreads])
+        flag=no
+        case ${host_os} in
+            aix* | freebsd* | darwin*) flag="-D_THREAD_SAFE";;
+            osf* | hpux*) flag="-D_REENTRANT";;
+            solaris*)
+            if test "$GCC" = "yes"; then
+                flag="-D_REENTRANT"
+            else
+                # TODO: What about Clang on Solaris?
+                flag="-mt -D_REENTRANT"
+            fi
+            ;;
+        esac
+        AC_MSG_RESULT([$flag])
+        if test "x$flag" != xno; then
+            PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
+        fi
+
+        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"],
+            [AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], [1], [Have PTHREAD_PRIO_INHERIT.])])
+
+        LIBS="$save_LIBS"
+        CFLAGS="$save_CFLAGS"
+
+        # 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
@@ -8,38 +8,14 @@ AC_ARG_ENABLE(aac,
 		[disable AAC support (default: enable)]),,
 	enable_aac=yes)

-AC_ARG_WITH(faad,
-	AS_HELP_STRING([--with-faad=PFX],
-		[prefix where faad2 is installed (optional)]),,
-	faad_prefix="")
-AC_ARG_WITH(faad-libraries,
-	AS_HELP_STRING([--with-faad-libraries=DIR],
-		[directory where faad2 library is installed (optional)]),,
-	faad_libraries="")
-AC_ARG_WITH(faad-includes,
-	AS_HELP_STRING([--with-faad-includes=DIR],
-		[directory where faad2 header files are installed (optional)]),,
-	faad_includes="")
-
 if test x$enable_aac = xyes; then
-	if test "x$faad_libraries" != "x" ; then
-		FAAD_LIBS="-L$faad_libraries"
-	elif test "x$faad_prefix" != "x" ; then
-		FAAD_LIBS="-L$faad_prefix/lib"
-	fi
-
-	FAAD_LIBS="$FAAD_LIBS -lfaad"
-
-	if test "x$faad_includes" != "x" ; then
-		FAAD_CFLAGS="-I$faad_includes"
-	elif test "x$faad_prefix" != "x" ; then
-		FAAD_CFLAGS="-I$faad_prefix/include"
-	fi
+	FAAD_LIBS="-lfaad"
+	FAAD_CFLAGS=""

 	oldcflags=$CFLAGS
 	oldlibs=$LIBS
 	oldcppflags=$CPPFLAGS
-	CFLAGS="$CFLAGS $FAAD_CFLAGS -I."
+	CFLAGS="$CFLAGS $FAAD_CFLAGS"
 	LIBS="$LIBS $FAAD_LIBS"
 	CPPFLAGS=$CFLAGS
 	AC_CHECK_HEADER(faad.h,,enable_aac=no)
@@ -47,77 +23,36 @@ 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_DECL(faacDecInit2,,enable_aac=no,[#include <faad.h>])
+		AC_CHECK_LIB(faad,NeAACDecInit2,,enable_aac=no)
 	fi
 	if test x$enable_aac = xyes; then
-		AC_CHECK_LIB(faad,faacDecInit2,,enable_aac=no)
-		if test x$enable_aac = xno; then
-			enable_aac=yes
-			AC_CHECK_LIB(faad,NeAACDecInit2,,enable_aac=no)
-		fi
-	fi
-	if test x$enable_aac = xyes; then
-  		AC_MSG_CHECKING(that FAAD2 uses buffer and bufferlen)
-		AC_COMPILE_IFELSE([AC_LANG_SOURCE([
-#include <faad.h>
-
-int main() {
-	char buffer;
-	long bufferlen = 0;
-	faacDecHandle decoder;
-	faacDecFrameInfo frameInfo;
-	faacDecConfigurationPtr config;
-	unsigned char channels;
-	long sampleRate;
-        mp4AudioSpecificConfig mp4ASC;
-
-	decoder = faacDecOpen();
-	config = faacDecGetCurrentConfiguration(decoder);
-	config->outputFormat = FAAD_FMT_16BIT;
-	faacDecSetConfiguration(decoder,config);
-	AudioSpecificConfig(&buffer, bufferlen, &mp4ASC);
-	faacDecInit(decoder,&buffer,bufferlen,&sampleRate,&channels);
-	faacDecInit2(decoder,&buffer,bufferlen,&sampleRate,&channels);
-	faacDecDecode(decoder,&frameInfo,&buffer,bufferlen);
-
-	return 0;
-}
-])],[AC_MSG_RESULT(yes);AC_DEFINE(HAVE_FAAD_BUFLEN_FUNCS,1,[Define if FAAD2 uses buflen in function calls])],[AC_MSG_RESULT(no);
 		AC_MSG_CHECKING(that FAAD2 can even be used)
 		AC_COMPILE_IFELSE([AC_LANG_SOURCE([
 #include <faad.h>

 int main() {
 	char buffer;
-	faacDecHandle decoder;
-	faacDecFrameInfo frameInfo;
-	faacDecConfigurationPtr config;
+	NeAACDecHandle decoder;
+	NeAACDecFrameInfo frameInfo;
+	NeAACDecConfigurationPtr config;
 	unsigned char channels;
 	long sampleRate;
 	long bufferlen = 0;
-	unsigned long dummy1_32;
-        unsigned char dummy2_8, dummy3_8, dummy4_8, dummy5_8, dummy6_8,
-                                dummy7_8, dummy8_8;

-	decoder = faacDecOpen();
-	config = faacDecGetCurrentConfiguration(decoder);
+	decoder = NeAACDecOpen();
+	config = NeAACDecGetCurrentConfiguration(decoder);
 	config->outputFormat = FAAD_FMT_16BIT;
-	faacDecSetConfiguration(decoder,config);
-	AudioSpecificConfig(&buffer,&dummy1_32,&dummy2_8,
-                                &dummy3_8,&dummy4_8,&dummy5_8,
-                                &dummy6_8,&dummy7_8,&dummy8_8);
-	faacDecInit(decoder,&buffer,&sampleRate,&channels);
-	faacDecInit2(decoder,&buffer,bufferlen,&sampleRate,&channels);
-	faacDecDecode(decoder,&frameInfo,&buffer);
-	faacDecClose(decoder);
+	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_CHECK_MEMBERS([faacDecConfiguration.downMatrix,faacDecConfiguration.dontUpSampleImplicitSBR,faacDecFrameInfo.samplerate],,,[#include <faad.h>])
 		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])
@@ -127,69 +62,9 @@ int main() {
 	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;
-
-	faacDecInit2(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
-fi
-
-if test x$enable_aac = xyes; then
-	enable_mp4=yes
-	MP4FF_LIBS="-lmp4ff"
-
-	oldcflags=$CFLAGS
-	oldlibs=$LIBS
-	oldcppflags=$CPPFLAGS
-	CFLAGS="$CFLAGS $FAAD_CFLAGS"
-	LIBS="$LIBS $FAAD_LIBS $MP4FF_LIBS"
-	CPPFLAGS=$CFLAGS
-
-	AC_CHECK_HEADER(mp4ff.h,,enable_mp4=no)
-
-	if test x$enable_mp4 = xyes; then
-		AC_CHECK_LIB(mp4ff,mp4ff_open_read,,enable_mp4=no)
-	fi
-
-	if test x$enable_mp4 = xyes; then
-		AC_SUBST(MP4FF_LIBS)
-		AC_DEFINE(HAVE_MP4, 1, [Define to use FAAD2+mp4ff for MP4 decoding])
-	else
-		AC_MSG_WARN([libmp4ff needed for MP4 support -- disabling MP4 support])
-		unset MP4FF_LIBS
-	fi
-
-	CFLAGS=$oldcflags
-	LIBS=$oldlibs
-	CPPFLAGS=$oldcppflags
-else
-	enable_mp4=no
-	FAAD_CFLAGS=""
+if test x$enable_aac = xno; then
 	FAAD_LIBS=""
+	FAAD_CFLAGS=""
 fi

 AC_SUBST(FAAD_CFLAGS)
--- a/m4/mpd_auto.m4
+++ b/m4/mpd_auto.m4
@@ -73,8 +73,26 @@ AC_DEFUN([MPD_AUTO_PKG_LIB], [
 			[eval "found_$1=yes"],
 			AC_CHECK_LIB($4, $5,
 				[eval "found_$1=yes $2_LIBS='$6' $2_CFLAGS='$7'"],
-				[eval "found_$1=no"]))
+				[eval "found_$1=no"],
+				[$6]))
 	fi

 	MPD_AUTO_RESULT([$1], [$8], [$9])
 ])
+
+dnl Wrapper for AC_CHECK_LIB.
+dnl
+dnl Parameters: varname1, varname2, libname, symname, libs, cflags, description, errmsg
+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])
+])
--- 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
@@ -0,0 +1,25 @@
+dnl MPD_OPTIONAL_FUNC(name, func, macro)
+dnl
+dnl Allow the user to enable or disable the use of a function.  If the
+dnl option is not specified, the function is auto-detected.
+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])],
+		[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/pkg.m4
+++ b/m4/pkg.m4
@@ -1,4 +1,5 @@
 # pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
+# serial 1 (pkg-config-0.24)
 # 
 # Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
 #
@@ -25,8 +26,12 @@
 # ----------------------------------
 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,7 +44,6 @@ if test -n "$PKG_CONFIG"; then
 		AC_MSG_RESULT([no])
 		PKG_CONFIG=""
 	fi
-		
 fi[]dnl
 ])# PKG_PROG_PKG_CONFIG

@@ -48,34 +52,32 @@ fi[]dnl
 # 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
+# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+# only at the first occurence in configure.ac, so if the first place
+# it's called might be skipped (such as if it is within an "if", you
+# 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])
 # ---------------------------------------------
 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

@@ -117,16 +119,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 +137,78 @@ $$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
+
+
+# PKG_INSTALLDIR(DIRECTORY)
+# -------------------------
+# Substitutes the variable pkgconfigdir as the location where a module
+# should install pkg-config .pc files. By default the directory is
+# $libdir/pkgconfig, but the default can be changed by passing
+# DIRECTORY. The user can override through the --with-pkgconfigdir
+# 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
+
+
+# PKG_NOARCH_INSTALLDIR(DIRECTORY)
+# -------------------------
+# Substitutes the variable noarch_pkgconfigdir as the location where a
+# module should install arch-independent pkg-config .pc files. By
+# default the directory is $datadir/pkgconfig, but the default can be
+# changed by passing DIRECTORY. The user can override through the
+# --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
+
+
+# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
+# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+# -------------------------------------------
+# 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
+])# PKG_CHECK_VAR
--- 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.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/scripts/makedist.sh
+++ b/scripts/makedist.sh
@@ -1,25 +0,0 @@
-#!/bin/sh
-PWD=`pwd`
-
-## If we're not in the scripts directory
-## assume the base directory.
-if test "`basename $PWD`" = "scripts"; then
-	cd ../
-else
-	MYOLDPWD=`pwd`
-	cd `dirname $0`/../
-fi
-
-if test -e Makefile
-then
-	make distclean
-fi
-./autogen.sh
-make
-make dist
-
-if test "`basename $PWD`" = "scripts"; then
-	cd contrib/
-else
-	cd $MYOLDPWD
-fi
--- a/scripts/mpd-indent.sh
+++ b/scripts/mpd-indent.sh
@@ -1,6 +0,0 @@
-#!/bin/sh
-indent -npro -kr -i8 -ts8 -sob -l80 -ss -ncs -cdw -cd0 -c0 -cp0 "$@"
-
-# there doesn't seem to be an indent switch for this, but this
-# forces goto labels to the left-most column, without indentation
-perl -i -p -e 's/^\s+(\w+):/$1:/g unless /^\s+default:/' "$@"
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -1,93 +0,0 @@
-#!/bin/sh -e
-#
-# This shell script tests the build of MPD with various compile-time
-# options.
-#
-# Author: Max Kellermann <max@duempel.org>
-
-PREFIX=/tmp/mpd
-rm -rf $PREFIX
-
-test "x$MAKE" != x || MAKE=make
-
-export CFLAGS="-Os"
-
-test -x configure || NOCONFIGURE=1 ./autogen.sh
-
-# all features on
-./configure --prefix=$PREFIX/full \
-    --disable-dependency-tracking --enable-debug --enable-werror \
-    --enable-un \
-    --enable-modplug \
-    --enable-ao --enable-mikmod --enable-mvp
-$MAKE install
-$MAKE distclean
-
-# no UN, no oggvorbis, no flac, enable oggflac
-./configure --prefix=$PREFIX/small \
-    --disable-dependency-tracking --enable-debug --enable-werror \
-    --disable-un \
-    --disable-flac --disable-vorbis --enable-oggflac
-$MAKE install
-$MAKE distclean
-
-# strip down (disable TCP, disable nearly all plugins)
-CFLAGS="$CFLAGS -DNDEBUG" \
-./configure --prefix=$PREFIX/tiny \
-    --disable-dependency-tracking --disable-debug --enable-werror \
-    --disable-tcp \
-    --disable-curl \
-    --disable-id3 --disable-lsr \
-    --disable-ao --disable-alsa --disable-jack --disable-pulse --disable-fifo \
-    --disable-shout-ogg --disable-shout-mp3 --disable-lame-encoder \
-    --disable-ffmpeg --disable-wavpack --disable-mpc --disable-aac \
-    --disable-flac --disable-vorbis --disable-oggflac --disable-audiofile \
-    --disable-cue \
-    --with-zeroconf=no
-$MAKE install
-$MAKE distclean
-
-# shout: ogg without mp3
-# sndfile instead of modplug
-./configure --prefix=$PREFIX/shout_ogg \
-    --disable-dependency-tracking --disable-debug --enable-werror \
-    --disable-tcp \
-    --disable-curl \
-    --disable-id3 --disable-lsr \
-    --disable-ao --disable-alsa --disable-jack --disable-pulse --disable-fifo \
-    --enable-shout-ogg --disable-shout-mp3 --disable-lame-encoder \
-    --disable-ffmpeg --disable-wavpack --disable-mpc --disable-aac \
-    --disable-flac --enable-vorbis --disable-oggflac --disable-audiofile \
-    --disable-modplug --enable-sndfile \
-    --with-zeroconf=no
-$MAKE install
-$MAKE distclean
-
-# shout: mp3 without ogg
-./configure --prefix=$PREFIX/shout_mp3 \
-    --disable-dependency-tracking --disable-debug --enable-werror \
-    --disable-tcp \
-    --disable-curl \
-    --disable-id3 --disable-lsr \
-    --disable-ao --disable-alsa --disable-jack --disable-pulse --disable-fifo \
-    --disable-shout-ogg --enable-shout-mp3 --enable-lame-encoder \
-    --disable-ffmpeg --disable-wavpack --disable-mpc --disable-aac \
-    --disable-flac --disable-vorbis --disable-oggflac --disable-audiofile \
-    --with-zeroconf=no
-$MAKE install
-$MAKE distclean
-
-# oggvorbis + oggflac
-./configure --prefix=$PREFIX/oggvorbisflac \
-    --disable-dependency-tracking --disable-debug --enable-werror \
-    --disable-tcp \
-    --disable-curl \
-    --disable-id3 --disable-lsr \
-    --disable-mp3 \
-    --disable-ao --disable-alsa --disable-jack --disable-pulse --disable-fifo \
-    --disable-shout-ogg --disable-shout-mp3 --disable-lame-encoder \
-    --disable-ffmpeg --disable-wavpack --disable-mpc --disable-aac \
-    --disable-flac --enable-vorbis --enable-oggflac --disable-audiofile \
-    --with-zeroconf=no
-$MAKE install
-$MAKE distclean
--- a/src/AudioCompress/compress.c
+++ b/src/AudioCompress/compress.c
@@ -33,6 +33,9 @@ struct Compressor {
 struct Compressor *Compressor_new(unsigned int history)
 {
 	struct Compressor *obj = malloc(sizeof(struct Compressor));
+	if (obj == NULL)
+		/* out of memory, not much we can do */
+		abort();

 	obj->prefs.target = TARGET;
 	obj->prefs.maxgain = GAINMAX;
@@ -61,6 +64,10 @@ void Compressor_delete(struct Compressor *obj)
 static int *resizeArray(int *data, int newsz, int oldsz)
 {
        data = realloc(data, newsz*sizeof(int));
+	if (data == NULL)
+		/* out of memory, not much we can do */
+		abort();
+
        if (newsz > oldsz)
                memset(data + oldsz, 0, sizeof(int)*(newsz - oldsz));
        return data;
--- a/src/AudioCompress/compress.h
+++ b/src/AudioCompress/compress.h
@@ -19,6 +19,10 @@ struct CompressorConfig {

 struct Compressor;

+#ifdef __cplusplus
+extern "C" {
+#endif
+
 //! Create a new compressor (use history value of 0 for default)
 struct Compressor *Compressor_new(unsigned int history);

@@ -34,7 +38,12 @@ struct CompressorConfig *Compressor_getConfig(struct Compressor *);
 //! Process 16-bit signed data
 void Compressor_Process_int16(struct Compressor *, int16_t *data, unsigned int count);

+#ifdef __cplusplus
+}
+#endif
+
 //! TODO: Compressor_Process_int32, Compressor_Process_float, others as needed

 //! TODO: functions for getting at the peak/gain/clip history buffers (for monitoring)
+
 #endif
--- a/src/AudioConfig.cxx
+++ b/src/AudioConfig.cxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2011 The Music Player Daemon Project
+ * Copyright (C) 2003-2014 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -18,42 +18,35 @@
 */

 #include "config.h"
-#include "audio_config.h"
-#include "audio_format.h"
-#include "audio_parser.h"
-#include "output_internal.h"
-#include "output_plugin.h"
-#include "output_all.h"
-#include "conf.h"
-#include "mpd_error.h"
+#include "AudioConfig.hxx"
+#include "AudioFormat.hxx"
+#include "AudioParser.hxx"
+#include "config/ConfigData.hxx"
+#include "config/ConfigGlobal.hxx"
+#include "config/ConfigOption.hxx"
+#include "util/Error.hxx"
+#include "system/FatalError.hxx"

-#include <glib.h>
+static AudioFormat configured_audio_format;

-#include <assert.h>
-#include <stdlib.h>
-
-static struct audio_format configured_audio_format;
-
-void getOutputAudioFormat(const struct audio_format *inAudioFormat,
-			  struct audio_format *outAudioFormat)
+AudioFormat
+getOutputAudioFormat(AudioFormat inAudioFormat)
 {
-	*outAudioFormat = *inAudioFormat;
-	audio_format_mask_apply(outAudioFormat, &configured_audio_format);
+	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);
-	GError *error = NULL;
-	bool ret;

-	if (param == NULL)
+	if (param == nullptr)
 		return;

-	ret = audio_format_parse(&configured_audio_format, param->value,
-				 true, &error);
-	if (!ret)
-		MPD_ERROR("error parsing \"%s\" at line %i: %s",
-			  CONF_AUDIO_OUTPUT_FORMAT, param->line,
-			  error->message);
+	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/AudioConfig.hxx
+++ b/src/AudioConfig.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2011 The Music Player Daemon Project
+ * Copyright (C) 2003-2014 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -17,15 +17,13 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#ifndef MPD_AUDIO_CONFIG_H
-#define MPD_AUDIO_CONFIG_H
+#ifndef MPD_AUDIO_CONFIG_HXX
+#define MPD_AUDIO_CONFIG_HXX

-#include <stdbool.h>
+struct AudioFormat;

-struct audio_format;
-
-void getOutputAudioFormat(const struct audio_format *inFormat,
-			  struct audio_format *outFormat);
+AudioFormat
+getOutputAudioFormat(AudioFormat inFormat);

 /* make sure initPlayerData is called before this function!! */
 void initAudioConfig(void);
--- a/src/AudioFormat.cxx
+++ b/src/AudioFormat.cxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2011 The Music Player Daemon Project
+ * Copyright (C) 2003-2014 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -17,71 +17,69 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#include "audio_format.h"
+#include "AudioFormat.hxx"

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

 void
-audio_format_mask_apply(struct audio_format *af,
-			const struct audio_format *mask)
+AudioFormat::ApplyMask(AudioFormat mask)
 {
-	assert(audio_format_valid(af));
-	assert(audio_format_mask_valid(mask));
+	assert(IsValid());
+	assert(mask.IsMaskValid());

-	if (mask->sample_rate != 0)
-		af->sample_rate = mask->sample_rate;
+	if (mask.sample_rate != 0)
+		sample_rate = mask.sample_rate;

-	if (mask->format != SAMPLE_FORMAT_UNDEFINED)
-		af->format = mask->format;
+	if (mask.format != SampleFormat::UNDEFINED)
+		format = mask.format;

-	if (mask->channels != 0)
-		af->channels = mask->channels;
+	if (mask.channels != 0)
+		channels = mask.channels;

-	assert(audio_format_valid(af));
+	assert(IsValid());
 }

 const char *
-sample_format_to_string(enum sample_format format)
+sample_format_to_string(SampleFormat format)
 {
 	switch (format) {
-	case SAMPLE_FORMAT_UNDEFINED:
+	case SampleFormat::UNDEFINED:
 		return "?";

-	case SAMPLE_FORMAT_S8:
+	case SampleFormat::S8:
 		return "8";

-	case SAMPLE_FORMAT_S16:
+	case SampleFormat::S16:
 		return "16";

-	case SAMPLE_FORMAT_S24_P32:
+	case SampleFormat::S24_P32:
 		return "24";

-	case SAMPLE_FORMAT_S32:
+	case SampleFormat::S32:
 		return "32";

-	case SAMPLE_FORMAT_FLOAT:
+	case SampleFormat::FLOAT:
 		return "f";

-	case SAMPLE_FORMAT_DSD:
+	case SampleFormat::DSD:
 		return "dsd";
 	}

 	/* unreachable */
 	assert(false);
-	return "?";
+	gcc_unreachable();
 }

 const char *
-audio_format_to_string(const struct audio_format *af,
+audio_format_to_string(const AudioFormat af,
 		       struct audio_format_string *s)
 {
-	assert(af != NULL);
-	assert(s != NULL);
+	assert(s != nullptr);

 	snprintf(s->buffer, sizeof(s->buffer), "%u:%s:%u",
-		 af->sample_rate, sample_format_to_string(af->format),
-		 af->channels);
+		 af.sample_rate, sample_format_to_string(af.format),
+		 af.channels);

 	return s->buffer;
 }
--- a/src/AudioFormat.hxx
+++ b/src/AudioFormat.hxx
@@ -0,0 +1,315 @@
+/*
+ * Copyright (C) 2003-2014 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_AUDIO_FORMAT_HXX
+#define MPD_AUDIO_FORMAT_HXX
+
+#include "Compiler.h"
+
+#include <stdint.h>
+#include <assert.h>
+
+#if defined(WIN32) && GCC_CHECK_VERSION(4,6)
+/* on WIN32, "FLOAT" is already defined, and this triggers -Wshadow */
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wshadow"
+#endif
+
+enum class SampleFormat : uint8_t {
+	UNDEFINED = 0,
+
+	S8,
+	S16,
+
+	/**
+	 * Signed 24 bit integer samples, packed in 32 bit integers
+	 * (the most significant byte is filled with the sign bit).
+	 */
+	S24_P32,
+
+	S32,
+
+	/**
+	 * 32 bit floating point samples in the host's format.  The
+	 * range is -1.0f to +1.0f.
+	 */
+	FLOAT,
+
+	/**
+	 * Direct Stream Digital.  1-bit samples; each frame has one
+	 * byte (8 samples) per channel.
+	 */
+	DSD,
+};
+
+#if defined(WIN32) && GCC_CHECK_VERSION(4,6)
+#pragma GCC diagnostic pop
+#endif
+
+static constexpr unsigned MAX_CHANNELS = 8;
+
+/**
+ * This structure describes the format of a raw PCM stream.
+ */
+struct AudioFormat {
+	/**
+	 * The sample rate in Hz.  A better name for this attribute is
+	 * "frame rate", because technically, you have two samples per
+	 * frame in stereo sound.
+	 */
+	uint32_t sample_rate;
+
+	/**
+	 * The format samples are stored in.  See the #sample_format
+	 * enum for valid values.
+	 */
+	SampleFormat format;
+
+	/**
+	 * The number of channels.  Only mono (1) and stereo (2) are
+	 * fully supported currently.
+	 */
+	uint8_t channels;
+
+	AudioFormat() = default;
+
+	constexpr AudioFormat(uint32_t _sample_rate,
+			      SampleFormat _format, uint8_t _channels)
+		:sample_rate(_sample_rate),
+		 format(_format), channels(_channels) {}
+
+	static constexpr AudioFormat Undefined() {
+		return AudioFormat(0, SampleFormat::UNDEFINED,0);
+	}
+
+	/**
+	 * Clears the #audio_format object, i.e. sets all attributes to an
+	 * undefined (invalid) value.
+	 */
+	void Clear() {
+		sample_rate = 0;
+		format = SampleFormat::UNDEFINED;
+		channels = 0;
+	}
+
+	/**
+	 * Checks whether the object has a defined value.
+	 */
+	constexpr bool IsDefined() const {
+		return sample_rate != 0;
+	}
+
+	/**
+	 * Checks whether the object is full, i.e. all attributes are
+	 * defined.  This is more complete than IsDefined(), but
+	 * slower.
+	 */
+	constexpr bool IsFullyDefined() const {
+		return sample_rate != 0 && format != SampleFormat::UNDEFINED &&
+			channels != 0;
+	}
+
+	/**
+	 * Checks whether the object has at least one defined value.
+	 */
+	constexpr bool IsMaskDefined() const {
+		return sample_rate != 0 || format != SampleFormat::UNDEFINED ||
+			channels != 0;
+	}
+
+	bool IsValid() const;
+	bool IsMaskValid() const;
+
+	constexpr bool operator==(const AudioFormat other) const {
+		return sample_rate == other.sample_rate &&
+			format == other.format &&
+			channels == other.channels;
+	}
+
+	constexpr bool operator!=(const AudioFormat other) const {
+		return !(*this == other);
+	}
+
+	void ApplyMask(AudioFormat mask);
+
+	/**
+	 * Returns the size of each (mono) sample in bytes.
+	 */
+	unsigned GetSampleSize() const;
+
+	/**
+	 * Returns the size of each full frame in bytes.
+	 */
+	unsigned GetFrameSize() const;
+
+	/**
+	 * Returns the floating point factor which converts a time
+	 * span to a storage size in bytes.
+	 */
+	double GetTimeToSize() const;
+};
+
+/**
+ * Buffer for audio_format_string().
+ */
+struct audio_format_string {
+	char buffer[24];
+};
+
+/**
+ * Checks whether the sample rate is valid.
+ *
+ * @param sample_rate the sample rate in Hz
+ */
+static constexpr inline bool
+audio_valid_sample_rate(unsigned sample_rate)
+{
+	return sample_rate > 0 && sample_rate < (1 << 30);
+}
+
+/**
+ * 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)
+{
+	switch (format) {
+	case SampleFormat::S8:
+	case SampleFormat::S16:
+	case SampleFormat::S24_P32:
+	case SampleFormat::S32:
+	case SampleFormat::FLOAT:
+	case SampleFormat::DSD:
+		return true;
+
+	case SampleFormat::UNDEFINED:
+		break;
+	}
+
+	return false;
+}
+
+/**
+ * Checks whether the number of channels is valid.
+ */
+static constexpr inline bool
+audio_valid_channel_count(unsigned channels)
+{
+	return channels >= 1 && channels <= MAX_CHANNELS;
+}
+
+/**
+ * Returns false if the format is not valid for playback with MPD.
+ * This function performs some basic validity checks.
+ */
+inline bool
+AudioFormat::IsValid() const
+{
+	return audio_valid_sample_rate(sample_rate) &&
+		audio_valid_sample_format(format) &&
+		audio_valid_channel_count(channels);
+}
+
+/**
+ * Returns false if the format mask is not valid for playback with
+ * MPD.  This function performs some basic validity checks.
+ */
+inline bool
+AudioFormat::IsMaskValid() const
+{
+	return (sample_rate == 0 ||
+		audio_valid_sample_rate(sample_rate)) &&
+		(format == SampleFormat::UNDEFINED ||
+		 audio_valid_sample_format(format)) &&
+		(channels == 0 || audio_valid_channel_count(channels));
+}
+
+gcc_const
+static inline unsigned
+sample_format_size(SampleFormat format)
+{
+	switch (format) {
+	case SampleFormat::S8:
+		return 1;
+
+	case SampleFormat::S16:
+		return 2;
+
+	case SampleFormat::S24_P32:
+	case SampleFormat::S32:
+	case SampleFormat::FLOAT:
+		return 4;
+
+	case SampleFormat::DSD:
+		/* each frame has 8 samples per channel */
+		return 1;
+
+	case SampleFormat::UNDEFINED:
+		return 0;
+	}
+
+	assert(false);
+	gcc_unreachable();
+}
+
+inline unsigned
+AudioFormat::GetSampleSize() const
+{
+	return sample_format_size(format);
+}
+
+inline unsigned
+AudioFormat::GetFrameSize() const
+{
+	return GetSampleSize() * channels;
+}
+
+inline double
+AudioFormat::GetTimeToSize() const
+{
+	return sample_rate * GetFrameSize();
+}
+
+/**
+ * Renders a #sample_format enum into a string, e.g. for printing it
+ * in a log file.
+ *
+ * @param format a #sample_format enum value
+ * @return the string
+ */
+gcc_pure gcc_malloc
+const char *
+sample_format_to_string(SampleFormat format);
+
+/**
+ * Renders the #audio_format object into a string, e.g. for printing
+ * it in a log file.
+ *
+ * @param af the #audio_format object
+ * @param s a buffer to print into
+ * @return the string, or nullptr if the #audio_format object is invalid
+ */
+gcc_pure gcc_malloc
+const char *
+audio_format_to_string(AudioFormat af,
+		       struct audio_format_string *s);
+
+#endif
--- a/src/AudioParser.cxx
+++ b/src/AudioParser.cxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2011 The Music Player Daemon Project
+ * Copyright (C) 2003-2014 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -23,27 +23,19 @@
 */

 #include "config.h"
-#include "audio_parser.h"
-#include "audio_format.h"
-#include "audio_check.h"
-#include "gcc.h"
+#include "AudioParser.hxx"
+#include "AudioFormat.hxx"
+#include "CheckAudioFormat.hxx"
+#include "util/Error.hxx"
+#include "Compiler.h"

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

-/**
- * The GLib quark used for errors reported by this library.
- */
-static inline GQuark
-audio_parser_quark(void)
-{
-	return g_quark_from_static_string("audio_parser");
-}
-
 static bool
 parse_sample_rate(const char *src, bool mask, uint32_t *sample_rate_r,
-		  const char **endptr_r, GError **error_r)
+		  const char **endptr_r, Error &error)
 {
 	unsigned long value;
 	char *endptr;
@@ -56,10 +48,10 @@ parse_sample_rate(const char *src, bool mask, uint32_t *sample_rate_r,

 	value = strtoul(src, &endptr, 10);
 	if (endptr == src) {
-		g_set_error(error_r, audio_parser_quark(), 0,
-			    "Failed to parse the sample rate");
+		error.Set(audio_format_domain,
+			  "Failed to parse the sample rate");
 		return false;
-	} else if (!audio_check_sample_rate(value, error_r))
+	} else if (!audio_check_sample_rate(value, error))
 		return false;

 	*sample_rate_r = value;
@@ -69,45 +61,45 @@ parse_sample_rate(const char *src, bool mask, uint32_t *sample_rate_r,

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

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

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

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

 	value = strtoul(src, &endptr, 10);
 	if (endptr == src) {
-		g_set_error(error_r, audio_parser_quark(), 0,
-			    "Failed to parse the sample format");
+		error.Set(audio_format_domain,
+			  "Failed to parse the sample format");
 		return false;
 	}

 	switch (value) {
 	case 8:
-		sample_format = SAMPLE_FORMAT_S8;
+		sample_format = SampleFormat::S8;
 		break;

 	case 16:
-		sample_format = SAMPLE_FORMAT_S16;
+		sample_format = SampleFormat::S16;
 		break;

 	case 24:
@@ -115,16 +107,16 @@ parse_sample_format(const char *src, bool mask,
 			/* for backwards compatibility */
 			endptr += 2;

-		sample_format = SAMPLE_FORMAT_S24_P32;
+		sample_format = SampleFormat::S24_P32;
 		break;

 	case 32:
-		sample_format = SAMPLE_FORMAT_S32;
+		sample_format = SampleFormat::S32;
 		break;

 	default:
-		g_set_error(error_r, audio_parser_quark(), 0,
-			    "Invalid sample format: %lu", value);
+		error.Format(audio_format_domain,
+			     "Invalid sample format: %lu", value);
 		return false;
 	}

@@ -137,7 +129,7 @@ parse_sample_format(const char *src, bool mask,

 static bool
 parse_channel_count(const char *src, bool mask, uint8_t *channels_r,
-		    const char **endptr_r, GError **error_r)
+		    const char **endptr_r, Error &error)
 {
 	unsigned long value;
 	char *endptr;
@@ -150,10 +142,10 @@ parse_channel_count(const char *src, bool mask, uint8_t *channels_r,

 	value = strtoul(src, &endptr, 10);
 	if (endptr == src) {
-		g_set_error(error_r, audio_parser_quark(), 0,
-			    "Failed to parse the channel count");
+		error.Set(audio_format_domain,
+			  "Failed to parse the channel count");
 		return false;
-	} else if (!audio_check_channel_count(value, error_r))
+	} else if (!audio_check_channel_count(value, error))
 		return false;

 	*channels_r = value;
@@ -162,14 +154,14 @@ parse_channel_count(const char *src, bool mask, uint8_t *channels_r,
 }

 bool
-audio_format_parse(struct audio_format *dest, const char *src,
-		   bool mask, GError **error_r)
+audio_format_parse(AudioFormat &dest, const char *src,
+		   bool mask, Error &error)
 {
 	uint32_t rate;
-	enum sample_format sample_format;
+	SampleFormat sample_format;
 	uint8_t channels;

-	audio_format_clear(dest);
+	dest.Clear();

 	/* parse sample rate */

@@ -178,12 +170,11 @@ audio_format_parse(struct audio_format *dest, const char *src,
 	rate = 0;
 #endif

-	if (!parse_sample_rate(src, mask, &rate, &src, error_r))
+	if (!parse_sample_rate(src, mask, &rate, &src, error))
 		return false;

 	if (*src++ != ':') {
-		g_set_error(error_r, audio_parser_quark(), 0,
-			    "Sample format missing");
+		error.Set(audio_format_domain, "Sample format missing");
 		return false;
 	}

@@ -191,32 +182,32 @@ audio_format_parse(struct audio_format *dest, const char *src,

 #if GCC_CHECK_VERSION(4,7)
 	/* workaround -Wmaybe-uninitialized false positive */
-	sample_format = SAMPLE_FORMAT_UNDEFINED;
+	sample_format = SampleFormat::UNDEFINED;
 #endif

-	if (!parse_sample_format(src, mask, &sample_format, &src, error_r))
+	if (!parse_sample_format(src, mask, &sample_format, &src, error))
 		return false;

 	if (*src++ != ':') {
-		g_set_error(error_r, audio_parser_quark(), 0,
-			    "Channel count missing");
+		error.Set(audio_format_domain, "Channel count missing");
 		return false;
 	}

 	/* parse channel count */

-	if (!parse_channel_count(src, mask, &channels, &src, error_r))
+	if (!parse_channel_count(src, mask, &channels, &src, error))
 		return false;

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

-	audio_format_init(dest, rate, sample_format, channels);
-	assert(mask ? audio_format_mask_valid(dest)
-	       : audio_format_valid(dest));
+	dest = AudioFormat(rate, sample_format, channels);
+	assert(mask
+	       ? dest.IsMaskValid()
+	       : dest.IsValid());

 	return true;
 }
--- a/src/AudioParser.hxx
+++ b/src/AudioParser.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2011 The Music Player Daemon Project
+ * Copyright (C) 2003-2014 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -22,14 +22,11 @@
 * Parser functions for audio related objects.
 */

-#ifndef AUDIO_PARSER_H
-#define AUDIO_PARSER_H
+#ifndef MPD_AUDIO_PARSER_HXX
+#define MPD_AUDIO_PARSER_HXX

-#include <glib.h>
-
-#include <stdbool.h>
-
-struct audio_format;
+struct AudioFormat;
+class Error;

 /**
 * Parses a string in the form "SAMPLE_RATE:BITS:CHANNELS" into an
@@ -43,7 +40,7 @@ struct audio_format;
 * @return true on success
 */
 bool
-audio_format_parse(struct audio_format *dest, const char *src,
-		   bool mask, GError **error_r);
+audio_format_parse(AudioFormat &dest, const char *src,
+		   bool mask, Error &error);

 #endif
--- a/src/BulkEdit.hxx
+++ b/src/BulkEdit.hxx
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2003-2014 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-2011 The Music Player Daemon Project
+ * Copyright (C) 2003-2014 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -17,17 +17,22 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#include "audio_check.h"
-#include "audio_format.h"
+#include "config.h"
+#include "CheckAudioFormat.hxx"
+#include "AudioFormat.hxx"
+#include "util/Error.hxx"
+#include "util/Domain.hxx"

 #include <assert.h>

+const Domain audio_format_domain("audio_format");
+
 bool
-audio_check_sample_rate(unsigned long sample_rate, GError **error_r)
+audio_check_sample_rate(unsigned long sample_rate, Error &error)
 {
 	if (!audio_valid_sample_rate(sample_rate)) {
-		g_set_error(error_r, audio_format_quark(), 0,
-			    "Invalid sample rate: %lu", sample_rate);
+		error.Format(audio_format_domain,
+			     "Invalid sample rate: %lu", sample_rate);
 		return false;
 	}

@@ -35,11 +40,12 @@ audio_check_sample_rate(unsigned long sample_rate, GError **error_r)
 }

 bool
-audio_check_sample_format(enum sample_format sample_format, GError **error_r)
+audio_check_sample_format(SampleFormat sample_format, Error &error)
 {
 	if (!audio_valid_sample_format(sample_format)) {
-		g_set_error(error_r, audio_format_quark(), 0,
-			    "Invalid sample format: %u", sample_format);
+		error.Format(audio_format_domain,
+			     "Invalid sample format: %u",
+			     unsigned(sample_format));
 		return false;
 	}

@@ -47,11 +53,11 @@ audio_check_sample_format(enum sample_format sample_format, GError **error_r)
 }

 bool
-audio_check_channel_count(unsigned channels, GError **error_r)
+audio_check_channel_count(unsigned channels, Error &error)
 {
 	if (!audio_valid_channel_count(channels)) {
-		g_set_error(error_r, audio_format_quark(), 0,
-			    "Invalid channel count: %u", channels);
+		error.Format(audio_format_domain,
+			     "Invalid channel count: %u", channels);
 		return false;
 	}

@@ -59,15 +65,15 @@ audio_check_channel_count(unsigned channels, GError **error_r)
 }

 bool
-audio_format_init_checked(struct audio_format *af, unsigned long sample_rate,
-			  enum sample_format sample_format, unsigned channels,
-			  GError **error_r)
+audio_format_init_checked(AudioFormat &af, unsigned long sample_rate,
+			  SampleFormat sample_format, unsigned channels,
+			  Error &error)
 {
-	if (audio_check_sample_rate(sample_rate, error_r) &&
-	    audio_check_sample_format(sample_format, error_r) &&
-	    audio_check_channel_count(channels, error_r)) {
-		audio_format_init(af, sample_rate, sample_format, channels);
-		assert(audio_format_valid(af));
+	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;
--- a/src/CheckAudioFormat.hxx
+++ b/src/CheckAudioFormat.hxx
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2003-2014 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_CHECK_AUDIO_FORMAT_HXX
+#define MPD_CHECK_AUDIO_FORMAT_HXX
+
+#include "AudioFormat.hxx"
+
+class Error;
+
+extern const class Domain audio_format_domain;
+
+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);
+
+/**
+ * Wrapper for audio_format_init(), which checks all attributes.
+ */
+bool
+audio_format_init_checked(AudioFormat &af, unsigned long sample_rate,
+			  SampleFormat sample_format, unsigned channels,
+			  Error &error);
+
+#endif
--- a/src/Chrono.hxx
+++ b/src/Chrono.hxx
@@ -0,0 +1,226 @@
+/*
+ * Copyright (C) 2003-2014 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 "Compiler.h"
+
+#include <chrono>
+#include <utility>
+#include <cstdint>
+
+#if defined(__GNUC__) && !GCC_CHECK_VERSION(4,7) && !defined(__clang__)
+/* std::chrono::duration operators are "constexpr" since gcc 4.7 */
+#define chrono_constexpr gcc_pure
+#else
+#define chrono_constexpr constexpr
+#endif
+
+/**
+ * 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;
+	}
+
+	chrono_constexpr SongTime operator+(const SongTime &other) const {
+		return SongTime(*(const Base *)this + (const Base &)other);
+	}
+
+	chrono_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;
+	}
+
+	chrono_constexpr SignedSongTime operator+(const SignedSongTime &other) const {
+		return SignedSongTime(*(const Base *)this + (const Base &)other);
+	}
+
+	chrono_constexpr SignedSongTime operator-(const SignedSongTime &other) const {
+		return SignedSongTime(*(const Base *)this - (const Base &)other);
+	}
+};
+
+#undef chrono_constexpr
+
+#endif
--- a/src/CommandLine.cxx
+++ b/src/CommandLine.cxx
@@ -0,0 +1,354 @@
+/*
+ * Copyright (C) 2003-2014 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 "CommandLine.hxx"
+#include "ls.hxx"
+#include "LogInit.hxx"
+#include "Log.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 "fs/StandardDirectory.hxx"
+#include "util/Error.hxx"
+#include "util/Domain.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 "encoder/EncoderList.hxx"
+#include "encoder/EncoderPlugin.hxx"
+#endif
+
+#ifdef ENABLE_ARCHIVE
+#include "archive/ArchiveList.hxx"
+#include "archive/ArchivePlugin.hxx"
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#ifdef WIN32
+#define CONFIG_FILE_LOCATION		"mpd\\mpd.conf"
+#define APP_CONFIG_FILE_LOCATION	"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"
+#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
+#ifdef GIT_COMMIT
+	     " (" GIT_COMMIT ")"
+#endif
+	     "\n"
+	     "\n"
+	     "Copyright (C) 2003-2007 Warren Dukes <warren.dukes@gmail.com>\n"
+	     "Copyright (C) 2008-2014 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
+	puts("\n"
+	     "Database plugins:");
+
+	for (auto i = database_plugins; *i != nullptr; ++i)
+		printf(" %s", (*i)->name);
+
+	puts("\n\n"
+	     "Storage plugins:");
+
+	for (auto i = storage_plugins; *i != nullptr; ++i)
+		printf(" %s", (*i)->name);
+#endif
+
+#ifdef ENABLE_NEIGHBOR_PLUGINS
+	puts("\n\n"
+	     "Neighbor plugins:");
+	for (auto i = neighbor_plugins; *i != nullptr; ++i)
+		printf(" %s", (*i)->name);
+#endif
+
+	puts("\n\n"
+	     "Decoders plugins:");
+
+	decoder_plugins_for_each([](const DecoderPlugin &plugin){
+			printf(" [%s]", plugin.name);
+
+			const char *const*suffixes = plugin.suffixes;
+			if (suffixes != nullptr)
+				for (; *suffixes != nullptr; ++suffixes)
+					printf(" %s", *suffixes);
+
+			puts("");
+		});
+
+	puts("\n"
+	     "Output plugins:");
+	audio_output_plugins_for_each(plugin)
+		printf(" %s", plugin->name);
+	puts("");
+
+#ifdef ENABLE_ENCODER
+	puts("\n"
+	     "Encoder plugins:");
+	encoder_plugins_for_each(plugin)
+		printf(" %s", plugin->name);
+	puts("");
+#endif
+
+#ifdef ENABLE_ARCHIVE
+	puts("\n"
+	     "Archive plugins:");
+	archive_plugins_for_each(plugin) {
+		printf(" [%s]", plugin->name);
+
+		const char *const*suffixes = plugin->suffixes;
+		if (suffixes != nullptr)
+			for (; *suffixes != nullptr; ++suffixes)
+				printf(" %s", *suffixes);
+
+		puts("");
+	}
+#endif
+
+	puts("\n"
+	     "Input plugins:");
+	input_plugins_for_each(plugin)
+		printf(" %s", plugin->name);
+
+	puts("\n\n"
+	     "Playlist plugins:");
+	playlist_plugins_for_each(plugin)
+		printf(" %s", plugin->name);
+
+	puts("\n\n"
+	     "Protocols:");
+	print_supported_uri_schemes_to_fp(stdout);
+
+	exit(EXIT_SUCCESS);
+}
+
+static void PrintOption(const OptionDef &opt)
+{
+	if (opt.HasShortOption())
+		printf("  -%c, --%-12s%s\n",
+		       opt.GetShortOption(),
+		       opt.GetLongOption(),
+		       opt.GetDescription());
+	else
+		printf("  --%-16s%s\n",
+		       opt.GetLongOption(),
+		       opt.GetDescription());
+}
+
+gcc_noreturn
+static void help(void)
+{
+	puts("Usage:\n"
+	     "  mpd [OPTION...] [path/to/mpd.conf]\n"
+	     "\n"
+	     "Music Player Daemon - a daemon for playing music.\n"
+	     "\n"
+	     "Options:");
+
+	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
+{
+	Error &error;
+	bool result;
+public:
+	ConfigLoader(Error &_error) : error(_error), result(false) { }
+
+	bool GetResult() const { return result; }
+
+	bool TryFile(const Path path);
+	bool TryFile(const AllocatedPath &base_path,
+		     PathTraitsFS::const_pointer path);
+};
+
+bool ConfigLoader::TryFile(Path path)
+{
+	if (FileExists(path)) {
+		result = ReadConfigFile(path, error);
+		return true;
+	}
+	return false;
+}
+
+bool ConfigLoader::TryFile(const AllocatedPath &base_path,
+			   PathTraitsFS::const_pointer path)
+{
+	if (base_path.IsNull())
+		return false;
+	auto full_path = AllocatedPath::Build(base_path, path);
+	return TryFile(full_path);
+}
+
+bool
+parse_cmdline(int argc, char **argv, struct options *options,
+	      Error &error)
+{
+	bool use_config_file = true;
+	options->kill = false;
+	options->daemon = true;
+	options->log_stderr = false;
+	options->verbose = false;
+
+	// 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();
+
+		error.Format(cmdline_domain, "invalid option: %s",
+			     parser.GetOption());
+		return false;
+	}
+
+	/* initialize the logging library, so the configuration file
+	   parser can use it already */
+	log_early_init(options->verbose);
+
+	if (!use_config_file) {
+		LogDebug(cmdline_domain,
+			 "Ignoring config, using daemon defaults");
+		return true;
+	}
+
+	// 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;
+		}
+		error.Set(cmdline_domain, "too many arguments");
+		return false;
+	}
+
+	if (config_file != nullptr) {
+		/* use specified configuration file */
+		return ReadConfigFile(Path::FromFS(config_file), error);
+	}
+
+	/* use default configuration file path */
+
+	ConfigLoader loader(error);
+
+	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) {
+		error.Set(cmdline_domain, "No configuration file found");
+		return false;
+	}
+
+	return loader.GetResult();
+}
--- a/src/CommandLine.hxx
+++ b/src/CommandLine.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2011 The Music Player Daemon Project
+ * Copyright (C) 2003-2014 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -17,22 +17,20 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#ifndef CMDLINE_H
-#define CMDLINE_H
+#ifndef MPD_COMMAND_LINE_HXX
+#define MPD_COMMAND_LINE_HXX

-#include <glib.h>
-
-#include <stdbool.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,
-	      GError **error_r);
+	      Error &error);

 #endif
--- a/src/Compiler.h
+++ b/src/Compiler.h
@@ -0,0 +1,186 @@
+/*
+ * Copyright (C) 2003-2014 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 COMPILER_H
+#define COMPILER_H
+
+#define GCC_MAKE_VERSION(major, minor, patchlevel) ((major) * 10000 + (minor) * 100 + patchlevel)
+
+#ifdef __GNUC__
+#define GCC_VERSION GCC_MAKE_VERSION(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__)
+#else
+#define GCC_VERSION 0
+#endif
+
+#define GCC_CHECK_VERSION(major, minor) \
+	(defined(__GNUC__) && GCC_VERSION >= GCC_MAKE_VERSION(major, minor, 0))
+
+/**
+ * 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) \
+	(defined(__GNUC__) && !defined(__clang__) && \
+	 GCC_VERSION < GCC_MAKE_VERSION(major, minor, 0))
+
+#ifdef __clang__
+#  define CLANG_VERSION GCC_MAKE_VERSION(__clang_major__, __clang_minor__, __clang_patchlevel__)
+#  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_OLDER_THAN(4,7)
+#    error Sorry, your gcc version is too old.  You need at least version 4.6.
+#  endif
+#else
+#  warning Untested compiler.  Use at your own risk!
+#endif
+
+/**
+ * Are we building with the specified version of clang or newer?
+ */
+#define CLANG_CHECK_VERSION(major, minor) \
+	(defined(__clang__) && \
+	 CLANG_VERSION >= GCC_MAKE_VERSION(major, minor, 0))
+
+#if GCC_CHECK_VERSION(4,0)
+
+/* GCC 4.x */
+
+#define gcc_const __attribute__((const))
+#define gcc_deprecated __attribute__((deprecated))
+#define gcc_may_alias __attribute__((may_alias))
+#define gcc_malloc __attribute__((malloc))
+#define gcc_noreturn __attribute__((noreturn))
+#define gcc_packed __attribute__((packed))
+#define gcc_printf(a,b) __attribute__((format(printf, a, b)))
+#define gcc_pure __attribute__((pure))
+#define gcc_sentinel __attribute__((sentinel))
+#define gcc_unused __attribute__((unused))
+#define gcc_warn_unused_result __attribute__((warn_unused_result))
+
+#define gcc_nonnull(...) __attribute__((nonnull(__VA_ARGS__)))
+#define gcc_nonnull_all __attribute__((nonnull))
+
+#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")))
+
+#define gcc_always_inline __attribute__((always_inline))
+
+#else
+
+/* generic C compiler */
+
+#define gcc_const
+#define gcc_deprecated
+#define gcc_may_alias
+#define gcc_malloc
+#define gcc_noreturn
+#define gcc_packed
+#define gcc_printf(a,b)
+#define gcc_pure
+#define gcc_sentinel
+#define gcc_unused
+#define gcc_warn_unused_result
+
+#define gcc_nonnull(...)
+#define gcc_nonnull_all
+
+#define gcc_likely(x) (x)
+#define gcc_unlikely(x) (x)
+
+#define gcc_aligned(n)
+
+#define gcc_visibility_hidden
+#define gcc_visibility_default
+
+#define gcc_always_inline inline
+
+#endif
+
+#if GCC_CHECK_VERSION(4,3)
+
+#define gcc_hot __attribute__((hot))
+#define gcc_cold __attribute__((cold))
+
+#else /* ! GCC_UNUSED >= 40300 */
+
+#define gcc_hot
+#define gcc_cold
+
+#endif /* ! GCC_UNUSED >= 40300 */
+
+#if GCC_CHECK_VERSION(4,6) && !defined(__clang__)
+#define gcc_flatten __attribute__((flatten))
+#else
+#define gcc_flatten
+#endif
+
+#ifndef __cplusplus
+/* plain C99 has "restrict" */
+#define gcc_restrict restrict
+#elif GCC_CHECK_VERSION(4,0)
+/* "__restrict__" is a GCC extension for C++ */
+#define gcc_restrict __restrict__
+#else
+/* disable it on other compilers */
+#define gcc_restrict
+#endif
+
+/* C++11 features */
+
+#if defined(__cplusplus)
+
+/* support for C++11 "override" was added in gcc 4.7 */
+#if GCC_OLDER_THAN(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
+#endif
+
+#if __has_feature(attribute_unused_on_fields)
+#define gcc_unused_field gcc_unused
+#else
+#define gcc_unused_field
+#endif
+
+#if defined(__GNUC__) || defined(__clang__)
+#define gcc_unreachable() __builtin_unreachable()
+#else
+#define gcc_unreachable()
+#endif
+
+#endif
--- a/src/CrossFade.cxx
+++ b/src/CrossFade.cxx
@@ -0,0 +1,140 @@
+/*
+ * Copyright (C) 2003-2014 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 "CrossFade.hxx"
+#include "Chrono.hxx"
+#include "MusicChunk.hxx"
+#include "AudioFormat.hxx"
+#include "util/NumberParser.hxx"
+#include "util/Domain.hxx"
+#include "Log.hxx"
+
+#include <assert.h>
+
+static constexpr Domain cross_fade_domain("cross_fade");
+
+gcc_pure
+static float
+mixramp_interpolate(const char *ramp_list, float required_db)
+{
+	float last_db = 0, last_secs = 0;
+	bool have_last = false;
+
+	/* ramp_list is a string of pairs of dBs and seconds that describe the
+	 * volume profile. Delimiters are semi-colons between pairs and spaces
+	 * between the dB and seconds of a pair.
+	 * The dB values must be monotonically increasing for this to work. */
+
+	while (1) {
+		/* Parse the dB value. */
+		char *endptr;
+		const float db = ParseFloat(ramp_list, &endptr);
+		if (endptr == ramp_list || *endptr != ' ')
+			break;
+
+		ramp_list = endptr + 1;
+
+		/* Parse the time. */
+		float secs = ParseFloat(ramp_list, &endptr);
+		if (endptr == ramp_list || (*endptr != ';' && *endptr != 0))
+			break;
+
+		ramp_list = endptr;
+		if (*ramp_list == ';')
+			++ramp_list;
+
+		/* Check for exact match. */
+		if (db == required_db) {
+			return secs;
+		}
+
+		/* Save if too quiet. */
+		if (db < required_db) {
+			last_db = db;
+			last_secs = secs;
+			have_last = true;
+			continue;
+		}
+
+		/* If required db < any stored value, use the least. */
+		if (!have_last)
+			return secs;
+
+		/* Finally, interpolate linearly. */
+		secs = last_secs + (required_db - last_db) * (secs - last_secs) / (db - last_db);
+		return secs;
+	}
+
+	return -1;
+}
+
+unsigned
+CrossFadeSettings::Calculate(SignedSongTime total_time,
+			     float replay_gain_db, float replay_gain_prev_db,
+			     const char *mixramp_start, const char *mixramp_prev_end,
+			     const AudioFormat af,
+			     const AudioFormat old_format,
+			     unsigned max_chunks) const
+{
+	unsigned int chunks = 0;
+	float chunks_f;
+
+	if (total_time.IsNegative() ||
+	    duration < 0 || duration >= total_time.ToDoubleS() ||
+	    /* we can't crossfade when the audio formats are different */
+	    af != old_format)
+		return 0;
+
+	assert(duration >= 0);
+	assert(af.IsValid());
+
+	chunks_f = (float)af.GetTimeToSize() / (float)CHUNK_SIZE;
+
+	if (mixramp_delay <= 0 || !mixramp_start || !mixramp_prev_end) {
+		chunks = (chunks_f * duration + 0.5);
+	} else {
+		/* Calculate mixramp overlap. */
+		const float mixramp_overlap_current =
+			mixramp_interpolate(mixramp_start,
+					    mixramp_db - replay_gain_db);
+		const float mixramp_overlap_prev =
+			mixramp_interpolate(mixramp_prev_end,
+					    mixramp_db - replay_gain_prev_db);
+		const float mixramp_overlap =
+			mixramp_overlap_current + mixramp_overlap_prev;
+
+		if (mixramp_overlap_current >= 0 &&
+		    mixramp_overlap_prev >= 0 &&
+		    mixramp_delay <= mixramp_overlap) {
+			chunks = (chunks_f * (mixramp_overlap - mixramp_delay));
+			FormatDebug(cross_fade_domain,
+				    "will overlap %d chunks, %fs", chunks,
+				    mixramp_overlap - mixramp_delay);
+		}
+	}
+
+	if (chunks > max_chunks) {
+		chunks = max_chunks;
+		LogWarning(cross_fade_domain,
+			   "audio_buffer_size too small for computed MixRamp overlap");
+	}
+
+	return chunks;
+}
--- a/src/CrossFade.hxx
+++ b/src/CrossFade.hxx
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2003-2014 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_CROSSFADE_HXX
+#define MPD_CROSSFADE_HXX
+
+#include "Compiler.h"
+
+struct AudioFormat;
+class SignedSongTime;
+
+struct CrossFadeSettings {
+	/**
+	 * The configured cross fade duration [s].
+	 */
+	float duration;
+
+	float mixramp_db;
+
+	/**
+	 * The configured MixRapm delay [s].  A non-positive value
+	 * disables MixRamp.
+	 */
+	float mixramp_delay;
+
+	CrossFadeSettings()
+		:duration(0),
+		 mixramp_db(0),
+		 mixramp_delay(-1)
+	{}
+
+
+	/**
+	 * Calculate how many music pipe chunks should be used for crossfading.
+	 *
+	 * @param total_time total_time the duration of the new song
+	 * @param replay_gain_db the ReplayGain adjustment used for this song
+	 * @param replay_gain_prev_db the ReplayGain adjustment used on the last song
+	 * @param mixramp_start the next songs mixramp_start tag
+	 * @param mixramp_prev_end the last songs mixramp_end setting
+	 * @param af the audio format of the new song
+	 * @param old_format the audio format of the current song
+	 * @param max_chunks the maximum number of chunks
+	 * @return the number of chunks for crossfading, or 0 if cross fading
+	 * should be disabled for this song change
+	 */
+	gcc_pure
+	unsigned Calculate(SignedSongTime total_time,
+			   float replay_gain_db, float replay_gain_prev_db,
+			   const char *mixramp_start,
+			   const char *mixramp_prev_end,
+			   AudioFormat af, AudioFormat old_format,
+			   unsigned max_chunks) const;
+};
+
+#endif
--- a/src/DetachedSong.cxx
+++ b/src/DetachedSong.cxx
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2003-2014 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,234 @@
+/*
+ * Copyright (C) 2003-2014 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 DetachedSong {
+	friend DetachedSong map_song_detach(const LightSong &song);
+	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();
+};
+
+#endif
--- a/src/GlobalEvents.cxx
+++ b/src/GlobalEvents.cxx
@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 2003-2014 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 <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
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2003-2014 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 {
+		/** an idle event was emitted */
+		IDLE,
+
+		/** must call playlist_sync() */
+		PLAYLIST,
+
+		/** the current song's tag has changed */
+		TAG,
+
+#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
@@ -0,0 +1,115 @@
+/*
+ * Copyright (C) 2003-2014 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 "IOThread.hxx"
+#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>
+
+static struct {
+	Mutex mutex;
+	Cond cond;
+
+	EventLoop *loop;
+	Thread thread;
+} io;
+
+void
+io_thread_run(void)
+{
+	assert(io_thread_inside());
+	assert(io.loop != nullptr);
+
+	io.loop->Run();
+}
+
+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();
+	io.mutex.unlock();
+
+	io_thread_run();
+}
+
+void
+io_thread_init(void)
+{
+	assert(io.loop == nullptr);
+	assert(!io.thread.IsDefined());
+
+	io.loop = new EventLoop();
+}
+
+void
+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);
+}
+
+void
+io_thread_quit(void)
+{
+	assert(io.loop != nullptr);
+
+	io.loop->Break();
+}
+
+void
+io_thread_deinit(void)
+{
+	if (io.thread.IsDefined()) {
+		io_thread_quit();
+		io.thread.Join();
+	}
+
+	delete io.loop;
+}
+
+EventLoop &
+io_thread_get()
+{
+	assert(io.loop != nullptr);
+
+	return *io.loop;
+}
+
+bool
+io_thread_inside(void)
+{
+	return io.thread.IsInside();
+}
--- a/src/IOThread.hxx
+++ b/src/IOThread.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2011 The Music Player Daemon Project
+ * Copyright (C) 2003-2014 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -17,17 +17,18 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#ifndef MPD_IO_THREAD_H
-#define MPD_IO_THREAD_H
+#ifndef MPD_IO_THREAD_HXX
+#define MPD_IO_THREAD_HXX

-#include <glib.h>
-#include <stdbool.h>
+#include "Compiler.h"
+
+class EventLoop;

 void
 io_thread_init(void);

-bool
-io_thread_start(GError **error_r);
+void
+io_thread_start();

 /**
 * Run the I/O event loop synchronously in the current thread.  This
@@ -48,33 +49,15 @@ io_thread_quit(void);
 void
 io_thread_deinit(void);

-G_GNUC_PURE
-GMainContext *
-io_thread_context(void);
+gcc_const
+EventLoop &
+io_thread_get();

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

-guint
-io_thread_idle_add(GSourceFunc function, gpointer data);
-
-G_GNUC_MALLOC
-GSource *
-io_thread_timeout_add(guint interval_ms, GSourceFunc function, gpointer data);
-
-G_GNUC_MALLOC
-GSource *
-io_thread_timeout_add_seconds(guint interval,
-			      GSourceFunc function, gpointer data);
-
-/**
- * Call a function synchronously in the I/O thread.
- */
-gpointer
-io_thread_call(GThreadFunc function, gpointer data);
-
 #endif
--- a/src/IcyMetaDataParser.cxx
+++ b/src/IcyMetaDataParser.cxx
@@ -0,0 +1,251 @@
+/*
+ * Copyright (C) 2003-2014 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 "IcyMetaDataParser.hxx"
+#include "tag/Tag.hxx"
+#include "tag/TagBuilder.hxx"
+#include "util/Domain.hxx"
+#include "Log.hxx"
+
+#include <assert.h>
+#include <string.h>
+
+static constexpr Domain icy_metadata_domain("icy_metadata");
+
+void
+IcyMetaDataParser::Reset()
+{
+	if (!IsDefined())
+		return;
+
+	if (data_rest == 0 && meta_size > 0)
+		delete[] meta_data;
+
+	delete tag;
+
+	data_rest = data_size;
+	meta_size = 0;
+}
+
+size_t
+IcyMetaDataParser::Data(size_t length)
+{
+	assert(length > 0);
+
+	if (!IsDefined())
+		return length;
+
+	if (data_rest == 0)
+		return 0;
+
+	if (length >= data_rest) {
+		length = data_rest;
+		data_rest = 0;
+	} else
+		data_rest -= length;
+
+	return length;
+}
+
+static void
+icy_add_item(TagBuilder &tag, TagType type, const char *value)
+{
+	size_t length = strlen(value);
+
+	if (length >= 2 && value[0] == '\'' && value[length - 1] == '\'') {
+		/* strip the single quotes */
+		++value;
+		length -= 2;
+	}
+
+	if (length > 0)
+		tag.AddItem(type, value, length);
+}
+
+static void
+icy_parse_tag_item(TagBuilder &tag, const char *name, const char *value)
+{
+	if (strcmp(name, "StreamTitle") == 0)
+		icy_add_item(tag, TAG_TITLE, value);
+	else
+		FormatDebug(icy_metadata_domain,
+			    "unknown icy-tag: '%s'", name);
+}
+
+/**
+ * Find a single quote that is followed by a semicolon (or by the end
+ * of the string).  If that fails, return the first single quote.  If
+ * that also fails, return #end.
+ */
+static char *
+find_end_quote(char *p, char *const end)
+{
+	char *fallback = std::find(p, end, '\'');
+	if (fallback >= end - 1 || fallback[1] == ';')
+		return fallback;
+
+	p = fallback + 1;
+	while (true) {
+		p = std::find(p, end, '\'');
+		if (p == end)
+			return fallback;
+
+		if (p == end - 1 || p[1] == ';')
+			return p;
+
+		++p;
+	}
+}
+
+static Tag *
+icy_parse_tag(char *p, char *const end)
+{
+	assert(p != nullptr);
+	assert(end != nullptr);
+	assert(p <= end);
+
+	TagBuilder tag;
+
+	while (p != end) {
+		const char *const name = p;
+		char *eq = std::find(p, end, '=');
+		if (eq == end)
+			break;
+
+		*eq = 0;
+		p = eq + 1;
+
+		if (*p != '\'') {
+			/* syntax error; skip to the next semicolon,
+			   try to recover */
+			char *semicolon = std::find(p, end, ';');
+			if (semicolon == end)
+				break;
+			p = semicolon + 1;
+			continue;
+		}
+
+		++p;
+
+		const char *const value = p;
+		char *quote = find_end_quote(p, end);
+		if (quote == end)
+			break;
+
+		*quote = 0;
+		p = quote + 1;
+
+		icy_parse_tag_item(tag, name, value);
+
+		char *semicolon = std::find(p, end, ';');
+		if (semicolon == end)
+			break;
+		p = semicolon + 1;
+	}
+
+	return tag.CommitNew();
+}
+
+size_t
+IcyMetaDataParser::Meta(const void *data, size_t length)
+{
+	const unsigned char *p = (const unsigned char *)data;
+
+	assert(IsDefined());
+	assert(data_rest == 0);
+	assert(length > 0);
+
+	if (meta_size == 0) {
+		/* read meta_size from the first byte of a meta
+		   block */
+		meta_size = *p++ * 16;
+		if (meta_size == 0) {
+			/* special case: no metadata */
+			data_rest = data_size;
+			return 1;
+		}
+
+		/* 1 byte was consumed (must be re-added later for the
+		   return value */
+		--length;
+
+		/* initialize metadata reader, allocate enough
+		   memory (+1 for the null terminator) */
+		meta_position = 0;
+		meta_data = new char[meta_size + 1];
+	}
+
+	assert(meta_position < meta_size);
+
+	if (length > meta_size - meta_position)
+		length = meta_size - meta_position;
+
+	memcpy(meta_data + meta_position, p, length);
+	meta_position += length;
+
+	if (p != data)
+		/* re-add the first byte (which contained meta_size) */
+		++length;
+
+	if (meta_position == meta_size) {
+		/* parse */
+
+		delete tag;
+
+		tag = icy_parse_tag(meta_data, meta_data + meta_size);
+		delete[] meta_data;
+
+		/* change back to normal data mode */
+
+		meta_size = 0;
+		data_rest = data_size;
+	}
+
+	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
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2003-2014 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_ICY_META_DATA_PARSER_HXX
+#define MPD_ICY_META_DATA_PARSER_HXX
+
+#include <stddef.h>
+
+struct Tag;
+
+class IcyMetaDataParser {
+	size_t data_size, data_rest;
+
+	size_t meta_size, meta_position;
+	char *meta_data;
+
+	Tag *tag;
+
+public:
+	IcyMetaDataParser():data_size(0) {}
+	~IcyMetaDataParser() {
+		Reset();
+	}
+
+	/**
+	 * Initialize an enabled icy_metadata object with the specified
+	 * data_size (from the icy-metaint HTTP response header).
+	 */
+	void Start(size_t _data_size) {
+		data_size = data_rest = _data_size;
+		meta_size = 0;
+		tag = nullptr;
+	}
+
+	/**
+	 * Resets the icy_metadata.  Call this after rewinding the stream.
+	 */
+	void Reset();
+
+	/**
+	 * Checks whether the icy_metadata object is enabled.
+	 */
+	bool IsDefined() const {
+		return data_size > 0;
+	}
+
+	/**
+	 * Evaluates data.  Returns the number of bytes of normal data which
+	 * can be read by the caller, but not more than "length".  If the
+	 * return value is smaller than "length", the caller should invoke
+	 * icy_meta().
+	 */
+	size_t Data(size_t length);
+
+	/**
+	 * Reads metadata from the stream.  Returns the number of bytes
+	 * consumed.  If the return value is smaller than "length", the caller
+	 * should invoke icy_data().
+	 */
+	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;
+		return result;
+	}
+};
+
+#endif
--- a/src/Idle.cxx
+++ b/src/Idle.cxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2011 The Music Player Daemon Project
+ * Copyright (C) 2003-2014 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -23,14 +23,15 @@
 */

 #include "config.h"
-#include "idle.h"
-#include "event_pipe.h"
+#include "Idle.hxx"
+#include "GlobalEvents.hxx"
+#include "util/ASCII.hxx"
+
+#include <atomic>

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

-static unsigned idle_flags;
-static GMutex *idle_mutex = NULL;
+static std::atomic_uint idle_flags;

 static const char *const idle_names[] = {
 	"database",
@@ -44,47 +45,26 @@ static const char *const idle_names[] = {
 	"update",
 	"subscription",
 	"message",
-        NULL
+	"neighbor",
+	"mount",
+	nullptr
 };

-void
-idle_init(void)
-{
-	g_assert(idle_mutex == NULL);
-	idle_mutex = g_mutex_new();
-}
-
-void
-idle_deinit(void)
-{
-	g_assert(idle_mutex != NULL);
-	g_mutex_free(idle_mutex);
-	idle_mutex = NULL;
-}
-
 void
 idle_add(unsigned flags)
 {
 	assert(flags != 0);

-	g_mutex_lock(idle_mutex);
-	idle_flags |= flags;
-	g_mutex_unlock(idle_mutex);
+	unsigned old_flags = idle_flags.fetch_or(flags);

-	event_pipe_emit(PIPE_EVENT_IDLE);
+	if ((old_flags & flags) != flags)
+		GlobalEvents::Emit(GlobalEvents::IDLE);
 }

 unsigned
 idle_get(void)
 {
-	unsigned flags;
-
-	g_mutex_lock(idle_mutex);
-	flags = idle_flags;
-	idle_flags = 0;
-	g_mutex_unlock(idle_mutex);
-
-	return flags;
+	return idle_flags.exchange(0);
 }

 const char*const*
@@ -92,3 +72,18 @@ idle_get_names(void)
 {
        return idle_names;
 }
+
+unsigned
+idle_parse_name(const char *name)
+{
+#if !CLANG_CHECK_VERSION(3,6)
+	/* disabled on clang due to -Wtautological-pointer-compare */
+	assert(name != nullptr);
+#endif
+
+	for (unsigned i = 0; idle_names[i] != nullptr; ++i)
+		if (StringEqualsCaseASCII(name, idle_names[i]))
+			return 1 << i;
+
+	return 0;
+}
--- a/src/Idle.hxx
+++ b/src/Idle.hxx
@@ -0,0 +1,97 @@
+/*
+ * Copyright (C) 2003-2014 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.
+ */
+
+/*
+ * Support library for the "idle" command.
+ *
+ */
+
+#ifndef MPD_IDLE_HXX
+#define MPD_IDLE_HXX
+
+#include "Compiler.h"
+
+/** song database has been updated*/
+static constexpr unsigned IDLE_DATABASE = 0x1;
+
+/** a stored playlist has been modified, created, deleted or
+    renamed */
+static constexpr unsigned IDLE_STORED_PLAYLIST = 0x2;
+
+/** the current playlist has been modified */
+static constexpr unsigned IDLE_PLAYLIST = 0x4;
+
+/** the player state has changed: play, stop, pause, seek, ... */
+static constexpr unsigned IDLE_PLAYER = 0x8;
+
+/** the volume has been modified */
+static constexpr unsigned IDLE_MIXER = 0x10;
+
+/** an audio output device has been enabled or disabled */
+static constexpr unsigned IDLE_OUTPUT = 0x20;
+
+/** options have changed: crossfade; random; repeat; ... */
+static constexpr unsigned IDLE_OPTIONS = 0x40;
+
+/** a sticker has been modified. */
+static constexpr unsigned IDLE_STICKER = 0x80;
+
+/** a database update has started or finished. */
+static constexpr unsigned IDLE_UPDATE = 0x100;
+
+/** a client has subscribed or unsubscribed to/from a channel */
+static constexpr unsigned IDLE_SUBSCRIPTION = 0x200;
+
+/** a message on the subscribed channel was received */
+static constexpr unsigned IDLE_MESSAGE = 0x400;
+
+/** a neighbor was found or lost */
+static constexpr unsigned IDLE_NEIGHBOR = 0x800;
+
+/** the mount list has changed */
+static constexpr unsigned IDLE_MOUNT = 0x1000;
+
+/**
+ * Adds idle flag (with bitwise "or") and queues notifications to all
+ * clients.
+ */
+void
+idle_add(unsigned flags);
+
+/**
+ * Atomically reads and resets the global idle flags value.
+ */
+unsigned
+idle_get(void);
+
+/**
+ * Get idle names
+ */
+const char*const*
+idle_get_names(void);
+
+/**
+ * Parse an idle name and return its mask.  Returns 0 if the given
+ * name is unknown.
+ */
+gcc_nonnull_all gcc_pure
+unsigned
+idle_parse_name(const char *name);
+
+#endif
--- a/src/Instance.cxx
+++ b/src/Instance.cxx
@@ -0,0 +1,102 @@
+/*
+ * Copyright (C) 2003-2014 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 "Instance.hxx"
+#include "Partition.hxx"
+#include "Idle.hxx"
+#include "Stats.hxx"
+
+#ifdef ENABLE_DATABASE
+#include "db/DatabaseError.hxx"
+#include "db/LightSong.hxx"
+
+#ifdef ENABLE_SQLITE
+#include "sticker/StickerDatabase.hxx"
+#include "sticker/SongSticker.hxx"
+#endif
+
+Database *
+Instance::GetDatabase(Error &error)
+{
+	if (database == nullptr)
+		error.Set(db_domain, DB_DISABLED, "No database");
+	return database;
+}
+
+#endif
+
+void
+Instance::TagModified()
+{
+	partition->TagModified();
+}
+
+void
+Instance::SyncWithPlayer()
+{
+	partition->SyncWithPlayer();
+}
+
+#ifdef ENABLE_DATABASE
+
+void
+Instance::OnDatabaseModified()
+{
+	assert(database != nullptr);
+
+	/* propagate the change to all subsystems */
+
+	stats_invalidate();
+	partition->DatabaseModified(*database);
+	idle_add(IDLE_DATABASE);
+}
+
+void
+Instance::OnDatabaseSongRemoved(const LightSong &song)
+{
+	assert(database != nullptr);
+
+#ifdef ENABLE_SQLITE
+	/* if the song has a sticker, remove it */
+	if (sticker_enabled())
+		sticker_song_delete(song);
+#endif
+
+	const auto uri = song.GetURI();
+	partition->DeleteSong(uri.c_str());
+}
+
+#endif
+
+#ifdef ENABLE_NEIGHBOR_PLUGINS
+
+void
+Instance::FoundNeighbor(gcc_unused const NeighborInfo &info)
+{
+	idle_add(IDLE_NEIGHBOR);
+}
+
+void
+Instance::LostNeighbor(gcc_unused const NeighborInfo &info)
+{
+	idle_add(IDLE_NEIGHBOR);
+}
+
+#endif
--- a/src/Instance.hxx
+++ b/src/Instance.hxx
@@ -0,0 +1,119 @@
+/*
+ * Copyright (C) 2003-2014 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_INSTANCE_HXX
+#define MPD_INSTANCE_HXX
+
+#include "check.h"
+#include "Compiler.h"
+
+#ifdef ENABLE_NEIGHBOR_PLUGINS
+#include "neighbor/Listener.hxx"
+class NeighborGlue;
+#endif
+
+#ifdef ENABLE_DATABASE
+#include "db/DatabaseListener.hxx"
+class Database;
+class Storage;
+class UpdateService;
+#endif
+
+class EventLoop;
+class Error;
+class ClientList;
+struct Partition;
+
+struct Instance final
+#if defined(ENABLE_DATABASE) || defined(ENABLE_NEIGHBOR_PLUGINS)
+	:
+#endif
+#ifdef ENABLE_DATABASE
+	public DatabaseListener
+#ifdef ENABLE_NEIGHBOR_PLUGINS
+	,
+#endif
+#endif
+#ifdef ENABLE_NEIGHBOR_PLUGINS
+	public NeighborListener
+#endif
+{
+	EventLoop *event_loop;
+
+#ifdef ENABLE_NEIGHBOR_PLUGINS
+	NeighborGlue *neighbors;
+#endif
+
+#ifdef ENABLE_DATABASE
+	Database *database;
+
+	/**
+	 * This is really a #CompositeStorage.  To avoid heavy include
+	 * dependencies, we declare it as just #Storage.
+	 */
+	Storage *storage;
+
+	UpdateService *update;
+#endif
+
+	ClientList *client_list;
+
+	Partition *partition;
+
+	Instance() {
+#ifdef ENABLE_DATABASE
+		storage = nullptr;
+		update = nullptr;
+#endif
+	}
+
+#ifdef ENABLE_DATABASE
+	/**
+	 * Returns the global #Database instance.  May return nullptr
+	 * if this MPD configuration has no database (no
+	 * music_directory was configured).
+	 */
+	Database *GetDatabase(Error &error);
+#endif
+
+	/**
+	 * A tag in the play queue has been modified by the player
+	 * thread.  Propagate the change to all subsystems.
+	 */
+	void TagModified();
+
+	/**
+	 * Synchronize the player with the play queue.
+	 */
+	void SyncWithPlayer();
+
+private:
+#ifdef ENABLE_DATABASE
+	virtual void OnDatabaseModified() override;
+	virtual void OnDatabaseSongRemoved(const LightSong &song) override;
+#endif
+
+#ifdef ENABLE_NEIGHBOR_PLUGINS
+	/* virtual methods from class NeighborListener */
+	virtual void FoundNeighbor(const NeighborInfo &info) override;
+	virtual void LostNeighbor(const NeighborInfo &info) override;
+#endif
+};
+
+#endif
--- a/src/Listen.cxx
+++ b/src/Listen.cxx
@@ -0,0 +1,160 @@
+/*
+ * Copyright (C) 2003-2014 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 "Listen.hxx"
+#include "client/Client.hxx"
+#include "config/ConfigData.hxx"
+#include "config/ConfigGlobal.hxx"
+#include "config/ConfigOption.hxx"
+#include "event/ServerSocket.hxx"
+#include "util/Error.hxx"
+#include "util/Domain.hxx"
+#include "fs/AllocatedPath.hxx"
+#include "Log.hxx"
+
+#include <string.h>
+#include <assert.h>
+
+#ifdef ENABLE_SYSTEMD_DAEMON
+#include <systemd/sd-daemon.h>
+#endif
+
+static constexpr Domain listen_domain("listen");
+
+#define DEFAULT_PORT	6600
+
+class ClientListener final : public ServerSocket {
+	Partition &partition;
+
+public:
+	ClientListener(EventLoop &_loop, Partition &_partition)
+		:ServerSocket(_loop), partition(_partition) {}
+
+private:
+	virtual void OnAccept(int fd, const sockaddr &address,
+			      size_t address_length, int uid) {
+		client_new(GetEventLoop(), partition,
+			   fd, &address, address_length, uid);
+	}
+};
+
+static ClientListener *listen_socket;
+int listen_port;
+
+static bool
+listen_add_config_param(unsigned int port,
+			const struct config_param *param,
+			Error &error_r)
+{
+	assert(param != nullptr);
+
+	if (0 == strcmp(param->value.c_str(), "any")) {
+		return listen_socket->AddPort(port, error_r);
+	} else if (param->value[0] == '/' || param->value[0] == '~') {
+		auto path = config_parse_path(param, error_r);
+		return !path.IsNull() &&
+			listen_socket->AddPath(std::move(path), error_r);
+	} else {
+		return listen_socket->AddHost(param->value.c_str(), port,
+					      error_r);
+	}
+}
+
+#ifdef ENABLE_SYSTEMD_DAEMON
+
+static bool
+listen_systemd_activation(Error &error_r)
+{
+	int n = sd_listen_fds(true);
+	if (n <= 0) {
+		if (n < 0)
+			FormatErrno(listen_domain, -n,
+				    "sd_listen_fds() failed");
+		return false;
+	}
+
+	for (int i = SD_LISTEN_FDS_START, end = SD_LISTEN_FDS_START + n;
+	     i != end; ++i)
+		if (!listen_socket->AddFD(i, error_r))
+			return false;
+
+	return true;
+}
+
+#endif
+
+bool
+listen_global_init(EventLoop &loop, Partition &partition, Error &error)
+{
+	int port = config_get_positive(CONF_PORT, DEFAULT_PORT);
+	const struct config_param *param =
+		config_get_param(CONF_BIND_TO_ADDRESS);
+
+	listen_socket = new ClientListener(loop, partition);
+
+#ifdef ENABLE_SYSTEMD_DAEMON
+	if (listen_systemd_activation(error))
+		return true;
+
+	if (error.IsDefined())
+		return false;
+#endif
+
+	if (param != nullptr) {
+		/* "bind_to_address" is configured, create listeners
+		   for all values */
+
+		do {
+			if (!listen_add_config_param(port, param, error)) {
+				delete listen_socket;
+				error.FormatPrefix("Failed to listen on %s (line %i): ",
+						   param->value.c_str(),
+						   param->line);
+				return false;
+			}
+		} while ((param = param->next) != nullptr);
+	} else {
+		/* no "bind_to_address" configured, bind the
+		   configured port on all interfaces */
+
+		if (!listen_socket->AddPort(port, error)) {
+			delete listen_socket;
+			error.FormatPrefix("Failed to listen on *:%d: ", port);
+			return false;
+		}
+	}
+
+	if (!listen_socket->Open(error)) {
+		delete listen_socket;
+		return false;
+	}
+
+	listen_port = port;
+	return true;
+}
+
+void listen_global_finish(void)
+{
+	LogDebug(listen_domain, "listen_global_finish called");
+
+	assert(listen_socket != nullptr);
+
+	delete listen_socket;
+}
--- a/src/Listen.hxx
+++ b/src/Listen.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2011 The Music Player Daemon Project
+ * Copyright (C) 2003-2014 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -17,17 +17,17 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#ifndef MPD_LISTEN_H
-#define MPD_LISTEN_H
+#ifndef MPD_LISTEN_HXX
+#define MPD_LISTEN_HXX

-#include <glib.h>
-
-#include <stdbool.h>
+class EventLoop;
+class Error;
+struct Partition;

 extern int listen_port;

 bool
-listen_global_init(GError **error_r);
+listen_global_init(EventLoop &loop, Partition &partition, Error &error);

 void listen_global_finish(void);

--- a/src/Log.cxx
+++ b/src/Log.cxx
@@ -0,0 +1,155 @@
+/*
+ * Copyright (C) 2003-2014 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 "LogV.hxx"
+#include "util/Error.hxx"
+
+#include <assert.h>
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+
+void
+LogFormatV(const Domain &domain, LogLevel level, const char *fmt, va_list ap)
+{
+	char msg[1024];
+	vsnprintf(msg, sizeof(msg), fmt, ap);
+	Log(domain, level, msg);
+}
+
+void
+LogFormat(const Domain &domain, LogLevel level, const char *fmt, ...)
+{
+	va_list ap;
+	va_start(ap, fmt);
+	LogFormatV(domain, level, fmt, ap);
+	va_end(ap);
+}
+
+void
+FormatDebug(const Domain &domain, const char *fmt, ...)
+{
+	va_list ap;
+	va_start(ap, fmt);
+	LogFormatV(domain, LogLevel::DEBUG, fmt, ap);
+	va_end(ap);
+}
+
+void
+FormatInfo(const Domain &domain, const char *fmt, ...)
+{
+	va_list ap;
+	va_start(ap, fmt);
+	LogFormatV(domain, LogLevel::INFO, fmt, ap);
+	va_end(ap);
+}
+
+void
+FormatDefault(const Domain &domain, const char *fmt, ...)
+{
+	va_list ap;
+	va_start(ap, fmt);
+	LogFormatV(domain, LogLevel::DEFAULT, fmt, ap);
+	va_end(ap);
+}
+
+void
+FormatWarning(const Domain &domain, const char *fmt, ...)
+{
+	va_list ap;
+	va_start(ap, fmt);
+	LogFormatV(domain, LogLevel::WARNING, fmt, ap);
+	va_end(ap);
+}
+
+void
+FormatError(const Domain &domain, const char *fmt, ...)
+{
+	va_list ap;
+	va_start(ap, fmt);
+	LogFormatV(domain, LogLevel::ERROR, fmt, ap);
+	va_end(ap);
+}
+
+void
+LogError(const Error &error)
+{
+	Log(error.GetDomain(), LogLevel::ERROR, error.GetMessage());
+}
+
+void
+LogError(const Error &error, const char *msg)
+{
+	LogFormat(error.GetDomain(), LogLevel::ERROR, "%s: %s",
+		  msg, error.GetMessage());
+}
+
+void
+FormatError(const Error &error, const char *fmt, ...)
+{
+	char msg[1024];
+	va_list ap;
+	va_start(ap, fmt);
+	vsnprintf(msg, sizeof(msg), fmt, ap);
+	va_end(ap);
+
+	LogError(error, msg);
+}
+
+void
+LogErrno(const Domain &domain, int e, const char *msg)
+{
+	LogFormat(domain, LogLevel::ERROR, "%s: %s", msg, strerror(e));
+}
+
+void
+LogErrno(const Domain &domain, const char *msg)
+{
+	LogErrno(domain, errno, msg);
+}
+
+static void
+FormatErrnoV(const Domain &domain, int e, const char *fmt, va_list ap)
+{
+	char msg[1024];
+	vsnprintf(msg, sizeof(msg), fmt, ap);
+
+	LogErrno(domain, e, msg);
+}
+
+void
+FormatErrno(const Domain &domain, int e, const char *fmt, ...)
+{
+	va_list ap;
+	va_start(ap, fmt);
+	FormatErrnoV(domain, e, fmt, ap);
+	va_end(ap);
+}
+
+void
+FormatErrno(const Domain &domain, const char *fmt, ...)
+{
+	const int e = errno;
+
+	va_list ap;
+	va_start(ap, fmt);
+	FormatErrnoV(domain, e, fmt, ap);
+	va_end(ap);
+}
--- a/src/Log.hxx
+++ b/src/Log.hxx
@@ -0,0 +1,110 @@
+/*
+ * Copyright (C) 2003-2014 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_LOG_HXX
+#define MPD_LOG_HXX
+
+#include "LogLevel.hxx"
+#include "Compiler.h"
+
+class Error;
+class Domain;
+
+void
+Log(const Domain &domain, LogLevel level, const char *msg);
+
+gcc_printf(3,4)
+void
+LogFormat(const Domain &domain, LogLevel level, const char *fmt, ...);
+
+static inline void
+LogDebug(const Domain &domain, const char *msg)
+{
+	Log(domain, LogLevel::DEBUG, msg);
+}
+
+gcc_printf(2,3)
+void
+FormatDebug(const Domain &domain, const char *fmt, ...);
+
+static inline void
+LogInfo(const Domain &domain, const char *msg)
+{
+	Log(domain, LogLevel::INFO, msg);
+}
+
+gcc_printf(2,3)
+void
+FormatInfo(const Domain &domain, const char *fmt, ...);
+
+static inline void
+LogDefault(const Domain &domain, const char *msg)
+{
+	Log(domain, LogLevel::DEFAULT, msg);
+}
+
+gcc_printf(2,3)
+void
+FormatDefault(const Domain &domain, const char *fmt, ...);
+
+static inline void
+LogWarning(const Domain &domain, const char *msg)
+{
+	Log(domain, LogLevel::WARNING, msg);
+}
+
+gcc_printf(2,3)
+void
+FormatWarning(const Domain &domain, const char *fmt, ...);
+
+static inline void
+LogError(const Domain &domain, const char *msg)
+{
+	Log(domain, LogLevel::ERROR, msg);
+}
+
+gcc_printf(2,3)
+void
+FormatError(const Domain &domain, const char *fmt, ...);
+
+void
+LogError(const Error &error);
+
+void
+LogError(const Error &error, const char *msg);
+
+gcc_printf(2,3)
+void
+FormatError(const Error &error, const char *fmt, ...);
+
+void
+LogErrno(const Domain &domain, int e, const char *msg);
+
+void
+LogErrno(const Domain &domain, const char *msg);
+
+gcc_printf(3,4)
+void
+FormatErrno(const Domain &domain, int e, const char *fmt, ...);
+
+gcc_printf(2,3)
+void
+FormatErrno(const Domain &domain, const char *fmt, ...);
+
+#endif /* LOG_H */
--- a/src/LogBackend.cxx
+++ b/src/LogBackend.cxx
@@ -0,0 +1,230 @@
+/*
+ * Copyright (C) 2003-2014 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 "LogBackend.hxx"
+#include "Log.hxx"
+#include "util/Domain.hxx"
+#include "util/StringUtil.hxx"
+
+#ifdef HAVE_GLIB
+#include <glib.h>
+#endif
+
+#include <assert.h>
+#include <stdio.h>
+#include <string.h>
+#include <time.h>
+
+#ifdef HAVE_SYSLOG
+#include <syslog.h>
+#endif
+
+#ifdef ANDROID
+#include <android/log.h>
+
+static int
+ToAndroidLogLevel(LogLevel log_level)
+{
+	switch (log_level) {
+	case LogLevel::DEBUG:
+		return ANDROID_LOG_DEBUG;
+
+	case LogLevel::INFO:
+	case LogLevel::DEFAULT:
+		return ANDROID_LOG_INFO;
+
+	case LogLevel::WARNING:
+		return ANDROID_LOG_WARN;
+
+	case LogLevel::ERROR:
+		return ANDROID_LOG_ERROR;
+	}
+
+	assert(false);
+	gcc_unreachable();
+}
+
+#else
+
+static LogLevel log_threshold = LogLevel::INFO;
+
+#ifdef HAVE_GLIB
+static const char *log_charset;
+#endif
+
+static bool enable_timestamp;
+
+#ifdef HAVE_SYSLOG
+static bool enable_syslog;
+#endif
+
+void
+SetLogThreshold(LogLevel _threshold)
+{
+	log_threshold = _threshold;
+}
+
+#ifdef HAVE_GLIB
+
+void
+SetLogCharset(const char *_charset)
+{
+	log_charset = _charset;
+}
+
+#endif
+
+void
+EnableLogTimestamp()
+{
+#ifdef HAVE_SYSLOG
+	assert(!enable_syslog);
+#endif
+	assert(!enable_timestamp);
+
+	enable_timestamp = true;
+}
+
+static const char *log_date(void)
+{
+	static constexpr size_t LOG_DATE_BUF_SIZE = 16;
+	static char buf[LOG_DATE_BUF_SIZE];
+	time_t t = time(nullptr);
+	strftime(buf, LOG_DATE_BUF_SIZE, "%b %d %H:%M : ", localtime(&t));
+	return buf;
+}
+
+/**
+ * Determines the length of the string excluding trailing whitespace
+ * characters.
+ */
+static int
+chomp_length(const char *p)
+{
+	size_t length = strlen(p);
+	return StripRight(p, length);
+}
+
+#ifdef HAVE_SYSLOG
+
+static int
+ToSysLogLevel(LogLevel log_level)
+{
+	switch (log_level) {
+	case LogLevel::DEBUG:
+		return LOG_DEBUG;
+
+	case LogLevel::INFO:
+		return LOG_INFO;
+
+	case LogLevel::DEFAULT:
+		return LOG_NOTICE;
+
+	case LogLevel::WARNING:
+		return LOG_WARNING;
+
+	case LogLevel::ERROR:
+		return LOG_ERR;
+	}
+
+	assert(false);
+	gcc_unreachable();
+}
+
+static void
+SysLog(const Domain &domain, LogLevel log_level, const char *message)
+{
+	syslog(ToSysLogLevel(log_level), "%s: %.*s",
+	       domain.GetName(),
+	       chomp_length(message), message);
+}
+
+void
+LogInitSysLog()
+{
+	openlog(PACKAGE, 0, LOG_DAEMON);
+	enable_syslog = true;
+}
+
+void
+LogFinishSysLog()
+{
+	if (enable_syslog)
+		closelog();
+}
+
+#endif
+
+static void
+FileLog(const Domain &domain, const char *message)
+{
+#ifdef HAVE_GLIB
+	char *converted;
+
+	if (log_charset != nullptr) {
+		converted = g_convert_with_fallback(message, -1,
+						    log_charset, "utf-8",
+						    nullptr, nullptr,
+						    nullptr, nullptr);
+		if (converted != nullptr)
+			message = converted;
+	} else
+		converted = nullptr;
+#endif
+
+	fprintf(stderr, "%s%s: %.*s\n",
+		enable_timestamp ? log_date() : "",
+		domain.GetName(),
+		chomp_length(message), message);
+
+#ifdef WIN32
+	/* force-flush the log file, because setvbuf() does not seem
+	   to have an effect on WIN32 */
+	fflush(stderr);
+#endif
+
+#ifdef HAVE_GLIB
+	g_free(converted);
+#endif
+}
+
+#endif /* !ANDROID */
+
+void
+Log(const Domain &domain, LogLevel level, const char *msg)
+{
+#ifdef ANDROID
+	__android_log_print(ToAndroidLogLevel(level), "MPD",
+			    "%s: %s", domain.GetName(), msg);
+#else
+
+	if (level < log_threshold)
+		return;
+
+#ifdef HAVE_SYSLOG
+	if (enable_syslog) {
+		SysLog(domain, level, msg);
+		return;
+	}
+#endif
+
+	FileLog(domain, msg);
+#endif /* !ANDROID */
+}
--- a/src/LogBackend.hxx
+++ b/src/LogBackend.hxx
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2003-2014 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_LOG_BACKEND_HXX
+#define MPD_LOG_BACKEND_HXX
+
+#include "check.h"
+#include "LogLevel.hxx"
+
+void
+SetLogThreshold(LogLevel _threshold);
+
+#ifdef HAVE_GLIB
+
+void
+SetLogCharset(const char *_charset);
+
+#endif
+
+void
+EnableLogTimestamp();
+
+void
+LogInitSysLog();
+
+void
+LogFinishSysLog();
+
+#endif /* LOG_H */
--- a/src/LogInit.cxx
+++ b/src/LogInit.cxx
@@ -0,0 +1,254 @@
+/*
+ * Copyright (C) 2003-2014 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 "LogInit.hxx"
+#include "LogBackend.hxx"
+#include "Log.hxx"
+#include "config/ConfigData.hxx"
+#include "config/ConfigGlobal.hxx"
+#include "config/ConfigOption.hxx"
+#include "system/FatalError.hxx"
+#include "fs/AllocatedPath.hxx"
+#include "fs/FileSystem.hxx"
+#include "util/Error.hxx"
+#include "util/Domain.hxx"
+#include "system/FatalError.hxx"
+
+#ifdef HAVE_GLIB
+#include <glib.h>
+#endif
+
+#include <assert.h>
+#include <string.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <time.h>
+#include <unistd.h>
+
+#define LOG_LEVEL_SECURE LogLevel::INFO
+
+#define LOG_DATE_BUF_SIZE 16
+#define LOG_DATE_LEN (LOG_DATE_BUF_SIZE - 1)
+
+static constexpr Domain log_domain("log");
+
+#ifndef ANDROID
+
+static int out_fd;
+static AllocatedPath out_path = AllocatedPath::Null();
+
+static void redirect_logs(int fd)
+{
+	assert(fd >= 0);
+	if (dup2(fd, STDOUT_FILENO) < 0)
+		FatalSystemError("Failed to dup2 stdout");
+	if (dup2(fd, STDERR_FILENO) < 0)
+		FatalSystemError("Failed to dup2 stderr");
+}
+
+static int
+open_log_file(void)
+{
+	assert(!out_path.IsNull());
+
+	return OpenFile(out_path, O_CREAT | O_WRONLY | O_APPEND, 0666);
+}
+
+static bool
+log_init_file(unsigned line, Error &error)
+{
+	assert(!out_path.IsNull());
+
+	out_fd = open_log_file();
+	if (out_fd < 0) {
+		const std::string out_path_utf8 = out_path.ToUTF8();
+		error.FormatErrno("failed to open log file \"%s\" (config line %u)",
+				  out_path_utf8.c_str(), line);
+		return false;
+	}
+
+	EnableLogTimestamp();
+	return true;
+}
+
+static inline LogLevel
+parse_log_level(const char *value, unsigned line)
+{
+	if (0 == strcmp(value, "default"))
+		return LogLevel::DEFAULT;
+	if (0 == strcmp(value, "secure"))
+		return LOG_LEVEL_SECURE;
+	else if (0 == strcmp(value, "verbose"))
+		return LogLevel::DEBUG;
+	else {
+		FormatFatalError("unknown log level \"%s\" at line %u",
+				 value, line);
+	}
+}
+
+#endif
+
+void
+log_early_init(bool verbose)
+{
+#ifdef ANDROID
+	(void)verbose;
+#else
+	/* force stderr to be line-buffered */
+	setvbuf(stderr, nullptr, _IOLBF, 0);
+
+	if (verbose)
+		SetLogThreshold(LogLevel::DEBUG);
+#endif
+}
+
+bool
+log_init(bool verbose, bool use_stdout, Error &error)
+{
+#ifdef ANDROID
+	(void)verbose;
+	(void)use_stdout;
+	(void)error;
+
+	return true;
+#else
+	const struct config_param *param;
+
+#ifdef HAVE_GLIB
+	const char *charset;
+	g_get_charset(&charset);
+	SetLogCharset(charset);
+#endif
+
+	if (verbose)
+		SetLogThreshold(LogLevel::DEBUG);
+	else if ((param = config_get_param(CONF_LOG_LEVEL)) != nullptr)
+		SetLogThreshold(parse_log_level(param->value.c_str(),
+						param->line));
+
+	if (use_stdout) {
+		return true;
+	} else {
+		param = config_get_param(CONF_LOG_FILE);
+		if (param == nullptr) {
+#ifdef HAVE_SYSLOG
+			/* no configuration: default to syslog (if
+			   available) */
+			LogInitSysLog();
+			return true;
+#else
+			error.Set(log_domain,
+				  "config parameter 'log_file' not found");
+			return false;
+#endif
+#ifdef HAVE_SYSLOG
+		} else if (strcmp(param->value.c_str(), "syslog") == 0) {
+			LogInitSysLog();
+			return true;
+#endif
+		} else {
+			out_path = config_get_path(CONF_LOG_FILE, error);
+			return !out_path.IsNull() &&
+				log_init_file(param->line, error);
+		}
+	}
+#endif
+}
+
+#ifndef ANDROID
+
+static void
+close_log_files(void)
+{
+#ifdef HAVE_SYSLOG
+	LogFinishSysLog();
+#endif
+}
+
+#endif
+
+void
+log_deinit(void)
+{
+#ifndef ANDROID
+	close_log_files();
+	out_path = AllocatedPath::Null();
+#endif
+}
+
+void setup_log_output(bool use_stdout)
+{
+#ifdef ANDROID
+	(void)use_stdout;
+#else
+	if (use_stdout)
+		return;
+
+	fflush(nullptr);
+
+	if (out_fd < 0) {
+#ifdef WIN32
+		return;
+#else
+		out_fd = open("/dev/null", O_WRONLY);
+		if (out_fd < 0)
+			return;
+#endif
+	}
+
+	redirect_logs(out_fd);
+	close(out_fd);
+	out_fd = -1;
+
+#ifdef HAVE_GLIB
+	SetLogCharset(nullptr);
+#endif
+#endif
+}
+
+int cycle_log_files(void)
+{
+#ifdef ANDROID
+	return 0;
+#else
+	int fd;
+
+	if (out_path.IsNull())
+		return 0;
+
+	FormatDebug(log_domain, "Cycling log files");
+	close_log_files();
+
+	fd = open_log_file();
+	if (fd < 0) {
+		const std::string out_path_utf8 = out_path.ToUTF8();
+		FormatError(log_domain,
+			    "error re-opening log file: %s",
+			    out_path_utf8.c_str());
+		return -1;
+	}
+
+	redirect_logs(fd);
+	close(fd);
+
+	FormatDebug(log_domain, "Done cycling log files");
+	return 0;
+#endif
+}
--- a/src/LogInit.hxx
+++ b/src/LogInit.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2011 The Music Player Daemon Project
+ * Copyright (C) 2003-2014 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -17,18 +17,10 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#ifndef MPD_LOG_H
-#define MPD_LOG_H
+#ifndef MPD_LOG_INIT_HXX
+#define MPD_LOG_INIT_HXX

-#include <glib.h>
-#include <stdbool.h>
-
-G_GNUC_CONST
-static inline GQuark
-log_quark(void)
-{
-	return g_quark_from_static_string("log");
-}
+class Error;

 /**
 * Configure a logging destination for daemon startup, before the
@@ -42,12 +34,13 @@ void
 log_early_init(bool verbose);

 bool
-log_init(bool verbose, bool use_stdout, GError **error_r);
+log_init(bool verbose, bool use_stdout, Error &error);
+
+void
+log_deinit(void);

 void setup_log_output(bool use_stdout);

 int cycle_log_files(void);

-void close_log_files(void);
-
 #endif /* LOG_H */
--- a/src/decoder/ffmpeg_metadata.h
+++ b/src/decoder/ffmpeg_metadata.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2012 The Music Player Daemon Project
+ * Copyright (C) 2003-2014 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -17,25 +17,43 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#ifndef MPD_FFMPEG_METADATA_H
-#define MPD_FFMPEG_METADATA_H
+#ifndef MPD_LOG_LEVEL_HXX
+#define MPD_LOG_LEVEL_HXX

-#include <libavformat/avformat.h>
-#include <libavutil/avutil.h>
-#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51,5,0)
-#include <libavutil/dict.h>
+#ifdef WIN32
+#include <windows.h>
+/* damn you, windows.h! */
+#ifdef ERROR
+#undef ERROR
+#endif
 #endif

-#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(53,1,0)
-#define AVDictionary AVMetadata
-#define AVDictionaryEntry AVMetadataTag
-#define av_dict_get av_metadata_get
-#endif
+enum class LogLevel {
+	/**
+	 * Debug message for developers.
+	 */
+	DEBUG,

-struct tag_handler;
+	/**
+	 * Unimportant informational message.
+	 */
+	INFO,

-void
-ffmpeg_scan_dictionary(AVDictionary *dict,
-		       const struct tag_handler *handler, void *handler_ctx);
+	/**
+	 * Interesting informational message.
+	 */
+	DEFAULT,
+
+	/**
+	 * Warning: something may be wrong.
+	 */
+	WARNING,
+
+	/**
+	 * An error has occurred, an operation could not finish
+	 * successfully.
+	 */
+	ERROR,
+};

 #endif
--- a/src/LogV.hxx
+++ b/src/LogV.hxx
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2003-2014 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_LOGV_HXX
+#define MPD_LOGV_HXX
+
+#include "Log.hxx" // IWYU pragma: export
+
+#include <stdarg.h>
+
+void
+LogFormatV(const Domain &domain, LogLevel level, const char *fmt, va_list ap);
+
+#endif /* LOG_H */
--- a/src/Main.cxx
+++ b/src/Main.cxx
@@ -0,0 +1,763 @@
+/*
+ * Copyright (C) 2003-2014 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 "Main.hxx"
+#include "Instance.hxx"
+#include "CommandLine.hxx"
+#include "PlaylistFile.hxx"
+#include "PlaylistGlobal.hxx"
+#include "MusicChunk.hxx"
+#include "StateFile.hxx"
+#include "PlayerThread.hxx"
+#include "Mapper.hxx"
+#include "Permission.hxx"
+#include "Listen.hxx"
+#include "client/Client.hxx"
+#include "client/ClientList.hxx"
+#include "command/AllCommands.hxx"
+#include "Partition.hxx"
+#include "tag/TagConfig.hxx"
+#include "ReplayGainConfig.hxx"
+#include "Idle.hxx"
+#include "Log.hxx"
+#include "LogInit.hxx"
+#include "GlobalEvents.hxx"
+#include "input/Init.hxx"
+#include "event/Loop.hxx"
+#include "IOThread.hxx"
+#include "fs/AllocatedPath.hxx"
+#include "fs/Config.hxx"
+#include "playlist/PlaylistRegistry.hxx"
+#include "zeroconf/ZeroconfGlue.hxx"
+#include "decoder/DecoderList.hxx"
+#include "AudioConfig.hxx"
+#include "pcm/PcmConvert.hxx"
+#include "unix/SignalHandlers.hxx"
+#include "unix/Daemon.hxx"
+#include "system/FatalError.hxx"
+#include "util/UriUtil.hxx"
+#include "util/Error.hxx"
+#include "thread/Id.hxx"
+#include "thread/Slack.hxx"
+#include "lib/icu/Init.hxx"
+#include "config/ConfigGlobal.hxx"
+#include "config/ConfigData.hxx"
+#include "config/ConfigDefaults.hxx"
+#include "config/ConfigOption.hxx"
+#include "config/ConfigError.hxx"
+#include "Stats.hxx"
+
+#ifdef ENABLE_DATABASE
+#include "db/update/Service.hxx"
+#include "db/Configured.hxx"
+#include "db/DatabasePlugin.hxx"
+#include "db/plugins/simple/SimpleDatabasePlugin.hxx"
+#include "storage/Configured.hxx"
+#include "storage/CompositeStorage.hxx"
+#ifdef ENABLE_INOTIFY
+#include "db/update/InotifyUpdate.hxx"
+#endif
+#endif
+
+#ifdef ENABLE_NEIGHBOR_PLUGINS
+#include "neighbor/Glue.hxx"
+#endif
+
+#ifdef ENABLE_SQLITE
+#include "sticker/StickerDatabase.hxx"
+#endif
+
+#ifdef ENABLE_ARCHIVE
+#include "archive/ArchiveList.hxx"
+#endif
+
+#ifdef ANDROID
+#include "java/Global.hxx"
+#include "java/File.hxx"
+#include "android/Environment.hxx"
+#include "android/Context.hxx"
+#include "fs/StandardDirectory.hxx"
+#include "fs/FileSystem.hxx"
+#include "org_musicpd_Bridge.h"
+#endif
+
+#ifdef HAVE_GLIB
+#include <glib.h>
+#endif
+
+#include <stdlib.h>
+
+#ifdef HAVE_LOCALE_H
+#include <locale.h>
+#endif
+
+#ifdef WIN32
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#endif
+
+#ifdef __BLOCKS__
+#include <dispatch/dispatch.h>
+#endif
+
+#include <limits.h>
+
+static constexpr unsigned DEFAULT_BUFFER_SIZE = 4096;
+static constexpr unsigned DEFAULT_BUFFER_BEFORE_PLAY = 10;
+
+#ifdef ANDROID
+Context *context;
+#endif
+
+Instance *instance;
+
+static StateFile *state_file;
+
+#ifndef ANDROID
+
+static bool
+glue_daemonize_init(const struct options *options, Error &error)
+{
+	auto pid_file = config_get_path(CONF_PID_FILE, error);
+	if (pid_file.IsNull() && error.IsDefined())
+		return false;
+
+	daemonize_init(config_get_string(CONF_USER, nullptr),
+		       config_get_string(CONF_GROUP, nullptr),
+		       std::move(pid_file));
+
+	if (options->kill)
+		daemonize_kill();
+
+	return true;
+}
+
+#endif
+
+static bool
+glue_mapper_init(Error &error)
+{
+	auto playlist_dir = config_get_path(CONF_PLAYLIST_DIR, error);
+	if (playlist_dir.IsNull() && error.IsDefined())
+		return false;
+
+	mapper_init(std::move(playlist_dir));
+	return true;
+}
+
+#ifdef ENABLE_DATABASE
+
+static bool
+InitStorage(Error &error)
+{
+	Storage *storage = CreateConfiguredStorage(io_thread_get(), error);
+	if (storage == nullptr)
+		return !error.IsDefined();
+
+	assert(!error.IsDefined());
+
+	CompositeStorage *composite = new CompositeStorage();
+	instance->storage = composite;
+	composite->Mount("", storage);
+	return true;
+}
+
+/**
+ * Returns the database.  If this function returns false, this has not
+ * succeeded, and the caller should create the database after the
+ * process has been daemonized.
+ */
+static bool
+glue_db_init_and_load(void)
+{
+	Error error;
+	instance->database =
+		CreateConfiguredDatabase(*instance->event_loop, *instance,
+					 error);
+	if (instance->database == nullptr) {
+		if (error.IsDefined())
+			FatalError(error);
+		else
+			return true;
+	}
+
+	if (instance->database->GetPlugin().flags & DatabasePlugin::FLAG_REQUIRE_STORAGE) {
+		if (!InitStorage(error))
+			FatalError(error);
+
+		if (instance->storage == nullptr) {
+			delete instance->database;
+			instance->database = nullptr;
+			LogDefault(config_domain,
+				   "Found database setting without "
+				   "music_directory - disabling database");
+			return true;
+		}
+	} else {
+		if (IsStorageConfigured())
+			LogDefault(config_domain,
+				   "Ignoring the storage configuration "
+				   "because the database does not need it");
+	}
+
+	if (!instance->database->Open(error))
+		FatalError(error);
+
+	if (!instance->database->IsPlugin(simple_db_plugin))
+		return true;
+
+	SimpleDatabase &db = *(SimpleDatabase *)instance->database;
+	instance->update = new UpdateService(*instance->event_loop, db,
+					     static_cast<CompositeStorage &>(*instance->storage),
+					     *instance);
+
+	/* run database update after daemonization? */
+	return db.FileExists();
+}
+
+static bool
+InitDatabaseAndStorage()
+{
+	const bool create_db = !glue_db_init_and_load();
+	return create_db;
+}
+
+#endif
+
+/**
+ * Configure and initialize the sticker subsystem.
+ */
+static void
+glue_sticker_init(void)
+{
+#ifdef ENABLE_SQLITE
+	Error error;
+	auto sticker_file = config_get_path(CONF_STICKER_FILE, error);
+	if (sticker_file.IsNull()) {
+		if (error.IsDefined())
+			FatalError(error);
+		return;
+	}
+
+	if (!sticker_global_init(std::move(sticker_file), error))
+		FatalError(error);
+#endif
+}
+
+static bool
+glue_state_file_init(Error &error)
+{
+	auto path_fs = config_get_path(CONF_STATE_FILE, error);
+	if (path_fs.IsNull()) {
+		if (error.IsDefined())
+			return false;
+
+#ifdef ANDROID
+		const auto cache_dir = GetUserCacheDir();
+		if (cache_dir.IsNull())
+			return true;
+
+		path_fs = AllocatedPath::Build(cache_dir, "state");
+#else
+		return true;
+#endif
+	}
+
+	unsigned interval = config_get_unsigned(CONF_STATE_FILE_INTERVAL,
+						StateFile::DEFAULT_INTERVAL);
+
+	state_file = new StateFile(std::move(path_fs), interval,
+				   *instance->partition,
+				   *instance->event_loop);
+	state_file->Read();
+	return true;
+}
+
+/**
+ * Windows-only initialization of the Winsock2 library.
+ */
+static void winsock_init(void)
+{
+#ifdef WIN32
+	WSADATA sockinfo;
+
+	int retval = WSAStartup(MAKEWORD(2, 2), &sockinfo);
+	if(retval != 0)
+		FormatFatalError("Attempt to open Winsock2 failed; error code %d",
+				 retval);
+
+	if (LOBYTE(sockinfo.wVersion) != 2)
+		FatalError("We use Winsock2 but your version is either too new "
+			   "or old; please install Winsock 2.x");
+#endif
+}
+
+/**
+ * Initialize the decoder and player core, including the music pipe.
+ */
+static void
+initialize_decoder_and_player(void)
+{
+	const struct config_param *param;
+
+	size_t buffer_size;
+	param = config_get_param(CONF_AUDIO_BUFFER_SIZE);
+	if (param != nullptr) {
+		char *test;
+		long tmp = strtol(param->value.c_str(), &test, 10);
+		if (*test != '\0' || tmp <= 0 || tmp == LONG_MAX)
+			FormatFatalError("buffer size \"%s\" is not a "
+					 "positive integer, line %i",
+					 param->value.c_str(), param->line);
+		buffer_size = tmp;
+	} else
+		buffer_size = DEFAULT_BUFFER_SIZE;
+
+	buffer_size *= 1024;
+
+	const unsigned buffered_chunks = buffer_size / CHUNK_SIZE;
+
+	if (buffered_chunks >= 1 << 15)
+		FormatFatalError("buffer size \"%lu\" is too big",
+				 (unsigned long)buffer_size);
+
+	float perc;
+	param = config_get_param(CONF_BUFFER_BEFORE_PLAY);
+	if (param != nullptr) {
+		char *test;
+		perc = strtod(param->value.c_str(), &test);
+		if (*test != '%' || perc < 0 || perc > 100) {
+			FormatFatalError("buffered before play \"%s\" is not "
+					 "a positive percentage and less "
+					 "than 100 percent, line %i",
+					 param->value.c_str(), param->line);
+		}
+	} else
+		perc = DEFAULT_BUFFER_BEFORE_PLAY;
+
+	unsigned buffered_before_play = (perc / 100) * buffered_chunks;
+	if (buffered_before_play > buffered_chunks)
+		buffered_before_play = buffered_chunks;
+
+	const unsigned max_length =
+		config_get_positive(CONF_MAX_PLAYLIST_LENGTH,
+				    DEFAULT_PLAYLIST_MAX_LENGTH);
+
+	instance->partition = new Partition(*instance,
+					    max_length,
+					    buffered_chunks,
+					    buffered_before_play);
+}
+
+/**
+ * Handler for GlobalEvents::IDLE.
+ */
+static void
+idle_event_emitted(void)
+{
+	/* send "idle" notifications to all subscribed
+	   clients */
+	unsigned flags = idle_get();
+	if (flags != 0)
+		instance->client_list->IdleAdd(flags);
+
+	if (flags & (IDLE_PLAYLIST|IDLE_PLAYER|IDLE_MIXER|IDLE_OUTPUT) &&
+	    state_file != nullptr)
+		state_file->CheckModified();
+}
+
+#ifdef WIN32
+
+/**
+ * Handler for GlobalEvents::SHUTDOWN.
+ */
+static void
+shutdown_event_emitted(void)
+{
+	instance->event_loop->Break();
+}
+
+#endif
+
+#ifndef ANDROID
+
+int main(int argc, char *argv[])
+{
+#ifdef WIN32
+	return win32_main(argc, argv);
+#else
+	return mpd_main(argc, argv);
+#endif
+}
+
+#endif
+
+static int mpd_main_after_fork(struct options);
+
+#ifdef ANDROID
+static inline
+#endif
+int mpd_main(int argc, char *argv[])
+{
+	struct options options;
+	Error error;
+
+#ifndef ANDROID
+	daemonize_close_stdin();
+
+#ifdef HAVE_LOCALE_H
+	/* initialize locale */
+	setlocale(LC_CTYPE,"");
+#endif
+
+#ifdef HAVE_GLIB
+	g_set_application_name("Music Player Daemon");
+
+#if !GLIB_CHECK_VERSION(2,32,0)
+	/* enable GLib's thread safety code */
+	g_thread_init(nullptr);
+#endif
+#endif
+#endif
+
+	if (!IcuInit(error)) {
+		LogError(error);
+		return EXIT_FAILURE;
+	}
+
+	winsock_init();
+	io_thread_init();
+	config_global_init();
+
+#ifdef ANDROID
+	(void)argc;
+	(void)argv;
+
+	{
+		const auto sdcard = Environment::getExternalStorageDirectory();
+		if (!sdcard.IsNull()) {
+			const auto config_path =
+				AllocatedPath::Build(sdcard, "mpd.conf");
+			if (FileExists(config_path) &&
+			    !ReadConfigFile(config_path, error)) {
+				LogError(error);
+				return EXIT_FAILURE;
+			}
+		}
+	}
+#else
+	if (!parse_cmdline(argc, argv, &options, error)) {
+		LogError(error);
+		return EXIT_FAILURE;
+	}
+
+	if (!glue_daemonize_init(&options, error)) {
+		LogError(error);
+		return EXIT_FAILURE;
+	}
+#endif
+
+	stats_global_init();
+	TagLoadConfig();
+
+	if (!log_init(options.verbose, options.log_stderr, error)) {
+		LogError(error);
+		return EXIT_FAILURE;
+	}
+
+	instance = new Instance();
+	instance->event_loop = new EventLoop();
+
+#ifdef ENABLE_NEIGHBOR_PLUGINS
+	instance->neighbors = new NeighborGlue();
+	if (!instance->neighbors->Init(io_thread_get(), *instance, error)) {
+		LogError(error);
+		return EXIT_FAILURE;
+	}
+
+	if (instance->neighbors->IsEmpty()) {
+		delete instance->neighbors;
+		instance->neighbors = nullptr;
+	}
+#endif
+
+	const unsigned max_clients = config_get_positive(CONF_MAX_CONN, 10);
+	instance->client_list = new ClientList(max_clients);
+
+	initialize_decoder_and_player();
+
+	if (!listen_global_init(*instance->event_loop, *instance->partition,
+				error)) {
+		LogError(error);
+		return EXIT_FAILURE;
+	}
+
+#ifndef ANDROID
+	daemonize_set_user();
+	daemonize_begin(options.daemon);
+#endif
+
+#ifdef __BLOCKS__
+	/* Runs the OS X native event loop in the main thread, and runs
+	   the rest of mpd_main on a new thread. This lets CoreAudio receive
+	   route change notifications (e.g. plugging or unplugging headphones).
+	   All hardware output on OS X ultimately uses CoreAudio internally.
+	   This must be run after forking; if dispatch is called before forking,
+	   the child process will have a broken internal dispatch state. */
+	dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+		exit(mpd_main_after_fork(options));
+	});
+	dispatch_main();
+	return EXIT_FAILURE; // unreachable, because dispatch_main never returns
+#else
+	return mpd_main_after_fork(options);
+#endif
+}
+
+static int mpd_main_after_fork(struct options options)
+{
+	Error error;
+
+	GlobalEvents::Initialize(*instance->event_loop);
+	GlobalEvents::Register(GlobalEvents::IDLE, idle_event_emitted);
+#ifdef WIN32
+	GlobalEvents::Register(GlobalEvents::SHUTDOWN, shutdown_event_emitted);
+#endif
+
+	ConfigureFS();
+
+	if (!glue_mapper_init(error)) {
+		LogError(error);
+		return EXIT_FAILURE;
+	}
+
+	initPermissions();
+	playlist_global_init();
+	spl_global_init();
+#ifdef ENABLE_ARCHIVE
+	archive_plugin_init_all();
+#endif
+
+	if (!pcm_convert_global_init(error)) {
+		LogError(error);
+		return EXIT_FAILURE;
+	}
+
+	decoder_plugin_init_all();
+
+#ifdef ENABLE_DATABASE
+	const bool create_db = InitDatabaseAndStorage();
+#endif
+
+	glue_sticker_init();
+
+	command_init();
+	initAudioConfig();
+	instance->partition->outputs.Configure(*instance->event_loop,
+					       instance->partition->pc);
+	client_manager_init();
+	replay_gain_global_init();
+
+	if (!input_stream_global_init(error)) {
+		LogError(error);
+		return EXIT_FAILURE;
+	}
+
+	playlist_list_global_init();
+
+#ifndef ANDROID
+	daemonize_commit();
+
+	setup_log_output(options.log_stderr);
+
+	SignalHandlersInit(*instance->event_loop);
+#endif
+
+	io_thread_start();
+
+#ifdef ENABLE_NEIGHBOR_PLUGINS
+	if (instance->neighbors != nullptr &&
+	    !instance->neighbors->Open(error))
+		FatalError(error);
+#endif
+
+	ZeroconfInit(*instance->event_loop);
+
+	StartPlayerThread(instance->partition->pc);
+
+#ifdef ENABLE_DATABASE
+	if (create_db) {
+		/* the database failed to load: recreate the
+		   database */
+		unsigned job = instance->update->Enqueue("", true);
+		if (job == 0)
+			FatalError("directory update failed");
+	}
+#endif
+
+	if (!glue_state_file_init(error)) {
+		LogError(error);
+		return EXIT_FAILURE;
+	}
+
+	instance->partition->outputs.SetReplayGainMode(replay_gain_get_real_mode(instance->partition->playlist.queue.random));
+
+#ifdef ENABLE_DATABASE
+	if (config_get_bool(CONF_AUTO_UPDATE, false)) {
+#ifdef ENABLE_INOTIFY
+		if (instance->storage != nullptr &&
+		    instance->update != nullptr)
+			mpd_inotify_init(*instance->event_loop,
+					 *instance->storage,
+					 *instance->update,
+					 config_get_unsigned(CONF_AUTO_UPDATE_DEPTH,
+							     INT_MAX));
+#else
+		FormatWarning(config_domain,
+			      "inotify: auto_update was disabled. enable during compilation phase");
+#endif
+	}
+#endif
+
+	config_global_check();
+
+	/* enable all audio outputs (if not already done by
+	   playlist_state_restore() */
+	instance->partition->pc.UpdateAudio();
+
+#ifdef WIN32
+	win32_app_started();
+#endif
+
+	/* the MPD frontend does not care about timer slack; set it to
+	   a huge value to allow the kernel to reduce CPU wakeups */
+	SetThreadTimerSlackMS(100);
+
+	/* run the main loop */
+	instance->event_loop->Run();
+
+#ifdef WIN32
+	win32_app_stopping();
+#endif
+
+	/* cleanup */
+
+#if defined(ENABLE_DATABASE) && defined(ENABLE_INOTIFY)
+	mpd_inotify_finish();
+
+	if (instance->update != nullptr)
+		instance->update->CancelAllAsync();
+#endif
+
+	if (state_file != nullptr) {
+		state_file->Write();
+		delete state_file;
+	}
+
+	instance->partition->pc.Kill();
+	ZeroconfDeinit();
+	listen_global_finish();
+	delete instance->client_list;
+
+#ifdef ENABLE_NEIGHBOR_PLUGINS
+	if (instance->neighbors != nullptr) {
+		instance->neighbors->Close();
+		delete instance->neighbors;
+	}
+#endif
+
+#ifdef ENABLE_DATABASE
+	delete instance->update;
+
+	if (instance->database != nullptr) {
+		instance->database->Close();
+		delete instance->database;
+	}
+
+	delete instance->storage;
+#endif
+
+#ifdef ENABLE_SQLITE
+	sticker_global_finish();
+#endif
+
+	GlobalEvents::Deinitialize();
+
+	playlist_list_global_finish();
+	input_stream_global_finish();
+
+#ifdef ENABLE_DATABASE
+	mapper_finish();
+#endif
+
+	delete instance->partition;
+	command_finish();
+	decoder_plugin_deinit_all();
+#ifdef ENABLE_ARCHIVE
+	archive_plugin_deinit_all();
+#endif
+	config_global_finish();
+	io_thread_deinit();
+#ifndef ANDROID
+	SignalHandlersFinish();
+#endif
+	delete instance->event_loop;
+	delete instance;
+	instance = nullptr;
+#ifndef ANDROID
+	daemonize_finish();
+#endif
+#ifdef WIN32
+	WSACleanup();
+#endif
+
+	IcuFinish();
+
+	log_deinit();
+	return EXIT_SUCCESS;
+}
+
+#ifdef ANDROID
+
+gcc_visibility_default
+JNIEXPORT void JNICALL
+Java_org_musicpd_Bridge_run(JNIEnv *env, jclass, jobject _context)
+{
+	Java::Init(env);
+	Java::File::Initialise(env);
+	Environment::Initialise(env);
+
+	context = new Context(env, _context);
+
+	mpd_main(0, nullptr);
+
+	delete context;
+	Environment::Deinitialise(env);
+}
+
+gcc_visibility_default
+JNIEXPORT void JNICALL
+Java_org_musicpd_Bridge_shutdown(JNIEnv *, jclass)
+{
+	if (instance != nullptr)
+		instance->event_loop->Break();
+}
+
+#endif
--- a/src/Main.hxx
+++ b/src/Main.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2011 The Music Player Daemon Project
+ * Copyright (C) 2003-2014 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -17,18 +17,20 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#ifndef MAIN_H
-#define MAIN_H
+#ifndef MPD_MAIN_HXX
+#define MPD_MAIN_HXX

-#include <glib.h>
+class EventLoop;
+class Context;
+struct Instance;

-extern GThread *main_task;
+#ifdef ANDROID
+extern Context *context;
+#endif

-extern GMainLoop *main_loop;
+extern Instance *instance;

-extern GCond *main_cond;
-
-extern struct player_control *global_player_control;
+#ifndef ANDROID

 /**
 * A entry point for application.
@@ -38,6 +40,8 @@ extern struct player_control *global_player_control;
 */
 int mpd_main(int argc, char *argv[]);

+#endif
+
 #ifdef WIN32

 /**
@@ -52,7 +56,7 @@ win32_main(int argc, char *argv[]);
 * When running as a service reports to service control manager
 * that our service is started.
 * When running as a console application enables console handler that will
- * trigger PIPE_EVENT_SHUTDOWN when user closes console window
+ * trigger GlobalEvents::SHUTDOWN when user closes console window
 * or presses Ctrl+C.
 * This function should be called just before entering main loop.
 */
--- a/src/Mapper.cxx
+++ b/src/Mapper.cxx
@@ -0,0 +1,130 @@
+/*
+ * Copyright (C) 2003-2014 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.
+ */
+
+/*
+ * Maps directory and song objects to file system paths.
+ */
+
+#include "config.h"
+#include "Mapper.hxx"
+#include "fs/AllocatedPath.hxx"
+#include "fs/Traits.hxx"
+#include "fs/Charset.hxx"
+#include "fs/CheckFile.hxx"
+
+#ifdef ENABLE_DATABASE
+#include "storage/StorageInterface.hxx"
+#include "Instance.hxx"
+#include "Main.hxx"
+#endif
+
+#include <assert.h>
+
+/**
+ * The absolute path of the playlist directory encoded in the
+ * filesystem character set.
+ */
+static AllocatedPath playlist_dir_fs = AllocatedPath::Null();
+
+static void
+mapper_set_playlist_dir(AllocatedPath &&path)
+{
+	assert(!path.IsNull());
+
+	playlist_dir_fs = std::move(path);
+
+	CheckDirectoryReadable(playlist_dir_fs);
+}
+
+void
+mapper_init(AllocatedPath &&_playlist_dir)
+{
+	if (!_playlist_dir.IsNull())
+		mapper_set_playlist_dir(std::move(_playlist_dir));
+}
+
+void mapper_finish(void)
+{
+}
+
+#ifdef ENABLE_DATABASE
+
+AllocatedPath
+map_uri_fs(const char *uri)
+{
+	assert(uri != nullptr);
+	assert(*uri != '/');
+
+	if (instance->storage == nullptr)
+		return AllocatedPath::Null();
+
+	const auto music_dir_fs = instance->storage->MapFS("");
+	if (music_dir_fs.IsNull())
+		return AllocatedPath::Null();
+
+	const auto uri_fs = AllocatedPath::FromUTF8(uri);
+	if (uri_fs.IsNull())
+		return AllocatedPath::Null();
+
+	return AllocatedPath::Build(music_dir_fs, uri_fs);
+}
+
+std::string
+map_fs_to_utf8(const char *path_fs)
+{
+	if (PathTraitsFS::IsSeparator(path_fs[0])) {
+		if (instance->storage == nullptr)
+			return std::string();
+
+		const auto music_dir_fs = instance->storage->MapFS("");
+		if (music_dir_fs.IsNull())
+			return std::string();
+
+		path_fs = music_dir_fs.RelativeFS(path_fs);
+		if (path_fs == nullptr || *path_fs == 0)
+			return std::string();
+	}
+
+	return PathToUTF8(path_fs);
+}
+
+#endif
+
+const AllocatedPath &
+map_spl_path(void)
+{
+	return playlist_dir_fs;
+}
+
+AllocatedPath
+map_spl_utf8_to_fs(const char *name)
+{
+	if (playlist_dir_fs.IsNull())
+		return AllocatedPath::Null();
+
+	std::string filename_utf8 = name;
+	filename_utf8.append(PLAYLIST_FILE_SUFFIX);
+
+	const auto filename_fs =
+		AllocatedPath::FromUTF8(filename_utf8.c_str());
+	if (filename_fs.IsNull())
+		return AllocatedPath::Null();
+
+	return AllocatedPath::Build(playlist_dir_fs, filename_fs);
+}
--- a/src/Mapper.hxx
+++ b/src/Mapper.hxx
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2003-2014 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.
+ */
+
+/*
+ * Maps directory and song objects to file system paths.
+ */
+
+#ifndef MPD_MAPPER_HXX
+#define MPD_MAPPER_HXX
+
+#include <string>
+
+#include "Compiler.h"
+
+#define PLAYLIST_FILE_SUFFIX ".m3u"
+
+class AllocatedPath;
+
+void
+mapper_init(AllocatedPath &&playlist_dir);
+
+void mapper_finish(void);
+
+#ifdef ENABLE_DATABASE
+
+/**
+ * Determines the absolute file system path of a relative URI.  This
+ * is basically done by converting the URI to the file system charset
+ * and prepending the music directory.
+ */
+gcc_pure
+AllocatedPath
+map_uri_fs(const char *uri);
+
+/**
+ * Maps a file system path (relative to the music directory or
+ * absolute) to a relative path in UTF-8 encoding.
+ *
+ * @param path_fs a path in file system encoding
+ * @return the relative path in UTF-8, or an empty string if mapping
+ * failed
+ */
+gcc_pure
+std::string
+map_fs_to_utf8(const char *path_fs);
+
+#endif
+
+/**
+ * Returns the playlist directory.
+ */
+gcc_const
+const AllocatedPath &
+map_spl_path(void);
+
+/**
+ * Maps a playlist name (without the ".m3u" suffix) to a file system
+ * path.
+ *
+ * @return the path in file system encoding, or nullptr if mapping failed
+ */
+gcc_pure
+AllocatedPath
+map_spl_utf8_to_fs(const char *name);
+
+#endif
--- a/src/MixRampInfo.hxx
+++ b/src/MixRampInfo.hxx
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2003-2014 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_MIX_RAMP_INFO_HXX
+#define MPD_MIX_RAMP_INFO_HXX
+
+#include "check.h"
+#include "Compiler.h"
+
+#include <string>
+
+class MixRampInfo {
+	std::string start, end;
+
+public:
+	MixRampInfo() = default;
+
+	void Clear() {
+		start.clear();
+		end.clear();
+	}
+
+	gcc_pure
+	bool IsDefined() const {
+		return !start.empty() || !end.empty();
+	}
+
+	gcc_pure
+	const char *GetStart() const {
+		return start.empty() ? nullptr : start.c_str();
+	}
+
+	gcc_pure
+	const char *GetEnd() const {
+		return end.empty() ? nullptr : end.c_str();
+	}
+
+	void SetStart(const char *new_value) {
+		if (new_value == nullptr)
+			start.clear();
+		else
+			start = new_value;
+	}
+
+	void SetStart(std::string &&new_value) {
+		start = std::move(new_value);
+	}
+
+	void SetEnd(const char *new_value) {
+		if (new_value == nullptr)
+			end.clear();
+		else
+			end = new_value;
+	}
+
+	void SetEnd(std::string &&new_value) {
+		end = std::move(new_value);
+	}
+};
+
+#endif
--- a/src/decoder_plugin.c
+++ b/src/decoder_plugin.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2011 The Music Player Daemon Project
+ * Copyright (C) 2003-2014 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -18,30 +18,36 @@
 */

 #include "config.h"
-#include "decoder_plugin.h"
-#include "string_util.h"
+#include "MusicBuffer.hxx"
+#include "MusicChunk.hxx"
+#include "system/FatalError.hxx"

 #include <assert.h>

-bool
-decoder_plugin_supports_suffix(const struct decoder_plugin *plugin,
-			       const char *suffix)
-{
-	assert(plugin != NULL);
-	assert(suffix != NULL);
-
-	return plugin->suffixes != NULL &&
-		string_array_contains(plugin->suffixes, suffix);
-
+MusicBuffer::MusicBuffer(unsigned num_chunks)
+	:buffer(num_chunks) {
+	if (buffer.IsOOM())
+		FatalError("Failed to allocate buffer");
 }

-bool
-decoder_plugin_supports_mime_type(const struct decoder_plugin *plugin,
-				  const char *mime_type)
+MusicChunk *
+MusicBuffer::Allocate()
 {
-	assert(plugin != NULL);
-	assert(mime_type != NULL);
-
-	return plugin->mime_types != NULL &&
-		string_array_contains(plugin->mime_types, mime_type);
+	const ScopeLock protect(mutex);
+	return buffer.Allocate();
+}
+
+void
+MusicBuffer::Return(MusicChunk *chunk)
+{
+	assert(chunk != nullptr);
+
+	const ScopeLock protect(mutex);
+
+	if (chunk->other != nullptr) {
+		assert(chunk->other->other == nullptr);
+		buffer.Free(chunk->other);
+	}
+
+	buffer.Free(chunk);
 }
--- a/src/MusicBuffer.hxx
+++ b/src/MusicBuffer.hxx
@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2003-2014 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_MUSIC_BUFFER_HXX
+#define MPD_MUSIC_BUFFER_HXX
+
+#include "util/SliceBuffer.hxx"
+#include "thread/Mutex.hxx"
+
+struct MusicChunk;
+
+/**
+ * An allocator for #MusicChunk objects.
+ */
+class MusicBuffer {
+	/** a mutex which protects #buffer */
+	Mutex mutex;
+
+	SliceBuffer<MusicChunk> buffer;
+
+public:
+	/**
+	 * Creates a new #MusicBuffer object.
+	 *
+	 * @param num_chunks the number of #MusicChunk reserved in
+	 * this buffer
+	 */
+	MusicBuffer(unsigned num_chunks);
+
+#ifndef NDEBUG
+	/**
+	 * Check whether the buffer is empty.  This call is not
+	 * protected with the mutex, and may only be used while this
+	 * object is inaccessible to other threads.
+	 */
+	bool IsEmptyUnsafe() const {
+		return buffer.IsEmpty();
+	}
+#endif
+
+	/**
+	 * Returns the total number of reserved chunks in this buffer.  This
+	 * is the same value which was passed to the constructor
+	 * music_buffer_new().
+	 */
+	gcc_pure
+	unsigned GetSize() const {
+		return buffer.GetCapacity();
+	}
+
+	/**
+	 * Allocates a chunk from the buffer.  When it is not used anymore,
+	 * call Return().
+	 *
+	 * @return an empty chunk or nullptr if there are no chunks
+	 * available
+	 */
+	MusicChunk *Allocate();
+
+	/**
+	 * Returns a chunk to the buffer.  It can be reused by
+	 * Allocate() then.
+	 */
+	void Return(MusicChunk *chunk);
+};
+
+#endif
--- a/src/MusicChunk.cxx
+++ b/src/MusicChunk.cxx
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2003-2014 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 "MusicChunk.hxx"
+#include "AudioFormat.hxx"
+#include "tag/Tag.hxx"
+
+#include <assert.h>
+
+MusicChunk::~MusicChunk()
+{
+	delete tag;
+}
+
+#ifndef NDEBUG
+bool
+MusicChunk::CheckFormat(const AudioFormat other_format) const
+{
+	assert(other_format.IsValid());
+
+	return length == 0 || audio_format == other_format;
+}
+#endif
+
+WritableBuffer<void>
+MusicChunk::Write(const AudioFormat af,
+		  SongTime data_time, uint16_t _bit_rate)
+{
+	assert(CheckFormat(af));
+	assert(length == 0 || audio_format.IsValid());
+
+	if (length == 0) {
+		/* if the chunk is empty, nobody has set bitRate and
+		   time yet */
+
+		bit_rate = _bit_rate;
+		time = data_time;
+
+#ifndef NDEBUG
+		audio_format = af;
+#endif
+	}
+
+	const size_t frame_size = af.GetFrameSize();
+	size_t num_frames = (sizeof(data) - length) / frame_size;
+	return { data + length, num_frames * frame_size };
+}
+
+bool
+MusicChunk::Expand(const AudioFormat af, size_t _length)
+{
+	const size_t frame_size = af.GetFrameSize();
+
+	assert(length + _length <= sizeof(data));
+	assert(audio_format == af);
+
+	length += _length;
+
+	return length + frame_size > sizeof(data);
+}
--- a/src/MusicChunk.hxx
+++ b/src/MusicChunk.hxx
@@ -0,0 +1,148 @@
+/*
+ * Copyright (C) 2003-2014 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_MUSIC_CHUNK_HXX
+#define MPD_MUSIC_CHUNK_HXX
+
+#include "Chrono.hxx"
+#include "ReplayGainInfo.hxx"
+#include "util/WritableBuffer.hxx"
+
+#ifndef NDEBUG
+#include "AudioFormat.hxx"
+#endif
+
+#include <stdint.h>
+#include <stddef.h>
+
+static constexpr size_t CHUNK_SIZE = 4096;
+
+struct AudioFormat;
+struct Tag;
+
+/**
+ * A chunk of music data.  Its format is defined by the
+ * MusicPipe::Push() caller.
+ */
+struct MusicChunk {
+	/** the next chunk in a linked list */
+	MusicChunk *next;
+
+	/**
+	 * An optional chunk which should be mixed into this chunk.
+	 * This is used for cross-fading.
+	 */
+	MusicChunk *other;
+
+	/**
+	 * The current mix ratio for cross-fading: 1.0 means play 100%
+	 * of this chunk, 0.0 means play 100% of the "other" chunk.
+	 */
+	float mix_ratio;
+
+	/** number of bytes stored in this chunk */
+	uint16_t length;
+
+	/** current bit rate of the source file */
+	uint16_t bit_rate;
+
+	/** the time stamp within the song */
+	SignedSongTime time;
+
+	/**
+	 * An optional tag associated with this chunk (and the
+	 * following chunks); appears at song boundaries.  The tag
+	 * object is owned by this chunk, and must be freed when this
+	 * chunk is deinitialized.
+	 */
+	Tag *tag;
+
+	/**
+	 * Replay gain information associated with this chunk.
+	 * Only valid if the serial is not 0.
+	 */
+	ReplayGainInfo replay_gain_info;
+
+	/**
+	 * A serial number for checking if replay gain info has
+	 * changed since the last chunk.  The magic value 0 indicates
+	 * that there is no replay gain info available.
+	 */
+	unsigned replay_gain_serial;
+
+	/** the data (probably PCM) */
+	uint8_t data[CHUNK_SIZE];
+
+#ifndef NDEBUG
+	AudioFormat audio_format;
+#endif
+
+	MusicChunk()
+		:other(nullptr),
+		 length(0),
+		 tag(nullptr),
+		 replay_gain_serial(0) {}
+
+	~MusicChunk();
+
+	bool IsEmpty() const {
+		return length == 0 && tag == nullptr;
+	}
+
+#ifndef NDEBUG
+	/**
+	 * Checks if the audio format if the chunk is equal to the
+	 * specified audio_format.
+	 */
+	gcc_pure
+	bool CheckFormat(AudioFormat audio_format) const;
+#endif
+
+	/**
+	 * Prepares appending to the music chunk.  Returns a buffer
+	 * where you may write into.  After you are finished, call
+	 * Expand().
+	 *
+	 * @param chunk the MusicChunk object
+	 * @param audio_format the audio format for the appended data;
+	 * must stay the same for the life cycle of this chunk
+	 * @param data_time the time within the song
+	 * @param bit_rate the current bit rate of the source file
+	 * @param max_length_r the maximum write length is returned
+	 * here
+	 * @return a writable buffer, or nullptr if the chunk is full
+	 */
+	WritableBuffer<void> Write(AudioFormat af,
+				   SongTime data_time,
+				   uint16_t bit_rate);
+
+	/**
+	 * Increases the length of the chunk after the caller has written to
+	 * the buffer returned by Write().
+	 *
+	 * @param chunk the MusicChunk object
+	 * @param audio_format the audio format for the appended data; must
+	 * stay the same for the life cycle of this chunk
+	 * @param length the number of bytes which were appended
+	 * @return true if the chunk is full
+	 */
+	bool Expand(AudioFormat af, size_t length);
+};
+
+#endif
--- a/src/MusicPipe.cxx
+++ b/src/MusicPipe.cxx
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2003-2014 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 "MusicPipe.hxx"
+#include "MusicBuffer.hxx"
+#include "MusicChunk.hxx"
+
+#ifndef NDEBUG
+
+bool
+MusicPipe::Contains(const MusicChunk *chunk) const
+{
+	const ScopeLock protect(mutex);
+
+	for (const MusicChunk *i = head; i != nullptr; i = i->next)
+		if (i == chunk)
+			return true;
+
+	return false;
+}
+
+#endif
+
+MusicChunk *
+MusicPipe::Shift()
+{
+	const ScopeLock protect(mutex);
+
+	MusicChunk *chunk = head;
+	if (chunk != nullptr) {
+		assert(!chunk->IsEmpty());
+
+		head = chunk->next;
+		--size;
+
+		if (head == nullptr) {
+			assert(size == 0);
+			assert(tail_r == &chunk->next);
+
+			tail_r = &head;
+		} else {
+			assert(size > 0);
+			assert(tail_r != &chunk->next);
+		}
+
+#ifndef NDEBUG
+		/* poison the "next" reference */
+		chunk->next = (MusicChunk *)(void *)0x01010101;
+
+		if (size == 0)
+			audio_format.Clear();
+#endif
+	}
+
+	return chunk;
+}
+
+void
+MusicPipe::Clear(MusicBuffer &buffer)
+{
+	MusicChunk *chunk;
+
+	while ((chunk = Shift()) != nullptr)
+		buffer.Return(chunk);
+}
+
+void
+MusicPipe::Push(MusicChunk *chunk)
+{
+	assert(!chunk->IsEmpty());
+	assert(chunk->length == 0 || chunk->audio_format.IsValid());
+
+	const ScopeLock protect(mutex);
+
+	assert(size > 0 || !audio_format.IsDefined());
+	assert(!audio_format.IsDefined() ||
+	       chunk->CheckFormat(audio_format));
+
+#ifndef NDEBUG
+	if (!audio_format.IsDefined() && chunk->length > 0)
+		audio_format = chunk->audio_format;
+#endif
+
+	chunk->next = nullptr;
+	*tail_r = chunk;
+	tail_r = &chunk->next;
+
+	++size;
+}
--- a/src/MusicPipe.hxx
+++ b/src/MusicPipe.hxx
@@ -0,0 +1,133 @@
+/*
+ * Copyright (C) 2003-2014 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_PIPE_H
+#define MPD_PIPE_H
+
+#include "thread/Mutex.hxx"
+#include "Compiler.h"
+
+#ifndef NDEBUG
+#include "AudioFormat.hxx"
+#endif
+
+#include <assert.h>
+
+struct MusicChunk;
+class MusicBuffer;
+
+/**
+ * A queue of #MusicChunk objects.  One party appends chunks at the
+ * tail, and the other consumes them from the head.
+ */
+class MusicPipe {
+	/** the first chunk */
+	MusicChunk *head;
+
+	/** a pointer to the tail of the chunk */
+	MusicChunk **tail_r;
+
+	/** the current number of chunks */
+	unsigned size;
+
+	/** a mutex which protects #head and #tail_r */
+	mutable Mutex mutex;
+
+#ifndef NDEBUG
+	AudioFormat audio_format;
+#endif
+
+public:
+	/**
+	 * Creates a new #MusicPipe object.  It is empty.
+	 */
+	MusicPipe()
+		:head(nullptr), tail_r(&head), size(0) {
+#ifndef NDEBUG
+		audio_format.Clear();
+#endif
+	}
+
+	/**
+	 * Frees the object.  It must be empty now.
+	 */
+	~MusicPipe() {
+		assert(head == nullptr);
+		assert(tail_r == &head);
+	}
+
+#ifndef NDEBUG
+	/**
+	 * Checks if the audio format if the chunk is equal to the specified
+	 * audio_format.
+	 */
+	gcc_pure
+	bool CheckFormat(AudioFormat other) const {
+		return !audio_format.IsDefined() ||
+			audio_format == other;
+	}
+
+	/**
+	 * Checks if the specified chunk is enqueued in the music pipe.
+	 */
+	gcc_pure
+	bool Contains(const MusicChunk *chunk) const;
+#endif
+
+	/**
+	 * Returns the first #MusicChunk from the pipe.  Returns
+	 * nullptr if the pipe is empty.
+	 */
+	gcc_pure
+	const MusicChunk *Peek() const {
+		return head;
+	}
+
+	/**
+	 * Removes the first chunk from the head, and returns it.
+	 */
+	MusicChunk *Shift();
+
+	/**
+	 * Clears the whole pipe and returns the chunks to the buffer.
+	 *
+	 * @param buffer the buffer object to return the chunks to
+	 */
+	void Clear(MusicBuffer &buffer);
+
+	/**
+	 * Pushes a chunk to the tail of the pipe.
+	 */
+	void Push(MusicChunk *chunk);
+
+	/**
+	 * Returns the number of chunks currently in this pipe.
+	 */
+	gcc_pure
+	unsigned GetSize() const {
+		return size;
+	}
+
+	gcc_pure
+	bool IsEmpty() const {
+		return GetSize() == 0;
+	}
+};
+
+#endif
--- a/src/Partition.cxx
+++ b/src/Partition.cxx
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2003-2014 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 "Partition.hxx"
+#include "DetachedSong.hxx"
+#include "output/MultipleOutputs.hxx"
+#include "mixer/Volume.hxx"
+#include "Idle.hxx"
+#include "GlobalEvents.hxx"
+
+#ifdef ENABLE_DATABASE
+
+void
+Partition::DatabaseModified(const Database &db)
+{
+	playlist.DatabaseModified(db);
+}
+
+#endif
+
+void
+Partition::TagModified()
+{
+	DetachedSong *song = pc.LockReadTaggedSong();
+	if (song != nullptr) {
+		playlist.TagModified(std::move(*song));
+		delete song;
+	}
+}
+
+void
+Partition::SyncWithPlayer()
+{
+	playlist.SyncWithPlayer(pc);
+}
+
+void
+Partition::OnPlayerSync()
+{
+	GlobalEvents::Emit(GlobalEvents::PLAYLIST);
+}
+
+void
+Partition::OnPlayerTagModified()
+{
+	GlobalEvents::Emit(GlobalEvents::TAG);
+}
+
+void
+Partition::OnMixerVolumeChanged(gcc_unused Mixer &mixer, gcc_unused int volume)
+{
+	InvalidateHardwareVolume();
+
+	/* notify clients */
+	idle_add(IDLE_MIXER);
+}
--- a/src/Partition.hxx
+++ b/src/Partition.hxx
@@ -0,0 +1,206 @@
+/*
+ * Copyright (C) 2003-2014 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_PARTITION_HXX
+#define MPD_PARTITION_HXX
+
+#include "queue/Playlist.hxx"
+#include "output/MultipleOutputs.hxx"
+#include "mixer/Listener.hxx"
+#include "PlayerControl.hxx"
+#include "PlayerListener.hxx"
+#include "Chrono.hxx"
+#include "Compiler.h"
+
+struct Instance;
+class MultipleOutputs;
+class SongLoader;
+
+/**
+ * A partition of the Music Player Daemon.  It is a separate unit with
+ * a playlist, a player, outputs etc.
+ */
+struct Partition final : private PlayerListener, private MixerListener {
+	Instance &instance;
+
+	struct playlist playlist;
+
+	MultipleOutputs outputs;
+
+	PlayerControl pc;
+
+	Partition(Instance &_instance,
+		  unsigned max_length,
+		  unsigned buffer_chunks,
+		  unsigned buffered_before_play)
+		:instance(_instance), playlist(max_length),
+		 outputs(*this),
+		 pc(*this, outputs, buffer_chunks, buffered_before_play) {}
+
+	void ClearQueue() {
+		playlist.Clear(pc);
+	}
+
+	unsigned AppendURI(const SongLoader &loader,
+			   const char *uri_utf8,
+			   Error &error) {
+		return playlist.AppendURI(pc, loader, uri_utf8, error);
+	}
+
+	PlaylistResult DeletePosition(unsigned position) {
+		return playlist.DeletePosition(pc, position);
+	}
+
+	PlaylistResult DeleteId(unsigned id) {
+		return playlist.DeleteId(pc, id);
+	}
+
+	/**
+	 * Deletes a range of songs from the playlist.
+	 *
+	 * @param start the position of the first song to delete
+	 * @param end the position after the last song to delete
+	 */
+	PlaylistResult DeleteRange(unsigned start, unsigned end) {
+		return playlist.DeleteRange(pc, start, end);
+	}
+
+#ifdef ENABLE_DATABASE
+
+	void DeleteSong(const char *uri) {
+		playlist.DeleteSong(pc, uri);
+	}
+
+#endif
+
+	void Shuffle(unsigned start, unsigned end) {
+		playlist.Shuffle(pc, start, end);
+	}
+
+	PlaylistResult MoveRange(unsigned start, unsigned end, int to) {
+		return playlist.MoveRange(pc, start, end, to);
+	}
+
+	PlaylistResult MoveId(unsigned id, int to) {
+		return playlist.MoveId(pc, id, to);
+	}
+
+	PlaylistResult SwapPositions(unsigned song1, unsigned song2) {
+		return playlist.SwapPositions(pc, song1, song2);
+	}
+
+	PlaylistResult SwapIds(unsigned id1, unsigned id2) {
+		return playlist.SwapIds(pc, id1, id2);
+	}
+
+	PlaylistResult SetPriorityRange(unsigned start_position,
+					unsigned end_position,
+					uint8_t priority) {
+		return playlist.SetPriorityRange(pc,
+						 start_position, end_position,
+						 priority);
+	}
+
+	PlaylistResult SetPriorityId(unsigned song_id,
+				     uint8_t priority) {
+		return playlist.SetPriorityId(pc, song_id, priority);
+	}
+
+	void Stop() {
+		playlist.Stop(pc);
+	}
+
+	PlaylistResult PlayPosition(int position) {
+		return playlist.PlayPosition(pc, position);
+	}
+
+	PlaylistResult PlayId(int id) {
+		return playlist.PlayId(pc, id);
+	}
+
+	void PlayNext() {
+		return playlist.PlayNext(pc);
+	}
+
+	void PlayPrevious() {
+		return playlist.PlayPrevious(pc);
+	}
+
+	PlaylistResult SeekSongPosition(unsigned song_position,
+					SongTime seek_time) {
+		return playlist.SeekSongPosition(pc, song_position, seek_time);
+	}
+
+	PlaylistResult SeekSongId(unsigned song_id, SongTime seek_time) {
+		return playlist.SeekSongId(pc, song_id, seek_time);
+	}
+
+	PlaylistResult SeekCurrent(SignedSongTime seek_time, bool relative) {
+		return playlist.SeekCurrent(pc, seek_time, relative);
+	}
+
+	void SetRepeat(bool new_value) {
+		playlist.SetRepeat(pc, new_value);
+	}
+
+	bool GetRandom() const {
+		return playlist.GetRandom();
+	}
+
+	void SetRandom(bool new_value) {
+		playlist.SetRandom(pc, new_value);
+	}
+
+	void SetSingle(bool new_value) {
+		playlist.SetSingle(pc, new_value);
+	}
+
+	void SetConsume(bool new_value) {
+		playlist.SetConsume(new_value);
+	}
+
+#ifdef ENABLE_DATABASE
+	/**
+	 * The database has been modified.  Propagate the change to
+	 * all subsystems.
+	 */
+	void DatabaseModified(const Database &db);
+#endif
+
+	/**
+	 * A tag in the play queue has been modified by the player
+	 * thread.  Propagate the change to all subsystems.
+	 */
+	void TagModified();
+
+	/**
+	 * Synchronize the player with the play queue.
+	 */
+	void SyncWithPlayer();
+
+private:
+	/* virtual methods from class PlayerListener */
+	virtual void OnPlayerSync() override;
+	virtual void OnPlayerTagModified() override;
+
+	/* virtual methods from class MixerListener */
+	virtual void OnMixerVolumeChanged(Mixer &mixer, int volume) override;
+};
+
+#endif
--- a/src/Permission.cxx
+++ b/src/Permission.cxx
@@ -0,0 +1,140 @@
+/*
+ * Copyright (C) 2003-2014 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 "Permission.hxx"
+#include "config/ConfigData.hxx"
+#include "config/ConfigGlobal.hxx"
+#include "config/ConfigOption.hxx"
+#include "system/FatalError.hxx"
+
+#include <algorithm>
+#include <map>
+#include <string>
+
+#include <assert.h>
+#include <string.h>
+
+static constexpr char PERMISSION_PASSWORD_CHAR = '@';
+static constexpr char PERMISSION_SEPARATOR = ',';
+
+static constexpr struct {
+	const char *name;
+	unsigned value;
+} permission_names[] = {
+	{ "read", PERMISSION_READ },
+	{ "add", PERMISSION_ADD },
+	{ "control", PERMISSION_CONTROL },
+	{ "admin", PERMISSION_ADMIN },
+	{ nullptr, 0 },
+};
+
+static std::map<std::string, unsigned> permission_passwords;
+
+static unsigned permission_default;
+
+gcc_pure
+static unsigned
+ParsePermission(const char *p)
+{
+	for (auto i = permission_names; i->name != nullptr; ++i)
+		if (strcmp(p, i->name) == 0)
+			return i->value;
+
+	FormatFatalError("unknown permission \"%s\"", p);
+}
+
+static unsigned parsePermissions(const char *string)
+{
+	assert(string != nullptr);
+
+	const char *const end = string + strlen(string);
+
+	unsigned permission = 0;
+	while (true) {
+		const char *comma = std::find(string, end,
+					      PERMISSION_SEPARATOR);
+		if (comma > string) {
+			const std::string name(string, comma);
+			permission |= ParsePermission(name.c_str());
+		}
+
+		if (comma == end)
+			break;
+
+		string = comma + 1;
+	}
+
+	return permission;
+}
+
+void initPermissions(void)
+{
+	unsigned permission;
+	const struct config_param *param;
+
+	permission_default = PERMISSION_READ | PERMISSION_ADD |
+	    PERMISSION_CONTROL | PERMISSION_ADMIN;
+
+	param = config_get_param(CONF_PASSWORD);
+
+	if (param) {
+		permission_default = 0;
+
+		do {
+			const char *separator =
+				strchr(param->value.c_str(),
+				       PERMISSION_PASSWORD_CHAR);
+
+			if (separator == NULL)
+				FormatFatalError("\"%c\" not found in password string "
+						 "\"%s\", line %i",
+						 PERMISSION_PASSWORD_CHAR,
+						 param->value.c_str(),
+						 param->line);
+
+			std::string password(param->value.c_str(), separator);
+
+			permission = parsePermissions(separator + 1);
+
+			permission_passwords.insert(std::make_pair(std::move(password),
+								   permission));
+		} while ((param = param->next) != nullptr);
+	}
+
+	param = config_get_param(CONF_DEFAULT_PERMS);
+
+	if (param)
+		permission_default = parsePermissions(param->value.c_str());
+}
+
+int getPermissionFromPassword(char const* password, unsigned* permission)
+{
+	auto i = permission_passwords.find(password);
+	if (i == permission_passwords.end())
+		return -1;
+
+	*permission = i->second;
+	return 0;
+}
+
+unsigned getDefaultPermissions(void)
+{
+	return permission_default;
+}
--- a/src/Permission.hxx
+++ b/src/Permission.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2011 The Music Player Daemon Project
+ * Copyright (C) 2003-2014 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -17,20 +17,17 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#ifndef MPD_PERMISSION_H
-#define MPD_PERMISSION_H
-
-#define PERMISSION_NONE    0
-#define PERMISSION_READ    1
-#define PERMISSION_ADD     2
-#define PERMISSION_CONTROL 4
-#define PERMISSION_ADMIN   8
+#ifndef MPD_PERMISSION_HXX
+#define MPD_PERMISSION_HXX

+static constexpr unsigned PERMISSION_NONE = 0;
+static constexpr unsigned PERMISSION_READ = 1;
+static constexpr unsigned PERMISSION_ADD = 2;
+static constexpr unsigned PERMISSION_CONTROL = 4;
+static constexpr unsigned PERMISSION_ADMIN = 8;

 int getPermissionFromPassword(char const* password, unsigned* permission);

-void finishPermissions(void);
-
 unsigned getDefaultPermissions(void);

 void initPermissions(void);
--- a/src/PlayerControl.cxx
+++ b/src/PlayerControl.cxx
@@ -0,0 +1,267 @@
+/*
+ * Copyright (C) 2003-2014 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 "PlayerControl.hxx"
+#include "Idle.hxx"
+#include "DetachedSong.hxx"
+
+#include <algorithm>
+
+#include <assert.h>
+
+PlayerControl::PlayerControl(PlayerListener &_listener,
+			     MultipleOutputs &_outputs,
+			     unsigned _buffer_chunks,
+			     unsigned _buffered_before_play)
+	:listener(_listener), outputs(_outputs),
+	 buffer_chunks(_buffer_chunks),
+	 buffered_before_play(_buffered_before_play),
+	 command(PlayerCommand::NONE),
+	 state(PlayerState::STOP),
+	 error_type(PlayerError::NONE),
+	 tagged_song(nullptr),
+	 next_song(nullptr),
+	 total_play_time(0),
+	 border_pause(false)
+{
+}
+
+PlayerControl::~PlayerControl()
+{
+	delete next_song;
+	delete tagged_song;
+}
+
+void
+PlayerControl::Play(DetachedSong *song)
+{
+	assert(song != nullptr);
+
+	Lock();
+
+	if (state != PlayerState::STOP)
+		SynchronousCommand(PlayerCommand::STOP);
+
+	assert(next_song == nullptr);
+
+	EnqueueSongLocked(song);
+
+	assert(next_song == nullptr);
+
+	Unlock();
+}
+
+void
+PlayerControl::Cancel()
+{
+	LockSynchronousCommand(PlayerCommand::CANCEL);
+	assert(next_song == nullptr);
+}
+
+void
+PlayerControl::Stop()
+{
+	LockSynchronousCommand(PlayerCommand::CLOSE_AUDIO);
+	assert(next_song == nullptr);
+
+	idle_add(IDLE_PLAYER);
+}
+
+void
+PlayerControl::UpdateAudio()
+{
+	LockSynchronousCommand(PlayerCommand::UPDATE_AUDIO);
+}
+
+void
+PlayerControl::Kill()
+{
+	assert(thread.IsDefined());
+
+	LockSynchronousCommand(PlayerCommand::EXIT);
+	thread.Join();
+
+	idle_add(IDLE_PLAYER);
+}
+
+void
+PlayerControl::PauseLocked()
+{
+	if (state != PlayerState::STOP) {
+		SynchronousCommand(PlayerCommand::PAUSE);
+		idle_add(IDLE_PLAYER);
+	}
+}
+
+void
+PlayerControl::Pause()
+{
+	Lock();
+	PauseLocked();
+	Unlock();
+}
+
+void
+PlayerControl::SetPause(bool pause_flag)
+{
+	Lock();
+
+	switch (state) {
+	case PlayerState::STOP:
+		break;
+
+	case PlayerState::PLAY:
+		if (pause_flag)
+			PauseLocked();
+		break;
+
+	case PlayerState::PAUSE:
+		if (!pause_flag)
+			PauseLocked();
+		break;
+	}
+
+	Unlock();
+}
+
+void
+PlayerControl::SetBorderPause(bool _border_pause)
+{
+	Lock();
+	border_pause = _border_pause;
+	Unlock();
+}
+
+player_status
+PlayerControl::GetStatus()
+{
+	player_status status;
+
+	Lock();
+	SynchronousCommand(PlayerCommand::REFRESH);
+
+	status.state = state;
+
+	if (state != PlayerState::STOP) {
+		status.bit_rate = bit_rate;
+		status.audio_format = audio_format;
+		status.total_time = total_time;
+		status.elapsed_time = elapsed_time;
+	}
+
+	Unlock();
+
+	return status;
+}
+
+void
+PlayerControl::SetError(PlayerError type, Error &&_error)
+{
+	assert(type != PlayerError::NONE);
+	assert(_error.IsDefined());
+
+	error_type = type;
+	error = std::move(_error);
+}
+
+void
+PlayerControl::ClearError()
+{
+	Lock();
+
+	if (error_type != PlayerError::NONE) {
+	    error_type = PlayerError::NONE;
+	    error.Clear();
+	}
+
+	Unlock();
+}
+
+void
+PlayerControl::LockSetTaggedSong(const DetachedSong &song)
+{
+	Lock();
+	delete tagged_song;
+	tagged_song = new DetachedSong(song);
+	Unlock();
+}
+
+void
+PlayerControl::ClearTaggedSong()
+{
+	delete tagged_song;
+	tagged_song = nullptr;
+}
+
+void
+PlayerControl::EnqueueSong(DetachedSong *song)
+{
+	assert(song != nullptr);
+
+	Lock();
+	EnqueueSongLocked(song);
+	Unlock();
+}
+
+bool
+PlayerControl::Seek(DetachedSong *song, SongTime t)
+{
+	assert(song != nullptr);
+
+	Lock();
+
+	delete next_song;
+	next_song = song;
+	seek_time = t;
+	SynchronousCommand(PlayerCommand::SEEK);
+	Unlock();
+
+	assert(next_song == nullptr);
+
+	idle_add(IDLE_PLAYER);
+
+	return true;
+}
+
+void
+PlayerControl::SetCrossFade(float _cross_fade_seconds)
+{
+	if (_cross_fade_seconds < 0)
+		_cross_fade_seconds = 0;
+	cross_fade.duration = _cross_fade_seconds;
+
+	idle_add(IDLE_OPTIONS);
+}
+
+void
+PlayerControl::SetMixRampDb(float _mixramp_db)
+{
+	cross_fade.mixramp_db = _mixramp_db;
+
+	idle_add(IDLE_OPTIONS);
+}
+
+void
+PlayerControl::SetMixRampDelay(float _mixramp_delay_seconds)
+{
+	cross_fade.mixramp_delay = _mixramp_delay_seconds;
+
+	idle_add(IDLE_OPTIONS);
+}
--- a/src/PlayerControl.hxx
+++ b/src/PlayerControl.hxx
@@ -0,0 +1,463 @@
+/*
+ * Copyright (C) 2003-2014 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_PLAYER_CONTROL_HXX
+#define MPD_PLAYER_CONTROL_HXX
+
+#include "AudioFormat.hxx"
+#include "thread/Mutex.hxx"
+#include "thread/Cond.hxx"
+#include "thread/Thread.hxx"
+#include "util/Error.hxx"
+#include "CrossFade.hxx"
+#include "Chrono.hxx"
+
+#include <stdint.h>
+
+class PlayerListener;
+class MultipleOutputs;
+class DetachedSong;
+
+enum class PlayerState : uint8_t {
+	STOP,
+	PAUSE,
+	PLAY
+};
+
+enum class PlayerCommand : uint8_t {
+	NONE,
+	EXIT,
+	STOP,
+	PAUSE,
+	SEEK,
+	CLOSE_AUDIO,
+
+	/**
+	 * At least one AudioOutput.enabled flag has been modified;
+	 * commit those changes to the output threads.
+	 */
+	UPDATE_AUDIO,
+
+	/** PlayerControl.next_song has been updated */
+	QUEUE,
+
+	/**
+	 * cancel pre-decoding PlayerControl.next_song; if the player
+	 * has already started playing this song, it will completely
+	 * stop
+	 */
+	CANCEL,
+
+	/**
+	 * Refresh status information in the #PlayerControl struct,
+	 * e.g. elapsed_time.
+	 */
+	REFRESH,
+};
+
+enum class PlayerError : uint8_t {
+	NONE,
+
+	/**
+	 * The decoder has failed to decode the song.
+	 */
+	DECODER,
+
+	/**
+	 * The audio output has failed.
+	 */
+	OUTPUT,
+};
+
+struct player_status {
+	PlayerState state;
+	uint16_t bit_rate;
+	AudioFormat audio_format;
+	SignedSongTime total_time;
+	SongTime elapsed_time;
+};
+
+struct PlayerControl {
+	PlayerListener &listener;
+
+	MultipleOutputs &outputs;
+
+	const unsigned buffer_chunks;
+
+	const unsigned buffered_before_play;
+
+	/**
+	 * The handle of the player thread.
+	 */
+	Thread thread;
+
+	/**
+	 * This lock protects #command, #state, #error, #tagged_song.
+	 */
+	mutable Mutex mutex;
+
+	/**
+	 * Trigger this object after you have modified #command.
+	 */
+	Cond cond;
+
+	/**
+	 * This object gets signalled when the player thread has
+	 * finished the #command.  It wakes up the client that waits
+	 * (i.e. the main thread).
+	 */
+	Cond client_cond;
+
+	PlayerCommand command;
+	PlayerState state;
+
+	PlayerError error_type;
+
+	/**
+	 * The error that occurred in the player thread.  This
+	 * attribute is only valid if #error is not
+	 * #PlayerError::NONE.  The object must be freed when this
+	 * object transitions back to #PlayerError::NONE.
+	 */
+	Error error;
+
+	/**
+	 * A copy of the current #DetachedSong after its tags have
+	 * been updated by the decoder (for example, a radio stream
+	 * that has sent a new tag after switching to the next song).
+	 * This shall be used by PlayerListener::OnPlayerTagModified()
+	 * to update the current #DetachedSong in the queue.
+	 *
+	 * Protected by #mutex.  Set by the PlayerThread and consumed
+	 * by the main thread.
+	 */
+	DetachedSong *tagged_song;
+
+	uint16_t bit_rate;
+	AudioFormat audio_format;
+	SignedSongTime total_time;
+	SongTime elapsed_time;
+
+	/**
+	 * The next queued song.
+	 *
+	 * This is a duplicate, and must be freed when this attribute
+	 * is cleared.
+	 */
+	DetachedSong *next_song;
+
+	SongTime seek_time;
+
+	CrossFadeSettings cross_fade;
+
+	double total_play_time;
+
+	/**
+	 * If this flag is set, then the player will be auto-paused at
+	 * the end of the song, before the next song starts to play.
+	 *
+	 * This is a copy of the queue's "single" flag most of the
+	 * time.
+	 */
+	bool border_pause;
+
+	PlayerControl(PlayerListener &_listener,
+		      MultipleOutputs &_outputs,
+		      unsigned buffer_chunks,
+		      unsigned buffered_before_play);
+	~PlayerControl();
+
+	/**
+	 * Locks the object.
+	 */
+	void Lock() const {
+		mutex.lock();
+	}
+
+	/**
+	 * Unlocks the object.
+	 */
+	void Unlock() const {
+		mutex.unlock();
+	}
+
+	/**
+	 * Signals the object.  The object should be locked prior to
+	 * calling this function.
+	 */
+	void Signal() {
+		cond.signal();
+	}
+
+	/**
+	 * Signals the object.  The object is temporarily locked by
+	 * this function.
+	 */
+	void LockSignal() {
+		Lock();
+		Signal();
+		Unlock();
+	}
+
+	/**
+	 * Waits for a signal on the object.  This function is only
+	 * valid in the player thread.  The object must be locked
+	 * prior to calling this function.
+	 */
+	void Wait() {
+		assert(thread.IsInside());
+
+		cond.wait(mutex);
+	}
+
+	/**
+	 * Wake up the client waiting for command completion.
+	 *
+	 * Caller must lock the object.
+	 */
+	void ClientSignal() {
+		assert(thread.IsInside());
+
+		client_cond.signal();
+	}
+
+	/**
+	 * The client calls this method to wait for command
+	 * completion.
+	 *
+	 * Caller must lock the object.
+	 */
+	void ClientWait() {
+		assert(!thread.IsInside());
+
+		client_cond.wait(mutex);
+	}
+
+	/**
+	 * A command has been finished.  This method clears the
+	 * command and signals the client.
+	 *
+	 * To be called from the player thread.  Caller must lock the
+	 * object.
+	 */
+	void CommandFinished() {
+		assert(command != PlayerCommand::NONE);
+
+		command = PlayerCommand::NONE;
+		ClientSignal();
+	}
+
+private:
+	/**
+	 * Wait for the command to be finished by the player thread.
+	 *
+	 * To be called from the main thread.  Caller must lock the
+	 * object.
+	 */
+	void WaitCommandLocked() {
+		while (command != PlayerCommand::NONE)
+			ClientWait();
+	}
+
+	/**
+	 * Send a command to the player thread and synchronously wait
+	 * for it to finish.
+	 *
+	 * To be called from the main thread.  Caller must lock the
+	 * object.
+	 */
+	void SynchronousCommand(PlayerCommand cmd) {
+		assert(command == PlayerCommand::NONE);
+
+		command = cmd;
+		Signal();
+		WaitCommandLocked();
+	}
+
+	/**
+	 * Send a command to the player thread and synchronously wait
+	 * for it to finish.
+	 *
+	 * To be called from the main thread.  This method locks the
+	 * object.
+	 */
+	void LockSynchronousCommand(PlayerCommand cmd) {
+		Lock();
+		SynchronousCommand(cmd);
+		Unlock();
+	}
+
+public:
+	/**
+	 * @param song the song to be queued; the given instance will
+	 * be owned and freed by the player
+	 */
+	void Play(DetachedSong *song);
+
+	/**
+	 * see PlayerCommand::CANCEL
+	 */
+	void Cancel();
+
+	void SetPause(bool pause_flag);
+
+private:
+	void PauseLocked();
+
+public:
+	void Pause();
+
+	/**
+	 * Set the player's #border_pause flag.
+	 */
+	void SetBorderPause(bool border_pause);
+
+	void Kill();
+
+	gcc_pure
+	player_status GetStatus();
+
+	PlayerState GetState() const {
+		return state;
+	}
+
+	/**
+	 * Set the error.  Discards any previous error condition.
+	 *
+	 * Caller must lock the object.
+	 *
+	 * @param type the error type; must not be #PlayerError::NONE
+	 * @param error detailed error information; must be defined.
+	 */
+	void SetError(PlayerError type, Error &&error);
+
+	/**
+	 * Checks whether an error has occurred, and if so, returns a
+	 * copy of the #Error object.
+	 *
+	 * Caller must lock the object.
+	 */
+	gcc_pure
+	Error GetError() const {
+		Error result;
+		if (error_type != PlayerError::NONE)
+			result.Set(error);
+		return result;
+	}
+
+	/**
+	 * Like GetError(), but locks and unlocks the object.
+	 */
+	gcc_pure
+	Error LockGetError() const {
+		Lock();
+		Error result = GetError();
+		Unlock();
+		return result;
+	}
+
+	void ClearError();
+
+	PlayerError GetErrorType() const {
+		return error_type;
+	}
+
+	/**
+	 * Set the #tagged_song attribute to a newly allocated copy of
+	 * the given #DetachedSong.  Locks and unlocks the object.
+	 */
+	void LockSetTaggedSong(const DetachedSong &song);
+
+	void ClearTaggedSong();
+
+	/**
+	 * Read and clear the #tagged_song attribute.
+	 *
+	 * Caller must lock the object.
+	 */
+	DetachedSong *ReadTaggedSong() {
+		DetachedSong *result = tagged_song;
+		tagged_song = nullptr;
+		return result;
+	}
+
+	/**
+	 * Like ReadTaggedSong(), but locks and unlocks the object.
+	 */
+	DetachedSong *LockReadTaggedSong() {
+		Lock();
+		DetachedSong *result = ReadTaggedSong();
+		Unlock();
+		return result;
+	}
+
+	void Stop();
+
+	void UpdateAudio();
+
+private:
+	void EnqueueSongLocked(DetachedSong *song) {
+		assert(song != nullptr);
+		assert(next_song == nullptr);
+
+		next_song = song;
+		SynchronousCommand(PlayerCommand::QUEUE);
+	}
+
+public:
+	/**
+	 * @param song the song to be queued; the given instance will be owned
+	 * and freed by the player
+	 */
+	void EnqueueSong(DetachedSong *song);
+
+	/**
+	 * Makes the player thread seek the specified song to a position.
+	 *
+	 * @param song the song to be queued; the given instance will be owned
+	 * and freed by the player
+	 * @return true on success, false on failure (e.g. if MPD isn't
+	 * playing currently)
+	 */
+	bool Seek(DetachedSong *song, SongTime t);
+
+	void SetCrossFade(float cross_fade_seconds);
+
+	float GetCrossFade() const {
+		return cross_fade.duration;
+	}
+
+	void SetMixRampDb(float mixramp_db);
+
+	float GetMixRampDb() const {
+		return cross_fade.mixramp_db;
+	}
+
+	void SetMixRampDelay(float mixramp_delay_seconds);
+
+	float GetMixRampDelay() const {
+		return cross_fade.mixramp_delay;
+	}
+
+	double GetTotalPlayTime() const {
+		return total_play_time;
+	}
+};
+
+#endif
--- a/src/PlayerListener.hxx
+++ b/src/PlayerListener.hxx
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2003-2014 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_PLAYER_LISTENER_HXX
+#define MPD_PLAYER_LISTENER_HXX
+
+class PlayerListener {
+public:
+	/**
+	 * Must call playlist_sync().
+	 */
+	virtual void OnPlayerSync() = 0;
+
+	/**
+	 * The current song's tag has changed.
+	 */
+	virtual void OnPlayerTagModified() = 0;
+};
+
+#endif
--- a/src/PlayerThread.cxx
+++ b/src/PlayerThread.cxx
--- a/Show More
+++ b/Show More