release v0.21.26

archive/iso9660: fix odd seeking bug (assertion failure)
Skip the beginning of a sector if the last seek was odd, and clear the buffer on seek.
2020-09-21 15:14:43 +02:00 · 2020-09-21 15:11:21 +02:00 · 2020-09-21 15:11:17 +02:00 · 2020-09-21 11:15:45 +02:00 · 2020-09-21 10:51:06 +02:00 · 2020-09-21 09:13:51 +02:00
1854 changed files with 165514 additions and 74911 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,61 +1,11 @@
-*.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
-stamp-h1
-tags
 *~
+
 .#*
 .stgit*
-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
+
+/output/
+
+__pycache__/
+
+/.clangd/
+/compile_commands.json
--- a/.travis.yml
+++ b/.travis.yml
@@ -0,0 +1,179 @@
+language: cpp
+
+jobs:
+  include:
+    # Ubuntu Bionic (18.04) with GCC 7
+    - os: linux
+      dist: bionic
+      addons:
+        apt:
+          sources:
+            - sourceline: 'ppa:deadsnakes/ppa' # for Python 3.7 (required by Meson)
+          packages:
+            - libgtest-dev
+            - libboost-dev
+            - python3.6
+            - python3-urllib3
+            - ninja-build
+      before_install:
+        - wget https://bootstrap.pypa.io/get-pip.py
+        - /usr/bin/python3.6 get-pip.py --user --no-cache-dir
+      install:
+        - /usr/bin/python3.6 $HOME/.local/bin/pip install --user meson --no-cache-dir
+      env:
+        - MATRIX_EVAL="export PATH=\$HOME/.local/bin:\$PATH"
+
+    # Ubuntu Bionic (18.04) with GCC 7 on big-endian
+    - os: linux
+      arch: s390x
+      dist: bionic
+      addons:
+        apt:
+          sources:
+            - sourceline: 'ppa:deadsnakes/ppa' # for Python 3.7 (required by Meson)
+          packages:
+            - libgtest-dev
+            - libboost-dev
+            - python3.6
+            - python3-urllib3
+            - ninja-build
+      before_install:
+        - wget https://bootstrap.pypa.io/get-pip.py
+        - /usr/bin/python3.6 get-pip.py --user --no-cache-dir
+      install:
+        - /usr/bin/python3.6 $HOME/.local/bin/pip install --user meson --no-cache-dir
+      env:
+        - MATRIX_EVAL="export PATH=\$HOME/.local/bin:\$PATH"
+
+    # Ubuntu Bionic (18.04) with GCC 7 on ARM64
+    - os: linux
+      arch: arm64
+      dist: bionic
+      addons:
+        apt:
+          sources:
+            - sourceline: 'ppa:deadsnakes/ppa' # for Python 3.7 (required by Meson)
+          packages:
+            - libgtest-dev
+            - libboost-dev
+            - python3.6
+            - python3-urllib3
+            - ninja-build
+      before_install:
+        - wget https://bootstrap.pypa.io/get-pip.py
+        - /usr/bin/python3.6 get-pip.py --user --no-cache-dir
+      install:
+        - /usr/bin/python3.6 $HOME/.local/bin/pip install --user meson --no-cache-dir
+      env:
+        - MATRIX_EVAL="export PATH=\$HOME/.local/bin:\$PATH"
+
+    # Ubuntu Trusty (16.04) with GCC 6
+    - os: linux
+      dist: trusty
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+            - sourceline: 'ppa:mhier/libboost-latest'
+            - sourceline: 'ppa:mstipicevic/ninja-build-1-7-2'
+            - sourceline: 'ppa:deadsnakes/ppa' # for Python 3.7 (required by Meson)
+          packages:
+            - g++-6
+            - libgtest-dev
+            - boost1.67
+            - python3.6
+            - python3-urllib3
+            - ninja-build
+      before_install:
+        - wget https://bootstrap.pypa.io/get-pip.py
+        - /usr/bin/python3.6 get-pip.py --user --no-cache-dir
+      install:
+        - /usr/bin/python3.6 $HOME/.local/bin/pip install --user meson --no-cache-dir
+      env:
+        # use gold as workaround for https://sourceware.org/bugzilla/show_bug.cgi?id=17068
+        - MATRIX_EVAL="export CC='ccache gcc-6' CXX='ccache g++-6' LDFLAGS=-fuse-ld=gold PATH=\$HOME/.local/bin:\$PATH"
+
+    # Ubuntu Trusty (16.04) with GCC 8
+    - os: linux
+      dist: trusty
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+            - sourceline: 'ppa:mhier/libboost-latest'
+            - sourceline: 'ppa:mstipicevic/ninja-build-1-7-2'
+            - sourceline: 'ppa:deadsnakes/ppa' # for Python 3.7 (required by Meson)
+          packages:
+            - g++-8
+            - libgtest-dev
+            - boost1.67
+            - python3.6
+            - python3-urllib3
+            - ninja-build
+      before_install:
+        - wget https://bootstrap.pypa.io/get-pip.py
+        - /usr/bin/python3.6 get-pip.py --user --no-cache-dir
+      install:
+        - /usr/bin/python3.6 $HOME/.local/bin/pip install --user meson --no-cache-dir
+      env:
+        # use gold as workaround for https://sourceware.org/bugzilla/show_bug.cgi?id=17068
+        - MATRIX_EVAL="export CC='ccache gcc-8' CXX='ccache g++-8' LDFLAGS=-fuse-ld=gold PATH=\$HOME/.local/bin:\$PATH"
+
+    - os: osx
+      osx_image: xcode9.4
+      addons:
+        homebrew:
+          packages:
+            - ccache
+            - meson
+            - icu4c
+            - ffmpeg
+            - libnfs
+            - yajl
+            - libupnp
+            - libid3tag
+            - chromaprint
+            - libsamplerate
+            - libsoxr
+            # libzzip appears to be broken on Homebrew: "ld: library not found for -lzzip"
+            #- libzzip
+            - flac
+            - opus
+            - libvorbis
+            - faad2
+            - wavpack
+            - libmpdclient
+          update: true
+      env:
+        - MATRIX_EVAL="export PATH=/usr/local/opt/ccache/libexec:$PATH HOMEBREW_NO_ANALYTICS=1"
+
+cache:
+  apt: true
+  ccache: true
+  directories:
+    - $HOME/Library/Caches/Homebrew
+
+before_cache:
+  - test "$TRAVIS_OS_NAME" != "osx" || brew cleanup
+
+before_install:
+  - eval "${MATRIX_EVAL}"
+
+install:
+  # C++14
+
+  # Work around "Target /usr/local/lib/libgtest.a is a symlink
+  # belonging to nss. You can unlink it" during gtest install
+  - test "$TRAVIS_OS_NAME" != "osx" || brew unlink nss
+
+  - test "$TRAVIS_OS_NAME" != "osx" || brew install https://gist.githubusercontent.com/Kronuz/96ac10fbd8472eb1e7566d740c4034f8/raw/gtest.rb
+
+before_script:
+  - ccache -s
+
+script:
+  - eval "${MATRIX_EVAL}"
+  - OPTIONS="-Dtest=true"
+  - meson . output --werror $OPTIONS
+  - ninja -C output -v test
+  - ccache -s
--- a/112
+++ b/112
@@ -1,67 +1,49 @@
-Current Developers
------------------
+Music Player Daemon - http://www.musicpd.org
+Copyright 2003-2018 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.kellermann@gmail.com>
+ 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>
+ Yue Wang <yuleopen@gmail.com>
+ Matthew Leon Grinshpun <ml@matthewleon.com>
+ Dimitris Papastamos <sin@2f30.org>
+ Florian Schlichting <fsfs@debian.org>
+ François Revol <revol@free.fr>
+ Jacob Vosmaer <contact@jacobvosmaer.nl>
+ Thomas Guillem <thomas@gllm.fr>
+ Andrew Basterfield <abasterfield@gmail.com>
+ Bart Nagel <bart@tremby.net>
+ Christian Kröner <ckroener@gmx.net>
+ Christopher Zimmermann <madroach@gmerlin.de>
+ John Regan <john@jrjrtech.com>
+ Joshua Wise <joshua@joshuawise.com>
+ Ryan Walklin
+ Stefan Roellin <stefan@roellin-baumann.ch>
+ Stefano Miccoli <stefano.miccoli@polimi.it>
+ Steven O'Brien <steven_obrien1@yahoo.co.uk>
+ Thomas Zander <thomas.e.zander@googlemail.com>
--- a/214
+++ b/214
@@ -1,214 +0,0 @@
-                       Music Player Daemon (MPD) - INSTALL
-
-
-Introduction
------------
-This document is a very small amount of documentation about what is needed to 
-install MPD. If more information is desired see the community wiki at 
-http://mpd.wikia.com.
-
-Dependencies
------------
-
-gcc - http://gcc.gnu.org/
-Any other C99 compliant compiler should also work.
-
-GLib 2.12 - http://www.gtk.org/
-General-purpose utility library.
-
-
-Optional Output Dependencies
----------------------------
-
-You will need at least one of these to compile MPD.
-
-Most of these are available as packages on major distributions.  Be sure to
-install both the library package as well as the development package.
-
-AO - http://www.xiph.org/ao/
-A portable library that abstracts many audio output types as one API.  Should
-be used only if there is no native plugin available or if the native plugin
-doesn't work.  You will need libao.
-
-ALSA - http://www.alsa-project.org/
-The Advanced Linux Sound Architecture.  Recommended audio output if you use
-Linux.  You will need libasound.
-
-FIFO
-This is a mostly undocumented, developer plugin to transmit raw data.
-
-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.
-
-JACK - http://www.jackaudio.org/
-A low-latency sound daemon.
-
-libshout - http://www.icecast.org/
-For streaming to an Icecast or Shoutcast server.
-You also need an encoder: either libvorbisenc (ogg), or liblame (mp3).
-
-OpenAL - http://kcat.strangesoft.net/openal.html
-Open Audio Library
-
-libffado - http://www.ffado.org/
-For FireWire audio devices.
-
-
-Optional Input Dependencies
---------------------------
-
-You will need at least one of these to compile MPD.
-
-Most of these are available as packages on major distributions.  Be sure to
-install both the library package as well as the development package.
-
-MAD - http://www.underbit.com/products/mad/
-For MP3 support.  You will need libmad, and optionally libid3tag if you want
-ID3 tag support.
-
-libmpg123 - http://www.mpg123.de/
-Alternative for MP3 support.
-
-Ogg Vorbis - http://www.xiph.org/ogg/vorbis/
-For Ogg Vorbis support.  You will need libogg and libvorbis.
-
-FLAC - http://flac.sourceforge.net/
-For FLAC support.  You will need version 1.1.0 or higher of libflac.
-
-OggFLAC - http://www.xiph.org/ogg/vorbis/ and http://flac.sourceforge.net/
-For OggFLAC support.  You will need liboggflac, which can be built from the
-FLAC sources if libogg is already installed.  Versions of flac 1.1.3 and
-greater will automatically detect and use OggFLAC if it's available.
-
-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.
-
-libmpcdec - http://www.musepack.net/
-For Musepack support.
-
-MikMod - http://mikmod.raphnet.net/
-For MOD support.  You will need libmikmod.
-
-libavcodec, libavformat (ffmpeg) - http://ffmpeg.mplayerhq.hu/
-Multi-codec library.
-
-libsidplay2 - http://sidplay2.sourceforge.net/
-For C64 SID support.
-
-libfluidsynth - http://fluidsynth.resonance.org/
-For MIDI support (DO NOT USE - use libwildmidi instead)
-
-libwildmidi - http://wildmidi.sourceforge.net/
-For MIDI support.
-
-libsndfile - http://www.mega-nerd.com/libsndfile/
-WAVE, AIFF, and many others.
-
-libwavpack - http://www.wavpack.com/
-For WavPack playback.
-
-
-Optional Miscellaneous Dependencies
-----------------------------------
-
-Avahi - http://www.avahi.org/
-For Zeroconf support.
-
-libsamplerate - http://www.mega-nerd.com/SRC/
-For advanced samplerate conversions.
-
-libcurl - http://curl.haxx.se/
-For playing HTTP streams.
-
-libmms - https://launchpad.net/libmms
-For playing MMS streams.
-
-SQLite - http://www.sqlite.org/
-For the sticker database.
-
-libcue - http://libcue.sourceforge.net/
-For CUE sheet support.
-
-
-pkg-config
----------
-
-MPD uses pkg-config to locate most external libraries.  If you do not
-have pkg-config, or if your version of the library does not ship the
-".pc" file, you have to provide the library's build options in
-environment variables.  These variables are documented in "./configure
--help".  Example:
-
- FLAC_CFLAGS=-I/usr/include/FLAC FLAC_LIBS=-lFLAC ./configure
-
-
-Download
--------
-
-Get the latest release from of MPD from <http://www.musicpd.org/>.
-
-Compile
-------
-
-1) unzip and untar the archive
-
-$ tar zxvf mpd-x.x.x.tar.gz
-
-or
-
-$ tar jxvf mpd-x.x.x.tar.bz2
-
-2) change to directory created
-
-$ cd mpd-x.x.x
-
-3) Run configure script (this will determine what dependencies you have)
-
-$ ./configure
-
-4) Compile
-
-$ make
-
-Install (Optional)
-------
-
-(as root)
-$ make install
-
-Run
---
-
-1) run mpd:
-
-$ mpd <config file>
-
-First default is ~/.mpdconf then ~/.mpd/mpd.conf then /etc/mpd.conf. If
-neither of these exist a mpd configuration file must be specified at
-runtime.
-
-A sample config file is included with the source of MPD, mpdconf.example.
-
-The first time MPD is run it will attempt to discover all music in your
-music root, recursively. This can be affected by the symbolic link 
-options specified in the example mpd.conf.
-
-Using MPD
---------
-
-You can download many different interfaces for MPD at 
-	<http://mpd.wikia.com/wiki/Clients>
-
-MPD can be interfaced directly using telnet (see COMMANDS, if you are brave).
--- a/Makefile.am
+++ b/Makefile.am
--- a/1469
+++ b/1469
--- a/17
+++ b/17
@@ -1,17 +0,0 @@
-
-		       Music Player Daemon (MPD)
-			http://www.musicpd.org
-
-A daemon for playing music of various formats.  Music is played through the 
-server's audio device.  The daemon stores info about all available music, 
-and this info can be easily searched and retrieved.  Player control, info
-retrieval, and playlist management can all be managed remotely.
-
-For basic installation information see the INSTALL file.
-
-MPD is released under the GNU General Public License version 2, which is
-distributed in the COPYING file.
-
-You should have received a copy of the GNU General Public License along with
-this program.  If not, see <http://www.gnu.org/licenses/>.
-
--- a/README.md
+++ b/README.md
@@ -0,0 +1,29 @@
+# Music Player Daemon
+
+http://www.musicpd.org
+
+A daemon for playing music of various formats.  Music is played through the 
+server's audio device.  The daemon stores info about all available music, 
+and this info can be easily searched and retrieved.  Player control, info
+retrieval, and playlist management can all be managed remotely.
+
+For basic installation instructions
+[read the manual](https://www.musicpd.org/doc/user/install.html).
+
+# Users
+
+- [Manual](http://www.musicpd.org/doc/user/)
+- [Forum](http://forum.musicpd.org/)
+- [IRC](irc://chat.freenode.net/#mpd)
+- [Bug tracker](https://github.com/MusicPlayerDaemon/MPD/issues/)
+
+# Developers
+
+- [Protocol specification](http://www.musicpd.org/doc/protocol/)
+- [Developer manual](http://www.musicpd.org/doc/developer/)
+
+# Legal
+
+MPD is released under the
+[GNU General Public License version 2](https://www.gnu.org/licenses/gpl-2.0.txt),
+which is distributed in the COPYING file.
--- a/92
+++ b/92
@@ -1,92 +0,0 @@
-                       Music Player Daemon (MPD) - UPGRADING
-
-Upgrading to 0.14
-----------------
-
-The filesystem character set is determined by GLib, if it is not
-configured.  GLib has an affinity towards UTF-8, while older MPD
-versions used to choose ISO-Latin-1.
-
-
-Upgrading to 0.13.0
-------------------
-
-JACK, Avahi, and libsamplerate have been added as optional dependencies.
-FLAC/OggFLAC now supports the 1.1.3 API, and libmikmod 3.2.0 betas are
-supported as well.
-
-New mpd.conf parameters include zeroconf_name, samplerate_converter, and
-gapless_mp3_playback.  See the mpd.conf man page or updated mpconf.example for
-more information on these parameters.
-
-Support for the ID3v2 "Original Artist/Performer" tag has been added.  Your
-MP3s will need to be rescanned for these tags to be included in the database.
-This can be done by running mpd --create-db.
-
-Upgrading to 0.12.0
-------------------
-
-The ao_driver and ao_driver_options config parameters have been removed and
-replaced with the audio_output config section.  You will have to update your
-config file to use this instead.  See the mpd.conf man page or the new
-mpdconf.example for details on specifying audio_output sections.
-
-The db_file parameter is no longer optional.  If you did not specify it in your
-old config file then you will have to add it in order to run 0.12.0.
-
-Support for OggFLAC and Musepack audio files has been added.  Additionally,
-scanning of MP3 files has been improved.  To make use of these updates it is
-highly recommended that you run mpd --create-db to recreate your entire
-database.
-
-Upgrading to 0.11.0
-------------------
-
-The database format has changed a little bit, but in a backward compatible way.
-This means that if you upgrade to 0.11.0 from 0.10.x, you do not need to make
-any changes.  However, if you downgrade back to 0.10.x, then you will need
-to recreate your db.
-
-The default port for MPD is now 6600, so update your mpd and client
-configurations appropriately.
-
-Upgrading to 0.10.0
-------------------
-
-All information is now stored in the db in UTF-8 format, and the character
-set used for the filesystem is stored in the db.  Thus, it is highly
-recommended that you recreate the db.  To do so, run mpd with the 
-"--create-db" command line option.  Also, note that the filesystem
-character set will be determined from your current locale settings.
-If your locale settings are not the same as those used for the filesystem,
-then use the config file parameter "filesystem_charset" to specify the
-correct character set (this maybe necessary if you create the db with root).
-
-Upgrading to 0.9.3
------------------
-
-Wave support was added, so to have your wave files added, update the db (mpc
-update).  
-
-Also, song lengths are now stored in the db.  To get this stuff
-added to the db, you will need to recreate the db from scratch.  To do this,
-run mpd with the "--create-db" commandline option. 
-
-Upgrading to 0.9.0
------------------
-
-The "stop_on_error" config parameter was removed, so be sure to remove this
-parameter from your config file.
-
-Upgrading to 0.8.x
------------------
-
-If you have FLACs, then to have them added to your list of available music,
-just use "update".
-
-Upgrading from 0.5.x to 0.6.x
-----------------------------
-If you have not compiled MPD with "make ogg", then nothing is needed.
-
-If you compiled with "make ogg", just use "update" (available via the phpMp
-interface) to add your OGGs to MPD's list of available music.
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -0,0 +1,48 @@
+<?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="49"
+          android:versionName="0.21.26">
+
+  <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28"/>
+
+  <uses-feature android:name="android.software.leanback"
+                android:required="false" />
+  <uses-feature android:name="android.hardware.touchscreen"
+                android:required="false" />
+
+  <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+  <uses-permission android:name="android.permission.WAKE_LOCK"/>
+  <uses-permission android:name="android.permission.INTERNET"/>
+  <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+  <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+
+  <application android:allowBackup="true"
+               android:icon="@drawable/icon"
+               android:banner="@drawable/icon"
+               android:label="@string/app_name">
+    <activity android:name=".Settings"
+              android:label="@string/app_name">
+      <intent-filter>
+        <action android:name="android.intent.action.MAIN" />
+        <category android:name="android.intent.category.LAUNCHER" />
+      </intent-filter>
+    </activity>
+    <activity android:name=".Settings"
+              android:label="@string/app_name" >
+      <intent-filter>
+        <action android:name="android.intent.action.MAIN" />
+        <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
+      </intent-filter>
+    </activity>
+
+    <receiver android:name=".Receiver">
+      <intent-filter>
+        <action android:name="android.intent.action.BOOT_COMPLETED" />
+      </intent-filter>
+    </receiver>
+    <service android:name=".Main" android:process=":main"/>
+  </application>
+
+</manifest>
--- a/android/apk/make-unsigned-apk.sh
+++ b/android/apk/make-unsigned-apk.sh
@@ -0,0 +1,21 @@
+#!/bin/sh -e
+
+S=`dirname "$0"`
+ANDROID_ABI=$1
+STRIP=$2
+ZIP=$3
+UNSIGNED_APK=$4
+LIBMPD_SO=$5
+CLASSES_DEX=$6
+RESOURCES_APK=$7
+D=`dirname "$UNSIGNED_APK"`
+
+rm -rf "$D/apk"
+mkdir -p "$D/apk/lib/$ANDROID_ABI"
+
+"$STRIP" "$LIBMPD_SO" -o "$D/apk/lib/$ANDROID_ABI/`basename $LIBMPD_SO`"
+cp "$CLASSES_DEX" "$D/apk/"
+cp "$RESOURCES_APK" "$UNSIGNED_APK"
+
+cd "$D/apk"
+exec zip -q -r -X "../`basename $UNSIGNED_APK`" .
--- a/android/apk/meson.build
+++ b/android/apk/meson.build
@@ -0,0 +1,59 @@
+unsigned_apk = custom_target(
+  'mpd-unsigned.apk',
+  output: 'mpd-unsigned.apk',
+  input: [mpd, classes_dex, resources_apk[0]],
+  command: [
+    join_paths(meson.current_source_dir(), 'make-unsigned-apk.sh'),
+    android_abi,
+    get_option('android_strip'),
+    zip,
+    '@OUTPUT0@',
+    '@INPUT@',
+  ],
+)
+
+if get_option('android_debug_keystore') != ''
+  debug_apk = custom_target(
+    'mpd-debug.apk',
+    output: 'mpd-debug.apk',
+    input: unsigned_apk,
+    command: [
+      jarsigner,
+      '-keystore', get_option('android_debug_keystore'),
+      '-storepass', 'android',
+      '-signedjar', '@OUTPUT@',
+      '@INPUT@',
+      'androiddebugkey',
+    ],
+    build_by_default: true
+  )
+endif
+
+if get_option('android_keystore') != '' and get_option('android_keyalias') != '' and get_option('android_keypass') != ''
+  unaligned_apk = custom_target(
+    'mpd-unaligned.apk',
+    output: 'mpd-unaligned.apk',
+    input: unsigned_apk,
+    command: [
+      jarsigner,
+      '-digestalg', 'SHA1', '-sigalg', 'MD5withRSA',
+      '-keystore', get_option('android_keystore'),
+      '-storepass', get_option('android_keypass'),
+      '-signedjar', '@OUTPUT@',
+      '@INPUT@',
+      get_option('android_keyalias'),
+    ],
+  )
+
+  apk = custom_target(
+    'mpd.apk',
+    output: 'mpd.apk',
+    input: unaligned_apk,
+    command: [
+      android_zipalign,
+      '-f', '4',
+      '@INPUT@', '@OUTPUT@',
+    ],
+    build_by_default: true
+  )
+endif
--- a/android/build.py
+++ b/android/build.py
@@ -0,0 +1,201 @@
+#!/usr/bin/env python3
+
+import os, os.path
+import sys, subprocess
+
+if len(sys.argv) < 4:
+    print("Usage: build.py SDK_PATH NDK_PATH ABI [configure_args...]", file=sys.stderr)
+    sys.exit(1)
+
+sdk_path = sys.argv[1]
+ndk_path = sys.argv[2]
+android_abi = sys.argv[3]
+configure_args = sys.argv[4:]
+
+if not os.path.isfile(os.path.join(sdk_path, 'tools', 'android')):
+    print("SDK not found in", ndk_path, file=sys.stderr)
+    sys.exit(1)
+
+if not os.path.isdir(ndk_path):
+    print("NDK not found in", ndk_path, file=sys.stderr)
+    sys.exit(1)
+
+android_abis = {
+    'armeabi-v7a': {
+        'arch': 'arm-linux-androideabi',
+        'ndk_arch': 'arm',
+        'toolchain_arch': 'arm-linux-androideabi',
+        'llvm_triple': 'armv7-linux-androideabi',
+        'cflags': '-fpic -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp',
+    },
+
+    'arm64-v8a': {
+        'arch': 'aarch64-linux-android',
+        'ndk_arch': 'arm64',
+        'toolchain_arch': 'aarch64-linux-android',
+        'llvm_triple': 'aarch64-linux-android',
+        'cflags': '-fpic',
+    },
+
+    'x86': {
+        'arch': 'i686-linux-android',
+        'ndk_arch': 'x86',
+        'toolchain_arch': 'x86',
+        'llvm_triple': 'i686-linux-android',
+        'cflags': '-fPIC -march=i686 -mtune=intel -mssse3 -mfpmath=sse -m32',
+    },
+
+    'x86_64': {
+        'arch': 'x86_64-linux-android',
+        'ndk_arch': 'x86_64',
+        'toolchain_arch': 'x86_64',
+        'llvm_triple': 'x86_64-linux-android',
+        'cflags': '-fPIC -m64',
+    },
+}
+
+# select the NDK target
+abi_info = android_abis[android_abi]
+arch = abi_info['arch']
+
+# the path to the MPD sources
+mpd_path = os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]) or '.', '..'))
+sys.path[0] = os.path.join(mpd_path, 'python')
+
+# output directories
+from build.dirs import lib_path, tarball_path, src_path
+from build.meson import configure as run_meson
+
+arch_path = os.path.join(lib_path, arch)
+build_path = os.path.join(arch_path, 'build')
+
+# build host configuration
+build_arch = 'linux-x86_64'
+
+# set up the NDK toolchain
+
+class AndroidNdkToolchain:
+    def __init__(self, tarball_path, src_path, build_path,
+                 use_cxx):
+        self.tarball_path = tarball_path
+        self.src_path = src_path
+        self.build_path = build_path
+
+        ndk_arch = abi_info['ndk_arch']
+        android_api_level = '21'
+
+        # select the NDK compiler
+        gcc_version = '4.9'
+
+        install_prefix = os.path.join(arch_path, 'root')
+
+        self.arch = arch
+        self.install_prefix = install_prefix
+
+        toolchain_path = os.path.join(ndk_path, 'toolchains', abi_info['toolchain_arch'] + '-' + gcc_version, 'prebuilt', build_arch)
+        llvm_path = os.path.join(ndk_path, 'toolchains', 'llvm', 'prebuilt', build_arch)
+        llvm_triple = abi_info['llvm_triple'] + android_api_level
+
+        common_flags = '-Os -g'
+        common_flags += ' ' + abi_info['cflags']
+
+        toolchain_bin = os.path.join(toolchain_path, 'bin')
+        llvm_bin = os.path.join(llvm_path, 'bin')
+        self.cc = os.path.join(llvm_bin, 'clang')
+        self.cxx = os.path.join(llvm_bin, 'clang++')
+        common_flags += ' -target ' + llvm_triple + ' -integrated-as -gcc-toolchain ' + toolchain_path
+
+        common_flags += ' -fvisibility=hidden -fdata-sections -ffunction-sections'
+
+        # required flags from https://android.googlesource.com/platform/ndk/+/ndk-release-r20/docs/BuildSystemMaintainers.md#additional-required-arguments
+        common_flags += ' -fno-addrsig'
+
+        self.ar = os.path.join(toolchain_bin, arch + '-ar')
+        self.ranlib = os.path.join(toolchain_bin, arch + '-ranlib')
+        self.nm = os.path.join(toolchain_bin, arch + '-nm')
+        self.strip = os.path.join(toolchain_bin, arch + '-strip')
+
+        self.cflags = common_flags
+        self.cxxflags = common_flags
+        self.cppflags = ' -isystem ' + os.path.join(install_prefix, 'include')
+        self.ldflags = ' -L' + os.path.join(install_prefix, 'lib') + \
+            ' -Wl,--exclude-libs=ALL' + \
+            ' ' + common_flags
+        self.ldflags = common_flags
+        self.libs = ''
+
+        self.is_arm = ndk_arch == 'arm'
+        self.is_armv7 = self.is_arm and 'armv7' in self.cflags
+        self.is_aarch64 = ndk_arch == 'arm64'
+        self.is_windows = False
+
+        libstdcxx_flags = ''
+        libstdcxx_cxxflags = ''
+        libstdcxx_ldflags = ''
+        libstdcxx_libs = '-static-libstdc++'
+
+        if self.is_armv7:
+            # On 32 bit ARM, clang generates no ".eh_frame" section;
+            # instead, the LLVM unwinder library is used for unwinding
+            # the stack after a C++ exception was thrown
+            libstdcxx_libs += ' -lunwind'
+
+        if use_cxx:
+            self.cxxflags += ' ' + libstdcxx_cxxflags
+            self.ldflags += ' ' + libstdcxx_ldflags
+            self.libs += ' ' + libstdcxx_libs
+
+        self.env = dict(os.environ)
+
+        # redirect pkg-config to use our root directory instead of the
+        # default one on the build host
+        import shutil
+        bin_dir = os.path.join(install_prefix, 'bin')
+        try:
+            os.makedirs(bin_dir)
+        except:
+            pass
+        self.pkg_config = shutil.copy(os.path.join(mpd_path, 'build', 'pkg-config.sh'),
+                                      os.path.join(bin_dir, 'pkg-config'))
+        self.env['PKG_CONFIG'] = self.pkg_config
+
+# a list of third-party libraries to be used by MPD on Android
+from build.libs import *
+thirdparty_libs = [
+    libmpdclient,
+    libogg,
+    libvorbis,
+    opus,
+    flac,
+    libid3tag,
+    libmodplug,
+    wildmidi,
+    gme,
+    ffmpeg,
+    curl,
+    libexpat,
+    libnfs,
+    boost,
+]
+
+# build the third-party libraries
+for x in thirdparty_libs:
+    toolchain = AndroidNdkToolchain(tarball_path, src_path, build_path,
+                                    use_cxx=x.use_cxx)
+    if not x.is_installed(toolchain):
+        x.build(toolchain)
+
+# configure and build MPD
+toolchain = AndroidNdkToolchain(tarball_path, src_path, build_path,
+                                use_cxx=True)
+
+configure_args += [
+    '-Dandroid_sdk=' + sdk_path,
+    '-Dandroid_ndk=' + ndk_path,
+    '-Dandroid_abi=' + android_abi,
+    '-Dandroid_strip=' + toolchain.strip,
+]
+
+from build.meson import configure as run_meson
+run_meson(toolchain, mpd_path, '.', configure_args)
+subprocess.check_call(['/usr/bin/ninja'], env=toolchain.env)
--- a/android/custom_rules.xml
+++ b/android/custom_rules.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="mpd_rules">
+  <!-- setting these two properties works around a bug in Android
+       SDK's build.xml, which deletes all .class files every time -->
+  <property name="build.last.is.packaging.debug" value="true" />
+  <property name="build.is.packaging.debug" value="true" />
+
+  <target name="compile-jni-classes"
+          depends="-set-debug-mode,-compile"/>
+</project>
--- a/android/make-resources-apk.sh
+++ b/android/make-resources-apk.sh
@@ -0,0 +1,24 @@
+#!/bin/sh -e
+
+S=`dirname "$0"`
+AAPT=$1
+BASE_JAR=$2
+JAVA_PKG=$3
+JAVA_PKG_PATH=$4
+APK_FILE="$5"
+D=`dirname "$APK_FILE"`
+
+rm -rf "$D/res"
+mkdir -p "$D/res/drawable" "$D/src"
+cp "$D/icon.png" "$D/notification_icon.png"  "$D/res/drawable/"
+
+"$AAPT" package -f -m --auto-add-overlay \
+  --custom-package "$JAVA_PKG" \
+  -M "$S/AndroidManifest.xml" \
+  -S "$D/res" \
+  -S "$S/res" \
+  -J "$D/src" \
+  -I "$BASE_JAR" \
+  -F "$D/resources.apk"
+
+cp "$D/src/$JAVA_PKG_PATH/R.java" "$D/"
--- a/android/meson.build
+++ b/android/meson.build
@@ -0,0 +1,140 @@
+android_package = 'org.musicpd'
+android_package_path = join_paths(android_package.split('.'))
+
+android_ndk = get_option('android_ndk')
+android_sdk = get_option('android_sdk')
+android_abi = get_option('android_abi')
+
+android_sdk_build_tools_version = '27.0.0'
+android_sdk_platform = 'android-23'
+
+android_build_tools_dir = join_paths(android_sdk, 'build-tools', android_sdk_build_tools_version)
+android_sdk_platform_dir = join_paths(android_sdk, 'platforms', android_sdk_platform)
+
+android_aidl = join_paths(android_build_tools_dir, 'aidl')
+android_aapt = join_paths(android_build_tools_dir, 'aapt')
+android_dx = join_paths(android_build_tools_dir, 'dx')
+android_zipalign = join_paths(android_build_tools_dir, 'zipalign')
+
+javac = find_program('javac')
+jarsigner = find_program('jarsigner')
+rsvg_convert = find_program('rsvg-convert')
+convert = find_program('convert')
+zip = find_program('zip')
+
+common_cppflags += '-I' + join_paths(meson.current_build_dir(), 'include')
+
+#
+# AIDL
+#
+
+IMainCallback_java = custom_target(
+  'IMainCallback.java',
+  output: 'IMainCallback.java',
+  input: join_paths(meson.current_source_dir(), 'src', 'IMainCallback.aidl'),
+  command: [
+    join_paths(meson.current_source_dir(), 'run-aidl.sh'),
+    android_aidl,
+    '@INPUT@',
+    '@OUTPUT@',
+    join_paths(meson.current_build_dir(), 'src'),
+    android_package_path,
+  ],
+)
+
+IMain_java = custom_target(
+  'IMain.java',
+  output: 'IMain.java',
+  input: join_paths(meson.current_source_dir(), 'src', 'IMain.aidl'),
+  depends: IMainCallback_java,
+  command: [
+    join_paths(meson.current_source_dir(), 'run-aidl.sh'),
+    android_aidl,
+    '@INPUT@',
+    '@OUTPUT@',
+    join_paths(meson.current_build_dir(), 'src'),
+    android_package_path,
+  ],
+)
+
+#
+# Resources
+#
+
+android_icon = custom_target(
+  'Android icon',
+  output: 'icon.png',
+  input: '../mpd.svg',
+  command: [
+    rsvg_convert, '--width=48', '--height=48', '@INPUT@', '-o', '@OUTPUT@',
+  ],
+)
+
+android_notification_icon = custom_target(
+  'Android notification icon',
+  output: 'notification_icon.png',
+  input: android_icon,
+  command: [
+    convert, '@INPUT@', '-colorspace', 'Gray', '-gamma', '2.2', '@OUTPUT@',
+  ],
+)
+
+resources_apk = custom_target(
+  'resources.apk',
+  output: ['resources.apk', 'R.java'],
+  input: [
+    'res/layout/custom_notification_gb.xml',
+    'res/layout/log_item.xml',
+    'res/layout/settings.xml',
+    'res/values/strings.xml',
+    android_icon,
+    android_notification_icon,
+  ],
+  command: [
+    join_paths(meson.current_source_dir(), 'make-resources-apk.sh'),
+    android_aapt,
+    join_paths(android_sdk_platform_dir, 'android.jar'),
+    android_package,
+    android_package_path,
+    '@OUTPUT0@',
+  ],
+)
+
+#
+# Compile Java
+#
+
+classes_jar = custom_target(
+  'classes.jar',
+  output: 'classes.jar',
+  input: [
+    'src/Bridge.java',
+    'src/Loader.java',
+    'src/Main.java',
+    'src/Receiver.java',
+    'src/Settings.java',
+    IMain_java,
+    IMainCallback_java,
+    resources_apk[1],
+  ],
+  command: [
+    join_paths(meson.current_source_dir(), 'run-javac.sh'),
+    javac,
+    join_paths(android_sdk_platform_dir, 'android.jar'),
+    android_package_path,
+    zip,
+    '@OUTPUT@',
+    '@INPUT@',
+  ],
+)
+
+classes_dex = custom_target(
+  'classes.dex',
+  output: 'classes.dex',
+  input: classes_jar,
+  command: [
+    android_dx,
+    '--dex', '--output', '@OUTPUT@',
+    '@INPUT@',
+  ],
+)
--- a/android/res/layout/custom_notification_gb.xml
+++ b/android/res/layout/custom_notification_gb.xml
@@ -0,0 +1,22 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/layout"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:padding="10dp" >
+    <ImageView android:id="@+id/image"
+        android:layout_width="wrap_content"
+        android:layout_height="fill_parent"
+        android:layout_alignParentLeft="true"
+        android:layout_marginRight="10dp" />
+    <TextView android:id="@+id/title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_toRightOf="@id/image"
+        style="Custom Notification Title" />
+    <TextView android:id="@+id/text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_toRightOf="@id/image"
+        android:layout_below="@id/title"
+        style="Custom Notification Text" />
+</RelativeLayout>
--- a/android/res/layout/log_item.xml
+++ b/android/res/layout/log_item.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:typeface="monospace" />
--- a/android/res/layout/settings.xml
+++ b/android/res/layout/settings.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical" >
+
+    <ToggleButton
+        android:id="@+id/run"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textOn="@string/toggle_button_run_on"
+        android:textOff="@string/toggle_button_run_off" />
+
+    <CheckBox
+        android:id="@+id/run_on_boot"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/checkbox_run_on_boot" />
+
+    <CheckBox
+        android:id="@+id/wakelock"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/checkbox_wakelock" />
+
+    <TextView
+        android:id="@+id/status"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+    <ListView
+		android:id="@+id/log_list"
+	    android:layout_width="match_parent"
+	    android:layout_height="wrap_content"
+	    android:paddingTop="10dip" />
+
+</LinearLayout>
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<resources>
+  <string name="app_name">MPD</string>
+  <string name="notification_title_mpd_running">Music Player Daemon is running</string>
+  <string name="notification_text_mpd_running">Touch for MPD options.</string>
+  <string name="toggle_button_run_on">MPD is running</string>
+  <string name="toggle_button_run_off">MPD is not running</string>
+  <string name="checkbox_run_on_boot">Run MPD automatically on boot</string>
+  <string name="checkbox_wakelock">Prevent suspend when MPD is running (Wakelock)</string>
+</resources>
--- a/android/run-aidl.sh
+++ b/android/run-aidl.sh
@@ -0,0 +1,12 @@
+#!/bin/sh -e
+
+AIDL=$1
+SRC=$2
+DST=$3
+GENSRC=$4
+JAVA_PKG_PATH=$5
+
+mkdir -p "$GENSRC/$JAVA_PKG_PATH"
+cp "$SRC" "$GENSRC/$JAVA_PKG_PATH/"
+"$AIDL" -I"$GENSRC" -o"$GENSRC" "$GENSRC/$JAVA_PKG_PATH/`basename $SRC`"
+exec cp "$GENSRC/$JAVA_PKG_PATH/`basename $DST`" "$DST"
--- a/android/run-javac.sh
+++ b/android/run-javac.sh
@@ -0,0 +1,22 @@
+#!/bin/sh -e
+
+JAVAC=$1
+CLASSPATH=$2
+JAVA_PKG_PATH=$3
+ZIP=$4
+JARFILE=`realpath "$5"`
+shift 5
+
+D=`dirname "$JARFILE"`
+GENSRC="$D/src"
+GENCLASS="$D/classes"
+GENINCLUDE="$D/include"
+
+mkdir -p "$GENSRC/$JAVA_PKG_PATH"
+"$JAVAC" -source 1.6 -target 1.6 -Xlint:-options \
+	 -cp "$CLASSPATH" \
+	 -h "$GENINCLUDE" \
+	 -d "$GENCLASS" \
+	 "$@"
+cd "$GENCLASS"
+zip -q -r "$JARFILE" .
--- a/android/src/Bridge.java
+++ b/android/src/Bridge.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2003-2018 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 {
+
+	/* used by jni */
+	public interface LogListener {
+		public void onLog(int priority, String msg);
+	}
+
+	public static native void run(Context context, LogListener logListener);
+	public static native void shutdown();
+}
--- a/android/src/IMain.aidl
+++ b/android/src/IMain.aidl
@@ -0,0 +1,12 @@
+package org.musicpd;
+import org.musicpd.IMainCallback;
+
+interface IMain
+{
+    void start();
+    void stop();
+    void setWakelockEnabled(boolean enabled);
+    boolean isRunning();
+    void registerCallback(IMainCallback cb);
+    void unregisterCallback(IMainCallback cb);
+}
--- a/android/src/IMainCallback.aidl
+++ b/android/src/IMainCallback.aidl
@@ -0,0 +1,9 @@
+package org.musicpd;
+
+interface IMainCallback
+{
+    void onStarted();
+    void onStopped();
+    void onError(String error);
+    void onLog(int priority, String msg);
+}
--- a/android/src/Loader.java
+++ b/android/src/Loader.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2003-2018 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,419 @@
+/*
+ * Copyright 2003-2018 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.annotation.TargetApi;
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.app.Service;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.ServiceConnection;
+import android.os.Build;
+import android.os.IBinder;
+import android.os.PowerManager;
+import android.os.RemoteCallbackList;
+import android.os.RemoteException;
+import android.util.Log;
+import android.widget.RemoteViews;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+
+public class Main extends Service implements Runnable {
+	private static final String TAG = "Main";
+	private static final String REMOTE_ERROR = "MPD process was killed";
+	private static final int MAIN_STATUS_ERROR = -1;
+	private static final int MAIN_STATUS_STOPPED = 0;
+	private static final int MAIN_STATUS_STARTED = 1;
+
+	private static final int MSG_SEND_STATUS = 0;
+	private static final int MSG_SEND_LOG = 1;
+
+	private Thread mThread = null;
+	private int mStatus = MAIN_STATUS_STOPPED;
+	private boolean mAbort = false;
+	private String mError = null;
+	private final RemoteCallbackList<IMainCallback> mCallbacks = new RemoteCallbackList<IMainCallback>();
+	private final IBinder mBinder = new MainStub(this);
+	private PowerManager.WakeLock mWakelock = null;
+
+	static class MainStub extends IMain.Stub {
+		private Main mService;
+		MainStub(Main service) {
+			mService = service;
+		}
+		public void start() {
+			mService.start();
+		}
+		public void stop() {
+			mService.stop();
+		}
+		public void setWakelockEnabled(boolean enabled) {
+			mService.setWakelockEnabled(enabled);
+		}
+		public boolean isRunning() {
+			return mService.isRunning();
+		}
+		public void registerCallback(IMainCallback cb) {
+			mService.registerCallback(cb);
+		}
+		public void unregisterCallback(IMainCallback cb) {
+			mService.unregisterCallback(cb);
+		}
+	}
+
+	private synchronized void sendMessage(int what, int arg1, int arg2, Object obj) {
+		int i = mCallbacks.beginBroadcast();
+		while (i > 0) {
+			i--;
+			final IMainCallback cb = mCallbacks.getBroadcastItem(i);
+			try {
+				switch (what) {
+				case MSG_SEND_STATUS:
+					switch (arg1) {
+					case MAIN_STATUS_ERROR:
+						cb.onError((String)obj);
+						break;
+					case MAIN_STATUS_STOPPED:
+						cb.onStopped();
+						break;
+					case MAIN_STATUS_STARTED:
+						cb.onStarted();
+						break;
+					}
+					break;
+				case MSG_SEND_LOG:
+					cb.onLog(arg1, (String) obj);
+					break;
+				}
+			} catch (RemoteException e) {
+			}
+		}
+		mCallbacks.finishBroadcast();
+	}
+
+	private Bridge.LogListener mLogListener = new Bridge.LogListener() {
+		@Override
+		public void onLog(int priority, String msg) {
+			sendMessage(MSG_SEND_LOG, priority, 0, msg);
+		}
+	};
+
+	@Override
+	public IBinder onBind(Intent intent) {
+		return mBinder;
+	}
+
+	@Override
+	public int onStartCommand(Intent intent, int flags, int startId) {
+		start();
+		if (intent != null && intent.getBooleanExtra("wakelock", false))
+			setWakelockEnabled(true);
+		return START_STICKY;
+	}
+
+	@Override
+	public void run() {
+		if (!Loader.loaded) {
+			final String error = "Failed to load the native MPD libary.\n" +
+				"Report this problem to us, and include the following information:\n" +
+				"SUPPORTED_ABIS=" + String.join(", ", Build.SUPPORTED_ABIS) + "\n" +
+				"PRODUCT=" + Build.PRODUCT + "\n" +
+				"FINGERPRINT=" + Build.FINGERPRINT + "\n" +
+				"error=" + Loader.error;
+			setStatus(MAIN_STATUS_ERROR, error);
+			stopSelf();
+			return;
+		}
+		synchronized (this) {
+			if (mAbort)
+				return;
+			setStatus(MAIN_STATUS_STARTED, null);
+		}
+		Bridge.run(this, mLogListener);
+		setStatus(MAIN_STATUS_STOPPED, null);
+	}
+
+	private synchronized void setStatus(int status, String error) {
+		mStatus = status;
+		mError = error;
+		sendMessage(MSG_SEND_STATUS, mStatus, 0, mError);
+	}
+
+	private Notification.Builder createNotificationBuilderWithChannel() {
+		final NotificationManager notificationManager = (NotificationManager) this.getSystemService(Context.NOTIFICATION_SERVICE);
+		if (notificationManager == null)
+			return null;
+
+		final String id = "org.musicpd";
+		final String name = "MPD service";
+		final int importance = 3; /* NotificationManager.IMPORTANCE_DEFAULT */
+
+		try {
+			Class<?> ncClass = Class.forName("android.app.NotificationChannel");
+			Constructor<?> ncCtor = ncClass.getConstructor(String.class, CharSequence.class, int.class);
+			Object nc = ncCtor.newInstance(id, name, importance);
+
+			Method nmCreateNotificationChannelMethod =
+				NotificationManager.class.getMethod("createNotificationChannel", ncClass);
+			nmCreateNotificationChannelMethod.invoke(notificationManager, nc);
+
+			Constructor nbCtor = Notification.Builder.class.getConstructor(Context.class, String.class);
+			return (Notification.Builder) nbCtor.newInstance(this, id);
+		} catch (Exception e)
+		{
+			Log.e(TAG, "error creating the NotificationChannel", e);
+			return null;
+		}
+	}
+
+	private void start() {
+		if (mThread != null)
+			return;
+
+		final Intent mainIntent = new Intent(this, Settings.class);
+		mainIntent.setAction("android.intent.action.MAIN");
+		mainIntent.addCategory("android.intent.category.LAUNCHER");
+		final PendingIntent contentIntent = PendingIntent.getActivity(this, 0,
+				mainIntent, PendingIntent.FLAG_CANCEL_CURRENT);
+
+		Notification.Builder nBuilder;
+		if (Build.VERSION.SDK_INT >= 26 /* Build.VERSION_CODES.O */)
+		{
+			nBuilder = createNotificationBuilderWithChannel();
+			if (nBuilder == null)
+				return;
+		}
+		else
+			nBuilder = new Notification.Builder(this);
+
+		Notification notification = nBuilder.setContentTitle(getText(R.string.notification_title_mpd_running))
+			.setContentText(getText(R.string.notification_text_mpd_running))
+			.setSmallIcon(R.drawable.notification_icon)
+			.setContentIntent(contentIntent)
+			.build();
+
+		mThread = new Thread(this);
+		mThread.start();
+
+		startForeground(R.string.notification_title_mpd_running, notification);
+		startService(new Intent(this, Main.class));
+	}
+
+	private void stop() {
+		if (mThread != null) {
+			if (mThread.isAlive()) {
+				synchronized (this) {
+					if (mStatus == MAIN_STATUS_STARTED)
+						Bridge.shutdown();
+					else
+						mAbort = true;
+				}
+			}
+			try {
+				mThread.join();
+				mThread = null;
+				mAbort = false;
+			} catch (InterruptedException ie) {}
+		}
+		setWakelockEnabled(false);
+		stopForeground(true);
+		stopSelf();
+	}
+
+	private void setWakelockEnabled(boolean enabled) {
+		if (enabled && mWakelock == null) {
+			PowerManager pm = (PowerManager)getSystemService(Context.POWER_SERVICE);
+			mWakelock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, TAG);
+			mWakelock.acquire();
+			Log.d(TAG, "Wakelock acquired");
+		} else if (!enabled && mWakelock != null) {
+			mWakelock.release();
+			mWakelock = null;
+			Log.d(TAG, "Wakelock released");
+		}
+	}
+
+	private boolean isRunning() {
+		return mThread != null && mThread.isAlive();
+	}
+
+	private void registerCallback(IMainCallback cb) {
+		if (cb != null) {
+			mCallbacks.register(cb);
+			sendMessage(MSG_SEND_STATUS, mStatus, 0, mError);
+		}
+	}
+
+	private void unregisterCallback(IMainCallback cb) {
+		if (cb != null) {
+			mCallbacks.unregister(cb);
+		}
+	}
+
+	/*
+	 * Client that bind the Main Service in order to send commands and receive callback
+	 */
+	public static class Client {
+
+		public interface Callback {
+			public void onStarted();
+			public void onStopped();
+			public void onError(String error);
+			public void onLog(int priority, String msg);
+		}
+
+		private boolean mBound = false;
+		private final Context mContext;
+		private Callback mCallback;
+		private IMain mIMain = null;
+
+		private final IMainCallback.Stub mICallback = new IMainCallback.Stub() {
+
+			@Override
+			public void onStopped() throws RemoteException {
+				mCallback.onStopped();
+			}
+
+			@Override
+			public void onStarted() throws RemoteException {
+				mCallback.onStarted();
+			}
+
+			@Override
+			public void onError(String error) throws RemoteException {
+				mCallback.onError(error);
+			}
+
+			@Override
+			public void onLog(int priority, String msg) throws RemoteException {
+				mCallback.onLog(priority, msg);
+			}
+		};
+
+		private final ServiceConnection mServiceConnection = new ServiceConnection() {
+
+			@Override
+			public void onServiceConnected(ComponentName name, IBinder service) {
+				synchronized (this) {
+					mIMain = IMain.Stub.asInterface(service);
+					try {
+						if (mCallback != null)
+							mIMain.registerCallback(mICallback);
+					} catch (RemoteException e) {
+						if (mCallback != null)
+							mCallback.onError(REMOTE_ERROR);
+					}
+				}
+			}
+
+			@Override
+			public void onServiceDisconnected(ComponentName name) {
+				if (mCallback != null)
+					mCallback.onError(REMOTE_ERROR);
+			}
+		};
+
+		public Client(Context context, Callback cb) throws IllegalArgumentException {
+			if (context == null)
+				throw new IllegalArgumentException("Context can't be null");
+			mContext = context;
+			mCallback = cb;
+			mBound = mContext.bindService(new Intent(mContext, Main.class), mServiceConnection, Context.BIND_AUTO_CREATE);
+		}
+
+		public boolean start() {
+			synchronized (this) {
+				if (mIMain != null) {
+					try {
+						mIMain.start();
+						return true;
+					} catch (RemoteException e) {
+					}
+				}
+				return false;
+			}
+		}
+
+		public boolean stop() {
+			synchronized (this) {
+				if (mIMain != null) {
+					try {
+						mIMain.stop();
+						return true;
+					} catch (RemoteException e) {
+					}
+				}
+				return false;
+			}
+		}
+
+		public boolean setWakelockEnabled(boolean enabled) {
+			synchronized (this) {
+				if (mIMain != null) {
+					try {
+						mIMain.setWakelockEnabled(enabled);
+						return true;
+					} catch (RemoteException e) {
+					}
+				}
+				return false;
+			}
+		}
+
+		public boolean isRunning() {
+			synchronized (this) {
+				if (mIMain != null) {
+					try {
+						return mIMain.isRunning();
+					} catch (RemoteException e) {
+					}
+				}
+				return false;
+			}
+		}
+
+		public void release() {
+			if (mBound) {
+				synchronized (this) {
+					if (mIMain != null && mICallback != null) {
+						try {
+							if (mCallback != null)
+								mIMain.unregisterCallback(mICallback);
+						} catch (RemoteException e) {
+						}
+					}
+				}
+				mBound = false;
+				mContext.unbindService(mServiceConnection);
+			}
+		}
+	}
+
+	/*
+	 * start Main service without any callback
+	 */
+	public static void start(Context context, boolean wakelock) {
+		context.startService(new Intent(context, Main.class).putExtra("wakelock", wakelock));
+	}
+}
--- a/android/src/Receiver.java
+++ b/android/src/Receiver.java
@@ -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.
+ */
+
+package org.musicpd;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.util.Log;
+
+public class Receiver extends BroadcastReceiver {
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        Log.d("Receiver", "onReceive: " + intent);
+        if (intent.getAction() == "android.intent.action.BOOT_COMPLETED") {
+        	if (Settings.Preferences.getBoolean(context,
+        			Settings.Preferences.KEY_RUN_ON_BOOT, false)) {
+        		final boolean wakelock = Settings.Preferences.getBoolean(context,
+        				Settings.Preferences.KEY_WAKELOCK, false);
+        		Main.start(context, wakelock);
+        	}
+        }
+    }
+}
--- a/android/src/Settings.java
+++ b/android/src/Settings.java
@@ -0,0 +1,290 @@
+/*
+ * Copyright 2003-2018 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 java.util.LinkedList;
+
+import android.Manifest;
+import android.app.Activity;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.SharedPreferences.Editor;
+import android.content.pm.PackageManager;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.util.Log;
+import android.widget.ArrayAdapter;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
+import android.widget.CompoundButton.OnCheckedChangeListener;
+import android.widget.ListView;
+import android.widget.TextView;
+import android.widget.ToggleButton;
+
+public class Settings extends Activity {
+	private static final String TAG = "Settings";
+	private Main.Client mClient;
+	private TextView mTextStatus;
+	private ToggleButton mRunButton;
+	private boolean mFirstRun;
+	private LinkedList<String> mLogListArray = new LinkedList<String>();
+	private ListView mLogListView;
+	private ArrayAdapter<String> mLogListAdapter;
+
+	private static final int MAX_LOGS = 500;
+
+	private static final int MSG_ERROR = 0;
+	private static final int MSG_STOPPED = 1;
+	private static final int MSG_STARTED = 2;
+	private static final int MSG_LOG = 3;
+
+	public static class Preferences {
+		public static final String KEY_RUN_ON_BOOT ="run_on_boot";
+		public static final String KEY_WAKELOCK ="wakelock";
+
+		public static SharedPreferences get(Context context) {
+			return context.getSharedPreferences(TAG, MODE_PRIVATE);
+		}
+
+		public static void putBoolean(Context context, String key, boolean value) {
+			final SharedPreferences prefs = get(context);
+
+			if (prefs == null)
+				return;
+			final Editor editor = prefs.edit();
+			editor.putBoolean(key, value);
+			editor.apply();
+		}
+
+		public static boolean getBoolean(Context context, String key, boolean defValue) {
+			final SharedPreferences prefs = get(context);
+
+			return prefs != null ? prefs.getBoolean(key, defValue) : defValue;
+		}
+	}
+
+	private Handler mHandler = new Handler(new Handler.Callback() {
+		@Override
+		public boolean handleMessage(Message msg) {
+			switch (msg.what) {
+			case MSG_ERROR:
+				Log.d(TAG, "onError");
+
+				mClient.release();
+				connectClient();
+
+				mRunButton.setEnabled(false);
+				mRunButton.setChecked(false);
+
+				mTextStatus.setText((String)msg.obj);
+				mFirstRun = true;
+				break;
+			case MSG_STOPPED:
+				Log.d(TAG, "onStopped");
+				mRunButton.setEnabled(true);
+				if (!mFirstRun && Preferences.getBoolean(Settings.this, Preferences.KEY_RUN_ON_BOOT, false))
+					mRunButton.setChecked(true);
+				else
+					mRunButton.setChecked(false);
+				mFirstRun = true;
+				mTextStatus.setText("");
+				break;
+			case MSG_STARTED:
+				Log.d(TAG, "onStarted");
+				mRunButton.setChecked(true);
+				mFirstRun = true;
+				mTextStatus.setText("MPD service started");
+				break;
+			case MSG_LOG:
+				if (mLogListArray.size() > MAX_LOGS)
+					mLogListArray.remove(0);
+				String priority;
+				switch (msg.arg1) {
+				case Log.DEBUG:
+					priority = "D";
+					break;
+				case Log.ERROR:
+					priority = "E";
+					break;
+				case Log.INFO:
+					priority = "I";
+					break;
+				case Log.VERBOSE:
+					priority = "V";
+					break;
+				case Log.WARN:
+					priority = "W";
+					break;
+				default:
+					priority = "";
+				}
+				mLogListArray.add(priority + "/ " + (String)msg.obj);
+				mLogListAdapter.notifyDataSetChanged();
+
+				break;
+			}
+			return true;
+		}
+	});
+
+	private final OnCheckedChangeListener mOnRunChangeListener = new OnCheckedChangeListener() {
+		@Override
+		public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+			if (mClient != null) {
+				if (isChecked) {
+					mClient.start();
+					if (Preferences.getBoolean(Settings.this,
+							Preferences.KEY_WAKELOCK, false))
+						mClient.setWakelockEnabled(true);
+				} else {
+					mClient.stop();
+				}
+			}
+		}
+	};
+
+	private final OnCheckedChangeListener mOnRunOnBootChangeListener = new OnCheckedChangeListener() {
+		@Override
+		public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+			Preferences.putBoolean(Settings.this, Preferences.KEY_RUN_ON_BOOT, isChecked);
+			if (isChecked && mClient != null && !mRunButton.isChecked())
+				mRunButton.setChecked(true);
+		}
+	};
+
+	private final OnCheckedChangeListener mOnWakelockChangeListener = new OnCheckedChangeListener() {
+		@Override
+		public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+			Preferences.putBoolean(Settings.this, Preferences.KEY_WAKELOCK, isChecked);
+			if (mClient != null && mClient.isRunning())
+				mClient.setWakelockEnabled(isChecked);
+		}
+	};
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		/* TODO: this sure is the wrong place to request
+		   permissions - it will cause MPD to quit
+		   immediately; we should request permissions when we
+		   need them, but implementing that is complicated, so
+		   for now, we do it here to give users a quick
+		   solution for the problem */
+		requestAllPermissions();
+
+		setContentView(R.layout.settings);
+		mRunButton = (ToggleButton) findViewById(R.id.run);
+		mRunButton.setOnCheckedChangeListener(mOnRunChangeListener);
+
+		mTextStatus = (TextView) findViewById(R.id.status);
+
+		mLogListAdapter = new ArrayAdapter<String>(this, R.layout.log_item, mLogListArray);
+
+		mLogListView = (ListView) findViewById(R.id.log_list);
+		mLogListView.setAdapter(mLogListAdapter);
+		mLogListView.setTranscriptMode(ListView.TRANSCRIPT_MODE_NORMAL);
+
+		CheckBox checkbox = (CheckBox) findViewById(R.id.run_on_boot);
+		checkbox.setOnCheckedChangeListener(mOnRunOnBootChangeListener);
+		if (Preferences.getBoolean(this, Preferences.KEY_RUN_ON_BOOT, false))
+			checkbox.setChecked(true);
+
+		checkbox = (CheckBox) findViewById(R.id.wakelock);
+		checkbox.setOnCheckedChangeListener(mOnWakelockChangeListener);
+		if (Preferences.getBoolean(this, Preferences.KEY_WAKELOCK, false))
+			checkbox.setChecked(true);
+
+		super.onCreate(savedInstanceState);
+	}
+
+	private void checkRequestPermission(String permission) {
+		if (checkSelfPermission(permission) == PackageManager.PERMISSION_GRANTED)
+			return;
+
+		try {
+			this.requestPermissions(new String[]{permission}, 0);
+		} catch (Exception e) {
+			Log.e(TAG, "requestPermissions(" + permission + ") failed",
+			      e);
+		}
+	}
+
+	private void requestAllPermissions() {
+		if (android.os.Build.VERSION.SDK_INT < 23)
+			/* we don't need to request permissions on
+			   this old Android version */
+			return;
+
+		/* starting with Android 6.0, we need to explicitly
+		   request all permissions before using them;
+		   mentioning them in the manifest is not enough */
+
+		checkRequestPermission(Manifest.permission.READ_EXTERNAL_STORAGE);
+	}
+
+	private void connectClient() {
+		mClient = new Main.Client(this, new Main.Client.Callback() {
+
+			private void removeMessages() {
+				/* don't remove log messages */
+				mHandler.removeMessages(MSG_STOPPED);
+				mHandler.removeMessages(MSG_STARTED);
+				mHandler.removeMessages(MSG_ERROR);
+			}
+
+			@Override
+			public void onStopped() {
+				removeMessages();
+				mHandler.sendEmptyMessage(MSG_STOPPED);
+			}
+
+			@Override
+			public void onStarted() {
+				removeMessages();
+				mHandler.sendEmptyMessage(MSG_STARTED);
+			}
+
+			@Override
+			public void onError(String error) {
+				removeMessages();
+				mHandler.sendMessage(Message.obtain(mHandler, MSG_ERROR, error));
+			}
+
+			@Override
+			public void onLog(int priority, String msg) {
+				mHandler.sendMessage(Message.obtain(mHandler, MSG_LOG, priority, 0, msg));
+			}
+		});
+	}
+
+	@Override
+	protected void onStart() {
+		mFirstRun = false;
+		connectClient();
+		super.onStart();
+	}
+
+	@Override
+	protected void onStop() {
+		mClient.release();
+		mClient = null;
+		super.onStop();
+	}
+}
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,137 +0,0 @@
-#!/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"
-
-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 1.10'
-fi
-if test -n "$AC_FORCE_VERSION"
-then
-	AC_VERSIONS="$AC_FORCE_VERSION"
-else
-	AC_VERSIONS='2.60 2.61'
-fi
-
-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
--- a/build/pkg-config.sh
+++ b/build/pkg-config.sh
@@ -0,0 +1,13 @@
+#!/bin/sh -e
+
+# This is a wrapper for pkg-config which helps with cross-compiling;
+# it sets up environment variables to pkg-config searches for
+# libraries in the sysroot where a copy of this script is located.
+
+BIN=`dirname $0`
+ROOT=`dirname "$BIN"`
+
+export PKG_CONFIG_DIR=
+export PKG_CONFIG_LIBDIR="${ROOT}/lib/pkgconfig:${ROOT}/share/pkgconfig"
+
+exec /usr/bin/pkg-config "$@"
--- a/configure.ac
+++ b/configure.ac
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -0,0 +1,214 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+# -- General configuration ------------------------------------------------
+
+# If your documentation needs a minimal Sphinx version, state it here.
+#
+# needs_sphinx = '1.0'
+
+# Add any Sphinx extension module names here, as strings. They can be
+# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
+# ones.
+extensions = ['sphinx.ext.intersphinx']
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ['_templates']
+
+# The suffix(es) of source filenames.
+# You can specify multiple suffix as a list of string:
+#
+# source_suffix = ['.rst', '.md']
+source_suffix = '.rst'
+
+# The encoding of source files.
+#
+# source_encoding = 'utf-8-sig'
+
+# The master toctree document.
+master_doc = 'index'
+
+# General information about the project.
+project = 'Music Player Daemon'
+copyright = '2003-2018 The Music Player Daemon Project'
+author = 'Max Kellermann'
+
+# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the
+# built documents.
+#
+# The short X.Y version.
+version = '0.21.26'
+# The full version, including alpha/beta/rc tags.
+release = version
+
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+#
+# This is also used if you do content translation via gettext catalogs.
+# Usually you set "language" from the command line for these cases.
+language = None
+
+# There are two options for replacing |today|: either, you set today to some
+# non-false value, then it is used:
+#
+# today = ''
+#
+# Else, today_fmt is used as the format for a strftime call.
+#
+# today_fmt = '%B %d, %Y'
+
+# List of patterns, relative to source directory, that match files and
+# directories to ignore when looking for source files.
+# This patterns also effect to html_static_path and html_extra_path
+exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
+
+# The reST default role (used for this markup: `text`) to use for all
+# documents.
+#
+# default_role = None
+
+# If true, '()' will be appended to :func: etc. cross-reference text.
+#
+# add_function_parentheses = True
+
+# If true, the current module name will be prepended to all description
+# unit titles (such as .. function::).
+#
+# add_module_names = True
+
+# If true, sectionauthor and moduleauthor directives will be shown in the
+# output. They are ignored by default.
+#
+# show_authors = False
+
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = 'sphinx'
+
+# A list of ignored prefixes for module index sorting.
+# modindex_common_prefix = []
+
+# If true, keep warnings as "system message" paragraphs in the built documents.
+# keep_warnings = False
+
+# If true, `todo` and `todoList` produce output, else they produce nothing.
+todo_include_todos = False
+
+
+# -- Options for HTML output ----------------------------------------------
+
+# The theme to use for HTML and HTML Help pages.  See the documentation for
+# a list of builtin themes.
+#
+html_theme = 'classic'
+
+# Theme options are theme-specific and customize the look and feel of a theme
+# further.  For a list of options available for each theme, see the
+# documentation.
+#
+# html_theme_options = {}
+
+# Add any paths that contain custom themes here, relative to this directory.
+# html_theme_path = []
+
+# The name for this set of Sphinx documents.
+# "<project> v<release> documentation" by default.
+#
+# html_title = ''
+
+# A shorter title for the navigation bar.  Default is the same as html_title.
+#
+# html_short_title = None
+
+# The name of an image file (relative to this directory) to place at the top
+# of the sidebar.
+#
+# html_logo = None
+
+# The name of an image file (relative to this directory) to use as a favicon of
+# the docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
+# pixels large.
+#
+# html_favicon = None
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+html_static_path = ['_static']
+
+# Add any extra paths that contain custom files (such as robots.txt or
+# .htaccess) here, relative to this directory. These files are copied
+# directly to the root of the documentation.
+#
+# html_extra_path = []
+
+# If not None, a 'Last updated on:' timestamp is inserted at every page
+# bottom, using the given strftime format.
+# The empty string is equivalent to '%b %d, %Y'.
+#
+# html_last_updated_fmt = None
+
+# If true, SmartyPants will be used to convert quotes and dashes to
+# typographically correct entities.
+#
+# html_use_smartypants = True
+
+# Custom sidebar templates, maps document names to template names.
+#
+# html_sidebars = {}
+
+# Additional templates that should be rendered to pages, maps page names to
+# template names.
+#
+# html_additional_pages = {}
+
+# If false, no module index is generated.
+#
+# html_domain_indices = True
+
+# If false, no index is generated.
+#
+# html_use_index = True
+
+# If true, the index is split into individual pages for each letter.
+#
+# html_split_index = False
+
+# If true, links to the reST sources are added to the pages.
+#
+# html_show_sourcelink = True
+
+# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
+#
+# html_show_sphinx = True
+
+# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
+#
+# html_show_copyright = True
+
+# If true, an OpenSearch description file will be output, and all pages will
+# contain a <link> tag referring to it.  The value of this option must be the
+# base URL from which the finished HTML is served.
+#
+# html_use_opensearch = ''
+
+# This is the file name suffix for HTML files (e.g. ".xhtml").
+# html_file_suffix = None
+
+# Language to be used for generating the HTML full-text search index.
+# Sphinx supports the following languages:
+#   'da', 'de', 'en', 'es', 'fi', 'fr', 'h', 'it', 'ja'
+#   'nl', 'no', 'pt', 'ro', 'r', 'sv', 'tr', 'zh'
+#
+# html_search_language = 'en'
+
+# A dictionary with options for the search language support, empty by default.
+# 'ja' uses this config value.
+# 'zh' user can custom change `jieba` dictionary path.
+#
+# html_search_options = {'type': 'default'}
+
+# The name of a javascript file (relative to the configuration directory) that
+# implements a search results scorer. If empty, the default will be used.
+#
+# html_search_scorer = 'scorer.js'
--- a/doc/developer.rst
+++ b/doc/developer.rst
@@ -0,0 +1,99 @@
+Developer's Manual
+##################
+
+Introduction
+************
+
+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 150 people have contributed patches. This document is work in progress.  Most of it may be incomplete yet.  Please help!
+
+Code Style
+**********
+
+* indent with tabs (width 8)
+* don't write CPP when you can write C++: use inline functions and constexpr instead of macros
+* comment your code, document your APIs
+* the code should be C++14 compliant, and must compile with :program:`GCC` 6.0 and :program:`clang` 3.4
+* report error conditions with C++ exceptions, preferable derived from :envvar:`std::runtime_error`
+* all code must be exception-safe
+* classes and functions names use CamelCase; variables are lower-case with words separated by underscore
+
+Some example code:
+
+.. code-block:: c
+
+    Foo(const char *abc, int xyz)
+    {
+        if (abc == nullptr) {
+                LogWarning("Foo happened!");
+                return -1;
+        }
+
+        return xyz;
+    }
+
+Hacking The Source
+******************
+
+MPD sources are managed in a git repository on
+`Github <https://github.com/MusicPlayerDaemon/>`_.
+
+Always write your code against the latest git:
+
+.. code-block:: none
+
+    git clone git://github.com/MusicPlayerDaemon/MPD
+
+If you already have a clone, update it:
+
+.. code-block:: none
+
+    git pull --rebase git://github.com/MusicPlayerDaemon/MPD master
+
+You can do without :code:`--rebase`, but we recommend that you rebase
+your repository on the "master" repository all the time.
+
+Configure with the option :code:`--werror`.  Enable as many plugins as
+possible, to be sure that you don't break any disabled code.
+
+Don't mix several changes in one single patch.  Create a separate patch for every change. Tools like :program:`stgit` help you with that. This way, we can review your patches more easily, and we can pick the patches we like most first.
+
+Basic stgit usage
+=================
+
+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.
+
+stgit needs to be initialized on a git repository:
+
+.. code-block:: sh
+
+    stg init
+
+Before you edit the code, create a patch:
+
+.. code-block:: sh
+
+    stg new my-patch-name
+
+stgit now asks you for the commit message.
+
+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:
+
+.. code-block:: sh
+
+    stg refresh
+
+You may now continue editing the same patch, and refresh it as often as you like. Create more patches, edit and refresh them.
+
+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).
+
+When the whole patch series is finished, convert stgit patches to git commits:
+
+.. code-block:: sh
+
+    stg commit
+
+Submitting Patches
+******************
+
+Submit pull requests on GitHub:
+https://github.com/MusicPlayerDaemon/MPD/pulls
--- a/doc/developer.xml
+++ b/doc/developer.xml
@@ -1,105 +0,0 @@
-<?xml version='1.0' encoding="utf-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-               "docbook/dtd/xml/4.2/docbookx.dtd">
-<book>
-  <title>The Music Player Daemon - Developer's Manual</title>
-
-  <chapter>
-    <title>Introduction</title>
-
-    <para>
-      This is a guide for those who wish to hack on the MPD source
-      code.  MPD is an open project, and we are always happy about
-      contributions.  So far, more than 50 people have contributed
-      patches.
-    </para>
-
-    <para>
-      This document is work in progress.  Most of it may be incomplete
-      yet.  Please help!
-    </para>
-  </chapter>
-
-  <chapter>
-    <title>Code Style</title>
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          indent with tabs (width 8)
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          don't write CPP when you can write C: use inline functions
-          and enums 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
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          Some example code:
-        </para>
-
-        <programlisting lang="C">static inline bool
-foo(const char *abc, int xyz)
-{
-        if (abc == NULL) {
-                g_warning("Foo happened!\n");
-                return -1;
-        }
-
-        return xyz;
-}
-        </programlisting>
-      </listitem>
-    </itemizedlist>
-  </chapter>
-
-  <chapter>
-    <title>Hacking The Source</title>
-
-    <para>
-      Always write your code against the latest git:
-    </para>
-
-    <programlisting>git clone git://git.musicpd.org/master/mpd.git</programlisting>
-
-    <para>
-      Configure with the options <option>--enable-debug
-      --enable-werror</option>.  Enable as many plugins as possible,
-      to be sure that you don't break any disabled code.
-    </para>
-
-    <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.
-    </para>
-  </chapter>
-
-  <chapter>
-    <title>Submitting Patches</title>
-
-    <para>
-      Send your patches to the mailing list:
-      musicpd-dev-team@lists.sourceforge.net
-    </para>
-  </chapter>
-</book>
--- a/doc/doxygen.conf
+++ b/doc/doxygen.conf
--- a/doc/doxygen.conf.in
+++ b/doc/doxygen.conf.in
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -0,0 +1,18 @@
+Music Player Daemon
+===================
+
+.. toctree::
+   :maxdepth: 2
+   :caption: Contents:
+
+   user
+   plugins
+   developer
+   protocol
+
+
+Indices and tables
+==================
+
+* :ref:`genindex`
+* :ref:`search`
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -0,0 +1,33 @@
+install_man(['mpd.1', 'mpd.conf.5'])
+
+sphinx = find_program('sphinx-build')
+sphinx_output = custom_target(
+  'HTML documentation',
+  output: 'html',
+  input: [
+    'index.rst', 'user.rst', 'developer.rst',
+    'plugins.rst',
+    'protocol.rst',
+    'conf.py',
+  ],
+  command: [sphinx, '-q', '-b', 'html', '-d', '@OUTDIR@/doctrees', meson.current_source_dir(), '@OUTPUT@'],
+  build_by_default: true,
+  install: true,
+  install_dir: join_paths(get_option('datadir'), 'doc', meson.project_name()),
+)
+
+custom_target(
+  'upload',
+  input: sphinx_output,
+  output: 'upload',
+  build_always_stale: true,
+  command: [
+    'rsync', '-vpruz', '--delete', meson.current_build_dir() + '/',
+    'www.musicpd.org:/var/www/mpd/doc/',
+    '--chmod=Dug+rwx,Do+rx,Fug+rw,Fo+r',
+    '--include=html', '--include=html/**',
+    '--exclude=*',
+  ],
+)
+  
+  
--- 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>.
+<\fBhttps://github.com/MusicPlayerDaemon/MPD/issues/\fP>.
 .SH AUTHORS
