release v0.21.26

Skip the beginning of a sector if the last seek was odd, and clear the
buffer on seek.

.gitignore

@@ -1,88 +1,11 @@
-*.Plo
-*.Po
-*.a
-*.d
-*.la
-*.lo
-*.o
-*.exe
-
 *~
 
 .#*
 .stgit*
-.deps
-.dirstamp
 
-tags
-
-/Makefile
-/Makefile.in
-/aclocal.m4
-/autom4te.cache
-/config.h
-/config.h.in
-/config.log
-/config.mk
-/config.status
-/config_detected.h
-/config_detected.mk
-/configure
-/configure.lineno
-/depmode
-/libtool
-/ltmain.sh
-/mkinstalldirs
 /output/
-/src/mpd
-/systemd/system/mpd.service
-/systemd/user/mpd.service
-/stamp-h1
-
-/src/dsd2pcm/dsd2pcm
-/src/win32/mpd_win32_rc.rc
-
-/doc/doxygen.conf
-/doc/protocol.html
-/doc/protocol
-/doc/user
-/doc/developer
-/doc/sticker
-/doc/api
-
-/test/software_volume
-/test/run_convert
-/test/run_decoder
-/test/read_tags
-/test/run_filter
-/test/run_encoder
-/test/run_output
-/test/read_conf
-/test/run_input
-/test/read_mixer
-/test/dump_playlist
-/test/run_normalize
-/test/tmp
-/test/run_inotify
-/test/test_queue_priority
-/test/test_protocol
-/test/run_ntp_server
-/test/run_resolver
-/test/run_tcp_connect
-/test/test_pcm
-/test/dump_rva2
-/test/dump_text_file
-/test/test_util
-/test/test_byte_reverse
-/test/test_mixramp
-/test/test_vorbis_encoder
-/test/DumpDatabase
-
-/lib/
-
-/*.tar.gz
-/*.tar.bz2
-/*.tar.xz
-/mpd-*/
 
 __pycache__/
+
+/.clangd/
+/compile_commands.json

.travis.yml

@@ -1,7 +1,73 @@
 language: cpp
 
-matrix:
+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:
@@ -9,7 +75,7 @@ matrix:
           sources:
             - ubuntu-toolchain-r-test
             - sourceline: 'ppa:mhier/libboost-latest'
-            - sourceline: 'ppa:saiarcot895/chromium-dev' # for ninja-build
+            - sourceline: 'ppa:mstipicevic/ninja-build-1-7-2'
             - sourceline: 'ppa:deadsnakes/ppa' # for Python 3.7 (required by Meson)
           packages:
             - g++-6
@@ -20,13 +86,14 @@ matrix:
             - ninja-build
       before_install:
         - wget https://bootstrap.pypa.io/get-pip.py
-        - /usr/bin/python3.6 get-pip.py --user
+        - /usr/bin/python3.6 get-pip.py --user --no-cache-dir
       install:
-        - /usr/bin/python3.6 $HOME/.local/bin/pip install --user meson
+        - /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=gcc-6 CXX=g++-6 LDFLAGS=-fuse-ld=gold PATH=$HOME/.local/bin:$PATH"
+        - 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:
@@ -34,7 +101,7 @@ matrix:
           sources:
             - ubuntu-toolchain-r-test
             - sourceline: 'ppa:mhier/libboost-latest'
-            - sourceline: 'ppa:saiarcot895/chromium-dev' # for ninja-build
+            - sourceline: 'ppa:mstipicevic/ninja-build-1-7-2'
             - sourceline: 'ppa:deadsnakes/ppa' # for Python 3.7 (required by Meson)
           packages:
             - g++-8
@@ -45,31 +112,61 @@ matrix:
             - ninja-build
       before_install:
         - wget https://bootstrap.pypa.io/get-pip.py
-        - /usr/bin/python3.6 get-pip.py --user
+        - /usr/bin/python3.6 get-pip.py --user --no-cache-dir
       install:
-        - /usr/bin/python3.6 $HOME/.local/bin/pip install --user meson
+        - /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=gcc-8 CXX=g++-8 LDFLAGS=-fuse-ld=gold PATH=$HOME/.local/bin:$PATH"
+        - 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.3beta
+      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=""
+        - MATRIX_EVAL="export PATH=/usr/local/opt/ccache/libexec:$PATH HOMEBREW_NO_ANALYTICS=1"
 
 cache:
-  - apt
-  - ccache
+  apt: true
+  ccache: true
+  directories:
+    - $HOME/Library/Caches/Homebrew
+
+before_cache:
+  - test "$TRAVIS_OS_NAME" != "osx" || brew cleanup
 
 before_install:
   - eval "${MATRIX_EVAL}"
-  # C++14
-  - test "$TRAVIS_OS_NAME" != "osx" || brew update
 
 install:
   # C++14
-  - test "$TRAVIS_OS_NAME" != "osx" || brew install ccache meson
-  - test "$TRAVIS_OS_NAME" != "osx" || brew install --HEAD https://gist.githubusercontent.com/Kronuz/96ac10fbd8472eb1e7566d740c4034f8/raw/gtest.rb
+
+  # 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

NEWS

@@ -1,3 +1,343 @@
+ver 0.21.26 (2020/09/21)
+* database
+  - inotify: obey ".mpdignore" files
+* output
+  - osx: fix crash bug
+  - sles: support floating point samples
+* archive
+  - bzip2: fix crash on corrupt bzip2 file
+  - bzip2: flush output at end of input file
+  - iso9660: fix unaligned reads
+  - iso9660: support seeking
+  - zzip: fix crash on corrupt ZIP file
+* decoder
+  - ffmpeg: remove "rtsp://" from the list of supported protocols
+  - ffmpeg: add "hls+http://" to the list of supported protocols
+  - opus: support the gain value from the Opus header
+  - sndfile: fix lost samples at end of file
+* fix "single" mode bug after resuming playback
+* the default log_level is "default", not "info"
+
+ver 0.21.25 (2020/07/06)
+* protocol:
+  - fix crash when using "rangeid" while playing
+* database
+  - simple: automatically scan new mounts
+  - upnp: fix compatibility with Plex DLNA
+* storage
+  - fix disappearing mounts after mounting twice
+  - udisks: fix reading ".mpdignore"
+* input
+  - file: detect premature end of file
+  - smbclient: don't send credentials to MPD clients
+* decoder
+  - opus: apply pre-skip and end trimming
+  - opus: fix memory leak
+  - opus: fix crash bug
+  - vorbis: fix crash bug
+* output
+  - osx: improve sample rate selection
+  - osx: fix noise while stopping
+* neighbor
+  - upnp: fix crash during shutdown
+* Windows/Android:
+  - fix Boost detection after breaking change in Meson 0.54
+
+ver 0.21.24 (2020/06/10)
+* protocol
+  - "tagtypes" requires no permissions
+* database
+  - simple: fix crash when mounting twice
+* decoder
+  - modplug: fix Windows build failure
+  - wildmidi: attempt to detect WildMidi using pkg-config
+  - wildmidi: fix Windows build failure
+* player
+  - don't restart current song if seeking beyond end
+* Android
+  - enable the decoder plugins GME, ModPlug and WildMidi
+  - fix build failure with Android NDK r21
+* Windows
+  - fix stream playback
+  - enable the decoder plugins GME, ModPlug and WildMidi
+  - work around Meson bug breaking the Windows build with GCC 10
+* fix unit test failure
+
+ver 0.21.23 (2020/04/23)
+* protocol
+  - add tag fallback for AlbumSort
+* storage
+  - curl: fix corrupt "href" values in the presence of XML entities
+  - curl: unescape "href" values
+* input
+  - nfs: fix crash bug
+  - nfs: fix freeze bug on reconnect
+* decoder
+  - gme: adapt to API change in the upcoming version 0.7.0
+* output
+  - alsa: implement channel mapping for 5.0 and 7.0
+* player
+  - drain outputs at end of song in "single" mode
+* Windows
+  - fix case insensitive search
+
+ver 0.21.22 (2020/04/02)
+* database
+  - simple: optimize startup
+* input
+  - curl: fix streaming errors on Android
+* playlist
+  - rss: support MIME type application/xml
+* mixer
+  - android: new mixer plugin for "sles" output
+* Android
+  - TV support
+* Windows
+  - fix time zone offset check
+* fix build failures with uClibc-ng
+
+ver 0.21.21 (2020/03/19)
+* configuration
+  - fix bug in "metadata_to_use" setting
+* playlist
+  - asx, xspf: fix corrupt tags in the presence of XML entities
+* archive
+  - iso9660: skip empty file names to work around libcdio bug
+* decoder
+  - gme: ignore empty tags
+* output
+  - solaris: port to NetBSD
+* raise default "max_connections" value to 100
+
+ver 0.21.20 (2020/02/16)
+* decoder
+  - audiofile, ffmpeg, sndfile: handle MIME type "audio/wav"
+  - ffmpeg: fix playback of AIFF and TTA
+  - vorbis, opus: fix seeking in small files
+* fix backwards seeking on ARM (and other non-x86 CPUs)
+
+ver 0.21.19 (2020/01/17)
+* configuration
+  - allow overriding top-level settings in includes
+* output
+  - pulse: obey Pulse's maximum sample rate (fixes DSD128 playback)
+* fix build failure with clang 10
+* fix build failure with Android NDK r20
+
+ver 0.21.18 (2019/12/24)
+* protocol
+  - work around Mac OS X bug in the ISO 8601 parser
+* output
+  - alsa: fix hang bug with ALSA "null" outputs
+* storage
+  - curl: fix crash bug
+* drop support for CURL versions older than 7.32.0
+* reduce unnecessary CPU wakeups
+
+ver 0.21.17 (2019/12/16)
+* protocol
+  - relax the ISO 8601 parser: allow omitting field separators, the
+    time of day and the "Z" suffix
+* archive
+  - zzip: improve error reporting
+* outputs
+  - jack: mark ports as terminal
+  - shout: declare metadata as UTF-8
+* fix build failure with -Ddatabase=false
+
+ver 0.21.16 (2019/10/16)
+* queue
+  - fix relative destination offset when moving a range
+* storage
+  - curl: request the "resourcetype" property to fix database update
+  - curl: URL-encode more paths
+  - curl: follow redirects for collections without trailing slash
+* update
+  - fix crash when music_directory is not a directory
+* fix build with iconv() instead of ICU
+
+ver 0.21.15 (2019/09/25)
+* decoder
+  - dsdiff, dsf: fix displayed bit rate
+  - mpcdec: fix bogus ReplayGain values
+* output
+  - solaris: fix build with glibc 2.30
+
+ver 0.21.14 (2019/08/21)
+* decoder
+  - sidplay: show track durations in database
+  - sidplay: convert tag values from Windows-1252 charset
+  - sidplay: strip text from "Date" tag
+* player
+  - fix crash after song change
+  - fix seek position after restarting the decoder
+* protocol
+  - include command name in error responses
+
+ver 0.21.13 (2019/08/06)
+* input
+  - cdio_paranoia: require libcdio-paranoia 10.2+0.93+1
+* decoder
+  - mad: fix crackling sound (0.21.12 regression)
+* output
+  - jack: improved Windows compatibility
+
+ver 0.21.12 (2019/08/03)
+* decoder
+  - mad: update bit rate after seeking
+  - mad: fix several bugs preventing the plugin from decoding the last frame
+  - opus: ignore case in replay gain tag names
+  - opus, vorbis: decode the "end of stream" packet
+* output
+  - jack: fix mono-to-stereo conversion
+* player
+  - don't restart unseekable song after failed seek attempt
+* Windows
+  - support backslash in relative URIs loaded from playlists
+
+ver 0.21.11 (2019/07/03)
+* input
+  - tidal: deprecated because Tidal has changed the protocol
+* decoder
+  - wildmidi: log error if library initialization fails
+* output
+  - alsa: fix busy loop while draining
+  - alsa: fix missing drain call
+  - alsa: improve xrun-avoiding silence generator
+  - alsa: log when generating silence due to slow decoder
+  - alsa, osx: fix distortions with DSD_U32 and DoP on 32 bit CPUs
+* protocol
+  - fix "list" with multiple "group" levels
+
+ver 0.21.10 (2019/06/05)
+* decoder
+  - opus: fix duplicate tags
+* output
+  - httpd: reject some well-known URIs
+* fix crash bug (0.21.9 regression)
+
+ver 0.21.9 (2019/05/20)
+* input
+  - buffer: fix deadlock bug
+* Android
+  - fix crash on ARMv7
+  - request storage permission on Android 6+
+* fix spurious "single" mode bug
+
+ver 0.21.8 (2019/04/23)
+* input
+  - smbclient: download to buffer instead of throttling transfer
+* output
+  - httpd: add missing mutex lock
+  - httpd: fix use-after-free bug
+* playlist
+  - soundcloud: fix "Unsupported URI scheme" (0.21.6 regression)
+* fix Bonjour bug
+* fix build failure with GCC 9
+* fix build failure with -Ddatabase=false
+* systemd: add user socket unit
+* doc: "list file" is deprecated
+
+ver 0.21.7 (2019/04/03)
+* input
+  - qobuz/tidal: scan tags when loading a playlist
+* require Meson 0.49.0 for native libgcrypt-config support
+* fix build failure with -Dlocal_socket=false
+* Haiku
+  - fix build
+  - add version info
+
+ver 0.21.6 (2019/03/17)
+* protocol
+  - allow loading playlists specified as absolute filesystem paths
+  - fix negated filter expressions with multiple tag values
+  - fix "list" with filter expression
+  - omit empty playlist names in "listplaylists"
+* input
+  - cdio_paranoia: fix build failure due to missing #include
+* decoder
+  - opus: fix replay gain when there are no other tags
+  - opus: fix seeking to beginning of song
+  - vorbis: fix Tremor conflict resulting in crash
+* output
+  - pulse: work around error with unusual channel count
+  - osx: fix build failure
+* playlist
+  - flac: fix use-after-free bug
+* support abstract sockets on Linux
+* Windows
+  - remove the unused libwinpthread-1.dll dependency
+* Android
+  - enable SLES power saving mode
+
+ver 0.21.5 (2019/02/22)
+* protocol
+  - fix deadlock in "albumart" command
+  - fix "tagtypes disable" command
+* database
+  - simple: fix assertion failure
+  - fix assertion failures with mount points
+* storage
+  - udisks: fix "AlreadyMounted" error
+  - udisks: use relative path from mount URI
+  - fix memory leak
+* input
+  - buffer: fix crash bug when playing remote WAV file
+* tags
+  - ape: map "Album Artist"
+* output
+  - shout: add support for TLS
+* mixer
+  - pulse: add "scale_volume" setting
+
+ver 0.21.4 (2019/01/04)
+* database
+  - inotify: fix crash bug "terminate called after throwing ..."
+  - upnp: implement "list ... group"
+* output
+  - httpd: declare protocol "HTTP/1.1" instead of "ICY"
+* remove libwrap support
+* Windows
+  - fix "Failed to accept connection: unknown error"
+* fix Haiku build
+
+ver 0.21.3 (2018/11/16)
+* output
+  - alsa: fix crash bug
+  - alsa: fix stuttering at start of playback
+  - alsa: fix discarded samples at end of song
+  - alsa: clear error after reopening device
+* log: default to journal if MPD was started as systemd service
+
+ver 0.21.2 (2018/11/12)
+* protocol
+  - operator "=~" matches a regular expression
+  - operator "contains" matches substrings
+* decoder
+  - ffmpeg: require FFmpeg 3.1 or later
+  - ffmpeg: fix broken sound with certain codecs
+* output
+  - alsa: fix high CPU usage with dmix
+  - httpd: fix three crash bugs
+* mixer
+  - alsa: fix more rounding errors
+* fix zlib support
+
+ver 0.21.1 (2018/11/04)
+* protocol
+  - allow escaping quotes in filter expressions
+  - operator "==" never searches substrings in filter expressions
+* decoder
+  - ffmpeg: fix build failure with non-standard FFmpeg installation path
+  - flac: fix linker failure when building without FLAC support
+* encoder
+  - vorbis: fix linker failure when building without Vorbis decoder
+* fix build failure on Linux-PowerPC
+* fix build failure on FreeBSD
+* eliminate DLL dependencies on Windows
+* add warning about buggy Boost version 1.67
+* require Meson 0.47.2 because a Meson 0.47.1 bug breaks our build
+
 ver 0.21 (2018/10/31)
 * configuration
   - add "include" directive, allows including config files

android/.gitignore

@@ -1 +0,0 @@
-/build

android/AndroidManifest.xml

@@ -2,18 +2,25 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="org.musicpd"
           android:installLocation="auto"
-          android:versionCode="23"
-          android:versionName="0.21">
+          android:versionCode="49"
+          android:versionName="0.21.26">
 
-  <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="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">
@@ -22,6 +29,14 @@
         <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" />

android/build.py

@@ -25,25 +25,32 @@ android_abis = {
         'arch': 'arm-linux-androideabi',
         'ndk_arch': 'arm',
         'toolchain_arch': 'arm-linux-androideabi',
-        'llvm_triple': 'armv7-none-linux-androideabi',
-        'cflags': '-march=armv7-a -mfpu=vfp -mfloat-abi=softfp',
+        'llvm_triple': 'armv7-linux-androideabi',
+        'cflags': '-fpic -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp',
     },
 
     'arm64-v8a': {
-        'android_api_level': '21',
         'arch': 'aarch64-linux-android',
         'ndk_arch': 'arm64',
         'toolchain_arch': 'aarch64-linux-android',
-        'llvm_triple': 'aarch64-none-linux-android',
-        'cflags': '',
+        'llvm_triple': 'aarch64-linux-android',
+        'cflags': '-fpic',
     },
 
     'x86': {
         'arch': 'i686-linux-android',
         'ndk_arch': 'x86',
         'toolchain_arch': 'x86',
-        'llvm_triple': 'i686-none-linux-android',
-        'cflags': '-march=i686 -mtune=intel -mssse3 -mfpmath=sse -m32',
+        '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',
     },
 }
 
@@ -76,27 +83,20 @@ class AndroidNdkToolchain:
 
         ndk_arch = abi_info['ndk_arch']
         android_api_level = '21'
-        ndk_platform = 'android-' + android_api_level
 
         # select the NDK compiler
         gcc_version = '4.9'
 
-        ndk_platform_path = os.path.join(ndk_path, 'platforms', ndk_platform)
-        sysroot = os.path.join(ndk_path, 'sysroot')
-        target_root = os.path.join(ndk_platform_path, 'arch-' + ndk_arch)
-
         install_prefix = os.path.join(arch_path, 'root')
 
         self.arch = arch
         self.install_prefix = install_prefix
-        self.sysroot = sysroot
 
         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']
+        llvm_triple = abi_info['llvm_triple'] + android_api_level
 
         common_flags = '-Os -g'
-        common_flags += ' -fPIC'
         common_flags += ' ' + abi_info['cflags']
 
         toolchain_bin = os.path.join(toolchain_path, 'bin')
@@ -107,6 +107,9 @@ class AndroidNdkToolchain:
 
         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')
@@ -114,15 +117,11 @@ class AndroidNdkToolchain:
 
         self.cflags = common_flags
         self.cxxflags = common_flags
-        self.cppflags = '--sysroot=' + sysroot + \
-            ' -isystem ' + os.path.join(install_prefix, 'include') + \
-            ' -isystem ' + os.path.join(sysroot, 'usr', 'include', arch) + \
-            ' -D__ANDROID_API__=' + android_api_level
-        self.ldflags = '--sysroot=' + sysroot + \
-            ' -L' + os.path.join(install_prefix, 'lib') + \
-            ' -L' + os.path.join(target_root, 'usr', 'lib') + \
-            ' -B' + os.path.join(target_root, 'usr', 'lib') + \
+        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'
@@ -130,13 +129,16 @@ class AndroidNdkToolchain:
         self.is_aarch64 = ndk_arch == 'arm64'
         self.is_windows = False
 
-        libcxx_path = os.path.join(ndk_path, 'sources/cxx-stl/llvm-libc++')
-        libcxx_libs_path = os.path.join(libcxx_path, 'libs', android_abi)
-
         libstdcxx_flags = ''
-        libstdcxx_cxxflags = libstdcxx_flags + ' -isystem ' + os.path.join(libcxx_path, 'include') + ' -isystem ' + os.path.join(ndk_path, 'sources/android/support/include')
-        libstdcxx_ldflags = libstdcxx_flags + ' -L' + libcxx_libs_path
-        libstdcxx_libs = '-lc++_static -lc++abi'
+        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
@@ -166,6 +168,9 @@ thirdparty_libs = [
     opus,
     flac,
     libid3tag,
+    libmodplug,
+    wildmidi,
+    gme,
     ffmpeg,
     curl,
     libexpat,

android/meson.build

@@ -6,7 +6,7 @@ android_sdk = get_option('android_sdk')
 android_abi = get_option('android_abi')
 
 android_sdk_build_tools_version = '27.0.0'
-android_sdk_platform = 'android-21'
+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/src/Main.java

@@ -21,6 +21,7 @@ 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;
@@ -35,6 +36,9 @@ 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";
@@ -156,11 +160,36 @@ public class Main extends Service implements Runnable {
 		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;
-		mThread = new Thread(this);
-		mThread.start();
 
 		final Intent mainIntent = new Intent(this, Settings.class);
 		mainIntent.setAction("android.intent.action.MAIN");
@@ -168,13 +197,25 @@ public class Main extends Service implements Runnable {
 		final PendingIntent contentIntent = PendingIntent.getActivity(this, 0,
 				mainIntent, PendingIntent.FLAG_CANCEL_CURRENT);
 
-		Notification notification = new Notification.Builder(this)
-			.setContentTitle(getText(R.string.notification_title_mpd_running))
+		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));
 	}

android/src/Settings.java

