release v0.21.4

Closes #343

NEWS

@@ -1,3 +1,22 @@
+ver 0.21.4 (2019/01/04)
+* database
+  - inotify: fix crash bug "terminate called after throwing ..."
+  - upnp: implement "list ... group"
+* output
+  - httpd: declare protocol "HTTP/1.1" instead of "ICY"
+* remove libwrap support
+* Windows
+  - fix "Failed to accept connection: unknown error"
+* fix Haiku build
+
+ver 0.21.3 (2018/11/16)
+* output
+  - alsa: fix crash bug
+  - alsa: fix stuttering at start of playback
+  - alsa: fix discarded samples at end of song
+  - alsa: clear error after reopening device
+* log: default to journal if MPD was started as systemd service
+
 ver 0.21.2 (2018/11/12)
 * protocol
   - operator "=~" matches a regular expression

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="24"
+          android:versionCode="26"
-          android:versionName="0.21.2">
+          android:versionName="0.21.4">
 
   <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="26"/>
 

doc/conf.py

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

doc/mpdconf.example

@@ -32,7 +32,7 @@
 # settings.
 #
 # The special value "syslog" makes MPD use the local syslog daemon. This
-# setting defaults to logging to syslog, otherwise logging is disabled.
+# setting defaults to logging to syslog.
 #
 #log_file			"~/.mpd/log"
 #

doc/protocol.rst

@@ -556,7 +556,7 @@ The Queue
 There are two ways to address songs within the queue: by their
 position and by their id.
 
-The position is a 1-based index.  It is unstable by design: if you
+The position is a 0-based index.  It is unstable by design: if you
 move, delete or insert songs, all following indices will change, and a
 client can never be sure what song is behind a given index/position.
 

doc/user.rst

@@ -88,7 +88,7 @@ For example, the following installs a fairly complete list of build dependencies
       libupnp-dev \
       libavahi-client-dev \
       libsqlite3-dev \
-      libsystemd-dev libwrap0-dev \
+      libsystemd-dev \
       libgtest-dev \
       libboost-dev \
       libicu-dev
@@ -276,7 +276,9 @@ You can also use multiple storage plugins to assemble a virtual music directory
 Configuring database plugins
 ----------------------------
 
-If a music directory is configured, one database plugin is used. To configure this plugin, add a database block to :file:`mpd.conf`:
+If a music directory is configured, one database plugin is used. To
+configure this plugin, add a :code:`database` block to
+:file:`mpd.conf`:
 
 .. code-block:: none
 
@@ -291,7 +293,9 @@ reference.
 Configuring neighbor plugins
 ----------------------------
 
-All neighbor plugins are disabled by default to avoid unwanted overhead. To enable (and configure) a plugin, add a neighbor block to :file:`mpd.conf`:
+All neighbor plugins are disabled by default to avoid unwanted
+overhead. To enable (and configure) a plugin, add a :code:`neighbor`
+block to :file:`mpd.conf`:
 
 .. code-block:: none
 
@@ -304,7 +308,8 @@ More information can be found in the :ref:`neighbor_plugin` reference.
 Configuring input plugins
 -------------------------
 
-To configure an input plugin, add a input block to :file:`mpd.conf`:
+To configure an input plugin, add an :code:`input` block to
+:file:`mpd.conf`:
 
 .. code-block:: none
 
@@ -332,7 +337,8 @@ More information can be found in the :ref:`input_plugins` reference.
 Configuring decoder plugins
 ---------------------------
 
-Most decoder plugins do not need any special configuration. To configure a decoder, add a decoder block to :file:`mpd.conf`:
+Most decoder plugins do not need any special configuration. To
+configure a decoder, add a :code:`decoder` block to :file:`mpd.conf`:
 
 .. code-block:: none
 
@@ -368,7 +374,8 @@ Configuring audio outputs
 
 Audio outputs are devices which actually play the audio chunks produced by :program:`MPD`. You can configure any number of audio output devices, but there must be at least one. If none is configured, :program:`MPD` attempts to auto-detect. Usually, this works quite well with ALSA, OSS and on Mac OS X.
 