-Warren Dukes <warren.dukes@gmail.com>
+Max Kellermann <max.kellermann@gmail.com>

 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
@@ -69,20 +63,15 @@ mpd will be saved to this file when mpd is terminated by a TERM signal or by
 the "kill" command.  When mpd is restarted, it will read the state file and
 restore the state of mpd (including the playlist).
 .TP
+.B restore_paused <yes or no>
+Put MPD into pause mode instead of starting playback after startup.
+.TP
 .B user <username>
 This specifies the user that MPD will run as, if set.  MPD should
 never run as root, and you may use this option to make MPD change its
 user id after initialization.  Do not use this option if you start MPD
 as an unprivileged user.
 .TP
-.B bind_to_address <ip address or hostname or any>
-This specifies which address mpd binds to and listens on.  Multiple
-bind_to_address parameters may be specified.  The default is "any", which binds
-to all available addresses.
-
-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".
-.TP
 .B port <port>
 This specifies the port that mpd listens on.  The default is 6600.
 .TP
@@ -92,6 +81,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.
@@ -99,23 +99,8 @@ information will be published with Zeroconf.  The default is yes.
 .B zeroconf_name <name>
 If Zeroconf is enabled, this is the service name to publish.  This name should
 be unique to your local network, but name collisions will be properly dealt