@@ -21,10 +21,12 @@ 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;
@@ -103,12 +105,13 @@ public class Settings extends Activity {
 				else
 					mRunButton.setChecked(false);
 				mFirstRun = true;
+				mTextStatus.setText("");
 				break;
 			case MSG_STARTED:
 				Log.d(TAG, "onStarted");
 				mRunButton.setChecked(true);
 				mFirstRun = true;
-				mTextStatus.setText("CAUTION: this version is EXPERIMENTAL!"); // XXX
+				mTextStatus.setText("MPD service started");
 				break;
 			case MSG_LOG:
 				if (mLogListArray.size() > MAX_LOGS)
@@ -178,6 +181,14 @@ public class Settings extends Activity {
 
 	@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);
@@ -203,6 +214,31 @@ public class Settings extends Activity {
 		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() {
 

autogen.sh

@@ -1,11 +0,0 @@
-#!/bin/sh
-
-set -e
-
-rm -rf config.cache build
-mkdir build
-
-aclocal -I m4 $ACLOCAL_FLAGS
-autoheader
-automake --add-missing $AUTOMAKE_FLAGS
-autoconf

build/pkg-config.sh

@@ -1,5 +1,9 @@
 #!/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"`
 

doc/.gitignore

@@ -1,2 +0,0 @@
-/html/
-/doctrees/

doc/conf.py

@@ -38,9 +38,9 @@ author = 'Max Kellermann'
 # built documents.
 #
 # The short X.Y version.
-version = '0.21'
+version = '0.21.26'
 # The full version, including alpha/beta/rc tags.
-release = '0.21~git'
+release = version
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

doc/developer.rst

@@ -2,12 +2,12 @@ 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
@@ -18,7 +18,6 @@ Code Style
 * classes and functions names use CamelCase; variables are lower-case with words separated by underscore
 
 Some example code:
-~~~~~~~~~~~~~~~~~~
 
 .. code-block:: c
 
@@ -33,7 +32,7 @@ Some example code:
     }
 
 Hacking The Source
-==================
+******************
 
 MPD sources are managed in a git repository on
 `Github <https://github.com/MusicPlayerDaemon/>`_.
@@ -59,7 +58,7 @@ 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.
 
@@ -94,35 +93,7 @@ When the whole patch series is finished, convert stgit patches to git commits:
     stg commit
 
 Submitting Patches
-==================
+******************
 
-Send your patches to the mailing list:
-Email: `mpd-devel <mpd-devel@musicpd.org>`_
-
-:program:`git pull` requests are preferred.
-
-Development Tools
-=================
-
-Clang Static Analyzer
----------------------
-
- The `static analyzer <http://clang-analyzer.llvm.org/>`_ is a tool that helps find bugs. To run it on the MPD code base, install LLVM and clang. configure MPD to use clang:
-
-.. code-block:: sh
-
-    ./configure --enable-debug CXX=clang++ CC=clang ...
-
-It is recommended to use :code:`--enable-debug`, because the analyzer
-takes advantage of :dfn:`assert()` calls, which are only enabled in
-the debug build.
-
-Now run the analyzer:
-
-.. code-block:: sh
-
-    scan-build --use-c++=clang++ --use-cc=clang make
-
-The options :code:`--use-c++` and :code:`--use-cc` are necessary
-because it invokes :command:`cc` for actually compiling the sources by
-default. That breaks, because MPD requires a C99 compiler.
+Submit pull requests on GitHub:
+https://github.com/MusicPlayerDaemon/MPD/pulls

doc/include/tags.xml

@@ -1,165 +0,0 @@
-<?xml version='1.0' encoding="utf-8"?>
-<!DOCTYPE itemizedlist PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-                              "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-
-<itemizedlist>
-  <listitem>
-    <para>
-      <varname>artist</varname>: the artist name.  Its meaning is not
-      well-defined; see <varname>composer</varname> and
-      <varname>performer</varname> for more specific tags.
-    </para>
-  </listitem>
-
-  <listitem>
-    <para>
-      <varname>artistsort</varname>: same as
-      <varname>artist</varname>, but for sorting.  This usually omits
-      prefixes such as "The".
-    </para>
-  </listitem>
-
-  <listitem>
-    <para>
-      <varname>album</varname>: the album name.
-    </para>
-  </listitem>
-
-  <listitem>
-    <para>
-      <varname>albumsort</varname>: same as <varname>album</varname>,
-      but for sorting.
-    </para>
-  </listitem>
-
-  <listitem>
-    <para>
-      <varname>albumartist</varname>: on multi-artist albums, this is
-      the artist name which shall be used for the whole album.  The
-      exact meaning of this tag is not well-defined.
-    </para>
-  </listitem>
-
-  <listitem>
-    <para>
-      <varname>albumartistsort</varname>: same as
-      <varname>albumartist</varname>, but for sorting.
-    </para>
-  </listitem>
-
-  <listitem>
-    <para>
-      <varname>title</varname>: the song title.
-    </para>
-  </listitem>
-
-  <listitem>
-    <para>
-      <varname>track</varname>: the decimal track number within the
-      album.
-    </para>
-  </listitem>
-
-  <listitem>
-    <para>
-      <varname>name</varname>: a name for this song.  This is not the
-      song title.  The exact meaning of this tag is not well-defined.
-      It is often used by badly configured internet radio stations
-      with broken tags to squeeze both the artist name and the song
-      title in one tag.
-    </para>
-  </listitem>
-
-  <listitem>
-    <para>
-      <varname>genre</varname>: the music genre.
-    </para>
-  </listitem>
-
-  <listitem>
-    <para>
-      <varname>date</varname>: the song's release date.  This is
-      usually a 4-digit year.
-    </para>
-  </listitem>
-
-  <listitem>
-    <para>
-      <varname>composer</varname>: the artist who composed the song.
-    </para>
-  </listitem>
-
-  <listitem>
-    <para>
-      <varname>performer</varname>: the artist who performed the song.
-    </para>
-  </listitem>
-
-  <listitem>
-    <para>
-      <varname>comment</varname>: a human-readable comment about this
-      song.  The exact meaning of this tag is not well-defined.
-    </para>
-  </listitem>
-
-  <listitem>
-    <para>
-      <varname>disc</varname>: the decimal disc number in a multi-disc
-      album.
-    </para>
-  </listitem>
-
-  <listitem>
-    <para>
-      <varname>musicbrainz_artistid</varname>: the artist id in the
-      <ulink
-      url="https://picard.musicbrainz.org/docs/mappings/">MusicBrainz</ulink>
-      database.
-    </para>
-  </listitem>
-
-  <listitem>
-    <para>
-      <varname>musicbrainz_albumid</varname>: the album id in the
-      <ulink
-      url="https://picard.musicbrainz.org/docs/mappings/">MusicBrainz</ulink>
-      database.
-    </para>
-  </listitem>
-
-  <listitem>
-    <para>
-      <varname>musicbrainz_albumartistid</varname>: the album artist
-      id in the <ulink
-      url="https://picard.musicbrainz.org/docs/mappings/">MusicBrainz</ulink>
-      database.
-    </para>
-  </listitem>
-
-  <listitem>
-    <para>
-      <varname>musicbrainz_trackid</varname>: the track id in the
-      <ulink
-      url="https://picard.musicbrainz.org/docs/mappings/">MusicBrainz</ulink>
-      database.
-    </para>
-  </listitem>
-
-  <listitem>
-    <para>
-      <varname>musicbrainz_releasetrackid</varname>: the release track
-      id in the <ulink
-      url="https://picard.musicbrainz.org/docs/mappings/">MusicBrainz</ulink>
-      database.
-    </para>
-  </listitem>
-
-  <listitem>
-    <para>
-      <varname>musicbrainz_workid</varname>: the work id in the
-      <ulink
-      url="https://picard.musicbrainz.org/docs/mappings/">MusicBrainz</ulink>
-      database.
-    </para>
-  </listitem>
-</itemizedlist>

doc/mpd.conf.5

@@ -140,7 +140,6 @@ of database.
 .B auto_update_depth <N>
 Limit the depth of the directories being watched, 0 means only watch
 the music directory itself.  There is no limit by default.
-.TP
 .SH REQUIRED AUDIO OUTPUT PARAMETERS
 .TP
 .B type <type>
@@ -164,57 +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 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 FILES
 .TP
 .BI ~/.mpdconf

doc/mpdconf.example

@@ -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"
 #

doc/plugins.rst

@@ -4,10 +4,10 @@ Plugin reference
 .. _database_plugins:
 
 Database plugins
-----------------
+================
 
 simple
-~~~~~~
+------
 
 The default plugin. Stores a copy of the database in memory. A file is used for permanent storage.
 
@@ -25,7 +25,7 @@ The default plugin. Stores a copy of the database in memory. A file is used for
      - Compress the database file using gzip? Enabled by default (if built with zlib).
 
 proxy
-~~~~~
+-----
 
 Provides access to the database of another :program:`MPD` instance using libmpdclient. This is useful when you run mount the music directory via NFS/SMB, and the file server already runs a :program:`MPD` instance. Only the file server needs to update the database.
 
@@ -42,77 +42,94 @@ Provides access to the database of another :program:`MPD` instance using libmpdc
    * - **password**
      - The password used to log in to the "master" :program:`MPD` instance.
    * - **keepalive yes|no**
-     - Send TCP keepalive packets to the "master" :program:`MPD` instance? This option can help avoid certain firewalls dropping inactive connections, at the expensive of a very small amount of additional network traffic. Disabled by default.
+     - Send TCP keepalive packets to the "master" :program:`MPD` instance? This option can help avoid certain firewalls dropping inactive connections, at the expense of a very small amount of additional network traffic. Disabled by default.
 
 upnp
-~~~~
+----
 
 Provides access to UPnP media servers.
 
 Storage plugins
----------------
+===============
 
 local
-~~~~~
+-----
 
 The default plugin which gives :program:`MPD` access to local files. It is used when music_directory refers to a local directory.
 
 curl
-~~~~
+----
 
-A WebDAV client using libcurl. It is used when :code:`music_directory` contains a http:// or https:// URI, for example :samp:`https://the.server/dav/`.
+A WebDAV client using libcurl. It is used when :code:`music_directory`
+contains a ``http://`` or ``https://`` URI, for example
+:samp:`https://the.server/dav/`.
 
 smbclient
-~~~~~~~~~
+---------
 
-Load music files from a SMB/CIFS server. It is used when :code:`music_directory` contains a smb:// URI, for example :samp:`smb://myfileserver/Music`.
+Load music files from a SMB/CIFS server. It is used when
+:code:`music_directory` contains a ``smb://`` URI, for example
+:samp:`smb://myfileserver/Music`.
 
 nfs
-~~~
+---
 
-Load music files from a NFS server. It is used when :code:`music_directory` contains a nfs:// URI according to RFC2224, for example :samp:`nfs://servername/path`.
+Load music files from a NFS server.  It is used when
+:code:`music_directory` contains a ``nfs://`` URI according to
+RFC2224, for example :samp:`nfs://servername/path`.
 
-This plugin uses libnfs, which supports only NFS version 3. Since :program:`MPD` is not allowed to bind to "privileged ports", the NFS server needs to enable the "insecure" setting; example :file:`/etc/exports`:
-
-.. code-block:: none
-
-    /srv/mp3 192.168.1.55(ro,insecure)
-
-Don't fear: "insecure" does not mean that your NFS server is insecure. A few decades ago, people thought the concept of "privileged ports" would make network services "secure", which was a fallacy. The absence of this obsolete "security" measure means little.
+See :ref:`input_nfs` for more information.
 
 udisks
-~~~~~~
+------
 
 Mount file systems (e.g. USB sticks or other removable media) using
 the udisks2 daemon via D-Bus.  To obtain a valid udisks2 URI, consult
 :ref:`the according neighbor plugin <neighbor_plugin>`.
 
+It might be necessary to grant :program:`MPD` privileges to control
+:program:`udisks2` through :program:`policykit`.  To do this, create a
+file called :file:`/usr/share/polkit-1/rules.d/mpd-udisks.rules` with
+the following text::
+
+ polkit.addRule(function(action, subject) {
+   if ((action.id == "org.freedesktop.udisks2.filesystem-mount" ||
+        action.id == "org.freedesktop.udisks2.filesystem-mount-other-seat") &&
+       subject.user == "mpd") {
+       return polkit.Result.YES;
+   }
+ });
+
+If you run MPD as a different user, change ``mpd`` to the name of your
+MPD user.
+
 .. _neighbor_plugin:
 
 Neighbor plugins
-----------------
+================
 
 smbclient
-~~~~~~~~~
+---------
 
 Provides a list of SMB/CIFS servers on the local network.
 
 udisks
-~~~~~~
+------
+
 Queries the udisks2 daemon via D-Bus and obtain a list of file systems (e.g. USB sticks or other removable media).
 
 upnp
-~~~~
+----
 
 Provides a list of UPnP servers on the local network.
 
 .. _input_plugins:
 
 Input plugins
--------------
+=============
 
 alsa
-~~~~
+----
 
 Allows :program:`MPD` on Linux to play audio directly from a soundcard using the scheme alsa://. Audio is formatted as 44.1 kHz 16-bit stereo (CD format). Examples:
 
@@ -125,7 +142,7 @@ Allows :program:`MPD` on Linux to play audio directly from a soundcard using the
     mpc add alsa://hw:1,0 plays audio from device hw:1,0 cdio_paranoia
 
 cdio_paranoia
-~~~~~~~~~~~~~
+-------------
 
 Plays audio CDs using libcdio. The URI has the form: "cdda://[DEVICE][/TRACK]". The simplest form cdda:// plays the whole disc in the default drive.
 
@@ -141,11 +158,14 @@ Plays audio CDs using libcdio. The URI has the form: "cdda://[DEVICE][/TRACK]".
      - Request CDParanoia cap the extraction speed to Nx normal CD audio rotation speed, keeping the drive quiet.
 
 curl
-~~~~
+----
 
 Opens remote files or streams over HTTP using libcurl.
 
-Note that unless overridden by the below settings (e.g. by setting them to a blank value), general curl configuration from environment variables such as http_proxy or specified in :file:`~/.curlrc` will be in effect.
+Note that unless overridden by the below settings (e.g. by setting
+them to a blank value), general curl configuration from environment
+variables such as ``http_proxy`` or specified in :file:`~/.curlrc`
+will be in effect.
 
 .. list-table::
    :widths: 20 80
@@ -163,44 +183,67 @@ Note that unless overridden by the below settings (e.g. by setting them to a bla
      - Verify the certificate's name against host? `More information <http://curl.haxx.se/libcurl/c/CURLOPT_SSL_VERIFYHOST.html>`_.
 
 ffmpeg
-~~~~~~
+------
 
-Access to various network protocols implemented by the FFmpeg library: gopher://, rtp://, rtsp://, rtmp://, rtmpt://, rtmps://
+Access to various network protocols implemented by the FFmpeg library:
+``gopher://``, ``rtp://``, ``rtsp://``, ``rtmp://``, ``rtmpt://``,
+``rtmps://``
 
 file
-~~~~
+----
 
 Opens local files
 
 mms
-~~~
+---
 
 Plays streams with the MMS protocol using `libmms <https://launchpad.net/libmms>`_.
 
-nfs
-~~~
+.. _input_nfs:
 
-Allows :program:`MPD` to access files on NFSv3 servers without actually mounting them (i.e. in userspace, without help from the kernel's VFS layer). All URIs with the nfs:// scheme are used according to RFC2224. Example:
+nfs
+---
+
+Allows :program:`MPD` to access files on NFS servers without actually
+mounting them (i.e. with :program:`libnfs` in userspace, without help
+from the kernel's VFS layer). All URIs with the ``nfs://`` scheme are
+used according to RFC2224. Example:
 
 .. code-block:: none
 
      mpc add nfs://servername/path/filename.ogg
 
-Note that this usually requires enabling the "insecure" flag in the server's /etc/exports file, because :program:`MPD` cannot bind to so-called "privileged" ports. Don't fear: this will not make your file server insecure; the flag was named in a time long ago when privileged ports were thought to be meaningful for security. By today's standards, NFSv3 is not secure at all, and if you believe it is, you're already doomed.
+This plugin uses :program:`libnfs`, which supports only NFS version 3.
+Since :program:`MPD` is not allowed to bind to so-called "privileged
+ports", the NFS server needs to enable the ``insecure`` setting;
+example :file:`/etc/exports`:
+
+.. code-block:: none
+
+    /srv/mp3 192.168.1.55(ro,insecure)
+
+Don't fear: this will not make your file server insecure; the flag was
+named a time long ago when privileged ports were thought to be
+meaningful for security. By today's standards, NFSv3 is not secure at
+all, and if you believe it is, you're already doomed.
 
 smbclient
-~~~~~~~~~
+---------
 
-Allows :program:`MPD` to access files on SMB/CIFS servers (e.g. Samba or Microsoft Windows). All URIs with the smb:// scheme are used. Example:
+Allows :program:`MPD` to access files on SMB/CIFS servers (e.g. Samba
+or Microsoft Windows). All URIs with the ``smb://`` scheme are
+used.  Example:
 
 .. code-block:: none
 
     mpc add smb://servername/sharename/filename.ogg
+    mpc add smb://username:password@servername/sharename/filename.ogg
 
 qobuz
-~~~~~
+-----
 
-Play songs from the commercial streaming service Qobuz. It plays URLs in the form qobuz://track/ID, e.g.:
+Play songs from the commercial streaming service Qobuz. It plays URLs
+in the form ``qobuz://track/ID``, e.g.:
 
 .. code-block:: none
 
@@ -224,9 +267,16 @@ Play songs from the commercial streaming service Qobuz. It plays URLs in the for
      - The `Qobuz format identifier <https://github.com/Qobuz/api-documentation/blob/master/endpoints/track/getFileUrl.md#parameters>`_, i.e. a number which chooses the format and quality to be requested from Qobuz. The default is "5" (320 kbit/s MP3).
 
 tidal
-~~~~~
+-----
 
-Play songs from the commercial streaming service `Tidal <http://tidal.com/>`_. It plays URLs in the form tidal://track/ID, e.g.:
+Play songs from the commercial streaming service `Tidal
+<http://tidal.com/>`_. It plays URLs in the form ``tidal://track/ID``,
+e.g.:
+
+.. warning::
+
+   This plugin is currently defunct because Tidal has changed the
+   protocol and decided not to share documentation.
 
 .. code-block:: none
 
@@ -250,10 +300,10 @@ Play songs from the commercial streaming service `Tidal <http://tidal.com/>`_. I
 .. _decoder_plugins:
      
 Decoder plugins
----------------
+===============
 
 adplug
-~~~~~~
+------
 
 Decodes AdLib files using libadplug.
 
@@ -267,17 +317,17 @@ Decodes AdLib files using libadplug.
      - The sample rate that shall be synthesized by the plugin. Defaults to 48000.
 
 audiofile
-~~~~~~~~~
+---------
 
 Decodes WAV and AIFF files using libaudiofile.
 
 faad
-~~~~
+----
 
 Decodes AAC files using libfaad.
 
 ffmpeg
-~~~~~~
+------
 
 Decodes various codecs using FFmpeg.
 
@@ -293,12 +343,12 @@ Decodes various codecs using FFmpeg.
      - Sets the FFmpeg muxer option probesize, which specifies probing size in bytes, i.e. the size of the data to analyze to get stream information. The `FFmpeg formats documentation <https://ffmpeg.org/ffmpeg-formats.html>`_ has more information.
 
 flac
-~~~~
+----
 
 Decodes FLAC files using libFLAC.
 
 dsdiff
-~~~~~~
+------
 
 Decodes DFF files containing DSDIFF data (e.g. SACD rips).
 
@@ -312,12 +362,12 @@ Decodes DFF files containing DSDIFF data (e.g. SACD rips).
      - Decode the least significant bit first. Default is no.
 
 dsf
-~~~
+---
 
 Decodes DSF files containing DSDIFF data (e.g. SACD rips).
 
 fluidsynth
-~~~~~~~~~~
+----------
 
 MIDI decoder based on `FluidSynth <http://www.fluidsynth.org/>`_.
 
@@ -333,7 +383,7 @@ MIDI decoder based on `FluidSynth <http://www.fluidsynth.org/>`_.
      - The absolute path of the soundfont file. Defaults to :file:`/usr/share/sounds/sf2/FluidR3_GM.sf2`.
 
 gme
-~~~
+---
 
 Video game music file emulator based on `game-music-emu <https://bitbucket.org/mpyne/game-music-emu/wiki/Home>`_.
 
@@ -347,7 +397,7 @@ Video game music file emulator based on `game-music-emu <https://bitbucket.org/m
      - Enable more accurate sound emulation.
 
 hybrid_dsd
-~~~~~~~~~~
+----------
 
 `Hybrid-DSD
 <http://dsdmaster.blogspot.de/p/bitperfect-introduces-hybrid-dsd-file.html>`_
@@ -370,12 +420,12 @@ of the file is better.
      - 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 <http://www.willwap.co.uk/Programs/vbrfix.php>`_ instead of disabling gapless MP3 playback. The default is to support gapless MP3 playback.
 
 mad
-~~~
+---
 
 Decodes MP3 files using `libmad <http://www.underbit.com/products/mad/>`_.
 
 mikmod
-~~~~~~
+------
 
 Module player based on `MikMod <http://mikmod.sourceforge.net/>`_.
 
@@ -391,7 +441,7 @@ Module player based on `MikMod <http://mikmod.sourceforge.net/>`_.
      - Sets the sample rate generated by libmikmod. Default is 44100.
 
 modplug
-~~~~~~~
+-------
 
 Module player based on MODPlug.
 
@@ -405,27 +455,27 @@ Module player based on MODPlug.
      - Number of times to loop the module if it uses backward loops. Default is 0 which prevents looping. -1 loops forever.
 
 mpcdec
-~~~~~~
+------
 
 Decodes Musepack files using `libmpcdec <http://www.musepack.net/>`_.
 
 mpg123
-~~~~~~
+------
 
 Decodes MP3 files using `libmpg123 <http://www.mpg123.de/>`_.
 
 opus
-~~~~
+----
 
 Decodes Opus files using `libopus <http://www.opus-codec.org/>`_.
 
 pcm
-~~~
+---
 
 Read raw PCM samples. It understands the "audio/L16" MIME type with parameters "rate" and "channels" according to RFC 2586. It also understands the MPD-specific MIME type "audio/x-mpd-float".
 
 sidplay
-~~~~~~~
+-------
 
 C64 SID decoder based on `libsidplayfp <https://sourceforge.net/projects/sidplay-residfp/>`_ or `libsidplay2 <https://sourceforge.net/projects/sidplay2/>`_.
 
@@ -447,23 +497,23 @@ C64 SID decoder based on `libsidplayfp <https://sourceforge.net/projects/sidplay
      - Only libsidplayfp. Absolute path to basic rom image file.
 
 sndfile
-~~~~~~~
+-------
 
 Decodes WAV and AIFF files using `libsndfile <http://www.mega-nerd.com/libsndfile/>`_.
 
 
 vorbis
-~~~~~~
+------
 
 Decodes Ogg-Vorbis files using `libvorbis <http://www.xiph.org/ogg/vorbis/>`_.
 
 wavpack
-~~~~~~~
+-------
 
 Decodes WavPack files using `libwavpack <http://www.wavpack.com/>`_.
 
 wildmidi
-~~~~~~~~
+--------
 
 MIDI decoder based on `libwildmidi <http://www.mindwerks.net/projects/wildmidi/>`_.
 
@@ -479,10 +529,11 @@ MIDI decoder based on `libwildmidi <http://www.mindwerks.net/projects/wildmidi/>
 .. _encoder_plugins:
      
 Encoder plugins
----------------
+===============
 
 flac
-~~~~
+----
+
 Encodes into `FLAC <https://xiph.org/flac/>`_ (lossless).
 
 .. list-table::
@@ -495,7 +546,7 @@ Encodes into `FLAC <https://xiph.org/flac/>`_ (lossless).
      - Sets the libFLAC compression level. The levels range from 0 (fastest, least compression) to 8 (slowest, most compression).
 
 lame
-~~~~
+----
 
 Encodes into MP3 using the `LAME <http://lame.sourceforge.net/>`_ library.
 
@@ -511,12 +562,12 @@ Encodes into MP3 using the `LAME <http://lame.sourceforge.net/>`_ library.
      - Sets the bit rate in kilobit per second. Cannot be used with quality.
 
 null
-~~~~
+----
 
 Does not encode anything, passes the input PCM data as-is.
 
 shine
-~~~~~
+-----
 
 Encodes into MP3 using the `Shine <https://github.com/savonet/shine>`_ library.
 
@@ -530,7 +581,7 @@ Encodes into MP3 using the `Shine <https://github.com/savonet/shine>`_ library.
      - Sets the bit rate in kilobit per second.
 
 twolame
-~~~~~~~
+-------
 
 Encodes into MP2 using the `TwoLAME <http://www.twolame.org/>`_ library.
 
@@ -546,7 +597,7 @@ Encodes into MP2 using the `TwoLAME <http://www.twolame.org/>`_ library.
      - Sets the bit rate in kilobit per second. Cannot be used with quality.
 
 opus
-~~~~
+----
 
 Encodes into `Ogg Opus <http://www.opus-codec.org/>`_.
 
@@ -568,7 +619,7 @@ Encodes into `Ogg Opus <http://www.opus-codec.org/>`_.
 .. _vorbis_plugin:
 
 vorbis
-~~~~~~
+------
 
 Encodes into `Ogg Vorbis <http://www.vorbis.com/>`_.
 
@@ -584,13 +635,13 @@ Encodes into `Ogg Vorbis <http://www.vorbis.com/>`_.
      - Sets the bit rate in kilobit per second. Cannot be used with quality.
 
 wave
-~~~~
+----
 Encodes into WAV (lossless).
 
 .. _resampler_plugins:
 
 Resampler plugins
------------------
+=================
 
 The resampler can be configured in a block named resampler, for example:
 
@@ -613,12 +664,12 @@ The following table lists the resampler options valid for all plugins:
      - The name of the plugin.
 
 internal
-~~~~~~~~
+--------
 
 A resampler built into :program:`MPD`. Its quality is very poor, but its CPU usage is low. This is the fallback if :program:`MPD` was compiled without an external resampler.
 
 libsamplerate
-~~~~~~~~~~~~~
+-------------
 
 A resampler using `libsamplerate <http://www.mega-nerd.com/SRC/>`_ a.k.a. Secret Rabbit Code (SRC).
 
@@ -651,7 +702,7 @@ The following converter types are provided by libsamplerate:
      - Linear interpolator, very fast, poor quality.
 
 soxr
-~~~~
+----
 
 A resampler using `libsoxr <http://sourceforge.net/projects/soxr/>`_, the SoX Resampler library
 
@@ -674,13 +725,15 @@ Valid quality values for libsoxr:
 * "low"
 * "quick"
 
+.. _output_plugins:
+
 Output plugins
---------------
+==============
 
 .. _alsa_plugin:
 
 alsa
-~~~~
+----
 
 The `Advanced Linux Sound Architecture (ALSA) <http://www.alsa-project.org/>`_ plugin uses libasound. It is recommended if you are using Linux.
 
@@ -739,7 +792,7 @@ The following attributes can be configured at runtime using the outputset comman
 
 
 ao
-~~
+--
 The ao plugin uses the portable `libao <https://www.xiph.org/ao/>`_ library. Use only if there is no native plugin for your operating system.
 
 .. list-table::
@@ -756,7 +809,8 @@ The ao plugin uses the portable `libao <https://www.xiph.org/ao/>`_ library. Use
      - 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.
 
 sndio
-~~~~~
+-----
+
 The sndio plugin uses the `sndio <http://www.sndio.org/>`_ library. It should normally be used on OpenBSD.
 
 .. list-table::
@@ -771,7 +825,7 @@ The sndio plugin uses the `sndio <http://www.sndio.org/>`_ library. It should no
      - Set the application buffer time in milliseconds.
 
 fifo
-~~~~
+----
 
 The fifo plugin writes raw PCM data to a FIFO (First In, First Out) file. The data can be read by another program.
 
@@ -784,8 +838,18 @@ The fifo plugin writes raw PCM data to a FIFO (First In, First Out) file. The da
    * - **path P**
      - This specifies the path of the FIFO to write 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 not 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.
 
+haiku
+-----
+
+Use the SoundPlayer API on the Haiku operating system.
+
+This plugin is unmaintained and contains known bugs.  It will be
+removed soon, unless there is a new maintainer.
+
+
 jack
-~~~~
+----
+
 The jack plugin connects to a `JACK server <http://jackaudio.org/>`_.
 
 .. list-table::
@@ -808,7 +872,8 @@ The jack plugin connects to a `JACK server <http://jackaudio.org/>`_.
      - Sets the size of the ring buffer for each channel. Do not configure this value unless you know what you're doing.
 
 httpd
-~~~~~
+-----
+
 The httpd plugin creates a HTTP server, similar to `ShoutCast <http://www.shoutcast.com/>`_ / `IceCast <http://icecast.org/>`_. HTTP streaming clients like mplayer, VLC, and mpv can connect to it.
 
 It is highly recommended to configure a fixed format, because a stream cannot switch its audio format on-the-fly when the song changes.
@@ -822,14 +887,15 @@ It is highly recommended to configure a fixed format, because a stream cannot sw
    * - **port P**
      - Binds the HTTP server to the specified port.
    * - **bind_to_address ADDR**
-     - Binds the HTTP server to the specified address (IPv4, IPv6 or UNIX socket). Multiple addresses in parallel are not supported.
+     - Binds the HTTP server to the specified address (IPv4, IPv6 or local socket). Multiple addresses in parallel are not supported.
    * - **encoder NAME**
      - Chooses an encoder plugin. A list of encoder plugins can be found in the encoder plugin reference :ref:`encoder_plugins`.
    * - **max_clients MC**
      - Sets a limit, number of concurrent clients. When set to 0 no limit will apply.
 
 null
-~~~~
+----
+
 The null plugin does nothing. It discards everything sent to it.
 
 .. list-table::
@@ -844,7 +910,8 @@ The null plugin does nothing. It discards everything sent to it.
 .. _oss_plugin:
 
 oss
-~~~
+---
+
 The "Open Sound System" plugin is supported on most Unix platforms.
 
 On Linux, OSS has been superseded by ALSA. Use the ALSA output plugin :ref:`alsa_plugin` instead of this one on Linux.
@@ -872,7 +939,7 @@ The according hardware mixer plugin understands the following settings:
      - Choose a mixer control, defaulting to PCM.
 
 openal
-~~~~~~
+------
 The "OpenAL" plugin uses `libopenal <http://kcat.strangesoft.net/openal.html>`_. It is supported on many platforms. Use only if there is no native plugin for your operating system.
 
 .. list-table::
@@ -885,7 +952,7 @@ The "OpenAL" plugin uses `libopenal <http://kcat.strangesoft.net/openal.html>`_.
      - Sets the device which should be used. This can be any valid OpenAL device name. If not specified, then libopenal will choose a default device.
 
 osx
-~~~
+---
 The "Mac OS X" plugin uses Apple's CoreAudio API.
 
 .. list-table::
@@ -906,7 +973,7 @@ The "Mac OS X" plugin uses Apple's CoreAudio API.
        The channel map may not refer to outputs that do not exist according to the format. If the format is "*:*:1" (mono) and you have a four-channel sound card then "-1,-1,0,0" (dual mono output on the second pair of sound card outputs) is a valid channel map but "-1,-1,0,1" is not because the second channel ('1') does not exist when the output is mono.
 
 pipe
-~~~~
+----
 
 The pipe plugin starts a program and writes raw PCM data into its standard input.
 
@@ -922,7 +989,7 @@ The pipe plugin starts a program and writes raw PCM data into its standard input
 .. _pulse_plugin:
 
 pulse
-~~~~~
+-----
 The pulse plugin connects to a `PulseAudio <http://www.freedesktop.org/wiki/Software/PulseAudio/>`_ server. Requires libpulse.
 
 .. list-table::
@@ -935,9 +1002,11 @@ The pulse plugin connects to a `PulseAudio <http://www.freedesktop.org/wiki/Soft
      - Sets the host name of the PulseAudio server. By default, :program:`MPD` connects to the local PulseAudio server.
    * - **sink NAME**
      - Specifies the name of the PulseAudio sink :program:`MPD` should play on.
+   * - **scale_volume FACTOR**
+     - Specifies a linear scaling coefficient (ranging from 0.5 to 5.0) to apply when adjusting volume through :program:`MPD`.  For example, chosing a factor equal to ``"0.7"`` means that setting the volume to 100 in :program:`MPD` will set the PulseAudio volume to 70%, and a factor equal to ``"3.5"`` means that volume 100 in :program:`MPD` corresponds to a 350% PulseAudio volume.
 
 recorder
-~~~~~~~~
+--------
 The recorder plugin writes the audio played by :program:`MPD` to a file. This may be useful for recording radio streams.
 
 .. list-table::
@@ -949,13 +1018,13 @@ The recorder plugin writes the audio played by :program:`MPD` to a file. This ma
    * - **path P**
      - Write to this file.
    * - **format_path P**
-     - An alternative to path which provides a format string referring to tag values. The special tag iso8601 emits the current date and time in `ISO8601 <https://en.wikipedia.org/wiki/ISO_8601>`_ format (UTC). Every time a new song starts or a new tag gets received from a radio station, a new file is opened. If the format does not render a file name, nothing is recorded. A tag name enclosed in percent signs ('%') is replaced with the tag value. Example: :file:`~/.mpd/recorder/%artist% - %title%.ogg`. Square brackets can be used to group a substring. If none of the tags referred in the group can be found, the whole group is omitted. Example: [~/.mpd/recorder/[%artist% - ]%title%.ogg] (this omits the dash when no artist tag exists; if title also doesn't exist, no file is written). The operators "|" (logical "or") and "&" (logical "and") can be used to select portions of the format string depending on the existing tag values. Example: ~/.mpd/recorder/[%title%|%name%].ogg (use the "name" tag if no title exists)
+     - An alternative to path which provides a format string referring to tag values. The special tag iso8601 emits the current date and time in `ISO8601 <https://en.wikipedia.org/wiki/ISO_8601>`_ format (UTC). Every time a new song starts or a new tag gets received from a radio station, a new file is opened. If the format does not render a file name, nothing is recorded. A tag name enclosed in percent signs ('%') is replaced with the tag value. Example: :file:`-/.mpd/recorder/%artist% - %title%.ogg`. Square brackets can be used to group a substring. If none of the tags referred in the group can be found, the whole group is omitted. Example: [-/.mpd/recorder/[%artist% - ]%title%.ogg] (this omits the dash when no artist tag exists; if title also doesn't exist, no file is written). The operators "|" (logical "or") and "&" (logical "and") can be used to select portions of the format string depending on the existing tag values. Example: -/.mpd/recorder/[%title%|%name%].ogg (use the "name" tag if no title exists)
    * - **encoder NAME**
      - Chooses an encoder plugin. A list of encoder plugins can be found in the encoder plugin reference :ref:`encoder_plugins`.
 
 
 shout
-~~~~~
+-----
 The shout plugin connects to a ShoutCast or IceCast server using libshout. It forwards tags to this server.
 
 You must set a format.
@@ -974,6 +1043,8 @@ You must set a format.
      - Set the timeout for the shout connection in seconds. Defaults to 2 seconds.
    * - **protocol icecast2|icecast1|shoutcast**
      - Specifies the protocol that wil be used to connect to the server. The default is "icecast2".
+   * - **tls disabled|auto|auto_no_plain|rfc2818|rfc2817**
+     - Specifies what kind of TLS to use. The default is "disabled" (no TLS).
    * - **mount URI**
      - Mounts the :program:`MPD` stream in the specified URI.
    * - **user USERNAME**
@@ -997,15 +1068,16 @@ You must set a format.
 .. _sles_output:
 
 sles
-~~~~
+----
 
 Plugin using the `OpenSL ES <https://www.khronos.org/opensles/>`__
 audio API.  Its primary use is local playback on Android, where
-:ref:`ALSA <alsa_plugin>` is not available.
+:ref:`ALSA <alsa_plugin>` is not available.  It supports 16 bit and
+floating point samples.
 
 
 solaris
-~~~~~~~
+-------
 The "Solaris" plugin runs only on SUN Solaris, and plays via /dev/audio.
 
 .. list-table::
@@ -1017,46 +1089,80 @@ The "Solaris" plugin runs only on SUN Solaris, and plays via /dev/audio.
    * - **device PATH**
      - Sets the path of the audio device, defaults to /dev/audio.
 
+
+.. _filter_plugins:
+
+Filter plugins
+==============
+
+normalize
+---------
+
+Normalize the volume during playback (at the expense of quality).
+
+
+null
+----
+
+A no-op filter.  Audio data is returned as-is.
+
+
+route
+-----
+
+Reroute channels.
+
+.. list-table::
+   :widths: 20 80
+   :header-rows: 1
+
+   * - Setting
+     - Description
+   * - **routes "0>0, 1>1, ..."**
+     - Specifies the channel mapping.
+
+
 .. _playlist_plugins:
 
 Playlist plugins
-----------------
+================
 
 asx
-~~~
+---
 
 Reads .asx playlist files.
 
 cue
-~~~
+---
 Reads .cue files.
 
 embcue
-~~~~~~
+------
 Reads CUE sheets from the "CUESHEET" tag of song files.
 
 m3u
-~~~
+---
 Reads .m3u playlist files.
 
 extm3u
-~~~~~~
+------
 Reads extended .m3u playlist files.
 
 flac
-~~~~
+----
 Reads the cuesheet metablock from a FLAC file.
 
 pls
-~~~
+---
 Reads .pls playlist files.
 
 rss
-~~~
+---
 Reads music links from .rss files.
 
 soundcloud
-~~~~~~~~~~
+----------
+
 Download playlist from SoundCloud. It accepts URIs starting with soundcloud://.
 
 .. list-table::
@@ -1069,5 +1175,5 @@ Download playlist from SoundCloud. It accepts URIs starting with soundcloud://.
      - An API key to access the SoundCloud servers.
 
 xspf
-~~~~
+----
 Reads XSPF playlist files. 

doc/protocol.rst

@@ -8,12 +8,15 @@ General protocol syntax
 Protocol overview
 =================
 
-The ``MPD`` command protocol exchanges
+The :program:`MPD` command protocol exchanges
 line-based text records between client and server over TCP.
 Once the client is connected to the server, they conduct a
 conversation until the client closes the connection. The
 conversation flow is always initiated by the client.
 
+All data between the client and the server is encoded in
+UTF-8.
+
 The client transmits a command sequence, terminated by the
 newline character ``\n``.  The server will
 respond with one or more lines, the last of which will be a
@@ -42,9 +45,6 @@ quotation marks.
 Argument strings are separated from the command and any other
 arguments by linear white-space (' ' or '\\t').
 
-All data between the client and the server is encoded in
-UTF-8.
-
 Responses
 =========
 
@@ -52,6 +52,28 @@ A command returns ``OK`` on completion or
 ``ACK some error`` on failure.  These
 denote the end of command execution.
 
+Some commands return more data before the response ends with ``OK``.
+Each line is usually in the form ``NAME: VALUE``.  Example::
+
+  foo: bar
+  OK
+
+.. _binary:
+
+Binary Responses
+----------------
+
+Some commands can return binary data.  This is initiated by a line
+containing ``binary: 1234`` (followed as usual by a newline).  After
+that, the specified number of bytes of binary data follows, then a
+newline, and finally the ``OK`` line.  Example::
+
+  foo: bar
+  binary: 42
+  <42 bytes>
+  OK
+
+
 Failure responses
 -----------------
 
@@ -112,9 +134,9 @@ list begins with `command_list_begin` or
 `command_list_ok_begin` and ends with
 `command_list_end`.
 
-It does not execute any commands until the list has ended.
-The return value is whatever the return for a list of commands
-is.  On success for all commands,
+It does not execute any commands until the list has ended.  The
+response is a concatentation of all individual responses.
+On success for all commands,
 ``OK`` is returned.  If a command
 fails, no more commands are executed and the appropriate
 ``ACK`` error is returned. If
@@ -144,18 +166,28 @@ syntax::
 ``EXPRESSION`` is a string enclosed in parantheses which can be one
 of:
 
-- ``(TAG == 'VALUE')``: match a tag value.
-  ``(TAG != 'VALUE')``: mismatch a tag value.
-  The special tag "*any*" checks all
-  tag values.
-  *albumartist* looks for
+- ``(TAG == 'VALUE')``: match a tag value; if there are multiple
+  values of the given type, at least one must match.
+  ``(TAG != 'VALUE')``: mismatch a tag value; if there are multiple
+  values of the given type, none of them must match.
+  The special tag ``any`` checks all
+  tag types.
+  ``AlbumArtist`` looks for
   ``VALUE`` in ``AlbumArtist``
   and falls back to ``Artist`` tags if
   ``AlbumArtist`` does not exist.
-  ``VALUE`` is what to find.  The
-  `find` commands specify an exact value
-  and are case-sensitive; the `search`
-  commands specify a sub string and ignore case.
+  ``VALUE`` is what to find.
+  An empty value string means: match only if the given tag type does
+  not exist at all; this implies that negation with an empty value
+  checks for the existence of the given tag type.
+
+- ``(TAG contains 'VALUE')`` checks if the given value is a substring
+  of the tag value.
+
+- ``(TAG =~ 'VALUE')`` and ``(TAG !~ 'VALUE')`` use a Perl-compatible
+  regular expression instead of doing a simple string comparison.
+  (This feature is only available if :program:`MPD` was compiled with
+  :file:`libpcre`)
 
 - ``(file == 'VALUE')``: match the full song URI
   (relative to the music directory).
@@ -168,29 +200,66 @@ of:
   file's time stamp with the given value (ISO 8601 or UNIX
   time stamp).
 
-- ``(AudioFormat == 'SAMPLERATE:BITS:CHANNELS')``:
-  compares the audio format with the given value.
+- ``(AudioFormat == 'SAMPLERATE:BITS:CHANNELS')``: compares the audio
+  format with the given value.  See :ref:`audio_output_format` for a
+  detailed explanation.
 
 - ``(AudioFormat =~ 'SAMPLERATE:BITS:CHANNELS')``:
   matches the audio format with the given mask (i.e. one
-  or more attributes may be "*").
+  or more attributes may be ``*``).
 
-- ``(!EXPRESSION)``: negate an expression.
+- ``(!EXPRESSION)``: negate an expression.  Note that each expression
+  must be enclosed in parantheses, e.g. :code:`(!(artist == 'VALUE'))`
+  (which is equivalent to :code:`(artist != 'VALUE')`)
 
 - ``(EXPRESSION1 AND EXPRESSION2 ...)``: combine two or
-  more expressions with logical "and".
+  more expressions with logical "and".  Note that each expression must
+  be enclosed in parantheses, e.g. :code:`((artist == 'FOO') AND
+  (album == 'BAR'))`
+
+The :command:`find` commands are case sensitive, which
+:command:`search` and related commands ignore case.
 
 Prior to MPD 0.21, the syntax looked like this::
 
  find TYPE VALUE
 
+Escaping String Values
+----------------------
+
+String values are quoted with single or double quotes, and special
+characters within those values must be escaped with the backslash
+(``\``).  Keep in mind that the backslash is also the escape character
+on the protocol level, which means you may need to use double
+backslash.
+
+Example expression which matches an artist named ``foo'bar"``::
+
+ (Artist == "foo\'bar\"")
+
+At the protocol level, the command must look like this::
+
+ find "(Artist == \"foo\\'bar\\\"\")"
+
+The double quotes enclosing the artist name must be escaped because
+they are inside a double-quoted ``find`` parameter.  The single quote
+inside that artist name must be escaped with two backslashes; one to
+escape the single quote, and another one because the backslash inside
+the string inside the parameter needs to be escaped as well.  The
+double quote has three confusing backslashes: two to build one
+backslash, and another one to escape the double quote on the protocol
+level.  Phew!
+
+To reduce confusion, you should use a library such as `libmpdclient
+<https://www.musicpd.org/libs/libmpdclient/>`_ which escapes command
+arguments for you.
+
 .. _tags:
 
 Tags
 ====
 
-The following tags are supported by
-``MPD``:
+The following tags are supported by :program:`MPD`:
 
 * **artist**: the artist name. Its meaning is not well-defined; see "*composer*" and "*performer*" for more specific tags.
 * **artistsort**: same as artist, but for sorting. This usually omits prefixes such as "The".
@@ -216,7 +285,7 @@ The following tags are supported by
 * **musicbrainz_workid**: the work id in the `MusicBrainz <https://picard.musicbrainz.org/docs/mappings/>`_ database.
 
 There can be multiple values for some of these tags.  For
-example, ``MPD`` may return multiple
+example, :program:`MPD` may return multiple
 lines with a ``performer`` tag.  A tag value is
 a UTF-8 string.
 
@@ -259,16 +328,17 @@ Recipes
 Queuing
 =======
 
-Often, users run ``MPD`` with :ref:`random <command_random>` enabled,
-but want to be able to insert songs "before" the rest of the playlist.
-That is commonly called "queuing".
+Often, users run :program:`MPD` with :ref:`random <command_random>`
+enabled, but want to be able to insert songs "before" the rest of the
+playlist.  That is commonly called "queuing".
 
-``MPD`` implements this by allowing the client to specify a "priority"
-for each song in the playlist (commands :ref:`priod <command_prio>`
-and :ref:`priodid <command_prioid>`).  A higher priority means that
-the song is going to be played before the other songs.
+:program:`MPD` implements this by allowing the client to specify a
+"priority" for each song in the playlist (commands :ref:`priod
+<command_prio>` and :ref:`priodid <command_prioid>`).  A higher
+priority means that the song is going to be played before the other
+songs.
 
-In "random" mode, ``MPD`` maintains an
+In "random" mode, :program:`MPD` maintains an
 internal randomized sequence of songs.  In this sequence,
 songs with a higher priority come first, and all songs with
 the same priority are shuffled (by default, all songs are
@@ -293,9 +363,9 @@ Command reference
    commands using song ids should be used instead of the commands
    that manipulate and control playback based on playlist
    position. Using song ids is a safer method when multiple
-   clients are interacting with ``MPD``.
+   clients are interacting with :program:`MPD`.
 
-Querying ``MPD``'s status
+Querying :program:`MPD`'s status
 ================================
 
 :command:`clearerror`
@@ -310,7 +380,7 @@ Querying ``MPD``'s status
 
 :command:`idle [SUBSYSTEMS...]` [#since_0_14]_
     Waits until there is a noteworthy change in one or more
-    of ``MPD``'s subsystems.  As soon
+    of :program:`MPD`'s subsystems.  As soon
     as there is one, it lists all changed systems in a line
     in the format ``changed:
     SUBSYSTEM``, where SUBSYSTEM is one of the
@@ -319,7 +389,7 @@ Querying ``MPD``'s status
     - ``database``: the song database has been modified after :ref:`update <command_update>`.
     - ``update``: a database update has started or finished.  If the database was modified during the update, the ``database`` event is also emitted.
     - ``stored_playlist``: a stored playlist has been modified, renamed, created or deleted
-    - ``playlist``: the current playlist has been modified
+    - ``playlist``: the queue (i.e. the current playlist) has been modified
     - ``player``: the player has been started, stopped or seeked
     - ``mixer``: the volume has been changed
     - ``output``: an audio output has been added, removed or modified (e.g. renamed, enabled or disabled)
@@ -340,11 +410,11 @@ Querying ``MPD``'s status
     to wait for events as long as mpd runs.  The
     `idle` command can be canceled by
     sending the command `noidle` (no other
-    commands are allowed). ``MPD``
+    commands are allowed). :program:`MPD`
     will then leave `idle` mode and print
     results immediately; might be empty at this time.
     If the optional ``SUBSYSTEMS`` argument
-    is used, ``MPD`` will only send
+    is used, :program:`MPD` will only send
     notifications when something changed in one of the
     specified subsytems.
 
@@ -354,29 +424,38 @@ Querying ``MPD``'s status
     Reports the current status of the player and the volume
     level.
 
-    - ``volume``: ``0-100`` or ``-1`` if the volume cannot be determined
+    - ``volume``: ``0-100`` (deprecated: ``-1`` if the volume cannot
+      be determined)
     - ``repeat``: ``0`` or ``1``
     - ``random``: ``0`` or ``1``
     - ``single`` [#since_0_15]_: ``0``, ``1``, or ``oneshot`` [#since_0_21]_
     - ``consume`` [#since_0_15]_: ``0`` or ``1``
     - ``playlist``: 31-bit unsigned integer, the playlist version number
     - ``playlistlength``: integer, the length of the playlist
-    - ``state``: ``play``, ``stop, or ``pause``
+    - ``state``: ``play``, ``stop``, or ``pause``
     - ``song``: playlist song number of the current song stopped on or playing
     - ``songid``: playlist songid of the current song stopped on or playing
     - ``nextsong`` [#since_0_15]_: playlist song number of the next song to be played
     - ``nextsongid`` [#since_0_15]_: playlist songid of the next song to be played
-    - ``time``: total time elapsed (of current playing/paused song)
-    - ``elapsed`` [#since_0_16]_: Total time elapsed within the current song, but with higher resolution.
+    - ``time``: total time elapsed (of current playing/paused song) in seconds
+      (deprecated, use ``elapsed`` instead)
+    - ``elapsed`` [#since_0_16]_: Total time elapsed within the
+      current song in seconds, but with higher resolution.
     - ``duration`` [#since_0_20]_: Duration of the current song in seconds.
     - ``bitrate``: instantaneous bitrate in kbps
     - ``xfade``: ``crossfade`` in seconds
     - ``mixrampdb``: ``mixramp`` threshold in dB
     - ``mixrampdelay``: ``mixrampdelay`` in seconds
-    - ``audio``: The format emitted by the decoder plugin during playback, format: ``*samplerate:bits:channels*``. Check the user manual for a detailed explanation.
+    - ``audio``: The format emitted by the decoder plugin during
+      playback, format: ``samplerate:bits:channels``.  See
+      :ref:`audio_output_format` for a detailed explanation.
     - ``updating_db``: ``job id``
     - ``error``: if there is an error, returns message here
 
+    :program:`MPD` may omit lines which have no (known) value.  Older
+    :program:`MPD` versions used to have a "magic" value for
+    "unknown", e.g. ":samp:`volume: -1`".
+
 :command:`stats`
     Displays statistics.
 
@@ -384,8 +463,9 @@ Querying ``MPD``'s status
     - ``albums``: number of albums
     - ``songs``: number of songs
     - ``uptime``: daemon uptime in seconds
-    - ``db_playtime``: sum of all song times in the db
-    - ``db_update``: last db update in UNIX time
+    - ``db_playtime``: sum of all song times in the database in seconds
+    - ``db_update``: last db update in UNIX time (seconds since
+      1970-01-01 UTC)
     - ``playtime``: time length of music played
 
 Playback options
@@ -490,8 +570,36 @@ Controlling playback
 :command:`stop`
     Stops playing.
 
-The current playlist
-====================
+The Queue
+=========
+
+.. note:: The "queue" used to be called "current playlist" or just
+          "playlist", but that was deemed confusing, because
+          "playlists" are also files containing a sequence of songs.
+          Those "playlist files" or "stored playlists" can be
+          :ref:`loaded into the queue <command_load>` and the queue
+          can be :ref:`saved into a playlist file <command_save>`, but
+          they are not to be confused with the queue.
+
+          Many of the command names in this section reflect the old
+          naming convention, but for the sake of compatibility, we
+          cannot rename commands.
+
+There are two ways to address songs within the queue: by their
+position and by their id.
+
+The position is a 0-based index.  It is unstable by design: if you
+move, delete or insert songs, all following indices will change, and a
+client can never be sure what song is behind a given index/position.
+
+Song ids on the other hand are stable: an id is assigned to a song
+when it is added, and will stay the same, no matter how much it is
+moved around.  Adding the same song twice will assign different ids to
+them, and a deleted-and-readded song will have a new id.  This way, a
+client can always be sure the correct song is being used.
+
+Many commands come in two flavors, one for each address type.
+Whenever possible, ids should be used.
 
 :command:`add {URI}`
     Adds the file ``URI`` to the playlist
@@ -507,7 +615,7 @@ The current playlist
      OK
 
 :command:`clear`
-    Clears the current playlist.
+    Clears the queue.
 
 .. _command_delete:
 
@@ -518,7 +626,7 @@ The current playlist
     Deletes the song ``SONGID`` from the
     playlist
 
-:command:`move {FROM} [{START:END} | {TO}]`
+:command:`move [{FROM} | {START:END}] {TO}`
     Moves the song at ``FROM`` or range of songs
     at ``START:END`` [#since_0_15]_ to ``TO``
     in the playlist.
@@ -532,13 +640,13 @@ The current playlist
 
 :command:`playlist`
 
-    Displays the current playlist.
+    Displays the queue.
 
     Do not use this, instead use :ref:`playlistinfo
     <command_playlistinfo>`.
 
 :command:`playlistfind {TAG} {NEEDLE}`
-    Finds songs in the current playlist with strict
+    Finds songs in the queue with strict
     matching.
 
 :command:`playlistid {SONGID}`
@@ -556,7 +664,7 @@ The current playlist
 
 :command:`playlistsearch {TAG} {NEEDLE}`
     Searches case-insensitively for partial matches in the
-    current playlist.
+    queue.
 
 :command:`plchanges {VERSION} [START:END]`
     Displays changed songs currently in the playlist since
@@ -593,7 +701,7 @@ The current playlist
     but address the songs with their id.
 
 :command:`rangeid {ID} {START:END}` [#since_0_19]_
-    Since ``MPD``
+    Since :program:`MPD`
     0.19 Specifies the portion of the
     song that shall be played.  ``START`` and
     ``END`` are offsets in seconds
@@ -603,7 +711,7 @@ The current playlist
     playing cannot be manipulated this way.
 
 :command:`shuffle [START:END]`
-    Shuffles the current playlist.
+    Shuffles the queue.
     ``START:END`` is optional and specifies
     a range of songs.
 
@@ -638,7 +746,9 @@ and without the `.m3u` suffix).
 Some of the commands described in this section can be used to
 run playlist plugins instead of the hard-coded simple
 `m3u` parser.  They can access playlists in
-the music directory (relative path including the suffix) or
+the music directory (relative path including the suffix),
+playlists in arbitrary location (absolute path including the suffix;
+allowed only for clients that are connected via local socket), or
 remote playlists (absolute URI with a supported scheme).
 
 :command:`listplaylist {NAME}`
@@ -657,6 +767,8 @@ remote playlists (absolute URI with a supported scheme).
     between clients and the server, clients should not
     compare this value with their local clock.
 
+.. _command_load:
+
 :command:`load {NAME} [START:END]`
     Loads the playlist into the current queue.  Playlist
     plugins are supported.  A range may be specified to load
@@ -687,8 +799,10 @@ remote playlists (absolute URI with a supported scheme).
     Removes the playlist `NAME.m3u` from
     the playlist directory.
 
+.. _command_save:
+
 :command:`save {NAME}`
-    Saves the current playlist to
+    Saves the queue to
     `NAME.m3u` in the playlist directory.
 
 The music database
@@ -703,7 +817,7 @@ The music database
 
     Returns the file size and actual number
     of bytes read at the requested offset, followed
-    by the chunk requested as raw bytes, then a
+    by the chunk requested as raw bytes (see :ref:`binary`), then a
     newline and the completion code.
 
     Example::
@@ -773,8 +887,7 @@ The music database
 :command:`list {TYPE} {FILTER} [group {GROUPTYPE}]`
     Lists unique tags values of the specified type.
     ``TYPE`` can be any tag supported by
-    ``MPD`` or
-    *file*.
+    :program:`MPD`.
 
     Additional arguments may specify a :ref:`filter <filter_syntax>`.
     The *group* keyword may be used
@@ -785,6 +898,10 @@ The music database
 
      list album group albumartist
 
+    ``list file`` was implemented in an early :program:`MPD` version,
+    but does not appear to make a lot of sense.  It still works (to
+    avoid breaking compatibility), but is deprecated.
+
 .. _command_listall:
 
 :command:`listall [URI]`
@@ -792,10 +909,10 @@ The music database
     ``URI``.
 
     Do not use this command.  Do not manage a client-side
-    copy of ``MPD``'s database.  That
+    copy of :program:`MPD`'s database.  That
     is fragile and adds huge overhead.  It will break with
     large databases.  Instead, query
-    ``MPD`` whenever you need
+    :program:`MPD` whenever you need
     something.
 
 .. _command_listallinfo:
@@ -806,16 +923,16 @@ The music database
     as :ref:`lsinfo <command_lsinfo>`
 
     Do not use this command.  Do not manage a client-side
-    copy of ``MPD``'s database.  That
+    copy of :program:`MPD`'s database.  That
     is fragile and adds huge overhead.  It will break with
     large databases.  Instead, query
-    ``MPD`` whenever you need
+    :program:`MPD` whenever you need
     something.
 
 :command:`listfiles {URI}`
     Lists the contents of the directory
     ``URI``, including files are not
-    recognized by ``MPD``.
+    recognized by :program:`MPD`.
     ``URI`` can be a path relative to the
     music directory or an URI understood by one of the
     storage plugins.  The response contains at least one
@@ -829,7 +946,7 @@ The music database
 
 .. _command_lsinfo:
 
-:command:`lsinfo {URI}`
+:command:`lsinfo [URI]`
     Lists the contents of the directory
     ``URI``.  The response contains records
     starting with ``file``,
@@ -844,7 +961,7 @@ The music database
     This command may be used to list metadata of remote
     files (e.g. URI beginning with "http://" or "smb://").
 
-    Clients that are connected via UNIX domain socket may
+    Clients that are connected via local socket may
     use this command to read the tags of an arbitrary local
     file (URI is an absolute path).
 
@@ -922,7 +1039,7 @@ Multiple storages can be "mounted" together, similar to the
 `mount` command on many operating
 systems, but without cooperation from the kernel.  No
 superuser privileges are necessary, beause this mapping exists
-only inside the ``MPD`` process
+only inside the :program:`MPD` process
 
 .. _command_mount:
 
@@ -965,15 +1082,16 @@ Stickers
 
 "Stickers" [#since_0_15]_ are pieces of
 information attached to existing
-``MPD`` objects (e.g. song files,
-directories, albums).  Clients can create arbitrary name/value
-pairs.  ``MPD`` itself does not assume
+:program:`MPD` objects (e.g. song files,
+directories, albums; but currently, they are only implemented for
+song).  Clients can create arbitrary name/value
+pairs.  :program:`MPD` itself does not assume
 any special meaning in them.
 
 The goal is to allow clients to share additional (possibly
 dynamic) information about songs, which is neither stored on
 the client (not available to other clients), nor stored in the
-song files (``MPD`` has no write
+song files (:program:`MPD` has no write
 access).
 
 Client developers should create a standard for common sticker
@@ -1015,14 +1133,21 @@ Connection settings
 ===================
 
 :command:`close`
-    Closes the connection to ``MPD``.
-    ``MPD`` will try to send the
+    Closes the connection to :program:`MPD`.
+    :program:`MPD` will try to send the
     remaining output buffer before it actually closes the
     connection, but that cannot be guaranteed.  This command
     will not generate a response.
 
+    Clients should not use this command; instead, they should just
+    close the socket.
+
 :command:`kill`
-    Kills ``MPD``.
+    Kills :program:`MPD`.
+
+    Do not use this command.  Send ``SIGTERM`` to :program:`MPD`
+    instead, or better: let your service manager handle :program:`MPD`
+    shutdown (e.g. :command:`systemctl stop mpd`).
 
 :command:`password {PASSWORD}`
     This is used for authentication with the server.
@@ -1044,7 +1169,7 @@ Connection settings
     ``tagtypes`` sub commands configure this
     list.
 
-:command:`tagtypes disable {NAME...]`
+:command:`tagtypes disable {NAME...}`
     Remove one or more tags from the list of tag types the
     client is interested in.  These will be omitted from
     responses to this client.
@@ -1056,7 +1181,7 @@ Connection settings
 
 :command:`tagtypes clear`
     Clear the list of tag types this client is interested
-    in.  This means that ``MPD`` will
+    in.  This means that :program:`MPD` will
     not send any tags to this client.
 
 :command:`tagtypes all`
@@ -1128,7 +1253,7 @@ Reflection
 :command:`config`
     Dumps configuration values that may be interesting for
     the client.  This command is only permitted to "local"
-    clients (connected via UNIX domain socket).
+    clients (connected via local socket).
 
     The following response attributes are available:
 

doc/user.rst

@@ -54,7 +54,7 @@ Download the source tarball from the `MPD home page <https://musicpd.org>`_ and
 In any case, you need:
 
 * a C++14 compiler (e.g. gcc 6.0 or clang 3.9)
-* `Meson 0.47 <http://mesonbuild.com/>`__ and `Ninja
+* `Meson 0.49.0 <http://mesonbuild.com/>`__ and `Ninja
   <https://ninja-build.org/>`__
 * Boost 1.58
 * pkg-config 
@@ -62,15 +62,16 @@ In any case, you need:
 Each plugin usually needs a codec library, which you also need to
 install. Check the :doc:`plugins` for details about required libraries
 
-For example, the following installs a fairly complete list of build dependencies on Debian Jessie:
+For example, the following installs a fairly complete list of build dependencies on Debian Buster:
 
 .. code-block:: none
 
-    apt install g++ \
+    apt install meson g++ \
+      libpcre3-dev \
       libmad0-dev libmpg123-dev libid3tag0-dev \
-      libflac-dev libvorbis-dev libopus-dev \
+      libflac-dev libvorbis-dev libopus-dev libogg-dev \
       libadplug-dev libaudiofile-dev libsndfile1-dev libfaad-dev \
-      libfluidsynth-dev libgme-dev libmikmod2-dev libmodplug-dev \
+      libfluidsynth-dev libgme-dev libmikmod-dev libmodplug-dev \
       libmpcdec-dev libwavpack-dev libwildmidi-dev \
       libsidplay2-dev libsidutils-dev libresid-builder-dev \
       libavcodec-dev libavformat-dev \
@@ -87,10 +88,12 @@ For example, the following installs a fairly complete list of build dependencies
       libupnp-dev \
       libavahi-client-dev \
       libsqlite3-dev \
-      libsystemd-dev libwrap0-dev \
+      libsystemd-dev \
       libgtest-dev \
       libboost-dev \
-      libicu-dev
+      libicu-dev \
+      libchromaprint-dev \
+      libgcrypt20-dev
       
 
 Now configure the source tree:
@@ -275,7 +278,9 @@ You can also use multiple storage plugins to assemble a virtual music directory
 Configuring database plugins
 ----------------------------
 
-If a music directory is configured, one database plugin is used. To configure this plugin, add a database block to :file:`mpd.conf`:
+If a music directory is configured, one database plugin is used. To
+configure this plugin, add a :code:`database` block to
+:file:`mpd.conf`:
 
 .. code-block:: none
 
@@ -290,7 +295,9 @@ reference.
 Configuring neighbor plugins
 ----------------------------
 
-All neighbor plugins are disabled by default to avoid unwanted overhead. To enable (and configure) a plugin, add a neighbor block to :file:`mpd.conf`:
+All neighbor plugins are disabled by default to avoid unwanted
+overhead. To enable (and configure) a plugin, add a :code:`neighbor`
+block to :file:`mpd.conf`:
 
 .. code-block:: none
 
@@ -303,7 +310,8 @@ More information can be found in the :ref:`neighbor_plugin` reference.
 Configuring input plugins
 -------------------------
 
-To configure an input plugin, add a input block to :file:`mpd.conf`:
+To configure an input plugin, add an :code:`input` block to
+:file:`mpd.conf`:
 
 .. code-block:: none
 
@@ -331,7 +339,8 @@ More information can be found in the :ref:`input_plugins` reference.
 Configuring decoder plugins
 ---------------------------
 
-Most decoder plugins do not need any special configuration. To configure a decoder, add a decoder block to :file:`mpd.conf`:
+Most decoder plugins do not need any special configuration. To
+configure a decoder, add a :code:`decoder` block to :file:`mpd.conf`:
 
 .. code-block:: none
 
@@ -358,16 +367,21 @@ More information can be found in the :ref:`decoder_plugins` reference.
 Configuring encoder plugins
 ---------------------------
 
-Encoders are used by some of the output plugins (such as shout). The encoder settings are included in the audio_output section.
+Encoders are used by some of the output plugins (such as shout). The
+encoder settings are included in the ``audio_output`` section, see :ref:`config_audio_output`.
 
 More information can be found in the :ref:`encoder_plugins` reference.
 
+
+.. _config_audio_output:
+
 Configuring audio outputs
 -------------------------
 
 Audio outputs are devices which actually play the audio chunks produced by :program:`MPD`. You can configure any number of audio output devices, but there must be at least one. If none is configured, :program:`MPD` attempts to auto-detect. Usually, this works quite well with ALSA, OSS and on Mac OS X.
 
-To configure an audio output manually, add one or more audio_output blocks to :file:`mpd.conf`:
+To configure an audio output manually, add one or more
+:code:`audio_output` blocks to :file:`mpd.conf`:
 
 .. code-block:: none
 
@@ -390,14 +404,9 @@ The following table lists the audio_output options valid for all plugins:
      - The name of the plugin
    * - **name**
      - The name of the audio output. It is visible to the client. Some plugins also use it internally, e.g. as a name registered in the PULSE server.
-   * - **format**
-     -  Always open the audio output with the specified audio format samplerate:bits:channels), regardless of the format of the input file. This is optional for most plugins.
-
-        Any of the three attributes may be an asterisk to specify that this attribute should not be enforced, example: 48000:16:*. *:*:* is equal to not having a format specification.
-
-        The following values are valid for bits: 8 (signed 8 bit integer samples), 16, 24 (signed 24 bit integer samples padded to 32 bit), 32 (signed 32 bit integer samples), f (32 bit floating point, -1.0 to 1.0), "dsd" means DSD (Direct Stream Digital). For DSD, there are special cases such as "dsd64", which allows you to omit the sample rate (e.g. dsd512:2 for stereo DSD512, i.e. 22.5792 MHz).
-
-        The sample rate is special for DSD: :program:`MPD` counts the number of bytes, not bits. Thus, a DSD "bit" rate of 22.5792 MHz (DSD512) is 2822400 from :program:`MPD`'s point of view (44100*512/8).
+   * - **format samplerate:bits:channels**
+     -  Always open the audio output with the specified audio format, regardless of the format of the input file. This is optional for most plugins.
+        See :ref:`audio_output_format` for a detailed description of the value.
    * - **enabed yes|no**
      - Specifies whether this audio output is enabled when :program:`MPD` is started. By default, all audio outputs are enabled. This is just the default setting when there is no state file; with a state file, the previous state is restored.
    * - **tags yes|no**
@@ -405,14 +414,30 @@ The following table lists the audio_output options valid for all plugins:
    * - **always_on yes|no**
      - If set to yes, then :program:`MPD` attempts to keep this audio output always open. This may be useful for streaming servers, when you don't want to disconnect all listeners even when playback is accidentally stopped.
    * - **mixer_type hardware|software|null|none**
-     - Specifies which mixer should be used for this audio output: the hardware mixer (available for ALSA :ref:`alsa_plugin`, OSS :ref:`oss_plugin` and PulseAudio :ref:`pulse_plugin`), the software mixer, the "null" mixer (null; allows setting the volume, but with no effect; this can be used as a trick to implement an external mixer :ref:`external_mixer`) or no mixer (none). By default, the hardware mixer is used for devices which support it, and none for the others.
+     - Specifies which mixer should be used for this audio output: the
+       hardware mixer (available for ALSA :ref:`alsa_plugin`, OSS
+       :ref:`oss_plugin` and PulseAudio :ref:`pulse_plugin`), the
+       software mixer, the ":samp:`null`" mixer (allows setting the
+       volume, but with no effect; this can be used as a trick to
+       implement an external mixer :ref:`external_mixer`) or no mixer
+       (:samp:`none`). By default, the hardware mixer is used for
+       devices which support it, and none for the others.
+   * - **filters "name,...**"
+     - The specified configured filters are instantiated in the given
+       order.  Each filter name refers to a ``filter`` block, see
+       :ref:`config_filter`.
+
+More information can be found in the :ref:`output_plugins` reference.
+
+
+.. _config_filter:
 
 Configuring filters
 -------------------
 
 Filters are plugins which modify an audio stream.
 
-To configure a filter, add a filter block to :file:`mpd.conf`:
+To configure a filter, add a :code:`filter` block to :file:`mpd.conf`:
 
 .. code-block:: none
 
@@ -421,6 +446,9 @@ To configure a filter, add a filter block to :file:`mpd.conf`:
         name "software volume"
     }
 
+Configured filters may then be added to the ``filters`` setting of an
+``audio_output`` section, see :ref:`config_audio_output`.
+
 The following table lists the filter options valid for all plugins:
 
 .. list-table::
@@ -434,12 +462,18 @@ The following table lists the filter options valid for all plugins:
    * - **name**
      - The name of the filter
 
+More information can be found in the :ref:`filter_plugins` reference.
+
+
 Configuring playlist plugins
 ----------------------------
 
-Playlist plugins are used to load remote playlists (protocol commands load, listplaylist and listplaylistinfo). This is not related to :program:`MPD`'s playlist directory.
+Playlist plugins are used to load remote playlists (protocol commands
+load, listplaylist and listplaylistinfo). This is not related to
+:program:`MPD`'s :ref:`playlist directory <stored_playlists>`.
 
-To configure a playlist plugin, add a playlist_plugin block to :file:`mpd.conf`:
+To configure a playlist plugin, add a :code:`playlist_plugin` block to
+:file:`mpd.conf`:
 
 .. code-block:: none
 
@@ -467,13 +501,34 @@ reference.
 Audio Format Settings
 ---------------------
 
-Global Audio Format
-~~~~~~~~~~~~~~~~~~~
+.. _audio_output_format:
 
-The setting audio_output_format forces :program:`MPD` to use one audio format for all outputs. Doing that is usually not a good idea. The values are the same as in format in the audio_output section.
+Global Audio Format
+^^^^^^^^^^^^^^^^^^^
+
+The setting ``audio_output_format`` forces :program:`MPD` to use one
+audio format for all outputs.  Doing that is usually not a good idea.
+
+The value is specified as ``samplerate:bits:channels``.
+
+Any of the three attributes may be an asterisk to specify that this
+attribute should not be enforced, example: ``48000:16:*``.
+``*:*:*`` is equal to not having a format specification.
+
+The following values are valid for bits: ``8`` (signed 8 bit integer
+samples), ``16``, ``24`` (signed 24 bit integer samples padded to 32
+bit), ``32`` (signed 32 bit integer samples), ``f`` (32 bit floating
+point, -1.0 to 1.0), ``dsd`` means DSD (Direct Stream Digital). For
+DSD, there are special cases such as ``dsd64``, which allows you to
+omit the sample rate (e.g. ``dsd512:2`` for stereo DSD512,
+i.e. 22.5792 MHz).
+
+The sample rate is special for DSD: :program:`MPD` counts the number
+of bytes, not bits. Thus, a DSD "bit" rate of 22.5792 MHz (DSD512) is
+2822400 from :program:`MPD`'s point of view (44100*512/8).
 
 Resampler
-~~~~~~~~~
+^^^^^^^^^
 
 Sometimes, music needs to be resampled before it can be played; for example, CDs use a sample rate of 44,100 Hz while many cheap audio chips can only handle 48,000 Hz. Resampling reduces the quality and consumes a lot of CPU. There are different options, some of them optimized for high quality and others for low CPU usage, but you can't have both at the same time. Often, the resampler is the component that is responsible for most of :program:`MPD`'s CPU usage. Since :program:`MPD` comes with high quality defaults, it may appear that :program:`MPD` consumes more CPU than other software.
 
@@ -486,7 +541,7 @@ Client Connections
 .. _listeners:
 
 Listeners
-~~~~~~~~~
+^^^^^^^^^
 
 The setting :code:`bind_to_address` specifies which addresses
 :program:`MPD` listens on for connections from clients.  It can be
@@ -513,6 +568,12 @@ choice::
 
  bind_to_address "/var/run/mpd/socket"
 
+On Linux, local sockets can be bound to a name without a socket inode
+on the filesystem; MPD implements this by prepending ``@`` to the
+address::
+
+ bind_to_address "@mpd"
+
 If no port is specified, the default port is 6600.  This default can
 be changed with the port setting::
 
@@ -523,7 +584,7 @@ used.
 
 
 Permissions and Passwords
-~~~~~~~~~~~~~~~~~~~~~~~~~
+^^^^^^^^^^^^^^^^^^^^^^^^^
 
 By default, all clients are unauthenticated and have a full set of permissions. This can be restricted with the settings :code:`default_permissions` and :code:`password`.
 
@@ -586,7 +647,7 @@ Other Settings
        Section :ref:`tags` contains a list of supported tags.
 
 The State File
-~~~~~~~~~~~~~~
+^^^^^^^^^^^^^^
 
  The state file is a file where :program:`MPD` saves and restores its state (play queue, playback position etc.) to keep it persistent across restarts and reboots. It is an optional setting.
 
@@ -604,7 +665,7 @@ The State File
      - Auto-save the state file this number of seconds after each state change. Defaults to 120 (2 minutes).
 
 The Sticker Database
-~~~~~~~~~~~~~~~~~~~~
+^^^^^^^^^^^^^^^^^^^^
 
 "Stickers" are pieces of information attached to songs. Some clients
 use them to store ratings and other volatile data. This feature
@@ -621,7 +682,7 @@ requires :program:`SQLite`, compile-time configure option
      - The location of the sticker database.
 
 Resource Limitations
-~~~~~~~~~~~~~~~~~~~~
+^^^^^^^^^^^^^^^^^^^^
 
 These settings are various limitations to prevent :program:`MPD` from using too many resources (denial of service).
 
@@ -634,7 +695,7 @@ These settings are various limitations to prevent :program:`MPD` from using too
    * - **connection_timeout SECONDS**
      - If a client does not send any new data in this time period, the connection is closed. Clients waiting in "idle" mode are excluded from this. Default is 60.
    * - **max_connections NUMBER**
-     - This specifies the maximum number of clients that can be connected to :program:`MPD` at the same time. Default is 5.
+     - This specifies the maximum number of clients that can be connected to :program:`MPD` at the same time. Default is 100.
    * - **max_playlist_length NUMBER**
      - The maximum number of songs that can be in the playlist. Default is 16384.
    * - **max_command_list_size KBYTES**
@@ -643,7 +704,7 @@ These settings are various limitations to prevent :program:`MPD` from using too
      - The maximum size of the output buffer to a client (maximum response size). Default is 8192 (8 MiB).
 
 Buffer Settings
-~~~~~~~~~~~~~~~
+^^^^^^^^^^^^^^^
 
 Do not change these unless you know what you are doing.
 
@@ -657,7 +718,7 @@ Do not change these unless you know what you are doing.
      - Adjust the size of the internal audio buffer. Default is 4096 (4 MiB).
 
 Zeroconf
-~~~~~~~~
+^^^^^^^^
 
 If Zeroconf support (`Avahi <http://avahi.org/>`_ or Apple's Bonjour)
 was enabled at compile time with :code:`-Dzeroconf=...`,
@@ -743,10 +804,12 @@ You can verify whether the real-time scheduler is active with the ps command:
 
 The CLS column shows the CPU scheduler; TS is the normal scheduler; FF and RR are real-time schedulers. In this example, two threads use the real-time scheduler: the output thread and the rtio (real-time I/O) thread; these two are the important ones. The database update thread uses the idle scheduler ("IDL in ps), which only gets CPU when no other process needs it.
 
-Note
-~~~~
+.. note::
 
-There is a rumor that real-time scheduling improves audio quality. That is not true. All it does is reduce the probability of skipping (audio buffer xruns) when the computer is under heavy load.
+   There is a rumor that real-time scheduling improves audio
+   quality. That is not true. All it does is reduce the probability of
+   skipping (audio buffer xruns) when the computer is under heavy
+   load.
 
 Using MPD
 *********
@@ -774,7 +837,7 @@ Depending on the size of your music collection and the speed of the storage, thi
 To exclude a file from the update, create a file called :file:`.mpdignore` in its parent directory. Each line of that file may contain a list of shell wildcards. Matching files in the current directory and all subdirectories are excluded.
 
 Mounting other storages into the music directory
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 :program:`MPD` has various storage plugins of which multiple instances can be "mounted" into the music directory. This way, you can use local music, file servers and USB sticks at the same time. Example:
 
@@ -816,10 +879,16 @@ The queue
 
 The queue (sometimes called "current playlist") is a list of songs to be played by :program:`MPD`. To play a song, add it to the queue and start playback. Most clients offer an interface to edit the queue.
 
+.. _stored_playlists:
+
 Stored Playlists
 ----------------
 
-Stored playlists are some kind of secondary playlists which can be created, saved, edited and deleted by the client. They are addressed by their names. Its contents can be loaded into the queue, to be played back. The playlist_directory setting specifies where those playlists are stored. 
+Stored playlists are some kind of secondary playlists which can be
+created, saved, edited and deleted by the client. They are addressed
+by their names.  Its contents can be loaded into the queue, to be
+played back.  The :code:`playlist_directory` setting specifies where
+those playlists are stored.
 
 Advanced usage
 **************
@@ -859,9 +928,11 @@ Obey the "format" row, which indicates that the current playback format is 16 bi
 Check list for bit-perfect playback:
 
 * Use the ALSA output plugin.
-* Disable sound processing inside ALSA by configuring a "hardware" device (hw:0,0 or similar).
-* Don't use software volume (setting mixer_type).
-* Don't force :program:`MPD` to use a specific audio format (settings format, audio_output_format).
+* Disable sound processing inside ALSA by configuring a "hardware"
+  device (:samp:`hw:0,0` or similar).
+* Don't use software volume (setting :code:`mixer_type`).
+* Don't force :program:`MPD` to use a specific audio format (settings
+  :code:`format`, :ref:`audio_output_format <audio_output_format>`).
 * Verify that you are really doing bit-perfect playback using :program:`MPD`'s verbose log and :file:`/proc/asound/card*/pcm*p/sub*/hw_params`. Some DACs can also indicate the audio format.
 
 Direct Stream Digital (DSD)
@@ -876,7 +947,11 @@ DSD (`Direct Stream Digital <https://en.wikipedia.org/wiki/Direct_Stream_Digital
 * DoP (DSD over PCM) playback. This wraps DSD inside fake 24 bit PCM according to the DoP standard. Requires a DAC that supports DSD. No support from ALSA and the sound chip required (except for bit-perfect 24 bit PCM support).
 * Convert DSD to PCM on-the-fly. 
 
-Native DSD playback is used automatically if available. DoP is only used if enabled explicitly using the dop option, because there is no way for :program:`MPD` to find out whether the DAC supports it. DSD to PCM conversion is the fallback if DSD cannot be used directly.
+Native DSD playback is used automatically if available. DoP is only
+used if enabled explicitly using the :code:`dop` option, because there
+is no way for :program:`MPD` to find out whether the DAC supports
+it. DSD to PCM conversion is the fallback if DSD cannot be used
+directly.
 
 Client Hacks
 ************
@@ -908,18 +983,18 @@ Support
 -------
 
 Getting Help
-~~~~~~~~~~~~
+^^^^^^^^^^^^
 
 The :program:`MPD` project runs a `forum <https://forum.musicpd.org/>`_ and an IRC channel (#mpd on Freenode) for requesting help. Visit the MPD help page for details on how to get help.
 
 Common Problems
-~~~~~~~~~~~~~~~
+^^^^^^^^^^^^^^^
 
 1. Database
-^^^^^^^^^^^
+"""""""""""
 
 Question: I can't see my music in the MPD database!
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 * Check your :code:`music_directory` setting. 
 * Does the MPD user have read permission on all music files, and read+execute permission on all music directories (and all of their parent directories)? 
@@ -927,22 +1002,22 @@ Question: I can't see my music in the MPD database!
 * Did you enable all relevant decoder plugins at compile time? :command:`mpd --version` will tell you. 
 
 Question: MPD doesn't read ID3 tags!
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 * You probably compiled :program:`MPD` without libid3tag. :command:`mpd --version` will tell you.
 
 2. Playback
-^^^^^^^^^^^
+"""""""""""
 
 Question: I can't hear music on my client!
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 * That problem usually follows a misunderstanding of the nature of :program:`MPD`. :program:`MPD` is a remote-controlled music player, not a music distribution system. Usually, the speakers are connected to the box where :program:`MPD` runs, and the :program:`MPD` client only sends control commands, but the client does not actually play your music.
 
   :program:`MPD` has output plugins which allow hearing music on a remote host (such as httpd), but that is not :program:`MPD`'s primary design goal. 
 
 Question: "Device or resource busy"
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 *  This ALSA error means that another program uses your sound hardware exclusively. You can stop that program to allow :program:`MPD` to use it.
 
@@ -961,13 +1036,22 @@ Your bug report should contain:
 * be clear about what you expect MPD to do, and what is actually happening
 
 MPD crashes
-~~~~~~~~~~~
+^^^^^^^^^^^
 
 All :program:`MPD` crashes are bugs which must be fixed by a developer, and you should write a bug report. (Many crash bugs are caused by codec libraries used by :program:`MPD`, and then that library must be fixed; but in any case, the :program:`MPD` `bug tracker <https://github.com/MusicPlayerDaemon/MPD/issues>`_ is a good place to report it first if you don't know.)
 
 A crash bug report needs to contain a "backtrace".
 
-First of all, your :program:`MPD` executable must not be "stripped" (i.e. debug information deleted). The executables shipped with Linux distributions are usually stripped, but some have so-called "debug" packages (package mpd-dbg or mpd-dbgsym on Debian, mpd-debug on other distributions). Make sure this package is installed.
+First of all, your :program:`MPD` executable must not be "stripped"
+(i.e. debug information deleted).  The executables shipped with Linux
+distributions are usually stripped, but some have so-called "debug"
+packages (package :file:`mpd-dbgsym` or :file:`mpd-dbg` on Debian,
+:file:`mpd-debug` on other distributions).  Make sure this package is
+installed.
+
+If you built :program:`MPD` from sources, please recompile with Meson
+option ":code:`--buildtype=debug -Db_ndebug=false`", because this will
+add more helpful information to the backtrace.
 
 You can extract the backtrace from a core dump, or by running :program:`MPD` in a debugger, e.g.:
 
@@ -976,4 +1060,5 @@ You can extract the backtrace from a core dump, or by running :program:`MPD` in
     gdb --args mpd --stdout --no-daemon --verbose
     run
 
-As soon as you have reproduced the crash, type "bt" on the gdb command prompt. Copy the output to your bug report.
+As soon as you have reproduced the crash, type ":command:`bt`" on the
+gdb command prompt. Copy the output to your bug report.

meson.build

@@ -1,11 +1,12 @@
 project(
   'mpd',
   ['c', 'cpp'],
-  version: '0.21',
-  meson_version: '>= 0.47',
+  version: '0.21.26',
+  meson_version: '>= 0.49.0',
   default_options: [
     'c_std=c99',
-    'cpp_std=c++14'
+    'cpp_std=c++14',
+    'warning_level=2',
   ],
   license: 'GPLv2+',
 )
@@ -15,12 +16,18 @@ 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.0')
+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 = [
@@ -34,9 +41,6 @@ common_cxxflags = [
 ]
 
 test_common_flags = [
-  '-Wall',
-  '-Wextra',
-
   '-fvisibility=hidden',
 
   '-ffast-math',
@@ -82,6 +86,10 @@ test_ldflags = [
 ]
 
 if get_option('buildtype') != 'debug'
+  test_cxxflags += [
+    '-ffunction-sections',
+    '-fdata-sections',
+  ]
   test_cflags += [
     '-ffunction-sections',
     '-fdata-sections',
@@ -99,7 +107,7 @@ 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' # TODO is this correct?
+is_haiku = host_machine.system() == 'haiku'
 
 if is_android
   common_cppflags += '-DANDROID'
@@ -132,7 +140,13 @@ 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'))
-conf.set('HAVE_STRNDUP', compiler.has_function('strndup', prefix: '#define _GNU_SOURCE\n#include <string.h>'))
+
+# 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)
@@ -172,6 +186,11 @@ inc = include_directories(
 )
 
 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,
@@ -275,6 +294,7 @@ if not is_android
 else
   sources += [
     'src/android/Context.cxx',
+    'src/android/AudioManager.cxx',
     'src/android/Environment.cxx',
     'src/android/LogListener.cxx',
   ]
@@ -293,10 +313,14 @@ if enable_database
 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')
@@ -307,9 +331,9 @@ subdir('src/lib/curl')
 subdir('src/lib/expat')
 subdir('src/lib/ffmpeg')
 subdir('src/lib/gcrypt')
-subdir('src/lib/wrap')
 subdir('src/lib/nfs')
 subdir('src/lib/oss')
+subdir('src/lib/pcre')
 subdir('src/lib/pulse')
 subdir('src/lib/sndio')
 subdir('src/lib/sqlite')
@@ -319,7 +343,6 @@ subdir('src/lib/yajl')
 
 subdir('src/fs')
 subdir('src/config')
-subdir('src/net')
 subdir('src/tag')
 subdir('src/pcm')
 subdir('src/neighbor')
@@ -362,8 +385,10 @@ basic_dep = declare_dependency(
 
 if enable_database
   subdir('src/storage')
-  subdir('src/db')
+else
+  storage_glue_dep = dependency('', required: false)
 endif
+subdir('src/db')
 
 if neighbor_glue_dep.found()
   sources += 'src/command/NeighborCommands.cxx'
@@ -372,8 +397,11 @@ endif
 if archive_glue_dep.found()
   sources += [
     'src/TagArchive.cxx',
-    'src/db/update/Archive.cxx',
   ]
+
+  if enable_database
+    sources += ['src/db/update/Archive.cxx']
+  endif
 endif
 
 if is_windows
@@ -385,6 +413,7 @@ more_deps = []
 if is_android
   subdir('src/java')
   target_type = 'shared_library'
+  target_name = 'mpd'
   link_args += [
     '-Wl,--no-undefined,-shared,-Bsymbolic',
     '-llog',
@@ -394,12 +423,20 @@ if is_android
     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(
-  'mpd',
+  target_name,
   sources,
   target_type: target_type,
   include_directories: inc,
@@ -426,7 +463,6 @@ mpd = build_target(
     systemd_dep,
     sqlite_dep,
     zeroconf_dep,
-    libwrap_dep,
     more_deps,
   ],
   link_args: link_args,
@@ -439,6 +475,14 @@ 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)

meson_options.txt

@@ -128,12 +128,13 @@ 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')
 
 #
-# Decoder plugins
+# Encoder plugins
 #
 
 option('vorbisenc', type: 'feature', description: 'Vorbis encoder plugin')
@@ -175,7 +176,7 @@ 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('libwrap', type: 'feature', description: 'libwrap support')
+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)')

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)

python/build/libs.py

@@ -4,19 +4,20 @@ 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.16.tar.xz',
-    'fa6bdab67c0e0490302b38f00c27b4959735c3ec8aef7a88327adb1407654464',
+    '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.3.tar.xz',
-    '4f3fc6178a533d392064f14776b23c397ed4b9f48f5de297aba73b643f955c08',
+    'http://downloads.xiph.org/releases/ogg/libogg-1.3.4.tar.xz',
+    'c163bc12bc300c401b6aa35907ac682671ea376f13ae0969a220f7ddf71893fe',
     'lib/libogg.a',
     [
         '--disable-shared', '--enable-static',
@@ -24,8 +25,8 @@ libogg = AutotoolsProject(
 )
 
 libvorbis = AutotoolsProject(
-    'http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.6.tar.xz',
-    'af00bb5a784e7c9e69f56823de4637c350643deedaf333d0fa86ecdba6fcb415',
+    'http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.7.tar.xz',
+    'b33cc4934322bcbf6efcbacf49e3ca01aadbea4114ec9589d1b1e9d20f72954b',
     'lib/libvorbis.a',
     [
         '--disable-shared', '--enable-static',
@@ -38,8 +39,8 @@ libvorbis = AutotoolsProject(
 )
 
 opus = AutotoolsProject(
-    'https://archive.mozilla.org/pub/opus/opus-1.3.tar.gz',
-    '4f3d69aefdf2dbaf9825408e452a8a414ffc60494c70633560700398820dc550',
+    'https://archive.mozilla.org/pub/opus/opus-1.3.1.tar.gz',
+    '65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d',
     'lib/libopus.a',
     [
         '--disable-shared', '--enable-static',
@@ -52,8 +53,8 @@ opus = AutotoolsProject(
 )
 
 flac = AutotoolsProject(
-    'http://downloads.xiph.org/releases/flac/flac-1.3.2.tar.xz',
-    '91cfc3ed61dc40f47f050a109b08610667d73477af6ef36dcad31c31a4a8d53f',
+    'http://downloads.xiph.org/releases/flac/flac-1.3.3.tar.xz',
+    '213e82bd716c9de6db2f98bcadbc4c24c7e2efe8c75939a1a84e28539c4e1748',
     'lib/libFLAC.a',
     [
         '--disable-shared', '--enable-static',
@@ -111,9 +112,44 @@ liblame = AutotoolsProject(
     ],
 )
 
+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.0.2.tar.xz',
-    'a95c0cc9eb990e94031d2183f2e6e444cc61c99f6f182d1575c433d62afb2f97',
+    'http://ffmpeg.org/releases/ffmpeg-4.3.1.tar.xz',
+    'ad009240d46e307b4e03a213a0f49c11b650e445b1f8be0dda2a9212b34d2ffb',
     'lib/libavcodec.a',
     [
         '--disable-shared', '--enable-static',
@@ -341,8 +377,8 @@ ffmpeg = FfmpegProject(
 )
 
 curl = AutotoolsProject(
-    'http://curl.haxx.se/download/curl-7.61.1.tar.xz',
-    '3d5913d6a39bd22e68e34dff697fd6e4c3c81563f580c76fca2009315cd81891',
+    'http://curl.haxx.se/download/curl-7.72.0.tar.xz',
+    '0ded0808c4d85f2ee0db86980ae610cc9d165e9ca9da466196cc73c346513713',
     'lib/libcurl.a',
     [
         '--disable-shared', '--enable-static',
@@ -358,6 +394,11 @@ curl = AutotoolsProject(
         '--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',
     ],
 
@@ -365,8 +406,8 @@ curl = AutotoolsProject(
 )
 
 libexpat = AutotoolsProject(
-    'https://github.com/libexpat/libexpat/releases/download/R_2_2_6/expat-2.2.6.tar.bz2',
-    '17b43c2716d521369f82fc2dc70f359860e90fa440bea65b3b85f0b246ea81f2',
+    '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',
@@ -375,8 +416,8 @@ libexpat = AutotoolsProject(
 )
 
 libnfs = AutotoolsProject(
-    'https://github.com/sahlberg/libnfs/archive/libnfs-3.0.0.tar.gz',
-    '445d92c5fc55e4a5b115e358e60486cf8f87ee50e0103d46a02e7fb4618566a5',
+    'https://github.com/sahlberg/libnfs/archive/libnfs-4.0.0.tar.gz',
+    '6ee77e9fe220e2d3e3b1f53cfea04fb319828cc7dbb97dd9df09e46e901d797d',
     'lib/libnfs.a',
     [
         '--disable-shared', '--enable-static',
@@ -387,12 +428,12 @@ libnfs = AutotoolsProject(
 
         '--disable-utils', '--disable-examples',
     ],
-    base='libnfs-libnfs-3.0.0',
+    base='libnfs-libnfs-4.0.0',
     autoreconf=True,
 )
 
 boost = BoostProject(
-    'http://downloads.sourceforge.net/project/boost/boost/1.68.0/boost_1_68_0.tar.bz2',
-    '7f6130bc3cf65f56a618888ce9d5ea704fa10b462be126ad053e80e553d6d8b7',
+    'https://dl.bintray.com/boostorg/release/1.74.0/source/boost_1_74_0.tar.bz2',
+    '83bfc1507731a0906e387fc28b7ef5417d591429e51e788417fe9ff025e116b1',
     'include/boost/version.hpp',
 )

python/build/meson.py

@@ -91,7 +91,12 @@ def configure(toolchain, src, build, args=()):
         '--cross-file', cross_file,
     ] + args
 
-    subprocess.check_call(configure, env=toolchain.env)
+    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=[],

python/build/zlib.py

@@ -18,5 +18,5 @@ class ZlibProject(Project):
             'INCLUDE_PATH='+ os.path.join(toolchain.install_prefix, 'include'),
             'LIBRARY_PATH=' + os.path.join(toolchain.install_prefix, 'lib'),
             'BINARY_PATH=' + os.path.join(toolchain.install_prefix, 'bin'),
-            'SHARED_MODE=1'],
+            ],
             cwd=src, env=toolchain.env)

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

src/AudioFormat.hxx

@@ -20,7 +20,7 @@
 #ifndef MPD_AUDIO_FORMAT_HXX
 #define MPD_AUDIO_FORMAT_HXX
 
-#include "pcm/SampleFormat.hxx"
+#include "pcm/SampleFormat.hxx" // IWYU pragma: export
 #include "util/Compiler.h"
 
 #include <chrono>

src/AudioParser.cxx

@@ -22,7 +22,6 @@
  *
  */
 
-#include "config.h"
 #include "AudioParser.hxx"
 #include "AudioFormat.hxx"
 #include "util/RuntimeError.hxx"

src/CheckAudioFormat.cxx

@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "CheckAudioFormat.hxx"
 #include "AudioFormat.hxx"
 #include "util/RuntimeError.hxx"

src/CommandLine.cxx

@@ -33,11 +33,11 @@
 #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/Macros.hxx"
 #include "util/RuntimeError.hxx"
 #include "util/Domain.hxx"
 #include "util/OptionDef.hxx"
@@ -108,17 +108,17 @@ static constexpr Domain cmdline_domain("cmdline");
 gcc_noreturn
 static void version(void)
 {
-	printf("Music Player Daemon " VERSION " (%s)\n"
+	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"
+	       "warranty; not even MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n",
+	       GIT_VERSION);
 
 #ifdef ENABLE_DATABASE
-	       "\n"
-	       "Database plugins:\n",
-	       GIT_VERSION);
+	printf("\n"
+	       "Database plugins:\n");
 
 	for (auto i = database_plugins; *i != nullptr; ++i)
 		printf(" %s", (*i)->name);
@@ -129,18 +129,18 @@ static void version(void)
 	for (auto i = storage_plugins; *i != nullptr; ++i)
 		printf(" %s", (*i)->name);
 
-	printf("\n"
+	printf("\n");
 #endif
 
 #ifdef ENABLE_NEIGHBOR_PLUGINS
-	       "\n"
+	printf("\n"
 	       "Neighbor plugins:\n");
 	for (auto i = neighbor_plugins; *i != nullptr; ++i)
 		printf(" %s", (*i)->name);
 
-	printf("\n"
 #endif
 
+	printf("\n"
 	       "\n"
 	       "Decoders plugins:\n");
 
@@ -380,17 +380,7 @@ ParseCommandLine(int argc, char **argv, struct options &options,
 
 	if (config_file != nullptr) {
 		/* use specified configuration file */
-#ifdef _UNICODE
-		wchar_t buffer[MAX_PATH];
-		auto result = MultiByteToWideChar(CP_ACP, 0, config_file, -1,
-						  buffer, ARRAY_SIZE(buffer));
-		if (result <= 0)
-			throw MakeLastError("MultiByteToWideChar() failed");
-
-		ReadConfigFile(config, Path::FromFS(buffer));
-#else
-		ReadConfigFile(config, Path::FromFS(config_file));
-#endif
+		ReadConfigFile(config, FromNarrowPath(config_file));
 		return;
 	}
 

src/IcyMetaDataParser.cxx

@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "IcyMetaDataParser.hxx"
 #include "tag/Tag.hxx"
 #include "tag/Builder.hxx"

src/Idle.cxx

@@ -22,7 +22,6 @@
  *
  */
 
-#include "config.h"
 #include "Idle.hxx"
 #include "Main.hxx"
 #include "Instance.hxx"

src/IdleFlags.cxx

@@ -22,7 +22,6 @@
  *
  */
 
-#include "config.h"
 #include "IdleFlags.hxx"
 #include "util/ASCII.hxx"
 

src/Instance.cxx

@@ -30,6 +30,9 @@
 
 #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"
@@ -48,7 +51,19 @@ Instance::Instance()
 {
 }
 
-Instance::~Instance() noexcept = default;
+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

src/Instance.hxx

@@ -20,7 +20,7 @@
 #ifndef MPD_INSTANCE_HXX
 #define MPD_INSTANCE_HXX
 
-#include "check.h"
+#include "config.h"
 #include "event/Loop.hxx"
 #include "event/Thread.hxx"
 #include "event/MaskMonitor.hxx"
@@ -41,7 +41,7 @@ class NeighborGlue;
 
 #ifdef ENABLE_DATABASE
 #include "db/DatabaseListener.hxx"
-class Database;
+#include "db/Ptr.hxx"
 class Storage;
 class UpdateService;
 #endif
@@ -104,7 +104,7 @@ struct Instance final
 #endif
 
 #ifdef ENABLE_DATABASE
-	Database *database;
+	DatabasePtr database;
 
 	/**
 	 * This is really a #CompositeStorage.  To avoid heavy include
@@ -147,7 +147,6 @@ struct Instance final
 	Partition *FindPartition(const char *name) noexcept;
 
 	void BeginShutdownPartitions() noexcept;
-	void FinishShutdownPartitions() noexcept;
 
 #ifdef ENABLE_DATABASE
 	/**
@@ -156,7 +155,7 @@ struct Instance final
 	 * music_directory was configured).
 	 */
 	Database *GetDatabase() {
-		return database;
+		return database.get();
 	}
 
 	/**
@@ -168,8 +167,6 @@ struct Instance final
 #endif
 
 	void BeginShutdownUpdate() noexcept;
-	void FinishShutdownUpdate() noexcept;
-	void ShutdownDatabase() noexcept;
 
 #ifdef ENABLE_CURL
 	void LookupRemoteTag(const char *uri) noexcept;

src/LocateUri.cxx

@@ -29,6 +29,8 @@
 #include "storage/StorageInterface.hxx"
 #endif
 
+#include <stdexcept>
+
 static LocatedUri
 LocateFileUri(const char *uri, const Client *client
 #ifdef ENABLE_DATABASE
@@ -55,14 +57,26 @@ LocateFileUri(const char *uri, const Client *client
 }
 
 static LocatedUri
-LocateAbsoluteUri(const char *uri
+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) {
@@ -76,7 +90,8 @@ LocateAbsoluteUri(const char *uri
 }
 
 LocatedUri
-LocateUri(const char *uri, const Client *client
+LocateUri(UriPluginKind kind,
+	  const char *uri, const Client *client
 #ifdef ENABLE_DATABASE
 	  , const Storage *storage
 #endif
@@ -100,7 +115,7 @@ LocateUri(const char *uri, const Client *client
 #endif
 				     );
 	else if (uri_has_scheme(uri))
-		return LocateAbsoluteUri(uri
+		return LocateAbsoluteUri(kind, uri
 #ifdef ENABLE_DATABASE
 					 , storage
 #endif

src/LocateUri.hxx

@@ -20,7 +20,7 @@
 #ifndef MPD_LOCATE_URI_HXX
 #define MPD_LOCATE_URI_HXX
 
-#include "check.h"
+#include "config.h"
 #include "util/Compiler.h"
 #include "fs/AllocatedPath.hxx"
 
@@ -41,6 +41,12 @@ class Client;
 class Storage;
 #endif
 
+enum class UriPluginKind {
+	INPUT,
+	STORAGE,
+	PLAYLIST,
+};
+
 struct LocatedUri {
 	enum class Type {
 		/**
@@ -84,7 +90,8 @@ struct LocatedUri {
  * that feature is disabled if this parameter is nullptr
  */
 LocatedUri
-LocateUri(const char *uri, const Client *client
+LocateUri(UriPluginKind kind,
+	  const char *uri, const Client *client
 #ifdef ENABLE_DATABASE
 	  , const Storage *storage
 #endif

src/Log.cxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2019 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -17,11 +17,9 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "LogV.hxx"
 #include "util/Domain.hxx"
-
-#include <exception>
+#include "util/Exception.hxx"
 
 #include <stdio.h>
 #include <string.h>
@@ -30,20 +28,20 @@
 static constexpr Domain exception_domain("exception");
 
 void
-LogFormatV(const Domain &domain, LogLevel level,
+LogFormatV(LogLevel level, const Domain &domain,
 	   const char *fmt, va_list ap) noexcept
 {
 	char msg[1024];
 	vsnprintf(msg, sizeof(msg), fmt, ap);
-	Log(domain, level, msg);
+	Log(level, domain, msg);
 }
 
 void
-LogFormat(const Domain &domain, LogLevel level, const char *fmt, ...) noexcept
+LogFormat(LogLevel level, const Domain &domain, const char *fmt, ...) noexcept
 {
 	va_list ap;
 	va_start(ap, fmt);
-	LogFormatV(domain, level, fmt, ap);
+	LogFormatV(level, domain, fmt, ap);
 	va_end(ap);
 }
 
@@ -52,7 +50,7 @@ FormatDebug(const Domain &domain, const char *fmt, ...) noexcept
 {
 	va_list ap;
 	va_start(ap, fmt);
-	LogFormatV(domain, LogLevel::DEBUG, fmt, ap);
+	LogFormatV(LogLevel::DEBUG, domain, fmt, ap);
 	va_end(ap);
 }
 
@@ -61,7 +59,7 @@ FormatInfo(const Domain &domain, const char *fmt, ...) noexcept
 {
 	va_list ap;
 	va_start(ap, fmt);
-	LogFormatV(domain, LogLevel::INFO, fmt, ap);
+	LogFormatV(LogLevel::INFO, domain, fmt, ap);
 	va_end(ap);
 }
 
@@ -70,7 +68,7 @@ FormatDefault(const Domain &domain, const char *fmt, ...) noexcept
 {
 	va_list ap;
 	va_start(ap, fmt);
-	LogFormatV(domain, LogLevel::DEFAULT, fmt, ap);
+	LogFormatV(LogLevel::DEFAULT, domain, fmt, ap);
 	va_end(ap);
 }
 
@@ -79,7 +77,7 @@ FormatWarning(const Domain &domain, const char *fmt, ...) noexcept
 {
 	va_list ap;
 	va_start(ap, fmt);
-	LogFormatV(domain, LogLevel::WARNING, fmt, ap);
+	LogFormatV(LogLevel::WARNING, domain, fmt, ap);
 	va_end(ap);
 }
 
@@ -88,42 +86,24 @@ FormatError(const Domain &domain, const char *fmt, ...) noexcept
 {
 	va_list ap;
 	va_start(ap, fmt);
-	LogFormatV(domain, LogLevel::ERROR, fmt, ap);
+	LogFormatV(LogLevel::ERROR, domain, fmt, ap);
 	va_end(ap);
 }
 
 void
-LogError(const std::exception &e) noexcept
+Log(LogLevel level, const std::exception &e) noexcept
 {
-	Log(exception_domain, LogLevel::ERROR, e.what());
-
-	try {
-		std::rethrow_if_nested(e);
-	} catch (const std::exception &nested) {
-		LogError(nested, "nested");
-	} catch (...) {
-		Log(exception_domain, LogLevel::ERROR,
-		    "Unrecognized nested exception");
-	}
+	Log(level, exception_domain, GetFullMessage(e).c_str());
 }
 
 void
-LogError(const std::exception &e, const char *msg) noexcept
+Log(LogLevel level, const std::exception &e, const char *msg) noexcept
 {
-	FormatError(exception_domain, "%s: %s", msg, e.what());
-
-	try {
-		std::rethrow_if_nested(e);
-	} catch (const std::exception &nested) {
-		LogError(nested);
-	} catch (...) {
-		Log(exception_domain, LogLevel::ERROR,
-		    "Unrecognized nested exception");
-	}
+	LogFormat(level, exception_domain, "%s: %s", msg, GetFullMessage(e).c_str());
 }
 
 void
-FormatError(const std::exception &e, const char *fmt, ...) noexcept
+LogFormat(LogLevel level, const std::exception &e, const char *fmt, ...) noexcept
 {
 	char msg[1024];
 	va_list ap;
@@ -131,37 +111,24 @@ FormatError(const std::exception &e, const char *fmt, ...) noexcept
 	vsnprintf(msg, sizeof(msg), fmt, ap);
 	va_end(ap);
 
-	LogError(e, msg);
+	Log(level, e, msg);
 }
 
 void
-LogError(const std::exception_ptr &ep) noexcept
+Log(LogLevel level, const std::exception_ptr &ep) noexcept
 {
-	try {
-		std::rethrow_exception(ep);
-	} catch (const std::exception &e) {
-		LogError(e);
-	} catch (...) {
-		Log(exception_domain, LogLevel::ERROR,
-		    "Unrecognized exception");
-	}
+	Log(level, exception_domain, GetFullMessage(ep).c_str());
 }
 
 void
-LogError(const std::exception_ptr &ep, const char *msg) noexcept
+Log(LogLevel level, const std::exception_ptr &ep, const char *msg) noexcept
 {
-	try {
-		std::rethrow_exception(ep);
-	} catch (const std::exception &e) {
-		LogError(e, msg);
-	} catch (...) {
-		FormatError(exception_domain,
-			    "%s: Unrecognized exception", msg);
-	}
+	LogFormat(level, exception_domain, "%s: %s", msg,
+		  GetFullMessage(ep).c_str());
 }
 
 void
-FormatError(const std::exception_ptr &ep, const char *fmt, ...) noexcept
+LogFormat(LogLevel level, const std::exception_ptr &ep, const char *fmt, ...) noexcept
 {
 	char msg[1024];
 	va_list ap;
@@ -169,13 +136,13 @@ FormatError(const std::exception_ptr &ep, const char *fmt, ...) noexcept
 	vsnprintf(msg, sizeof(msg), fmt, ap);
 	va_end(ap);
 
-	LogError(ep, msg);
+	Log(level, ep, msg);
 }
 
 void
 LogErrno(const Domain &domain, int e, const char *msg) noexcept
 {
-	LogFormat(domain, LogLevel::ERROR, "%s: %s", msg, strerror(e));
+	LogFormat(LogLevel::ERROR, domain, "%s: %s", msg, strerror(e));
 }
 
 void

src/Log.hxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2019 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -28,16 +28,38 @@
 class Domain;
 
 void
-Log(const Domain &domain, LogLevel level, const char *msg) noexcept;
+Log(LogLevel level, const Domain &domain, const char *msg) noexcept;
 
 gcc_printf(3,4)
 void
-LogFormat(const Domain &domain, LogLevel level, const char *fmt, ...) noexcept;
+LogFormat(LogLevel level, const Domain &domain, const char *fmt, ...) noexcept;
+
+void
+Log(LogLevel level, const std::exception &e) noexcept;
+
+void
+Log(LogLevel level, const std::exception &e, const char *msg) noexcept;
+
+gcc_printf(3,4)
+void
+LogFormat(LogLevel level, const std::exception &e,
+	  const char *fmt, ...) noexcept;
+
+void
+Log(LogLevel level, const std::exception_ptr &ep) noexcept;
+
+void
+Log(LogLevel level, const std::exception_ptr &ep, const char *msg) noexcept;
+
+gcc_printf(3,4)
+void
+LogFormat(LogLevel level, const std::exception_ptr &ep,
+	  const char *fmt, ...) noexcept;
 
 static inline void
 LogDebug(const Domain &domain, const char *msg) noexcept
 {
-	Log(domain, LogLevel::DEBUG, msg);
+	Log(LogLevel::DEBUG, domain, msg);
 }
 
 gcc_printf(2,3)
@@ -47,7 +69,7 @@ FormatDebug(const Domain &domain, const char *fmt, ...) noexcept;
 static inline void
 LogInfo(const Domain &domain, const char *msg) noexcept
 {
-	Log(domain, LogLevel::INFO, msg);
+	Log(LogLevel::INFO, domain, msg);
 }
 
 gcc_printf(2,3)
@@ -57,7 +79,7 @@ FormatInfo(const Domain &domain, const char *fmt, ...) noexcept;
 static inline void
 LogDefault(const Domain &domain, const char *msg) noexcept
 {
-	Log(domain, LogLevel::DEFAULT, msg);
+	Log(LogLevel::DEFAULT, domain, msg);
 }
 
 gcc_printf(2,3)
@@ -67,7 +89,7 @@ FormatDefault(const Domain &domain, const char *fmt, ...) noexcept;
 static inline void
 LogWarning(const Domain &domain, const char *msg) noexcept
 {
-	Log(domain, LogLevel::WARNING, msg);
+	Log(LogLevel::WARNING, domain, msg);
 }
 
 gcc_printf(2,3)
@@ -77,28 +99,47 @@ FormatWarning(const Domain &domain, const char *fmt, ...) noexcept;
 static inline void
 LogError(const Domain &domain, const char *msg) noexcept
 {
-	Log(domain, LogLevel::ERROR, msg);
+	Log(LogLevel::ERROR, domain, msg);
 }
 
-void
-LogError(const std::exception &e) noexcept;
+inline void
+LogError(const std::exception &e) noexcept
+{
+	Log(LogLevel::ERROR, e);
+}
 
-void
-LogError(const std::exception &e, const char *msg) noexcept;
+inline void
+LogError(const std::exception &e, const char *msg) noexcept
+{
+	Log(LogLevel::ERROR, e, msg);
+}
 
-gcc_printf(2,3)
-void
-FormatError(const std::exception &e, const char *fmt, ...) noexcept;
+template<typename... Args>
+inline void
+FormatError(const std::exception &e, const char *fmt, Args&&... args) noexcept
+{
+	LogFormat(LogLevel::ERROR, e, fmt, std::forward<Args>(args)...);
+}
 
-void
-LogError(const std::exception_ptr &ep) noexcept;
+inline void
+LogError(const std::exception_ptr &ep) noexcept
+{
+	Log(LogLevel::ERROR, ep);
+}
 
-void
-LogError(const std::exception_ptr &ep, const char *msg) noexcept;
+inline void
+LogError(const std::exception_ptr &ep, const char *msg) noexcept
+{
+	Log(LogLevel::ERROR, ep, msg);
+}
 
-gcc_printf(2,3)
-void
-FormatError(const std::exception_ptr &ep, const char *fmt, ...) noexcept;
+template<typename... Args>
+inline void
+FormatError(const std::exception_ptr &ep,
+	    const char *fmt, Args&&... args) noexcept
+{
+	LogFormat(LogLevel::ERROR, ep, fmt, std::forward<Args>(args)...);
+}
 
 gcc_printf(2,3)
 void

src/LogBackend.cxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2019 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -17,11 +17,11 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "LogBackend.hxx"
 #include "Log.hxx"
 #include "util/Domain.hxx"
 #include "util/StringStrip.hxx"
+#include "config.h"
 
 #include <assert.h>
 #include <stdio.h>
@@ -61,7 +61,7 @@ ToAndroidLogLevel(LogLevel log_level) noexcept
 
 #else
 
-static LogLevel log_threshold = LogLevel::INFO;
+static LogLevel log_threshold = LogLevel::DEFAULT;
 
 static bool enable_timestamp;
 
@@ -176,7 +176,7 @@ FileLog(const Domain &domain, const char *message) noexcept
 #endif /* !ANDROID */
 
 void
-Log(const Domain &domain, LogLevel level, const char *msg) noexcept
+Log(LogLevel level, const Domain &domain, const char *msg) noexcept
 {
 #ifdef ANDROID
 	__android_log_print(ToAndroidLogLevel(level), "MPD",

src/LogBackend.hxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2019 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -20,7 +20,6 @@
 #ifndef MPD_LOG_BACKEND_HXX
 #define MPD_LOG_BACKEND_HXX
 
-#include "check.h"
 #include "LogLevel.hxx"
 
 void

src/LogInit.cxx

@@ -30,6 +30,10 @@
 #include "util/RuntimeError.hxx"
 #include "system/Error.hxx"
 
+#ifdef ENABLE_SYSTEMD_DAEMON
+#include <systemd/sd-daemon.h>
+#endif
+
 #include <assert.h>
 #include <string.h>
 #include <fcntl.h>
@@ -105,7 +109,7 @@ parse_log_level(const char *value, int line)
 #endif
 
 void
-log_early_init(bool verbose)
+log_early_init(bool verbose) noexcept
 {
 #ifdef ANDROID
 	(void)verbose;
@@ -139,6 +143,16 @@ log_init(const ConfigData &config, bool verbose, bool use_stdout)
 		if (param == nullptr) {
 			/* no configuration: default to syslog (if
 			   available) */
+#ifdef ENABLE_SYSTEMD_DAEMON
+			if (sd_booted() &&
+			    getenv("NOTIFY_SOCKET") != nullptr) {
+				/* if MPD was started as a systemd
+				   service, default to journal (which
+				   is connected to fd=2) */
+				out_fd = STDOUT_FILENO;
+				return;
+			}
+#endif
 #ifndef HAVE_SYSLOG
 			throw std::runtime_error("config parameter 'log_file' not found");
 #endif
@@ -157,7 +171,7 @@ log_init(const ConfigData &config, bool verbose, bool use_stdout)
 #ifndef ANDROID
 
 static void
-close_log_files(void)
+close_log_files() noexcept
 {
 #ifdef HAVE_SYSLOG
 	LogFinishSysLog();
@@ -167,7 +181,7 @@ close_log_files(void)
 #endif
 
 void
-log_deinit(void)
+log_deinit() noexcept
 {
 #ifndef ANDROID
 	close_log_files();
@@ -199,7 +213,8 @@ void setup_log_output()
 #endif
 }
 
-int cycle_log_files(void)
+int
+cycle_log_files() noexcept
 {
 #ifdef ANDROID
 	return 0;

src/LogInit.hxx

@@ -31,7 +31,7 @@ struct ConfigData;
  * @param verbose true when the program is started with --verbose
  */
 void
-log_early_init(bool verbose);
+log_early_init(bool verbose) noexcept;
 
 /**
  * Throws #std::runtime_error on error.
@@ -40,12 +40,12 @@ void
 log_init(const ConfigData &config, bool verbose, bool use_stdout);
 
 void
-log_deinit();
+log_deinit() noexcept;
 
 void
 setup_log_output();
 
 int
-cycle_log_files();
+cycle_log_files() noexcept;
 
 #endif /* LOG_H */

src/LogV.hxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2019 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -25,7 +25,7 @@
 #include <stdarg.h>
 
 void
-LogFormatV(const Domain &domain, LogLevel level,
+LogFormatV(LogLevel level, const Domain &domain,
 	   const char *fmt, va_list ap) noexcept;
 
 #endif /* LOG_H */

src/Main.cxx

@@ -185,19 +185,16 @@ InitStorage(const ConfigData &config, EventLoop &event_loop)
 static bool
 glue_db_init_and_load(const ConfigData &config)
 {
-	instance->database =
-		CreateConfiguredDatabase(config, instance->event_loop,
+	auto db = CreateConfiguredDatabase(config, instance->event_loop,
 					   instance->io_thread.GetEventLoop(),
 					   *instance);
-	if (instance->database == nullptr)
+	if (!db)
 		return true;
 
-	if (instance->database->GetPlugin().flags & DatabasePlugin::FLAG_REQUIRE_STORAGE) {
+	if (db->GetPlugin().RequireStorage()) {
 		InitStorage(config, instance->io_thread.GetEventLoop());
 
 		if (instance->storage == nullptr) {
-			delete instance->database;
-			instance->database = nullptr;
 			LogDefault(config_domain,
 				   "Found database setting without "
 				   "music_directory - disabling database");
@@ -211,22 +208,24 @@ glue_db_init_and_load(const ConfigData &config)
 	}
 
 	try {
-		instance->database->Open();
+		db->Open();
 	} catch (...) {
 		std::throw_with_nested(std::runtime_error("Failed to open database plugin"));
 	}
 
-	if (!instance->database->IsPlugin(simple_db_plugin))
+	instance->database = std::move(db);
+
+	auto *sdb = dynamic_cast<SimpleDatabase *>(instance->database.get());
+	if (sdb == nullptr)
 		return true;
 
-	SimpleDatabase &db = *(SimpleDatabase *)instance->database;
 	instance->update = new UpdateService(config,
-					     instance->event_loop, db,
+					     instance->event_loop, *sdb,
 					     static_cast<CompositeStorage &>(*instance->storage),
 					     *instance);
 
 	/* run database update after daemonization? */
-	return db.FileExists();
+	return sdb->FileExists();
 }
 
 static bool
@@ -351,27 +350,6 @@ Instance::BeginShutdownUpdate() noexcept
 #endif
 }
 
-inline void
-Instance::FinishShutdownUpdate() noexcept
-{
-#ifdef ENABLE_DATABASE
-	delete update;
-#endif
-}
-
-inline void
-Instance::ShutdownDatabase() noexcept
-{
-#ifdef ENABLE_DATABASE
-	if (instance->database != nullptr) {
-		instance->database->Close();
-		delete instance->database;
-	}
-
-	delete instance->storage;
-#endif
-}
-
 inline void
 Instance::BeginShutdownPartitions() noexcept
 {
@@ -381,12 +359,6 @@ Instance::BeginShutdownPartitions() noexcept
 	}
 }
 
-inline void
-Instance::FinishShutdownPartitions() noexcept
-{
-	partitions.clear();
-}
-
 void
 Instance::OnIdle(unsigned flags)
 {
@@ -488,7 +460,7 @@ MainOrThrow(int argc, char *argv[])
 #endif
 
 	const unsigned max_clients =
-		raw_config.GetPositive(ConfigOption::MAX_CONN, 10);
+		raw_config.GetPositive(ConfigOption::MAX_CONN, 100);
 	instance->client_list = new ClientList(max_clients);
 
 	initialize_decoder_and_player(raw_config, config.replay_gain);
@@ -523,18 +495,19 @@ static int
 mpd_main_after_fork(const ConfigData &raw_config, const Config &config)
 {
 	ConfigureFS(raw_config);
+	AtScopeExit() { DeinitFS(); };
 
 	glue_mapper_init(raw_config);
 
 	initPermissions(raw_config);
 	spl_global_init(raw_config);
 #ifdef ENABLE_ARCHIVE
-	archive_plugin_init_all();
+	const ScopeArchivePluginsInit archive_plugins_init;
 #endif
 
 	pcm_convert_global_init(raw_config);
 
-	decoder_plugin_init_all(raw_config);
+	const ScopeDecoderPluginsInit decoder_plugins_init(raw_config);
 
 #ifdef ENABLE_DATABASE
 	const bool create_db = InitDatabaseAndStorage(raw_config);
@@ -553,9 +526,9 @@ mpd_main_after_fork(const ConfigData &raw_config, const Config &config)
 	}
 
 	client_manager_init(raw_config);
-	input_stream_global_init(raw_config,
+	const ScopeInputPluginsInit input_plugins_init(raw_config,
 						       instance->io_thread.GetEventLoop());
-	playlist_list_global_init(raw_config);
+	const ScopePlaylistPluginsInit playlist_plugins_init(raw_config);
 
 #ifdef ENABLE_DAEMON
 	daemonize_commit();
@@ -564,7 +537,7 @@ mpd_main_after_fork(const ConfigData &raw_config, const Config &config)
 #ifndef ANDROID
 	setup_log_output();
 
-	SignalHandlersInit(instance->event_loop);
+	const ScopeSignalHandlersInit signal_handlers_init(instance->event_loop);
 #endif
 
 	instance->io_thread.Start();
@@ -652,34 +625,10 @@ mpd_main_after_fork(const ConfigData &raw_config, const Config &config)
 	}
 #endif
 
-	instance->FinishShutdownUpdate();
-	instance->ShutdownDatabase();
-
 #ifdef ENABLE_SQLITE
 	sticker_global_finish();
 #endif
 
-	playlist_list_global_finish();
-	input_stream_global_finish();
-
-#ifdef ENABLE_DATABASE
-	mapper_finish();
-#endif
-
-	DeinitFS();
-
-	instance->FinishShutdownPartitions();
-	command_finish();
-	decoder_plugin_deinit_all();
-#ifdef ENABLE_ARCHIVE
-	archive_plugin_deinit_all();
-#endif
-	instance->rtio_thread.Stop();
-	instance->io_thread.Stop();
-#ifndef ANDROID
-	SignalHandlersFinish();
-#endif
-
 	return EXIT_SUCCESS;
 }
 

src/Mapper.cxx

@@ -58,11 +58,6 @@ mapper_init(AllocatedPath &&_playlist_dir)
 		mapper_set_playlist_dir(std::move(_playlist_dir));
 }
 
-void
-mapper_finish() noexcept
-{
-}
-
 #ifdef ENABLE_DATABASE
 
 AllocatedPath

src/Mapper.hxx

@@ -24,9 +24,10 @@
 #ifndef MPD_MAPPER_HXX
 #define MPD_MAPPER_HXX
 
-#include <string>
-
 #include "util/Compiler.h"
+#include "config.h"
+
+#include <string>
 
 #define PLAYLIST_FILE_SUFFIX ".m3u"
 
@@ -36,9 +37,6 @@ class AllocatedPath;
 void
 mapper_init(AllocatedPath &&playlist_dir);
 
-void
-mapper_finish() noexcept;
-
 #ifdef ENABLE_DATABASE
 
 /**

src/MixRampInfo.hxx

@@ -20,7 +20,6 @@
 #ifndef MPD_MIX_RAMP_INFO_HXX
 #define MPD_MIX_RAMP_INFO_HXX
 
-#include "check.h"
 #include "util/Compiler.h"
 
 #include <string>

src/MusicBuffer.cxx

@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "MusicBuffer.hxx"
 #include "MusicChunk.hxx"
 

src/MusicChunk.cxx

@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "MusicChunk.hxx"
 #include "AudioFormat.hxx"
 #include "tag/Tag.hxx"

src/MusicChunk.hxx

@@ -43,7 +43,15 @@ struct MusicChunk;
 /**
  * Meta information for #MusicChunk.
  */
-struct MusicChunkInfo {
+struct alignas(8) MusicChunkInfo {
+	/* align to multiple of 8 bytes, which adds padding at the
+	   end, so the size of MusicChunk::data is also a multiple of
+	   8 bytes; this is a workaround for a bug in the DSD_U32 and
+	   DoP converters which require processing 8 bytes at a time,
+	   discarding the remainder */
+	/* TODO: once all converters have been fixed, we should remove
+	   this workaround */
+
 	/** the next chunk in a linked list */
 	MusicChunkPtr next;
 
@@ -119,6 +127,10 @@ struct MusicChunk : MusicChunkInfo {
 	/** the data (probably PCM) */
 	uint8_t data[CHUNK_SIZE - sizeof(MusicChunkInfo)];
 
+	/* TODO: remove this check once all converters have been fixed
+	   (see comment in struct MusicChunkInfo for details) */
+	static_assert(sizeof(data) % 8 == 0, "Wrong alignment");
+
 	/**
 	 * Prepares appending to the music chunk.  Returns a buffer
 	 * where you may write into.  After you are finished, call

src/MusicChunkPtr.cxx

@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "MusicChunkPtr.hxx"
 #include "MusicBuffer.hxx"
 

src/MusicChunkPtr.hxx

@@ -20,8 +20,6 @@
 #ifndef MPD_MUSIC_CHUNK_PTR_HXX
 #define MPD_MUSIC_CHUNK_PTR_HXX
 
-#include "check.h"
-
 #include <memory>
 
 struct MusicChunk;

src/MusicPipe.cxx

@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "MusicPipe.hxx"
 #include "MusicChunk.hxx"
 

src/Partition.hxx

@@ -31,6 +31,7 @@
 #include "SingleMode.hxx"
 #include "Chrono.hxx"
 #include "util/Compiler.h"
+#include "config.h"
 
 #include <string>
 #include <memory>

src/Permission.cxx

@@ -101,7 +101,7 @@ initPermissions(const ConfigData &config)
 		const char *separator = strchr(param.value.c_str(),
 					       PERMISSION_PASSWORD_CHAR);
 
-		if (separator == NULL)
+		if (separator == nullptr)
 			throw FormatRuntimeError("\"%c\" not found in password string "
 						 "\"%s\", line %i",
 						 PERMISSION_PASSWORD_CHAR,

src/Permission.hxx

@@ -20,7 +20,7 @@
 #ifndef MPD_PERMISSION_HXX
 #define MPD_PERMISSION_HXX
 
-#include "check.h"
+#include "config.h"
 
 struct ConfigData;
 

src/PlaylistDatabase.cxx

@@ -17,13 +17,12 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "PlaylistDatabase.hxx"
 #include "db/PlaylistVector.hxx"
 #include "fs/io/TextFile.hxx"
 #include "fs/io/BufferedOutputStream.hxx"
+#include "time/ChronoUtil.hxx"
 #include "util/StringStrip.hxx"
-#include "util/ChronoUtil.hxx"
 #include "util/RuntimeError.hxx"
 
 #include <string.h>

src/PlaylistDatabase.hxx

@@ -20,8 +20,6 @@
 #ifndef MPD_PLAYLIST_DATABASE_HXX
 #define MPD_PLAYLIST_DATABASE_HXX
 
-#include "check.h"
-
 #define PLAYLIST_META_BEGIN "playlist_begin: "
 
 class PlaylistVector;

src/PlaylistError.cxx

@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "PlaylistError.hxx"
 #include "util/Domain.hxx"
 

src/PlaylistFile.cxx

@@ -134,7 +134,9 @@ LoadPlaylistFileInfo(PlaylistInfo &info,
 	const auto *const name_fs_end =
 		FindStringSuffix(name_fs_str,
 				 PATH_LITERAL(PLAYLIST_FILE_SUFFIX));
-	if (name_fs_end == nullptr)
+	if (name_fs_end == nullptr ||
+	    /* no empty playlist names (raw file name = ".m3u") */
+	    name_fs_end == name_fs_str)
 		return false;
 
 	FileInfo fi;

src/PlaylistPrint.cxx

@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "PlaylistPrint.hxx"
 #include "PlaylistFile.hxx"
 #include "PlaylistError.hxx"

src/PluginUnavailable.hxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -27,10 +27,20 @@
  * that this plugin is unavailable.  It will be disabled, and MPD can
  * continue initialization.
  */
-class PluginUnavailable final : public std::runtime_error {
+class PluginUnavailable : public std::runtime_error {
 public:
-	explicit PluginUnavailable(const char *msg)
-		:std::runtime_error(msg) {}
+	using std::runtime_error::runtime_error;
+};
+
+/**
+ * Like #PluginUnavailable, but denotes that the plugin is not
+ * available because it was not explicitly enabled in the
+ * configuration.  The message may describe the necessary steps to
+ * enable it.
+ */
+class PluginUnconfigured : public PluginUnavailable {
+public:
+	using PluginUnavailable::PluginUnavailable;
 };
 
 #endif

src/RemoteTagCache.cxx

@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "RemoteTagCache.hxx"
 #include "RemoteTagCacheHandler.hxx"
 #include "input/ScanTags.hxx"

src/RemoteTagCache.hxx

@@ -20,7 +20,6 @@
 #ifndef MPD_REMOTE_TAG_CACHE_HXX
 #define MPD_REMOTE_TAG_CACHE_HXX
 
-#include "check.h"
 #include "input/RemoteTagScanner.hxx"
 #include "tag/Tag.hxx"
 #include "event/DeferEvent.hxx"

src/ReplayGainConfig.hxx

@@ -20,8 +20,6 @@
 #ifndef MPD_REPLAY_GAIN_CONFIG_HXX
 #define MPD_REPLAY_GAIN_CONFIG_HXX
 
-#include "check.h"
-
 struct ReplayGainConfig {
 	static constexpr bool DEFAULT_LIMIT = true;
 

src/ReplayGainGlobal.cxx

@@ -17,16 +17,15 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "ReplayGainGlobal.hxx"
 #include "ReplayGainConfig.hxx"
 #include "config/Param.hxx"
 #include "config/Data.hxx"
 #include "util/RuntimeError.hxx"
 
-#include <assert.h>
-#include <stdlib.h>
-#include <math.h>
+#include <cassert>
+#include <cstdlib>
+#include <cmath>
 
 static float
 ParsePreamp(const char *s)
@@ -34,14 +33,14 @@ ParsePreamp(const char *s)
 	assert(s != nullptr);
 
 	char *endptr;
-	float f = strtod(s, &endptr);
+	float f = std::strtof(s, &endptr);
 	if (endptr == s || *endptr != '\0')
 		throw std::invalid_argument("Not a numeric value");
 
-	if (f < -15 || f > 15)
+	if (f < -15.0f || f > 15.0f)
 		throw std::invalid_argument("Number must be between -15 and 15");
 
-	return pow(10, f / 20.0);
+	return std::pow(10.0f, f / 20.0f);
 }
 
 static float

src/ReplayGainGlobal.hxx

@@ -20,8 +20,6 @@
 #ifndef MPD_REPLAY_GAIN_GLOBAL_HXX
 #define MPD_REPLAY_GAIN_GLOBAL_HXX
 
-#include "check.h"
-
 struct ConfigData;
 struct ReplayGainConfig;
 

src/ReplayGainInfo.cxx

@@ -17,11 +17,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "ReplayGainInfo.hxx"
 #include "ReplayGainConfig.hxx"
 
-#include <math.h>
+#include <cmath>
 
 float
 ReplayGainTuple::CalculateScale(const ReplayGainConfig &config) const noexcept
@@ -29,13 +28,13 @@ ReplayGainTuple::CalculateScale(const ReplayGainConfig &config) const noexcept
 	float scale;
 
 	if (IsDefined()) {
-		scale = pow(10.0, gain / 20.0);
+		scale = std::pow(10.0f, gain / 20.0f);
 		scale *= config.preamp;
-		if (scale > 15.0)
-			scale = 15.0;
+		if (scale > 15.0f)
+			scale = 15.0f;
 
-		if (config.limit && scale * peak > 1.0)
-			scale = 1.0 / peak;
+		if (config.limit && scale * peak > 1.0f)
+			scale = 1.0f / peak;
 	} else
 		scale = config.missing_preamp;
 

src/ReplayGainInfo.hxx

@@ -20,7 +20,6 @@
 #ifndef MPD_REPLAY_GAIN_INFO_HXX
 #define MPD_REPLAY_GAIN_INFO_HXX
 
-#include "check.h"
 #include "util/Compiler.h"
 #include "ReplayGainMode.hxx"
 
@@ -39,6 +38,10 @@ struct ReplayGainTuple {
 		return gain > -100;
 	}
 
+	static constexpr ReplayGainTuple Undefined() noexcept {
+		return {-200.0f, 0.0f};
+	}
+
 	gcc_pure
 	float CalculateScale(const ReplayGainConfig &config) const noexcept;
 };
@@ -50,6 +53,13 @@ struct ReplayGainInfo {
 		return track.IsDefined() || album.IsDefined();
 	}
 
+	static constexpr ReplayGainInfo Undefined() noexcept {
+		return {
+			ReplayGainTuple::Undefined(),
+			ReplayGainTuple::Undefined(),
+		};
+	}
+
 	const ReplayGainTuple &Get(ReplayGainMode mode) const noexcept {
 		return mode == ReplayGainMode::ALBUM
 			? (album.IsDefined() ? album : track)

src/SongLoader.cxx

@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "SongLoader.hxx"
 #include "LocateUri.hxx"
 #include "client/Client.hxx"
@@ -25,6 +24,7 @@
 #include "storage/StorageInterface.hxx"
 #include "song/DetachedSong.hxx"
 #include "PlaylistError.hxx"
+#include "config.h"
 
 #include <assert.h>
 
@@ -94,7 +94,8 @@ SongLoader::LoadSong(const char *uri_utf8) const
 	assert(uri_utf8 != nullptr);
 #endif
 
-	const auto located_uri = LocateUri(uri_utf8, client
+	const auto located_uri = LocateUri(UriPluginKind::INPUT,
+					   uri_utf8, client
 #ifdef ENABLE_DATABASE
 					   , storage
 #endif

src/SongLoader.hxx

@@ -20,8 +20,8 @@
 #ifndef MPD_SONG_LOADER_HXX
 #define MPD_SONG_LOADER_HXX
 
-#include "check.h"
 #include "util/Compiler.h"
+#include "config.h"
 
 #include <cstddef>
 

src/SongPrint.cxx

@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "SongPrint.hxx"
 #include "song/LightSong.hxx"
 #include "Partition.hxx"
@@ -28,7 +27,7 @@
 #include "TagPrint.hxx"
 #include "client/Response.hxx"
 #include "fs/Traits.hxx"
-#include "util/ChronoUtil.hxx"
+#include "time/ChronoUtil.hxx"
 #include "util/UriUtil.hxx"
 
 #define SONG_FILE "file: "

src/SongSave.cxx

@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "SongSave.hxx"
 #include "AudioParser.hxx"
 #include "db/plugins/simple/Song.hxx"
@@ -28,7 +27,7 @@
 #include "tag/ParseName.hxx"
 #include "tag/Tag.hxx"
 #include "tag/Builder.hxx"
-#include "util/ChronoUtil.hxx"
+#include "time/ChronoUtil.hxx"
 #include "util/StringAPI.hxx"
 #include "util/StringBuffer.hxx"
 #include "util/StringStrip.hxx"

src/SongUpdate.cxx

@@ -79,6 +79,7 @@ Song::UpdateFile(Storage &storage) noexcept
 	TagBuilder tag_builder;
 	auto new_audio_format = AudioFormat::Undefined();
 
+	try {
 		const auto path_fs = storage.MapFS(relative_uri.c_str());
 		if (path_fs.IsNull()) {
 			const auto absolute_uri =
@@ -91,6 +92,10 @@ Song::UpdateFile(Storage &storage) noexcept
 						     &new_audio_format))
 				return false;
 		}
+	} catch (...) {
+		// TODO: log or propagate I/O errors?
+		return false;
+	}
 
 	mtime = info.mtime;
 	audio_format = new_audio_format;
@@ -98,8 +103,6 @@ Song::UpdateFile(Storage &storage) noexcept
 	return true;
 }
 
-#endif
-
 #ifdef ENABLE_ARCHIVE
 
 Song *
@@ -145,6 +148,8 @@ Song::UpdateFileInArchive(ArchiveFile &archive) noexcept
 
 #endif
 
+#endif /* ENABLE_DATABASE */
+
 bool
 DetachedSong::LoadFile(Path path) noexcept
 {
@@ -153,8 +158,14 @@ DetachedSong::LoadFile(Path path) noexcept
 		return false;
 
 	TagBuilder tag_builder;
+
+	try {
 		if (!ScanFileTagsWithGeneric(path, tag_builder))
 			return false;
+	} catch (...) {
+		// TODO: log or propagate I/O errors?
+		return false;
+	}
 
 	mtime = fi.GetModificationTime();
 	tag_builder.Commit(tag);
@@ -173,8 +184,14 @@ DetachedSong::Update() noexcept
 		return LoadFile(path_fs);
 	} else if (IsRemote()) {
 		TagBuilder tag_builder;
+
+		try {
 			if (!tag_stream_scan(uri.c_str(), tag_builder))
 				return false;
+		} catch (...) {
+			// TODO: log or propagate I/O errors?
+			return false;
+		}
 
 		mtime = std::chrono::system_clock::time_point::min();
 		tag_builder.Commit(tag);

src/StateFile.cxx

@@ -119,7 +119,7 @@ try {
 	TextFile file(config.path);
 
 #ifdef ENABLE_DATABASE
-	const SongLoader song_loader(partition.instance.database,
+	const SongLoader song_loader(partition.instance.GetDatabase(),
 				     partition.instance.storage);
 #else
 	const SongLoader song_loader(nullptr, nullptr);

src/StateFile.hxx

@@ -24,6 +24,7 @@
 #include "event/TimerEvent.hxx"
 #include "fs/AllocatedPath.hxx"
 #include "util/Compiler.h"
+#include "config.h"
 
 #include <string>
 #include <chrono>

src/StateFileConfig.cxx

@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "StateFileConfig.hxx"
 #include "config/Data.hxx"
 

src/StateFileConfig.hxx

@@ -20,7 +20,6 @@
 #ifndef MPD_STATE_FILE_CONFIG_HXX
 #define MPD_STATE_FILE_CONFIG_HXX
 
-#include "check.h"
 #include "fs/AllocatedPath.hxx"
 
 #include <chrono>

src/Stats.cxx

@@ -28,10 +28,10 @@
 #include "db/Stats.hxx"
 #include "system/Clock.hxx"
 #include "Log.hxx"
-#include "util/ChronoUtil.hxx"
+#include "time/ChronoUtil.hxx"
+#include "util/Math.hxx"
 
 #include <chrono>
-#include <cmath>
 
 #ifndef _WIN32
 /**
@@ -121,10 +121,10 @@ stats_print(Response &r, const Partition &partition)
 #else
 		 (unsigned)std::chrono::duration_cast<std::chrono::seconds>(std::chrono::steady_clock::now() - start_time).count(),
 #endif
-		 std::lround(partition.pc.GetTotalPlayTime().count()));
+		 lround(partition.pc.GetTotalPlayTime().count()));
 
 #ifdef ENABLE_DATABASE
-	const Database *db = partition.instance.database;
+	const Database *db = partition.instance.GetDatabase();
 	if (db != nullptr)
 		db_stats_print(r, *db);
 #endif

src/TagArchive.cxx

@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "TagArchive.hxx"
 #include "TagStream.hxx"
 #include "archive/ArchiveFile.hxx"

src/TagArchive.hxx

@@ -20,8 +20,6 @@
 #ifndef MPD_TAG_ARCHIVE_HXX
 #define MPD_TAG_ARCHIVE_HXX
 
-#include "check.h"
-
 class ArchiveFile;
 class TagHandler;
 class TagBuilder;

src/TagFile.cxx

@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "TagFile.hxx"
 #include "tag/Generic.hxx"
 #include "tag/Handler.hxx"
@@ -48,11 +47,11 @@ public:
 		 handler(_handler),
 		 is(nullptr) {}
 
-	bool ScanFile(const DecoderPlugin &plugin) noexcept {
+	bool ScanFile(const DecoderPlugin &plugin) {
 		return plugin.ScanFile(path_fs, handler);
 	}
 
-	bool ScanStream(const DecoderPlugin &plugin) noexcept {
+	bool ScanStream(const DecoderPlugin &plugin) {
 		if (plugin.scan_stream == nullptr)
 			return false;
 
@@ -74,14 +73,14 @@ public:
 		return plugin.ScanStream(*is, handler);
 	}
 
-	bool Scan(const DecoderPlugin &plugin) noexcept {
+	bool Scan(const DecoderPlugin &plugin) {
 		return plugin.SupportsSuffix(suffix) &&
 			(ScanFile(plugin) || ScanStream(plugin));
 	}
 };
 
 bool
-ScanFileTagsNoGeneric(Path path_fs, TagHandler &handler) noexcept
+ScanFileTagsNoGeneric(Path path_fs, TagHandler &handler)
 {
 	assert(!path_fs.IsNull());
 
@@ -101,7 +100,7 @@ ScanFileTagsNoGeneric(Path path_fs, TagHandler &handler) noexcept
 
 bool
 ScanFileTagsWithGeneric(Path path, TagBuilder &builder,
-			AudioFormat *audio_format) noexcept
+			AudioFormat *audio_format)
 {
 	FullTagHandler h(builder, audio_format);
 

src/TagFile.hxx

@@ -20,8 +20,6 @@
 #ifndef MPD_TAG_FILE_HXX
 #define MPD_TAG_FILE_HXX
 
-#include "check.h"
-
 struct AudioFormat;
 class Path;
 class TagHandler;
@@ -32,22 +30,26 @@ class TagBuilder;
  * but does not fall back to generic scanners (APE and ID3) if no tags
  * were found (but the file was recognized).
  *
+ * Throws on I/O error.
+ *
  * @return true if the file was recognized (even if no metadata was
  * found)
  */
 bool
-ScanFileTagsNoGeneric(Path path, TagHandler &handler) noexcept;
+ScanFileTagsNoGeneric(Path path, TagHandler &handler);
 
 /**
  * Scan the tags of a song file.  Invokes matching decoder plugins,
  * and falls back to generic scanners (APE and ID3) if no tags were
  * found (but the file was recognized).
  *
+ * Throws on I/O error.
+ *
  * @return true if the file was recognized (even if no metadata was
  * found)
  */
 bool
 ScanFileTagsWithGeneric(Path path, TagBuilder &builder,
-			AudioFormat *audio_format=nullptr) noexcept;
+			AudioFormat *audio_format=nullptr);
 
 #endif

src/TagPrint.cxx

@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "TagPrint.hxx"
 #include "tag/Tag.hxx"
 #include "tag/Settings.hxx"
@@ -26,8 +25,9 @@
 void
 tag_print_types(Response &r) noexcept
 {
+	const auto tag_mask = global_tag_mask & r.GetTagMask();
 	for (unsigned i = 0; i < TAG_NUM_OF_ITEM_TYPES; i++)
-		if (IsTagEnabled(i))
+		if (tag_mask.Test(TagType(i)))
 			r.Format("tagtype: %s\n", tag_item_names[i]);
 }
 

src/TagSave.cxx

@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "TagSave.hxx"
 #include "tag/Tag.hxx"
 #include "fs/io/BufferedOutputStream.hxx"

src/TagStream.cxx

@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "TagStream.hxx"
 #include "tag/Generic.hxx"
 #include "tag/Handler.hxx"
@@ -46,7 +45,7 @@ CheckDecoderPlugin(const DecoderPlugin &plugin,
 }
 
 bool
-tag_stream_scan(InputStream &is, TagHandler &handler) noexcept
+tag_stream_scan(InputStream &is, TagHandler &handler)
 {
 	assert(is.IsReady());
 
@@ -74,19 +73,17 @@ tag_stream_scan(InputStream &is, TagHandler &handler) noexcept
 }
 
 bool
-tag_stream_scan(const char *uri, TagHandler &handler) noexcept
-try {
+tag_stream_scan(const char *uri, TagHandler &handler)
+{
 	Mutex mutex;
 
 	auto is = InputStream::OpenReady(uri, mutex);
 	return tag_stream_scan(*is, handler);
-} catch (const std::exception &e) {
-	return false;
 }
 
 bool
 tag_stream_scan(InputStream &is, TagBuilder &builder,
-		AudioFormat *audio_format) noexcept
+		AudioFormat *audio_format)
 {
 	assert(is.IsReady());
 
@@ -103,12 +100,10 @@ tag_stream_scan(InputStream &is, TagBuilder &builder,
 
 bool
 tag_stream_scan(const char *uri, TagBuilder &builder,
-		AudioFormat *audio_format) noexcept
-try {
+		AudioFormat *audio_format)
+{
 	Mutex mutex;
 
 	auto is = InputStream::OpenReady(uri, mutex);
 	return tag_stream_scan(*is, builder, audio_format);
-} catch (const std::exception &e) {
-	return false;
 }

src/TagStream.hxx

@@ -20,8 +20,6 @@
 #ifndef MPD_TAG_STREAM_HXX
 #define MPD_TAG_STREAM_HXX
 
-#include "check.h"
-
 struct AudioFormat;
 class InputStream;
 class TagHandler;
@@ -31,29 +29,39 @@ class TagBuilder;
  * Scan the tags of an #InputStream.  Invokes matching decoder
  * plugins, but does not invoke the special "APE" and "ID3" scanners.
  *
+ * Throws on I/O error.
+ *
  * @return true if the file was recognized (even if no metadata was
  * found)
  */
 bool
-tag_stream_scan(InputStream &is, TagHandler &handler) noexcept;
+tag_stream_scan(InputStream &is, TagHandler &handler);
 
+/**
+ * Throws on I/O error.
+ */
 bool
-tag_stream_scan(const char *uri, TagHandler &handler) noexcept;
+tag_stream_scan(const char *uri, TagHandler &handler);
 
 /**
  * Scan the tags of an #InputStream.  Invokes matching decoder
  * plugins, and falls back to generic scanners (APE and ID3) if no
  * tags were found (but the file was recognized).
  *
+ * Throws on I/O error.
+ *
  * @return true if the file was recognized (even if no metadata was
  * found)
  */
 bool
 tag_stream_scan(InputStream &is, TagBuilder &builder,
-		AudioFormat *audio_format=nullptr) noexcept;
+		AudioFormat *audio_format=nullptr);
 
+/**
+ * Throws on I/O error.
+ */
 bool
 tag_stream_scan(const char *uri, TagBuilder &builder,
-		AudioFormat *audio_format=nullptr) noexcept;
+		AudioFormat *audio_format=nullptr);
 
 #endif

src/TimePrint.cxx

@@ -17,10 +17,9 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "TimePrint.hxx"
 #include "client/Response.hxx"
-#include "util/TimeISO8601.hxx"
+#include "time/ISO8601.hxx"
 
 void
 time_print(Response &r, const char *name,

src/android/AudioManager.cxx

@@ -0,0 +1,56 @@
+/*
+ * Copyright 2003-2020 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 "AudioManager.hxx"
+#include "java/Class.hxx"
+#include "java/Exception.hxx"
+#include "java/File.hxx"
+
+#define STREAM_MUSIC 3
+
+AudioManager::AudioManager(JNIEnv *env, jobject obj) noexcept
+	: Java::GlobalObject(env, obj)
+{
+	Java::Class cls(env, env->GetObjectClass(Get()));
+	jmethodID method = env->GetMethodID(cls, "getStreamMaxVolume", "(I)I");
+	assert(method);
+	maxVolume = env->CallIntMethod(Get(), method, STREAM_MUSIC);
+
+	getStreamVolumeMethod = env->GetMethodID(cls, "getStreamVolume", "(I)I");
+	assert(getStreamVolumeMethod);
+
+	setStreamVolumeMethod = env->GetMethodID(cls, "setStreamVolume", "(III)V");
+	assert(setStreamVolumeMethod);
+}
+
+int
+AudioManager::GetVolume(JNIEnv *env)
+{
+	if (maxVolume == 0)
+		return 0;
+	return env->CallIntMethod(Get(), getStreamVolumeMethod, STREAM_MUSIC);
+}
+
+void
+AudioManager::SetVolume(JNIEnv *env, int volume)
+{
+	if (maxVolume == 0)
+		return;
+	env->CallVoidMethod(Get(), setStreamVolumeMethod, STREAM_MUSIC, volume, 0);
+}

src/android/AudioManager.hxx

@@ -0,0 +1,42 @@
+/*
+ * Copyright 2003-2020 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_ANDROID_AUDIO_MANAGER_HXX
+#define MPD_ANDROID_AUDIO_MANAGER_HXX
+
+#include "java/Object.hxx"
+
+class AudioManager : public Java::GlobalObject {
+	int maxVolume;
+	jmethodID getStreamVolumeMethod;
+	jmethodID setStreamVolumeMethod;
+
+public:
+	AudioManager(JNIEnv *env, jobject obj) noexcept;
+
+	AudioManager(std::nullptr_t) noexcept { maxVolume = 0; }
+
+	~AudioManager() noexcept {}
+
+	int GetMaxVolume() { return maxVolume; }
+	int GetVolume(JNIEnv *env);
+	void SetVolume(JNIEnv *env, int);
+};
+
+#endif

src/android/Context.cxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2019 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -17,14 +17,16 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Context.hxx"
 #include "java/Class.hxx"
 #include "java/File.hxx"
+#include "java/String.hxx"
 #include "fs/AllocatedPath.hxx"
 
+#include "AudioManager.hxx"
+
 AllocatedPath
-Context::GetCacheDir(JNIEnv *env) const
+Context::GetCacheDir(JNIEnv *env) const noexcept
 {
 	assert(env != nullptr);
 
@@ -41,3 +43,21 @@ Context::GetCacheDir(JNIEnv *env) const
 
 	return Java::File::ToAbsolutePath(env, file);
 }
+
+AudioManager *
+Context::GetAudioManager(JNIEnv *env) noexcept
+{
+	assert(env != nullptr);
+
+	Java::Class cls(env, env->GetObjectClass(Get()));
+	jmethodID method = env->GetMethodID(cls, "getSystemService",
+					    "(Ljava/lang/String;)Ljava/lang/Object;");
+	assert(method);
+
+	Java::String name(env, "audio");
+	jobject am = env->CallObjectMethod(Get(), method, name.Get());
+	if (Java::DiscardException(env) || am == nullptr)
+		return nullptr;
+
+    return new AudioManager(env, am);
+}

src/android/Context.hxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2019 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -23,13 +23,18 @@
 #include "java/Object.hxx"
 
 class AllocatedPath;
+class AudioManager;
 
-class Context : public Java::Object {
+class Context : public Java::GlobalObject {
 public:
-	Context(JNIEnv *env, jobject obj):Java::Object(env, obj) {}
+	Context(JNIEnv *env, jobject obj) noexcept
+		:Java::GlobalObject(env, obj) {}
 
 	gcc_pure
-	AllocatedPath GetCacheDir(JNIEnv *env) const;
+	AllocatedPath GetCacheDir(JNIEnv *env) const noexcept;
+
+	gcc_pure
+	AudioManager *GetAudioManager(JNIEnv *env) noexcept;
 };
 
 #endif

src/android/Environment.cxx

@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Environment.hxx"
 #include "java/Class.hxx"
 #include "java/String.hxx"

src/android/LogListener.cxx

@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "LogListener.hxx"
 #include "java/Class.hxx"
 #include "java/String.hxx"

src/android/LogListener.hxx

@@ -22,9 +22,9 @@
 
 #include "java/Object.hxx"
 
-class LogListener : public Java::Object {
+class LogListener : public Java::GlobalObject {
 public:
-	LogListener(JNIEnv *env, jobject obj):Java::Object(env, obj) {}
+	LogListener(JNIEnv *env, jobject obj):Java::GlobalObject(env, obj) {}
 
 	void OnLog(JNIEnv *env, int priority, const char *fmt, ...) const;
 };

src/apple/AudioObject.cxx

@@ -0,0 +1,40 @@
+/*
+ * Copyright 2020 Max Kellermann <max.kellermann@gmail.com>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the
+ * distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
+ * FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "AudioObject.hxx"
+#include "StringRef.hxx"
+
+Apple::StringRef
+AudioObjectGetStringProperty(AudioObjectID inObjectID,
+			     const AudioObjectPropertyAddress &inAddress)
+{
+	auto s = AudioObjectGetPropertyDataT<CFStringRef>(inObjectID,
+							  inAddress);
+	return Apple::StringRef(s);
+}

src/apple/AudioObject.hxx

@@ -0,0 +1,105 @@
+/*
+ * Copyright 2020 Max Kellermann <max.kellermann@gmail.com>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the
+ * distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
+ * FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef APPLE_AUDIO_OBJECT_HXX
+#define APPLE_AUDIO_OBJECT_HXX
+
+#include "Throw.hxx"
+#include "util/AllocatedArray.hxx"
+
+#include <CoreAudio/AudioHardware.h>
+
+#include <cstddef>
+
+namespace Apple {
+class StringRef;
+}
+
+inline std::size_t
+AudioObjectGetPropertyDataSize(AudioObjectID inObjectID,
+			       const AudioObjectPropertyAddress &inAddress)
+{
+	UInt32 size;
+	OSStatus status = AudioObjectGetPropertyDataSize(inObjectID,
+							 &inAddress,
+							 0, nullptr, &size);
+	if (status != noErr)
+		Apple::ThrowOSStatus(status);
+
+	return size;
+}
+
+template<typename T>
+T
+AudioObjectGetPropertyDataT(AudioObjectID inObjectID,
+			    const AudioObjectPropertyAddress &inAddress)
+{
+	OSStatus status;
+	UInt32 size = sizeof(T);
+	T value;
+
+	status = AudioObjectGetPropertyData(inObjectID, &inAddress,
+					    0, nullptr,
+					    &size, &value);
+	if (status != noErr)
+		Apple::ThrowOSStatus(status);
+
+	return value;
+}
+
+Apple::StringRef
+AudioObjectGetStringProperty(AudioObjectID inObjectID,
+			     const AudioObjectPropertyAddress &inAddress);
+
+template<typename T>
+AllocatedArray<T>
+AudioObjectGetPropertyDataArray(AudioObjectID inObjectID,
+			       const AudioObjectPropertyAddress &inAddress)
+{
+	OSStatus status;
+	UInt32 size;
+
+	status = AudioObjectGetPropertyDataSize(inObjectID,
+						&inAddress,
+						0, nullptr, &size);
+	if (status != noErr)
+		Apple::ThrowOSStatus(status);
+
+	AllocatedArray<T> result(size / sizeof(T));
+
+	status = AudioObjectGetPropertyData(inObjectID, &inAddress,
+					    0, nullptr,
+					    &size, result.begin());
+	if (status != noErr)
+		Apple::ThrowOSStatus(status);
+
+	return result;
+}
+
+#endif

src/apple/AudioUnit.hxx

@@ -0,0 +1,111 @@
+/*
+ * Copyright 2020 Max Kellermann <max.kellermann@gmail.com>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the
+ * distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
+ * FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef APPLE_AUDIO_UNIT_HXX
+#define APPLE_AUDIO_UNIT_HXX
+
+#include "Throw.hxx"
+
+#include <AudioUnit/AudioUnit.h>
+
+template<typename T>
+T
+AudioUnitGetPropertyT(AudioUnit inUnit, AudioUnitPropertyID inID,
+		      AudioUnitScope inScope,
+		      AudioUnitElement inElement)
+{
+	UInt32 size = sizeof(T);
+	T value;
+
+	OSStatus status = AudioUnitGetProperty(inUnit, inID, inScope,
+					       inElement,
+					       &value, &size);
+	if (status != noErr)
+		Apple::ThrowOSStatus(status);
+
+	return value;
+}
+
+template<typename T>
+void
+AudioUnitSetPropertyT(AudioUnit inUnit, AudioUnitPropertyID inID,
+		      AudioUnitScope inScope,
+		      AudioUnitElement inElement,
+		      const T &value)
+{
+	OSStatus status = AudioUnitSetProperty(inUnit, inID, inScope,
+					       inElement,
+					       &value, sizeof(value));
+	if (status != noErr)
+		Apple::ThrowOSStatus(status);
+}
+
+inline void
+AudioUnitSetCurrentDevice(AudioUnit inUnit, const AudioDeviceID &value)
+{
+	AudioUnitSetPropertyT(inUnit, kAudioOutputUnitProperty_CurrentDevice,
+			      kAudioUnitScope_Global, 0,
+			      value);
+}
+
+inline void
+AudioUnitSetInputStreamFormat(AudioUnit inUnit,
+			      const AudioStreamBasicDescription &value)
+{
+	AudioUnitSetPropertyT(inUnit, kAudioUnitProperty_StreamFormat,
+			      kAudioUnitScope_Input, 0,
+			      value);
+}
+
+inline void
+AudioUnitSetInputRenderCallback(AudioUnit inUnit,
+				const AURenderCallbackStruct &value)
+{
+	AudioUnitSetPropertyT(inUnit, kAudioUnitProperty_SetRenderCallback,
+			      kAudioUnitScope_Input, 0,
+			      value);
+}
+
+inline UInt32
+AudioUnitGetBufferFrameSize(AudioUnit inUnit)
+{
+	return AudioUnitGetPropertyT<UInt32>(inUnit,
+					     kAudioDevicePropertyBufferFrameSize,
+					     kAudioUnitScope_Global, 0);
+}
+
+inline void
+AudioUnitSetBufferFrameSize(AudioUnit inUnit, const UInt32 &value)
+{
+	AudioUnitSetPropertyT(inUnit, kAudioDevicePropertyBufferFrameSize,
+			      kAudioUnitScope_Global, 0,
+			      value);
+}
+
+#endif