-To configure an audio output manually, add one or more audio_output blocks to :file:`mpd.conf`:
+To configure an audio output manually, add one or more
+:code:`audio_output` blocks to :file:`mpd.conf`:
 
 .. code-block:: none
 
@@ -406,14 +413,21 @@ The following table lists the audio_output options valid for all plugins:
    * - **always_on yes|no**
      - If set to yes, then :program:`MPD` attempts to keep this audio output always open. This may be useful for streaming servers, when you don't want to disconnect all listeners even when playback is accidentally stopped.
    * - **mixer_type hardware|software|null|none**
-     - Specifies which mixer should be used for this audio output: the hardware mixer (available for ALSA :ref:`alsa_plugin`, OSS :ref:`oss_plugin` and PulseAudio :ref:`pulse_plugin`), the software mixer, the "null" mixer (null; allows setting the volume, but with no effect; this can be used as a trick to implement an external mixer :ref:`external_mixer`) or no mixer (none). By default, the hardware mixer is used for devices which support it, and none for the others.
+     - Specifies which mixer should be used for this audio output: the
+       hardware mixer (available for ALSA :ref:`alsa_plugin`, OSS
+       :ref:`oss_plugin` and PulseAudio :ref:`pulse_plugin`), the
+       software mixer, the ":samp:`null`" mixer (allows setting the
+       volume, but with no effect; this can be used as a trick to
+       implement an external mixer :ref:`external_mixer`) or no mixer
+       (:samp:`none`). By default, the hardware mixer is used for
+       devices which support it, and none for the others.
 
 Configuring filters
 -------------------
 
 Filters are plugins which modify an audio stream.
 
-To configure a filter, add a filter block to :file:`mpd.conf`:
+To configure a filter, add a :code:`filter` block to :file:`mpd.conf`:
 
 .. code-block:: none
 
@@ -438,9 +452,12 @@ The following table lists the filter options valid for all plugins:
 Configuring playlist plugins
 ----------------------------
 
-Playlist plugins are used to load remote playlists (protocol commands load, listplaylist and listplaylistinfo). This is not related to :program:`MPD`'s playlist directory.
+Playlist plugins are used to load remote playlists (protocol commands
+load, listplaylist and listplaylistinfo). This is not related to
+:program:`MPD`'s :ref:`playlist directory <stored_playlists>`.
 
-To configure a playlist plugin, add a playlist_plugin block to :file:`mpd.conf`:
+To configure a playlist plugin, add a :code:`playlist_plugin` block to
+:file:`mpd.conf`:
 
 .. code-block:: none
 
@@ -817,10 +834,16 @@ The queue
 
 The queue (sometimes called "current playlist") is a list of songs to be played by :program:`MPD`. To play a song, add it to the queue and start playback. Most clients offer an interface to edit the queue.
 
+.. _stored_playlists:
+
 Stored Playlists
 ----------------
 
-Stored playlists are some kind of secondary playlists which can be created, saved, edited and deleted by the client. They are addressed by their names. Its contents can be loaded into the queue, to be played back. The playlist_directory setting specifies where those playlists are stored. 
+Stored playlists are some kind of secondary playlists which can be
+created, saved, edited and deleted by the client. They are addressed
+by their names.  Its contents can be loaded into the queue, to be
+played back.  The :code:`playlist_directory` setting specifies where
+those playlists are stored.
 
 Advanced usage
 **************
@@ -860,9 +883,11 @@ Obey the "format" row, which indicates that the current playback format is 16 bi
 Check list for bit-perfect playback:
 
 * Use the ALSA output plugin.
-* Disable sound processing inside ALSA by configuring a "hardware" device (hw:0,0 or similar).
+* Disable sound processing inside ALSA by configuring a "hardware"
-* Don't use software volume (setting mixer_type).
+  device (:samp:`hw:0,0` or similar).
-* Don't force :program:`MPD` to use a specific audio format (settings format, audio_output_format).
+* 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`).
 * 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)
@@ -877,7 +902,11 @@ DSD (`Direct Stream Digital <https://en.wikipedia.org/wiki/Direct_Stream_Digital
 * DoP (DSD over PCM) playback. This wraps DSD inside fake 24 bit PCM according to the DoP standard. Requires a DAC that supports DSD. No support from ALSA and the sound chip required (except for bit-perfect 24 bit PCM support).
 * Convert DSD to PCM on-the-fly. 
 