-with.  The default is "Music Player".
-.TP
-.B password <password@permissions>
-This specifies a password for access to mpd.  The format is
-"password@permissions" where permissions is a comma delimited list composed
-of "read", "add", "control", and/or "admin".  "read" allows for reading of the
-database, displaying the current playlist, and current status of mpd.  "add"
-allows for adding songs and loading playlists.  "control" allows for all other
-player and playlist manipulations.  "admin" allows the db to be updated and for
-the client to kill mpd.  An example value is "somePassword@read,add".  Multiple
-password parameters may be specified.
-.TP
-.B default_permissions <permissions>
-This specifies the permissions of a client that has not been authenticated
-using a password.  The format of permissions is specified in the description of
-the "password" config parameter.  If no passwords are specified, the default is
-"read,add,control,admin", otherwise it is "" (no permissions).
+with.  The default is "Music Player @ %h", where %h will be replaced with the
+hostname of the machine running MPD.
 .TP
 .B audio_output
 See \fBDESCRIPTION\fP and the various \fBAUDIO OUTPUT PARAMETERS\fP sections
@@ -123,53 +108,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
@@ -179,80 +117,23 @@ 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
-to let libid3tag convert them (from ISO-8859-1, as the standard specifies) and
-do no additional conversion.
-.TP
-.B gapless_mp3_playback <yes or no>
-This specifies whether to support gapless playback of MP3s which have the
-necessary headers.  Useful if your MP3s have headers with incorrect
-information.  If you have such MP3s, it is highly recommended that you fix them
-using vbrfix (available from <http://www.willwap.co.uk/Programs/vbrfix.php>)
-instead of disabling gapless MP3 playback.  The default is to support gapless
-MP3 playback.
-.TP
 .B save_absolute_paths_in_playlists <yes or no>
 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
@@ -263,7 +144,7 @@ the music directory itself.  There is no limit by default.
 .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.
@@ -282,190 +163,12 @@ Specifies how replay gain is applied.  The default is "software",
 which uses an internal software volume control.  "mixer" uses the
 configured (hardware) mixer control.  "none" disables replay gain on
 this audio output.
-.SH OPTIONAL ALSA OUTPUT PARAMETERS
-.TP
-.B device <dev>
-This specifies the device to use for audio output.  The default is "default".
 .TP
 .B mixer_type <hardware, software or none>
 Specifies which mixer should be used for this audio output: the
 hardware mixer (available for ALSA, OSS and PulseAudio), the software
 mixer or no mixer ("none").  By default, the hardware mixer is used
 for devices which support it, and none for the others.
-.TP
-.B mixer_device <mixer dev>
-This specifies which mixer to use.  The default is "default".  To use
-the second sound card in a system, use "hw:1".
-.TP
-.B mixer_control <mixer ctrl>
-This specifies which mixer control to use (sometimes referred to as
-the "device").  The default is "PCM".  Use "amixer scontrols" to see
-the list of possible controls.
-.TP
-.B mixer_index <mixer index>
-A number identifying the index of the named mixer control.  This is
-probably only useful if your alsa device has more than one
-identically\-named mixer control.  The default is "0".  Use "amixer
-scontrols" to see the list of controls with their indexes.
-.TP
-.B use_mmap <yes or no>
-Setting this allows you to use memory-mapped I/O.  Certain hardware setups may
-benefit from this, but most do not.  Most users do not need to set this.  The
-default is to not use memory-mapped I/O.
-.TP
-.B auto_resample <yes or no>
-Setting this to "no" disables ALSA's software resampling, if the
-hardware does not support a specific sample rate.  This lets MPD do
-the resampling.  "yes" is the default and allows ALSA to resample.
-.TP
-.B auto_channels <yes or no>
-Setting this to "no" disables ALSA's channel conversion, if the
-hardware does not support a specific number of channels.  Default: "yes".
-.TP
-.B auto_format <yes or no>
-Setting this to "no" disables ALSA's sample format conversion, if the
-hardware does not support a specific sample format.  Default: "yes".
-.TP
-.B buffer_time <time in microseconds>
-This sets the length of the hardware sample buffer in microseconds.  Increasing
-it may help to reduce or eliminate skipping on certain setups.  Most users do
-not need to change this.  The default is 500000 microseconds (0.5 seconds).
-.TP
-.B period_time <time in microseconds>
-This sets the time between hardware sample transfers in microseconds.
-Increasing this can reduce CPU usage while lowering it can reduce underrun
-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 genre <genre>
-This specifies the genre(s) of the stream.
 .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 #######################################################
@@ -32,7 +32,7 @@
 # settings.
 #
 # The special value "syslog" makes MPD use the local syslog daemon. This
-# setting defaults to logging to syslog, otherwise logging is disabled.
+# setting defaults to logging to syslog.
 #
 #log_file			"~/.mpd/log"
 #
@@ -75,7 +75,8 @@
 #
 # This setting sets the address for the daemon to listen on. Careful attention
 # should be paid if this is assigned to anything other then the default, any.
-# This setting can deny access to control of the daemon.
+# This setting can deny access to control of the daemon. Not effective if
+# systemd socket activiation is in use.
 #
 # For network
 #bind_to_address		"any"
@@ -95,25 +96,25 @@
 #
 #log_level			"default"
 #
-# If you have a problem with your MP3s ending abruptly it is recommended that 
-# you set this argument to "no" to attempt to fix the problem. If this solves
-# the problem, it is highly recommended to fix the MP3 files with vbrfix
-# (available from <http://www.willwap.co.uk/Programs/vbrfix.php>), at which
-# point gapless MP3 playback can be enabled.
+# Setting "restore_paused" to "yes" puts MPD into pause mode instead
+# of starting playback after startup.
 #
-#gapless_mp3_playback			"yes"
+#restore_paused "no"
 #
 # This setting enables MPD to create playlists in a format usable by other
 # music players.
 #
 #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 example just enables the "comment" tag without disabling all
+# the other supported tags:
+#metadata_to_use "+comment"
+#
 # This setting enables automatic update of MPD's database when files in 
 # music_directory are changed.
 #
@@ -150,9 +151,9 @@
 #zeroconf_enabled		"yes"
 #
 # The argument to this setting will be the Zeroconf / Avahi unique name for
-# this MPD server on the network.
+# this MPD server on the network. %h will be replaced with the hostname.
 #
-#zeroconf_name			"Music Player"
+#zeroconf_name			"Music Player @ %h"
 #
 ###############################################################################

@@ -160,7 +161,7 @@
 # Permissions #################################################################
 #
 # If this setting is set, MPD will require password authorization. The password
-# can setting can be specified multiple times for different password profiles.
+# setting can be specified multiple times for different password profiles.
 #
 #password                        "password@read,add,control,admin"
 #
@@ -171,6 +172,15 @@
 ###############################################################################


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

@@ -191,16 +201,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
@@ -213,7 +219,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
@@ -223,7 +228,7 @@ input {
 #
 #audio_output {
 #	type		"shout"
-#	encoding	"ogg"			# optional
+#	encoder		"vorbis"		# optional
 #	name		"My Shout Stream"
 #	host		"localhost"
 #	port		"8000"
@@ -235,6 +240,7 @@ input {
 ##	protocol	"icecast2"		# optional
 ##	user		"source"		# optional
 ##	description	"My Stream Description"	# optional
+##	url		"http://example.com"	# optional
 ##	genre		"jazz"			# optional
 ##	public		"no"			# optional
 ##	timeout		"2"			# optional
@@ -276,6 +282,42 @@ 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
+#}
+#
+# An example of an sndio output.
+#
+#audio_output {
+#	type		"sndio"
+#	name		"sndio output"
+#	mixer_type	"hardware"
+#}
+#
+# An example of an OS X output:
+#
+#audio_output {
+#	type		"osx"
+#	name		"My OS X Device"
+##	device		"Built-in Output"	# optional
+##	channel_map      "-1,-1,0,1"	# optional
+#}
+#
 ## Example "pipe" output:
 #
 #audio_output {
@@ -297,27 +339,17 @@ 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
-# setting is disabled.
-#
-#samplerate_converter		"Fastest Sinc Interpolator"
-#
 ###############################################################################


 # 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"
 #
@@ -326,6 +358,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.
@@ -334,39 +380,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"
-#
-###############################################################################
-
-
 # Character Encoding ##########################################################
 #
 # If file or directory names do not display correctly for your locale then you 
@@ -374,34 +387,4 @@ input {
 #
 #filesystem_charset		"UTF-8"
 #
-# This setting controls the encoding that ID3v1 tags should be converted from.
-#
-#id3v1_encoding			"ISO-8859-1"
-#
 ###############################################################################
-
-
-# SIDPlay decoder #############################################################
-#
-# songlength_database:
-#  Location of your songlengths file, as distributed with the HVSC.
-#  The sidplay plugin checks this for matching MD5 fingerprints.
-#  See http://www.c64.org/HVSC/DOCUMENTS/Songlengths.faq
-#
-# default_songlength:
-#  This is the default playing time in seconds for songs not in the
-#  songlength database, or in case you're not using a database.
-#  A value of 0 means play indefinitely.
-#
-# filter:
-#  Turns the SID filter emulation on or off.
-#
-#decoder {
-#	plugin			"sidplay"
-#	songlength_database	"/media/C64Music/DOCUMENTS/Songlengths.txt"
-#	default_songlength	"120"
-#	filter "true"
-#}
-#
-###############################################################################
-
--- a/doc/plugins.rst
+++ b/doc/plugins.rst
--- a/doc/protocol.rst
+++ b/doc/protocol.rst
--- a/doc/protocol.xml
+++ b/doc/protocol.xml
--- a/doc/user.rst
+++ b/doc/user.rst
--- a/doc/user.xml
+++ b/doc/user.xml
--- a/m4/faad.m4
+++ b/m4/faad.m4
@@ -1,192 +0,0 @@
-AC_DEFUN([AM_PATH_FAAD],
-[dnl ##
-dnl faad
-dnl ##
-
-AC_ARG_ENABLE(aac,
-	AS_HELP_STRING([--disable-aac],
-		[disable AAC support (default: enable)]),,
-	enable_aac=yes)
-
-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
-
-	oldcflags=$CFLAGS
-	oldlibs=$LIBS
-	oldcppflags=$CPPFLAGS
-	CFLAGS="$CFLAGS $MPD_CFLAGS $FAAD_CFLAGS -I."
-	LIBS="$LIBS $MPD_LIBS $FAAD_LIBS"
-	CPPFLAGS=$CFLAGS
-	AC_CHECK_HEADER(faad.h,,enable_aac=no)
-	if test x$enable_aac = xyes; then
-		AC_CHECK_DECL(FAAD2_VERSION,,enable_aac=no,[#include <faad.h>])
-	fi
-	if test x$enable_aac = xyes; then
-		AC_CHECK_DECL(faacDecInit2,,enable_aac=no,[#include <faad.h>])
-	fi
-	if test x$enable_aac = xyes; then
-		AC_CHECK_LIB(faad,faacDecInit2,[MPD_LIBS="$MPD_LIBS $FAAD_LIBS";MPD_CFLAGS="$MPD_CFLAGS $FAAD_CFLAGS"],enable_aac=no)
-		if test x$enable_aac = xno; then
-			enable_aac=yes
-			AC_CHECK_LIB(faad,NeAACDecInit2,[MPD_LIBS="$MPD_LIBS $FAAD_LIBS";MPD_CFLAGS="$MPD_CFLAGS $FAAD_CFLAGS"],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;
-	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);
-	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);
-
-	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])
-	fi
-	CFLAGS=$oldcflags
-	LIBS=$oldlibs
-	CPPFLAGS=$oldcppflags
-fi
-
-if test x$enable_aac = xyes; then
-	oldcflags=$CFLAGS
-	oldlibs=$LIBS
-	oldcppflags=$CPPFLAGS
-	CFLAGS="$CFLAGS $MPD_CFLAGS $FAAD_CFLAGS -Werror"
-	LIBS="$LIBS $MPD_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
-fi
-])
--- a/m4/libwrap.m4
+++ b/m4/libwrap.m4
@@ -1,14 +0,0 @@
-dnl
-dnl Usage:
-dnl AC_CHECK_LIBWRAP([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-dnl
-
-AC_DEFUN([AC_CHECK_LIBWRAP],[
-	AC_CHECK_HEADERS([tcpd.h],
-		AC_CHECK_LIB([wrap], [request_init],
-			[LIBWRAP_CFLAGS=""
-			LIBWRAP_LDFLAGS="-lwrap"
-			$1],
-			$2),
-		$2)
-])
--- a/m4/mpd_auto.m4
+++ b/m4/mpd_auto.m4
@@ -1,65 +0,0 @@
-AC_DEFUN([MPD_AUTO_ENABLED], [
-	var="enable_$1"
-	feature="$2"
-
-	if eval "test x`echo '$'$var` = xauto"; then
-		AC_MSG_NOTICE([auto-detected $feature])
-		eval "$var=yes"
-	fi
-])
-
-AC_DEFUN([MPD_AUTO_DISABLED], [
-	var="enable_$1"
-	feature="$2"
-	msg="$3"
-
-	if eval "test x`echo '$'$var` = xauto"; then
-		AC_MSG_WARN([$msg -- disabling $feature])
-		eval "$var=no"
-	elif eval "test x`echo '$'$var` = xyes"; then
-		AC_MSG_ERROR([$feature: $msg])
-	fi
-])
-
-dnl Check whether a prerequisite for a feature was found.  This is
-dnl very similar to MPD_AUTO_RESULT, but does not finalize the
-dnl detection; it assumes that more checks will follow.
-AC_DEFUN([MPD_AUTO_PRE], [
-	name="$1"
-	var="enable_$1"
-	found="found_$name"
-	feature="$2"
-	msg="$3"
-
-	if eval "test x`echo '$'$var` != xno" && eval "test x`echo '$'$found` = xno"; then
-                MPD_AUTO_DISABLED([$name], [$feature], [$msg])
-	fi
-])
-
-AC_DEFUN([MPD_AUTO_RESULT], [
-	name="$1"
-	var="enable_$1"
-	found="found_$name"
-	feature="$2"
-	msg="$3"
-
-	if eval "test x`echo '$'$var` = xno"; then
-		eval "$found=no"
-	fi
-
-	if eval "test x`echo '$'$found` = xyes"; then
-                MPD_AUTO_ENABLED([$name], [$feature])
-	else
-                MPD_AUTO_DISABLED([$name], [$feature], [$msg])
-	fi
-])
-
-AC_DEFUN([MPD_AUTO_PKG], [
-	if eval "test x`echo '$'enable_$1` != xno"; then
-		PKG_CHECK_MODULES([$2], [$3],
-			[eval "found_$1=yes"],
-			[eval "found_$1=no"])
-	fi
-
-	MPD_AUTO_RESULT([$1], [$4], [$5])
-])
--- a/m4/mpd_check_cflag.m4
+++ b/m4/mpd_check_cflag.m4
@@ -1,18 +0,0 @@
-AC_DEFUN([MPD_CHECK_FLAG],[
-  var=`echo "$1" | tr "=-" "__"`
-  AC_CACHE_CHECK([whether the C compiler accepts $1],
-    [mpd_check_cflag_$var],[
-    save_CFLAGS="$CFLAGS"
-    CFLAGS="$CFLAGS $1"
-    AC_COMPILE_IFELSE([AC_LANG_SOURCE([
-     int main(void) { return 0; }
-     ])], [ eval "mpd_check_cflag_$var=yes"
-     ], [ eval "mpd_check_cflag_$var=no" ])
-    CFLAGS="$save_CFLAGS"
-  ])
-  if eval "test x`echo '$mpd_check_cflag_'$var` = xyes"
-  then
-    AM_CFLAGS="$AM_CFLAGS $1"
-  fi
-  ])
-])
--- a/m4/pkg.m4
+++ b/m4/pkg.m4
@@ -1,157 +0,0 @@
-# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
-# 
-# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-# ----------------------------------
-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
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
-fi
-if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=m4_default([$1], [0.9.0])
-	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		AC_MSG_RESULT([yes])
-	else
-		AC_MSG_RESULT([no])
-		PKG_CONFIG=""
-	fi
-		
-fi[]dnl
-])# PKG_PROG_PKG_CONFIG
-
-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-#
-# Check to see whether a particular set of modules exists.  Similar
-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
-#
-#
-# Similar to PKG_CHECK_MODULES, make sure that the first instance of
-# this or PKG_CHECK_MODULES is called, or make sure to call
-# PKG_CHECK_EXISTS manually
-# --------------------------------------------------------------
-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_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
-fi[]dnl
-])# _PKG_CONFIG
-
-# _PKG_SHORT_ERRORS_SUPPORTED
-# -----------------------------
-AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi[]dnl
-])# _PKG_SHORT_ERRORS_SUPPORTED
-
-
-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-# [ACTION-IF-NOT-FOUND])
-#
-#
-# Note that if there is a possibility the first call to
-# PKG_CHECK_MODULES might not happen, you should be sure to include an
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-#
-#
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_MODULES],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
-AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
-
-pkg_failed=no
-AC_MSG_CHECKING([for $1])
-
-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
-_PKG_CONFIG([$1][_LIBS], [libs], [$2])
-
-m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
-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
-        _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"`
-        else 
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
-        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
-[Package requirements ($2) were not met:
-
-$$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])
-elif test $pkg_failed = untried; then
-	ifelse([$4], , [AC_MSG_FAILURE(dnl
-[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])
-else
-	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
-        AC_MSG_RESULT([yes])
-	ifelse([$3], , :, [$3])
-fi[]dnl
-])# PKG_CHECK_MODULES
--- a/m4/pretty_print.m4
+++ b/m4/pretty_print.m4
@@ -1,19 +0,0 @@
-AC_DEFUN([results], [
-	dnl This is a hack to allow "with" names, otherwise "enable".
-	num=`expr $1 : 'with'`
-	if test "$num" != "0"; then
-		var="`echo '$'$1`"
-	else
-		var="`echo '$'enable_$1`"
-	fi
-
-	printf '('
-	if eval "test x$var = xyes"; then
-		printf '+'
-	elif test -n "$3" && eval "test x$var = x$3"; then
-		printf '+'
-	else
-		printf '-'
-	fi
-	printf '%s) ' "$2"
-])
--- a/m4/ucred.m4
+++ b/m4/ucred.m4
@@ -1,32 +0,0 @@
-# Check if "struct ucred" is available.  If not, try harder with
-# _GNU_SOURCE.
-#
-# Author: Max Kellermann <max@duempel.org>
-
-AC_DEFUN([STRUCT_UCRED],[
-	AC_MSG_CHECKING([for struct ucred])
-	AC_CACHE_VAL(mpd_cv_have_struct_ucred, [
-		AC_TRY_COMPILE([#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 = 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
-				# :(
-				MPD_CFLAGS="$MPD_CFLAGS -D_GNU_SOURCE"
-			fi
-		fi
-		])
-
-	AC_MSG_RESULT($mpd_cv_have_struct_ucred)
-	if test x$mpd_cv_have_struct_ucred = xyes; then
-		AC_DEFINE(HAVE_STRUCT_UCRED, 1, [Define if struct ucred is present from sys/socket.h])
-	fi
-])
--- a/meson.build
+++ b/meson.build
@@ -0,0 +1,510 @@
+project(
+  'mpd',
+  ['c', 'cpp'],
+  version: '0.21.26',
+  meson_version: '>= 0.49.0',
+  default_options: [
+    'c_std=c99',
+    'cpp_std=c++14',
+    'warning_level=2',
+  ],
+  license: 'GPLv2+',
+)
+
+version_cxx = vcs_tag(input: 'src/GitVersion.cxx', output: 'GitVersion.cxx')
+
+compiler = meson.get_compiler('cpp')
+c_compiler = meson.get_compiler('c')
+
+if compiler.get_id() == 'gcc' and compiler.version().version_compare('<6')
+  warning('Your GCC version is too old.  You need at least version 6.')
+elif compiler.get_id() == 'clang' and compiler.version().version_compare('<3')
+  warning('Your clang version is too old.  You need at least version 3.')
+endif
+
+conf = configuration_data()
+conf.set_quoted('PACKAGE', meson.project_name())
+conf.set_quoted('PACKAGE_NAME', meson.project_name())
+conf.set_quoted('PACKAGE_VERSION', meson.project_version())
+conf.set_quoted('VERSION', meson.project_version())
+conf.set_quoted('PROTOCOL_VERSION', '0.21.11')
+conf.set_quoted('SYSTEM_CONFIG_FILE_LOCATION', join_paths(get_option('prefix'), get_option('sysconfdir'), 'mpd.conf'))
+
+common_cppflags = [
+  '-D_GNU_SOURCE',
+]
+
+common_cflags = [
+]
+
+common_cxxflags = [
+]
+
+test_common_flags = [
+  '-fvisibility=hidden',
+
+  '-ffast-math',
+  '-ftree-vectorize',
+]
+
+test_cxxflags = test_common_flags + [
+  '-fno-threadsafe-statics',
+  '-fmerge-all-constants',
+
+  '-Wmissing-declarations',
+  '-Wshadow',
+  '-Wpointer-arith',
+  '-Wcast-qual',
+  '-Wwrite-strings',
+  '-Wsign-compare',
+
+  '-Wno-non-virtual-dtor',
+
+  # work around bogus GCC7 warning "mangled name for ... will change
+  # in C++17 because the exception specification is part of a function
+  # type"
+  '-Wno-noexcept-type',
+]
+
+if compiler.get_id() == 'clang'
+  # Workaround for clang bug
+  # https://bugs.llvm.org/show_bug.cgi?id=32611
+  test_cxxflags += '-funwind-tables'
+endif
+
+test_cflags = test_common_flags + [
+  '-Wmissing-prototypes',
+  '-Wshadow',
+  '-Wpointer-arith',
+  '-Wstrict-prototypes',
+  '-Wcast-qual',
+  '-Wwrite-strings',
+  '-pedantic',
+]
+
+test_ldflags = [
+]
+
+if get_option('buildtype') != 'debug'
+  test_cxxflags += [
+    '-ffunction-sections',
+    '-fdata-sections',
+  ]
+  test_cflags += [
+    '-ffunction-sections',
+    '-fdata-sections',
+  ]
+  test_ldflags += [
+    '-Wl,--gc-sections',
+  ]
+endif
+
+add_global_arguments(common_cxxflags + compiler.get_supported_arguments(test_cxxflags), language: 'cpp')
+add_global_arguments(common_cflags + c_compiler.get_supported_arguments(test_cflags), language: 'c')
+add_global_link_arguments(compiler.get_supported_link_arguments(test_ldflags), language: 'cpp')
+
+is_linux = host_machine.system() == 'linux'
+is_android = get_option('android_ndk') != ''
+is_darwin = host_machine.system() == 'darwin'
+is_windows = host_machine.system() == 'windows'
+is_haiku = host_machine.system() == 'haiku'
+
+if is_android
+  common_cppflags += '-DANDROID'
+endif
+
+if is_windows
+  common_cppflags += [
+    '-DWIN32_LEAN_AND_MEAN',
+    '-DWINVER=0x0600', '-D_WIN32_WINNT=0x0600',
+    '-DSTRICT',
+    '-DUNICODE', '-D_UNICODE',
+  ]
+
+  subdir('win32')
+endif
+
+if is_android
+  subdir('android')
+endif
+
+add_global_arguments(common_cppflags, language: 'c')
+add_global_arguments(common_cppflags, language: 'cpp')
+
+enable_daemon = not is_windows and not is_android and get_option('daemon')
+conf.set('ENABLE_DAEMON', enable_daemon)
+
+conf.set('HAVE_LOCALE_H', compiler.has_header('locale.h'))
+
+conf.set('HAVE_GETPWNAM_R', compiler.has_function('getpwnam_r'))
+conf.set('HAVE_GETPWUID_R', compiler.has_function('getpwuid_r'))
+conf.set('HAVE_INITGROUPS', compiler.has_function('initgroups'))
+conf.set('HAVE_FNMATCH', compiler.has_function('fnmatch'))
+
+# Explicitly exclude Windows in this check because
+# https://github.com/mesonbuild/meson/issues/3672 (reported in 2018,
+# still not fixed in 2020) causes Meson to believe it exists, because
+# __builtin_strndup() exists (but strndup() still cannot be used).
+conf.set('HAVE_STRNDUP', not is_windows and compiler.has_function('strndup', prefix: '#define _GNU_SOURCE\n#include <string.h>'))
+
+conf.set('HAVE_STRCASESTR', compiler.has_function('strcasestr'))
+
+conf.set('HAVE_PRCTL', is_linux)
+
+conf.set('USE_EVENTFD', is_linux and get_option('eventfd'))
+conf.set('USE_SIGNALFD', is_linux and get_option('signalfd'))
+
+if is_windows
+  conf.set('USE_WINSELECT', true)
+elif is_linux and get_option('epoll')
+  conf.set('USE_EPOLL', true)
+else
+  conf.set('USE_POLL', true)
+endif
+
+if not get_option('syslog').disabled()
+  if compiler.has_function('syslog')
+    conf.set('HAVE_SYSLOG', true)
+  elif get_option('syslog').enabled()
+    error('syslog() not found')
+  endif
+endif
+
+enable_database = get_option('database')
+conf.set('ENABLE_DATABASE', enable_database)
+
+enable_inotify = get_option('inotify') and is_linux and enable_database
+conf.set('ENABLE_INOTIFY', enable_inotify)
+
+conf.set('ENABLE_DSD', get_option('dsd'))
+
+inc = include_directories(
+  'src',
+
+  # for the generated config.h
+  '.',
+)
+
+boost_dep = dependency('boost', version: '>= 1.58')
+if boost_dep.version() == '1.67'
+  # https://github.com/MusicPlayerDaemon/MPD/pull/384
+  # https://github.com/boostorg/lockfree/commit/12726cda009a855073b9bedbdce57b6ce7763da2
+  warning('Your Boost version 1.67 is known to be buggy, and the MPD build will fail. Please upgrade to Boost 1.68 or later.')
+endif
+
+sources = [
+  version_cxx,
+  'src/Main.cxx',
+  'src/protocol/Ack.cxx',
+  'src/protocol/ArgParser.cxx',
+  'src/protocol/Result.cxx',
+  'src/command/CommandError.cxx',
+  'src/command/AllCommands.cxx',
+  'src/command/QueueCommands.cxx',
+  'src/command/TagCommands.cxx',
+  'src/command/PlayerCommands.cxx',
+  'src/command/PlaylistCommands.cxx',
+  'src/command/FileCommands.cxx',
+  'src/command/OutputCommands.cxx',
+  'src/command/MessageCommands.cxx',
+  'src/command/ClientCommands.cxx',
+  'src/command/PartitionCommands.cxx',
+  'src/command/OtherCommands.cxx',
+  'src/command/CommandListBuilder.cxx',
+  'src/Idle.cxx',
+  'src/IdleFlags.cxx',
+  'src/decoder/Domain.cxx',
+  'src/decoder/Thread.cxx',
+  'src/decoder/Control.cxx',
+  'src/decoder/Bridge.cxx',
+  'src/decoder/DecoderPrint.cxx',
+  'src/client/Listener.cxx',
+  'src/client/Client.cxx',
+  'src/client/ClientEvent.cxx',
+  'src/client/ClientExpire.cxx',
+  'src/client/ClientGlobal.cxx',
+  'src/client/ClientIdle.cxx',
+  'src/client/ClientList.cxx',
+  'src/client/ClientNew.cxx',
+  'src/client/ClientProcess.cxx',
+  'src/client/ClientRead.cxx',
+  'src/client/ClientWrite.cxx',
+  'src/client/ClientMessage.cxx',
+  'src/client/ClientSubscribe.cxx',
+  'src/client/ClientFile.cxx',
+  'src/client/Response.cxx',
+  'src/Listen.cxx',
+  'src/LogInit.cxx',
+  'src/LogBackend.cxx',
+  'src/Log.cxx',
+  'src/ls.cxx',
+  'src/Instance.cxx',
+  'src/win32/Win32Main.cxx',
+  'src/MusicBuffer.cxx',
+  'src/MusicPipe.cxx',
+  'src/MusicChunk.cxx',
+  'src/MusicChunkPtr.cxx',
+  'src/Mapper.cxx',
+  'src/Partition.cxx',
+  'src/Permission.cxx',
+  'src/player/CrossFade.cxx',
+  'src/player/Thread.cxx',
+  'src/player/Control.cxx',
+  'src/PlaylistError.cxx',
+  'src/PlaylistPrint.cxx',
+  'src/PlaylistSave.cxx',
+  'src/playlist/PlaylistStream.cxx',
+  'src/playlist/PlaylistMapper.cxx',
+  'src/playlist/PlaylistAny.cxx',
+  'src/playlist/PlaylistSong.cxx',
+  'src/playlist/PlaylistQueue.cxx',
+  'src/playlist/Print.cxx',
+  'src/db/PlaylistVector.cxx',
+  'src/queue/Queue.cxx',
+  'src/queue/QueuePrint.cxx',
+  'src/queue/QueueSave.cxx',
+  'src/queue/Playlist.cxx',
+  'src/queue/PlaylistControl.cxx',
+  'src/queue/PlaylistEdit.cxx',
+  'src/queue/PlaylistTag.cxx',
+  'src/queue/PlaylistState.cxx',
+  'src/ReplayGainGlobal.cxx',
+  'src/LocateUri.cxx',
+  'src/SongUpdate.cxx',
+  'src/SongLoader.cxx',
+  'src/SongPrint.cxx',
+  'src/SongSave.cxx',
+  'src/StateFile.cxx',
+  'src/StateFileConfig.cxx',
+  'src/Stats.cxx',
+  'src/TagPrint.cxx',
+  'src/TagSave.cxx',
+  'src/TagFile.cxx',
+  'src/TagStream.cxx',
+  'src/TimePrint.cxx',
+  'src/mixer/Volume.cxx',
+  'src/PlaylistFile.cxx',
+]
+
+if not is_android
+  sources += [
+    'src/CommandLine.cxx',
+    'src/unix/SignalHandlers.cxx',
+  ]
+else
+  sources += [
+    'src/android/Context.cxx',
+    'src/android/AudioManager.cxx',
+    'src/android/Environment.cxx',
+    'src/android/LogListener.cxx',
+  ]
+endif
+
+if enable_daemon
+  sources += 'src/unix/Daemon.cxx'
+endif
+
+if enable_database
+  sources += [
+    'src/queue/PlaylistUpdate.cxx',
+    'src/command/StorageCommands.cxx',
+    'src/command/DatabaseCommands.cxx',
+  ]
+endif
+
+subdir('src/util')
+subdir('src/time')
+subdir('src/system')
+subdir('src/thread')
+subdir('src/net')
+subdir('src/event')
+
+subdir('src/apple')
+
+subdir('src/lib/dbus')
+subdir('src/lib/icu')
+subdir('src/lib/smbclient')
+subdir('src/lib/zlib')
+
+subdir('src/lib/alsa')
+subdir('src/lib/curl')
+subdir('src/lib/expat')
+subdir('src/lib/ffmpeg')
+subdir('src/lib/gcrypt')
+subdir('src/lib/nfs')
+subdir('src/lib/oss')
+subdir('src/lib/pcre')
+subdir('src/lib/pulse')
+subdir('src/lib/sndio')
+subdir('src/lib/sqlite')
+subdir('src/lib/systemd')
+subdir('src/lib/upnp')
+subdir('src/lib/yajl')
+
+subdir('src/fs')
+subdir('src/config')
+subdir('src/tag')
+subdir('src/pcm')
+subdir('src/neighbor')
+subdir('src/input')
+subdir('src/archive')
+subdir('src/filter')
+subdir('src/mixer')
+subdir('src/output')
+subdir('src/lib/xiph')
+subdir('src/decoder')
+subdir('src/encoder')
+subdir('src/song')
+subdir('src/playlist')
+subdir('src/zeroconf')
+
+if curl_dep.found()
+  sources += 'src/RemoteTagCache.cxx'
+endif
+
+if sqlite_dep.found()
+  sources += [
+    'src/command/StickerCommands.cxx',
+    'src/sticker/StickerDatabase.cxx',
+    'src/sticker/StickerPrint.cxx',
+    'src/sticker/SongSticker.cxx',
+  ]
+endif
+
+basic = static_library(
+  'basic',
+  'src/ReplayGainInfo.cxx',
+  'src/ReplayGainMode.cxx',
+  'src/SingleMode.cxx',
+  include_directories: inc,
+)
+
+basic_dep = declare_dependency(
+  link_with: basic,
+)
+
+if enable_database
+  subdir('src/storage')
+else
+  storage_glue_dep = dependency('', required: false)
+endif
+subdir('src/db')
+
+if neighbor_glue_dep.found()
+  sources += 'src/command/NeighborCommands.cxx'
+endif
+
+if archive_glue_dep.found()
+  sources += [
+    'src/TagArchive.cxx',
+  ]
+
+  if enable_database
+    sources += ['src/db/update/Archive.cxx']
+  endif
+endif
+
+if is_windows
+  sources += windows_resources
+endif
+
+link_args = []
+more_deps = []
+if is_android
+  subdir('src/java')
+  target_type = 'shared_library'
+  target_name = 'mpd'
+  link_args += [
+    '-Wl,--no-undefined,-shared,-Bsymbolic',
+    '-llog',
+    '-lz',
+  ]
+  more_deps += [
+    declare_dependency(sources: [classes_jar]),
+    java_dep,
+  ]
+elif is_haiku
+  target_type = 'executable'
+  target_name = 'mpd.nores'
+  link_args += [
+    '-lnetwork',
+    '-lbe',
+  ]
+else
+  target_type = 'executable'
+  target_name = 'mpd'
+endif
+
+mpd = build_target(
+  target_name,
+  sources,
+  target_type: target_type,
+  include_directories: inc,
+  dependencies: [
+    basic_dep,
+    config_dep,
+    dbus_dep,
+    fs_dep,
+    net_dep,
+    util_dep,
+    event_dep,
+    thread_dep,
+    neighbor_glue_dep,
+    input_glue_dep,
+    archive_glue_dep,
+    output_glue_dep,
+    mixer_glue_dep,
+    decoder_glue_dep,
+    encoder_glue_dep,
+    playlist_glue_dep,
+    db_glue_dep,
+    storage_glue_dep,
+    song_dep,
+    systemd_dep,
+    sqlite_dep,
+    zeroconf_dep,
+    more_deps,
+  ],
+  link_args: link_args,
+  install: not is_android and not is_haiku,
+)
+
+if is_android
+  subdir('android/apk')
+endif
+
+if is_haiku
+  subdir('src/haiku')
+  custom_target(
+    'mpd',
+    output: 'mpd',
+    input: [mpd, rsrc],
+    command: [addres, '@OUTPUT@', '@INPUT0@', '@INPUT1@'],
+    install: true,
+    install_dir: get_option('bindir'),
+  )
+endif
+
+configure_file(output: 'config.h', configuration: conf)
+
+if systemd_dep.found()
+  subdir('systemd')
+endif
+
+install_data(
+  'mpd.svg',
+  install_dir: join_paths(get_option('datadir'), 'icons', 'hicolor', 'scalable', 'apps'),
+)
+
+install_data(
+  'AUTHORS', 'COPYING', 'NEWS', 'README.md',
+  install_dir: join_paths(get_option('datadir'), 'doc', meson.project_name()),
+)
+
+if get_option('documentation')
+  subdir('doc')
+endif
+
+if get_option('test')
+  subdir('test')
+endif
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -0,0 +1,187 @@
+option('documentation', type: 'boolean', value: false, description: 'Build documentation')
+
+option('test', type: 'boolean', value: false, description: 'Build the unit tests and debug programs')
+
+option('syslog', type: 'feature', description: 'syslog support')
+option('inotify', type: 'boolean', value: true, description: 'inotify support (for automatic database update)')
+
+option('daemon', type: 'boolean', value: true, description: 'enable daemonization')
+option('systemd', type: 'feature', description: 'systemd support')
+
+option('systemd_system_unit_dir', type: 'string', description: 'systemd system service directory')
+option('systemd_user_unit_dir', type: 'string', description: 'systemd user service directory')
+
+#
+# Android
+#
+
+option('android_sdk', type: 'string', description: 'The path where Android SDK is installed')
+option('android_ndk', type: 'string', description: 'The path where Android NDK is installed')
+option('android_abi', type: 'string', value: 'armeabi-v7a', description: 'The Android ABI to be built')
+
+option('android_strip', type: 'string', value: 'strip', description: 'The "strip" tool from the NDK')
+
+option('android_debug_keystore', type: 'string', description: 'The keystore file used to sign debug APK files')
+
+option('android_keystore', type: 'string', description: 'The keystore file used to sign APK files')
+option('android_keyalias', type: 'string', description: 'The key alias used to sign APK files')
+option('android_keypass', type: 'string', description: 'The password of the keystore used to sign APK files')
+
+#
+# System call support
+#
+
+option('epoll', type: 'boolean', value: true, description: 'Use epoll on Linux')
+option('eventfd', type: 'boolean', value: true, description: 'Use eventfd() on Linux')
+option('signalfd', type: 'boolean', value: true, description: 'Use signalfd() on Linux')
+
+#
+# Network support
+#
+
+option('tcp', type: 'boolean', value: true, description: 'Support for clients connecting via TCP')
+option('ipv6', type: 'feature', description: 'Support for IPv6')
+option('local_socket', type: 'boolean', value: true, description: 'Support for clients connecting via local sockets')
+
+#
+# Audio formats
+#
+
+option('dsd', type: 'boolean', value: true, description: 'Support the DSD audio format')
+
+#
+# Database plugins
+#
+
+option('database', type: 'boolean', value: true, description: 'enable support for the music database')
+option('upnp', type: 'feature', description: 'UPnP client support')
+option('libmpdclient', type: 'feature', description: 'libmpdclient support (for the proxy database plugin)')
+
+#
+# Neighbor plugins
+#
+
+option('neighbor', type: 'boolean', value: true, description: 'enable support for neighbor discovery')
+
+#
+# Storage plugins
+#
+
+option('udisks', type: 'feature', description: 'Support for removable media using udisks2')
+option('webdav', type: 'feature', description: 'WebDAV support using CURL and Expat')
+
+#
+# Playlist plugins
+#
+
+option('cue', type: 'boolean', value: true, description: 'CUE sheet support')
+
+#
+# Input plugins
+#
+
+option('cdio_paranoia', type: 'feature', description: 'libcdio_paranoia input plugin')
+option('curl', type: 'feature', description: 'HTTP client using CURL')
+option('mms', type: 'feature', description: 'MMS protocol support using libmms')
+option('nfs', type: 'feature', description: 'NFS protocol support using libnfs')
+option('smbclient', type: 'feature', description: 'SMB support using libsmbclient')
+
+#
+# Commercial services
+#
+
+option('qobuz', type: 'feature', description: 'Qobuz client')
+option('soundcloud', type: 'feature', description: 'SoundCloud client')
+option('tidal', type: 'feature', description: 'Tidal client')
+
+#
+# Archive plugins
+#
+
+option('bzip2', type: 'feature', description: 'bzip2 support using libbz2')
+option('iso9660', type: 'feature', description: 'ISO9660 support using libiso9660')
+option('zzip', type: 'feature', description: 'ZIP support using zziplib')
+
+#
+# Tag plugins
+#
+
+option('id3tag', type: 'feature', description: 'ID3 support using libid3tag')
+option('chromaprint', type: 'feature', description: 'ChromaPrint / AcoustID support')
+
+#
+# Decoder plugins
+#
+
+option('adplug', type: 'feature', description: 'AdPlug decoder plugin')
+option('audiofile', type: 'feature', description: 'libaudiofile decoder plugin')
+option('faad', type: 'feature', description: 'AAC decoder using libfaad')
+option('ffmpeg', type: 'feature', description: 'FFmpeg codec support')
+option('flac', type: 'feature', description: 'FLAC decoder plugin')
+option('fluidsynth', type: 'feature', description: 'fluidsynth MIDI decoder plugin')
+option('gme', type: 'feature', description: 'Game Music Emulator decoder plugin')
+option('mad', type: 'feature', description: 'MP3 decoder using libmad')
+option('mikmod', type: 'feature', description: 'MikMod decoder plugin')
+option('modplug', type: 'feature', description: 'Modplug decoder plugin')
+option('mpcdec', type: 'feature', description: 'Musepack decoder plugin')
+option('mpg123', type: 'feature', description: 'MP3 decoder using libmpg123')
+option('opus', type: 'feature', description: 'Opus decoder plugin')
+option('sidplay', type: 'feature', description: 'C64 SID support via libsidplayfp or libsidplay2')
+option('sndfile', type: 'feature', description: 'libsndfile decoder plugin')
+option('tremor', type: 'feature', description: 'Fixed-point vorbis decoder plugin')
+option('vorbis', type: 'feature', description: 'Vorbis decoder plugin')
+option('wavpack', type: 'feature', description: 'WavPack decoder plugin')
+option('wildmidi', type: 'feature', description: 'WildMidi decoder plugin')
+
+#
+# Encoder plugins
+#
+
+option('vorbisenc', type: 'feature', description: 'Vorbis encoder plugin')
+option('lame', type: 'feature', description: 'LAME MP3 encoder plugin')
+option('twolame', type: 'feature', description: 'TwoLAME MP2 encoder plugin')
+option('shine', type: 'feature', description: 'shine MP3 encoder plugin')
+option('wave_encoder', type: 'boolean', value: true, description: 'PCM wave encoder encoder plugin')
+
+#
+# Filter plugins
+#
+
+option('libsamplerate', type: 'feature', description: 'libsamplerate resampler')
+option('soxr', type: 'feature', description: 'libsoxr resampler')
+
+#
+# Output plugins
+#
+
+option('alsa', type: 'feature', description: 'ALSA support')
+option('ao', type: 'feature', description: 'libao output plugin')
+option('fifo', type: 'boolean', value: true, description: 'FIFO output plugin')
+option('httpd', type: 'boolean', value: true, description: 'HTTP streaming output plugin')
+option('jack', type: 'feature', description: 'JACK output plugin')
+option('openal', type: 'feature', description: 'OpenAL output plugin')
+option('oss', type: 'feature', description: 'Open Sound System support')
+option('pipe', type: 'boolean', value: true, description: 'Pipe output plugin')
+option('pulse', type: 'feature', description: 'PulseAudio support')
+option('recorder', type: 'boolean', value: true, description: 'Recorder output plugin')
+option('shout', type: 'feature', description: 'Shoutcast streaming support using libshout')
+option('sndio', type: 'feature', description: 'sndio output plugin')
+option('solaris_output', type: 'feature', description: 'Solaris /dev/audio support')
+
+#
+# Misc libraries
+#
+
+option('dbus', type: 'feature', description: 'D-Bus support')
+option('expat', type: 'feature', description: 'Expat XML support')
+option('icu', type: 'feature', description: 'Use libicu for Unicode')
+option('iconv', type: 'feature', description: 'Use iconv() for character set conversion')
+option('pcre', type: 'feature', description: 'Enable regular expression support (using libpcre)')
+option('sqlite', type: 'feature', description: 'SQLite database support (for stickers)')
+option('yajl', type: 'feature', description: 'libyajl for YAML support')
+option('zlib', type: 'feature', description: 'zlib support (for database compression)')
+
+option('zeroconf', type: 'combo',
+       choices: ['auto', 'avahi', 'bonjour', 'disabled'],
+       value: 'auto',
+       description: 'Zeroconf support')
--- a/mpd.svg
+++ b/mpd.svg
@@ -0,0 +1,857 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Sodipodi ("http://www.sodipodi.com/") -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   x="0"
+   y="0"
+   width="128"
+   height="128"
+   id="svg1"
+   sodipodi:version="0.32"
+   sodipodi:docname="mpd.svg"
+   inkscape:version="0.47pre4 r22446"
+   inkscape:export-filename="/cowserver/documents/httpd/vhosts/images/mpd-test5.png"
+   inkscape:export-xdpi="76.799988"
+   inkscape:export-ydpi="76.799988">
+  <sodipodi:namedview
+     id="base"
+     inkscape:zoom="2.6884788"
+     inkscape:cx="71.610485"
+     inkscape:cy="61.484977"
+     inkscape:window-width="1680"
+     inkscape:window-height="994"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     showgrid="false"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg1" />
+  <defs
+     id="defs3">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 80 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="160 : 80 : 1"
+       inkscape:persp3d-origin="80 : 53.333333 : 1"
+       id="perspective118" />
+    <linearGradient
+       id="linearGradient919">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.86092716;"
+         offset="0.0000000"
+         id="stop920" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.0000000;"
+         offset="1.0000000"
+         id="stop921" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient1068">
+      <stop
+         offset="0.0000000"
+         style="stop-color:#d2d2d2;stop-opacity:1.0000000;"
+         id="stop1070" />
+      <stop
+         offset="1.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         id="stop1069" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient1065">
+      <stop
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         id="stop1067" />
+      <stop
+         offset="1.0000000"
+         style="stop-color:#c2bfbf;stop-opacity:0.99607843;"
+         id="stop1066" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient1060">
+      <stop
+         offset="0.0000000"
+         style="stop-color:#878787;stop-opacity:1.0000000;"
+         id="stop1063" />
+      <stop
+         offset="1.0000000"
+         style="stop-color:#000000;stop-opacity:0.99607843;"
+         id="stop1061" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient645">
+      <stop
+         style="stop-color:#aca597;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop646" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop647" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient593">
+      <stop
+         style="stop-color:#478acf;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop594" />
+      <stop
+         style="stop-color:#65c6f7;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop595" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient574">
+      <stop
+         style="stop-color:#85ad92;stop-opacity:1.0000;"
+         offset="0"
+         id="stop575" />
+      <stop
+         style="stop-color:#559db2;stop-opacity:0.7725;"
+         offset="1"
+         id="stop576" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient570">
+      <stop
+         style="stop-color:#999999;stop-opacity:0.7176;"
+         offset="0"
+         id="stop571" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.3725;"
+         offset="1"
+         id="stop572" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient573"
+       xlink:href="#linearGradient1068"
+       x1="40.458553"
+       y1="389.65582"
+       x2="36.063946"
+       y2="357.28375"
+       gradientTransform="matrix(2.3025192,0,0,0.29683004,-0.91913426,-1.5117091)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient1213"
+       xlink:href="#linearGradient1068"
+       x1="123.71407"
+       y1="141.41566"
+       x2="98.353867"
+       y2="113.41083"
+       gradientTransform="matrix(0.91680324,0,0,0.74547827,-0.91913426,-1.5117091)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       id="radialGradient581"
+       xlink:href="#linearGradient919"
+       cx="0.095785439"
+       cy="0.16814159"
+       r="1.5409589"
+       fx="0.095785439"
+       fy="0.16814159" />
+    <linearGradient
+       id="linearGradient580"
+       xlink:href="#linearGradient1068"
+       x1="132.0352"
+       y1="135.68469"
+       x2="119.62381"
+       y2="111.07157"
+       gradientTransform="matrix(0.90170536,0,0,0.75796032,-0.91913426,-1.5117091)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#linearGradient1060"
+       id="linearGradient901"
+       x1="0.93491787"
+       y1="0.92044502"
+       x2="-0.052546836"
+       y2="0.20347559" />
+    <linearGradient
+       xlink:href="#linearGradient593"
+       id="linearGradient902" />
+    <linearGradient
+       xlink:href="#linearGradient1068"
+       id="linearGradient916"
+       x1="0.14831461"
+       y1="-1.6875"
+       x2="0.43370786"
+       y2="1.8125" />
+    <defs
+       id="defs890">
+      <linearGradient
+         id="linearGradient922"
+         x1="0"
+         y1="0.5"
+         x2="1"
+         y2="0.5"
+         gradientUnits="objectBoundingBox"
+         spreadMethod="pad"
+         xlink:href="#linearGradient1065" />
+      <linearGradient
+         id="linearGradient908"
+         x1="0"
+         y1="0.5"
+         x2="1"
+         y2="0.5"
+         gradientUnits="objectBoundingBox"
+         spreadMethod="pad"
+         xlink:href="#linearGradient1060" />
+      <linearGradient
+         id="linearGradient894"
+         x1="0"
+         y1="0.5"
+         x2="1"
+         y2="0.5"
+         gradientUnits="objectBoundingBox"
+         spreadMethod="pad"
+         xlink:href="#linearGradient1068" />
+      <linearGradient
+         xlink:href="#linearGradient894"
+         id="linearGradient897"
+         x1="0.5955056"
+         y1="-0.33587787"
+         x2="0.61348313"
+         y2="1.1908396" />
+      <linearGradient
+         xlink:href="#linearGradient894"
+         id="linearGradient898"
+         x1="0.96449792"
+         y1="1.0278323"
+         x2="0.46738392"
+         y2="0.21800731" />
+      <linearGradient
+         xlink:href="#linearGradient908"
+         id="linearGradient907"
+         x1="0.57078654"
+         y1="2.3770492"
+         x2="0.33258426"
+         y2="0.49180329" />
+      <linearGradient
+         xlink:href="#linearGradient922"
+         id="linearGradient921"
+         x1="0.47058824"
+         y1="0.15384616"
+         x2="0.46547315"
+         y2="0.98380566" />
+      <linearGradient
+         xlink:href="#linearGradient922"
+         id="linearGradient948" />
+      <defs
+         id="defs987">
+        <linearGradient
+           id="linearGradient855"
+           x1="0"
+           y1="0.5"
+           x2="1"
+           y2="0.5"
+           gradientUnits="objectBoundingBox"
+           spreadMethod="pad"
+           xlink:href="#linearGradient908" />
+        <linearGradient
+           id="linearGradient1188"
+           x1="0"
+           y1="0.5"
+           x2="1"
+           y2="0.5"
+           gradientUnits="objectBoundingBox"
+           spreadMethod="pad"
+           xlink:href="#linearGradient922" />
+        <linearGradient
+           id="linearGradient831">
+          <stop
+             style="stop-color:#94897f;stop-opacity:1.0000000;"
+             offset="0.0000000"
+             id="stop832" />
+          <stop
+             style="stop-color:#fff5fe;stop-opacity:1.0000000;"
+             offset="1.0000000"
+             id="stop833" />
+        </linearGradient>
+        <linearGradient
+           xlink:href="#linearGradient1188"
+           id="linearGradient834"
+           x1="0.87550199"
+           y1="0.34817815"
+           x2="-0.29317269"
+           y2="0.93522269"
+           gradientUnits="objectBoundingBox"
+           spreadMethod="pad" />
+        <radialGradient
+           xlink:href="#linearGradient1188"
+           id="radialGradient835"
+           r="0.55628061"
+           fy="0.28125"
+           fx="0.59090906"
+           cy="0.28125"
+           cx="0.59090906"
+           spreadMethod="pad" />
+        <linearGradient
+           xlink:href="#linearGradient1188"
+           id="linearGradient893"
+           x1="0.12793733"
+           y1="0.76923078"
+           x2="0.49608356"
+           y2="0.70850199" />
+        <linearGradient
+           xlink:href="#linearGradient855"
+           id="linearGradient625"
+           x1="0.035955057"
+           y1="1.0276498"
+           x2="0.053932585"
+           y2="-0.359447" />
+        <linearGradient
+           xlink:href="#linearGradient1188"
+           id="linearGradient627"
+           x1="1.2826855"
+           y1="0.12550607"
+           x2="-0.15547703"
+           y2="0.96356273" />
+        <radialGradient
+           xlink:href="#linearGradient1188"
+           id="radialGradient628"
+           r="1.5982224"
+           fy="0.4866707"
+           fx="0.36789617"
+           cy="0.4866707"
+           cx="0.36789617"
+           gradientTransform="scale(0.877379,1.139758)" />
+        <linearGradient
+           xlink:href="#linearGradient1188"
+           id="linearGradient628"
+           x1="0.76923078"
+           y1="0.14979757"
+           x2="0.41909814"
+           y2="0.73279351" />
+      </defs>
+      <sodipodi:namedview
+         id="namedview898"
+         pagecolor="#ffffff"
+         bordercolor="#666666"
+         borderopacity="1.0"
+         inkscape:pageopacity="0.0"
+         inkscape:pageshadow="2"
+         inkscape:zoom="3.4732669"
+         inkscape:cx="50.051177"
+         inkscape:cy="18.096983"
+         inkscape:window-width="1022"
+         inkscape:window-height="670"
+         showguides="false"
+         snaptoguides="false"
+         showgrid="false"
+         snaptogrid="false"
+         inkscape:window-x="0"
+         inkscape:window-y="25">
+        <sodipodi:guide
+           orientation="vertical"
+           position="28.705556"
+           id="guide879" />
+        <sodipodi:guide
+           orientation="horizontal"
+           position="30.130655"
+           id="guide880" />
+      </sodipodi:namedview>
+    </defs>
+    <sodipodi:namedview
+       id="namedview1003"
+       pagecolor="#ffffff"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="1.3368738"
+       inkscape:cx="24.541029"
+       inkscape:cy="14.368596"
+       inkscape:window-width="640"
+       inkscape:window-height="499"
+       showguides="true"
+       snaptoguides="true"
+       inkscape:window-x="138"
+       inkscape:window-y="169" />
+    <linearGradient
+       xlink:href="#linearGradient1060"
+       id="linearGradient1304"
+       x1="-0.20218579"
+       y1="0.21681416"
+       x2="0.67759562"
+       y2="0.57522124" />
+    <linearGradient
+       xlink:href="#linearGradient1065"
+       id="linearGradient1322"
+       x1="0.32404181"
+       y1="0.77876109"
+       x2="0.24041812"
+       y2="0.26548672" />
+    <defs
+       id="defs989">
+      <linearGradient
+         id="linearGradient850">
+        <stop
+           style="stop-color:#eed680;stop-opacity:1.0000000;"
+           offset="0.0000000"
+           id="stop852" />
+        <stop
+           style="stop-color:#dfb546;stop-opacity:1.0000000;"
+           offset="0.68035328"
+           id="stop858" />
+        <stop
+           style="stop-color:#d8a429;stop-opacity:1.0000000;"
+           offset="0.77277374"
+           id="stop859" />
+        <stop
+           style="stop-color:#d1940c;stop-opacity:1.0000000;"
+           offset="1.0000000"
+           id="stop857" />
+      </linearGradient>
+      <linearGradient
+         xlink:href="#linearGradient850"
+         id="linearGradient569"
+         x1="0.11875"
+         y1="0.12612613"
+         x2="0.59375"
+         y2="0.66066068"
+         spreadMethod="pad" />
+      <linearGradient
+         id="linearGradient839">
+        <stop
+           style="stop-color:#46a046;stop-opacity:1.0000000;"
+           offset="0.0000000"
+           id="stop840" />
+        <stop
+           style="stop-color:#df421e;stop-opacity:1.0000000;"
+           offset="0.39364964"
+           id="stop841" />
+        <stop
+           style="stop-color:#ada7c8;stop-opacity:1.0000000;"
+           offset="0.72036445"
+           id="stop842" />
+        <stop
+           style="stop-color:#eed680;stop-opacity:1.0000000;"
+           offset="1.0000000"
+           id="stop843" />
+      </linearGradient>
+      <linearGradient
+         xlink:href="#linearGradient839"
+         id="linearGradient836"
+         x1="1.3267924e-17"
+         y1="0.5"
+         x2="1"
+         y2="0.5" />
+      <defs
+         id="defs604">
+        <linearGradient
+           id="linearGradient622">
+          <stop
+             style="stop-color:#f8e29d;stop-opacity:0.4471;"
+             offset="0"
+             id="stop623" />
+          <stop
+             style="stop-color:#272d2d;stop-opacity:0.4784;"
+             offset="1"
+             id="stop624" />
+        </linearGradient>
+        <linearGradient
+           id="linearGradient617">
+          <stop
+             style="stop-color:#ffffff;stop-opacity:1;"
+             offset="0"
+             id="stop618" />
+          <stop
+             style="stop-color:#000000;stop-opacity:1;"
+             offset="1"
+             id="stop619" />
+        </linearGradient>
+        <linearGradient
+           id="linearGradient613">
+          <stop
+             style="stop-color:#ffffff;stop-opacity:0.6235;"
+             offset="0"
+             id="stop614" />
+          <stop
+             style="stop-color:#5d6567;stop-opacity:1;"
+             offset="1"
+             id="stop615" />
+        </linearGradient>
+        <linearGradient
+           id="linearGradient607">
+          <stop
+             style="stop-color:#d7d5d5;stop-opacity:1;"
+             offset="0"
+             id="stop608" />
+          <stop
+             style="stop-color:#000000;stop-opacity:0.4039;"
+             offset="1"
+             id="stop609" />
+        </linearGradient>
+        <radialGradient
+           xlink:href="#linearGradient607"
+           id="radialGradient610"
+           cx="1.4287461"
+           cy="0.75323397"
+           r="0.85534656"
+           fx="1.4287461"
+           fy="0.75323397"
+           gradientTransform="matrix(1,2.268336e-6,-1.975559e-5,1,5.713033e-8,3.856326e-8)" />
+        <linearGradient
+           xlink:href="#linearGradient617"
+           id="linearGradient612"
+           x1="7.7024956"
+           y1="-2.0263922"
+           x2="62.759903"
+           y2="56.137772"
+           gradientTransform="scale(0.9953779,1.0046436)"
+           gradientUnits="userSpaceOnUse" />
+        <radialGradient
+           xlink:href="#linearGradient613"
+           id="radialGradient616"
+           cx="58.70882"
+           cy="53.831562"
+           r="43.551846"
+           fx="58.70882"
+           fy="53.831562"
+           gradientTransform="scale(0.99517298,1.0048504)"
+           gradientUnits="userSpaceOnUse" />
+        <linearGradient
+           xlink:href="#linearGradient617"
+           id="linearGradient621" />
+        <linearGradient
+           xlink:href="#linearGradient617"
+           id="linearGradient626"
+           x1="72.060211"
+           y1="55.161442"
+           x2="32.409"
+           y2="12.126946"
+           gradientTransform="matrix(0.995134,-1.068631e-5,-1.31398e-7,1.00489,0,0)"
+           gradientUnits="userSpaceOnUse" />
+        <linearGradient
+           xlink:href="#linearGradient607"
+           id="linearGradient687"
+           x1="67.707405"
+           y1="49.314793"
+           x2="-10.031048"
+           y2="4.6068792"
+           gradientTransform="scale(0.99522839,1.0047945)"
+           gradientUnits="userSpaceOnUse" />
+        <linearGradient
+           xlink:href="#linearGradient617"
+           id="linearGradient742"
+           x1="-7.4378386"
+           y1="25.923714"
+           x2="18.009745"
+           y2="10.089797"
+           gradientTransform="scale(0.889853,1.123781)" />
+      </defs>
+      <sodipodi:namedview
+         id="namedview889"
+         showguides="true"
+         snaptoguides="true"
+         inkscape:zoom="7.5625000"
+         inkscape:cx="24.000000"
+         inkscape:cy="24.000000"
+         inkscape:window-width="640"
+         inkscape:window-height="496"
+         inkscape:window-x="0"
+         inkscape:window-y="26" />
+    </defs>
+    <sodipodi:namedview
+       id="namedview1023"
+       pagecolor="#ffffff"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="3.5521067"
+       inkscape:cx="66.459318"
+       inkscape:cy="62.629296"
+       inkscape:window-width="1150"
+       inkscape:window-height="752"
+       showgrid="true"
+       snaptogrid="true"
+       inkscape:window-x="0"
+       inkscape:window-y="29">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1.0000000mm"
+         spacingy="1.0000000mm"
+         color="#0000ff"
+         empcolor="#0000ff"
+         opacity="0.2"
+         empopacity="0.4"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1068"
+       id="linearGradient2924"
+       x1="41.673889"
+       y1="320.40921"
+       x2="36.082947"
+       y2="279.22458"
+       gradientTransform="matrix(2.3376099,0,0,0.29237422,-0.91913426,-1.5117091)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1068"
+       id="linearGradient2926"
+       x1="134.95444"
+       y1="108.16693"
+       x2="102.05431"
+       y2="71.835884"
+       gradientTransform="matrix(0.91680324,0,0,0.74547824,-0.91913426,-1.5117091)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1068"
+       id="linearGradient2928"
+       x1="145.32188"
+       y1="101.97199"
+       x2="129.22044"
+       y2="70.041069"
+       gradientTransform="matrix(0.90170536,0,0,0.75796032,-0.91913426,-1.5117091)"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <rect
+     style="fill-opacity:0.47154475;fill-rule:evenodd;stroke-width:3pt"
+     id="rect918"
+     width="48.72493"
+     height="42.16835"
+     ry="0.74231374"
+     x="67.536102"
+     y="66.474693"
+     inkscape:export-filename="/cowserver/documents/httpd/vhosts/images/mpd-big7.png"
+     inkscape:export-xdpi="721.66998"
+     inkscape:export-ydpi="721.66998"
+     rx="0.7811048" />
+  <rect
+     style="fill-opacity:0.47154475;fill-rule:evenodd;stroke-width:3pt"
+     id="rect1006"
+     width="63.211483"
+     height="54.705563"
+     ry="0.74231374"
+     x="64.47226"
+     y="30.558294"
+     inkscape:export-filename="/cowserver/documents/httpd/vhosts/images/mpd-big7.png"
+     inkscape:export-xdpi="721.66998"
+     inkscape:export-ydpi="721.66998"
+     rx="0.7811048" />
+  <rect
+     style="fill:#000000;fill-opacity:0.47058824;fill-rule:evenodd"
+     id="rect1005"
+     width="57.843418"
+     height="9.0050545"
+     ry="0.62889248"
+     x="65.398254"
+     y="82.153206"
+     inkscape:export-filename="/cowserver/documents/httpd/vhosts/images/mpd-big7.png"
+     inkscape:export-xdpi="721.66998"
+     inkscape:export-ydpi="721.66998"
+     rx="0.66175652" />
+  <rect
+     style="fill:url(#linearGradient2924);fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:0.82671446"
+     id="rect1007"
+     width="54.910637"
+     height="6.1445785"
+     ry="0.42912331"
+     x="64.622299"
+     y="82.282539"
+     inkscape:export-filename="/cowserver/documents/httpd/vhosts/images/mpd-big7.png"
+     inkscape:export-xdpi="721.66998"
+     inkscape:export-ydpi="721.66998"
+     rx="0.44939452" />
+  <rect
+     width="57.905403"
+     height="47.084496"
+     ry="1.7822117"
+     x="63.784973"
+     y="32.456562"
+     style="font-size:12px;fill:url(#linearGradient2926);fill-rule:evenodd;stroke:#000000;stroke-width:0"
+     id="rect1009"
+     inkscape:export-filename="/cowserver/documents/httpd/vhosts/images/mpd-big7.png"
+     inkscape:export-xdpi="721.66998"
+     inkscape:export-ydpi="721.66998"
+     rx="1.6336281" />
+  <rect
+     style="fill:#000000;fill-opacity:0.47058824;fill-rule:evenodd"
+     id="rect971"
+     width="44.58709"
+     height="6.9413123"
+     ry="0.62889248"
+     x="68.249886"
+     y="106.24529"
+     inkscape:export-filename="/cowserver/documents/httpd/vhosts/images/mpd-big7.png"
+     inkscape:export-xdpi="721.66998"
+     inkscape:export-ydpi="721.66998"
+     rx="0.66175652" />
+  <rect
+     width="64.637024"
+     height="54.068516"
+     ry="1.4120796"
+     x="59.853096"
+     y="28.740753"
+     style="font-size:12px;fill:url(#linearGradient2928);fill-rule:evenodd;stroke:#000000;stroke-width:1.65869105"
+     id="rect1008"
+     inkscape:export-filename="/cowserver/documents/httpd/vhosts/images/mpd-big7.png"
+     inkscape:export-xdpi="721.66998"
+     inkscape:export-ydpi="721.66998"
+     rx="1.3970968" />
+  <rect
+     width="51.129478"
+     height="39.964478"
+     ry="0.5422883"
+     x="66.358932"
+     y="34.89621"
+     style="font-size:12px;fill:#00b4ed;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.79054338;stroke-linejoin:round"
+     id="rect976"
+     inkscape:export-filename="/cowserver/documents/httpd/vhosts/images/mpd-big7.png"
+     inkscape:export-xdpi="721.66998"
+     inkscape:export-ydpi="721.66998"
+     rx="0.5422883" />
+  <metadata
+     id="metadata982">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <rect
+     width="44.634872"
+     height="36.293858"
+     ry="1.7822117"
+     x="67.006332"
+     y="67.937927"
+     style="font-size:12px;fill:url(#linearGradient1213);fill-rule:evenodd;stroke:#000000;stroke-width:0"
+     id="rect575"
+     inkscape:export-filename="/cowserver/documents/httpd/vhosts/images/mpd-big7.png"
+     inkscape:export-xdpi="721.66998"
+     inkscape:export-ydpi="721.66998"
+     rx="1.633628" />
+  <path
+     sodipodi:type="arc"
+     style="font-size:12px;fill:#444040;fill-opacity:0.47058824;fill-rule:evenodd"
+     id="path672"
+     d="m 68.473,57.85183 a 23.629898,3.2222576 0 1 1 -47.259797,0 23.629898,3.2222576 0 1 1 47.259797,0 z"
+     sodipodi:cx="44.843102"
+     sodipodi:cy="57.85183"
+     sodipodi:rx="23.629898"
+     sodipodi:ry="3.2222576"
+     transform="matrix(1.4221482,0,-0.30247168,1.9834766,9.6201687,-10.428817)"
+     inkscape:export-filename="/cowserver/documents/httpd/vhosts/images/mpd-big2.png"
+     inkscape:export-xdpi="721.66998"
+     inkscape:export-ydpi="721.66998" />
+  <path
+     sodipodi:type="arc"
+     style="font-size:12px;fill:#4e4d4b;fill-rule:evenodd;stroke:#000000;stroke-width:2.30019999;stroke-opacity:0.9565"
+     id="path625"
+     d="m 58.291138,27.531645 a 19.367088,19.556963 0 1 1 -38.734177,0 19.367088,19.556963 0 1 1 38.734177,0 z"
+     sodipodi:cx="38.924049"
+     sodipodi:cy="27.531645"
+     sodipodi:rx="19.367088"
+     sodipodi:ry="19.556963"
+     transform="matrix(-1.0172416,-0.47376693,-0.5523759,1.3286212,116.84611,57.272851)"
+     inkscape:export-filename="/cowserver/documents/httpd/vhosts/images/mpd-big2.png"
+     inkscape:export-xdpi="721.66998"
+     inkscape:export-ydpi="721.66998" />
+  <path
+     sodipodi:type="arc"
+     style="font-size:12px;fill:url(#linearGradient612);fill-rule:evenodd;stroke:#000000;stroke-width:2.06100011;stroke-opacity:0.9565"
+     id="path605"
+     d="m 58.291138,27.531645 a 19.367088,19.556963 0 1 1 -38.734177,0 19.367088,19.556963 0 1 1 38.734177,0 z"
+     sodipodi:cx="38.924049"
+     sodipodi:cy="27.531645"
+     sodipodi:rx="19.367088"
+     sodipodi:ry="19.556963"
+     transform="matrix(-1.4321234,-0.79696518,-1.1299666,2.2349846,128.07685,29.383033)"
+     inkscape:export-filename="/cowserver/documents/httpd/vhosts/images/mpd-big2.png"
+     inkscape:export-xdpi="721.66998"
+     inkscape:export-ydpi="721.66998" />
+  <path
+     sodipodi:type="arc"
+     style="font-size:12px;fill:url(#radialGradient616);fill-rule:evenodd;stroke:#000000;stroke-width:0.317;stroke-opacity:0.97829997"
+     id="path606"
+     d="m 58.291138,27.531645 a 19.367088,19.556963 0 1 1 -38.734177,0 19.367088,19.556963 0 1 1 38.734177,0 z"
+     sodipodi:cx="38.924049"
+     sodipodi:cy="27.531645"
+     sodipodi:rx="19.367088"
+     sodipodi:ry="19.556963"
+     transform="matrix(-1.1546358,-0.69851175,-0.95634664,1.9588777,108.06887,31.115628)"
+     inkscape:export-filename="/cowserver/documents/httpd/vhosts/images/mpd-big2.png"
+     inkscape:export-xdpi="721.66998"
+     inkscape:export-ydpi="721.66998" />
+  <path
+     sodipodi:type="arc"
+     style="font-size:12px;fill-rule:evenodd;stroke-width:1.63499999"
+     id="path686"
+     d="m 58.291138,27.531645 a 19.367088,19.556963 0 1 1 -38.734177,0 19.367088,19.556963 0 1 1 38.734177,0 z"
+     sodipodi:cx="38.924049"
+     sodipodi:cy="27.531645"
+     sodipodi:rx="19.367088"
+     sodipodi:ry="19.556963"
+     transform="matrix(-0.39495459,-0.4546194,-0.52881207,0.94219495,73.198184,52.427791)"
+     inkscape:export-filename="/cowserver/documents/httpd/vhosts/images/mpd-big2.png"
+     inkscape:export-xdpi="721.66998"
+     inkscape:export-ydpi="721.66998" />
+  <path
+     sodipodi:type="arc"
+     style="font-size:12px;fill:url(#linearGradient687);fill-rule:evenodd;stroke:#3f3b3b;stroke-width:0.77380002"
+     id="path611"
+     d="m 58.291138,27.531645 a 19.367088,19.556963 0 1 1 -38.734177,0 19.367088,19.556963 0 1 1 38.734177,0 z"
+     sodipodi:cx="38.924049"
+     sodipodi:cy="27.531645"
+     sodipodi:rx="19.367088"
+     sodipodi:ry="19.556963"
+     transform="matrix(-0.36949013,-0.40957751,-0.49471918,0.84885391,70.248021,52.066881)"
+     inkscape:export-filename="/cowserver/documents/httpd/vhosts/images/mpd-big2.png"
+     inkscape:export-xdpi="721.66998"
+     inkscape:export-ydpi="721.66998" />
+  <rect
+     style="fill:url(#linearGradient573);fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:0.82671446"
+     id="rect934"
+     width="42.326431"
+     height="4.7363882"
+     ry="0.42912331"
+     x="67.651756"
+     y="106.34497"
+     inkscape:export-filename="/cowserver/documents/httpd/vhosts/images/mpd-big7.png"
+     inkscape:export-xdpi="721.66998"
+     inkscape:export-ydpi="721.66998"
+     rx="0.44939449" />
+  <rect
+     width="49.823761"
+     height="41.677303"
+     ry="1.4120796"
+     x="63.975548"
+     y="65.073692"
+     style="font-size:12px;fill:url(#linearGradient580);fill-rule:evenodd;stroke:#000000;stroke-width:1.27855873;stroke-opacity:1"
+     id="rect562"
+     inkscape:export-filename="/cowserver/documents/httpd/vhosts/images/mpd-big7.png"
+     inkscape:export-xdpi="721.66998"
+     inkscape:export-ydpi="721.66998"
+     rx="1.3970969" />
+  <rect
+     width="39.411831"
+     height="30.805574"
+     ry="0.5422883"
+     x="68.990387"
+     y="70.097008"
+     style="font-size:12px;fill:#003d88;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.61407685;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.93023257"
+     id="rect975"
+     inkscape:export-filename="/cowserver/documents/httpd/vhosts/images/mpd-big7.png"
+     inkscape:export-xdpi="721.66998"
+     inkscape:export-ydpi="721.66998"
+     rx="0.5422883" />
+</svg>
--- a/python/build/autotools.py
+++ b/python/build/autotools.py
@@ -0,0 +1,64 @@
+import os.path, subprocess, sys
+
+from build.makeproject import MakeProject
+
+class AutotoolsProject(MakeProject):
+    def __init__(self, url, md5, installed, configure_args=[],
+                 autogen=False,
+                 autoreconf=False,
+                 cppflags='',
+                 ldflags='',
+                 libs='',
+                 subdirs=None,
+                 **kwargs):
+        MakeProject.__init__(self, url, md5, installed, **kwargs)
+        self.configure_args = configure_args
+        self.autogen = autogen
+        self.autoreconf = autoreconf
+        self.cppflags = cppflags
+        self.ldflags = ldflags
+        self.libs = libs
+        self.subdirs = subdirs
+
+    def configure(self, toolchain):
+        src = self.unpack(toolchain)
+        if self.autogen:
+            if sys.platform == 'darwin':
+                subprocess.check_call(['glibtoolize', '--force'], cwd=src)
+            else:
+                subprocess.check_call(['libtoolize', '--force'], cwd=src)
+            subprocess.check_call(['aclocal'], cwd=src)
+            subprocess.check_call(['automake', '--add-missing', '--force-missing', '--foreign'], cwd=src)
+            subprocess.check_call(['autoconf'], cwd=src)
+        if self.autoreconf:
+            subprocess.check_call(['autoreconf', '-vif'], cwd=src)
+
+        build = self.make_build_path(toolchain)
+
+        configure = [
+            os.path.join(src, 'configure'),
+            'CC=' + toolchain.cc,
+            'CXX=' + toolchain.cxx,
+            'CFLAGS=' + toolchain.cflags,
+            'CXXFLAGS=' + toolchain.cxxflags,
+            'CPPFLAGS=' + toolchain.cppflags + ' ' + self.cppflags,
+            'LDFLAGS=' + toolchain.ldflags + ' ' + self.ldflags,
+            'LIBS=' + toolchain.libs + ' ' + self.libs,
+            'AR=' + toolchain.ar,
+            'RANLIB=' + toolchain.ranlib,
+            'STRIP=' + toolchain.strip,
+            '--host=' + toolchain.arch,
+            '--prefix=' + toolchain.install_prefix,
+            '--enable-silent-rules',
+        ] + self.configure_args
+
+        subprocess.check_call(configure, cwd=build, env=toolchain.env)
+        return build
+
+    def build(self, toolchain):
+        build = self.configure(toolchain)
+        if self.subdirs is not None:
+            for subdir in self.subdirs:
+                MakeProject.build(self, toolchain, os.path.join(build, subdir))
+        else:
+            MakeProject.build(self, toolchain, build)
--- a/python/build/boost.py
+++ b/python/build/boost.py
@@ -0,0 +1,23 @@
+import os, shutil
+import re
+
+from build.project import Project
+
+class BoostProject(Project):
+    def __init__(self, url, md5, installed,
+                 **kwargs):
+        m = re.match(r'.*/boost_(\d+)_(\d+)_(\d+)\.tar\.bz2$', url)
+        version = "%s.%s.%s" % (m.group(1), m.group(2), m.group(3))
+        Project.__init__(self, url, md5, installed,
+                         name='boost', version=version,
+                         **kwargs)
+
+    def build(self, toolchain):
+        src = self.unpack(toolchain)
+
+        # install the headers manually; don't build any library
+        # (because right now, we only use header-only libraries)
+        includedir = os.path.join(toolchain.install_prefix, 'include')
+        dest = os.path.join(includedir, 'boost')
+        shutil.rmtree(dest, ignore_errors=True)
+        shutil.copytree(os.path.join(src, 'boost'), dest)
--- a/python/build/cmake.py
+++ b/python/build/cmake.py
@@ -0,0 +1,45 @@
+import subprocess
+
+from build.project import Project
+
+def configure(toolchain, src, build, args=()):
+    cross_args = []
+
+    if toolchain.is_windows:
+        cross_args.append('-DCMAKE_SYSTEM_NAME=Windows')
+        cross_args.append('-DCMAKE_RC_COMPILER=' + toolchain.windres)
+
+    configure = [
+        'cmake',
+        src,
+
+        '-DCMAKE_INSTALL_PREFIX=' + toolchain.install_prefix,
+        '-DCMAKE_BUILD_TYPE=release',
+
+        '-DCMAKE_C_COMPILER=' + toolchain.cc,
+        '-DCMAKE_CXX_COMPILER=' + toolchain.cxx,
+
+        '-DCMAKE_C_FLAGS=' + toolchain.cflags + ' ' + toolchain.cppflags,
+        '-DCMAKE_CXX_FLAGS=' + toolchain.cxxflags + ' ' + toolchain.cppflags,
+
+        '-GNinja',
+    ] + cross_args + args
+
+    subprocess.check_call(configure, env=toolchain.env, cwd=build)
+
+class CmakeProject(Project):
+    def __init__(self, url, md5, installed, configure_args=[],
+                 **kwargs):
+        Project.__init__(self, url, md5, installed, **kwargs)
+        self.configure_args = configure_args
+
+    def configure(self, toolchain):
+        src = self.unpack(toolchain)
+        build = self.make_build_path(toolchain)
+        configure(toolchain, src, build, self.configure_args)
+        return build
+
+    def build(self, toolchain):
+        build = self.configure(toolchain)
+        subprocess.check_call(['ninja', 'install'],
+                              cwd=build, env=toolchain.env)
--- a/python/build/dirs.py
+++ b/python/build/dirs.py
@@ -0,0 +1,9 @@
+import os.path
+
+lib_path = os.path.abspath('lib')
+
+shared_path = lib_path
+if 'MPD_SHARED_LIB' in os.environ:
+    shared_path = os.environ['MPD_SHARED_LIB']
+tarball_path = os.path.join(shared_path, 'download')
+src_path = os.path.join(shared_path, 'src')
--- a/python/build/download.py
+++ b/python/build/download.py
@@ -0,0 +1,26 @@
+from build.verify import verify_file_digest
+import os
+import urllib.request
+
+def download_and_verify(url, md5, parent_path):
+    """Download a file, verify its MD5 checksum and return the local path."""
+
+    os.makedirs(parent_path, exist_ok=True)
+    path = os.path.join(parent_path, os.path.basename(url))
+
+    try:
+        if verify_file_digest(path, md5): return path
+        os.unlink(path)
+    except FileNotFoundError:
+        pass
+
+    tmp_path = path + '.tmp'
+
+    print("download", url)
+    urllib.request.urlretrieve(url, tmp_path)
+    if not verify_file_digest(tmp_path, md5):
+        os.unlink(tmp_path)
+        raise RuntimeError("Digest mismatch")
+
+    os.rename(tmp_path, path)
+    return path
--- a/python/build/ffmpeg.py
+++ b/python/build/ffmpeg.py
@@ -0,0 +1,56 @@
+import os.path, subprocess
+
+from build.project import Project
+
+class FfmpegProject(Project):
+    def __init__(self, url, md5, installed, configure_args=[],
+                 cppflags='',
+                 **kwargs):
+        Project.__init__(self, url, md5, installed, **kwargs)
+        self.configure_args = configure_args
+        self.cppflags = cppflags
+
+    def _filter_cflags(self, flags):
+        # FFmpeg expects the GNU as syntax
+        flags = flags.replace(' -integrated-as ', ' -no-integrated-as ')
+        return flags
+
+    def build(self, toolchain):
+        src = self.unpack(toolchain)
+        build = self.make_build_path(toolchain)
+
+        if toolchain.is_arm:
+            arch = 'arm'
+        elif toolchain.is_aarch64:
+            arch = 'aarch64'
+        else:
+            arch = 'x86'
+
+        if toolchain.is_windows:
+            target_os = 'mingw32'
+        else:
+            target_os = 'linux'
+
+        configure = [
+            os.path.join(src, 'configure'),
+            '--cc=' + toolchain.cc,
+            '--cxx=' + toolchain.cxx,
+            '--nm=' + toolchain.nm,
+            '--extra-cflags=' + self._filter_cflags(toolchain.cflags) + ' ' + toolchain.cppflags + ' ' + self.cppflags,
+            '--extra-cxxflags=' + self._filter_cflags(toolchain.cxxflags) + ' ' + toolchain.cppflags + ' ' + self.cppflags,
+            '--extra-ldflags=' + toolchain.ldflags,
+            '--extra-libs=' + toolchain.libs,
+            '--ar=' + toolchain.ar,
+            '--ranlib=' + toolchain.ranlib,
+            '--enable-cross-compile',
+            '--arch=' + arch,
+            '--target-os=' + target_os,
+            '--prefix=' + toolchain.install_prefix,
+        ] + self.configure_args
+
+        if toolchain.is_armv7:
+            configure.append('--cpu=cortex-a8')
+
+        subprocess.check_call(configure, cwd=build, env=toolchain.env)
+        subprocess.check_call(['/usr/bin/make', '--quiet', '-j12'], cwd=build, env=toolchain.env)
+        subprocess.check_call(['/usr/bin/make', '--quiet', 'install'], cwd=build, env=toolchain.env)
--- a/python/build/libs.py
+++ b/python/build/libs.py
@@ -0,0 +1,439 @@
+import re
+from os.path import abspath
+
+from build.project import Project
+from build.zlib import ZlibProject
+from build.meson import MesonProject
+from build.cmake import CmakeProject
+from build.autotools import AutotoolsProject
+from build.ffmpeg import FfmpegProject
+from build.boost import BoostProject
+
+libmpdclient = MesonProject(
+    'https://www.musicpd.org/download/libmpdclient/2/libmpdclient-2.19.tar.xz',
+    '158aad4c2278ab08e76a3f2b0166c99b39fae00ee17231bd225c5a36e977a189',
+    'lib/libmpdclient.a',
+)
+
+libogg = AutotoolsProject(
+    'http://downloads.xiph.org/releases/ogg/libogg-1.3.4.tar.xz',
+    'c163bc12bc300c401b6aa35907ac682671ea376f13ae0969a220f7ddf71893fe',
+    'lib/libogg.a',
+    [
+        '--disable-shared', '--enable-static',
+    ],
+)
+
+libvorbis = AutotoolsProject(
+    'http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.7.tar.xz',
+    'b33cc4934322bcbf6efcbacf49e3ca01aadbea4114ec9589d1b1e9d20f72954b',
+    'lib/libvorbis.a',
+    [
+        '--disable-shared', '--enable-static',
+    ],
+
+    edits={
+        # this option is not understood by clang
+        'configure': lambda data: data.replace('-mno-ieee-fp', ' '),
+    }
+)
+
+opus = AutotoolsProject(
+    'https://archive.mozilla.org/pub/opus/opus-1.3.1.tar.gz',
+    '65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d',
+    'lib/libopus.a',
+    [
+        '--disable-shared', '--enable-static',
+        '--disable-doc',
+        '--disable-extra-programs',
+    ],
+
+    # suppress "visibility default" from opus_defines.h
+    cppflags='-DOPUS_EXPORT=',
+)
+
+flac = AutotoolsProject(
+    'http://downloads.xiph.org/releases/flac/flac-1.3.3.tar.xz',
+    '213e82bd716c9de6db2f98bcadbc4c24c7e2efe8c75939a1a84e28539c4e1748',
+    'lib/libFLAC.a',
+    [
+        '--disable-shared', '--enable-static',
+        '--disable-xmms-plugin', '--disable-cpplibs',
+        '--disable-doxygen-docs',
+    ],
+    subdirs=['include', 'src/libFLAC'],
+)
+
+zlib = ZlibProject(
+    'http://zlib.net/zlib-1.2.11.tar.xz',
+    '4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066',
+    'lib/libz.a',
+)
+
+libid3tag = AutotoolsProject(
+    'ftp://ftp.mars.org/pub/mpeg/libid3tag-0.15.1b.tar.gz',
+    'e5808ad997ba32c498803822078748c3',
+    'lib/libid3tag.a',
+    [
+        '--disable-shared', '--enable-static',
+
+        # without this, libid3tag's configure.ac ignores -O* and -f*
+        '--disable-debugging',
+    ],
+    autogen=True,
+
+    edits={
+        # fix bug in libid3tag's configure.ac which discards all but the last optimization flag
+        'configure.ac': lambda data: re.sub(r'optimize="\$1"', r'optimize="$optimize $1"', data, count=1),
+    }
+)
+
+libmad = AutotoolsProject(
+    'ftp://ftp.mars.org/pub/mpeg/libmad-0.15.1b.tar.gz',
+    '1be543bc30c56fb6bea1d7bf6a64e66c',
+    'lib/libmad.a',
+    [
+        '--disable-shared', '--enable-static',
+
+        # without this, libmad's configure.ac ignores -O* and -f*
+        '--disable-debugging',
+    ],
+    autogen=True,
+)
+
+liblame = AutotoolsProject(
+    'http://downloads.sourceforge.net/project/lame/lame/3.100/lame-3.100.tar.gz',
+    'ddfe36cab873794038ae2c1210557ad34857a4b6bdc515785d1da9e175b1da1e',
+    'lib/libmp3lame.a',
+    [
+        '--disable-shared', '--enable-static',
+        '--disable-gtktest', '--disable-analyzer-hooks',
+        '--disable-decoder', '--disable-frontend',
+    ],
+)
+
+libmodplug = AutotoolsProject(
+    'https://downloads.sourceforge.net/modplug-xmms/libmodplug/0.8.9.0/libmodplug-0.8.9.0.tar.gz',
+    '457ca5a6c179656d66c01505c0d95fafaead4329b9dbaa0f997d00a3508ad9de',
+    'lib/libmodplug.a',
+    [
+        '--disable-shared', '--enable-static',
+    ],
+)
+
+wildmidi = CmakeProject(
+    'https://codeload.github.com/Mindwerks/wildmidi/tar.gz/wildmidi-0.4.3',
+    '498e5a96455bb4b91b37188ad6dcb070824e92c44f5ed452b90adbaec8eef3c5',
+    'lib/libWildMidi.a',
+    [
+        '-DBUILD_SHARED_LIBS=OFF',
+        '-DWANT_PLAYER=OFF',
+        '-DWANT_STATIC=ON',
+    ],
+    base='wildmidi-wildmidi-0.4.3',
+    name='wildmidi',
+    version='0.4.3',
+)
+
+gme = CmakeProject(
+    'https://bitbucket.org/mpyne/game-music-emu/downloads/game-music-emu-0.6.3.tar.xz',
+    'aba34e53ef0ec6a34b58b84e28bf8cfbccee6585cebca25333604c35db3e051d',
+    'lib/libgme.a',
+    [
+        '-DBUILD_SHARED_LIBS=OFF',
+        '-DENABLE_UBSAN=OFF',
+        '-DZLIB_INCLUDE_DIR=OFF',
+        '-DSDL2_DIR=OFF',
+    ],
+)
+
+ffmpeg = FfmpegProject(
+    'http://ffmpeg.org/releases/ffmpeg-4.3.1.tar.xz',
+    'ad009240d46e307b4e03a213a0f49c11b650e445b1f8be0dda2a9212b34d2ffb',
+    'lib/libavcodec.a',
+    [
+        '--disable-shared', '--enable-static',
+        '--enable-gpl',
+        '--enable-small',
+        '--disable-pthreads',
+        '--disable-programs',
+        '--disable-doc',
+        '--disable-avdevice',
+        '--disable-swresample',
+        '--disable-swscale',
+        '--disable-postproc',
+        '--disable-avfilter',
+        '--disable-lzo',
+        '--disable-faan',
+        '--disable-pixelutils',
+        '--disable-network',
+        '--disable-encoders',
+        '--disable-muxers',
+        '--disable-protocols',
+        '--disable-devices',
+        '--disable-filters',
+        '--disable-v4l2_m2m',
+
+        '--disable-parser=bmp',
+        '--disable-parser=cavsvideo',
+        '--disable-parser=dvbsub',
+        '--disable-parser=dvdsub',
+        '--disable-parser=dvd_nav',
+        '--disable-parser=flac',
+        '--disable-parser=g729',
+        '--disable-parser=gsm',
+        '--disable-parser=h261',
+        '--disable-parser=h263',
+        '--disable-parser=h264',
+        '--disable-parser=hevc',
+        '--disable-parser=mjpeg',
+        '--disable-parser=mlp',
+        '--disable-parser=mpeg4video',
+        '--disable-parser=mpegvideo',
+        '--disable-parser=opus',
+        '--disable-parser=vc1',
+        '--disable-parser=vp3',
+        '--disable-parser=vp8',
+        '--disable-parser=vp9',
+        '--disable-parser=png',
+        '--disable-parser=pnm',
+        '--disable-parser=xma',
+
+        '--disable-demuxer=aqtitle',
+        '--disable-demuxer=ass',
+        '--disable-demuxer=bethsoftvid',
+        '--disable-demuxer=bink',
+        '--disable-demuxer=cavsvideo',
+        '--disable-demuxer=cdxl',
+        '--disable-demuxer=dvbsub',
+        '--disable-demuxer=dvbtxt',
+        '--disable-demuxer=h261',
+        '--disable-demuxer=h263',
+        '--disable-demuxer=h264',
+        '--disable-demuxer=ico',
+        '--disable-demuxer=image2',
+        '--disable-demuxer=jacosub',
+        '--disable-demuxer=lrc',
+        '--disable-demuxer=microdvd',
+        '--disable-demuxer=mjpeg',
+        '--disable-demuxer=mjpeg_2000',
+        '--disable-demuxer=mpegps',
+        '--disable-demuxer=mpegvideo',
+        '--disable-demuxer=mpl2',
+        '--disable-demuxer=mpsub',
+        '--disable-demuxer=pjs',
+        '--disable-demuxer=rawvideo',
+        '--disable-demuxer=realtext',
+        '--disable-demuxer=sami',
+        '--disable-demuxer=scc',
+        '--disable-demuxer=srt',
+        '--disable-demuxer=stl',
+        '--disable-demuxer=subviewer',
+        '--disable-demuxer=subviewer1',
+        '--disable-demuxer=swf',
+        '--disable-demuxer=tedcaptions',
+        '--disable-demuxer=vobsub',
+        '--disable-demuxer=vplayer',
+        '--disable-demuxer=webvtt',
+        '--disable-demuxer=yuv4mpegpipe',
+
+        # we don't need these decoders, because we have the dedicated
+        # libraries
+        '--disable-decoder=flac',
+        '--disable-decoder=opus',
+        '--disable-decoder=vorbis',
+
+        # audio codecs nobody uses
+        '--disable-decoder=atrac1',
+        '--disable-decoder=atrac3',
+        '--disable-decoder=atrac3al',
+        '--disable-decoder=atrac3p',
+        '--disable-decoder=atrac3pal',
+        '--disable-decoder=binkaudio_dct',
+        '--disable-decoder=binkaudio_rdft',
+        '--disable-decoder=bmv_audio',
+        '--disable-decoder=dsicinaudio',
+        '--disable-decoder=dvaudio',
+        '--disable-decoder=metasound',
+        '--disable-decoder=paf_audio',
+        '--disable-decoder=ra_144',
+        '--disable-decoder=ra_288',
+        '--disable-decoder=ralf',
+        '--disable-decoder=qdm2',
+        '--disable-decoder=qdmc',
+
+        # disable lots of image and video codecs
+        '--disable-decoder=ass',
+        '--disable-decoder=asv1',
+        '--disable-decoder=asv2',
+        '--disable-decoder=apng',
+        '--disable-decoder=avrn',
+        '--disable-decoder=avrp',
+        '--disable-decoder=bethsoftvid',
+        '--disable-decoder=bink',
+        '--disable-decoder=bmp',
+        '--disable-decoder=bmv_video',
+        '--disable-decoder=cavs',
+        '--disable-decoder=ccaption',
+        '--disable-decoder=cdgraphics',
+        '--disable-decoder=clearvideo',
+        '--disable-decoder=dirac',
+        '--disable-decoder=dsicinvideo',
+        '--disable-decoder=dvbsub',
+        '--disable-decoder=dvdsub',
+        '--disable-decoder=dvvideo',
+        '--disable-decoder=exr',
+        '--disable-decoder=ffv1',
+        '--disable-decoder=ffvhuff',
+        '--disable-decoder=ffwavesynth',
+        '--disable-decoder=flic',
+        '--disable-decoder=flv',
+        '--disable-decoder=fraps',
+        '--disable-decoder=gif',
+        '--disable-decoder=h261',
+        '--disable-decoder=h263',
+        '--disable-decoder=h263i',
+        '--disable-decoder=h263p',
+        '--disable-decoder=h264',
+        '--disable-decoder=hevc',
+        '--disable-decoder=hnm4_video',
+        '--disable-decoder=hq_hqa',
+        '--disable-decoder=hqx',
+        '--disable-decoder=idcin',
+        '--disable-decoder=iff_ilbm',
+        '--disable-decoder=indeo2',
+        '--disable-decoder=indeo3',
+        '--disable-decoder=indeo4',
+        '--disable-decoder=indeo5',
+        '--disable-decoder=interplay_video',
+        '--disable-decoder=jacosub',
+        '--disable-decoder=jpeg2000',
+        '--disable-decoder=jpegls',
+        '--disable-decoder=microdvd',
+        '--disable-decoder=mimic',
+        '--disable-decoder=mjpeg',
+        '--disable-decoder=mmvideo',
+        '--disable-decoder=mpl2',
+        '--disable-decoder=motionpixels',
+        '--disable-decoder=mpeg1video',
+        '--disable-decoder=mpeg2video',
+        '--disable-decoder=mpeg4',
+        '--disable-decoder=mpegvideo',
+        '--disable-decoder=mscc',
+        '--disable-decoder=msmpeg4_crystalhd',
+        '--disable-decoder=msmpeg4v1',
+        '--disable-decoder=msmpeg4v2',
+        '--disable-decoder=msmpeg4v3',
+        '--disable-decoder=msvideo1',
+        '--disable-decoder=mszh',
+        '--disable-decoder=mvc1',
+        '--disable-decoder=mvc2',
+        '--disable-decoder=on2avc',
+        '--disable-decoder=paf_video',
+        '--disable-decoder=png',
+        '--disable-decoder=qdraw',
+        '--disable-decoder=qpeg',
+        '--disable-decoder=rawvideo',
+        '--disable-decoder=realtext',
+        '--disable-decoder=roq',
+        '--disable-decoder=roq_dpcm',
+        '--disable-decoder=rscc',
+        '--disable-decoder=rv10',
+        '--disable-decoder=rv20',
+        '--disable-decoder=rv30',
+        '--disable-decoder=rv40',
+        '--disable-decoder=sami',
+        '--disable-decoder=sheervideo',
+        '--disable-decoder=snow',
+        '--disable-decoder=srt',
+        '--disable-decoder=stl',
+        '--disable-decoder=subrip',
+        '--disable-decoder=subviewer',
+        '--disable-decoder=subviewer1',
+        '--disable-decoder=svq1',
+        '--disable-decoder=svq3',
+        '--disable-decoder=tiff',
+        '--disable-decoder=tiertexseqvideo',
+        '--disable-decoder=truemotion1',
+        '--disable-decoder=truemotion2',
+        '--disable-decoder=truemotion2rt',
+        '--disable-decoder=twinvq',
+        '--disable-decoder=utvideo',
+        '--disable-decoder=vc1',
+        '--disable-decoder=vmdvideo',
+        '--disable-decoder=vp3',
+        '--disable-decoder=vp5',
+        '--disable-decoder=vp6',
+        '--disable-decoder=vp7',
+        '--disable-decoder=vp8',
+        '--disable-decoder=vp9',
+        '--disable-decoder=vqa',
+        '--disable-decoder=webvtt',
+        '--disable-decoder=wmv1',
+        '--disable-decoder=wmv2',
+        '--disable-decoder=wmv3',
+        '--disable-decoder=yuv4',
+    ],
+)
+
+curl = AutotoolsProject(
+    'http://curl.haxx.se/download/curl-7.72.0.tar.xz',
+    '0ded0808c4d85f2ee0db86980ae610cc9d165e9ca9da466196cc73c346513713',
+    '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-smb',
+        '--disable-gopher',
+        '--disable-manual',
+        '--disable-threaded-resolver', '--disable-verbose', '--disable-sspi',
+        '--disable-crypto-auth', '--disable-ntlm-wb', '--disable-tls-srp', '--disable-cookies',
+        '--disable-doh',
+        '--disable-mime',
+        '--disable-netrc',
+        '--disable-progress-meter',
+        '--disable-alt-svc',
+        '--without-ssl', '--without-gnutls', '--without-nss', '--without-libssh2',
+    ],
+
+    patches='src/lib/curl/patches',
+)
+
+libexpat = AutotoolsProject(
+    'https://github.com/libexpat/libexpat/releases/download/R_2_2_9/expat-2.2.9.tar.bz2',
+    'f1063084dc4302a427dabcca499c8312b3a32a29b7d2506653ecc8f950a9a237',
+    'lib/libexpat.a',
+    [
+        '--disable-shared', '--enable-static',
+        '--without-docbook',
+    ],
+)
+
+libnfs = AutotoolsProject(
+    'https://github.com/sahlberg/libnfs/archive/libnfs-4.0.0.tar.gz',
+    '6ee77e9fe220e2d3e3b1f53cfea04fb319828cc7dbb97dd9df09e46e901d797d',
+    'lib/libnfs.a',
+    [
+        '--disable-shared', '--enable-static',
+        '--disable-debug',
+
+        # work around -Wtautological-compare
+        '--disable-werror',
+
+        '--disable-utils', '--disable-examples',
+    ],
+    base='libnfs-libnfs-4.0.0',
+    autoreconf=True,
+)
+
+boost = BoostProject(
+    'https://dl.bintray.com/boostorg/release/1.74.0/source/boost_1_74_0.tar.bz2',
+    '83bfc1507731a0906e387fc28b7ef5417d591429e51e788417fe9ff025e116b1',
+    'include/boost/version.hpp',
+)
--- a/python/build/makeproject.py
+++ b/python/build/makeproject.py
@@ -0,0 +1,28 @@
+import subprocess
+
+from build.project import Project
+
+class MakeProject(Project):
+    def __init__(self, url, md5, installed,
+                 install_target='install',
+                 **kwargs):
+        Project.__init__(self, url, md5, installed, **kwargs)
+        self.install_target = install_target
+
+    def get_simultaneous_jobs(self):
+        return 12
+
+    def get_make_args(self, toolchain):
+        return ['--quiet', '-j' + str(self.get_simultaneous_jobs())]
+
+    def get_make_install_args(self, toolchain):
+        return ['--quiet', self.install_target]
+
+    def make(self, toolchain, wd, args):
+        subprocess.check_call(['/usr/bin/make'] + args,
+                              cwd=wd, env=toolchain.env)
+
+    def build(self, toolchain, wd, install=True):
+        self.make(toolchain, wd, self.get_make_args(toolchain))
+        if install:
+            self.make(toolchain, wd, self.get_make_install_args(toolchain))
--- a/python/build/meson.py
+++ b/python/build/meson.py
@@ -0,0 +1,116 @@
+import os.path, subprocess, sys
+
+from build.project import Project
+
+def make_cross_file(toolchain):
+    if toolchain.is_windows:
+        system = 'windows'
+        windres = "windres = '%s'" % toolchain.windres
+    else:
+        system = 'linux'
+        windres = ''
+
+    if toolchain.is_arm:
+        cpu_family = 'arm'
+        if toolchain.is_armv7:
+            cpu = 'armv7'
+        else:
+            cpu = 'armv6'
+    elif toolchain.is_aarch64:
+        cpu_family = 'aarch64'
+        cpu = 'arm64-v8a'
+    else:
+        cpu_family = 'x86'
+        if 'x86_64' in toolchain.arch:
+            cpu = 'x86_64'
+        else:
+            cpu = 'i686'
+
+    # TODO: support more CPUs
+    endian = 'little'
+
+    # TODO: write pkg-config wrapper
+
+    path = os.path.join(toolchain.build_path, 'meson.cross')
+    os.makedirs(toolchain.build_path, exist_ok=True)
+    with open(path, 'w') as f:
+        f.write("""
+[binaries]
+c = '%s'
+cpp = '%s'
+ar = '%s'
+strip = '%s'
+pkgconfig = '%s'
+%s
+
+[properties]
+root = '%s'
+
+c_args = %s
+c_link_args = %s
+
+cpp_args = %s
+cpp_link_args = %s
+
+# Keep Meson from executing Android-x86 test binariees
+needs_exe_wrapper = true
+
+[host_machine]
+system = '%s'
+cpu_family = '%s'
+cpu = '%s'
+endian = '%s'
+            """ % (toolchain.cc, toolchain.cxx, toolchain.ar, toolchain.strip,
+                   toolchain.pkg_config,
+                   windres,
+                   toolchain.install_prefix,
+                   repr((toolchain.cppflags + ' ' + toolchain.cflags).split()),
+                   repr(toolchain.ldflags.split() + toolchain.libs.split()),
+                   repr((toolchain.cppflags + ' ' + toolchain.cxxflags).split()),
+                   repr(toolchain.ldflags.split() + toolchain.libs.split()),
+                   system, cpu_family, cpu, endian))
+    return path
+
+def configure(toolchain, src, build, args=()):
+    cross_file = make_cross_file(toolchain)
+    configure = [
+        'meson',
+        src, build,
+
+        '--prefix', toolchain.install_prefix,
+
+        # this is necessary because Meson uses Debian's build machine
+        # MultiArch path (e.g. "lib/x86_64-linux-gnu") for cross
+        # builds, which is obviously wrong
+        '--libdir', 'lib',
+
+        '--buildtype', 'plain',
+
+        '--default-library=static',
+
+        '--cross-file', cross_file,
+    ] + args
+
+    env = toolchain.env.copy()
+
+    # Meson 0.54 requires the BOOST_ROOT environment variable
+    env['BOOST_ROOT'] = toolchain.install_prefix
+
+    subprocess.check_call(configure, env=env)
+
+class MesonProject(Project):
+    def __init__(self, url, md5, installed, configure_args=[],
+                 **kwargs):
+        Project.__init__(self, url, md5, installed, **kwargs)
+        self.configure_args = configure_args
+
+    def configure(self, toolchain):
+        src = self.unpack(toolchain)
+        build = self.make_build_path(toolchain)
+        configure(toolchain, src, build, self.configure_args)
+        return build
+
+    def build(self, toolchain):
+        build = self.configure(toolchain)
+        subprocess.check_call(['ninja', 'install'],
+                              cwd=build, env=toolchain.env)
--- a/python/build/project.py
+++ b/python/build/project.py
@@ -0,0 +1,81 @@
+import os, shutil
+import re
+
+from build.download import download_and_verify
+from build.tar import untar
+from build.quilt import push_all
+
+class Project:
+    def __init__(self, url, md5, installed, name=None, version=None,
+                 base=None,
+                 patches=None,
+                 edits=None,
+                 use_cxx=False):
+        if base is None:
+            basename = os.path.basename(url)
+            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]?[\d.]*)$', 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
+
+        if patches is not None:
+            srcdir = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
+            patches = os.path.join(srcdir, patches)
+        self.patches = patches
+        self.edits = edits
+        self.use_cxx = use_cxx
+
+    def download(self, toolchain):
+        return download_and_verify(self.url, self.md5, toolchain.tarball_path)
+
+    def is_installed(self, toolchain):
+        tarball = self.download(toolchain)
+        installed = os.path.join(toolchain.install_prefix, self.installed)
+        tarball_mtime = os.path.getmtime(tarball)
+        try:
+            return os.path.getmtime(installed) >= tarball_mtime
+        except FileNotFoundError:
+            return False
+
+    def unpack(self, toolchain, out_of_tree=True):
+        if out_of_tree:
+            parent_path = toolchain.src_path
+        else:
+            parent_path = toolchain.build_path
+        path = untar(self.download(toolchain), parent_path, self.base)
+
+        if self.patches is not None:
+            push_all(toolchain, path, self.patches)
+
+        if self.edits is not None:
+            for filename, function in self.edits.items():
+                with open(os.path.join(path, filename), 'r+t') as f:
+                    old_data = f.read()
+                    new_data = function(old_data)
+                    f.seek(0)
+                    f.truncate(0)
+                    f.write(new_data)
+
+        return path
+
+    def make_build_path(self, toolchain):
+        path = os.path.join(toolchain.build_path, self.base)
+        try:
+            shutil.rmtree(path)
+        except FileNotFoundError:
+            pass
+        os.makedirs(path, exist_ok=True)
+        return path
--- a/python/build/quilt.py
+++ b/python/build/quilt.py
@@ -0,0 +1,9 @@
+import subprocess
+
+def run_quilt(toolchain, cwd, patches_path, *args):
+    env = dict(toolchain.env)
+    env['QUILT_PATCHES'] = patches_path
+    subprocess.check_call(['quilt'] + list(args), cwd=cwd, env=env)
+
+def push_all(toolchain, src_path, patches_path):
+    run_quilt(toolchain, src_path, patches_path, 'push', '-a')
--- a/python/build/tar.py
+++ b/python/build/tar.py
@@ -0,0 +1,11 @@
+import os, shutil, subprocess
+
+def untar(tarball_path, parent_path, base):
+    path = os.path.join(parent_path, base)
+    try:
+        shutil.rmtree(path)
+    except FileNotFoundError:
+        pass
+    os.makedirs(parent_path, exist_ok=True)
+    subprocess.check_call(['/bin/tar', 'xfC', tarball_path, parent_path])
+    return path
--- a/python/build/verify.py
+++ b/python/build/verify.py
@@ -0,0 +1,42 @@
+import hashlib
+
+def feed_file(h, f):
+    """Feed data read from an open file into the hashlib instance."""
+
+    while True:
+        data = f.read(65536)
+        if len(data) == 0:
+            # end of file
+            break
+        h.update(data)
+
+def feed_file_path(h, path):
+    """Feed data read from a file (to be opened by this function) into the hashlib instance."""
+
+    with open(path, 'rb') as f:
+        feed_file(h, f)
+
+def file_digest(algorithm, path):
+    """Calculate the digest of a file and return it in hexadecimal notation."""
+
+    h = algorithm()
+    feed_file_path(h, path)
+    return h.hexdigest()
+
+def guess_digest_algorithm(digest):
+    l = len(digest)
+    if l == 32:
+        return hashlib.md5
+    elif l == 40:
+        return hashlib.sha1
+    elif l == 64:
+        return hashlib.sha256
+    else:
+        return None
+
+def verify_file_digest(path, expected_digest):
+    """Verify the digest of a file, and return True if the digest matches with the given expected digest."""
+
+    algorithm = guess_digest_algorithm(expected_digest)
+    assert(algorithm is not None)
+    return file_digest(algorithm, path) == expected_digest
--- a/python/build/zlib.py
+++ b/python/build/zlib.py
@@ -0,0 +1,22 @@
+import os.path, subprocess
+
+from build.project import Project
+
+class ZlibProject(Project):
+    def __init__(self, url, md5, installed,
+                 **kwargs):
+        Project.__init__(self, url, md5, installed, **kwargs)
+
+    def build(self, toolchain):
+        src = self.unpack(toolchain, out_of_tree=False)
+
+        subprocess.check_call(['/usr/bin/make', '--quiet',
+            '-f', 'win32/Makefile.gcc',
+            'PREFIX=' + toolchain.arch + '-',
+            '-j12',
+            'install',
+            'INCLUDE_PATH='+ os.path.join(toolchain.install_prefix, 'include'),
+            'LIBRARY_PATH=' + os.path.join(toolchain.install_prefix, 'lib'),
+            'BINARY_PATH=' + os.path.join(toolchain.install_prefix, 'bin'),
+            ],
+            cwd=src, env=toolchain.env)
--- a/scripts/check_config_h.rb
+++ b/scripts/check_config_h.rb
@@ -1,47 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This script verifies that every source includes config.h first.
-# This is very important for consistent Large File Support.
-#
-
-def check_file(file)
-    first = true
-    file.each_line do |line|
-        if line =~ /^\#include\s+(\S+)/ then
-            if $1 == '"config.h"'
-                unless first
-                    puts "#{file.path}: config.h included too late"
-                end
-            else
-                if first
-                    puts "#{file.path}: config.h missing"
-                end
-            end
-            first = false
-        end
-    end
-end
-
-def check_path(path)
-    File.open(path) do |file|
-        check_file(file)
-    end
-end
-
-if ARGV.empty?
-    Dir["src/*.c"].each do |path|
-        check_path(path)
-    end
-
-    Dir["src/*/*.c"].each do |path|
-        check_path(path)
-    end
-
-    Dir["test/*.c"].each do |path|
-        check_path(path)
-    end
-else
-    ARGV.each do |path|
-        check_path(path)
-    end
-end
--- 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/AudioFormat.cxx
+++ b/src/AudioFormat.cxx
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2003-2018 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 "AudioFormat.hxx"
+#include "util/StringBuffer.hxx"
+#include "util/StringFormat.hxx"
+
+#include <assert.h>
+
+void
+AudioFormat::ApplyMask(AudioFormat mask) noexcept
+{
+	assert(IsValid());
+	assert(mask.IsMaskValid());
+
+	if (mask.sample_rate != 0)
+		sample_rate = mask.sample_rate;
+
+	if (mask.format != SampleFormat::UNDEFINED)
+		format = mask.format;
+
+	if (mask.channels != 0)
+		channels = mask.channels;
+
+	assert(IsValid());
+}
+
+StringBuffer<24>
+ToString(const AudioFormat af) noexcept
+{
+	StringBuffer<24> buffer;
+	char *p = buffer.data();
+
+	if (af.format == SampleFormat::DSD && af.sample_rate > 0 &&
+	    af.sample_rate % 44100 == 0) {
+		/* use shortcuts such as "dsd64" which implies the
+		   sample rate */
+		p += sprintf(p, "dsd%u:", af.sample_rate * 8 / 44100);
+	} else {
+		const char *sample_format = af.format != SampleFormat::UNDEFINED
+			? sample_format_to_string(af.format)
+			: "*";
+
+		if (af.sample_rate > 0)
+			p += sprintf(p, "%u:%s:", af.sample_rate,
+				     sample_format);
+		else
+			p += sprintf(p, "*:%s:", sample_format);
+	}
+
+	if (af.channels > 0)
+		p += sprintf(p, "%u", af.channels);
+	else {
+		*p++ = '*';
+		*p = 0;
+	}
+
+	return buffer;
+}
--- a/src/AudioFormat.hxx
+++ b/src/AudioFormat.hxx
@@ -0,0 +1,245 @@
+/*
+ * Copyright 2003-2018 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 "pcm/SampleFormat.hxx" // IWYU pragma: export
+#include "util/Compiler.h"
+
+#include <chrono>
+
+#include <stdint.h>
+#include <stddef.h>
+
+template<size_t CAPACITY> class StringBuffer;
+
+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.
+	 *
+	 * Channel order follows the FLAC convention
+	 * (https://xiph.org/flac/format.html):
+	 *
+	 * - 1 channel: mono
+	 * - 2 channels: left, right
+	 * - 3 channels: left, right, center
+	 * - 4 channels: front left, front right, back left, back right
+	 * - 5 channels: front left, front right, front center, back/surround left, back/surround right
+	 * - 6 channels: front left, front right, front center, LFE, back/surround left, back/surround right
+	 * - 7 channels: front left, front right, front center, LFE, back center, side left, side right
+	 * - 8 channels: front left, front right, front center, LFE, back left, back right, side left, side right
+	 */
+	uint8_t channels;
+
+	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 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) noexcept;
+
+	gcc_pure
+	AudioFormat WithMask(AudioFormat mask) const noexcept {
+		AudioFormat result = *this;
+		result.ApplyMask(mask);
+		return result;
+	}
+
+	gcc_pure
+	bool MatchMask(AudioFormat mask) const noexcept {
+		return WithMask(mask) == *this;
+	}
+
+	/**
+	 * Returns the size of each (mono) sample in bytes.
+	 */
+	unsigned GetSampleSize() const;
+
+	/**
+	 * Returns the size of each full frame in bytes.
+	 */
+	unsigned GetFrameSize() const;
+
+	template<typename D>
+	constexpr auto TimeToFrames(D t) const noexcept {
+		using Period = typename D::period;
+		return ((t.count() * sample_rate) / Period::den) * Period::num;
+	}
+
+	template<typename D>
+	constexpr size_t TimeToSize(D t) const noexcept {
+		return size_t(size_t(TimeToFrames(t)) * GetFrameSize());
+	}
+
+	template<typename D>
+	constexpr D FramesToTime(std::uintmax_t size) const noexcept {
+		using Rep = typename D::rep;
+		using Period = typename D::period;
+		return D(((Rep(1) * size / Period::num) * Period::den) / sample_rate);
+	}
+
+	template<typename D>
+	constexpr D SizeToTime(std::uintmax_t size) const noexcept {
+		return FramesToTime<D>(size / GetFrameSize());
+	}
+};
+
+/**
+ * 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 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));
+}
+
+inline unsigned
+AudioFormat::GetSampleSize() const
+{
+	return sample_format_size(format);
+}
+
+inline unsigned
+AudioFormat::GetFrameSize() const
+{
+	return GetSampleSize() * channels;
+}
+
+/**
+ * Renders the #AudioFormat object into a string, e.g. for printing
+ * it in a log file.
+ *
+ * @param af the #AudioFormat object
+ * @return the string buffer
+ */
+gcc_const
+StringBuffer<24>
+ToString(AudioFormat af) noexcept;
+
+#endif
--- a/src/AudioParser.cxx
+++ b/src/AudioParser.cxx
@@ -0,0 +1,187 @@
+/*
+ * Copyright 2003-2018 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.
+ */
+
+/*
+ * Parser functions for audio related objects.
+ *
+ */
+
+#include "AudioParser.hxx"
+#include "AudioFormat.hxx"
+#include "util/RuntimeError.hxx"
+
+#include <assert.h>
+#include <string.h>
+#include <stdlib.h>
+
+static uint32_t
+ParseSampleRate(const char *src, bool mask, const char **endptr_r)
+{
+	unsigned long value;
+	char *endptr;
+
+	if (mask && *src == '*') {
+		*endptr_r = src + 1;
+		return 0;
+	}
+
+	value = strtoul(src, &endptr, 10);
+	if (endptr == src) {
+		throw std::invalid_argument("Failed to parse the sample rate");
+	} else if (!audio_valid_sample_rate(value))
+		throw FormatInvalidArgument("Invalid sample rate: %lu", value);
+
+	*endptr_r = endptr;
+	return value;
+}
+
+static SampleFormat
+ParseSampleFormat(const char *src, bool mask, const char **endptr_r)
+{
+	unsigned long value;
+	char *endptr;
+	SampleFormat sample_format;
+
+	if (mask && *src == '*') {
+		*endptr_r = src + 1;
+		return SampleFormat::UNDEFINED;
+	}
+
+	if (*src == 'f') {
+		*endptr_r = src + 1;
+		return SampleFormat::FLOAT;
+	}
+
+	if (memcmp(src, "dsd", 3) == 0) {
+		*endptr_r = src + 3;
+		return SampleFormat::DSD;
+	}
+
+	value = strtoul(src, &endptr, 10);
+	if (endptr == src)
+		throw std::invalid_argument("Failed to parse the sample format");
+
+	switch (value) {
+	case 8:
+		sample_format = SampleFormat::S8;
+		break;
+
+	case 16:
+		sample_format = SampleFormat::S16;
+		break;
+
+	case 24:
+		if (memcmp(endptr, "_3", 2) == 0)
+			/* for backwards compatibility */
+			endptr += 2;
+
+		sample_format = SampleFormat::S24_P32;
+		break;
+
+	case 32:
+		sample_format = SampleFormat::S32;
+		break;
+
+	default:
+		throw FormatInvalidArgument("Invalid sample format: %lu",
+					    value);
+	}
+
+	assert(audio_valid_sample_format(sample_format));
+
+	*endptr_r = endptr;
+	return sample_format;
+}
+
+static uint8_t
+ParseChannelCount(const char *src, bool mask, const char **endptr_r)
+{
+	unsigned long value;
+	char *endptr;
+
+	if (mask && *src == '*') {
+		*endptr_r = src + 1;
+		return 0;
+	}
+
+	value = strtoul(src, &endptr, 10);
+	if (endptr == src)
+		throw std::invalid_argument("Failed to parse the channel count");
+	else if (!audio_valid_channel_count(value))
+		throw FormatInvalidArgument("Invalid channel count: %u",
+					    value);
+
+	*endptr_r = endptr;
+	return value;
+}
+
+AudioFormat
+ParseAudioFormat(const char *src, bool mask)
+{
+	AudioFormat dest;
+	dest.Clear();
+
+	if (strncmp(src, "dsd", 3) == 0) {
+		/* allow format specifications such as "dsd64" which
+		   implies the sample rate */
+
+		char *endptr;
+		auto dsd = strtoul(src + 3, &endptr, 10);
+		if (endptr > src + 3 && *endptr == ':' &&
+		    dsd >= 32 && dsd <= 4096 && dsd % 2 == 0) {
+			dest.sample_rate = dsd * 44100 / 8;
+			dest.format = SampleFormat::DSD;
+
+			src = endptr + 1;
+			dest.channels = ParseChannelCount(src, mask, &src);
+			if (*src != 0)
+				throw FormatInvalidArgument("Extra data after channel count: %s",
+							    src);
+
+			return dest;
+		}
+	}
+
+	/* parse sample rate */
+
+	dest.sample_rate = ParseSampleRate(src, mask, &src);
+
+	if (*src++ != ':')
+		throw std::invalid_argument("Sample format missing");
+
+	/* parse sample format */
+
+	dest.format = ParseSampleFormat(src, mask, &src);
+
+	if (*src++ != ':')
+		throw std::invalid_argument("Channel count missing");
+
+	/* parse channel count */
+
+	dest.channels = ParseChannelCount(src, mask, &src);
+
+	if (*src != 0)
+		throw FormatInvalidArgument("Extra data after channel count: %s",
+					    src);
+
+	assert(mask
+	       ? dest.IsMaskValid()
+	       : dest.IsValid());
+	return dest;
+}
--- a/src/AudioParser.hxx
+++ b/src/AudioParser.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2010 The Music Player Daemon Project
+ * Copyright 2003-2018 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -22,28 +22,21 @@
 * 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;

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

 #endif
