release v0.21.9

Closes https://github.com/MusicPlayerDaemon/MPD/issues/340

.travis.yml

@@ -9,7 +9,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
@@ -34,7 +34,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

NEWS

@@ -1,3 +1,77 @@
+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 ..."

android/AndroidManifest.xml

@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="org.musicpd"
           android:installLocation="auto"
-          android:versionCode="26"
-          android:versionName="0.21.4">
+          android:versionCode="32"
+          android:versionName="0.21.9">
 
   <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="26"/>
 

android/build.py

@@ -138,6 +138,12 @@ class AndroidNdkToolchain:
         libstdcxx_ldflags = libstdcxx_flags + ' -L' + libcxx_libs_path
         libstdcxx_libs = '-lc++_static -lc++abi'
 
+        if self.is_armv7:
+            # On 32 bit ARM, clang generates no ".eh_frame" section;
+            # instead, the LLVM unwinder library is used for unwinding
+            # the stack after a C++ exception was thrown
+            libstdcxx_libs += ' -lunwind'
+
         if use_cxx:
             self.cxxflags += ' ' + libstdcxx_cxxflags
             self.ldflags += ' ' + libstdcxx_ldflags

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/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;
@@ -178,6 +180,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 +213,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() {
 

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/conf.py

@@ -38,7 +38,7 @@ author = 'Max Kellermann'
 # built documents.
 #
 # The short X.Y version.
-version = '0.21.4'
+version = '0.21.9'
 # The full version, including alpha/beta/rc tags.
 release = version
 

doc/developer.rst

@@ -96,10 +96,8 @@ When the whole patch series is finished, convert stgit patches to git commits:
 Submitting Patches
 ==================
 
-Send your patches to the mailing list:
-Email: `mpd-devel <mpd-devel@musicpd.org>`_
-
-:program:`git pull` requests are preferred.
+Submit pull requests on GitHub:
+https://github.com/MusicPlayerDaemon/MPD/pulls
 
 Development Tools
 =================

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/plugins.rst

@@ -87,6 +87,22 @@ 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
@@ -674,6 +690,8 @@ Valid quality values for libsoxr:
 * "low"
 * "quick"
 
+.. _output_plugins:
+
 Output plugins
 --------------
 
@@ -784,6 +802,15 @@ 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/>`_.
@@ -822,7 +849,7 @@ 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**
@@ -935,6 +962,8 @@ 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
 ~~~~~~~~
@@ -974,6 +1003,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**
@@ -1017,8 +1048,41 @@ 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 expensve 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
 ----------------
 

doc/protocol.rst

@@ -14,6 +14,9 @@ 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 (without an
+extra newline, because this binary data is not a text line), 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,15 +166,20 @@ 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.
+  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.
@@ -173,12 +200,13 @@ 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.  Note that each expression
   must be enclosed in parantheses, e.g. :code:`(!(artist == 'VALUE'))`
@@ -207,11 +235,11 @@ backslash.
 
 Example expression which matches an artist named ``foo'bar"``::
 
- (artist "foo\'bar\"")
+ (Artist == "foo\'bar\"")
 
 At the protocol level, the command must look like this::
 
- find "(artist \"foo\\'bar\\\"\")"
+ 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
@@ -409,15 +437,18 @@ Querying :program:`MPD`'s status
     - ``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)
+    - ``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, but with higher resolution.
+    - ``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
 
@@ -432,7 +463,7 @@ Querying :program:`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_playtime``: sum of all song times in the database in seconds
     - ``db_update``: last db update in UNIX time
     - ``playtime``: time length of music played
 
@@ -594,7 +625,7 @@ Whenever possible, ids should be used.
     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.
@@ -714,7 +745,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}`
@@ -783,7 +816,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::
@@ -791,8 +824,7 @@ The music database
      albumart
      size: 1024768
      binary: 8192
-     <8192 bytes>
-     OK
+     <8192 bytes>OK
 
 :command:`count {FILTER} [group {GROUPTYPE}]`
     Count the number of songs and their total playtime in
@@ -853,8 +885,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
-    :program:`MPD` or
-    *file*.
+    :program:`MPD`.
 
     Additional arguments may specify a :ref:`filter <filter_syntax>`.
     The *group* keyword may be used
@@ -865,6 +896,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]`
@@ -909,7 +944,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``,
@@ -924,7 +959,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).
 
@@ -1046,7 +1081,8 @@ Stickers
 "Stickers" [#since_0_15]_ are pieces of
 information attached to existing
 :program:`MPD` objects (e.g. song files,
-directories, albums).  Clients can create arbitrary name/value
+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.
 
@@ -1131,7 +1167,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.
@@ -1215,7 +1251,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.2 <http://mesonbuild.com/>`__ and `Ninja
+* `Meson 0.49.0 <http://mesonbuild.com/>`__ and `Ninja
   <https://ninja-build.org/>`__
 * Boost 1.58
 * pkg-config 
@@ -365,10 +365,14 @@ 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
 -------------------------
 
@@ -398,14 +402,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**
@@ -421,6 +420,15 @@ The following table lists the audio_output options valid for all plugins:
        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
 -------------------
@@ -436,6 +444,9 @@ To configure a filter, add a :code:`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::
@@ -449,6 +460,9 @@ 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
 ----------------------------
 
@@ -485,10 +499,31 @@ reference.
 Audio Format Settings
 ---------------------
 
+.. _audio_output_format:
+
 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 values are the same as in format in the audio_output section.
+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
 ~~~~~~~~~
@@ -531,6 +566,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::
 
@@ -860,7 +901,7 @@ To verify if :program:`MPD` converts the audio format, enable verbose logging, a
 .. code-block:: none
 
     decoder: audio_format=44100:24:2, seekable=true
-    output: opened plugin=alsa name="An ALSA output"audio_format=44100:16:2
+    output: opened plugin=alsa name="An ALSA output" audio_format=44100:16:2
     output: converting from 44100:24:2
 
 This example shows that a 24 bit file is being played, but the sound chip cannot play 24 bit. It falls back to 16 bit, discarding 8 bit.
@@ -887,7 +928,7 @@ Check list for bit-perfect playback:
   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`, :code:`audio_output_format`).
+  :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)

meson.build