-Native DSD playback is used automatically if available. DoP is only used if enabled explicitly using the dop option, because there is no way for :program:`MPD` to find out whether the DAC supports it. DSD to PCM conversion is the fallback if DSD cannot be used directly.
+Native DSD playback is used automatically if available. DoP is only
+used if enabled explicitly using the :code:`dop` option, because there
+is no way for :program:`MPD` to find out whether the DAC supports
+it. DSD to PCM conversion is the fallback if DSD cannot be used
+directly.
 
 Client Hacks
 ************

meson.build

@@ -1,7 +1,7 @@
 project(
   'mpd',
   ['c', 'cpp'],
-  version: '0.21.2',
+  version: '0.21.4',
   meson_version: '>= 0.47.2',
   default_options: [
     'c_std=c99',
@@ -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.0')
+conf.set_quoted('PROTOCOL_VERSION', '0.21.4')
 conf.set_quoted('SYSTEM_CONFIG_FILE_LOCATION', join_paths(get_option('prefix'), get_option('sysconfdir'), 'mpd.conf'))
 
 common_cppflags = [
@@ -99,7 +99,7 @@ is_linux = host_machine.system() == 'linux'
 is_android = get_option('android_ndk') != ''
 is_darwin = host_machine.system() == 'darwin'
 is_windows = host_machine.system() == 'windows'
-is_haiku = host_machine.system() == 'haiku' # TODO is this correct?
+is_haiku = host_machine.system() == 'haiku'
 
 if is_android
   common_cppflags += '-DANDROID'
@@ -312,7 +312,6 @@ subdir('src/lib/curl')
 subdir('src/lib/expat')
 subdir('src/lib/ffmpeg')
 subdir('src/lib/gcrypt')
-subdir('src/lib/wrap')
 subdir('src/lib/nfs')
 subdir('src/lib/oss')
 subdir('src/lib/pcre')
@@ -432,7 +431,6 @@ mpd = build_target(
     systemd_dep,
     sqlite_dep,
     zeroconf_dep,
-    libwrap_dep,
     more_deps,
   ],
   link_args: link_args,

meson_options.txt

@@ -175,7 +175,6 @@ option('dbus', type: 'feature', description: 'D-Bus support')
 option('expat', type: 'feature', description: 'Expat XML support')
 option('icu', type: 'feature', description: 'Use libicu for Unicode')
 option('iconv', type: 'feature', description: 'Use iconv() for character set conversion')
-option('libwrap', type: 'feature', description: 'libwrap support')
 option('pcre', type: 'feature', description: 'Enable regular expression support (using libpcre)')
 option('sqlite', type: 'feature', description: 'SQLite database support (for stickers)')
 option('yajl', type: 'feature', description: 'libyajl for YAML support')

python/build/libs.py

@@ -112,8 +112,8 @@ liblame = AutotoolsProject(
 )
 
 ffmpeg = FfmpegProject(
-    'http://ffmpeg.org/releases/ffmpeg-4.0.2.tar.xz',
+    'http://ffmpeg.org/releases/ffmpeg-4.1.tar.xz',
-    'a95c0cc9eb990e94031d2183f2e6e444cc61c99f6f182d1575c433d62afb2f97',
+    'a38ec4d026efb58506a99ad5cd23d5a9793b4bf415f2c4c2e9c1bb444acd1994',
     'lib/libavcodec.a',
     [
         '--disable-shared', '--enable-static',
@@ -341,8 +341,8 @@ ffmpeg = FfmpegProject(
 )
 
 curl = AutotoolsProject(
-    'http://curl.haxx.se/download/curl-7.61.1.tar.xz',
+    'http://curl.haxx.se/download/curl-7.62.0.tar.xz',
-    '3d5913d6a39bd22e68e34dff697fd6e4c3c81563f580c76fca2009315cd81891',
+    'dab5643a5fe775ae92570b9f3df6b0ef4bc2a827a959361fb130c73b721275c1',
     'lib/libcurl.a',
     [
         '--disable-shared', '--enable-static',

scripts/check_config_h.rb

@@ -1,47 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This script verifies that every source includes config.h first.
-# This is very important for consistent Large File Support.
-#
-
-def check_file(file)
-    first = true
-    file.each_line do |line|
-        if line =~ /^\#include\s+(\S+)/ then
-            if $1 == '"config.h"'
-                unless first
-                    puts "#{file.path}: config.h included too late"
-                end
-            else
-                if first
-                    puts "#{file.path}: config.h missing"
-                end
-            end
-            first = false
-        end
-    end
-end
-
-def check_path(path)
-    File.open(path) do |file|
-        check_file(file)
-    end
-end
-
-if ARGV.empty?
-    Dir["src/*.c"].each do |path|
-        check_path(path)
-    end
-
-    Dir["src/*/*.c"].each do |path|
-        check_path(path)
-    end
-
-    Dir["test/*.c"].each do |path|
-        check_path(path)
-    end
-else
-    ARGV.each do |path|
-        check_path(path)
-    end
-end

src/AudioParser.cxx

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

src/CheckAudioFormat.cxx

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

src/IcyMetaDataParser.cxx

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

src/Idle.cxx

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

src/IdleFlags.cxx

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

src/Instance.hxx

@@ -20,7 +20,7 @@
 #ifndef MPD_INSTANCE_HXX
 #define MPD_INSTANCE_HXX
 
-#include "check.h"
+#include "config.h"
 #include "event/Loop.hxx"
 #include "event/Thread.hxx"
 #include "event/MaskMonitor.hxx"

src/LocateUri.hxx

@@ -20,7 +20,7 @@
 #ifndef MPD_LOCATE_URI_HXX
 #define MPD_LOCATE_URI_HXX
 
-#include "check.h"
+#include "config.h"
 #include "util/Compiler.h"
 #include "fs/AllocatedPath.hxx"
 

src/Log.cxx

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

src/LogBackend.cxx

@@ -17,11 +17,11 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "LogBackend.hxx"
 #include "Log.hxx"
 #include "util/Domain.hxx"
 #include "util/StringStrip.hxx"
+#include "config.h"
 
 #include <assert.h>
 #include <stdio.h>

src/LogBackend.hxx

@@ -20,7 +20,6 @@
 #ifndef MPD_LOG_BACKEND_HXX
 #define MPD_LOG_BACKEND_HXX
 
-#include "check.h"
 #include "LogLevel.hxx"
 
 void

src/LogInit.cxx

@@ -30,6 +30,10 @@
 #include "util/RuntimeError.hxx"
 #include "system/Error.hxx"
 
+#ifdef ENABLE_SYSTEMD_DAEMON
+#include <systemd/sd-daemon.h>
+#endif
+
 #include <assert.h>
 #include <string.h>
 #include <fcntl.h>
@@ -139,6 +143,16 @@ log_init(const ConfigData &config, bool verbose, bool use_stdout)
 		if (param == nullptr) {
 			/* no configuration: default to syslog (if
 			   available) */
+#ifdef ENABLE_SYSTEMD_DAEMON
+			if (sd_booted() &&
+			    getenv("NOTIFY_SOCKET") != nullptr) {
+				/* if MPD was started as a systemd
+				   service, default to journal (which
+				   is connected to fd=2) */
+				out_fd = STDOUT_FILENO;
+				return;
+			}
+#endif
 #ifndef HAVE_SYSLOG
 			throw std::runtime_error("config parameter 'log_file' not found");
 #endif

src/Main.cxx

@@ -192,7 +192,7 @@ glue_db_init_and_load(const ConfigData &config)
 	if (instance->database == nullptr)
 		return true;
 
-	if (instance->database->GetPlugin().flags & DatabasePlugin::FLAG_REQUIRE_STORAGE) {
+	if (instance->database->GetPlugin().RequireStorage()) {
 		InitStorage(config, instance->io_thread.GetEventLoop());
 
 		if (instance->storage == nullptr) {
@@ -216,17 +216,17 @@ glue_db_init_and_load(const ConfigData &config)
 		std::throw_with_nested(std::runtime_error("Failed to open database plugin"));
 	}
 
-	if (!instance->database->IsPlugin(simple_db_plugin))
+	auto *db = dynamic_cast<SimpleDatabase *>(instance->database);
+	if (db == nullptr)
 		return true;
 
-	SimpleDatabase &db = *(SimpleDatabase *)instance->database;
 	instance->update = new UpdateService(config,
-					     instance->event_loop, db,
+					     instance->event_loop, *db,
 					     static_cast<CompositeStorage &>(*instance->storage),
 					     *instance);
 
 	/* run database update after daemonization? */
-	return db.FileExists();
+	return db->FileExists();
 }
 
 static bool

src/Mapper.hxx

@@ -24,9 +24,10 @@
 #ifndef MPD_MAPPER_HXX
 #define MPD_MAPPER_HXX
 
-#include <string>
-
 #include "util/Compiler.h"
+#include "config.h"
+
+#include <string>
 
 #define PLAYLIST_FILE_SUFFIX ".m3u"
 

src/MixRampInfo.hxx

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

src/MusicBuffer.cxx

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

src/MusicChunk.cxx

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

src/MusicChunkPtr.cxx

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

src/MusicChunkPtr.hxx

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

src/MusicPipe.cxx

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

src/Partition.hxx

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

src/Permission.hxx

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

src/PlaylistDatabase.cxx

@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "PlaylistDatabase.hxx"
 #include "db/PlaylistVector.hxx"
 #include "fs/io/TextFile.hxx"

src/PlaylistDatabase.hxx

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

src/PlaylistError.cxx

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

src/PlaylistPrint.cxx

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

src/RemoteTagCache.cxx

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

src/RemoteTagCache.hxx

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

src/ReplayGainConfig.hxx

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

src/ReplayGainGlobal.cxx

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

src/ReplayGainGlobal.hxx

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

src/ReplayGainInfo.cxx

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

src/ReplayGainInfo.hxx

@@ -20,7 +20,6 @@
 #ifndef MPD_REPLAY_GAIN_INFO_HXX
 #define MPD_REPLAY_GAIN_INFO_HXX
 
-#include "check.h"
 #include "util/Compiler.h"
 #include "ReplayGainMode.hxx"
 

src/SongLoader.cxx

@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "SongLoader.hxx"
 #include "LocateUri.hxx"
 #include "client/Client.hxx"
@@ -25,6 +24,7 @@
 #include "storage/StorageInterface.hxx"
 #include "song/DetachedSong.hxx"
 #include "PlaylistError.hxx"
+#include "config.h"
 
 #include <assert.h>
 

src/SongLoader.hxx

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

src/SongPrint.cxx

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

src/SongSave.cxx

@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "SongSave.hxx"
 #include "AudioParser.hxx"
 #include "db/plugins/simple/Song.hxx"

src/StateFile.hxx

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

src/StateFileConfig.cxx

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

src/StateFileConfig.hxx

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

src/TagArchive.cxx

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

src/TagArchive.hxx

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

src/TagFile.cxx

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

src/TagFile.hxx

@@ -20,8 +20,6 @@
 #ifndef MPD_TAG_FILE_HXX
 #define MPD_TAG_FILE_HXX
 
-#include "check.h"
-
 struct AudioFormat;
 class Path;
 class TagHandler;

src/TagPrint.cxx

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

src/TagSave.cxx

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

src/TagStream.cxx

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

src/TagStream.hxx

@@ -20,8 +20,6 @@
 #ifndef MPD_TAG_STREAM_HXX
 #define MPD_TAG_STREAM_HXX
 
-#include "check.h"
-
 struct AudioFormat;
 class InputStream;
 class TagHandler;

src/TimePrint.cxx

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

src/android/Context.cxx

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

src/android/Environment.cxx

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

src/android/LogListener.cxx

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

src/archive/ArchiveLookup.cxx

@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h" /* must be first for large file support */
 #include "ArchiveLookup.hxx"
 #include "ArchiveDomain.hxx"
 #include "Log.hxx"

src/archive/ArchivePlugin.cxx

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

src/archive/plugins/Bzip2ArchivePlugin.cxx

@@ -21,7 +21,6 @@
   * single bz2 archive handling (requires libbz2)
   */
 
-#include "config.h"
 #include "Bzip2ArchivePlugin.hxx"
 #include "../ArchivePlugin.hxx"
 #include "../ArchiveFile.hxx"

src/archive/plugins/Iso9660ArchivePlugin.cxx

@@ -21,7 +21,6 @@
   * iso archive handling (requires cdio, and iso9660)
   */
 
-#include "config.h"
 #include "Iso9660ArchivePlugin.hxx"
 #include "../ArchivePlugin.hxx"
 #include "../ArchiveFile.hxx"

src/archive/plugins/ZzipArchivePlugin.cxx

@@ -21,7 +21,6 @@
   * zip archive handling (requires zziplib)
   */
 
-#include "config.h"
 #include "ZzipArchivePlugin.hxx"
 #include "../ArchivePlugin.hxx"
 #include "../ArchiveFile.hxx"

src/check.h

@@ -1,40 +0,0 @@
-/*
- * Copyright 2003-2018 The Music Player Daemon Project
- * http://www.musicpd.org
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef MPD_CHECK_H
-#define MPD_CHECK_H
-
-/*
- * All sources must include config.h on the first line to ensure that
- * Large File Support is configured properly.  This header checks
- * whether this has happened.
- *
- * Usage: include this header before you use any of the above types.
- * It will stop the compiler if something went wrong.
- *
- * This is Linux/glibc specific, and only enabled in the debug build,
- * so bugs in this headers don't affect users with production builds.
- *
- */
-
-#ifndef PACKAGE_VERSION
-#error config.h missing
-#endif
-
-#endif

src/client/Client.cxx

@@ -17,11 +17,11 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "ClientInternal.hxx"
-#include "util/Domain.hxx"
 #include "Partition.hxx"
 #include "Instance.hxx"
+#include "util/Domain.hxx"
+#include "config.h"
 
 const Domain client_domain("client");
 

src/client/Client.hxx

@@ -20,7 +20,6 @@
 #ifndef MPD_CLIENT_H
 #define MPD_CLIENT_H
 
-#include "check.h"
 #include "ClientMessage.hxx"
 #include "command/CommandListBuilder.hxx"
 #include "tag/Mask.hxx"

src/client/ClientEvent.cxx

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

src/client/ClientExpire.cxx

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

src/client/ClientFile.cxx

@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Client.hxx"
 #include "protocol/Ack.hxx"
 #include "fs/Path.hxx"

src/client/ClientGlobal.cxx

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

src/client/ClientIdle.cxx

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

src/client/ClientInternal.hxx

@@ -20,7 +20,6 @@
 #ifndef MPD_CLIENT_INTERNAL_HXX
 #define MPD_CLIENT_INTERNAL_HXX
 
-#include "check.h"
 #include "Client.hxx"
 #include "command/CommandResult.hxx"
 

src/client/ClientList.cxx

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

src/client/ClientNew.cxx

@@ -35,10 +35,6 @@
 #include <sys/socket.h>
 #endif
 
-#ifdef HAVE_LIBWRAP
-#include <tcpd.h>
-#endif
-
 static constexpr char GREETING[] = "OK MPD " PROTOCOL_VERSION "\n";
 
 Client::Client(EventLoop &_loop, Partition &_partition,
@@ -66,27 +62,6 @@ client_new(EventLoop &loop, Partition &partition,
 
 	assert(fd.IsDefined());
 
-#ifdef HAVE_LIBWRAP
-	if (address.GetFamily() != AF_LOCAL) {
-		// TODO: shall we obtain the program name from argv[0]?
-		const char *progname = "mpd";
-
-		struct request_info req;
-		request_init(&req, RQ_FILE, fd.Get(), RQ_DAEMON, progname, 0);
-
-		fromhost(&req);
-
-		if (!hosts_access(&req)) {
-			/* tcp wrappers says no */
-			FormatWarning(client_domain,
-				      "libwrap refused connection (libwrap=%s) from %s",
-				      progname, remote.c_str());
-
-			return;
-		}
-	}
-#endif	/* HAVE_WRAP */
-
 	ClientList &client_list = *partition.instance.client_list;
 	if (client_list.IsFull()) {
 		LogWarning(client_domain, "Max connections reached");

src/client/ClientProcess.cxx

@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "ClientInternal.hxx"
 #include "protocol/Result.hxx"
 #include "command/AllCommands.hxx"

src/client/ClientRead.cxx

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

src/client/ClientSubscribe.cxx

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

src/client/ClientWrite.cxx

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

src/client/Listener.cxx

@@ -17,12 +17,12 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "Listener.hxx"
 #include "Client.hxx"
 #include "Permission.hxx"
 #include "net/UniqueSocketDescriptor.hxx"
 #include "net/SocketAddress.hxx"
+#include "config.h"
 
 static unsigned
 GetPermissions(SocketAddress address, int uid) noexcept

src/client/Listener.hxx

@@ -20,7 +20,6 @@
 #ifndef MPD_CLIENT_LISTENER_HXX
 #define MPD_CLIENT_LISTENER_HXX
 
-#include "check.h"
 #include "event/ServerSocket.hxx"
 
 struct Partition;

src/client/Response.cxx

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

src/client/Response.hxx

@@ -20,7 +20,6 @@
 #ifndef MPD_RESPONSE_HXX
 #define MPD_RESPONSE_HXX
 
-#include "check.h"
 #include "protocol/Ack.hxx"
 #include "util/Compiler.h"
 

src/command/ClientCommands.cxx

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

src/command/CommandListBuilder.cxx

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

src/command/DatabaseCommands.cxx

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

src/command/MessageCommands.cxx

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

src/command/NeighborCommands.cxx

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

src/command/OutputCommands.cxx

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

src/command/PartitionCommands.cxx

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

src/command/Request.hxx

@@ -20,7 +20,6 @@
 #ifndef MPD_REQUEST_HXX
 #define MPD_REQUEST_HXX
 
-#include "check.h"
 #include "protocol/ArgParser.hxx"
 #include "protocol/RangeArg.hxx"
 #include "Chrono.hxx"

src/command/StickerCommands.cxx

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

src/command/StorageCommands.cxx

@@ -209,12 +209,9 @@ handle_mount(Client &client, Request args, Response &r)
 	instance.EmitIdle(IDLE_MOUNT);
 
 #ifdef ENABLE_DATABASE
-	Database *_db = instance.database;
+	if (auto *db = dynamic_cast<SimpleDatabase *>(instance.database)) {
-	if (_db != nullptr && _db->IsPlugin(simple_db_plugin)) {
-		SimpleDatabase &db = *(SimpleDatabase *)_db;
-
 		try {
-			db.Mount(local_uri, remote_uri);
+			db->Mount(local_uri, remote_uri);
 		} catch (...) {
 			composite.Unmount(local_uri);
 			throw;
@@ -256,11 +253,8 @@ handle_unmount(Client &client, Request args, Response &r)
 		   destroy here */
 		instance.update->CancelMount(local_uri);
 
-	Database *_db = instance.database;
+	if (auto *db = dynamic_cast<SimpleDatabase *>(instance.database)) {
-	if (_db != nullptr && _db->IsPlugin(simple_db_plugin)) {
+		if (db->Unmount(local_uri))
-		SimpleDatabase &db = *(SimpleDatabase *)_db;
-
-		if (db.Unmount(local_uri))
 			// TODO: call Instance::OnDatabaseModified()?
 			instance.EmitIdle(IDLE_DATABASE);
 	}

src/command/TagCommands.cxx

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

src/config/Block.cxx

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

src/config/Block.hxx

@@ -20,7 +20,6 @@
 #ifndef MPD_CONFIG_BLOCK_HXX
 #define MPD_CONFIG_BLOCK_HXX
 
-#include "check.h"
 #include "Param.hxx"
 #include "util/Compiler.h"
 

src/config/Check.cxx

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

src/config/Data.cxx

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