--- a/src/BulkEdit.hxx
+++ b/src/BulkEdit.hxx
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2003-2018 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
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2003-2018 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 "CheckAudioFormat.hxx"
+#include "AudioFormat.hxx"
+#include "util/RuntimeError.hxx"
+
+#include <stdexcept>
+
+#include <assert.h>
+
+void
+CheckSampleRate(unsigned long sample_rate)
+{
+	if (!audio_valid_sample_rate(sample_rate))
+		throw FormatRuntimeError("Invalid sample rate: %lu",
+					 sample_rate);
+}
+
+void
+CheckSampleFormat(SampleFormat sample_format)
+{
+	if (!audio_valid_sample_format(sample_format))
+		throw FormatRuntimeError("Invalid sample format: %u",
+					 unsigned(sample_format));
+}
+
+void
+CheckChannelCount(unsigned channels)
+{
+	if (!audio_valid_channel_count(channels))
+		throw FormatRuntimeError("Invalid channel count: %u",
+					 channels);
+}
+
+AudioFormat
+CheckAudioFormat(unsigned long sample_rate,
+		 SampleFormat sample_format, unsigned channels)
+{
+	CheckSampleRate(sample_rate);
+	CheckSampleFormat(sample_format);
+	CheckChannelCount(channels);
+
+	return AudioFormat(sample_rate, sample_format, channels);
+}
--- a/src/CheckAudioFormat.hxx
+++ b/src/CheckAudioFormat.hxx
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2003-2018 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"
+
+void
+CheckSampleRate(unsigned long sample_rate);
+
+void
+CheckSampleFormat(SampleFormat sample_format);
+
+void
+CheckChannelCount(unsigned sample_format);
+
+/**
+ * Check #AudioFormat attributes and construct an #AudioFormat
+ * instance.
+ *
+ * Throws #std::runtime_error on error.
+ */
+AudioFormat
+CheckAudioFormat(unsigned long sample_rate,
+		 SampleFormat sample_format, unsigned channels);
+
+#endif
--- a/src/Chrono.hxx
+++ b/src/Chrono.hxx
@@ -0,0 +1,225 @@
+/*
+ * Copyright 2003-2018 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef MPD_CHRONO_HXX
+#define MPD_CHRONO_HXX
+
+#include <chrono>
+#include <utility>
+#include <cstdint>
+
+using FloatDuration = std::chrono::duration<double>;
+
+/**
+ * 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;
+
+public:
+	SongTime() = default;
+
+	template<typename T>
+	explicit constexpr SongTime(T t):Base(t) {}
+
+	static constexpr SongTime zero() {
+		return SongTime(Base::zero());
+	}
+
+	template<typename D>
+	static constexpr SongTime Cast(D src) {
+		return SongTime(std::chrono::duration_cast<Base>(src));
+	}
+
+	static constexpr SongTime FromS(unsigned s) {
+		return SongTime(rep(s) * 1000);
+	}
+
+	static constexpr SongTime FromS(float s) {
+		return SongTime(rep(s * 1000));
+	}
+
+	static constexpr SongTime FromS(double s) {
+		return SongTime(rep(s * 1000));
+	}
+
+	static constexpr SongTime FromMS(rep ms) {
+		return SongTime(ms);
+	}
+
+	constexpr rep ToS() const {
+		return count() / rep(1000);
+	}
+
+	constexpr rep RoundS() const {
+		return (count() + 500) / rep(1000);
+	}
+
+	constexpr rep ToMS() const {
+		return count();
+	}
+
+	template<typename T=rep>
+	constexpr T ToScale(unsigned scale) const {
+		return count() * T(scale) / 1000;
+	}
+
+	/**
+	 * Convert a scalar value with the given scale to a #SongTime
+	 * instance.
+	 *
+	 * @param value the input value
+	 * @param scale the value's scale in Hz
+	 */
+	template<typename T=rep>
+	static constexpr SongTime FromScale(T value, unsigned scale) {
+		return SongTime(value * T(1000) / T(scale));
+	}
+
+	constexpr double ToDoubleS() const {
+		return double(count()) / 1000.;
+	};
+
+	constexpr bool IsZero() const {
+		return count() == 0;
+	}
+
+	constexpr bool IsPositive() const {
+		return count() > 0;
+	}
+
+	constexpr SongTime operator+(const SongTime &other) const {
+		return SongTime(*(const Base *)this + (const Base &)other);
+	}
+
+	constexpr SongTime operator-(const SongTime &other) const {
+		return SongTime(*(const Base *)this - (const Base &)other);
+	}
+};
+
+/**
+ * A variant of #SongTime that is based on a signed integer.  It can
+ * be used for relative values.
+ */
+class SignedSongTime : public std::chrono::duration<std::int32_t, std::milli> {
+	typedef std::chrono::duration<std::int32_t, std::milli> Base;
+
+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);
+	}
+
+	template<typename D>
+	static constexpr SongTime Cast(D src) {
+		return SongTime(std::chrono::duration_cast<Base>(src));
+	}
+
+	static constexpr SignedSongTime FromS(int s) {
+		return SignedSongTime(rep(s) * 1000);
+	}
+
+	static constexpr SignedSongTime FromS(unsigned s) {
+		return SignedSongTime(rep(s) * 1000);
+	}
+
+	static constexpr SignedSongTime FromS(float s) {
+		return SignedSongTime(rep(s * 1000));
+	}
+
+	static constexpr SignedSongTime FromS(double s) {
+		return SignedSongTime(rep(s * 1000));
+	}
+
+	static constexpr SignedSongTime FromMS(rep ms) {
+		return SignedSongTime(ms);
+	}
+
+	constexpr rep ToS() const {
+		return count() / rep(1000);
+	}
+
+	constexpr rep RoundS() const {
+		return (count() + 500) / rep(1000);
+	}
+
+	constexpr rep ToMS() const {
+		return count();
+	}
+
+	template<typename T=rep>
+	constexpr T ToScale(unsigned scale) const {
+		return count() * T(scale) / 1000;
+	}
+
+	/**
+	 * Convert a scalar value with the given scale to a
+	 * #SignedSongTime instance.
+	 *
+	 * @param value the input value
+	 * @param scale the value's scale in Hz
+	 */
+	template<typename T=rep>
+	static constexpr SignedSongTime FromScale(T value, unsigned scale) {
+		return SignedSongTime(value * T(1000) / T(scale));
+	}
+
+	constexpr double ToDoubleS() const {
+		return double(count()) / 1000.;
+	};
+
+	constexpr bool IsZero() const {
+		return count() == 0;
+	}
+
+	constexpr bool IsPositive() const {
+		return count() > 0;
+	}
+
+	constexpr bool IsNegative() const {
+		return count() < 0;
+	}
+
+	constexpr SignedSongTime operator+(const SignedSongTime &other) const {
+		return SignedSongTime(*(const Base *)this + (const Base &)other);
+	}
+
+	constexpr SignedSongTime operator-(const SignedSongTime &other) const {
+		return SignedSongTime(*(const Base *)this - (const Base &)other);
+	}
+};
+
+#endif
--- a/src/CommandLine.cxx
+++ b/src/CommandLine.cxx
@@ -0,0 +1,405 @@
+/*
+ * Copyright 2003-2018 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 "GitVersion.hxx"
+#include "ls.hxx"
+#include "LogInit.hxx"
+#include "Log.hxx"
+#include "config/File.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/NarrowPath.hxx"
+#include "fs/Traits.hxx"
+#include "fs/FileSystem.hxx"
+#include "fs/StandardDirectory.hxx"
+#include "system/Error.hxx"
+#include "util/RuntimeError.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>
+
+namespace {
+#ifdef _WIN32
+constexpr auto CONFIG_FILE_LOCATION = Path::FromFS(PATH_LITERAL("mpd\\mpd.conf"));
+constexpr auto APP_CONFIG_FILE_LOCATION = Path::FromFS(PATH_LITERAL("conf\\mpd.conf"));
+#else
+constexpr auto USER_CONFIG_FILE_LOCATION1 = Path::FromFS(PATH_LITERAL(".mpdconf"));
+constexpr auto USER_CONFIG_FILE_LOCATION2 = Path::FromFS(PATH_LITERAL(".mpd/mpd.conf"));
+constexpr auto USER_CONFIG_FILE_LOCATION_XDG = Path::FromFS(PATH_LITERAL("mpd/mpd.conf"));
+#endif
+}
+
+enum Option {
+	OPTION_KILL,
+	OPTION_NO_CONFIG,
+	OPTION_NO_DAEMON,
+	OPTION_STDOUT,
+	OPTION_STDERR,
+	OPTION_VERBOSE,
+	OPTION_VERSION,
+	OPTION_HELP,
+	OPTION_HELP2,
+};
+
+static constexpr OptionDef option_defs[] = {
+	{"kill", "kill the currently running mpd session"},
+	{"no-config", "don't read from config"},
+	{"no-daemon", "don't detach from console"},
+	{"stdout", nullptr}, // hidden, compatibility with old versions
+	{"stderr", "print messages to stderr"},
+	{"verbose", 'v', "verbose logging"},
+	{"version", 'V', "print version number"},
+	{"help", 'h', "show help options"},
+	{nullptr, '?', nullptr}, // hidden, standard alias for --help
+};
+
+static constexpr Domain cmdline_domain("cmdline");
+
+gcc_noreturn
+static void version(void)
+{
+	printf("Music Player Daemon " VERSION " (%s)"
+	       "\n"
+	       "Copyright 2003-2007 Warren Dukes <warren.dukes@gmail.com>\n"
+	       "Copyright 2008-2018 Max Kellermann <max.kellermann@gmail.com>\n"
+	       "This is free software; see the source for copying conditions.  There is NO\n"
+	       "warranty; not even MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n",
+	       GIT_VERSION);
+
+#ifdef ENABLE_DATABASE
+	printf("\n"
+	       "Database plugins:\n");
+
+	for (auto i = database_plugins; *i != nullptr; ++i)
+		printf(" %s", (*i)->name);
+
+	printf("\n\n"
+	       "Storage plugins:\n");
+
+	for (auto i = storage_plugins; *i != nullptr; ++i)
+		printf(" %s", (*i)->name);
+
+	printf("\n");
+#endif
+
+#ifdef ENABLE_NEIGHBOR_PLUGINS
+	printf("\n"
+	       "Neighbor plugins:\n");
+	for (auto i = neighbor_plugins; *i != nullptr; ++i)
+		printf(" %s", (*i)->name);
+
+#endif
+
+	printf("\n"
+	       "\n"
+	       "Decoders plugins:\n");
+
+	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);
+
+			printf("\n");
+		});
+
+	printf("\n"
+	       "Filters:\n"
+#ifdef ENABLE_LIBSAMPLERATE
+	       " libsamplerate"
+#endif
+#ifdef ENABLE_SOXR
+	       " soxr"
+#endif
+	       "\n\n"
+	       "Tag plugins:\n"
+#ifdef ENABLE_ID3TAG
+	       " id3tag"
+#endif
+	       "\n\n"
+	       "Output plugins:\n");
+	audio_output_plugins_for_each(plugin)
+		printf(" %s", plugin->name);
+	printf("\n"
+
+#ifdef ENABLE_ENCODER
+	       "\n"
+	       "Encoder plugins:\n");
+	encoder_plugins_for_each(plugin)
+		printf(" %s", plugin->name);
+	printf("\n"
+#endif
+
+#ifdef ENABLE_ARCHIVE
+	       "\n"
+	       "Archive plugins:\n");
+	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);
+
+		printf("\n");
+	}
+
+	printf(""
+#endif
+
+	       "\n"
+	       "Input plugins:\n"
+	       " file"
+#ifdef ENABLE_ARCHIVE
+	       " archive"
+#endif
+	       );
+	input_plugins_for_each(plugin)
+		printf(" %s", plugin->name);
+
+	printf("\n\n"
+	       "Playlist plugins:\n");
+	playlist_plugins_for_each(plugin)
+		printf(" %s", plugin->name);
+
+	printf("\n\n"
+	       "Protocols:\n");
+	print_supported_uri_schemes_to_fp(stdout);
+
+	printf("\n"
+	       "Other features:\n"
+#ifdef HAVE_AVAHI
+	       " avahi"
+#endif
+#ifdef ENABLE_DBUS
+	       " dbus"
+#endif
+#ifdef ENABLE_UDISKS
+	       " udisks"
+#endif
+#ifdef USE_EPOLL
+	       " epoll"
+#endif
+#ifdef HAVE_ICONV
+	       " iconv"
+#endif
+#ifdef HAVE_ICU
+	       " icu"
+#endif
+#ifdef ENABLE_INOTIFY
+	       " inotify"
+#endif
+#ifdef HAVE_IPV6
+	       " ipv6"
+#endif
+#ifdef ENABLE_SYSTEMD_DAEMON
+	       " systemd"
+#endif
+#ifdef HAVE_TCP
+	       " tcp"
+#endif
+#ifdef HAVE_UN
+	       " un"
+#endif
+	       "\n");
+
+	exit(EXIT_SUCCESS);
+}
+
+static 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)
+{
+	printf("Usage:\n"
+	       "  mpd [OPTION...] [path/to/mpd.conf]\n"
+	       "\n"
+	       "Music Player Daemon - a daemon for playing music.\n"
+	       "\n"
+	       "Options:\n");
+
+	for (const auto &i : option_defs)
+		if(i.HasDescription() == true) // hide hidden options from help print
+			PrintOption(i);
+
+	exit(EXIT_SUCCESS);
+}
+
+class ConfigLoader
+{
+	ConfigData &config;
+
+public:
+	explicit ConfigLoader(ConfigData &_config) noexcept
+		:config(_config) {}
+
+	bool TryFile(const Path path);
+	bool TryFile(const AllocatedPath &base_path, Path path);
+};
+
+bool ConfigLoader::TryFile(Path path)
+{
+	if (FileExists(path)) {
+		ReadConfigFile(config, path);
+		return true;
+	}
+	return false;
+}
+
+bool ConfigLoader::TryFile(const AllocatedPath &base_path, Path path)
+{
+	if (base_path.IsNull())
+		return false;
+	auto full_path = base_path / path;
+	return TryFile(full_path);
+}
+
+void
+ParseCommandLine(int argc, char **argv, struct options &options,
+		 ConfigData &config)
+{
+	bool use_config_file = true;
+
+	// First pass: handle command line options
+	OptionParser parser(option_defs, argc, argv);
+	while (auto o = parser.Next()) {
+		switch (Option(o.index)) {
+		case OPTION_KILL:
+			options.kill = true;
+			break;
+
+		case OPTION_NO_CONFIG:
+			use_config_file = false;
+			break;
+
+		case OPTION_NO_DAEMON:
+			options.daemon = false;
+			break;
+
+		case OPTION_STDOUT:
+		case OPTION_STDERR:
+			options.log_stderr = true;
+			break;
+
+		case OPTION_VERBOSE:
+			options.verbose = true;
+			break;
+
+		case OPTION_VERSION:
+			version();
+
+		case OPTION_HELP:
+		case OPTION_HELP2:
+			help();
+		}
+	}
+
+	/* 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;
+	}
+
+	// Second pass: find non-option parameters (i.e. config file)
+	const char *config_file = nullptr;
+	for (const char *i : parser.GetRemaining()) {
+		if (config_file == nullptr) {
+			config_file = i;
+			continue;
+		}
+
+		throw std::runtime_error("too many arguments");
+	}
+
+	if (config_file != nullptr) {
+		/* use specified configuration file */
+		ReadConfigFile(config, FromNarrowPath(config_file));
+		return;
+	}
+
+	/* use default configuration file path */
+
+	ConfigLoader loader(config);
+
+	bool found =
+#ifdef _WIN32
+		loader.TryFile(GetUserConfigDir(), CONFIG_FILE_LOCATION) ||
+		loader.TryFile(GetSystemConfigDir(), CONFIG_FILE_LOCATION) ||
+		loader.TryFile(GetAppBaseDir(), APP_CONFIG_FILE_LOCATION);
+#else
+		loader.TryFile(GetUserConfigDir(),
+			       USER_CONFIG_FILE_LOCATION_XDG) ||
+		loader.TryFile(GetHomeDir(), USER_CONFIG_FILE_LOCATION1) ||
+		loader.TryFile(GetHomeDir(), USER_CONFIG_FILE_LOCATION2) ||
+		loader.TryFile(Path::FromFS(SYSTEM_CONFIG_FILE_LOCATION));
+#endif
+	if (!found)
+		throw std::runtime_error("No configuration file found");
+}
--- a/src/CommandLine.hxx
+++ b/src/CommandLine.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2010 The Music Player Daemon Project
+ * Copyright 2003-2018 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>
+struct ConfigData;

 struct options {
-	gboolean kill;
-	gboolean daemon;
-	gboolean log_stderr;
-	gboolean verbose;
+	bool kill = false;
+	bool daemon = true;
+	bool log_stderr = false;
+	bool verbose = false;
 };