@@ -1,8 +1,8 @@
 project(
   'mpd',
   ['c', 'cpp'],
-  version: '0.21.4',
-  meson_version: '>= 0.47.2',
+  version: '0.21.9',
+  meson_version: '>= 0.49.0',
   default_options: [
     'c_std=c99',
     'cpp_std=c++14'
@@ -20,7 +20,7 @@ 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.4')
+conf.set_quoted('PROTOCOL_VERSION', '0.21.6')
 conf.set_quoted('SYSTEM_CONFIG_FILE_LOCATION', join_paths(get_option('prefix'), get_option('sysconfdir'), 'mpd.conf'))
 
 common_cppflags = [
@@ -367,8 +367,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'
@@ -390,6 +392,7 @@ more_deps = []
 if is_android
   subdir('src/java')
   target_type = 'shared_library'
+  target_name = 'mpd'
   link_args += [
     '-Wl,--no-undefined,-shared,-Bsymbolic',
     '-llog',
@@ -399,12 +402,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,
@@ -443,6 +454,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,6 +128,7 @@ 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')

python/build/libs.py

@@ -112,8 +112,8 @@ liblame = AutotoolsProject(
 )
 
 ffmpeg = FfmpegProject(
-    'http://ffmpeg.org/releases/ffmpeg-4.1.tar.xz',
-    'a38ec4d026efb58506a99ad5cd23d5a9793b4bf415f2c4c2e9c1bb444acd1994',
+    'http://ffmpeg.org/releases/ffmpeg-4.1.3.tar.xz',
+    '0c3020452880581a8face91595b239198078645e7d7184273b8bcc7758beb63d',
     'lib/libavcodec.a',
     [
         '--disable-shared', '--enable-static',
@@ -341,8 +341,8 @@ ffmpeg = FfmpegProject(
 )
 
 curl = AutotoolsProject(
-    'http://curl.haxx.se/download/curl-7.62.0.tar.xz',
-    'dab5643a5fe775ae92570b9f3df6b0ef4bc2a827a959361fb130c73b721275c1',
+    'http://curl.haxx.se/download/curl-7.64.1.tar.xz',
+    '9252332a7f871ce37bfa7f78bdd0a0e3924d8187cc27cb57c76c9474a7168fb3',
     'lib/libcurl.a',
     [
         '--disable-shared', '--enable-static',
@@ -375,8 +375,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 +387,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',
+    'http://downloads.sourceforge.net/project/boost/boost/1.70.0/boost_1_70_0.tar.bz2',
+    '430ae8354789de4fd19ee52f3b1f739e1fba576f0aded0897c3c2bc00fb38778',
     'include/boost/version.hpp',
 )

src/CommandLine.cxx

@@ -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");
 

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

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

@@ -55,14 +55,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
 		  )
 {
-	if (!uri_supported_scheme(uri))
-		throw std::runtime_error("Unsupported URI scheme");
+	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 +88,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 +113,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

@@ -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/LogInit.cxx

@@ -109,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;
@@ -171,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();
@@ -181,7 +181,7 @@ close_log_files(void)
 #endif
 
 void
-log_deinit(void)
+log_deinit() noexcept
 {
 #ifndef ANDROID
 	close_log_files();
@@ -213,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/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,
-					 instance->io_thread.GetEventLoop(),
-					 *instance);
-	if (instance->database == nullptr)
+	auto db = CreateConfiguredDatabase(config, instance->event_loop,
+					   instance->io_thread.GetEventLoop(),
+					   *instance);
+	if (!db)
 		return true;
 
-	if (instance->database->GetPlugin().RequireStorage()) {
+	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"));
 	}
 
-	auto *db = dynamic_cast<SimpleDatabase *>(instance->database);
-	if (db == nullptr)
+	instance->database = std::move(db);
+
+	auto *sdb = dynamic_cast<SimpleDatabase *>(instance->database.get());
+	if (sdb == nullptr)
 		return true;
 
 	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)
 {
@@ -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,
-				 instance->io_thread.GetEventLoop());
-	playlist_list_global_init(raw_config);
+	const ScopeInputPluginsInit input_plugins_init(raw_config,
+						       instance->io_thread.GetEventLoop());
+	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

@@ -37,9 +37,6 @@ class AllocatedPath;
 void
 mapper_init(AllocatedPath &&playlist_dir);
 
-void
-mapper_finish() noexcept;
-
 #ifdef ENABLE_DATABASE
 
 /**

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/SongLoader.cxx

@@ -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/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/Stats.cxx

@@ -124,7 +124,7 @@ stats_print(Response &r, const Partition &partition)
 		 std::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/TagPrint.cxx

@@ -25,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/archive/ArchiveList.cxx

@@ -49,7 +49,7 @@ static bool archive_plugins_enabled[ARRAY_SIZE(archive_plugins) - 1];
 		if (archive_plugins_enabled[archive_plugin_iterator - archive_plugins])
 
 const ArchivePlugin *
-archive_plugin_from_suffix(const char *suffix)
+archive_plugin_from_suffix(const char *suffix) noexcept
 {
 	if (suffix == nullptr)
 		return nullptr;
@@ -63,7 +63,7 @@ archive_plugin_from_suffix(const char *suffix)
 }
 
 const ArchivePlugin *
-archive_plugin_from_name(const char *name)
+archive_plugin_from_name(const char *name) noexcept
 {
 	archive_plugins_for_each_enabled(plugin)
 		if (strcmp(plugin->name, name) == 0)
@@ -81,7 +81,8 @@ void archive_plugin_init_all(void)
 	}
 }
 
-void archive_plugin_deinit_all(void)
+void
+archive_plugin_deinit_all() noexcept
 {
 	archive_plugins_for_each_enabled(plugin)
 		if (plugin->finish != nullptr)

src/archive/ArchiveList.hxx

@@ -33,10 +33,10 @@ extern const ArchivePlugin *const archive_plugins[];
 /* interface for using plugins */
 
 const ArchivePlugin *
-archive_plugin_from_suffix(const char *suffix);
+archive_plugin_from_suffix(const char *suffix) noexcept;
 
 const ArchivePlugin *
-archive_plugin_from_name(const char *name);
+archive_plugin_from_name(const char *name) noexcept;
 
 /* this is where we "load" all the "plugins" ;-) */
 void
@@ -44,6 +44,17 @@ archive_plugin_init_all();
 
 /* this is where we "unload" all the "plugins" */
 void
-archive_plugin_deinit_all();
+archive_plugin_deinit_all() noexcept;
+
+class ScopeArchivePluginsInit {
+public:
+	ScopeArchivePluginsInit() {
+		archive_plugin_init_all();
+	}
+
+	~ScopeArchivePluginsInit() noexcept {
+		archive_plugin_deinit_all();
+	}
+};
 
 #endif

src/command/AllCommands.cxx

@@ -285,11 +285,6 @@ command_init()
 #endif
 }
 
-void
-command_finish()
-{
-}
-
 static const struct command *
 command_lookup(const char *name)
 {

src/command/DatabaseCommands.cxx

@@ -268,7 +268,10 @@ handle_list(Client &client, Request args, Response &r)
 	std::unique_ptr<SongFilter> filter;
 	TagType group = TAG_NUM_OF_ITEM_TYPES;
 
-	if (args.size == 1) {
+	if (args.size == 1 &&
+	    /* parantheses are the syntax for filter expressions: no
+	       compatibility mode */
+	    args.front()[0] != '(') {
 		/* for compatibility with < 0.12.0 */
 		if (tagType != TAG_ALBUM) {
 			r.FormatError(ACK_ERROR_ARG,

src/command/FileCommands.cxx

@@ -37,9 +37,11 @@
 #include "fs/FileInfo.hxx"
 #include "fs/DirectoryReader.hxx"
 #include "input/InputStream.hxx"
+#include "input/Error.hxx"
 #include "LocateUri.hxx"
 #include "TimePrint.hxx"
 #include "thread/Mutex.hxx"
+#include "Log.hxx"
 
 #include <assert.h>
 #include <inttypes.h> /* for PRIu64 */
@@ -216,7 +218,7 @@ handle_read_comments(Client &client, Request args, Response &r)
 
 	const char *const uri = args.front();
 
-	const auto located_uri = LocateUri(uri, &client
+	const auto located_uri = LocateUri(UriPluginKind::INPUT, uri, &client
 #ifdef ENABLE_DATABASE
 					   , nullptr
 #endif
@@ -256,7 +258,11 @@ find_stream_art(const char *directory, Mutex &mutex)
 
 		try {
 			return InputStream::OpenReady(art_file.c_str(), mutex);
-		} catch (const std::exception &e) {}
+		} catch (...) {
+			auto e = std::current_exception();
+			if (!IsFileNotFound(e))
+				LogError(e);
+		}
 	}
 	return nullptr;
 }
@@ -285,8 +291,11 @@ read_stream_art(Response &r, const char *uri, size_t offset)
 	uint8_t buffer[CHUNK_SIZE];
 	size_t read_size;
 
-	is->Seek(offset);
-	read_size = is->Read(&buffer, CHUNK_SIZE);
+	{
+		const std::lock_guard<Mutex> protect(mutex);
+		is->Seek(offset);
+		read_size = is->Read(&buffer, CHUNK_SIZE);
+	}
 
 	r.Format("size: %" PRIoffset "\n"
 			 "binary: %u\n",
@@ -322,7 +331,7 @@ handle_album_art(Client &client, Request args, Response &r)
 	const char *uri = args.front();
 	size_t offset = args.ParseUnsigned(1);
 
-	const auto located_uri = LocateUri(uri, &client
+	const auto located_uri = LocateUri(UriPluginKind::INPUT, uri, &client
 #ifdef ENABLE_DATABASE
 					   , nullptr
 #endif

src/command/OtherCommands.cxx

@@ -99,7 +99,7 @@ handle_listfiles(Client &client, Request args, Response &r)
 	/* default is root directory */
 	const auto uri = args.GetOptional(0, "");
 
-	const auto located_uri = LocateUri(uri, &client
+	const auto located_uri = LocateUri(UriPluginKind::STORAGE, uri, &client
 #ifdef ENABLE_DATABASE
 					   , nullptr
 #endif
@@ -219,7 +219,7 @@ handle_lsinfo(Client &client, Request args, Response &r)
 		   compatibility, work around this here */
 		uri = "";
 
-	const auto located_uri = LocateUri(uri, &client
+	const auto located_uri = LocateUri(UriPluginKind::INPUT, uri, &client
 #ifdef ENABLE_DATABASE
 					   , nullptr
 #endif
@@ -294,7 +294,7 @@ handle_update(Client &client, Request args, Response &r, bool discard)
 	if (update != nullptr)
 		return handle_update(r, *update, path, discard);
 
-	Database *db = client.GetInstance().database;
+	Database *db = client.GetInstance().GetDatabase();
 	if (db != nullptr)
 		return handle_update(r, *db, path, discard);
 #else

src/command/PlaylistCommands.cxx

@@ -20,6 +20,7 @@
 #include "config.h"
 #include "PlaylistCommands.hxx"
 #include "Request.hxx"
+#include "Instance.hxx"
 #include "db/DatabasePlaylist.hxx"
 #include "CommandError.hxx"
 #include "PlaylistSave.hxx"
@@ -27,6 +28,7 @@
 #include "PlaylistError.hxx"
 #include "db/PlaylistVector.hxx"
 #include "SongLoader.hxx"
+#include "song/DetachedSong.hxx"
 #include "BulkEdit.hxx"
 #include "playlist/PlaylistQueue.hxx"
 #include "playlist/Print.hxx"
@@ -38,6 +40,7 @@
 #include "util/UriUtil.hxx"
 #include "util/ConstBuffer.hxx"
 #include "util/ChronoUtil.hxx"
+#include "LocateUri.hxx"
 
 bool
 playlist_commands_available() noexcept
@@ -66,22 +69,43 @@ handle_save(Client &client, Request args, gcc_unused Response &r)
 CommandResult
 handle_load(Client &client, Request args, gcc_unused Response &r)
 {
+	const auto uri = LocateUri(UriPluginKind::PLAYLIST, args.front(),
+				   &client
+#ifdef ENABLE_DATABASE
+					   , nullptr
+#endif
+					   );
 	RangeArg range = args.ParseOptional(1, RangeArg::All());
 
 	const ScopeBulkEdit bulk_edit(client.GetPartition());
 
+	auto &playlist = client.GetPlaylist();
+	const unsigned old_size = playlist.GetLength();
+
 	const SongLoader loader(client);
-	playlist_open_into_queue(args.front(),
+	playlist_open_into_queue(uri,
 				 range.start, range.end,
-				 client.GetPlaylist(),
+				 playlist,
 				 client.GetPlayerControl(), loader);
+
+	/* invoke the RemoteTagScanner on all newly added songs */
+	auto &instance = client.GetInstance();
+	const unsigned new_size = playlist.GetLength();
+	for (unsigned i = old_size; i < new_size; ++i)
+		instance.LookupRemoteTag(playlist.queue.Get(i).GetURI());
+
 	return CommandResult::OK;
 }
 
 CommandResult
 handle_listplaylist(Client &client, Request args, Response &r)
 {
-	const char *const name = args.front();
+	const auto name = LocateUri(UriPluginKind::PLAYLIST, args.front(),
+				    &client
+#ifdef ENABLE_DATABASE
+					   , nullptr
+#endif
+					   );
 
 	if (playlist_file_print(r, client.GetPartition(), SongLoader(client),
 				name, false))
@@ -93,7 +117,12 @@ handle_listplaylist(Client &client, Request args, Response &r)
 CommandResult
 handle_listplaylistinfo(Client &client, Request args, Response &r)
 {
-	const char *const name = args.front();
+	const auto name = LocateUri(UriPluginKind::PLAYLIST, args.front(),
+				    &client
+#ifdef ENABLE_DATABASE
+					   , nullptr
+#endif
+					   );
 
 	if (playlist_file_print(r, client.GetPartition(), SongLoader(client),
 				name, true))

src/command/QueueCommands.cxx

@@ -83,7 +83,8 @@ handle_add(Client &client, Request args, Response &r)
 		   here */
 		uri = "";
 
-	const auto located_uri = LocateUri(uri, &client
+	const auto located_uri = LocateUri(UriPluginKind::INPUT, uri,
+					   &client
 #ifdef ENABLE_DATABASE
 					   , nullptr
 #endif

src/command/StorageCommands.cxx

@@ -209,7 +209,7 @@ handle_mount(Client &client, Request args, Response &r)
 	instance.EmitIdle(IDLE_MOUNT);
 
 #ifdef ENABLE_DATABASE
-	if (auto *db = dynamic_cast<SimpleDatabase *>(instance.database)) {
+	if (auto *db = dynamic_cast<SimpleDatabase *>(instance.GetDatabase())) {
 		try {
 			db->Mount(local_uri, remote_uri);
 		} catch (...) {
@@ -253,7 +253,7 @@ handle_unmount(Client &client, Request args, Response &r)
 		   destroy here */
 		instance.update->CancelMount(local_uri);
 
-	if (auto *db = dynamic_cast<SimpleDatabase *>(instance.database)) {
+	if (auto *db = dynamic_cast<SimpleDatabase *>(instance.GetDatabase())) {
 		if (db->Unmount(local_uri))
 			// TODO: call Instance::OnDatabaseModified()?
 			instance.EmitIdle(IDLE_DATABASE);

src/config/Net.cxx

@@ -29,6 +29,8 @@ ServerSocketAddGeneric(ServerSocket &server_socket, const char *address, unsigne
 		server_socket.AddPort(port);
 	} else if (address[0] == '/' || address[0] == '~') {
 		server_socket.AddPath(ParsePath(address));
+	} else if (address[0] == '@') {
+		server_socket.AddAbstract(address);
 	} else {
 		server_socket.AddHost(address, port);
 	}

src/config/Net.hxx

@@ -23,14 +23,14 @@
 class ServerSocket;
 
 /**
- * Sets the address or unix socket of a ServerSocket instance
+ * Sets the address or local socket of a ServerSocket instance
  * There are three possible ways
  * 1) Set address to a valid ip address and specify port.
  *    server_socket will listen on this address/port tuple.
  * 2) Set address to null and specify port.
  *    server_socket will listen on ANY address on that port.
- * 3) Set address to a path of a unix socket. port is ignored.
- *    server_socket will listen on this unix socket.
+ * 3) Set address to a path of a local socket. port is ignored.
+ *    server_socket will listen on this local socket.
  *
  * Throws #std::runtime_error on error.
  *

src/db/Configured.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
@@ -19,6 +19,7 @@
 
 #include "Configured.hxx"
 #include "DatabaseGlue.hxx"
+#include "Interface.hxx"
 #include "config/Data.hxx"
 #include "config/Param.hxx"
 #include "config/Block.hxx"
@@ -26,7 +27,7 @@
 #include "fs/StandardDirectory.hxx"
 #include "util/RuntimeError.hxx"
 
-Database *
+DatabasePtr
 CreateConfiguredDatabase(const ConfigData &config,
 			 EventLoop &main_event_loop, EventLoop &io_event_loop,
 			 DatabaseListener &listener)

src/db/Configured.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,10 +20,11 @@
 #ifndef MPD_DB_CONFIG_HXX
 #define MPD_DB_CONFIG_HXX
 
+#include "Ptr.hxx"
+
 struct ConfigData;
 class EventLoop;
 class DatabaseListener;
-class Database;
 
 /**
  * Read database configuration settings and create a #Database
@@ -32,7 +33,7 @@ class Database;
  *
  * Throws #std::runtime_error on error.
  */
-Database *
+DatabasePtr
 CreateConfiguredDatabase(const ConfigData &config,
 			 EventLoop &main_event_loop, EventLoop &io_event_loop,
 			 DatabaseListener &listener);

src/db/DatabaseGlue.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
@@ -18,13 +18,14 @@
  */
 
 #include "DatabaseGlue.hxx"
+#include "Interface.hxx"
 #include "Registry.hxx"
 #include "DatabaseError.hxx"
 #include "util/RuntimeError.hxx"
 #include "config/Block.hxx"
 #include "DatabasePlugin.hxx"
 
-Database *
+DatabasePtr
 DatabaseGlobalInit(EventLoop &main_event_loop,
 		   EventLoop &io_event_loop,
 		   DatabaseListener &listener,

src/db/DatabaseGlue.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,12 +20,11 @@
 #ifndef MPD_DATABASE_GLUE_HXX
 #define MPD_DATABASE_GLUE_HXX
 
-#include "util/Compiler.h"
+#include "Ptr.hxx"
 
 struct ConfigBlock;
 class EventLoop;
 class DatabaseListener;
-class Database;
 
 /**
  * Initialize the database library.
@@ -34,7 +33,7 @@ class Database;
  *
  * @param block the database configuration block
  */
-Database *
+DatabasePtr
 DatabaseGlobalInit(EventLoop &main_event_loop,
 		   EventLoop &io_event_loop,
 		   DatabaseListener &listener,

src/db/DatabasePlugin.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
@@ -26,10 +26,11 @@
 #ifndef MPD_DATABASE_PLUGIN_HXX
 #define MPD_DATABASE_PLUGIN_HXX
 
+#include "Ptr.hxx"
+
 struct ConfigBlock;
 class EventLoop;
 class DatabaseListener;
-class Database;
 
 struct DatabasePlugin {
 	/**
@@ -52,10 +53,10 @@ struct DatabasePlugin {
 	 * @param io_event_loop the #EventLoop running on the
 	 * #EventThread, i.e. the one used for background I/O
 	 */
-	Database *(*create)(EventLoop &main_event_loop,
-			    EventLoop &io_event_loop,
-			    DatabaseListener &listener,
-			    const ConfigBlock &block);
+	DatabasePtr (*create)(EventLoop &main_event_loop,
+			      EventLoop &io_event_loop,
+			      DatabaseListener &listener,
+			      const ConfigBlock &block);
 
 	constexpr bool RequireStorage() const {
 		return flags & FLAG_REQUIRE_STORAGE;

src/db/Ptr.hxx

@@ -0,0 +1,29 @@
+/*
+ * Copyright 2003-2019 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef MPD_DATABASE_PTR_HXX
+#define MPD_DATABASE_PTR_HXX
+
+#include <memory>
+
+class Database;
+
+typedef std::unique_ptr<Database> DatabasePtr;
+
+#endif

src/db/VHelper.cxx

@@ -18,11 +18,11 @@
  */
 
 #include "VHelper.hxx"
-#include "song/DetachedSong.hxx"
 #include "song/LightSong.hxx"
 #include "song/Filter.hxx"
 
 #include <assert.h>
+#include <stdlib.h>
 #include <string.h>
 
 DatabaseVisitorHelper::DatabaseVisitorHelper(const DatabaseSelection &_selection,

src/db/VHelper.hxx

@@ -22,6 +22,7 @@
 
 #include "Visitor.hxx"
 #include "Selection.hxx"
+#include "song/DetachedSong.hxx"
 
 #include <vector>
 

src/db/meson.build

@@ -9,6 +9,11 @@ db_api_dep = declare_dependency(
   link_with: db_api,
 )
 
+if not enable_database
+  db_glue_dep = db_api_dep
+  subdir_done()
+endif
+
 subdir('plugins')
 
 db_glue_sources = [

src/db/plugins/ProxyDatabasePlugin.cxx

@@ -112,10 +112,10 @@ public:
 	ProxyDatabase(EventLoop &_loop, DatabaseListener &_listener,
 		      const ConfigBlock &block);
 
-	static Database *Create(EventLoop &main_event_loop,
-				EventLoop &io_event_loop,
-				DatabaseListener &listener,
-				const ConfigBlock &block);
+	static DatabasePtr Create(EventLoop &main_event_loop,
+				  EventLoop &io_event_loop,
+				  DatabaseListener &listener,
+				  const ConfigBlock &block);
 
 	void Open() override;
 	void Close() noexcept override;
@@ -440,12 +440,12 @@ ProxyDatabase::ProxyDatabase(EventLoop &_loop, DatabaseListener &_listener,
 {
 }
 
-Database *
+DatabasePtr
 ProxyDatabase::Create(EventLoop &loop, EventLoop &,
 		      DatabaseListener &listener,
 		      const ConfigBlock &block)
 {
-	return new ProxyDatabase(loop, listener, block);
+	return std::make_unique<ProxyDatabase>(loop, listener, block);
 }
 
 void
@@ -568,7 +568,8 @@ ProxyDatabase::OnSocketReady(gcc_unused unsigned flags) noexcept
 	if (!is_idle) {
 		// TODO: can this happen?
 		IdleMonitor::Schedule();
-		return false;
+		SocketMonitor::Cancel();
+		return true;
 	}
 
 	unsigned idle = (unsigned)mpd_recv_idle(connection, false);
@@ -586,7 +587,8 @@ ProxyDatabase::OnSocketReady(gcc_unused unsigned flags) noexcept
 	idle_received |= idle;
 	is_idle = false;
 	IdleMonitor::Schedule();
-	return false;
+	SocketMonitor::Cancel();
+	return true;
 }
 
 void

src/db/plugins/simple/Directory.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
@@ -37,22 +37,25 @@
 #include <string.h>
 #include <stdlib.h>
 
-Directory::Directory(std::string &&_path_utf8, Directory *_parent)
+Directory::Directory(std::string &&_path_utf8, Directory *_parent) noexcept
 	:parent(_parent),
 	 path(std::move(_path_utf8))
 {
 }
 
-Directory::~Directory()
+Directory::~Directory() noexcept
 {
-	delete mounted_database;
+	if (mounted_database != nullptr) {
+		mounted_database->Close();
+		mounted_database.reset();
+	}
 
 	songs.clear_and_dispose(Song::Disposer());
 	children.clear_and_dispose(DeleteDisposer());
 }
 
 void
-Directory::Delete()
+Directory::Delete() noexcept
 {
 	assert(holding_db_lock());
 	assert(parent != nullptr);
@@ -70,7 +73,7 @@ Directory::GetName() const noexcept
 }
 
 Directory *
-Directory::CreateChild(const char *name_utf8)
+Directory::CreateChild(const char *name_utf8) noexcept
 {
 	assert(holding_db_lock());
 	assert(name_utf8 != nullptr);
@@ -160,7 +163,7 @@ Directory::LookupDirectory(const char *uri) noexcept
 }
 
 void
-Directory::AddSong(Song *song)
+Directory::AddSong(Song *song) noexcept
 {
 	assert(holding_db_lock());
 	assert(song != nullptr);

src/db/plugins/simple/Directory.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,6 +23,7 @@
 #include "util/Compiler.h"
 #include "db/Visitor.hxx"
 #include "db/PlaylistVector.hxx"
+#include "db/Ptr.hxx"
 #include "Song.hxx"
 
 #include <boost/intrusive/list.hpp>
@@ -43,7 +44,6 @@ static constexpr unsigned DEVICE_INARCHIVE = -1;
 static constexpr unsigned DEVICE_CONTAINER = -2;
 
 class SongFilter;
-class Database;
 
 struct Directory {
 	static constexpr auto link_mode = boost::intrusive::normal_link;
@@ -96,21 +96,21 @@ struct Directory {
 	 * If this is not nullptr, then this directory does not really
 	 * exist, but is a mount point for another #Database.
 	 */
-	Database *mounted_database = nullptr;
+	DatabasePtr mounted_database;
 
 public:
-	Directory(std::string &&_path_utf8, Directory *_parent);
-	~Directory();
+	Directory(std::string &&_path_utf8, Directory *_parent) noexcept;
+	~Directory() noexcept;
 
 	/**
 	 * Create a new root #Directory object.
 	 */
 	gcc_malloc gcc_returns_nonnull
-	static Directory *NewRoot() {
+	static Directory *NewRoot() noexcept {
 		return new Directory(std::string(), nullptr);
 	}
 
-	bool IsMount() const {
+	bool IsMount() const noexcept {
 		return mounted_database != nullptr;
 	}
 
@@ -120,7 +120,7 @@ public:
 	 *
 	 * Caller must lock the #db_mutex.
 	 */
-	void Delete();
+	void Delete() noexcept;
 
 	/**
 	 * Create a new #Directory object as a child of the given one.
@@ -129,7 +129,7 @@ public:
 	 *
 	 * @param name_utf8 the UTF-8 encoded name of the new sub directory
 	 */
-	Directory *CreateChild(const char *name_utf8);
+	Directory *CreateChild(const char *name_utf8) noexcept;
 
 	/**
 	 * Caller must lock the #db_mutex.
@@ -149,7 +149,7 @@ public:
 	 *
 	 * Caller must lock the #db_mutex.
 	 */
-	Directory *MakeChild(const char *name_utf8) {
+	Directory *MakeChild(const char *name_utf8) noexcept {
 		Directory *child = FindChild(name_utf8);
 		if (child == nullptr)
 			child = CreateChild(name_utf8);
@@ -242,7 +242,7 @@ public:
 	 * Add a song object to this directory.  Its "parent" attribute must
 	 * be set already.
 	 */
-	void AddSong(Song *song);
+	void AddSong(Song *song) noexcept;
 
 	/**
 	 * Remove a song object from this directory (which effectively

src/db/plugins/simple/SimpleDatabasePlugin.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
@@ -60,8 +60,7 @@ inline SimpleDatabase::SimpleDatabase(const ConfigBlock &block)
 #ifdef ENABLE_ZLIB
 	 compress(block.GetBlockValue("compress", true)),
 #endif
-	 cache_path(block.GetPath("cache_directory")),
-	 prefixed_light_song(nullptr)
+	 cache_path(block.GetPath("cache_directory"))
 {
 	if (path.IsNull())
 		throw std::runtime_error("No \"path\" parameter specified");
@@ -84,12 +83,12 @@ inline SimpleDatabase::SimpleDatabase(AllocatedPath &&_path,
 	 prefixed_light_song(nullptr) {
 }
 
-Database *
+DatabasePtr
 SimpleDatabase::Create(EventLoop &, EventLoop &,
 		       gcc_unused DatabaseListener &listener,
 		       const ConfigBlock &block)
 {
-	return new SimpleDatabase(block);
+	return std::make_unique<SimpleDatabase>(block);
 }
 
 void
@@ -219,6 +218,7 @@ SimpleDatabase::GetSong(const char *uri) const
 
 		prefixed_light_song =
 			new PrefixedLightSong(*song, r.directory->GetPath());
+		r.directory->mounted_database->ReturnSong(song);
 		return prefixed_light_song;
 	}
 
@@ -251,7 +251,7 @@ void
 SimpleDatabase::ReturnSong(gcc_unused const LightSong *song) const noexcept
 {
 	assert(song != nullptr);
-	assert(song == &light_song.Get() || song == prefixed_light_song);
+	assert(song == prefixed_light_song || song == &light_song.Get());
 
 	if (prefixed_light_song != nullptr) {
 		delete prefixed_light_song;
@@ -390,13 +390,13 @@ SimpleDatabase::Save()
 }
 
 void
-SimpleDatabase::Mount(const char *uri, Database *db)
+SimpleDatabase::Mount(const char *uri, DatabasePtr db)
 {
 #if !CLANG_CHECK_VERSION(3,6)
 	/* disabled on clang due to -Wtautological-pointer-compare */
 	assert(uri != nullptr);
-	assert(db != nullptr);
 #endif
+	assert(db != nullptr);
 	assert(*uri != 0);
 
 	ScopeDatabaseLock protect;
@@ -411,7 +411,7 @@ SimpleDatabase::Mount(const char *uri, Database *db)
 				    "Parent not found");
 
 	Directory *mnt = r.directory->CreateChild(r.uri);
-	mnt->mounted_database = db;
+	mnt->mounted_database = std::move(db);
 }
 
 static constexpr bool
@@ -441,27 +441,21 @@ SimpleDatabase::Mount(const char *local_uri, const char *storage_uri)
 #ifndef ENABLE_ZLIB
 	constexpr bool compress = false;
 #endif
-	auto db = new SimpleDatabase(cache_path / name_fs,
-				     compress);
-	try {
-		db->Open();
-	} catch (...) {
-		delete db;
-		throw;
-	}
+	auto db = std::make_unique<SimpleDatabase>(cache_path / name_fs,
+						   compress);
+	db->Open();
 
 	// TODO: update the new database instance?
 
 	try {
-		Mount(local_uri, db);
+		Mount(local_uri, std::move(db));
 	} catch (...) {
 		db->Close();
-		delete db;
 		throw;
 	}
 }
 
-inline Database *
+inline DatabasePtr
 SimpleDatabase::LockUmountSteal(const char *uri) noexcept
 {
 	ScopeDatabaseLock protect;
@@ -470,8 +464,7 @@ SimpleDatabase::LockUmountSteal(const char *uri) noexcept
 	if (r.uri != nullptr || !r.directory->IsMount())
 		return nullptr;
 
-	Database *db = r.directory->mounted_database;
-	r.directory->mounted_database = nullptr;
+	auto db = std::move(r.directory->mounted_database);
 	r.directory->Delete();
 
 	return db;
@@ -480,12 +473,11 @@ SimpleDatabase::LockUmountSteal(const char *uri) noexcept
 bool
 SimpleDatabase::Unmount(const char *uri) noexcept
 {
-	Database *db = LockUmountSteal(uri);
+	auto db = LockUmountSteal(uri);
 	if (db == nullptr)
 		return false;
 
 	db->Close();
-	delete db;
 	return true;
 }
 

src/db/plugins/simple/SimpleDatabasePlugin.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
@@ -21,6 +21,7 @@
 #define MPD_SIMPLE_DATABASE_PLUGIN_HXX
 
 #include "db/Interface.hxx"
+#include "db/Ptr.hxx"
 #include "fs/AllocatedPath.hxx"
 #include "song/LightSong.hxx"
 #include "util/Manual.hxx"
@@ -57,7 +58,7 @@ class SimpleDatabase : public Database {
 	 * A buffer for GetSong() when prefixing the #LightSong
 	 * instance from a mounted #Database.
 	 */
-	mutable PrefixedLightSong *prefixed_light_song;
+	mutable PrefixedLightSong *prefixed_light_song = nullptr;
 
 	/**
 	 * A buffer for GetSong().
@@ -68,15 +69,14 @@ class SimpleDatabase : public Database {
 	mutable unsigned borrowed_song_count;
 #endif
 
+public:
 	SimpleDatabase(const ConfigBlock &block);
-
 	SimpleDatabase(AllocatedPath &&_path, bool _compress) noexcept;
 
-public:
-	static Database *Create(EventLoop &main_event_loop,
-				EventLoop &io_event_loop,
-				DatabaseListener &listener,
-				const ConfigBlock &block);
+	static DatabasePtr Create(EventLoop &main_event_loop,
+				  EventLoop &io_event_loop,
+				  DatabaseListener &listener,
+				  const ConfigBlock &block);
 
 	gcc_pure
 	Directory &GetRoot() noexcept {
@@ -99,7 +99,7 @@ public:
 	 * success, this object gains ownership of the given #Database
 	 */
 	gcc_nonnull_all
-	void Mount(const char *uri, Database *db);
+	void Mount(const char *uri, DatabasePtr db);
 
 	/**
 	 * Throws #std::runtime_error on error.
@@ -142,7 +142,7 @@ private:
 	 */
 	void Load();
 
-	Database *LockUmountSteal(const char *uri) noexcept;
+	DatabasePtr LockUmountSteal(const char *uri) noexcept;
 };
 
 extern const DatabasePlugin simple_db_plugin;

src/db/plugins/upnp/UpnpDatabasePlugin.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
@@ -82,10 +82,10 @@ public:
 		:Database(upnp_db_plugin),
 		 event_loop(_event_loop) {}
 
-	static Database *Create(EventLoop &main_event_loop,
-				EventLoop &io_event_loop,
-				DatabaseListener &listener,
-				const ConfigBlock &block) noexcept;
+	static DatabasePtr Create(EventLoop &main_event_loop,
+				  EventLoop &io_event_loop,
+				  DatabaseListener &listener,
+				  const ConfigBlock &block) noexcept;
 
 	void Open() override;
 	void Close() noexcept override;
@@ -146,12 +146,12 @@ private:
 			      const UPnPDirObject& dirent) const;
 };
 
-Database *
+DatabasePtr
 UpnpDatabase::Create(EventLoop &, EventLoop &io_event_loop,
 		     gcc_unused DatabaseListener &listener,
 		     const ConfigBlock &) noexcept
 {
-	return new UpnpDatabase(io_event_loop);
+	return std::make_unique<UpnpDatabase>(io_event_loop);
 }
 
 void

src/db/update/Service.cxx

@@ -94,7 +94,7 @@ UpdateService::CancelMount(const char *uri)
 		cancel_current = next.IsDefined() && next.storage == storage2;
 	}
 
-	if (auto *db2 = dynamic_cast<SimpleDatabase *>(lr.directory->mounted_database)) {
+	if (auto *db2 = dynamic_cast<SimpleDatabase *>(lr.directory->mounted_database.get())) {
 		queue.Erase(*db2);
 		cancel_current |= next.IsDefined() && next.db == db2;
 	}
@@ -188,7 +188,7 @@ UpdateService::Enqueue(const char *path, bool discard)
 		/* follow the mountpoint, update the mounted
 		   database */
 
-		db2 = dynamic_cast<SimpleDatabase *>(lr.directory->mounted_database);
+		db2 = dynamic_cast<SimpleDatabase *>(lr.directory->mounted_database.get());
 		if (db2 == nullptr)
 			throw std::runtime_error("Cannot update this type of database");
 

src/decoder/DecoderList.cxx

@@ -152,7 +152,8 @@ decoder_plugin_init_all(const ConfigData &config)
 	}
 }
 
-void decoder_plugin_deinit_all(void)
+void
+decoder_plugin_deinit_all() noexcept
 {
 	decoder_plugins_for_each_enabled([=](const DecoderPlugin &plugin){
 			plugin.Finish();

src/decoder/DecoderList.hxx

@@ -40,11 +40,22 @@ decoder_plugin_init_all(const ConfigData &config);
 
 /* this is where we "unload" all the "plugins" */
 void
-decoder_plugin_deinit_all();
+decoder_plugin_deinit_all() noexcept;
+
+class ScopeDecoderPluginsInit {
+public:
+	explicit ScopeDecoderPluginsInit(const ConfigData &config) {
+		decoder_plugin_init_all(config);
+	}
+
+	~ScopeDecoderPluginsInit() noexcept {
+		decoder_plugin_deinit_all();
+	}
+};
 
 template<typename F>
 static inline const DecoderPlugin *
-decoder_plugins_find(F f)
+decoder_plugins_find(F f) noexcept
 {
 	for (unsigned i = 0; decoder_plugins[i] != nullptr; ++i)
 		if (decoder_plugins_enabled[i] && f(*decoder_plugins[i]))

src/decoder/plugins/AudiofileDecoderPlugin.cxx

@@ -33,6 +33,7 @@
 
 #include <assert.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 static constexpr Domain audiofile_domain("audiofile");
 

src/decoder/plugins/HybridDsdDecoderPlugin.cxx

@@ -39,8 +39,8 @@ InitHybridDsdDecoder(const ConfigBlock &block)
 	   without a DSD DAC, the PCM (=ALAC) part of the file is
 	   better */
 	if (block.GetBlockParam("enabled") == nullptr) {
-		LogInfo(hybrid_dsd_domain,
-			"The Hybrid DSD decoder is disabled because it was not explicitly enabled");
+		LogDebug(hybrid_dsd_domain,
+			 "The Hybrid DSD decoder is disabled because it was not explicitly enabled");
 		return false;
 	}
 

src/decoder/plugins/OpusDecoderPlugin.cxx

@@ -208,10 +208,12 @@ MPDOpusDecoder::HandleTags(const ogg_packet &packet)
 	TagBuilder tag_builder;
 	AddTagHandler h(tag_builder);
 
-	if (ScanOpusTags(packet.packet, packet.bytes, &rgi, h) &&
-	    !tag_builder.empty()) {
-		client.SubmitReplayGain(&rgi);
+	if (!ScanOpusTags(packet.packet, packet.bytes, &rgi, h))
+		return;
 
+	client.SubmitReplayGain(&rgi);
+
+	if (!tag_builder.empty()) {
 		Tag tag = tag_builder.Commit();
 		auto cmd = client.SubmitTag(input_stream, std::move(tag));
 		if (cmd != DecoderCommand::NONE)

src/decoder/plugins/meson.build

@@ -36,8 +36,9 @@ if flac_dep.found()
   ]
 endif
 
-conf.set('ENABLE_VORBIS_DECODER', libvorbis_dep.found())
-if libvorbis_dep.found()
+conf.set('ENABLE_VORBIS_DECODER', libvorbis_dep.found() or libvorbisidec_dep.found())
+conf.set('HAVE_TREMOR', libvorbisidec_dep.found())
+if libvorbis_dep.found() or libvorbisidec_dep.found()
   decoder_plugins_sources += [
     'VorbisDecoderPlugin.cxx',
     'VorbisDomain.cxx',
@@ -181,6 +182,7 @@ decoder_plugins = static_library(
     libsidplay_dep,
     libsndfile_dep,
     libvorbis_dep,
+    libvorbisidec_dep,
     ogg_dep,
     wavpack_dep,
     wildmidi_dep,

src/event/BufferedSocket.cxx

@@ -110,15 +110,9 @@ BufferedSocket::OnSocketReady(unsigned flags) noexcept
 	if (flags & READ) {
 		assert(!input.IsFull());
 
-		if (!ReadToBuffer())
+		if (!ReadToBuffer() || !ResumeInput())
 			return false;
 
-		if (!ResumeInput())
-			/* we must return "true" here or
-			   SocketMonitor::Dispatch() will call
-			   Cancel() on a freed object */
-			return true;
-
 		if (!input.IsFull())
 			ScheduleRead();
 	}

src/event/BufferedSocket.hxx

@@ -46,6 +46,11 @@ public:
 	using SocketMonitor::Close;
 
 private:
+	/**
+	 * @return the number of bytes read from the socket, 0 if the
+	 * socket isn't ready for reading, -1 on error (the socket has
+	 * been closed and probably destructed)
+	 */
 	ssize_t DirectRead(void *data, size_t length) noexcept;
 
 	/**

src/event/Call.cxx

@@ -80,7 +80,7 @@ private:
 void
 BlockingCall(EventLoop &loop, std::function<void()> &&f)
 {
-	if (loop.IsDead() || loop.IsInside()) {
+	if (!loop.IsAlive() || loop.IsInside()) {
 		/* we're already inside the loop - we can simply call
 		   the function */
 		f();

src/event/FullyBufferedSocket.hxx

@@ -45,6 +45,11 @@ public:
 	}
 
 private:
+	/**
+	 * @return the number of bytes written to the socket, 0 if the
+	 * socket isn't ready for writing, -1 on error (the socket has
+	 * been closed and probably destructed)
+	 */
 	ssize_t DirectWrite(const void *data, size_t length) noexcept;
 
 protected:

src/event/Loop.cxx

@@ -25,7 +25,13 @@
 
 EventLoop::EventLoop(ThreadId _thread)
 	:SocketMonitor(*this),
-	 quit(false), dead(false),
+	 /* if this instance is hosted by an EventThread (no ThreadId
+	    known yet) then we're not yet alive until the thread is
+	    started; for the main EventLoop instance, we assume it's
+	    already alive, because nobody but EventThread will call
+	    SetAlive() */
+	 alive(!_thread.IsNull()),
+	 quit(false),
 	 thread(_thread)
 {
 	SocketMonitor::Open(SocketDescriptor(wake_fd.Get()));
@@ -143,12 +149,11 @@ EventLoop::Run() noexcept
 
 	assert(IsInside());
 	assert(!quit);
-	assert(!dead);
+	assert(alive);
 	assert(busy);
 
 	SocketMonitor::Schedule(SocketMonitor::READ);
 	AtScopeExit(this) {
-		dead = true;
 		SocketMonitor::Cancel();
 	};
 
@@ -215,7 +220,6 @@ EventLoop::Run() noexcept
 	} while (!quit);
 
 #ifndef NDEBUG
-	assert(!dead);
 	assert(busy);
 	assert(thread.IsInside());
 #endif

src/event/Loop.hxx

@@ -85,12 +85,15 @@ class EventLoop final : SocketMonitor
 
 	std::chrono::steady_clock::time_point now = std::chrono::steady_clock::now();
 
-	std::atomic_bool quit;
-
 	/**
-	 * If this is true, then Run() has returned.
+	 * Is this #EventLoop alive, i.e. can events be scheduled?
+	 * This is used by BlockingCall() to determine whether
+	 * schedule in the #EventThread or to call directly (if
+	 * there's no #EventThread yet/anymore).
 	 */
-	std::atomic_bool dead;
+	bool alive;
+
+	std::atomic_bool quit;
 
 	/**
 	 * True when the object has been modified and another check is
@@ -207,9 +210,12 @@ private:
 	bool OnSocketReady(unsigned flags) noexcept override;
 
 public:
-	gcc_pure
-	bool IsDead() const noexcept {
-		return dead;
+	void SetAlive(bool _alive) noexcept {
+		alive = _alive;
+	}
+
+	bool IsAlive() const noexcept {
+		return alive;
 	}
 
 	/**

src/event/ServerSocket.cxx

@@ -392,7 +392,29 @@ ServerSocket::AddPath(AllocatedPath &&path)
 #else /* !HAVE_UN */
 	(void)path;
 
-	throw std::runtime_error("UNIX domain socket support is disabled");
+	throw std::runtime_error("Local socket support is disabled");
 #endif /* !HAVE_UN */
 }
 
+
+void
+ServerSocket::AddAbstract(const char *name)
+{
+#if !defined(__linux__)
+	(void)name;
+
+	throw std::runtime_error("Abstract sockets are only available on Linux");
+#elif !defined(HAVE_UN)
+	(void)name;
+
+	throw std::runtime_error("Local socket support is disabled");
+#else
+	assert(name != nullptr);
+	assert(*name == '@');
+
+	AllocatedSocketAddress address;
+	address.SetLocal(name);
+
+	AddAddress(std::move(address));
+#endif
+}

src/event/ServerSocket.hxx

@@ -90,7 +90,7 @@ public:
 	void AddHost(const char *hostname, unsigned port);
 
 	/**
-	 * Add a listener on a Unix domain socket.
+	 * Add a listener on a local socket.
 	 *
 	 * Throws #std::runtime_error on error.
 	 *
@@ -99,6 +99,16 @@ public:
 	 */
 	void AddPath(AllocatedPath &&path);
 
+	/**
+	 * Add a listener on an abstract local socket (Linux specific).
+	 *
+	 * Throws on error.
+	 *
+	 * @param name the abstract socket name, starting with a '@'
+	 * instead of a null byte
+	 */
+	void AddAbstract(const char *name);
+
 	/**
 	 * Add a socket descriptor that is accepting connections.  After this
 	 * has been called, don't call server_socket_open(), because the

src/event/SocketMonitor.cxx

@@ -33,8 +33,8 @@ SocketMonitor::Dispatch(unsigned flags) noexcept
 {
 	flags &= GetScheduledFlags();
 
-	if (flags != 0 && !OnSocketReady(flags) && IsDefined())
-		Cancel();
+	if (flags != 0)
+		OnSocketReady(flags);
 }
 
 SocketMonitor::~SocketMonitor() noexcept

src/event/Thread.cxx

@@ -26,8 +26,11 @@
 void
 EventThread::Start()
 {
+	assert(!event_loop.IsAlive());
 	assert(!thread.IsDefined());
 
+	event_loop.SetAlive(true);
+
 	thread.Start();
 }
 
@@ -35,6 +38,9 @@ void
 EventThread::Stop() noexcept
 {
 	if (thread.IsDefined()) {
+		assert(event_loop.IsAlive());
+		event_loop.SetAlive(false);
+
 		event_loop.Break();
 		thread.Join();
 	}

src/filter/Filter.hxx

@@ -65,7 +65,7 @@ public:
 
 	/**
 	 * Flush pending data and return it.  This should be called
-	 * repepatedly until it returns nullptr.
+	 * repeatedly until it returns nullptr.
 	 */
 	virtual ConstBuffer<void> Flush();
 };

src/filter/plugins/AutoConvertFilterPlugin.cxx

@@ -56,6 +56,7 @@ public:
 	}
 
 	ConstBuffer<void> FilterPCM(ConstBuffer<void> src) override;
+	ConstBuffer<void> Flush() override;
 };
 
 class PreparedAutoConvertFilter final : public PreparedFilter {
@@ -104,6 +105,18 @@ AutoConvertFilter::FilterPCM(ConstBuffer<void> src)
 	return filter->FilterPCM(src);
 }
 
+ConstBuffer<void>
+AutoConvertFilter::Flush()
+{
+	if (convert != nullptr) {
+		auto result = convert->Flush();
+		if (!result.IsNull())
+			return filter->FilterPCM(result);
+	}
+
+	return filter->Flush();
+}
+
 std::unique_ptr<PreparedFilter>
 autoconvert_filter_new(std::unique_ptr<PreparedFilter> filter) noexcept
 {

src/fs/io/BufferedOutputStream.hxx

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2018 Max Kellermann <max.kellermann@gmail.com>
+ * Copyright 2014-2019 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
@@ -88,4 +88,13 @@ private:
 #endif
 };
 
+template<typename F>
+void
+WithBufferedOutputStream(OutputStream &os, F &&f)
+{
+	BufferedOutputStream bos(os);
+	f(bos);
+	bos.Flush();
+}
+
 #endif

src/fs/io/FileOutputStream.cxx

@@ -31,8 +31,33 @@
 #include "system/Error.hxx"
 #include "util/StringFormat.hxx"
 
+#ifdef __linux__
+#include <fcntl.h>
+#endif
+
+#ifdef __linux__
+FileOutputStream::FileOutputStream(FileDescriptor _directory_fd,
+				   Path _path, Mode _mode)
+	:path(_path),
+	 directory_fd(_directory_fd),
+	 mode(_mode)
+{
+	Open();
+}
+#endif
+
 FileOutputStream::FileOutputStream(Path _path, Mode _mode)
-	:path(_path), mode(_mode)
+	:path(_path),
+#ifdef __linux__
+	 directory_fd(AT_FDCWD),
+#endif
+	 mode(_mode)
+{
+	Open();
+}
+
+inline void
+FileOutputStream::Open()
 {
 	switch (mode) {
 	case Mode::CREATE:
@@ -149,8 +174,12 @@ FileOutputStream::Cancel() noexcept
  * Open a file using Linux's O_TMPFILE for writing the given file.
  */
 static bool
-OpenTempFile(FileDescriptor &fd, Path path)
+OpenTempFile(FileDescriptor directory_fd,
+	     FileDescriptor &fd, Path path)
 {
+	if (directory_fd != FileDescriptor(AT_FDCWD))
+		return fd.Open(directory_fd, ".", O_TMPFILE|O_WRONLY, 0666);
+
 	const auto directory = path.GetDirectoryName();
 	if (directory.IsNull())
 		return false;
@@ -165,11 +194,15 @@ FileOutputStream::OpenCreate(bool visible)
 {
 #ifdef HAVE_O_TMPFILE
 	/* try Linux's O_TMPFILE first */
-	is_tmpfile = !visible && OpenTempFile(fd, GetPath());
+	is_tmpfile = !visible && OpenTempFile(directory_fd, fd, GetPath());
 	if (!is_tmpfile) {
 #endif
 		/* fall back to plain POSIX */
-		if (!fd.Open(GetPath().c_str(),
+		if (!fd.Open(
+#ifdef __linux__
+			     directory_fd,
+#endif
+			     GetPath().c_str(),
 			     O_WRONLY|O_CREAT|O_TRUNC,
 			     0666))
 			throw FormatErrno("Failed to create %s",
@@ -188,7 +221,11 @@ FileOutputStream::OpenAppend(bool create)
 	if (create)
 		flags |= O_CREAT;
 
-	if (!fd.Open(path.c_str(), flags))
+	if (!fd.Open(
+#ifdef __linux__
+		     directory_fd,
+#endif
+		     path.c_str(), flags))
 		throw FormatErrno("Failed to append to %s",
 				  path.c_str());
 }
@@ -219,12 +256,12 @@ FileOutputStream::Commit()
 
 #ifdef HAVE_O_TMPFILE
 	if (is_tmpfile) {
-		unlink(GetPath().c_str());
+		unlinkat(directory_fd.Get(), GetPath().c_str(), 0);
 
 		/* hard-link the temporary file to the final path */
 		if (linkat(AT_FDCWD,
 			   StringFormat<64>("/proc/self/fd/%d", fd.Get()),
-			   AT_FDCWD, path.c_str(),
+			   directory_fd.Get(), path.c_str(),
 			   AT_SYMLINK_FOLLOW) < 0)
 			throw FormatErrno("Failed to commit %s",
 					  path.c_str());
@@ -253,7 +290,11 @@ FileOutputStream::Cancel() noexcept
 #ifdef HAVE_O_TMPFILE
 		if (!is_tmpfile)
 #endif
-			unlink(GetPath().c_str());
+#ifdef __linux__
+			unlinkat(directory_fd.Get(), GetPath().c_str(), 0);
+#else
+		unlink(GetPath().c_str());
+#endif
 		break;
 
 	case Mode::CREATE_VISIBLE:

src/fs/io/FileOutputStream.hxx

@@ -59,6 +59,10 @@ class Path;
 class FileOutputStream final : public OutputStream {
 	const AllocatedPath path;
 
+#ifdef __linux__
+	const FileDescriptor directory_fd;
+#endif
+
 #ifdef _WIN32
 	HANDLE handle = INVALID_HANDLE_VALUE;
 #else
@@ -108,6 +112,11 @@ private:
 public:
 	explicit FileOutputStream(Path _path, Mode _mode=Mode::CREATE);
 
+#ifdef __linux__
+	FileOutputStream(FileDescriptor _directory_fd, Path _path,
+			 Mode _mode=Mode::CREATE);
+#endif
+
 	~FileOutputStream() noexcept {
 		if (IsDefined())
 			Cancel();
@@ -133,6 +142,7 @@ public:
 private:
 	void OpenCreate(bool visible);
 	void OpenAppend(bool create);
+	void Open();
 
 	bool Close() noexcept {
 		assert(IsDefined());

src/fs/io/OutputStream.hxx

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2018 Max Kellermann <max.kellermann@gmail.com>
+ * Copyright 2014-2019 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
@@ -27,8 +27,8 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef MPD_OUTPUT_STREAM_HXX
-#define MPD_OUTPUT_STREAM_HXX
+#ifndef OUTPUT_STREAM_HXX
+#define OUTPUT_STREAM_HXX
 
 #include <stddef.h>
 

src/fs/io/StdioOutputStream.hxx

@@ -39,7 +39,7 @@ class StdioOutputStream final : public OutputStream {
 	FILE *const file;
 
 public:
-	explicit StdioOutputStream(FILE *_file):file(_file) {}
+	explicit StdioOutputStream(FILE *_file) noexcept:file(_file) {}
 
 	/* virtual methods from class OutputStream */
 	void Write(const void *data, size_t size) override {

src/haiku/add_resources.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+cp "$2" "$1" && xres -o "$1" -- "$3" && mimeset -f "$1" || (rm -f "$1"; exit 1)

src/haiku/meson.build

@@ -1,18 +1,26 @@
-rc = meson.find_program('rc')
-xres = meson.find_program('xres')
+haiku_conf = configuration_data()
+haiku_conf.set('VERSION', meson.project_version())
+
+splitted_version = meson.project_version().split('~')[0].split('.')
+haiku_conf.set('VERSION_MAJOR', splitted_version[0])
+haiku_conf.set('VERSION_MINOR', splitted_version.get(1, '0'))
+haiku_conf.set('VERSION_REVISION', splitted_version.get(2, '0'))
+haiku_conf.set('VERSION_EXTRA', splitted_version.get(3, '0'))
+
+mpd_rdef = configure_file(
+  input: 'mpd.rdef.in',
+  output: 'mpd.rdef',
+  configuration: haiku_conf,
+)
+
+rc = find_program('rc')
+xres = find_program('xres')
 
 rsrc = custom_target(
   'mpd.rsrc',
   output: 'mpd.rsrc',
-  input: 'mpd.rdef',
+  input: mpd_rdef,
   command: [rc, '-o', '@OUTPUT@', '@INPUT@'],
 )
 
-custom_target(
-  'mpd.rsrc',
-  output: 'mpd',
-  input: [mpd, rsrc],
-  command: [xres, '-o', '@OUTPUT@', '--', '@INPUT@'],
-  install: true,
-  install_dir: get_option('bindir'),
-)
+addres = files('add_resources.sh')

src/haiku/mpd.rdef.in

@@ -2,7 +2,15 @@ resource app_signature "application/x-vnd.MusicPD";
 
 resource app_flags B_BACKGROUND_APP;
 
-// TODO: resource app_version {};
+resource app_version {
+	major = @VERSION_MAJOR@,
+	middle = @VERSION_MINOR@,
+	minor = @VERSION_REVISION@,
+	variety = B_APPV_ALPHA,
+	internal = @VERSION_EXTRA@,
+	short_info = "Music Player Daemon @VERSION@",
+    long_info  = "Music Player Daemon @VERSION@ ©The Music Player Daemon Project"
+};
 
 resource vector_icon {
 	$"6E6369661F050102031604BEE29BBEC5403EC540BEE29B4A10004A10000001C6"

src/input/BufferedInputStream.cxx

@@ -59,6 +59,9 @@ BufferedInputStream::~BufferedInputStream() noexcept
 void
 BufferedInputStream::Check()
 {
+	if (read_error)
+		std::rethrow_exception(read_error);
+
 	if (input)
 		input->Check();
 }
@@ -66,6 +69,11 @@ BufferedInputStream::Check()
 void
 BufferedInputStream::Seek(offset_type new_offset)
 {
+	if (new_offset >= size) {
+		offset = size;
+		return;
+	}
+
 	auto r = buffer.Read(new_offset);
 	if (r.HasData()) {
 		/* nice, we already have some data at the desired
@@ -96,7 +104,7 @@ BufferedInputStream::IsEOF() noexcept
 bool
 BufferedInputStream::IsAvailable() noexcept
 {
-	return IsEOF() || buffer.Read(offset).HasData();
+	return IsEOF() || buffer.Read(offset).HasData() || read_error;
 }
 
 size_t
@@ -159,6 +167,32 @@ BufferedInputStream::RunThread() noexcept
 			idle = false;
 			seek = false;
 			client_cond.signal();
+		} else if (!idle && !read_error &&
+			   offset != input->GetOffset() &&
+			   !IsAvailable()) {
+			/* a past Seek() call was a no-op because data
+			   was already available at that position, but
+			   now we've reached a new position where
+			   there is no more data in the buffer, and
+			   our input is reading somewhere else (maybe
+			   stuck at the end of the file); to find a
+			   way out, we now seek our input to our
+			   reading position to be able to fill our
+			   buffer */
+
+			try {
+				input->Seek(offset);
+			} catch (...) {
+				/* this is really a seek error, but we
+				   register it as a read_error,
+				   because seek_error is only checked
+				   by Seek(), and at our frontend (our
+				   own InputStream interface) is in
+				   "read" mode */
+				read_error = std::current_exception();
+				client_cond.signal();
+				InvokeOnAvailable();
+			}
 		} else if (!idle && !read_error &&
 			   input->IsAvailable() && !input->IsEOF()) {
 			const auto read_offset = input->GetOffset();

src/input/Init.hxx

@@ -35,4 +35,16 @@ input_stream_global_init(const ConfigData &config, EventLoop &event_loop);
 void
 input_stream_global_finish() noexcept;
 
+class ScopeInputPluginsInit {
+public:
+	ScopeInputPluginsInit(const ConfigData &config,
+			      EventLoop &event_loop) {
+		input_stream_global_init(config, event_loop);
+	}
+
+	~ScopeInputPluginsInit() noexcept {
+		input_stream_global_finish();
+	}
+};
+
 #endif

src/input/plugins/CdioParanoiaInputPlugin.cxx

@@ -23,6 +23,7 @@
 
 #include "config.h"
 #include "CdioParanoiaInputPlugin.hxx"
+#include "lib/cdio/Paranoia.hxx"
 #include "../InputStream.hxx"
 #include "../InputPlugin.hxx"
 #include "util/TruncateString.hxx"
@@ -41,18 +42,12 @@
 #include <stdlib.h>
 #include <assert.h>
 
-#ifdef HAVE_CDIO_PARANOIA_PARANOIA_H
-#include <cdio/paranoia/paranoia.h>
-#else
-#include <cdio/paranoia.h>
-#endif
-
 #include <cdio/cd_types.h>
 
 class CdioParanoiaInputStream final : public InputStream {
 	cdrom_drive_t *const drv;
 	CdIo_t *const cdio;
-	cdrom_paranoia_t *const para;
+	CdromParanoia para;
 
 	const lsn_t lsn_from, lsn_to;
 	int lsn_relofs;
@@ -66,18 +61,17 @@ class CdioParanoiaInputStream final : public InputStream {
 				bool reverse_endian,
 				lsn_t _lsn_from, lsn_t _lsn_to)
 		:InputStream(_uri, _mutex),
-		 drv(_drv), cdio(_cdio), para(cdio_paranoia_init(drv)),
+		 drv(_drv), cdio(_cdio), para(drv),
 		 lsn_from(_lsn_from), lsn_to(_lsn_to),
 		 lsn_relofs(0),
 		 buffer_lsn(-1)
 	{
 		/* Set reading mode for full paranoia, but allow
 		   skipping sectors. */
-		paranoia_modeset(para,
-				 PARANOIA_MODE_FULL^PARANOIA_MODE_NEVERSKIP);
+		para.SetMode(PARANOIA_MODE_FULL^PARANOIA_MODE_NEVERSKIP);
 
 		/* seek to beginning of the track */
-		cdio_paranoia_seek(para, lsn_from, SEEK_SET);
+		para.Seek(lsn_from);
 
 		seekable = true;
 		size = (lsn_to - lsn_from + 1) * CDIO_CD_FRAMESIZE_RAW;
@@ -90,7 +84,7 @@ class CdioParanoiaInputStream final : public InputStream {
 	}
 
 	~CdioParanoiaInputStream() {
-		cdio_paranoia_free(para);
+		para = {};
 		cdio_cddap_close_no_free_cdio(drv);
 		cdio_destroy(cdio);
 	}
@@ -208,10 +202,10 @@ input_cdio_open(const char *uri,
 		throw std::runtime_error("Unable to identify audio CD disc.");
 	}
 
-	cdda_verbose_set(drv, CDDA_MESSAGE_FORGETIT, CDDA_MESSAGE_FORGETIT);
+	cdio_cddap_verbose_set(drv, CDDA_MESSAGE_FORGETIT, CDDA_MESSAGE_FORGETIT);
 	if (speed > 0) {
 		FormatDebug(cdio_domain,"Attempting to set CD speed to %dx",speed);
-		cdda_speed_set(drv,speed);
+		cdio_cddap_speed_set(drv,speed);
 	}
 
 	if (0 != cdio_cddap_open(drv)) {
@@ -277,7 +271,7 @@ CdioParanoiaInputStream::Seek(offset_type new_offset)
 
 	{
 		const ScopeUnlock unlock(mutex);
-		cdio_paranoia_seek(para, lsn_from + lsn_relofs, SEEK_SET);
+		para.Seek(lsn_from + lsn_relofs);
 	}
 }
 
@@ -285,56 +279,53 @@ size_t
 CdioParanoiaInputStream::Read(void *ptr, size_t length)
 {
 	size_t nbytes = 0;
-	int diff;
-	size_t len, maxwrite;
-	int16_t *rbuf;
-	char *s_err, *s_mess;
 	char *wptr = (char *) ptr;
 
 	while (length > 0) {
-
-
 		/* end of track ? */
 		if (lsn_from + lsn_relofs > lsn_to)
 			break;
 
 		//current sector was changed ?
+		const int16_t *rbuf;
 		if (lsn_relofs != buffer_lsn) {
 			const ScopeUnlock unlock(mutex);
 
-			rbuf = cdio_paranoia_read(para, nullptr);
+			try {
+				rbuf = para.Read().data;
+			} catch (...) {
+				char *s_err = cdio_cddap_errors(drv);
+				if (s_err) {
+					FormatError(cdio_domain,
+						    "paranoia_read: %s", s_err);
+#if LIBCDIO_VERSION_NUM >= 90
+					cdio_cddap_free_messages(s_err);
+#else
+					free(s_err);
+#endif
+				}
 
-			s_err = cdda_errors(drv);
-			if (s_err) {
-				FormatError(cdio_domain,
-					    "paranoia_read: %s", s_err);
-				free(s_err);
+				throw;
 			}
-			s_mess = cdda_messages(drv);
-			if (s_mess) {
-				free(s_mess);
-			}
-			if (!rbuf)
-				throw std::runtime_error("paranoia read error");
 
 			//store current buffer
 			memcpy(buffer, rbuf, CDIO_CD_FRAMESIZE_RAW);
 			buffer_lsn = lsn_relofs;
 		} else {
 			//use cached sector
-			rbuf = (int16_t *)buffer;
+			rbuf = (const int16_t *)buffer;
 		}
 
 		//correct offset
-		diff = offset - lsn_relofs * CDIO_CD_FRAMESIZE_RAW;
+		const int diff = offset - lsn_relofs * CDIO_CD_FRAMESIZE_RAW;
 
 		assert(diff >= 0 && diff < CDIO_CD_FRAMESIZE_RAW);
 
-		maxwrite = CDIO_CD_FRAMESIZE_RAW - diff;  //# of bytes pending in current buffer
-		len = (length < maxwrite? length : maxwrite);
+		const size_t maxwrite = CDIO_CD_FRAMESIZE_RAW - diff;  //# of bytes pending in current buffer
+		const size_t len = (length < maxwrite? length : maxwrite);
 
 		//skip diff bytes from this lsn
-		memcpy(wptr, ((char*)rbuf) + diff, len);
+		memcpy(wptr, ((const char *)rbuf) + diff, len);
 		//update pointer
 		wptr += len;
 		nbytes += len;

src/input/plugins/CurlInputPlugin.cxx

@@ -306,9 +306,8 @@ input_curl_init(EventLoop &event_loop, const ConfigBlock &block)
 {
 	try {
 		curl_init = new CurlInit(event_loop);
-	} catch (const std::runtime_error &e) {
-		LogError(e);
-		throw PluginUnavailable(e.what());
+	} catch (...) {
+		std::throw_with_nested(PluginUnavailable("CURL initialization failed"));
 	}
 
 	const auto version_info = curl_version_info(CURLVERSION_FIRST);

src/input/plugins/SmbclientInputPlugin.cxx

@@ -22,14 +22,13 @@
 #include "lib/smbclient/Mutex.hxx"
 #include "../InputStream.hxx"
 #include "../InputPlugin.hxx"
+#include "../MaybeBufferedInputStream.hxx"
 #include "PluginUnavailable.hxx"
 #include "system/Error.hxx"
 #include "util/ASCII.hxx"
 
 #include <libsmbclient.h>
 
-#include <stdexcept>
-
 class SmbclientInputStream final : public InputStream {
 	SMBCCTX *ctx;
 	int fd;
@@ -72,9 +71,8 @@ input_smbclient_init(EventLoop &, const ConfigBlock &)
 {
 	try {
 		SmbclientInit();
-	} catch (const std::runtime_error &e) {
-		// TODO: use std::throw_with_nested()?
-		throw PluginUnavailable(e.what());
+	} catch (...) {
+		std::throw_with_nested(PluginUnavailable("libsmbclient initialization failed"));
 	}
 
 	// TODO: create one global SMBCCTX here?
@@ -115,8 +113,9 @@ input_smbclient_open(const char *uri,
 		throw MakeErrno(e, "smbc_fstat() failed");
 	}
 
-	return std::make_unique<SmbclientInputStream>(uri, mutex,
-						      ctx, fd, st);
+	return std::make_unique<MaybeBufferedInputStream>
+		(std::make_unique<SmbclientInputStream>(uri, mutex,
+							ctx, fd, st));
 }
 
 size_t

src/input/plugins/meson.build

@@ -10,10 +10,6 @@ libcdio_paranoia_dep = dependency('libcdio_paranoia', version: '>= 0.4', require
 conf.set('ENABLE_CDIO_PARANOIA', libcdio_paranoia_dep.found())
 if libcdio_paranoia_dep.found()
   input_plugins_sources += 'CdioParanoiaInputPlugin.cxx'
-
-  conf.set('HAVE_CDIO_PARANOIA_PARANOIA_H',
-           compiler.has_header('cdio/paranoia/paranoia.h',
-                               dependencies: libcdio_paranoia_dep))
 endif
 
 if curl_dep.found()

src/lib/cdio/Paranoia.hxx

@@ -0,0 +1,166 @@
+/*
+ * Copyright 2019 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 CDIO_PARANOIA_HXX
+#define CDIO_PARANOIA_HXX
+
+#include "util/ConstBuffer.hxx"
+#include "util/Compiler.h"
+
+#include <cdio/version.h>
+#if LIBCDIO_VERSION_NUM >= 90
+#include <cdio/paranoia/paranoia.h>
+#else
+#include <cdio/paranoia.h>
+#endif
+
+#include <stdexcept>
+#include <utility>
+
+#include <cstdio>
+
+class CdromDrive {
+	cdrom_drive_t *drv = nullptr;
+
+public:
+	CdromDrive() = default;
+
+	explicit CdromDrive(CdIo_t *cdio)
+		:drv(cdio_cddap_identify_cdio(cdio, 1, nullptr))
+	{
+		if (drv == nullptr)
+			throw std::runtime_error("Failed to identify audio CD");
+
+		cdda_verbose_set(drv, CDDA_MESSAGE_FORGETIT,
+				 CDDA_MESSAGE_FORGETIT);
+	}
+
+	~CdromDrive() noexcept {
+		if (drv != nullptr)
+			cdio_cddap_close_no_free_cdio(drv);
+	}
+
+	CdromDrive(CdromDrive &&src) noexcept
+		:drv(std::exchange(src.drv, nullptr)) {}
+
+	CdromDrive &operator=(CdromDrive &&src) noexcept {
+		using std::swap;
+		swap(drv, src.drv);
+		return *this;
+	}
+
+	auto get() const noexcept {
+		return drv;
+	}
+
+	void Open() {
+		if (cdio_cddap_open(drv) != 0)
+			throw std::runtime_error("Failed to open disc");
+	}
+
+	auto GetDiscSectorRange() const {
+		auto first = cdio_cddap_disc_firstsector(drv);
+		auto last = cdio_cddap_disc_lastsector(drv);
+		if (first < 0 || last < 0)
+			throw std::runtime_error("Failed to get disc audio sectors");
+		return std::make_pair(first, last);
+	}
+
+	gcc_pure
+	bool IsAudioTrack(track_t i) const noexcept {
+		return cdio_cddap_track_audiop(drv, i);
+	}
+
+	auto GetTrackSectorRange(track_t i) const {
+		auto first = cdio_cddap_track_firstsector(drv, i);
+		auto last = cdio_cddap_track_lastsector(drv, i);
+		if (first < 0 || last < 0)
+			throw std::runtime_error("Invalid track number");
+		return std::make_pair(first, last);
+	}
+
+	gcc_pure
+	unsigned GetTrackCount() const noexcept {
+		return cdio_cddap_tracks(drv);
+	}
+
+	unsigned GetTrackChannels(track_t i) const {
+		auto value = cdio_cddap_track_channels(drv, i);
+		if (value < 0)
+			throw std::runtime_error("cdio_cddap_track_channels() failed");
+		return unsigned(value);
+	}
+};
+
+class CdromParanoia {
+	cdrom_paranoia_t *paranoia = nullptr;
+
+public:
+	CdromParanoia() = default;
+
+	explicit CdromParanoia(cdrom_drive_t *drv) noexcept
+		:paranoia(cdio_paranoia_init(drv)) {}
+
+	~CdromParanoia() noexcept {
+		if (paranoia != nullptr)
+			cdio_paranoia_free(paranoia);
+	}
+
+	CdromParanoia(CdromParanoia &&src) noexcept
+		:paranoia(std::exchange(src.paranoia, nullptr)) {}
+
+	CdromParanoia &operator=(CdromParanoia &&src) noexcept {
+		using std::swap;
+		swap(paranoia, src.paranoia);
+		return *this;
+	}
+
+	auto get() const noexcept {
+		return paranoia;
+	}
+
+	void SetMode(int mode_flags) noexcept {
+		paranoia_modeset(paranoia, mode_flags);
+	}
+
+	void Seek(int32_t seek, int whence=SEEK_SET) {
+		if (cdio_paranoia_seek(paranoia, seek, whence) < 0)
+			throw std::runtime_error("Failed to seek disc");
+	}
+
+	ConstBuffer<int16_t> Read() {
+		const int16_t *data = cdio_paranoia_read(paranoia, nullptr);
+		if (data == nullptr)
+			throw std::runtime_error("Read from audio CD failed");
+
+		return {data, CDIO_CD_FRAMESIZE_RAW / sizeof(int16_t)};
+	}
+};
+
+#endif

src/lib/curl/patches/no_netrc.patch

@@ -1,20 +1,19 @@
-Index: curl-7.58.0/lib/url.c
-===================================================================
---- curl-7.58.0.orig/lib/url.c
-+++ curl-7.58.0/lib/url.c
-@@ -3503,6 +3503,7 @@ static CURLcode override_login(struct Cu
+diff -ur curl-7.63.0.orig/lib/url.c curl-7.63.0/lib/url.c
+--- curl-7.63.0.orig/lib/url.c	2019-01-21 10:15:51.368019445 +0100
++++ curl-7.63.0/lib/url.c	2019-01-21 10:19:16.307523984 +0100
+@@ -3057,6 +3057,7 @@
    }
  
    conn->bits.netrc = FALSE;
 +#ifndef __BIONIC__
-   if(data->set.use_netrc != CURL_NETRC_IGNORED) {
-     int ret = Curl_parsenetrc(conn->host.name,
-                               userp, passwdp,
-@@ -3524,6 +3525,7 @@ static CURLcode override_login(struct Cu
-       conn->bits.user_passwd = TRUE; /* enable user+password */
+   if(data->set.use_netrc != CURL_NETRC_IGNORED &&
+       (!*userp || !**userp || !*passwdp || !**passwdp)) {
+     bool netrc_user_changed = FALSE;
+@@ -3090,6 +3091,7 @@
+       }
      }
    }
 +#endif
  
-   return CURLE_OK;
- }
+   /* for updated strings, we update them in the URL */
+   if(user_changed) {

src/lib/dbus/ReadIter.hxx

@@ -35,6 +35,7 @@
 
 #include "Iter.hxx"
 #include "util/Compiler.h"
+#include "util/ConstBuffer.hxx"
 
 #if GCC_OLDER_THAN(8,0)
 /* switch off completely bogus shadow warnings in older GCC
@@ -81,6 +82,14 @@ public:
 		return value;
 	}
 
+	template<typename T>
+	ConstBuffer<T> GetFixedArray() noexcept {
+		void *value;
+		int n_elements;
+		dbus_message_iter_get_fixed_array(&iter, &value, &n_elements);
+		return {(const T *)value, size_t(n_elements)};
+	}
+
 	/**
 	 * Create a new iterator which recurses into a container
 	 * value.

src/lib/dbus/UDisks2.cxx

@@ -22,6 +22,7 @@
 #include "ReadIter.hxx"
 #include "ObjectManager.hxx"
 #include "util/StringAPI.hxx"
+#include "util/StringView.hxx"
 #include "util/Compiler.h"
 
 #include <functional>
@@ -39,6 +40,40 @@ CheckString(I &&i) noexcept
 	return i.GetString();
 }
 
+template<typename I>
+gcc_pure
+static StringView
+CheckRecursedByteArrayToString(I &&i) noexcept
+{
+	if (i.GetArgType() != DBUS_TYPE_BYTE)
+		return nullptr;
+
+	auto value = i.template GetFixedArray<char>();
+	return { value.data, value.size };
+}
+
+template<typename I>
+gcc_pure
+static StringView
+CheckByteArrayToString(I &&i) noexcept
+{
+	if (i.GetArgType() != DBUS_TYPE_ARRAY)
+		return nullptr;
+
+	return CheckRecursedByteArrayToString(i.Recurse());
+}
+
+template<typename I>
+gcc_pure
+static StringView
+CheckByteArrayArrayFrontToString(I &&i) noexcept
+{
+	if (i.GetArgType() != DBUS_TYPE_ARRAY)
+		return nullptr;
+
+	return CheckByteArrayToString(i.Recurse());
+}
+
 static void
 ParseDriveDictEntry(Object &o, const char *name,
 		    ODBus::ReadMessageIter &&value_i) noexcept
@@ -61,6 +96,25 @@ ParseBlockDictEntry(Object &o, const char *name,
 	}
 }
 
+static void
+ParseFileesystemDictEntry(Object &o, const char *name,
+			  ODBus::ReadMessageIter &&value_i) noexcept
+{
+	if (StringIsEqual(name, "MountPoints")) {
+		if (!o.mount_point.empty())
+			/* we already know one mount point, and we're
+			   not interested in more */
+			return;
+
+		/* get the first string in the array */
+		auto value = CheckByteArrayArrayFrontToString(value_i);
+		if (value != nullptr)
+			o.mount_point = {value.data, value.size};
+
+		// TODO: check whether the string is a valid filesystem path
+	}
+}
+
 static void
 ParseInterface(Object &o, const char *interface,
 	       ODBus::ReadMessageIter &&i) noexcept
@@ -74,6 +128,10 @@ ParseInterface(Object &o, const char *interface,
 					    std::ref(o), _1, _2));
 	} else if (StringIsEqual(interface, "org.freedesktop.UDisks2.Filesystem")) {
 		o.is_filesystem = true;
+
+		i.ForEachProperty(std::bind(ParseFileesystemDictEntry,
+					    std::ref(o), _1, _2));
+
 	}
 }
 

src/lib/dbus/UDisks2.hxx

@@ -39,6 +39,13 @@ struct Object {
 
 	std::string drive_id, block_id;
 
+	/**
+	 * The first element of the "MountPoints" array of the
+	 * "Filesystem" interface.  Empty if no "MountPoints" property
+	 * exists.
+	 */
+	std::string mount_point;
+
 	bool is_filesystem = false;
 
 	explicit Object(const char *_path) noexcept

src/lib/gcrypt/meson.build

@@ -1,4 +1,17 @@
+# Since version 0.49.0 Meson has native libgcrypt dependency support, which has
+# the advantage over find_library() as it uses libgcrypt-config to query the
+# required linker flags.
+# However, we still need to use find_library() first, to prevent Meson
+# falsly assuming a target libgcrypt is available in case there is no
+# libgcrypt-config entry in the cross file and libgcrypt is installed on the
+# host. In this case, Meson will falsly use the native libgcrypt-config and
+# will falsly assume it has found the gcrypt library for the target.
+#
+# See: https://github.com/MusicPlayerDaemon/MPD/pull/495
 gcrypt_dep = c_compiler.find_library('gcrypt', required: get_option('qobuz'))
+if gcrypt_dep.found()
+  gcrypt_dep = dependency('libgcrypt')
+endif
 if not gcrypt_dep.found()
   subdir_done()
 endif

src/lib/nfs/Manager.cxx

@@ -73,7 +73,7 @@ NfsManager::Compare::operator()(const ManagedConnection &a,
 
 NfsManager::~NfsManager() noexcept
 {
-	assert(GetEventLoop().IsInside());
+	assert(!GetEventLoop().IsAlive() || GetEventLoop().IsInside());
 
 	CollectGarbage();
 
@@ -103,7 +103,7 @@ NfsManager::GetConnection(const char *server, const char *export_name) noexcept
 void
 NfsManager::CollectGarbage() noexcept
 {
-	assert(GetEventLoop().IsInside());
+	assert(!GetEventLoop().IsAlive() || GetEventLoop().IsInside());
 
 	garbage.clear_and_dispose(DeleteDisposer());
 }

src/lib/xiph/OggVisitor.cxx

@@ -20,6 +20,7 @@
 #include "OggVisitor.hxx"
 
 #include <stdexcept>
+#include <utility>
 
 void
 OggVisitor::EndStream()
@@ -51,7 +52,13 @@ OggVisitor::ReadNextPage()
 inline void
 OggVisitor::HandlePacket(const ogg_packet &packet)
 {
+	const bool _post_seek = std::exchange(post_seek, false);
+
 	if (packet.b_o_s) {
+		if (_post_seek)
+			/* ignore the BOS packet after seeking */
+			return;
+
 		EndStream();
 		has_stream = true;
 		OnOggBeginning(packet);
@@ -97,4 +104,6 @@ OggVisitor::PostSeek()
 
 	/* find the next Ogg page and feed it into the stream */
 	sync.ExpectPageSeekIn(stream);
+
+	post_seek = true;
 }

src/lib/xiph/OggVisitor.hxx

@@ -39,6 +39,14 @@ class OggVisitor {
 
 	bool has_stream = false;
 
+	/**
+	 * This is true after seeking; its one-time effect is to
+	 * ignore the BOS packet, just in case we have been seeking to
+	 * the beginning of the file, because that would disrupt
+	 * playback.
+	 */
+	bool post_seek = false;
+
 public:
 	explicit OggVisitor(Reader &reader)
 		:sync(reader), stream(0) {}

src/lib/xiph/meson.build

@@ -1,6 +1,24 @@
 libflac_dep = dependency('flac', version: '>= 1.2', required: get_option('flac'))
 libopus_dep = dependency('opus', required: get_option('opus'))
-libvorbis_dep = dependency('vorbis', required: get_option('vorbis'))
+
+if get_option('tremor').enabled()
+  # no libvorbis if Tremor was explicitly enabled
+  libvorbis_dep = dependency('', required: false)
+else
+  libvorbis_dep = dependency('vorbis', required: get_option('vorbis'))
+endif
+
+if libvorbis_dep.found()
+  # no Tremor if libvorbis is used
+  libvorbisidec_dep = dependency('', required: false)
+else
+  # attempt to auto-detect Tremor only if libvorbis was disabled or not found
+  libvorbisidec_dep = dependency('vorbisidec', required: get_option('tremor'))
+endif
+
+if get_option('vorbis').enabled() and get_option('tremor').enabled()
+	error('Cannot build both, the Vorbis decoder AND the Tremor (Vorbis fixed-point) decoder')
+endif
 
 libvorbisenc_dep = dependency('', required: false)
 if need_encoder and not get_option('vorbisenc').disabled()
@@ -13,7 +31,7 @@ if need_encoder and not get_option('vorbisenc').disabled()
   endif
 endif
 
-if libopus_dep.found() or libvorbis_dep.found() or libvorbisenc_dep.found()
+if libopus_dep.found() or libvorbis_dep.found() or libvorbisenc_dep.found() or libvorbisidec_dep.found()
   libogg_dep = dependency('ogg')
 else
   libogg_dep = dependency('', required: false)