-bool
-parse_cmdline(int argc, char **argv, struct options *options,
-	      GError **error_r);
+void
+ParseCommandLine(int argc, char **argv, struct options &options,
+		 ConfigData &config);

 #endif
--- a/src/GitVersion.cxx
+++ b/src/GitVersion.cxx
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2003-2018 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 "GitVersion.hxx"
+
+char GIT_VERSION[] = "@VCS_TAG@";
--- a/src/GitVersion.hxx
+++ b/src/GitVersion.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2010 The Music Player Daemon Project
+ * Copyright 2003-2018 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -17,9 +17,9 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#ifndef MPD_SIG_HANDLERS_H
-#define MPD_SIG_HANDLERS_H
+#ifndef MPD_GIT_VERSION_HXX
+#define MPD_GIT_VERSION_HXX

-void initSigHandlers(void);
+extern char GIT_VERSION[];

 #endif
--- a/src/IcyMetaDataParser.cxx
+++ b/src/IcyMetaDataParser.cxx
@@ -0,0 +1,250 @@
+/*
+ * Copyright 2003-2018 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 "IcyMetaDataParser.hxx"
+#include "tag/Tag.hxx"
+#include "tag/Builder.hxx"
+#include "util/Domain.hxx"
+#include "util/StringView.hxx"
+#include "Log.hxx"
+
+#include <assert.h>
+#include <string.h>
+
+static constexpr Domain icy_metadata_domain("icy_metadata");
+
+void
+IcyMetaDataParser::Reset() noexcept
+{
+	if (!IsDefined())
+		return;
+
+	if (data_rest == 0 && meta_size > 0)
+		delete[] meta_data;
+
+	tag.reset();
+
+	data_rest = data_size;
+	meta_size = 0;
+}
+
+size_t
+IcyMetaDataParser::Data(size_t length) noexcept
+{
+	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) noexcept
+{
+	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) noexcept
+{
+	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) noexcept
+{
+	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 std::unique_ptr<Tag>
+icy_parse_tag(char *p, char *const end) noexcept
+{
+	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) noexcept
+{
+	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 */
+
+		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) noexcept
+{
+	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,91 @@
+/*
+ * Copyright 2003-2018 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 "tag/Tag.hxx"
+
+#include <memory>
+
+#include <stddef.h>
+
+class IcyMetaDataParser {
+	size_t data_size = 0, data_rest;
+
+	size_t meta_size, meta_position;
+	char *meta_data;
+
+	std::unique_ptr<Tag> tag;
+
+public:
+	~IcyMetaDataParser() noexcept {
+		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) noexcept {
+		data_size = data_rest = _data_size;
+		meta_size = 0;
+		tag = nullptr;
+	}
+
+	/**
+	 * Resets the icy_metadata.  Call this after rewinding the stream.
+	 */
+	void Reset() noexcept;
+
+	/**
+	 * Checks whether the icy_metadata object is enabled.
+	 */
+	bool IsDefined() const noexcept {
+		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) noexcept;
+
+	/**
+	 * 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) noexcept;
+
+	/**
+	 * Parse data and eliminate metadata.
+	 *
+	 * @return the number of data bytes remaining in the buffer
+	 */
+	size_t ParseInPlace(void *data, size_t length) noexcept;
+
+	std::unique_ptr<Tag> ReadTag() noexcept {
+		return std::exchange(tag, nullptr);
+	}
+};
+
+#endif
--- a/src/Idle.cxx
+++ b/src/Idle.cxx
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2003-2018 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.
+ *
+ */
+
+#include "Idle.hxx"
+#include "Main.hxx"
+#include "Instance.hxx"
+
+#include <assert.h>
+
+void
+idle_add(unsigned flags)
+{
+	assert(flags != 0);
+
+	instance->EmitIdle(flags);
+}
--- a/src/Idle.hxx
+++ b/src/Idle.hxx
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2003-2018 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 "IdleFlags.hxx"
+
+/**
+ * Adds idle flag (with bitwise "or") and queues notifications to all
+ * clients.
+ */
+void
+idle_add(unsigned flags);
+
+#endif
--- a/src/IdleFlags.cxx
+++ b/src/IdleFlags.cxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2010 The Music Player Daemon Project
+ * Copyright 2003-2018 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -22,15 +22,10 @@
 *
 */

-#include "config.h"
-#include "idle.h"
-#include "event_pipe.h"
+#include "IdleFlags.hxx"
+#include "util/ASCII.hxx"

 #include <assert.h>
-#include <glib.h>
-
-static unsigned idle_flags;
-static GMutex *idle_mutex = NULL;

 static const char *const idle_names[] = {
 	"database",
@@ -42,51 +37,31 @@ static const char *const idle_names[] = {
 	"options",
 	"sticker",
 	"update",
-        NULL
+	"subscription",
+	"message",
+	"neighbor",
+	"mount",
+	"partition",
+	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);
-
-	event_pipe_emit(PIPE_EVENT_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;
-}
-
 const char*const*
-idle_get_names(void)
+idle_get_names() noexcept
 {
        return idle_names;
 }
+
+unsigned
+idle_parse_name(const char *name) noexcept
+{
+#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/IdleFlags.hxx
+++ b/src/IdleFlags.hxx
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2003-2018 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_FLAGS_HXX
+#define MPD_IDLE_FLAGS_HXX
+
+#include "util/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;
+
+/** the partition list has changed */
+static constexpr unsigned IDLE_PARTITION = 0x2000;
+
+/**
+ * Get idle names
+ */
+gcc_const
+const char*const*
+idle_get_names() noexcept;
+
+/**
+ * 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) noexcept;
+
+#endif
--- a/src/Instance.cxx
+++ b/src/Instance.cxx
@@ -0,0 +1,168 @@
+/*
+ * Copyright 2003-2018 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_CURL
+#include "RemoteTagCache.hxx"
+#include "util/UriUtil.hxx"
+#endif
+
+#ifdef ENABLE_DATABASE
+#include "db/DatabaseError.hxx"
+#include "db/Interface.hxx"
+#include "db/update/Service.hxx"
+#include "storage/StorageInterface.hxx"
+
+#ifdef ENABLE_SQLITE
+#include "sticker/StickerDatabase.hxx"
+#include "sticker/SongSticker.hxx"
+#endif
+#endif
+
+#include <exception>
+
+Instance::Instance()
+	:rtio_thread(true),
+#ifdef ENABLE_SYSTEMD_DAEMON
+	 systemd_watchdog(event_loop),
+#endif
+	 idle_monitor(event_loop, BIND_THIS_METHOD(OnIdle))
+{
+}
+
+Instance::~Instance() noexcept
+{
+#ifdef ENABLE_DATABASE
+	delete update;
+
+	if (database != nullptr) {
+		database->Close();
+		database.reset();
+	}
+
+	delete storage;
+#endif
+}
+
+Partition *
+Instance::FindPartition(const char *name) noexcept
+{
+	for (auto &partition : partitions)
+		if (partition.name == name)
+			return &partition;
+
+	return nullptr;
+}
+
+#ifdef ENABLE_DATABASE
+
+const Database &
+Instance::GetDatabaseOrThrow() const
+{
+	if (database == nullptr)
+		throw DatabaseError(DatabaseErrorCode::DISABLED,
+				    "No database");
+
+	return *database;
+}
+
+void
+Instance::OnDatabaseModified()
+{
+	assert(database != nullptr);
+
+	/* propagate the change to all subsystems */
+
+	stats_invalidate();
+
+	for (auto &partition : partitions)
+		partition.DatabaseModified(*database);
+}
+
+void
+Instance::OnDatabaseSongRemoved(const char *uri)
+{
+	assert(database != nullptr);
+
+#ifdef ENABLE_SQLITE
+	/* if the song has a sticker, remove it */
+	if (sticker_enabled()) {
+		try {
+			sticker_song_delete(uri);
+		} catch (...) {
+		}
+	}
+#endif
+
+	for (auto &partition : partitions)
+		partition.StaleSong(uri);
+}
+
+#endif
+
+#ifdef ENABLE_NEIGHBOR_PLUGINS
+
+void
+Instance::FoundNeighbor(gcc_unused const NeighborInfo &info) noexcept
+{
+	for (auto &partition : partitions)
+		partition.EmitIdle(IDLE_NEIGHBOR);
+}
+
+void
+Instance::LostNeighbor(gcc_unused const NeighborInfo &info) noexcept
+{
+	for (auto &partition : partitions)
+		partition.EmitIdle(IDLE_NEIGHBOR);
+}
+
+#endif
+
+#ifdef ENABLE_CURL
+
+void
+Instance::LookupRemoteTag(const char *uri) noexcept
+{
+	if (!uri_has_scheme(uri))
+		return;
+
+	if (!remote_tag_cache)
+		remote_tag_cache = std::make_unique<RemoteTagCache>(event_loop,
+								    *this);
+
+	remote_tag_cache->Lookup(uri);
+}
+
+void
+Instance::OnRemoteTag(const char *uri, const Tag &tag) noexcept
+{
+	if (!tag.IsDefined())
+		/* boring */
+		return;
+
+	for (auto &partition : partitions)
+		partition.TagModified(uri, tag);
+}
+
+#endif
--- a/src/Instance.hxx
+++ b/src/Instance.hxx
@@ -0,0 +1,200 @@
+/*
+ * Copyright 2003-2018 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 "config.h"
+#include "event/Loop.hxx"
+#include "event/Thread.hxx"
+#include "event/MaskMonitor.hxx"
+#include "util/Compiler.h"
+
+#ifdef ENABLE_SYSTEMD_DAEMON
+#include "lib/systemd/Watchdog.hxx"
+#endif
+
+#ifdef ENABLE_CURL
+#include "RemoteTagCacheHandler.hxx"
+#endif
+
+#ifdef ENABLE_NEIGHBOR_PLUGINS
+#include "neighbor/Listener.hxx"
+class NeighborGlue;
+#endif
+
+#ifdef ENABLE_DATABASE
+#include "db/DatabaseListener.hxx"
+#include "db/Ptr.hxx"
+class Storage;
+class UpdateService;
+#endif
+
+#include <memory>
+#include <list>
+
+class ClientList;
+struct Partition;
+class StateFile;
+class RemoteTagCache;
+
+/**
+ * A utility class which, when used as the first base class, ensures
+ * that the #EventLoop gets initialized before the other base classes.
+ */
+struct EventLoopHolder {
+	EventLoop event_loop;
+};
+
+struct Instance final
+	: EventLoopHolder
+#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
+#ifdef ENABLE_CURL
+	, public RemoteTagCacheHandler
+#endif
+{
+	/**
+	 * A thread running an #EventLoop for non-blocking (bulk) I/O.
+	 */
+	EventThread io_thread;
+
+	/**
+	 * Another thread running an #EventLoop for non-blocking
+	 * (real-time) I/O.  This is used instead of #io_thread for
+	 * events which require low latency, e.g. for filling hardware
+	 * ring buffers.
+	 */
+	EventThread rtio_thread;
+
+#ifdef ENABLE_SYSTEMD_DAEMON
+	Systemd::Watchdog systemd_watchdog;
+#endif
+
+	MaskMonitor idle_monitor;
+
+#ifdef ENABLE_NEIGHBOR_PLUGINS
+	NeighborGlue *neighbors;
+#endif
+
+#ifdef ENABLE_DATABASE
+	DatabasePtr database;
+
+	/**
+	 * This is really a #CompositeStorage.  To avoid heavy include
+	 * dependencies, we declare it as just #Storage.
+	 */
+	Storage *storage = nullptr;
+
+	UpdateService *update = nullptr;
+#endif
+
+#ifdef ENABLE_CURL
+	std::unique_ptr<RemoteTagCache> remote_tag_cache;
+#endif
+
+	ClientList *client_list;
+
+	std::list<Partition> partitions;
+
+	StateFile *state_file = nullptr;
+
+	Instance();
+	~Instance() noexcept;
+
+	/**
+	 * Wrapper for EventLoop::Break().  Call to initiate shutdown.
+	 */
+	void Break() {
+		event_loop.Break();
+	}
+
+	void EmitIdle(unsigned mask) {
+		idle_monitor.OrMask(mask);
+	}
+
+	/**
+	 * Find a #Partition with the given name.  Returns nullptr if
+	 * no such partition was found.
+	 */
+	gcc_pure
+	Partition *FindPartition(const char *name) noexcept;
+
+	void BeginShutdownPartitions() noexcept;
+
+#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() {
+		return database.get();
+	}
+
+	/**
+	 * Returns the global #Database instance.  Throws
+	 * DatabaseError if this MPD configuration has no database (no
+	 * music_directory was configured).
+	 */
+	const Database &GetDatabaseOrThrow() const;
+#endif
+
+	void BeginShutdownUpdate() noexcept;
+
+#ifdef ENABLE_CURL
+	void LookupRemoteTag(const char *uri) noexcept;
+#else
+	void LookupRemoteTag(const char *) noexcept {
+		/* no-op */
+	}
+#endif
+
+private:
+#ifdef ENABLE_DATABASE
+	void OnDatabaseModified() override;
+	void OnDatabaseSongRemoved(const char *uri) override;
+#endif
+
+#ifdef ENABLE_NEIGHBOR_PLUGINS
+	/* virtual methods from class NeighborListener */
+	void FoundNeighbor(const NeighborInfo &info) noexcept override;
+	void LostNeighbor(const NeighborInfo &info) noexcept override;
+#endif
+
+#ifdef ENABLE_CURL
+	/* virtual methods from class RemoteTagCacheHandler */
+	void OnRemoteTag(const char *uri, const Tag &tag) noexcept override;
+#endif
+
+	/* callback for #idle_monitor */
+	void OnIdle(unsigned mask);
+};
+
+#endif
--- a/src/Listen.cxx
+++ b/src/Listen.cxx
@@ -0,0 +1,161 @@
+/*
+ * Copyright 2003-2018 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 "Log.hxx"
+#include "client/Listener.hxx"
+#include "config/Param.hxx"
+#include "config/Data.hxx"
+#include "config/Option.hxx"
+#include "config/Net.hxx"
+#include "net/AllocatedSocketAddress.hxx"
+#include "net/UniqueSocketDescriptor.hxx"
+#include "net/SocketUtil.hxx"
+#include "system/Error.hxx"
+#include "util/RuntimeError.hxx"
+#include "fs/AllocatedPath.hxx"
+#include "fs/XDG.hxx"
+
+#include <sys/stat.h>
+#include <string.h>
+#include <assert.h>
+
+#ifdef ENABLE_SYSTEMD_DAEMON
+#include <systemd/sd-daemon.h>
+#endif
+
+#define DEFAULT_PORT	6600
+
+int listen_port;
+
+#ifdef ENABLE_SYSTEMD_DAEMON
+
+static bool
+listen_systemd_activation(ClientListener &listener)
+{
+	int n = sd_listen_fds(true);
+	if (n <= 0) {
+		if (n < 0)
+			throw MakeErrno(-n, "sd_listen_fds() failed");
+		return false;
+	}
+
+	for (int i = SD_LISTEN_FDS_START, end = SD_LISTEN_FDS_START + n;
+	     i != end; ++i)
+		listener.AddFD(UniqueSocketDescriptor(i));
+
+	return true;
+}
+
+#endif
+
+/**
+ * Listen on "$XDG_RUNTIME_DIR/mpd/socket" (if applicable).
+ *
+ * @return true if a listener socket was added
+ */
+static bool
+ListenXdgRuntimeDir(ClientListener &listener) noexcept
+{
+#if defined(USE_XDG) && defined(HAVE_UN)
+	if (geteuid() == 0)
+		/* this MPD instance is a system-wide daemon; don't
+		   use $XDG_RUNTIME_DIR */
+		return false;
+
+	Path xdg_runtime_dir = Path::FromFS(getenv("XDG_RUNTIME_DIR"));
+	if (xdg_runtime_dir.IsNull())
+		return false;
+
+	const auto mpd_runtime_dir = xdg_runtime_dir / Path::FromFS("mpd");
+	mkdir(mpd_runtime_dir.c_str(), 0700);
+
+	const auto socket_path = mpd_runtime_dir / Path::FromFS("socket");
+	unlink(socket_path.c_str());
+
+	AllocatedSocketAddress address;
+	address.SetLocal(socket_path.c_str());
+
+	try {
+		auto fd = socket_bind_listen(AF_LOCAL, SOCK_STREAM, 0,
+					     address, 5);
+		chmod(socket_path.c_str(), 0600);
+		listener.AddFD(std::move(fd), std::move(address));
+		return true;
+	} catch (...) {
+		FormatError(std::current_exception(),
+			    "Failed to listen on '%s' (not fatal)",
+			    socket_path.c_str());
+		return false;
+	}
+#else
+	(void)listener;
+	return false;
+#endif
+}
+
+void
+listen_global_init(const ConfigData &config, ClientListener &listener)
+{
+	int port = config.GetPositive(ConfigOption::PORT, DEFAULT_PORT);
+
+#ifdef ENABLE_SYSTEMD_DAEMON
+	if (listen_systemd_activation(listener))
+		return;
+#endif
+
+	for (const auto &param : config.GetParamList(ConfigOption::BIND_TO_ADDRESS)) {
+		try {
+			ServerSocketAddGeneric(listener, param.value.c_str(),
+					       port);
+		} catch (...) {
+			std::throw_with_nested(FormatRuntimeError("Failed to listen on %s (line %i)",
+								  param.value.c_str(),
+								  param.line));
+		}
+	}
+
+	bool have_xdg_runtime_listener = false;
+
+	if (listener.IsEmpty()) {
+		/* no "bind_to_address" configured, bind the
+		   configured port on all interfaces */
+
+		have_xdg_runtime_listener = ListenXdgRuntimeDir(listener);
+
+		try {
+			listener.AddPort(port);
+		} catch (...) {
+			std::throw_with_nested(FormatRuntimeError("Failed to listen on *:%d: ", port));
+		}
+	}
+
+	try {
+		listener.Open();
+	} catch (...) {
+		if (have_xdg_runtime_listener)
+			LogError(std::current_exception(),
+				 "Default TCP listener setup failed, but this is okay because we have a $XDG_RUNTIME_DIR listener");
+		else
+			throw;
+	}
+
+	listen_port = port;
+}
--- a/src/Listen.hxx
+++ b/src/Listen.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2010 The Music Player Daemon Project
+ * Copyright 2003-2018 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -17,18 +17,15 @@
 * 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>
+struct ConfigData;
+class ClientListener;

 extern int listen_port;

-bool
-listen_global_init(GError **error_r);
-
-void listen_global_finish(void);
+void
+listen_global_init(const ConfigData &config, ClientListener &listener);

 #endif
--- a/src/LocateUri.cxx
+++ b/src/LocateUri.cxx
@@ -0,0 +1,125 @@
+/*
+ * Copyright 2003-2018 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 "LocateUri.hxx"
+#include "client/Client.hxx"
+#include "fs/AllocatedPath.hxx"
+#include "ls.hxx"
+#include "util/UriUtil.hxx"
+#include "util/ASCII.hxx"
+
+#ifdef ENABLE_DATABASE
+#include "storage/StorageInterface.hxx"
+#endif
+
+#include <stdexcept>
+
+static LocatedUri
+LocateFileUri(const char *uri, const Client *client
+#ifdef ENABLE_DATABASE
+	      , const Storage *storage
+#endif
+	      )
+{
+	auto path = AllocatedPath::FromUTF8Throw(uri);
+
+#ifdef ENABLE_DATABASE
+	if (storage != nullptr) {
+		const char *suffix = storage->MapToRelativeUTF8(uri);
+		if (suffix != nullptr)
+			/* this path was relative to the music
+			   directory */
+			return LocatedUri(LocatedUri::Type::RELATIVE, suffix);
+	}
+#endif
+
+	if (client != nullptr)
+		client->AllowFile(path);
+
+	return LocatedUri(LocatedUri::Type::PATH, uri, std::move(path));
+}
+
+static LocatedUri
+LocateAbsoluteUri(UriPluginKind kind, const char *uri
+#ifdef ENABLE_DATABASE
+		  , const Storage *storage
+#endif
+		  )
+{
+	switch (kind) {
+	case UriPluginKind::INPUT:
+	case UriPluginKind::STORAGE: // TODO: separate check for storage plugins
+		if (!uri_supported_scheme(uri))
+			throw std::runtime_error("Unsupported URI scheme");
+		break;
+
+	case UriPluginKind::PLAYLIST:
+		/* for now, no validation for playlist URIs; this is
+		   more complicated because there are three ways to
+		   identify which plugin to use: URI scheme, filename
+		   suffix and MIME type */
+		break;
+	}
+
+#ifdef ENABLE_DATABASE
+	if (storage != nullptr) {
+		const char *suffix = storage->MapToRelativeUTF8(uri);
+		if (suffix != nullptr)
+			return LocatedUri(LocatedUri::Type::RELATIVE, suffix);
+	}
+#endif
+
+	return LocatedUri(LocatedUri::Type::ABSOLUTE, uri);
+}
+
+LocatedUri
+LocateUri(UriPluginKind kind,
+	  const char *uri, const Client *client
+#ifdef ENABLE_DATABASE
+	  , const Storage *storage
+#endif
+	  )
+{
+	/* skip the obsolete "file://" prefix */
+	const char *path_utf8 = StringAfterPrefixCaseASCII(uri, "file://");
+	if (path_utf8 != nullptr) {
+		if (!PathTraitsUTF8::IsAbsolute(path_utf8))
+			throw std::runtime_error("Malformed file:// URI");
+
+		return LocateFileUri(path_utf8, client
+#ifdef ENABLE_DATABASE
+				     , storage
+#endif
+				     );
+	} else if (PathTraitsUTF8::IsAbsolute(uri))
+		return LocateFileUri(uri, client
+#ifdef ENABLE_DATABASE
+				     , storage
+#endif
+				     );
+	else if (uri_has_scheme(uri))
+		return LocateAbsoluteUri(kind, uri
+#ifdef ENABLE_DATABASE
+					 , storage
+#endif
+					 );
+	else
+		return LocatedUri(LocatedUri::Type::RELATIVE, uri);
+}
--- a/Show More
+++ b/Show More