release v0.22

Fixes use-after-free because the temporary goes out of scope.

.clang-format

@@ -0,0 +1,17 @@
+BasedOnStyle: LLVM
+AccessModifierOffset: -8
+AllowAllConstructorInitializersOnNextLine: false
+AlwaysBreakTemplateDeclarations: Yes
+BraceWrapping:
+  AfterFunction: true
+  SplitEmptyFunction: true
+BreakConstructorInitializers: BeforeColon
+ColumnLimit: 90
+ConstructorInitializerIndentWidth: 0
+ContinuationIndentWidth: 8
+IndentCaseLabels: false
+IndentPPDirectives: AfterHash
+IndentWidth: 8
+Standard: c++17
+TabWidth: 8
+UseTab: Always

.github/FUNDING.yml

@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: MaxK
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,22 @@
+---
+name: Bug report
+about: Create a bug report
+---
+
+<!-- See https://www.musicpd.org/help/ -->
+## Bug report
+### Describe the bug
+
+
+## Expected Behavior
+
+
+## Actual Behavior
+
+
+## Version
+<!-- Paste the output of "mpd --version" here -->
+
+
+## Log
+<!-- Paste relevant portions of the log file here (--verbose) -->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,6 @@
+---
+name: Feature request
+about: Create a feature request
+---
+
+## Feature request

.github/ISSUE_TEMPLATE/question.md

@@ -0,0 +1,9 @@
+---
+name: Question
+about: Ask a question about MPD
+---
+
+<!-- Before you ask a question on GitHub, please read MPD's
+documentation.  A copy is available at
+https://www.musicpd.org/doc/html/ -->
+## Question

.travis.yml

@@ -67,32 +67,6 @@ jobs:
       env:
         - MATRIX_EVAL="export PATH=\$HOME/.local/bin:\$PATH"
 
-    # Ubuntu Trusty (16.04) with GCC 6
-    - os: linux
-      dist: trusty
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-            - sourceline: 'ppa:mhier/libboost-latest'
-            - sourceline: 'ppa:mstipicevic/ninja-build-1-7-2'
-            - sourceline: 'ppa:deadsnakes/ppa' # for Python 3.7 (required by Meson)
-          packages:
-            - g++-6
-            - libgtest-dev
-            - boost1.67
-            - python3.6
-            - python3-urllib3
-            - ninja-build
-      before_install:
-        - wget https://bootstrap.pypa.io/get-pip.py
-        - /usr/bin/python3.6 get-pip.py --user --no-cache-dir
-      install:
-        - /usr/bin/python3.6 $HOME/.local/bin/pip install --user meson --no-cache-dir
-      env:
-        # use gold as workaround for https://sourceware.org/bugzilla/show_bug.cgi?id=17068
-        - MATRIX_EVAL="export CC='ccache gcc-6' CXX='ccache g++-6' LDFLAGS=-fuse-ld=gold PATH=\$HOME/.local/bin:\$PATH"
-
     # Ubuntu Trusty (16.04) with GCC 8
     - os: linux
       dist: trusty
@@ -120,7 +94,7 @@ jobs:
         - MATRIX_EVAL="export CC='ccache gcc-8' CXX='ccache g++-8' LDFLAGS=-fuse-ld=gold PATH=\$HOME/.local/bin:\$PATH"
 
     - os: osx
-      osx_image: xcode9.4
+      osx_image: xcode10.3
       addons:
         homebrew:
           packages:

AUTHORS

@@ -1,5 +1,5 @@
 Music Player Daemon - http://www.musicpd.org
-Copyright 2003-2018 The Music Player Daemon Project
+Copyright 2003-2020 The Music Player Daemon Project
 
 The following people have contributed code to MPD:
 

NEWS

@@ -1,3 +1,65 @@
+ver 0.22 (2020/09/23)
+* protocol
+  - "findadd"/"searchadd"/"searchaddpl" support the "sort" and
+    "window" parameters
+  - add command "readpicture" to download embedded pictures
+  - command "moveoutput" moves an output between partitions
+  - command "delpartition" deletes a partition
+  - show partition name in "status" response
+* tags
+  - new tags "Grouping" (for ID3 "TIT1"), "Work" and "Conductor"
+* input
+  - curl: support "charset" parameter in URI fragment
+  - ffmpeg: allow partial reads
+  - io_uring: new plugin for local files on Linux (using liburing)
+  - smbclient: close unused SMB/CIFS connections
+* database
+  - upnp: drop support for libupnp versions older than 1.8
+* playlist
+  - cue: integrate contents in database
+* decoder
+  - ffmpeg: support RTSP
+  - mad: remove option "gapless", always do gapless
+  - sidplay: add option "default_genre"
+  - sidplay: map SID name field to "Album" tag
+  - sidplay: add support for new song length format with libsidplayfp 2.0
+  - vorbis, opus: improve seeking accuracy
+* playlist
+  - flac: support reading CUE sheets from remote FLAC files
+* filter
+  - ffmpeg: new plugin based on FFmpeg's libavfilter library
+  - hdcd: new plugin based on FFmpeg's "af_hdcd" for HDCD playback
+  - volume: convert S16 to S24 to preserve quality and reduce dithering noise
+  - dsd: add integer-only DSD to PCM converter
+* output
+  - jack: add option "auto_destination_ports"
+  - jack: report error details
+  - pulse: add option "media_role"
+  - solaris: support S8 and S32
+* lower the real-time priority from 50 to 40
+* switch to C++17
+  - GCC 8 or clang 5 (or newer) recommended
+
+ver 0.21.26 (2020/09/21)
+* database
+  - inotify: obey ".mpdignore" files
+* output
+  - osx: fix crash bug
+  - sles: support floating point samples
+* archive
+  - bzip2: fix crash on corrupt bzip2 file
+  - bzip2: flush output at end of input file
+  - iso9660: fix unaligned reads
+  - iso9660: support seeking
+  - zzip: fix crash on corrupt ZIP file
+* decoder
+  - ffmpeg: remove "rtsp://" from the list of supported protocols
+  - ffmpeg: add "hls+http://" to the list of supported protocols
+  - opus: support the gain value from the Opus header
+  - sndfile: fix lost samples at end of file
+* fix "single" mode bug after resuming playback
+* the default log_level is "default", not "info"
+
 ver 0.21.25 (2020/07/06)
 * protocol:
   - fix crash when using "rangeid" while playing

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="48"
-          android:versionName="0.21.25">
+          android:versionCode="50"
+          android:versionName="0.22">
 
   <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28"/>
 

android/src/Bridge.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify

android/src/Loader.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify

android/src/Main.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify

android/src/Settings.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify

doc/conf.py

@@ -30,7 +30,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = 'Music Player Daemon'
-copyright = '2003-2018 The Music Player Daemon Project'
+copyright = '2003-2020 The Music Player Daemon Project'
 author = 'Max Kellermann'
 
 # The version info for the project you're documenting, acts as replacement for
@@ -38,7 +38,7 @@ author = 'Max Kellermann'
 # built documents.
 #
 # The short X.Y version.
-version = '0.21.25'
+version = '0.22'
 # The full version, including alpha/beta/rc tags.
 release = version
 
@@ -212,3 +212,7 @@ html_static_path = ['_static']
 # implements a search results scorer. If empty, the default will be used.
 #
 # html_search_scorer = 'scorer.js'
+man_pages = [
+        ('mpd.1', 'mpd', 'MPD documentation', [author], 1),
+        ('mpd.conf.5', 'mpd.conf', 'mpd.conf documentation', [author], 5)
+]

doc/developer.rst

@@ -12,8 +12,7 @@ Code Style
 * indent with tabs (width 8)
 * don't write CPP when you can write C++: use inline functions and constexpr instead of macros
 * comment your code, document your APIs
-* the code should be C++14 compliant, and must compile with :program:`GCC` 6.0 and :program:`clang` 3.4
-* report error conditions with C++ exceptions, preferable derived from :envvar:`std::runtime_error`
+* the code should be C++17 compliant, and must compile with :program:`GCC` 8 and :program:`clang` 5
 * all code must be exception-safe
 * classes and functions names use CamelCase; variables are lower-case with words separated by underscore
 
@@ -31,6 +30,56 @@ Some example code:
         return xyz;
     }
 
+
+Error handling
+==============
+
+If an error occurs, throw a C++ exception, preferably derived from
+:code:`std::runtime_error`.  The function's API documentation should
+mention that.  If a function cannot throw exceptions, add
+:code:`noexcept` to its prototype.
+
+Some parts of MPD use callbacks to report completion; the handler
+classes usually have an "error" callback which receives a
+:code:`std::exception_ptr`
+(e.g. :code:`BufferedSocket::OnSocketError()`).  Wrapping errors in
+:code:`std::exception_ptr` allows propagating details about the error
+across thread boundaries to the entity which is interested in handling
+it (e.g. giving the MPD client details about an I/O error caught by
+the decoder thread).
+
+Out-of-memory errors (i.e. :code:`std::bad_alloc`) do not need to be
+handled.  Some operating systems such as Linux do not report
+out-of-memory to userspace, and instead kill a process to recover.
+Even if we know we are out of memory, there is little we can do except
+for aborting the process quickly.  Any other attempts to give back
+memory may cause page faults on the way which make the situation
+worse.
+
+Error conditions which are caused by a bug do not need to be handled
+at runtime; instead, use :code:`assert()` to detect them in debug
+builds.
+
+
+git Branches
+************
+
+There are two active branches in the git repository:
+
+- the "unstable" branch called ``master`` where new features are
+  merged.  This will become the next major release eventually.
+- the "stable" branch (currently called ``v0.21.x``) where only bug
+  fixes are merged.
+
+Once :program:`MPD` 0.22 is released, a new branch called ``v0.22.x``
+will be created for 0.22 bug-fix releases; after that, ``v0.21.x``
+will eventually cease to be maintained.
+
+After bug fixes have been added to the "stable" branch, it will be
+merged into ``master``.  This ensures that all known bugs are fixed in
+all active branches.
+
+
 Hacking The Source
 ******************
 

doc/meson.build

@@ -1,33 +1,51 @@
-install_man(['mpd.1', 'mpd.conf.5'])
+if not get_option('html_manual')
+  subdir_done()
+endif
 
-sphinx = find_program('sphinx-build')
-sphinx_output = custom_target(
-  'HTML documentation',
-  output: 'html',
-  input: [
-    'index.rst', 'user.rst', 'developer.rst',
-    'plugins.rst',
-    'protocol.rst',
-    'conf.py',
-  ],
-  command: [sphinx, '-q', '-b', 'html', '-d', '@OUTDIR@/doctrees', meson.current_source_dir(), '@OUTPUT@'],
-  build_by_default: true,
-  install: true,
-  install_dir: join_paths(get_option('datadir'), 'doc', meson.project_name()),
-)
+sphinx = find_program('sphinx-build', required: get_option('documentation'))
+if not sphinx.found()
+  subdir_done()
+endif
 
-custom_target(
-  'upload',
-  input: sphinx_output,
-  output: 'upload',
-  build_always_stale: true,
-  command: [
-    'rsync', '-vpruz', '--delete', meson.current_build_dir() + '/',
-    'www.musicpd.org:/var/www/mpd/doc/',
-    '--chmod=Dug+rwx,Do+rx,Fug+rw,Fo+r',
-    '--include=html', '--include=html/**',
-    '--exclude=*',
-  ],
-)
+if get_option('html_manual')
+  sphinx_output = custom_target(
+    'HTML documentation',
+    output: 'html',
+    input: [
+      'index.rst', 'user.rst', 'developer.rst',
+      'plugins.rst',
+      'protocol.rst',
+      'conf.py',
+    ],
+    command: [sphinx, '-q', '-b', 'html', '-d', '@OUTDIR@/doctrees', meson.current_source_dir(), '@OUTPUT@'],
+    build_by_default: true,
+    install: true,
+    install_dir: join_paths(get_option('datadir'), 'doc', meson.project_name()),
+  )
 
+  custom_target(
+    'upload',
+    input: sphinx_output,
+    output: 'upload',
+    build_always_stale: true,
+    command: [
+      'rsync', '-vpruz', '--delete', meson.current_build_dir() + '/',
+      'www.musicpd.org:/var/www/mpd/doc/',
+      '--chmod=Dug+rwx,Do+rx,Fug+rw,Fo+r',
+      '--include=html', '--include=html/**',
+      '--exclude=*',
+    ],
+  )
+endif
 
+if get_option('manpages')
+  custom_target(
+    'Manpage documentation',
+    output: ['mpd.1', 'mpd.conf.5'],
+    input: ['mpd.1.rst', 'conf.py'],
+    command: [sphinx, '-q', '-b', 'man', '-d', '@OUTDIR@/man_doctrees', meson.current_source_dir(), '@OUTDIR@'],
+    build_by_default: true,
+    install: true,
+    install_dir: [join_paths(get_option('mandir'), 'man1'), join_paths(get_option('mandir'), 'man5')],
+  )
+endif

doc/mpd.1

@@ -1,55 +0,0 @@
-.TH "Music Player Daemon" 1
-.SH NAME
-MPD \- A daemon for playing music
-.SH SYNOPSIS
-.B mpd
-.RI [ options ]
-.RI [ CONF_FILE ]
-.SH DESCRIPTION
-MPD is a daemon for playing music.  Music is played through the configured
-audio output(s) (which are generally local, but can be remote).  The daemon
-stores info about all available music, and this info can be easily searched and
-retrieved.  Player control, info retrieval, and playlist management can all be
-managed remotely.
-
-MPD searches for a config file in \fB$XDG_CONFIG_HOME/mpd/mpd.conf\fP then
-\fB~/.mpdconf\fP then \fB/etc/mpd.conf\fP or uses CONF_FILE.
-
-Read more about MPD at <\fBhttp://www.musicpd.org/\fP>.
-.SH OPTIONS
-.TP
-.BI \-\-help
-Output a brief help message.
-.TP
-.BI \-\-kill
-Kill the currently running mpd session.  The pid_file parameter must be
-specified in the config file for this to work.
-.TP
-.BI \-\-no\-daemon
-Don't detach from console.
-.TP
-.BI \-\-stderr
-Print messages stderr.
-.TP
-.BI \-\-verbose
-Verbose logging.
-.TP
-.BI \-\-version
-Print version information.
-.SH FILES
-.TP
-.BI ~/.mpdconf
-User configuration file.
-.TP
-.BI /etc/mpd.conf
-Global configuration file.
-.SH SEE ALSO
-mpd.conf(5), mpc(1)
-.SH BUGS
-If you find a bug, please report it at
-.br
-<\fBhttps://github.com/MusicPlayerDaemon/MPD/issues/\fP>.
-.SH AUTHORS
-Max Kellermann <max.kellermann@gmail.com>
-
-Special thanks to all the people that provided feedback and patches.

doc/mpd.1.rst

@@ -0,0 +1,69 @@
+===
+mpd
+===
+
+SYNOPSIS
+--------
+
+``mpd`` [options] [CONF_FILE]
+
+DESCRIPTION
+------------
+
+MPD is a daemon for playing music. Music is played through the configured audio output(s) (which are generally local, but can be remote). The daemon stores info about all available music, and this info can be easily searched and retrieved. Player control, info retrieval, and playlist management can all be managed remotely.
+
+MPD searches for a config file in ``$XDG_CONFIG_HOME/mpd/mpd.conf``
+then ``~/.mpdconf`` then ``/etc/mpd.conf`` or uses ``CONF_FILE``.
+
+Read more about MPD at http://www.musicpd.org/
+
+OPTIONS
+-------
+
+.. program:: mpd
+
+.. option:: --help
+
+  Output a brief help message.
+
+.. option:: --kill
+
+  Kill the currently running mpd session. The pid_file parameter must be specified in the config file for this to work.
+
+.. option:: --no-config
+
+  Don't read from the configuration file.
+
+.. option:: --no-daemon
+
+  Don't detach from console.
+
+.. option:: --stderr
+
+  Print messages to stderr.
+
+.. option:: --verbose
+
+  Verbose logging.
+
+.. option:: --version
+
+  Print version information.
+
+FILES
+-----
+
+:file:`~/.mpdconf`
+  User configuration file.
+
+:file:`/etc/mpd.conf`
+  Global configuration file.
+
+SEE ALSO
+--------
+
+:manpage:`mpd.conf(5)`, :manpage:`mpc(1)`
+
+BUGS
+----
+If you find a bug, please report it at https://github.com/MusicPlayerDaemon/MPD/issues/

doc/mpd.conf.5

@@ -1,180 +0,0 @@
-.TH mpd.conf 5
-.SH NAME
-mpd.conf \- Music Player Daemon configuration file
-.SH DESCRIPTION
-\fBmpd.conf\fP is the configuration file for mpd(1).  If not specified on the
-command line, MPD first searches for it at \fB$XDG_CONFIG_HOME/mpd/mpd.conf\fP
-then at \fB~/.mpdconf\fP then at \fB~/.mpd/mpd.conf\fP and then in
-\fB/etc/mpd.conf\fP.
-
-Lines beginning with a "#" character are comments.  All other non-empty lines
-specify parameters and their values.  These lines contain the parameter name
-and parameter value (surrounded by double quotes) separated by whitespace
-(either tabs or spaces).  For example:
-
-parameter "value"
-
-The exception to this rule is the audio_output parameter, which is of the form:
-
-audio_output {
-.br
-        parameter1 "value"
-        parameter2 "value"
-.br
-}
-
-Parameters that take a file or directory as an argument should use absolute
-paths.
-
-See \fBdocs/mpdconf.example\fP in the source tarball for an example
-configuration file.
-
-This manual is not complete, it lists only the most important options.
-Please read the MPD user manual for a complete configuration guide:
-<\fBhttp://www.musicpd.org/doc/user/\fP>
-.SH REQUIRED PARAMETERS
-.TP
-.B db_file <file>
-This specifies where the db file will be stored.
-.TP
-.B log_file <file>
-This specifies where the log file should be located.
-The special value "syslog" makes MPD use the local syslog daemon.
-.SH OPTIONAL PARAMETERS
-.TP
-.B sticker_file <file>
-The location of the sticker database.  This is a database which
-manages dynamic information attached to songs.
-.TP
-.B pid_file <file>
-This specifies the file to save mpd's process ID in.
-.TP
-.B music_directory <directory>
-This specifies the directory where music is located.
-If you do not configure this, you can only play streams.
-.TP
-.B playlist_directory <directory>
-This specifies the directory where saved playlists are stored.
-If you do not configure this, you cannot save playlists.
-.TP
-.B state_file <file>
-This specifies if a state file is used and where it is located.  The state of
-mpd will be saved to this file when mpd is terminated by a TERM signal or by
-the "kill" command.  When mpd is restarted, it will read the state file and
-restore the state of mpd (including the playlist).
-.TP
-.B restore_paused <yes or no>
-Put MPD into pause mode instead of starting playback after startup.
-.TP
-.B user <username>
-This specifies the user that MPD will run as, if set.  MPD should
-never run as root, and you may use this option to make MPD change its
-user id after initialization.  Do not use this option if you start MPD
-as an unprivileged user.
-.TP
-.B port <port>
-This specifies the port that mpd listens on.  The default is 6600.
-.TP
-.B log_level <default, secure, or verbose>
-This specifies how verbose logs are.  "default" is minimal logging, "secure"
-reports from what address a connection is opened, and when it is closed, and
-"verbose" records excessive amounts of information for debugging purposes.  The
-default is "default".
-.TP
-.B follow_outside_symlinks <yes or no>
-Control if MPD will follow symbolic links pointing outside the music dir.
-You must recreate the database after changing this option.
-The default is "yes".
-.TP
-.B follow_inside_symlinks <yes or no>
-Control if MPD will follow symbolic links pointing inside the music dir,
-potentially adding duplicates to the database.
-You must recreate the database after changing this option.
-The default is "yes".
-.TP
-.B zeroconf_enabled <yes or no>
-If yes, and MPD has been compiled with support for Avahi or Bonjour, service
-information will be published with Zeroconf.  The default is yes.
-.TP
-.B zeroconf_name <name>
-If Zeroconf is enabled, this is the service name to publish.  This name should
-be unique to your local network, but name collisions will be properly dealt
-with.  The default is "Music Player @ %h", where %h will be replaced with the
-hostname of the machine running MPD.
-.TP
-.B audio_output
-See \fBDESCRIPTION\fP and the various \fBAUDIO OUTPUT PARAMETERS\fP sections
-for the format of this parameter.  Multiple audio_output sections may be
-specified.  If no audio_output section is specified, then MPD will scan for a
-usable audio output.
-.TP
-.B replaygain <off or album or track or auto>
-If specified, mpd will adjust the volume of songs played using ReplayGain tags
-(see <\fBhttp://www.replaygain.org/\fP>).  Setting this to "album" will adjust
-volume using the album's ReplayGain tags, while setting it to "track" will
-adjust it using the track ReplayGain tags.  "auto" uses the track ReplayGain
-tags if random play is activated otherwise the album ReplayGain tags. Currently
-only FLAC, Ogg Vorbis, Musepack, and MP3 (through ID3v2 ReplayGain tags, not
-APEv2) are supported.
-.TP
-.B replaygain_preamp <\-15 to 15>
-This is the gain (in dB) applied to songs with ReplayGain tags.
-.TP
-.B volume_normalization <yes or no>
-If yes, mpd will normalize the volume of songs as they play.  The default is no.
-.TP
-.B filesystem_charset <charset>
-This specifies the character set used for the filesystem.  A list of supported
-character sets can be obtained by running "iconv \-l".  The default is
-determined from the locale when the db was originally created.
-.TP
-.B save_absolute_paths_in_playlists <yes or no>
-This specifies whether relative or absolute paths for song filenames are used
-when saving playlists.  The default is "no".
-.TP
-.B auto_update <yes or no>
-This specifies the whether to support automatic update of music database when
-files are changed in music_directory. The default is to disable autoupdate
-of database.
-.TP
-.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.
-.SH REQUIRED AUDIO OUTPUT PARAMETERS
-.TP
-.B type <type>
-This specifies the audio output type.  See the list of supported outputs in mpd
-\-\-version for possible values.
-.TP
-.B name <name>
-This specifies a unique name for the audio output.
-.SH OPTIONAL AUDIO OUTPUT PARAMETERS
-.TP
-.B format <sample_rate:bits:channels>
-This specifies the sample rate, bits per sample, and number of channels of
-audio that is sent to the audio output device.  See documentation for the
-\fBaudio_output_format\fP parameter for more details.  The default is to use
-whatever audio format is passed to the audio output.
-Any of the three attributes may be an asterisk to specify that this
-attribute should not be enforced
-.TP
-.B replay_gain_handler <software, mixer or none>
-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.
-.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.
-.SH FILES
-.TP
-.BI ~/.mpdconf
-User configuration file.
-.TP
-.BI /etc/mpd.conf
-Global configuration file.
-.SH SEE ALSO
-mpd(1), mpc(1)

doc/mpd.conf.5.rst

@@ -0,0 +1,202 @@
+========
+mpd.conf
+========
+
+
+DESCRIPTION
+------------
+
+:file:`mpd.conf` is the configuration file for :manpage:`mpd(1)`. If
+not specified on the command line, MPD first searches for it at
+:file:`$XDG_CONFIG_HOME/mpd/mpd.conf` then at :file:`~/.mpdconf` then
+at :file:`~/.mpd/mpd.conf` and then in :file:`/etc/mpd.conf`.
+
+Lines beginning with a :samp:`#` character are comments. All other
+non-empty lines specify parameters and their values. These lines
+contain the parameter name and parameter value (surrounded by double
+quotes) separated by whitespace (either tabs or spaces).  For
+example::
+
+   parameter "value"
+
+The exception to this rule is the audio_output parameter, which is of
+the form::
+
+   audio_output {
+   	parameter1 "value"
+   	parameter2 "value"
+   }
+
+
+Parameters that take a file or directory as an argument should use absolute paths.
+
+See :file:`docs/mpdconf.example` in the source tarball for an example
+configuration file.
+
+This manual is not complete, it lists only the most important options.
+Please read the MPD user manual for a complete configuration guide:
+http://www.musicpd.org/doc/user/
+
+
+REQUIRED PARAMETERS
+-------------------
+
+db_file <file>
+   This specifies where the db file will be stored.
+
+log_file <file>
+   This specifies where the log file should be located. The special value "syslog" makes MPD use the local syslog daemon.
+
+OPTIONAL PARAMETERS
+-------------------
+
+sticker_file <file>
+   The location of the sticker database. This is a database which manages
+   dynamic information attached to songs.
+
+pid_file <file>
+   This specifies the file to save mpd's process ID in.
+
+music_directory <directory>
+   This specifies the directory where music is located. If you do not configure
+   this, you can only play streams.
+
+playlist_directory <directory>
+   This specifies the directory where saved playlists are stored. If
+   you do not configure this, you cannot save playlists.
+
+state_file <file>
+   This specifies if a state file is used and where it is located. The state of
+   mpd will be saved to this file when mpd is terminated by a TERM signal or by
+   the :program:`kill` command. When mpd is restarted, it will read the state file and
+   restore the state of mpd (including the playlist).
+
+restore_paused <yes or no>
+   Put MPD into pause mode instead of starting playback after startup.
+
+user <username>
+   This specifies the user that MPD will run as, if set. MPD should never run
+   as root, and you may use this option to make MPD change its user id after
+   initialization. Do not use this option if you start MPD as an unprivileged
+   user.
+
+port <port>
+   This specifies the port that mpd listens on. The default is 6600.
+
+log_level <default, secure, or verbose>
+   Suppress all messages below the given threshold.  The following
+   log levels are available:
+
+   - :samp:`error`: errors
+   - :samp:`warning`: warnings
+   - :samp:`notice`: interesting informational messages
+   - :samp:`info`: unimportant informational messages
+   - :samp:`verbose`: debug messages (for developers and for
+     troubleshooting)
+
+   The default is :samp:`notice`.
+
+follow_outside_symlinks <yes or no>
+  Control if MPD will follow symbolic links pointing outside the music dir. You
+  must recreate the database after changing this option. The default is "yes".
+
+follow_inside_symlinks <yes or no>
+  Control if MPD will follow symbolic links pointing inside the music dir,
+  potentially adding duplicates to the database. You must recreate the
+  database after changing this option. The default is "yes".
+
+zeroconf_enabled <yes or no>
+  If yes, and MPD has been compiled with support for Avahi or Bonjour, service
+  information will be published with Zeroconf. The default is yes.
+
+zeroconf_name <name>
+  If Zeroconf is enabled, this is the service name to publish. This name should
+  be unique to your local network, but name collisions will be properly dealt
+  with. The default is "Music Player @ %h", where %h will be replaced with the
+  hostname of the machine running MPD.
+
+audio_output
+  See DESCRIPTION and the various ``AUDIO OUTPUT PARAMETERS`` sections for the
+  format of this parameter. Multiple audio_output sections may be specified. If
+  no audio_output section is specified, then MPD will scan for a usable audio
+  output.
+
+replaygain <off or album or track or auto>
+  If specified, mpd will adjust the volume of songs played using ReplayGain
+  tags (see http://www.replaygain.org/). Setting this to "album" will
+  adjust volume using the album's ReplayGain tags, while setting it to "track"
+  will adjust it using the track ReplayGain tags. "auto" uses the track
+  ReplayGain tags if random play is activated otherwise the album ReplayGain
+  tags. Currently only FLAC, Ogg Vorbis, Musepack, and MP3 (through ID3v2
+  ReplayGain tags, not APEv2) are supported.
+
+replaygain_preamp <-15 to 15>
+  This is the gain (in dB) applied to songs with ReplayGain tags.
+
+volume_normalization <yes or no>
+  If yes, mpd will normalize the volume of songs as they play. The default is
+  no.
+
+filesystem_charset <charset>
+  This specifies the character set used for the filesystem. A list of supported
+  character sets can be obtained by running "iconv -l". The default is
+  determined from the locale when the db was originally created.
+
+save_absolute_paths_in_playlists <yes or no>
+  This specifies whether relative or absolute paths for song filenames are used
+  when saving playlists. The default is "no".
+
+auto_update <yes or no>
+  This specifies the whether to support automatic update of music database
+  when files are changed in music_directory. The default is to disable
+  autoupdate of database.
+
+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.
+
+REQUIRED AUDIO OUTPUT PARAMETERS
+--------------------------------
+
+type <type>
+  This specifies the audio output type. See the list of supported outputs in
+  ``mpd --version`` for possible values.
+
+name <name>
+  This specifies a unique name for the audio output.
+
+OPTIONAL AUDIO OUTPUT PARAMETERS
+--------------------------------
+
+format <sample_rate:bits:channels>
+  This specifies the sample rate, bits per sample, and number of channels of
+  audio that is sent to the audio output device. See documentation for the
+  ``audio_output_format`` parameter for more details. The default is to use
+  whatever audio format is passed to the audio output. Any of the three
+  attributes may be an asterisk to specify that this attribute should not be
+  enforced
+
+replay_gain_handler <software, mixer or none>
+  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.
+
+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.
+
+FILES
+-----
+
+:file:`~/.mpdconf`
+  User configuration file.
+
+:file:`/etc/mpd.conf`
+  Global configuration file.
+
+SEE ALSO
+--------
+
+:manpage:`mpd(1)`, :manpage:`mpc(1)`

doc/mpdconf.example

@@ -89,12 +89,10 @@
 #
 #port				"6600"
 #
-# This setting controls the type of information which is logged. Available 
-# setting arguments are "default", "secure" or "verbose". The "verbose" setting
-# argument is recommended for troubleshooting, though can quickly stretch
-# available resources on limited hardware storage.
+# Suppress all messages below the given threshold.  Use "verbose" for
+# troubleshooting.
 #
-#log_level			"default"
+#log_level			"notice"
 #
 # Setting "restore_paused" to "yes" puts MPD into pause mode instead
 # of starting playback after startup.
@@ -280,6 +278,7 @@ input {
 #	name		"My Pulse Output"
 ##	server		"remote_server"		# optional
 ##	sink		"remote_server_sink"	# optional
+##	media_role	"media_role"		#optional
 #}
 #
 # An example of a winmm output (Windows multimedia API).
@@ -293,6 +292,20 @@ input {
 ##	mixer_type	"hardware"	# optional
 #}
 #
+# An example of a wasapi output (Windows multimedia API).
+#
+#audio_output {
+#	type		"wasapi"
+#	name		"My WASAPI output"
+##	device		"Digital Audio (S/PDIF) (High Definition Audio Device)" # optional
+#		or
+##	device		"0"		# optional
+## Exclusive mode blocks all other audio source, and get best audio quality without resampling.
+##	exclusive	"no"		# optional
+## Enumerate all devices in log.
+##	enumerate	"no"		# optional
+#}
+#
 # An example of an openal output.
 #
 #audio_output {

doc/plugins.rst

@@ -27,7 +27,7 @@ The default plugin. Stores a copy of the database in memory. A file is used for
 proxy
 -----
 
-Provides access to the database of another :program:`MPD` instance using libmpdclient. This is useful when you run mount the music directory via NFS/SMB, and the file server already runs a :program:`MPD` instance. Only the file server needs to update the database.
+Provides access to the database of another :program:`MPD` instance using libmpdclient. This is useful when you mount the music directory via NFS/SMB, and the file server already runs a :program:`MPD` instance. Only the file server needs to update the database.
 
 .. list-table::
    :widths: 20 80                     
@@ -116,7 +116,7 @@ Provides a list of SMB/CIFS servers on the local network.
 udisks
 ------
 
-Queries the udisks2 daemon via D-Bus and obtain a list of file systems (e.g. USB sticks or other removable media).
+Queries the udisks2 daemon via D-Bus and obtains a list of file systems (e.g. USB sticks or other removable media).
 
 upnp
 ----
@@ -131,15 +131,39 @@ Input plugins
 alsa
 ----
 
-Allows :program:`MPD` on Linux to play audio directly from a soundcard using the scheme alsa://. Audio is formatted as 44.1 kHz 16-bit stereo (CD format). Examples:
+Allows :program:`MPD` on Linux to play audio directly from a soundcard using the scheme alsa://. Audio is by default formatted as 48 kHz 16-bit stereo, but this default can be overidden by a config file setting or by the URI. Examples:
 
 .. code-block:: none
 
-    mpc add alsa:// plays audio from device hw:0,0
+    mpc add alsa:// plays audio from device default
 
 .. code-block:: none
 
-    mpc add alsa://hw:1,0 plays audio from device hw:1,0 cdio_paranoia
+    mpc add alsa://hw:1,0 plays audio from device hw:1,0
+
+.. code-block:: none
+
+    mpc add alsa://hw:1,0?format=44100:16:2 plays audio from device hw:1,0 sampling 16-bit stereo at 44.1kHz.
+
+.. list-table::
+   :widths: 20 80
+   :header-rows: 1
+
+   * - Setting
+     - Description
+   * - **default_device NAME**
+     - The alsa device id to use when none is specified in the URI.
+   * - **default_format F**
+     - The sampling rate, size and channels to use. Wildcards are not allowed.
+
+       Example - "44100:16:2"
+
+   * - **auto_resample yes|no**
+     - If set to no, then libasound will not attempt to resample. In this case, the user is responsible for ensuring that the requested sample rate can be produced natively by the device, otherwise an error will occur.
+   * - **auto_channels yes|no**
+     - If set to no, then libasound will not attempt to convert between different channel numbers. The user must ensure that the device supports the requested channels when sampling.
+   * - **auto_format yes|no**
+     - If set to no, then libasound will not attempt to convert between different sample formats (16 bit, 24 bit, floating point, ...). Again the user must ensure that the requested format is available natively from the device.
 
 cdio_paranoia
 -------------
@@ -326,6 +350,8 @@ faad
 
 Decodes AAC files using libfaad.
 
+.. _decoder_ffmpeg:
+
 ffmpeg
 ------
 
@@ -395,30 +421,22 @@ Video game music file emulator based on `game-music-emu <https://bitbucket.org/m
      - Description
    * - **accuracy yes|no**
      - Enable more accurate sound emulation.
+   * - **default_fade**
+     - The default fade-out time, in seconds. Used by songs that don't specify their own fade-out time.
 
 hybrid_dsd
 ----------
 
 `Hybrid-DSD
 <http://dsdmaster.blogspot.de/p/bitperfect-introduces-hybrid-dsd-file.html>`_
-is a MP4 container file (:file:`*.m4a`) which contains both ALAC and
+is an MP4 container file (:file:`*.m4a`) which contains both ALAC and
 DSD data. It is disabled by default, and works only if you explicitly
 enable it. Without this plugin, the ALAC parts gets handled by the
-`FFmpeg decoder plugin
-<https://www.musicpd.org/doc/user/decoder_plugins.html#ffmpeg_decoder>`_. This
+:ref:`FFmpeg decoder plugin <decoder_ffmpeg>`. This
 plugin should be enabled only if you have a bit-perfect playback path
 to a DSD-capable DAC; for everybody else, playing back the ALAC copy
 of the file is better.
 
-.. list-table::
-   :widths: 20 80
-   :header-rows: 1
-
-   * - Setting
-     - Description
-   * - **gapless yes|no**
-     - This specifies whether to support gapless playback of MP3s which have the necessary headers. Useful if your MP3s have headers with incorrect information. If you have such MP3s, it is highly recommended that you fix them using `vbrfix <http://www.willwap.co.uk/Programs/vbrfix.php>`_ instead of disabling gapless MP3 playback. The default is to support gapless MP3 playback.
-
 mad
 ---
 
@@ -462,7 +480,9 @@ Decodes Musepack files using `libmpcdec <http://www.musepack.net/>`_.
 mpg123
 ------
 
-Decodes MP3 files using `libmpg123 <http://www.mpg123.de/>`_.
+Decodes MP3 files using `libmpg123 <http://www.mpg123.de/>`_. Currently, this
+decoder does not support streams (e.g. archived files, remote files over HTTP,
+...), only regular local files.
 
 opus
 ----
@@ -472,7 +492,7 @@ Decodes Opus files using `libopus <http://www.opus-codec.org/>`_.
 pcm
 ---
 
-Read raw PCM samples. It understands the "audio/L16" MIME type with parameters "rate" and "channels" according to RFC 2586. It also understands the MPD-specific MIME type "audio/x-mpd-float".
+Reads raw PCM samples. It understands the "audio/L16" MIME type with parameters "rate" and "channels" according to RFC 2586. It also understands the MPD-specific MIME type "audio/x-mpd-float".
 
 sidplay
 -------
@@ -486,9 +506,11 @@ C64 SID decoder based on `libsidplayfp <https://sourceforge.net/projects/sidplay
    * - Setting
      - Description
    * - **songlength_database PATH**
-     - Location of your songlengths file, as distributed with the HVSC. The sidplay plugin checks this for matching MD5 fingerprints. See http://www.hvsc.c64.org/download/C64Music/DOCUMENTS/Songlengths.faq.
+     - Location of your songlengths file, as distributed with the HVSC. The sidplay plugin checks this for matching MD5 fingerprints. See http://www.hvsc.c64.org/download/C64Music/DOCUMENTS/Songlengths.faq. New songlength format support requires libsidplayfp 2.0 or later.
    * - **default_songlength SECONDS**
      - This is the default playing time in seconds for songs not in the songlength database, or in case you're not using a database. A value of 0 means play indefinitely.
+   * - **default_genre GENRE**
+     - Optional default genre for SID songs.
    * - **filter yes|no**
      - Turns the SID filter emulation on or off.
    * - **kernal**
@@ -724,6 +746,25 @@ Valid quality values for libsoxr:
 * "medium"
 * "low"
 * "quick"
+* "custom"
+
+If the quality is set to custom also the following settings are available:
+
+   * - Name
+     - Description
+   * - **precision**
+     - The precision in bits. Valid values 16,20,24,28 and 32  bits.
+   * - **phase_response**
+     - Between the 0-100, Where 0=MINIMUM_PHASE and 50=LINEAR_PHASE.
+   * - **passband_end**
+     - The % of source bandwidth where to start filtering. Typical between the 90-99.7.
+   * - **stopband_begin**
+     - The % of the source bandwidth Where the anti aliasing filter start. Value 100+.
+   * - **attenuation**
+     - Reduction in dB's to prevent clipping from the resampling process.
+   * - **flags**
+     - Bitmask with additional option see soxr documentation for specific flags.
+
 
 .. _output_plugins:
 
@@ -868,6 +909,10 @@ The jack plugin connects to a `JACK server <http://jackaudio.org/>`_.
      - The names of the JACK source ports to be created. By default, the ports "left" and "right" are created. To use more ports, you have to tweak this option.
    * - **destination_ports A,B**
      - The names of the JACK destination ports to connect to.
+   * - **auto_destination_ports yes|no**
+     - If set to *yes*, then MPD will automatically create connections between the send ports of
+       MPD and receive ports of the first sound card; if set to *no*, then MPD will only create
+       connections to the contents of *destination_ports* if it is set. Enabled by default.
    * - **ringbuffer_size NBYTES**
      - Sets the size of the ring buffer for each channel. Do not configure this value unless you know what you're doing.
 
@@ -1002,6 +1047,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.
+   * - **media_role ROLE**
+     - Specifies a custom media role that :program:`MPD` reports to PulseAudio. Default is "music". (optional).
    * - **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.
 
@@ -1072,7 +1119,8 @@ sles
 
 Plugin using the `OpenSL ES <https://www.khronos.org/opensles/>`__
 audio API.  Its primary use is local playback on Android, where
-:ref:`ALSA <alsa_plugin>` is not available.
+:ref:`ALSA <alsa_plugin>` is not available.  It supports 16 bit and
+floating point samples.
 
 
 solaris
@@ -1089,11 +1137,58 @@ The "Solaris" plugin runs only on SUN Solaris, and plays via /dev/audio.
      - Sets the path of the audio device, defaults to /dev/audio.
 
 
+wasapi
+------
+
+The `Windows Audio Session API <https://docs.microsoft.com/en-us/windows/win32/coreaudio/wasapi>`_ plugin uses WASAPI, which is supported started from Windows Vista. It is recommended if you are using Windows.
+
+.. list-table::
+   :widths: 20 80
+   :header-rows: 1
+
+   * - Setting
+     - Description
+   * - **device NAME**
+     - Sets the device which should be used. This can be any valid audio device name, or index number. The default value is "", which makes WASAPI choose the default output device.
+   * - **enumerate yes|no**
+     - Enumerate all devices in log while playing started. Useful for device configuration. The default value is "no".
+   * - **exclusive yes|no**
+     - Exclusive mode blocks all other audio source, and get best audio quality without resampling. Stopping playing release the exclusive control of the output device. The default value is "no".
+
+
 .. _filter_plugins:
 
 Filter plugins
 ==============
 
+ffmpeg
+------
+
+Configures a FFmpeg filter graph.
+
+This plugin requires building with ``libavfilter`` (FFmpeg).
+
+.. list-table::
+   :widths: 20 80
+   :header-rows: 1
+
+   * - Setting
+     - Description
+   * - **graph "..."**
+     - Specifies the ``libavfilter`` graph; read the `FFmpeg
+       documentation
+       <https://libav.org/documentation/libavfilter.html#Filtergraph-syntax-1>`_
+       for details
+
+
+hdcd
+----
+
+Decode `HDCD
+<https://en.wikipedia.org/wiki/High_Definition_Compatible_Digital>`_.
+
+This plugin requires building with ``libavfilter`` (FFmpeg).
+
 normalize
 ---------
 
@@ -1176,3 +1271,19 @@ Download playlist from SoundCloud. It accepts URIs starting with soundcloud://.
 xspf
 ----
 Reads XSPF playlist files. 
+
+
+Archive plugins
+===============
+
+bz2
+---
+Allows to load single bzip2 compressed files using `libbz2 <https://www.sourceware.org/bzip2/>`_. Does not support seeking.
+
+zzip
+----
+Allows to load music files from ZIP archives using `zziplib <http://zziplib.sourceforge.net/>`_.
+
+iso
+---
+Allows to load music files from ISO 9660 images using `libcdio <https://www.gnu.org/software/libcdio/>`_.

doc/protocol.rst

@@ -66,7 +66,16 @@ Binary Responses
 Some commands can return binary data.  This is initiated by a line
 containing ``binary: 1234`` (followed as usual by a newline).  After
 that, the specified number of bytes of binary data follows, then a
-newline, and finally the ``OK`` line.  Example::
+newline, and finally the ``OK`` line.
+
+If the object to be transmitted is large, the server may choose a
+reasonable chunk size and transmit only a portion.  Usually, the
+response also contains a ``size`` line which specifies the total
+(uncropped) size, and the command usually has a way to specify an
+offset into the object; this way, the client can copy the whole file
+without blocking the connection for too long.
+
+Example::
 
   foo: bar
   binary: 42
@@ -163,7 +172,7 @@ syntax::
 
  find EXPRESSION
 
-``EXPRESSION`` is a string enclosed in parantheses which can be one
+``EXPRESSION`` is a string enclosed in parentheses which can be one
 of:
 
 - ``(TAG == 'VALUE')``: match a tag value; if there are multiple
@@ -209,15 +218,15 @@ of:
   or more attributes may be ``*``).
 
 - ``(!EXPRESSION)``: negate an expression.  Note that each expression
-  must be enclosed in parantheses, e.g. :code:`(!(artist == 'VALUE'))`
+  must be enclosed in parentheses, e.g. :code:`(!(artist == 'VALUE'))`
   (which is equivalent to :code:`(artist != 'VALUE')`)
 
 - ``(EXPRESSION1 AND EXPRESSION2 ...)``: combine two or
   more expressions with logical "and".  Note that each expression must
-  be enclosed in parantheses, e.g. :code:`((artist == 'FOO') AND
+  be enclosed in parentheses, e.g. :code:`((artist == 'FOO') AND
   (album == 'BAR'))`
 
-The :command:`find` commands are case sensitive, which
+The :command:`find` commands are case sensitive, while
 :command:`search` and related commands ignore case.
 
 Prior to MPD 0.21, the syntax looked like this::
@@ -274,6 +283,12 @@ The following tags are supported by :program:`MPD`:
 * **date**: the song's release date. This is usually a 4-digit year.
 * **composer**: the artist who composed the song.
 * **performer**: the artist who performed the song.
+* **conductor**: the conductor who conducted the song.
+* **work**: `"a work is a distinct intellectual or artistic creation,
+  which can be expressed in the form of one or more audio recordings" <https://musicbrainz.org/doc/Work>`_
+* **grouping**: "used if the sound belongs to a larger category of
+  sounds/music" (`from the IDv2.4.0 TIT1 description
+  <http://id3.org/id3v2.4.0-frames>`_).
 * **comment**: a human-readable comment about this song. The exact meaning of this tag is not well-defined.
 * **disc**: the decimal disc number in a multi-disc album.
 * **label**: the name of the label or publisher.
@@ -374,7 +389,9 @@ Querying :program:`MPD`'s status
 
 :command:`currentsong`
     Displays the song info of the current song (same song that
-    is identified in status).
+    is identified in status). Information about the current song
+    is represented by key-value pairs, one on each line. The first
+    pair must be the `file` key-value pair.
 
 .. _command_idle:
 
@@ -398,9 +415,11 @@ Querying :program:`MPD`'s status
     - ``sticker``: the sticker database has been modified.
     - ``subscription``: a client has subscribed or unsubscribed to a channel
     - ``message``: a message was received on a channel this client is subscribed to; this event is only emitted when the queue is empty
+    - ``neighbor``: a neighbor was found or lost
+    - ``mount``: the mount list has changed
 
     Change events accumulate, even while the connection is not in
-    "idle" mode; no events gets lost while the client is doing
+    "idle" mode; no events get lost while the client is doing
     something else with the connection.  If an event had already
     occurred since the last call, the new :ref:`idle <command_idle>`
     command will return immediately.
@@ -424,6 +443,8 @@ Querying :program:`MPD`'s status
     Reports the current status of the player and the volume
     level.
 
+    - ``partition``: the name of the current partition (see
+      :ref:`partition_commands`)
     - ``volume``: ``0-100`` (deprecated: ``-1`` if the volume cannot
       be determined)
     - ``repeat``: ``0`` or ``1``
@@ -515,7 +536,7 @@ Playback options
     ``auto``
     .
     Changing the mode during playback may take several
-    seconds, because the new settings does not affect the
+    seconds, because the new settings do not affect the
     buffered data.
     This command triggers the
     ``options`` idle event.
@@ -535,10 +556,10 @@ Controlling playback
 :command:`next`
     Plays next song in the playlist.
 
-:command:`pause {PAUSE}`
-    Toggles pause/resumes playing, ``PAUSE`` is 0 or 1.
-
-    The use of pause command without the PAUSE argument is deprecated.
+:command:`pause {STATE}`
+    Pause or resume playback.  Pass :samp:`1` to pause playback or
+    :samp:`0` to resume playback.  Without the parameter, the pause
+    state is toggled.
 
 :command:`play [SONGPOS]`
     Begins playing the playlist at song number
@@ -809,11 +830,12 @@ The music database
 ==================
 
 :command:`albumart {URI} {OFFSET}`
-    Searches the directory the file ``URI``
-    resides in and attempts to return a chunk of an album
+    Locate album art for the given song and return a chunk of an album
     art image file at offset ``OFFSET``.
-    Uses the filename "cover" with any of ".png, .jpg,
-    .tiff, .bmp".
+
+    This is currently implemented by searching the directory the file
+    resides in for a file called :file:`cover.png`, :file:`cover.jpg`,
+    :file:`cover.tiff` or :file:`cover.bmp`.
 
     Returns the file size and actual number
     of bytes read at the requested offset, followed
@@ -822,7 +844,7 @@ The music database
 
     Example::
 
-     albumart
+     albumart foo/bar.ogg 0
      size: 1024768
      binary: 8192
      <8192 bytes>
@@ -846,10 +868,21 @@ The music database
      count group artist
      count title Echoes group artist
 
-    A group with an empty value contains counts of matching song which
-    don't this group tag.  It exists only if at least one such song is
+    A group with an empty value contains counts of matching songs which
+    don't have this group tag.  It exists only if at least one such song is
     found.
 
+:command:`getfingerprint {URI}`
+
+    Calculate the song's audio fingerprint.  Example (abbreviated fingerprint)::
+
+      getfingerprint "foo/bar.ogg"
+      chromaprint: AQACcEmSREmWJJmkIT_6CCf64...
+      OK
+
+    This command is only available if MPD was built with
+    :file:`libchromaprint` (``-Dchromaprint=enabled``).
+
 .. _command_find:
 
 :command:`find {FILTER} [sort {TYPE}] [window {START:END}]`
@@ -876,7 +909,7 @@ The music database
 
 .. _command_findadd:
 
-:command:`findadd {FILTER}`
+:command:`findadd {FILTER} [sort {TYPE}] [window {START:END}]`
     Search the database for songs matching
     ``FILTER`` (see :ref:`Filters <filter_syntax>`) and add them to
     the queue.  Parameters have the same meaning as for
@@ -981,6 +1014,30 @@ The music database
     decoder plugins support it.  For example, on Ogg files,
     this lists the Vorbis comments.
 
+:command:`readpicture {URI} {OFFSET}`
+    Locate a picture for the given song and return a chunk of the
+    image file at offset ``OFFSET``.  This is usually implemented by
+    reading embedded pictures from binary tags (e.g. ID3v2's ``APIC``
+    tag).
+
+    Returns the following values:
+
+    - ``size``: the total file size
+    - ``type``: the file's MIME type (optional)
+    - ``binary``: see :ref:`binary`
+
+    If the song file was recognized, but there is no picture, the
+    response is successful, but is otherwise empty.
+
+    Example::
+
+     readpicture foo/bar.ogg 0
+     size: 1024768
+     type: image/jpeg
+     binary: 8192
+     <8192 bytes>
+     OK
+
 .. _command_search:
 
 :command:`search {FILTER} [sort {TYPE}] [window {START:END}]`
@@ -991,14 +1048,14 @@ The music database
 
 .. _command_searchadd:
 
-:command:`searchadd {FILTER}`
+:command:`searchadd {FILTER} [sort {TYPE}] [window {START:END}]`
     Search the database for songs matching
     ``FILTER`` (see :ref:`Filters <filter_syntax>`) and add them to
     the queue.
 
     Parameters have the same meaning as for :ref:`search <command_search>`.
 
-:command:`searchaddpl {NAME} {FILTER}`
+:command:`searchaddpl {NAME} {FILTER} [sort {TYPE}] [window {START:END}]`
     Search the database for songs matching
     ``FILTER`` (see :ref:`Filters <filter_syntax>`) and add them to
     the playlist named ``NAME``.
@@ -1038,8 +1095,8 @@ access NFS and SMB servers.
 Multiple storages can be "mounted" together, similar to the
 `mount` command on many operating
 systems, but without cooperation from the kernel.  No
-superuser privileges are necessary, beause this mapping exists
-only inside the :program:`MPD` process
+superuser privileges are necessary, because this mapping exists
+only inside the :program:`MPD` process.
 
 .. _command_mount:
 
@@ -1188,6 +1245,8 @@ Connection settings
     Announce that this client is interested in all tag
     types.  This is the default setting for new clients.
 
+.. _partition_commands:
+
 Partition commands
 ==================
 
@@ -1208,6 +1267,13 @@ client is assigned to one partition at a time.
 :command:`newpartition {NAME}`
     Create a new partition.
 
+:command:`delpartition {NAME}`
+    Delete a partition.  The partition must be empty (no connected
+    clients and no outputs).
+
+:command:`moveoutput {OUTPUTNAME}`
+    Move an output to the current partition.
+
 Audio output devices
 ====================
 
@@ -1297,6 +1363,9 @@ additional services.
 New messages are indicated by the ``message``
 idle event.
 
+If your MPD instance has multiple partitions, note that
+client-to-client messages are local to the current partition.
+
 :command:`subscribe {NAME}`
     Subscribe to a channel.  The channel is created if it
     does not exist already.  The name may consist of

doc/user.rst

@@ -44,7 +44,9 @@ ALSA is not available on Android; only the :ref:`OpenSL ES
 Compiling from source
 ---------------------
 
-Download the source tarball from the `MPD home page <https://musicpd.org>`_ and unpack it:
+`Download the source tarball <https://www.musicpd.org/download.html>`_
+and unpack it (or `clone the git repository
+<https://github.com/MusicPlayerDaemon/MPD>`_):
 
 .. code-block:: none
 
@@ -53,7 +55,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)
+* a C++17 compiler (e.g. GCC 8 or clang 5)
 * `Meson 0.49.0 <http://mesonbuild.com/>`__ and `Ninja
   <https://ninja-build.org/>`__
 * Boost 1.58
@@ -185,47 +187,6 @@ ABI is the Android ABI to be built, e.g. ":code:`arm64-v8a`".
 
 This downloads various library sources, and then configures and builds :program:`MPD`. 
 
-systemd socket activation
--------------------------
-
-Using systemd, you can launch :program:`MPD` on demand when the first client attempts to connect.
-
-:program:`MPD` comes with two systemd unit files: a "service" unit and
-a "socket" unit.  These will be installed to the directory specified
-with :code:`-Dsystemd_system_unit_dir=...`,
-e.g. :file:`/lib/systemd/system`.
-
-To enable socket activation, type:
-
-.. code-block:: none
-
-    systemctl enable mpd.socket
-    systemctl start mpd.socket
-
-In this configuration, :program:`MPD` will ignore the :ref:`listener
-settings <listeners>` (``bind_to_address`` and ``port``).
-
-systemd user unit
------------------
-
-You can launch :program:`MPD` as a systemd user unit.  These will be
-installed to the directory specified with
-:code:`-Dsystemd_user_unit_dir=...`,
-e.g. :file:`/usr/lib/systemd/user` or
-:file:`$HOME/.local/share/systemd/user`.
-
-Once the user unit is installed, you can start and stop :program:`MPD` like any other service:
-
-.. code-block:: none
-
-    systemctl --user start mpd
-
-To auto-start :program:`MPD` upon login, type:
-
-.. code-block:: none
-
-    systemctl --user enable mpd
-
 Configuration
 *************
 
@@ -260,6 +221,13 @@ another file; the given file name is relative to the current file:
 
   include "other.conf"
 
+You can use :code:`include_optional` instead if you want the included file
+to be optional; the directive will be ignored if the file does not exist:
+
+.. code-block:: none
+
+  include_optional "may_not_exist.conf"
+
 Configuring the music directory
 -------------------------------
 
@@ -336,6 +304,44 @@ The following table lists the input options valid for all plugins:
 
 More information can be found in the :ref:`input_plugins` reference.
 
+.. _input_cache:
+
+Configuring the Input Cache
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The input cache prefetches queued song files before they are going to
+be played.  This has several advantages:
+
+- risk of buffer underruns during playback is reduced because this
+  decouples playback from disk (or network) I/O
+- bulk transfers may be faster and more energy efficient than loading
+  small chunks on-the-fly
+- by prefetching several songs at a time, the hard disk can spin down
+  for longer periods of time
+
+This comes at a cost:
+
+- memory usage
+- bulk transfers may reduce the performance of other applications
+  which also want to access the disk (if the kernel's I/O scheduler
+  isn't doing its job properly)
+
+To enable the input cache, add an ``input_cache`` block to the
+configuration file:
+
+.. code-block:: none
+
+    input_cache {
+        size "1 GB"
+    }
+
+This allocates a cache of 1 GB.  If the cache grows larger than that,
+older files will be evicted.
+
+You can flush the cache at any time by sending ``SIGHUP`` to the
+:program:`MPD` process, see :ref:`signals`.
+
+
 Configuring decoder plugins
 ---------------------------
 
@@ -419,7 +425,7 @@ The following table lists the audio_output options valid for all plugins:
        :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
+       implement an external mixer, see :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,...**"
@@ -714,8 +720,9 @@ Do not change these unless you know what you are doing.
 
    * - Setting
      - Description
-   * - **audio_buffer_size KBYTES**
-     - Adjust the size of the internal audio buffer. Default is 4096 (4 MiB).
+   * - **audio_buffer_size SIZE**
+     - Adjust the size of the internal audio buffer. Default is
+       :samp:`4 MB` (4 MiB).
 
 Zeroconf
 ^^^^^^^^
@@ -768,17 +775,17 @@ Real-Time Scheduling
 
 On Linux, :program:`MPD` attempts to configure real-time scheduling for some threads that benefit from it.
 
-This is only possible you allow :program:`MPD` to do it. This privilege is controlled by :envvar:`RLIMIT_RTPRIO` :envvar:`RLIMIT_RTTIME`. You can configure this privilege with :command:`ulimit` before launching :program:`MPD`:
+This is only possible if you allow :program:`MPD` to do it. This privilege is controlled by :envvar:`RLIMIT_RTPRIO` :envvar:`RLIMIT_RTTIME`. You can configure this privilege with :command:`ulimit` before launching :program:`MPD`:
 
 .. code-block:: none
 
-    ulimit -HS -r 50; mpd
+    ulimit -HS -r 40; mpd
 
 Or you can use the :command:`prlimit` program from the util-linux package:
 
 .. code-block:: none
 
-    prlimit --rtprio=50 --rttime=unlimited mpd
+    prlimit --rtprio=40 --rttime=unlimited mpd
 
 The systemd service file shipped with :program:`MPD` comes with this setting.
 
@@ -796,10 +803,10 @@ You can verify whether the real-time scheduler is active with the ps command:
       PID   TID CLS RTPRIO COMMAND
     16257 16257  TS      - mpd
     16257 16258  TS      - io
-    16257 16259  FF     50 rtio
+    16257 16259  FF     40 rtio
     16257 16260  TS      - player
     16257 16261  TS      - decoder
-    16257 16262  FF     50 output:ALSA
+    16257 16262  FF     40 output:ALSA
     16257 16263 IDL      0 update
 
 The CLS column shows the CPU scheduler; TS is the normal scheduler; FF and RR are real-time schedulers. In this example, two threads use the real-time scheduler: the output thread and the rtio (real-time I/O) thread; these two are the important ones. The database update thread uses the idle scheduler ("IDL in ps), which only gets CPU when no other process needs it.
@@ -814,6 +821,89 @@ The CLS column shows the CPU scheduler; TS is the normal scheduler; FF and RR ar
 Using MPD
 *********
 
+Starting and Stopping MPD
+-------------------------
+
+The simplest (but not the best) way to start :program:`MPD` is to
+simply type::
+
+ mpd
+
+This will start :program:`MPD` as a daemon process (which means it
+detaches from your terminal and continues to run in background).  To
+stop it, send ``SIGTERM`` to the process; if you have configured a
+``pid_file``, you can use the ``--kill`` option::
+
+ mpd --kill
+
+The best way to manage :program:`MPD` processes is to use a service
+manager such as :program:`systemd`.
+
+systemd
+^^^^^^^
+
+:program:`MPD` ships with :program:`systemd` service units.
+
+If you have installed :program:`MPD` with your operating system's
+package manager, these are probably preinstalled, so you can start and
+stop :program:`MPD` this way (like any other service)::
+
+ systemctl start mpd
+ systemctl stop mpd
+
+systemd socket activation
+^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Using systemd, you can launch :program:`MPD` on demand when the first client attempts to connect.
+
+:program:`MPD` comes with two systemd unit files: a "service" unit and
+a "socket" unit.  These will be installed to the directory specified
+with :code:`-Dsystemd_system_unit_dir=...`,
+e.g. :file:`/lib/systemd/system`.
+
+To enable socket activation, type:
+
+.. code-block:: none
+
+    systemctl enable mpd.socket
+    systemctl start mpd.socket
+
+In this configuration, :program:`MPD` will ignore the :ref:`listener
+settings <listeners>` (``bind_to_address`` and ``port``).
+
+systemd user unit
+^^^^^^^^^^^^^^^^^
+
+You can launch :program:`MPD` as a systemd user unit.  These will be
+installed to the directory specified with
+:code:`-Dsystemd_user_unit_dir=...`,
+e.g. :file:`/usr/lib/systemd/user` or
+:file:`$HOME/.local/share/systemd/user`.
+
+Once the user unit is installed, you can start and stop :program:`MPD` like any other service:
+
+.. code-block:: none
+
+    systemctl --user start mpd
+
+To auto-start :program:`MPD` upon login, type:
+
+.. code-block:: none
+
+    systemctl --user enable mpd
+
+.. _signals:
+
+Signals
+-------
+
+:program:`MPD` understands the following UNIX signals:
+
+- ``SIGTERM``, ``SIGINT``: shut down MPD
+- ``SIGHUP``: reopen log files (send this after log rotation) and
+  flush caches (see :ref:`input_cache`)
+
+
 The client
 ----------
 
@@ -953,6 +1043,22 @@ 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.
 
+ICY-MetaData
+------------
+
+Some MP3 streams send information about the current song with a
+protocol named `"ICY-MetaData"
+<http://www.smackfu.com/stuff/programming/shoutcast.html>`_.
+:program:`MPD` makes its ``StreamTitle`` value available as ``Title``
+tag.
+
+By default, :program:`MPD` assumes this tag is UTF-8-encoded.  To tell
+:program:`MPD` to assume a different character set, specify it in the
+``charset`` URL fragment parameter, e.g.::
+
+ mpc add 'http://radio.example.com/stream#charset=cp1251'
+
+
 Client Hacks
 ************
 
@@ -977,7 +1083,7 @@ Sometimes, it is helpful to run :program:`MPD` in a terminal and follow what hap
 
 .. code-block:: none
 
-    mpd --stdout --no-daemon --verbose
+    mpd --stderr --no-daemon --verbose
 
 Support
 -------
@@ -1057,7 +1163,7 @@ You can extract the backtrace from a core dump, or by running :program:`MPD` in
 
 .. code-block:: none
 
-    gdb --args mpd --stdout --no-daemon --verbose
+    gdb --args mpd --stderr --no-daemon --verbose
     run
 
 As soon as you have reproduced the crash, type ":command:`bt`" on the

meson.build

@@ -1,12 +1,18 @@
 project(
   'mpd',
   ['c', 'cpp'],
-  version: '0.21.25',
+  version: '0.22',
   meson_version: '>= 0.49.0',
   default_options: [
     'c_std=c99',
-    'cpp_std=c++14',
-    'warning_level=2',
+    'build.c_std=c99',
+    'cpp_std=c++17',
+    'build.cpp_std=c++17',
+    'warning_level=3',
+
+    # This is only here to build subprojects as static libraries; MPD
+    # itself doesn't ship any libraries.
+    'default_library=static',
   ],
   license: 'GPLv2+',
 )
@@ -16,18 +22,20 @@ version_cxx = vcs_tag(input: 'src/GitVersion.cxx', output: 'GitVersion.cxx')
 compiler = meson.get_compiler('cpp')
 c_compiler = meson.get_compiler('c')
 
-if compiler.get_id() == 'gcc' and compiler.version().version_compare('<6')
-  warning('Your GCC version is too old.  You need at least version 6.')
-elif compiler.get_id() == 'clang' and compiler.version().version_compare('<3')
-  warning('Your clang version is too old.  You need at least version 3.')
+if compiler.get_id() == 'gcc' and compiler.version().version_compare('<8')
+  warning('Your GCC version is too old.  You need at least version 8.')
+elif compiler.get_id() == 'clang' and compiler.version().version_compare('<5')
+  warning('Your clang version is too old.  You need at least version 5.')
 endif
 
+version_conf = configuration_data()
+version_conf.set_quoted('PACKAGE', meson.project_name())
+version_conf.set_quoted('PACKAGE_NAME', meson.project_name())
+version_conf.set_quoted('VERSION', meson.project_version())
+version_conf.set_quoted('PROTOCOL_VERSION', '0.22.0')
+configure_file(output: 'Version.h', configuration: version_conf)
+
 conf = configuration_data()
-conf.set_quoted('PACKAGE', meson.project_name())
-conf.set_quoted('PACKAGE_NAME', meson.project_name())
-conf.set_quoted('PACKAGE_VERSION', meson.project_version())
-conf.set_quoted('VERSION', meson.project_version())
-conf.set_quoted('PROTOCOL_VERSION', '0.21.11')
 conf.set_quoted('SYSTEM_CONFIG_FILE_LOCATION', join_paths(get_option('prefix'), get_option('sysconfdir'), 'mpd.conf'))
 
 common_cppflags = [
@@ -41,6 +49,9 @@ common_cxxflags = [
 ]
 
 test_common_flags = [
+  '-Wvla',
+  '-Wdouble-promotion',
+
   '-fvisibility=hidden',
 
   '-ffast-math',
@@ -57,13 +68,15 @@ test_cxxflags = test_common_flags + [
   '-Wcast-qual',
   '-Wwrite-strings',
   '-Wsign-compare',
+  '-Wcomma',
+  '-Wextra-semi',
+  '-Wheader-hygiene',
+  '-Winconsistent-missing-destructor-override',
+  '-Wunreachable-code-break',
+  '-Wunused',
+  '-Wused-but-marked-unused',
 
   '-Wno-non-virtual-dtor',
-
-  # work around bogus GCC7 warning "mangled name for ... will change
-  # in C++17 because the exception specification is part of a function
-  # type"
-  '-Wno-noexcept-type',
 ]
 
 if compiler.get_id() == 'clang'
@@ -134,7 +147,7 @@ add_global_arguments(common_cppflags, language: 'cpp')
 enable_daemon = not is_windows and not is_android and get_option('daemon')
 conf.set('ENABLE_DAEMON', enable_daemon)
 
-conf.set('HAVE_LOCALE_H', compiler.has_header('locale.h'))
+conf.set('HAVE_CLOCALE', compiler.has_header('clocale'))
 
 conf.set('HAVE_GETPWNAM_R', compiler.has_function('getpwnam_r'))
 conf.set('HAVE_GETPWUID_R', compiler.has_function('getpwuid_r'))
@@ -192,6 +205,17 @@ if boost_dep.version() == '1.67'
   warning('Your Boost version 1.67 is known to be buggy, and the MPD build will fail. Please upgrade to Boost 1.68 or later.')
 endif
 
+log = static_library(
+  'log',
+  'src/Log.cxx',
+  'src/LogBackend.cxx',
+  include_directories: inc,
+)
+
+log_dep = declare_dependency(
+  link_with: log,
+)
+
 sources = [
   version_cxx,
   'src/Main.cxx',
@@ -220,23 +244,23 @@ sources = [
   'src/decoder/DecoderPrint.cxx',
   'src/client/Listener.cxx',
   'src/client/Client.cxx',
-  'src/client/ClientEvent.cxx',
-  'src/client/ClientExpire.cxx',
-  'src/client/ClientGlobal.cxx',
-  'src/client/ClientIdle.cxx',
-  'src/client/ClientList.cxx',
-  'src/client/ClientNew.cxx',
-  'src/client/ClientProcess.cxx',
-  'src/client/ClientRead.cxx',
-  'src/client/ClientWrite.cxx',
-  'src/client/ClientMessage.cxx',
-  'src/client/ClientSubscribe.cxx',
-  'src/client/ClientFile.cxx',
+  'src/client/Config.cxx',
+  'src/client/Domain.cxx',
+  'src/client/Event.cxx',
+  'src/client/Expire.cxx',
+  'src/client/Idle.cxx',
+  'src/client/List.cxx',
+  'src/client/New.cxx',
+  'src/client/Process.cxx',
+  'src/client/Read.cxx',
+  'src/client/Write.cxx',
+  'src/client/Message.cxx',
+  'src/client/Subscribe.cxx',
+  'src/client/File.cxx',
   'src/client/Response.cxx',
+  'src/client/ThreadBackgroundCommand.cxx',
   'src/Listen.cxx',
   'src/LogInit.cxx',
-  'src/LogBackend.cxx',
-  'src/Log.cxx',
   'src/ls.cxx',
   'src/Instance.cxx',
   'src/win32/Win32Main.cxx',
@@ -281,6 +305,7 @@ sources = [
   'src/TagSave.cxx',
   'src/TagFile.cxx',
   'src/TagStream.cxx',
+  'src/TagAny.cxx',
   'src/TimePrint.cxx',
   'src/mixer/Volume.cxx',
   'src/PlaylistFile.cxx',
@@ -314,6 +339,8 @@ endif
 
 subdir('src/util')
 subdir('src/time')
+subdir('src/io')
+subdir('src/io/uring')
 subdir('src/system')
 subdir('src/thread')
 subdir('src/net')
@@ -327,6 +354,7 @@ subdir('src/lib/smbclient')
 subdir('src/lib/zlib')
 
 subdir('src/lib/alsa')
+subdir('src/lib/chromaprint')
 subdir('src/lib/curl')
 subdir('src/lib/expat')
 subdir('src/lib/ffmpeg')
@@ -341,6 +369,8 @@ subdir('src/lib/systemd')
 subdir('src/lib/upnp')
 subdir('src/lib/yajl')
 
+subdir('src/lib/crypto')
+
 subdir('src/fs')
 subdir('src/config')
 subdir('src/tag')
@@ -365,12 +395,19 @@ endif
 if sqlite_dep.found()
   sources += [
     'src/command/StickerCommands.cxx',
-    'src/sticker/StickerDatabase.cxx',
-    'src/sticker/StickerPrint.cxx',
+    'src/sticker/Database.cxx',
+    'src/sticker/Print.cxx',
     'src/sticker/SongSticker.cxx',
   ]
 endif
 
+if chromaprint_dep.found()
+  sources += [
+    'src/command/FingerprintCommands.cxx',
+    'src/lib/chromaprint/DecoderClient.cxx',
+  ]
+endif
+
 basic = static_library(
   'basic',
   'src/ReplayGainInfo.cxx',
@@ -464,6 +501,7 @@ mpd = build_target(
     sqlite_dep,
     zeroconf_dep,
     more_deps,
+    chromaprint_dep,
   ],
   link_args: link_args,
   install: not is_android and not is_haiku,
@@ -501,9 +539,7 @@ install_data(
   install_dir: join_paths(get_option('datadir'), 'doc', meson.project_name()),
 )
 
-if get_option('documentation')
-  subdir('doc')
-endif
+subdir('doc')
 
 if get_option('test')
   subdir('test')

meson_options.txt

@@ -1,9 +1,12 @@
-option('documentation', type: 'boolean', value: false, description: 'Build documentation')
+option('documentation', type: 'feature', description: 'Build documentation')
+option('html_manual', type: 'boolean', value: true, description: 'Build the HTML manual')
+option('manpages', type: 'boolean', value: true, description: 'Build manual pages')
 
 option('test', type: 'boolean', value: false, description: 'Build the unit tests and debug programs')
 
 option('syslog', type: 'feature', description: 'syslog support')
 option('inotify', type: 'boolean', value: true, description: 'inotify support (for automatic database update)')
+option('io_uring', type: 'feature', description: 'Linux io_uring support using liburing')
 
 option('daemon', type: 'boolean', value: true, description: 'enable daemonization')
 option('systemd', type: 'feature', description: 'systemd support')

python/build/libs.py

@@ -10,8 +10,8 @@ from build.ffmpeg import FfmpegProject
 from build.boost import BoostProject
 
 libmpdclient = MesonProject(
-    'https://www.musicpd.org/download/libmpdclient/2/libmpdclient-2.18.tar.xz',
-    '4cb01e1f567e0169aca94875fb6e1200e7f5ce35b63a4df768ec1591fb1081fa',
+    'https://www.musicpd.org/download/libmpdclient/2/libmpdclient-2.19.tar.xz',
+    '158aad4c2278ab08e76a3f2b0166c99b39fae00ee17231bd225c5a36e977a189',
     'lib/libmpdclient.a',
 )
 
@@ -25,8 +25,8 @@ libogg = AutotoolsProject(
 )
 
 libvorbis = AutotoolsProject(
-    'http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.6.tar.xz',
-    'af00bb5a784e7c9e69f56823de4637c350643deedaf333d0fa86ecdba6fcb415',
+    'http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.7.tar.xz',
+    'b33cc4934322bcbf6efcbacf49e3ca01aadbea4114ec9589d1b1e9d20f72954b',
     'lib/libvorbis.a',
     [
         '--disable-shared', '--enable-static',
@@ -148,8 +148,8 @@ gme = CmakeProject(
 )
 
 ffmpeg = FfmpegProject(
-    'http://ffmpeg.org/releases/ffmpeg-4.2.3.tar.xz',
-    '9df6c90aed1337634c1fb026fb01c154c29c82a64ea71291ff2da9aacb9aad31',
+    'http://ffmpeg.org/releases/ffmpeg-4.3.1.tar.xz',
+    'ad009240d46e307b4e03a213a0f49c11b650e445b1f8be0dda2a9212b34d2ffb',
     'lib/libavcodec.a',
     [
         '--disable-shared', '--enable-static',
@@ -377,8 +377,8 @@ ffmpeg = FfmpegProject(
 )
 
 curl = AutotoolsProject(
-    'http://curl.haxx.se/download/curl-7.70.0.tar.xz',
-    '032f43f2674008c761af19bf536374128c16241fb234699a55f9fb603fcfbae7',
+    'http://curl.haxx.se/download/curl-7.72.0.tar.xz',
+    '0ded0808c4d85f2ee0db86980ae610cc9d165e9ca9da466196cc73c346513713',
     'lib/libcurl.a',
     [
         '--disable-shared', '--enable-static',
@@ -433,7 +433,7 @@ libnfs = AutotoolsProject(
 )
 
 boost = BoostProject(
-    'https://dl.bintray.com/boostorg/release/1.73.0/source/boost_1_73_0.tar.bz2',
-    '4eb3b8d442b426dc35346235c8733b5ae35ba431690e38c6a8263dce9fcbb402',
+    'https://dl.bintray.com/boostorg/release/1.74.0/source/boost_1_74_0.tar.bz2',
+    '83bfc1507731a0906e387fc28b7ef5417d591429e51e788417fe9ff025e116b1',
     'include/boost/version.hpp',
 )

python/build/tar.py

@@ -7,5 +7,11 @@ def untar(tarball_path, parent_path, base):
     except FileNotFoundError:
         pass
     os.makedirs(parent_path, exist_ok=True)
-    subprocess.check_call(['/bin/tar', 'xfC', tarball_path, parent_path])
+    try:
+        subprocess.check_call(['/bin/tar', 'xfC', tarball_path, parent_path])
+    except FileNotFoundError:
+        import tarfile
+        tar = tarfile.open(tarball_path)
+        tar.extractall(path=parent_path)
+        tar.close()
     return path

src/BulkEdit.hxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify

src/Chrono.hxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -95,7 +95,7 @@ public:
 
 	constexpr double ToDoubleS() const {
 		return double(count()) / 1000.;
-	};
+	}
 
 	constexpr bool IsZero() const {
 		return count() == 0;
@@ -199,7 +199,7 @@ public:
 
 	constexpr double ToDoubleS() const {
 		return double(count()) / 1000.;
-	};
+	}
 
 	constexpr bool IsZero() const {
 		return count() == 0;

src/CommandLine.cxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -37,11 +37,15 @@
 #include "fs/Traits.hxx"
 #include "fs/FileSystem.hxx"
 #include "fs/StandardDirectory.hxx"
-#include "system/Error.hxx"
-#include "util/RuntimeError.hxx"
+#include "io/uring/Features.h"
 #include "util/Domain.hxx"
 #include "util/OptionDef.hxx"
 #include "util/OptionParser.hxx"
+#include "Version.h"
+
+#ifdef _WIN32
+#include "system/Error.hxx"
+#endif
 
 #ifdef ENABLE_DATABASE
 #include "db/Registry.hxx"
@@ -55,6 +59,7 @@
 #include "neighbor/NeighborPlugin.hxx"
 #endif
 
+#include "encoder/Features.h"
 #ifdef ENABLE_ENCODER
 #include "encoder/EncoderList.hxx"
 #include "encoder/EncoderPlugin.hxx"
@@ -65,9 +70,6 @@
 #include "archive/ArchivePlugin.hxx"
 #endif
 
-#include <stdio.h>
-#include <stdlib.h>
-
 namespace {
 #ifdef _WIN32
 constexpr auto CONFIG_FILE_LOCATION = Path::FromFS(PATH_LITERAL("mpd\\mpd.conf"));
@@ -77,7 +79,7 @@ constexpr auto USER_CONFIG_FILE_LOCATION1 = Path::FromFS(PATH_LITERAL(".mpdconf"
 constexpr auto USER_CONFIG_FILE_LOCATION2 = Path::FromFS(PATH_LITERAL(".mpd/mpd.conf"));
 constexpr auto USER_CONFIG_FILE_LOCATION_XDG = Path::FromFS(PATH_LITERAL("mpd/mpd.conf"));
 #endif
-}
+} // namespace
 
 enum Option {
 	OPTION_KILL,
@@ -105,8 +107,8 @@ static constexpr OptionDef option_defs[] = {
 
 static constexpr Domain cmdline_domain("cmdline");
 
-gcc_noreturn
-static void version(void)
+[[noreturn]]
+static void version()
 {
 	printf("Music Player Daemon " VERSION " (%s)"
 	       "\n"
@@ -145,15 +147,19 @@ static void version(void)
 	       "Decoders plugins:\n");
 
 	decoder_plugins_for_each([](const DecoderPlugin &plugin){
-			printf(" [%s]", plugin.name);
+		printf(" [%s]", plugin.name);
 
-			const char *const*suffixes = plugin.suffixes;
-			if (suffixes != nullptr)
-				for (; *suffixes != nullptr; ++suffixes)
-					printf(" %s", *suffixes);
+		const char *const*suffixes = plugin.suffixes;
+		if (suffixes != nullptr)
+			for (; *suffixes != nullptr; ++suffixes)
+				printf(" %s", *suffixes);
 
-			printf("\n");
-		});
+		if (plugin.protocols != nullptr)
+			for (const auto &i : plugin.protocols())
+				printf(" %s", i.c_str());
+
+		printf("\n");
+	});
 
 	printf("\n"
 	       "Filters:\n"
@@ -202,6 +208,9 @@ static void version(void)
 	       "\n"
 	       "Input plugins:\n"
 	       " file"
+#ifdef HAVE_URING
+	       " io_uring"
+#endif
 #ifdef ENABLE_ARCHIVE
 	       " archive"
 #endif
@@ -255,7 +264,7 @@ static void version(void)
 #endif
 	       "\n");
 
-	exit(EXIT_SUCCESS);
+	std::exit(EXIT_SUCCESS);
 }
 
 static void PrintOption(const OptionDef &opt)
@@ -271,8 +280,8 @@ static void PrintOption(const OptionDef &opt)
 		       opt.GetDescription());
 }
 
-gcc_noreturn
-static void help(void)
+[[noreturn]]
+static void help()
 {
 	printf("Usage:\n"
 	       "  mpd [OPTION...] [path/to/mpd.conf]\n"
@@ -282,10 +291,10 @@ static void help(void)
 	       "Options:\n");
 
 	for (const auto &i : option_defs)
-		if(i.HasDescription() == true) // hide hidden options from help print
+		if(i.HasDescription()) // hide hidden options from help print
 			PrintOption(i);
 
-	exit(EXIT_SUCCESS);
+	std::exit(EXIT_SUCCESS);
 }
 
 class ConfigLoader
@@ -296,7 +305,7 @@ public:
 	explicit ConfigLoader(ConfigData &_config) noexcept
 		:config(_config) {}
 
-	bool TryFile(const Path path);
+	bool TryFile(Path path);
 	bool TryFile(const AllocatedPath &base_path, Path path);
 };
 

src/CommandLine.hxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify

src/GitVersion.cxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -19,4 +19,4 @@
 
 #include "GitVersion.hxx"
 
-char GIT_VERSION[] = "@VCS_TAG@";
+const char GIT_VERSION[] = "@VCS_TAG@";

src/GitVersion.hxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -20,6 +20,6 @@
 #ifndef MPD_GIT_VERSION_HXX
 #define MPD_GIT_VERSION_HXX
 
-extern char GIT_VERSION[];
+extern const char GIT_VERSION[];
 
 #endif

src/IcyMetaDataParser.cxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -18,16 +18,24 @@
  */
 
 #include "IcyMetaDataParser.hxx"
-#include "tag/Tag.hxx"
 #include "tag/Builder.hxx"
-#include "util/Domain.hxx"
+#include "util/AllocatedString.hxx"
 #include "util/StringView.hxx"
-#include "Log.hxx"
 
-#include <assert.h>
+#include <algorithm>
+#include <cassert>
+
 #include <string.h>
 
-static constexpr Domain icy_metadata_domain("icy_metadata");
+#ifdef HAVE_ICU_CONVERTER
+
+void
+IcyMetaDataParser::SetCharset(const char *charset)
+{
+	icu_converter = IcuConverter::Create(charset);
+}
+
+#endif
 
 void
 IcyMetaDataParser::Reset() noexcept
@@ -65,29 +73,40 @@ IcyMetaDataParser::Data(size_t length) noexcept
 }
 
 static void
-icy_add_item(TagBuilder &tag, TagType type, const char *value) noexcept
+icy_add_item(TagBuilder &tag, TagType type, StringView value) noexcept
 {
-	size_t length = strlen(value);
-
-	if (length >= 2 && value[0] == '\'' && value[length - 1] == '\'') {
+	if (value.size >= 2 && value.front() == '\'' && value.back() == '\'') {
 		/* strip the single quotes */
-		++value;
-		length -= 2;
+		++value.data;
+		value.size -= 2;
 	}
 
-	if (length > 0)
-		tag.AddItem(type, {value, length});
+	if (value.size > 0)
+		tag.AddItem(type, value);
 }
 
 static void
 icy_parse_tag_item(TagBuilder &tag,
+#ifdef HAVE_ICU_CONVERTER
+		   const IcuConverter *icu_converter,
+#endif
 		   const char *name, const char *value) noexcept
 {
-	if (strcmp(name, "StreamTitle") == 0)
+	if (strcmp(name, "StreamTitle") == 0) {
+#ifdef HAVE_ICU_CONVERTER
+		if (icu_converter != nullptr) {
+			try {
+				icy_add_item(tag, TAG_TITLE,
+					     icu_converter->ToUTF8(value).c_str());
+			} catch (...) {
+			}
+
+			return;
+		}
+#endif
+
 		icy_add_item(tag, TAG_TITLE, value);
-	else
-		FormatDebug(icy_metadata_domain,
-			    "unknown icy-tag: '%s'", name);
+	}
 }
 
 /**
@@ -116,7 +135,11 @@ find_end_quote(char *p, char *const end) noexcept
 }
 
 static std::unique_ptr<Tag>
-icy_parse_tag(char *p, char *const end) noexcept
+icy_parse_tag(
+#ifdef HAVE_ICU_CONVERTER
+	      const IcuConverter *icu_converter,
+#endif
+	      char *p, char *const end) noexcept
 {
 	assert(p != nullptr);
 	assert(end != nullptr);
@@ -153,7 +176,11 @@ icy_parse_tag(char *p, char *const end) noexcept
 		*quote = 0;
 		p = quote + 1;
 
-		icy_parse_tag_item(tag, name, value);
+		icy_parse_tag_item(tag,
+#ifdef HAVE_ICU_CONVERTER
+				   icu_converter,
+#endif
+				   name, value);
 
 		char *semicolon = std::find(p, end, ';');
 		if (semicolon == end)
@@ -167,7 +194,7 @@ icy_parse_tag(char *p, char *const end) noexcept
 size_t
 IcyMetaDataParser::Meta(const void *data, size_t length) noexcept
 {
-	const unsigned char *p = (const unsigned char *)data;
+	const auto *p = (const unsigned char *)data;
 
 	assert(IsDefined());
 	assert(data_rest == 0);
@@ -208,7 +235,11 @@ IcyMetaDataParser::Meta(const void *data, size_t length) noexcept
 	if (meta_position == meta_size) {
 		/* parse */
 
-		tag = icy_parse_tag(meta_data, meta_data + meta_size);
+		tag = icy_parse_tag(
+#ifdef HAVE_ICU_CONVERTER
+				    icu_converter.get(),
+#endif
+				    meta_data, meta_data + meta_size);
 		delete[] meta_data;
 
 		/* change back to normal data mode */
@@ -223,7 +254,7 @@ IcyMetaDataParser::Meta(const void *data, size_t length) noexcept
 size_t
 IcyMetaDataParser::ParseInPlace(void *data, size_t length) noexcept
 {
-	uint8_t *const dest0 = (uint8_t *)data;
+	auto *const dest0 = (uint8_t *)data;
 	uint8_t *dest = dest0;
 	const uint8_t *src = dest0;
 

src/IcyMetaDataParser.hxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -20,18 +20,23 @@
 #ifndef MPD_ICY_META_DATA_PARSER_HXX
 #define MPD_ICY_META_DATA_PARSER_HXX
 
+#include "lib/icu/Converter.hxx"
 #include "tag/Tag.hxx"
+#include "config.h"
 
+#include <cstddef>
 #include <memory>
 
-#include <stddef.h>
-
 class IcyMetaDataParser {
 	size_t data_size = 0, data_rest;
 
 	size_t meta_size, meta_position;
 	char *meta_data;
 
+#ifdef HAVE_ICU_CONVERTER
+	std::unique_ptr<IcuConverter> icu_converter;
+#endif
+
 	std::unique_ptr<Tag> tag;
 
 public:
@@ -39,6 +44,13 @@ public:
 		Reset();
 	}
 
+#ifdef HAVE_ICU_CONVERTER
+	/**
+	 * Throws on error.
+	 */
+	void SetCharset(const char *charset);
+#endif
+
 	/**
 	 * Initialize an enabled icy_metadata object with the specified
 	 * data_size (from the icy-metaint HTTP response header).

src/Idle.cxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -26,12 +26,12 @@
 #include "Main.hxx"
 #include "Instance.hxx"
 
-#include <assert.h>
+#include <cassert>
 
 void
 idle_add(unsigned flags)
 {
 	assert(flags != 0);
 
-	instance->EmitIdle(flags);
+	global_instance->EmitIdle(flags);
 }

src/Idle.hxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify

src/IdleFlags.cxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -25,7 +25,7 @@
 #include "IdleFlags.hxx"
 #include "util/ASCII.hxx"
 
-#include <assert.h>
+#include <cassert>
 
 static const char *const idle_names[] = {
 	"database",

src/IdleFlags.hxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify

src/Instance.cxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -20,12 +20,15 @@
 #include "config.h"
 #include "Instance.hxx"
 #include "Partition.hxx"
-#include "Idle.hxx"
+#include "IdleFlags.hxx"
+#include "StateFile.hxx"
 #include "Stats.hxx"
+#include "client/List.hxx"
+#include "input/cache/Manager.hxx"
 
 #ifdef ENABLE_CURL
 #include "RemoteTagCache.hxx"
-#include "util/UriUtil.hxx"
+#include "util/UriExtract.hxx"
 #endif
 
 #ifdef ENABLE_DATABASE
@@ -34,14 +37,16 @@
 #include "db/update/Service.hxx"
 #include "storage/StorageInterface.hxx"
 
+#ifdef ENABLE_NEIGHBOR_PLUGINS
+#include "neighbor/Glue.hxx"
+#endif
+
 #ifdef ENABLE_SQLITE
-#include "sticker/StickerDatabase.hxx"
+#include "sticker/Database.hxx"
 #include "sticker/SongSticker.hxx"
 #endif
 #endif
 
-#include <exception>
-
 Instance::Instance()
 	:rtio_thread(true),
 #ifdef ENABLE_SYSTEMD_DAEMON
@@ -65,6 +70,13 @@ Instance::~Instance() noexcept
 #endif
 }
 
+void
+Instance::OnStateModified() noexcept
+{
+	if (state_file)
+		state_file->CheckModified();
+}
+
 Partition *
 Instance::FindPartition(const char *name) noexcept
 {
@@ -75,6 +87,20 @@ Instance::FindPartition(const char *name) noexcept
 	return nullptr;
 }
 
+void
+Instance::DeletePartition(Partition &partition) noexcept
+{
+	// TODO: use boost::intrusive::list to avoid this loop
+	for (auto i = partitions.begin();; ++i) {
+		assert(i != partitions.end());
+
+		if (&*i == &partition) {
+			partitions.erase(i);
+			break;
+		}
+	}
+}
+
 #ifdef ENABLE_DATABASE
 
 const Database &
@@ -88,7 +114,7 @@ Instance::GetDatabaseOrThrow() const
 }
 
 void
-Instance::OnDatabaseModified()
+Instance::OnDatabaseModified() noexcept
 {
 	assert(database != nullptr);
 
@@ -101,15 +127,15 @@ Instance::OnDatabaseModified()
 }
 
 void
-Instance::OnDatabaseSongRemoved(const char *uri)
+Instance::OnDatabaseSongRemoved(const char *uri) noexcept
 {
 	assert(database != nullptr);
 
 #ifdef ENABLE_SQLITE
 	/* if the song has a sticker, remove it */
-	if (sticker_enabled()) {
+	if (HasStickerDatabase()) {
 		try {
-			sticker_song_delete(uri);
+			sticker_song_delete(*sticker_database, uri);
 		} catch (...) {
 		}
 	}
@@ -124,17 +150,15 @@ Instance::OnDatabaseSongRemoved(const char *uri)
 #ifdef ENABLE_NEIGHBOR_PLUGINS
 
 void
-Instance::FoundNeighbor(gcc_unused const NeighborInfo &info) noexcept
+Instance::FoundNeighbor([[maybe_unused]] const NeighborInfo &info) noexcept
 {
-	for (auto &partition : partitions)
-		partition.EmitIdle(IDLE_NEIGHBOR);
+	EmitIdle(IDLE_NEIGHBOR);
 }
 
 void
-Instance::LostNeighbor(gcc_unused const NeighborInfo &info) noexcept
+Instance::LostNeighbor([[maybe_unused]] const NeighborInfo &info) noexcept
 {
-	for (auto &partition : partitions)
-		partition.EmitIdle(IDLE_NEIGHBOR);
+	EmitIdle(IDLE_NEIGHBOR);
 }
 
 #endif
@@ -166,3 +190,18 @@ Instance::OnRemoteTag(const char *uri, const Tag &tag) noexcept
 }
 
 #endif
+
+void
+Instance::OnIdle(unsigned flags) noexcept
+{
+	/* broadcast to all partitions */
+	for (auto &partition : partitions)
+		partition.EmitIdle(flags);
+}
+
+void
+Instance::FlushCaches() noexcept
+{
+	if (input_cache)
+		input_cache->Flush();
+}

src/Instance.hxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -53,6 +53,8 @@ class ClientList;
 struct Partition;
 class StateFile;
 class RemoteTagCache;
+class StickerDatabase;
+class InputCacheManager;
 
 /**
  * A utility class which, when used as the first base class, ensures
@@ -97,10 +99,16 @@ struct Instance final
 	Systemd::Watchdog systemd_watchdog;
 #endif
 
+	std::unique_ptr<InputCacheManager> input_cache;
+
+	/**
+	 * Monitor for global idle events to be broadcasted to all
+	 * partitions.
+	 */
 	MaskMonitor idle_monitor;
 
 #ifdef ENABLE_NEIGHBOR_PLUGINS
-	NeighborGlue *neighbors;
+	std::unique_ptr<NeighborGlue> neighbors;
 #endif
 
 #ifdef ENABLE_DATABASE
@@ -119,11 +127,15 @@ struct Instance final
 	std::unique_ptr<RemoteTagCache> remote_tag_cache;
 #endif
 
-	ClientList *client_list;
+	std::unique_ptr<ClientList> client_list;
 
 	std::list<Partition> partitions;
 
-	StateFile *state_file = nullptr;
+	std::unique_ptr<StateFile> state_file;
+
+#ifdef ENABLE_SQLITE
+	std::unique_ptr<StickerDatabase> sticker_database;
+#endif
 
 	Instance();
 	~Instance() noexcept;
@@ -131,14 +143,27 @@ struct Instance final
 	/**
 	 * Wrapper for EventLoop::Break().  Call to initiate shutdown.
 	 */
-	void Break() {
+	void Break() noexcept {
 		event_loop.Break();
 	}
 
-	void EmitIdle(unsigned mask) {
+	/**
+	 * Emit an "idle" event to all clients of all partitions.
+	 *
+	 * This method can be called from any thread.
+	 */
+	void EmitIdle(unsigned mask) noexcept {
 		idle_monitor.OrMask(mask);
 	}
 
+	/**
+	 * Notify the #Instance that the state has been modified, and
+	 * the #StateFile may need to be saved.
+	 *
+	 * This method must be called from the main thread.
+	 */
+	void OnStateModified() noexcept;
+
 	/**
 	 * Find a #Partition with the given name.  Returns nullptr if
 	 * no such partition was found.
@@ -146,6 +171,8 @@ struct Instance final
 	gcc_pure
 	Partition *FindPartition(const char *name) noexcept;
 
+	void DeletePartition(Partition &partition) noexcept;
+
 	void BeginShutdownPartitions() noexcept;
 
 #ifdef ENABLE_DATABASE
@@ -154,7 +181,7 @@ struct Instance final
 	 * if this MPD configuration has no database (no
 	 * music_directory was configured).
 	 */
-	Database *GetDatabase() {
+	Database *GetDatabase() noexcept {
 		return database.get();
 	}
 
@@ -166,6 +193,12 @@ struct Instance final
 	const Database &GetDatabaseOrThrow() const;
 #endif
 
+#ifdef ENABLE_SQLITE
+	bool HasStickerDatabase() noexcept {
+		return sticker_database != nullptr;
+	}
+#endif
+
 	void BeginShutdownUpdate() noexcept;
 
 #ifdef ENABLE_CURL
@@ -176,10 +209,13 @@ struct Instance final
 	}
 #endif
 
+	void FlushCaches() noexcept;
+
 private:
 #ifdef ENABLE_DATABASE
-	void OnDatabaseModified() override;
-	void OnDatabaseSongRemoved(const char *uri) override;
+	/* virtual methods from class DatabaseListener */
+	void OnDatabaseModified() noexcept override;
+	void OnDatabaseSongRemoved(const char *uri) noexcept override;
 #endif
 
 #ifdef ENABLE_NEIGHBOR_PLUGINS
@@ -194,7 +230,7 @@ private:
 #endif
 
 	/* callback for #idle_monitor */
-	void OnIdle(unsigned mask);
+	void OnIdle(unsigned mask) noexcept;
 };
 
 #endif

src/Listen.cxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -34,8 +34,6 @@
 #include "fs/XDG.hxx"
 
 #include <sys/stat.h>
-#include <string.h>
-#include <assert.h>
 
 #ifdef ENABLE_SYSTEMD_DAEMON
 #include <systemd/sd-daemon.h>

src/Listen.hxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify

src/LocateUri.cxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -22,8 +22,8 @@
 #include "client/Client.hxx"
 #include "fs/AllocatedPath.hxx"
 #include "ls.hxx"
-#include "util/UriUtil.hxx"
 #include "util/ASCII.hxx"
+#include "util/UriExtract.hxx"
 
 #ifdef ENABLE_DATABASE
 #include "storage/StorageInterface.hxx"
@@ -42,11 +42,13 @@ LocateFileUri(const char *uri, const Client *client
 
 #ifdef ENABLE_DATABASE
 	if (storage != nullptr) {
-		const char *suffix = storage->MapToRelativeUTF8(uri);
-		if (suffix != nullptr)
+		const auto suffix = storage->MapToRelativeUTF8(uri);
+		if (suffix.data() != nullptr)
 			/* this path was relative to the music
 			   directory */
-			return LocatedUri(LocatedUri::Type::RELATIVE, suffix);
+			// TODO: don't use suffix.data() (ok for now because we know it's null-terminated)
+			return LocatedUri(LocatedUri::Type::RELATIVE,
+					  suffix.data());
 	}
 #endif
 
@@ -80,9 +82,11 @@ LocateAbsoluteUri(UriPluginKind kind, const char *uri
 
 #ifdef ENABLE_DATABASE
 	if (storage != nullptr) {
-		const char *suffix = storage->MapToRelativeUTF8(uri);
-		if (suffix != nullptr)
-			return LocatedUri(LocatedUri::Type::RELATIVE, suffix);
+		const auto suffix = storage->MapToRelativeUTF8(uri);
+		if (suffix.data() != nullptr)
+			// TODO: don't use suffix.data() (ok for now because we know it's null-terminated)
+			return LocatedUri(LocatedUri::Type::RELATIVE,
+					  suffix.data());
 	}
 #endif
 

src/LocateUri.hxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -21,7 +21,6 @@
 #define MPD_LOCATE_URI_HXX
 
 #include "config.h"
-#include "util/Compiler.h"
 #include "fs/AllocatedPath.hxx"
 
 #ifdef _WIN32

src/Log.cxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2019 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -21,15 +21,16 @@
 #include "util/Domain.hxx"
 #include "util/Exception.hxx"
 
+#include <cerrno>
+
 #include <stdio.h>
 #include <string.h>
-#include <errno.h>
 
 static constexpr Domain exception_domain("exception");
 
 void
 LogFormatV(LogLevel level, const Domain &domain,
-	   const char *fmt, va_list ap) noexcept
+	   const char *fmt, std::va_list ap) noexcept
 {
 	char msg[1024];
 	vsnprintf(msg, sizeof(msg), fmt, ap);
@@ -39,7 +40,7 @@ LogFormatV(LogLevel level, const Domain &domain,
 void
 LogFormat(LogLevel level, const Domain &domain, const char *fmt, ...) noexcept
 {
-	va_list ap;
+	std::va_list ap;
 	va_start(ap, fmt);
 	LogFormatV(level, domain, fmt, ap);
 	va_end(ap);
@@ -48,7 +49,7 @@ LogFormat(LogLevel level, const Domain &domain, const char *fmt, ...) noexcept
 void
 FormatDebug(const Domain &domain, const char *fmt, ...) noexcept
 {
-	va_list ap;
+	std::va_list ap;
 	va_start(ap, fmt);
 	LogFormatV(LogLevel::DEBUG, domain, fmt, ap);
 	va_end(ap);
@@ -57,25 +58,25 @@ FormatDebug(const Domain &domain, const char *fmt, ...) noexcept
 void
 FormatInfo(const Domain &domain, const char *fmt, ...) noexcept
 {
-	va_list ap;
+	std::va_list ap;
 	va_start(ap, fmt);
 	LogFormatV(LogLevel::INFO, domain, fmt, ap);
 	va_end(ap);
 }
 
 void
-FormatDefault(const Domain &domain, const char *fmt, ...) noexcept
+FormatNotice(const Domain &domain, const char *fmt, ...) noexcept
 {
-	va_list ap;
+	std::va_list ap;
 	va_start(ap, fmt);
-	LogFormatV(LogLevel::DEFAULT, domain, fmt, ap);
+	LogFormatV(LogLevel::NOTICE, domain, fmt, ap);
 	va_end(ap);
 }
 
 void
 FormatWarning(const Domain &domain, const char *fmt, ...) noexcept
 {
-	va_list ap;
+	std::va_list ap;
 	va_start(ap, fmt);
 	LogFormatV(LogLevel::WARNING, domain, fmt, ap);
 	va_end(ap);
@@ -84,7 +85,7 @@ FormatWarning(const Domain &domain, const char *fmt, ...) noexcept
 void
 FormatError(const Domain &domain, const char *fmt, ...) noexcept
 {
-	va_list ap;
+	std::va_list ap;
 	va_start(ap, fmt);
 	LogFormatV(LogLevel::ERROR, domain, fmt, ap);
 	va_end(ap);
@@ -106,7 +107,7 @@ void
 LogFormat(LogLevel level, const std::exception &e, const char *fmt, ...) noexcept
 {
 	char msg[1024];
-	va_list ap;
+	std::va_list ap;
 	va_start(ap, fmt);
 	vsnprintf(msg, sizeof(msg), fmt, ap);
 	va_end(ap);
@@ -131,7 +132,7 @@ void
 LogFormat(LogLevel level, const std::exception_ptr &ep, const char *fmt, ...) noexcept
 {
 	char msg[1024];
-	va_list ap;
+	std::va_list ap;
 	va_start(ap, fmt);
 	vsnprintf(msg, sizeof(msg), fmt, ap);
 	va_end(ap);
@@ -152,7 +153,7 @@ LogErrno(const Domain &domain, const char *msg) noexcept
 }
 
 static void
-FormatErrnoV(const Domain &domain, int e, const char *fmt, va_list ap) noexcept
+FormatErrnoV(const Domain &domain, int e, const char *fmt, std::va_list ap) noexcept
 {
 	char msg[1024];
 	vsnprintf(msg, sizeof(msg), fmt, ap);
@@ -163,7 +164,7 @@ FormatErrnoV(const Domain &domain, int e, const char *fmt, va_list ap) noexcept
 void
 FormatErrno(const Domain &domain, int e, const char *fmt, ...) noexcept
 {
-	va_list ap;
+	std::va_list ap;
 	va_start(ap, fmt);
 	FormatErrnoV(domain, e, fmt, ap);
 	va_end(ap);
@@ -174,7 +175,7 @@ FormatErrno(const Domain &domain, const char *fmt, ...) noexcept
 {
 	const int e = errno;
 
-	va_list ap;
+	std::va_list ap;
 	va_start(ap, fmt);
 	FormatErrnoV(domain, e, fmt, ap);
 	va_end(ap);

src/Log.hxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2019 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -77,14 +77,14 @@ void
 FormatInfo(const Domain &domain, const char *fmt, ...) noexcept;
 
 static inline void
-LogDefault(const Domain &domain, const char *msg) noexcept
+LogNotice(const Domain &domain, const char *msg) noexcept
 {
-	Log(LogLevel::DEFAULT, domain, msg);
+	Log(LogLevel::NOTICE, domain, msg);
 }
 
 gcc_printf(2,3)
 void
-FormatDefault(const Domain &domain, const char *fmt, ...) noexcept;
+FormatNotice(const Domain &domain, const char *fmt, ...) noexcept;
 
 static inline void
 LogWarning(const Domain &domain, const char *msg) noexcept

src/LogBackend.cxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2019 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -21,9 +21,11 @@
 #include "Log.hxx"
 #include "util/Domain.hxx"
 #include "util/StringStrip.hxx"
+#include "Version.h"
 #include "config.h"
 
-#include <assert.h>
+#include <cassert>
+
 #include <stdio.h>
 #include <string.h>
 #include <time.h>
@@ -45,7 +47,7 @@ ToAndroidLogLevel(LogLevel log_level) noexcept
 		return ANDROID_LOG_DEBUG;
 
 	case LogLevel::INFO:
-	case LogLevel::DEFAULT:
+	case LogLevel::NOTICE:
 		return ANDROID_LOG_INFO;
 
 	case LogLevel::WARNING:
@@ -61,7 +63,7 @@ ToAndroidLogLevel(LogLevel log_level) noexcept
 
 #else
 
-static LogLevel log_threshold = LogLevel::INFO;
+static LogLevel log_threshold = LogLevel::NOTICE;
 
 static bool enable_timestamp;
 
@@ -120,7 +122,7 @@ ToSysLogLevel(LogLevel log_level) noexcept
 	case LogLevel::INFO:
 		return LOG_INFO;
 
-	case LogLevel::DEFAULT:
+	case LogLevel::NOTICE:
 		return LOG_NOTICE;
 
 	case LogLevel::WARNING:

src/LogBackend.hxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2019 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify

src/LogInit.cxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -28,24 +28,24 @@
 #include "fs/FileSystem.hxx"
 #include "util/Domain.hxx"
 #include "util/RuntimeError.hxx"
+#include "util/StringAPI.hxx"
 #include "system/Error.hxx"
 
+#include <cassert>
+
 #ifdef ENABLE_SYSTEMD_DAEMON
 #include <systemd/sd-daemon.h>
 #endif
 
-#include <assert.h>
 #include <string.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <unistd.h>
 
-#define LOG_LEVEL_SECURE LogLevel::INFO
-
 #define LOG_DATE_BUF_SIZE 16
 #define LOG_DATE_LEN (LOG_DATE_BUF_SIZE - 1)
 
-gcc_unused
+[[maybe_unused]]
 static constexpr Domain log_domain("log");
 
 #ifndef ANDROID
@@ -63,7 +63,7 @@ static void redirect_logs(int fd)
 }
 
 static int
-open_log_file(void)
+open_log_file()
 {
 	assert(!out_path.IsNull());
 
@@ -93,17 +93,24 @@ log_init_file(int line)
 }
 
 static inline LogLevel
-parse_log_level(const char *value, int line)
+parse_log_level(const char *value)
 {
-	if (0 == strcmp(value, "default"))
-		return LogLevel::DEFAULT;
-	if (0 == strcmp(value, "secure"))
-		return LOG_LEVEL_SECURE;
-	else if (0 == strcmp(value, "verbose"))
+	if (StringIsEqual(value, "notice") ||
+	    /* deprecated name: */
+	    StringIsEqual(value, "default"))
+		return LogLevel::NOTICE;
+	else if (StringIsEqual(value, "info") ||
+		 /* deprecated since MPD 0.22: */
+		 StringIsEqual(value, "secure"))
+		return LogLevel::INFO;
+	else if (StringIsEqual(value, "verbose"))
 		return LogLevel::DEBUG;
+	else if (StringIsEqual(value, "warning"))
+		return LogLevel::WARNING;
+	else if (StringIsEqual(value, "error"))
+		return LogLevel::ERROR;
 	else
-		throw FormatRuntimeError("unknown log level \"%s\" at line %d",
-					 value, line);
+		throw FormatRuntimeError("unknown log level \"%s\"", value);
 }
 
 #endif
@@ -132,9 +139,12 @@ log_init(const ConfigData &config, bool verbose, bool use_stdout)
 #else
 	if (verbose)
 		SetLogThreshold(LogLevel::DEBUG);
-	else if (const auto &param = config.GetParam(ConfigOption::LOG_LEVEL))
-		SetLogThreshold(parse_log_level(param->value.c_str(),
-						param->line));
+	else
+		SetLogThreshold(config.With(ConfigOption::LOG_LEVEL, [](const char *s){
+			return s != nullptr
+				? parse_log_level(s)
+				: LogLevel::NOTICE;
+		}));
 
 	if (use_stdout) {
 		out_fd = STDOUT_FILENO;
@@ -157,7 +167,7 @@ log_init(const ConfigData &config, bool verbose, bool use_stdout)
 			throw std::runtime_error("config parameter 'log_file' not found");
 #endif
 #ifdef HAVE_SYSLOG
-		} else if (strcmp(param->value.c_str(), "syslog") == 0) {
+		} else if (StringIsEqual(param->value.c_str(), "syslog")) {
 			LogInitSysLog();
 #endif
 		} else {

src/LogInit.hxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify

src/LogLevel.hxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -42,7 +42,7 @@ enum class LogLevel {
 	/**
 	 * Interesting informational message.
 	 */
-	DEFAULT,
+	NOTICE,
 
 	/**
 	 * Warning: something may be wrong.

src/LogV.hxx

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

src/Main.cxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -27,30 +27,30 @@
 #include "Mapper.hxx"
 #include "Permission.hxx"
 #include "Listen.hxx"
-#include "client/Listener.hxx"
-#include "client/Client.hxx"
-#include "client/ClientList.hxx"
+#include "client/Config.hxx"
+#include "client/List.hxx"
 #include "command/AllCommands.hxx"
 #include "Partition.hxx"
 #include "tag/Config.hxx"
 #include "ReplayGainGlobal.hxx"
-#include "Idle.hxx"
+#include "IdleFlags.hxx"
 #include "Log.hxx"
 #include "LogInit.hxx"
 #include "input/Init.hxx"
+#include "input/cache/Config.hxx"
+#include "input/cache/Manager.hxx"
 #include "event/Loop.hxx"
 #include "fs/AllocatedPath.hxx"
 #include "fs/Config.hxx"
 #include "playlist/PlaylistRegistry.hxx"
 #include "zeroconf/ZeroconfGlue.hxx"
 #include "decoder/DecoderList.hxx"
-#include "AudioParser.hxx"
-#include "pcm/PcmConvert.hxx"
+#include "pcm/AudioParser.hxx"
+#include "pcm/Convert.hxx"
 #include "unix/SignalHandlers.hxx"
 #include "thread/Slack.hxx"
 #include "net/Init.hxx"
 #include "lib/icu/Init.hxx"
-#include "config/File.hxx"
 #include "config/Check.hxx"
 #include "config/Data.hxx"
 #include "config/Param.hxx"
@@ -58,6 +58,7 @@
 #include "config/Defaults.hxx"
 #include "config/Option.hxx"
 #include "config/Domain.hxx"
+#include "config/Parser.hxx"
 #include "util/RuntimeError.hxx"
 #include "util/ScopeExit.hxx"
 
@@ -82,7 +83,7 @@
 #endif
 
 #ifdef ENABLE_SQLITE
-#include "sticker/StickerDatabase.hxx"
+#include "sticker/Database.hxx"
 #endif
 
 #ifdef ENABLE_ARCHIVE
@@ -95,6 +96,7 @@
 #include "android/Environment.hxx"
 #include "android/Context.hxx"
 #include "android/LogListener.hxx"
+#include "config/File.hxx"
 #include "fs/FileSystem.hxx"
 #include "org_musicpd_Bridge.h"
 #endif
@@ -107,14 +109,12 @@
 #include <systemd/sd-daemon.h>
 #endif
 
-#include <stdlib.h>
+#include <climits>
 
-#ifdef HAVE_LOCALE_H
-#include <locale.h>
+#ifdef HAVE_CLOCALE
+#include <clocale>
 #endif
 
-#include <limits.h>
-
 static constexpr size_t KILOBYTE = 1024;
 static constexpr size_t MEGABYTE = 1024 * KILOBYTE;
 
@@ -129,17 +129,14 @@ Context *context;
 LogListener *logListener;
 #endif
 
-Instance *instance;
+Instance *global_instance;
 
 struct Config {
 	ReplayGainConfig replay_gain;
-};
 
-static Config
-LoadConfig(const ConfigData &config)
-{
-	return {LoadReplayGainConfig(config)};
-}
+	explicit Config(const ConfigData &raw)
+		:replay_gain(LoadReplayGainConfig(raw)) {}
+};
 
 #ifdef ENABLE_DAEMON
 
@@ -166,14 +163,15 @@ glue_mapper_init(const ConfigData &config)
 #ifdef ENABLE_DATABASE
 
 static void
-InitStorage(const ConfigData &config, EventLoop &event_loop)
+InitStorage(Instance &instance, EventLoop &event_loop,
+	    const ConfigData &config)
 {
 	auto storage = CreateConfiguredStorage(config, event_loop);
 	if (storage == nullptr)
 		return;
 
-	CompositeStorage *composite = new CompositeStorage();
-	instance->storage = composite;
+	auto *composite = new CompositeStorage();
+	instance.storage = composite;
 	composite->Mount("", std::move(storage));
 }
 
@@ -183,28 +181,29 @@ InitStorage(const ConfigData &config, EventLoop &event_loop)
  * process has been daemonized.
  */
 static bool
-glue_db_init_and_load(const ConfigData &config)
+glue_db_init_and_load(Instance &instance, const ConfigData &config)
 {
-	auto db = CreateConfiguredDatabase(config, instance->event_loop,
-					   instance->io_thread.GetEventLoop(),
-					   *instance);
+	auto db = CreateConfiguredDatabase(config, instance.event_loop,
+					   instance.io_thread.GetEventLoop(),
+					   instance);
 	if (!db)
 		return true;
 
 	if (db->GetPlugin().RequireStorage()) {
-		InitStorage(config, instance->io_thread.GetEventLoop());
+		InitStorage(instance, instance.io_thread.GetEventLoop(),
+			    config);
 
-		if (instance->storage == nullptr) {
-			LogDefault(config_domain,
-				   "Found database setting without "
-				   "music_directory - disabling database");
+		if (instance.storage == nullptr) {
+			LogNotice(config_domain,
+				  "Found database setting without "
+				  "music_directory - disabling database");
 			return true;
 		}
 	} else {
 		if (IsStorageConfigured(config))
-			LogDefault(config_domain,
-				   "Ignoring the storage configuration "
-				   "because the database does not need it");
+			LogNotice(config_domain,
+				  "Ignoring the storage configuration "
+				  "because the database does not need it");
 	}
 
 	try {
@@ -213,65 +212,66 @@ glue_db_init_and_load(const ConfigData &config)
 		std::throw_with_nested(std::runtime_error("Failed to open database plugin"));
 	}
 
-	instance->database = std::move(db);
+	instance.database = std::move(db);
 
-	auto *sdb = dynamic_cast<SimpleDatabase *>(instance->database.get());
+	auto *sdb = dynamic_cast<SimpleDatabase *>(instance.database.get());
 	if (sdb == nullptr)
 		return true;
 
-	instance->update = new UpdateService(config,
-					     instance->event_loop, *sdb,
-					     static_cast<CompositeStorage &>(*instance->storage),
-					     *instance);
+	instance.update = new UpdateService(config,
+					    instance.event_loop, *sdb,
+					    static_cast<CompositeStorage &>(*instance.storage),
+					    instance);
 
 	/* run database update after daemonization? */
 	return sdb->FileExists();
 }
 
 static bool
-InitDatabaseAndStorage(const ConfigData &config)
+InitDatabaseAndStorage(Instance &instance, const ConfigData &config)
 {
-	const bool create_db = !glue_db_init_and_load(config);
+	const bool create_db = !glue_db_init_and_load(instance, config);
 	return create_db;
 }
 
 #endif
 
+#ifdef ENABLE_SQLITE
+
 /**
  * Configure and initialize the sticker subsystem.
  */
-static void
-glue_sticker_init(const ConfigData &config)
+static std::unique_ptr<StickerDatabase>
+LoadStickerDatabase(const ConfigData &config)
 {
-#ifdef ENABLE_SQLITE
 	auto sticker_file = config.GetPath(ConfigOption::STICKER_FILE);
 	if (sticker_file.IsNull())
-		return;
+		return nullptr;
 
-	sticker_global_init(std::move(sticker_file));
-#else
-	(void)config;
-#endif
+	return std::make_unique<StickerDatabase>(std::move(sticker_file));
 }
 
+#endif
+
 static void
-glue_state_file_init(const ConfigData &raw_config)
+glue_state_file_init(Instance &instance, const ConfigData &raw_config)
 {
 	StateFileConfig config(raw_config);
 	if (!config.IsEnabled())
 		return;
 
-	instance->state_file = new StateFile(std::move(config),
-					     instance->partitions.front(),
-					     instance->event_loop);
-	instance->state_file->Read();
+	instance.state_file = std::make_unique< StateFile>(std::move(config),
+							   instance.partitions.front(),
+							   instance.event_loop);
+	instance.state_file->Read();
 }
 
 /**
  * Initialize the decoder and player core, including the music pipe.
  */
 static void
-initialize_decoder_and_player(const ConfigData &config,
+initialize_decoder_and_player(Instance &instance,
+			      const ConfigData &config,
 			      const ReplayGainConfig &replay_gain_config)
 {
 	const ConfigParam *param;
@@ -279,20 +279,21 @@ initialize_decoder_and_player(const ConfigData &config,
 	size_t buffer_size;
 	param = config.GetParam(ConfigOption::AUDIO_BUFFER_SIZE);
 	if (param != nullptr) {
-		char *test;
-		long tmp = strtol(param->value.c_str(), &test, 10);
-		if (*test != '\0' || tmp <= 0 || tmp == LONG_MAX)
-			throw FormatRuntimeError("buffer size \"%s\" is not a "
-						 "positive integer, line %i",
-						 param->value.c_str(), param->line);
-		buffer_size = tmp * KILOBYTE;
+		buffer_size = param->With([](const char *s){
+			size_t result = ParseSize(s, KILOBYTE);
+			if (result <= 0)
+				throw FormatRuntimeError("buffer size \"%s\" is not a "
+							 "positive integer", s);
 
-		if (buffer_size < MIN_BUFFER_SIZE) {
-			FormatWarning(config_domain, "buffer size %lu is too small, using %lu bytes instead",
-				      (unsigned long)buffer_size,
-				      (unsigned long)MIN_BUFFER_SIZE);
-			buffer_size = MIN_BUFFER_SIZE;
-		}
+			if (result < MIN_BUFFER_SIZE) {
+				FormatWarning(config_domain, "buffer size %lu is too small, using %lu bytes instead",
+					      (unsigned long)result,
+					      (unsigned long)MIN_BUFFER_SIZE);
+				result = MIN_BUFFER_SIZE;
+			}
+
+			return result;
+		});
 	} else
 		buffer_size = DEFAULT_BUFFER_SIZE;
 
@@ -306,35 +307,26 @@ initialize_decoder_and_player(const ConfigData &config,
 		config.GetPositive(ConfigOption::MAX_PLAYLIST_LENGTH,
 				   DEFAULT_PLAYLIST_MAX_LENGTH);
 
-	AudioFormat configured_audio_format = AudioFormat::Undefined();
-	param = config.GetParam(ConfigOption::AUDIO_OUTPUT_FORMAT);
-	if (param != nullptr) {
-		try {
-			configured_audio_format = ParseAudioFormat(param->value.c_str(),
-								   true);
-		} catch (...) {
-			std::throw_with_nested(FormatRuntimeError("error parsing line %i",
-								  param->line));
-		}
-	}
+	AudioFormat configured_audio_format = config.With(ConfigOption::AUDIO_OUTPUT_FORMAT, [](const char *s){
+		if (s == nullptr)
+			return AudioFormat::Undefined();
 
-	instance->partitions.emplace_back(*instance,
-					  "default",
-					  max_length,
-					  buffered_chunks,
-					  configured_audio_format,
-					  replay_gain_config);
-	auto &partition = instance->partitions.back();
+		return ParseAudioFormat(s, true);
+	});
 
-	try {
-		param = config.GetParam(ConfigOption::REPLAYGAIN);
-		if (param != nullptr)
-			partition.replay_gain_mode =
-				FromString(param->value.c_str());
-	} catch (...) {
-		std::throw_with_nested(FormatRuntimeError("Failed to parse line %i",
-							  param->line));
-	}
+	instance.partitions.emplace_back(instance,
+					 "default",
+					 max_length,
+					 buffered_chunks,
+					 configured_audio_format,
+					 replay_gain_config);
+	auto &partition = instance.partitions.back();
+
+	partition.replay_gain_mode = config.With(ConfigOption::REPLAYGAIN, [](const char *s){
+		return s != nullptr
+			? FromString(s)
+			: ReplayGainMode::OFF;
+	});
 }
 
 inline void
@@ -354,55 +346,22 @@ inline void
 Instance::BeginShutdownPartitions() noexcept
 {
 	for (auto &partition : partitions) {
-		partition.pc.Kill();
-		partition.listener.reset();
+		partition.BeginShutdown();
 	}
 }
 
-void
-Instance::OnIdle(unsigned flags)
+static inline void
+MainConfigured(const struct options &options, const ConfigData &raw_config)
 {
-	/* send "idle" notifications to all subscribed
-	   clients */
-	client_list->IdleAdd(flags);
-
-	if (flags & (IDLE_PLAYLIST|IDLE_PLAYER|IDLE_MIXER|IDLE_OUTPUT) &&
-	    state_file != nullptr)
-		state_file->CheckModified();
-}
-
-#ifndef ANDROID
-
-int
-main(int argc, char *argv[]) noexcept
-{
-#ifdef _WIN32
-	return win32_main(argc, argv);
-#else
-	return mpd_main(argc, argv);
-#endif
-}
-
-#endif
-
-static int
-mpd_main_after_fork(const ConfigData &raw_config,
-		    const Config &config);
-
-static inline int
-MainOrThrow(int argc, char *argv[])
-{
-	struct options options;
-
 #ifdef ENABLE_DAEMON
 	daemonize_close_stdin();
 #endif
 
 #ifndef ANDROID
-#ifdef HAVE_LOCALE_H
+#ifdef HAVE_CLOCALE
 	/* initialize locale */
-	setlocale(LC_CTYPE,"");
-	setlocale(LC_COLLATE, "");
+	std::setlocale(LC_CTYPE,"");
+	std::setlocale(LC_COLLATE, "");
 #endif
 #endif
 
@@ -413,25 +372,8 @@ MainOrThrow(int argc, char *argv[])
 	const ODBus::ScopeInit dbus_init;
 #endif
 
-	ConfigData raw_config;
-
-#ifdef ANDROID
-	(void)argc;
-	(void)argv;
-
-	const auto sdcard = Environment::getExternalStorageDirectory();
-	if (!sdcard.IsNull()) {
-		const auto config_path =
-			sdcard / Path::FromFS("mpd.conf");
-		if (FileExists(config_path))
-			ReadConfigFile(raw_config, config_path);
-	}
-#else
-	ParseCommandLine(argc, argv, options, raw_config);
-#endif
-
 	InitPathParser(raw_config);
-	const auto config = LoadConfig(raw_config);
+	const Config config(raw_config);
 
 #ifdef ENABLE_DAEMON
 	glue_daemonize_init(&options, raw_config);
@@ -441,31 +383,33 @@ MainOrThrow(int argc, char *argv[])
 
 	log_init(raw_config, options.verbose, options.log_stderr);
 
-	instance = new Instance();
-	AtScopeExit() {
-		delete instance;
-		instance = nullptr;
-	};
+	Instance instance;
+	global_instance = &instance;
 
 #ifdef ENABLE_NEIGHBOR_PLUGINS
-	instance->neighbors = new NeighborGlue();
-	instance->neighbors->Init(raw_config,
-				  instance->io_thread.GetEventLoop(),
-				  *instance);
+	instance.neighbors = std::make_unique<NeighborGlue>();
+	instance.neighbors->Init(raw_config,
+				 instance.io_thread.GetEventLoop(),
+				 instance);
 
-	if (instance->neighbors->IsEmpty()) {
-		delete instance->neighbors;
-		instance->neighbors = nullptr;
-	}
+	if (instance.neighbors->IsEmpty())
+		instance.neighbors.reset();
 #endif
 
 	const unsigned max_clients =
 		raw_config.GetPositive(ConfigOption::MAX_CONN, 100);
-	instance->client_list = new ClientList(max_clients);
+	instance.client_list = std::make_unique<ClientList>(max_clients);
 
-	initialize_decoder_and_player(raw_config, config.replay_gain);
+	const auto *input_cache_config = raw_config.GetBlock(ConfigBlockOption::INPUT_CACHE);
+	if (input_cache_config != nullptr) {
+		const InputCacheConfig c(*input_cache_config);
+		instance.input_cache = std::make_unique<InputCacheManager>(c);
+	}
 
-	listen_global_init(raw_config, *instance->partitions.front().listener);
+	initialize_decoder_and_player(instance,
+				      raw_config, config.replay_gain);
+
+	listen_global_init(raw_config, *instance.partitions.front().listener);
 
 #ifdef ENABLE_DAEMON
 	daemonize_set_user();
@@ -473,27 +417,6 @@ MainOrThrow(int argc, char *argv[])
 	AtScopeExit() { daemonize_finish(); };
 #endif
 
-	return mpd_main_after_fork(raw_config, config);
-}
-
-#ifdef ANDROID
-static inline
-#endif
-int mpd_main(int argc, char *argv[]) noexcept
-{
-	AtScopeExit() { log_deinit(); };
-
-	try {
-		return MainOrThrow(argc, argv);
-	} catch (...) {
-		LogError(std::current_exception());
-		return EXIT_FAILURE;
-	}
-}
-
-static int
-mpd_main_after_fork(const ConfigData &raw_config, const Config &config)
-{
 	ConfigureFS(raw_config);
 	AtScopeExit() { DeinitFS(); };
 
@@ -510,24 +433,26 @@ mpd_main_after_fork(const ConfigData &raw_config, const Config &config)
 	const ScopeDecoderPluginsInit decoder_plugins_init(raw_config);
 
 #ifdef ENABLE_DATABASE
-	const bool create_db = InitDatabaseAndStorage(raw_config);
+	const bool create_db = InitDatabaseAndStorage(instance, raw_config);
 #endif
 
-	glue_sticker_init(raw_config);
+#ifdef ENABLE_SQLITE
+	instance.sticker_database = LoadStickerDatabase(raw_config);
+#endif
 
 	command_init();
 
-	for (auto &partition : instance->partitions) {
-		partition.outputs.Configure(instance->rtio_thread.GetEventLoop(),
+	for (auto &partition : instance.partitions) {
+		partition.outputs.Configure(instance.rtio_thread.GetEventLoop(),
 					    raw_config,
-					    config.replay_gain,
-					    partition.pc);
+					    config.replay_gain);
 		partition.UpdateEffectiveReplayGainMode();
 	}
 
 	client_manager_init(raw_config);
 	const ScopeInputPluginsInit input_plugins_init(raw_config,
-						       instance->io_thread.GetEventLoop());
+						       instance.io_thread.GetEventLoop());
+
 	const ScopePlaylistPluginsInit playlist_plugins_init(raw_config);
 
 #ifdef ENABLE_DAEMON
@@ -537,37 +462,42 @@ mpd_main_after_fork(const ConfigData &raw_config, const Config &config)
 #ifndef ANDROID
 	setup_log_output();
 
-	const ScopeSignalHandlersInit signal_handlers_init(instance->event_loop);
+	const ScopeSignalHandlersInit signal_handlers_init(instance);
 #endif
 
-	instance->io_thread.Start();
-	instance->rtio_thread.Start();
+	instance.io_thread.Start();
+	instance.rtio_thread.Start();
 
 #ifdef ENABLE_NEIGHBOR_PLUGINS
-	if (instance->neighbors != nullptr)
-		instance->neighbors->Open();
+	if (instance.neighbors != nullptr)
+		instance.neighbors->Open();
+
+	AtScopeExit(&instance) {
+		if (instance.neighbors != nullptr)
+			instance.neighbors->Close();
+	};
 #endif
 
-	ZeroconfInit(raw_config, instance->event_loop);
+	ZeroconfInit(raw_config, instance.event_loop);
 
 #ifdef ENABLE_DATABASE
 	if (create_db) {
 		/* the database failed to load: recreate the
 		   database */
-		instance->update->Enqueue("", true);
+		instance.update->Enqueue("", true);
 	}
 #endif
 
-	glue_state_file_init(raw_config);
+	glue_state_file_init(instance, raw_config);
 
 #ifdef ENABLE_DATABASE
 	if (raw_config.GetBool(ConfigOption::AUTO_UPDATE, false)) {
 #ifdef ENABLE_INOTIFY
-		if (instance->storage != nullptr &&
-		    instance->update != nullptr)
-			mpd_inotify_init(instance->event_loop,
-					 *instance->storage,
-					 *instance->update,
+		if (instance.storage != nullptr &&
+		    instance.update != nullptr)
+			mpd_inotify_init(instance.event_loop,
+					 *instance.storage,
+					 *instance.update,
 					 raw_config.GetUnsigned(ConfigOption::AUTO_UPDATE_DEPTH,
 								INT_MAX));
 #else
@@ -581,7 +511,7 @@ mpd_main_after_fork(const ConfigData &raw_config, const Config &config)
 
 	/* enable all audio outputs (if not already done by
 	   playlist_state_restore() */
-	for (auto &partition : instance->partitions)
+	for (auto &partition : instance.partitions)
 		partition.pc.LockUpdateAudio();
 
 #ifdef _WIN32
@@ -590,14 +520,14 @@ mpd_main_after_fork(const ConfigData &raw_config, const Config &config)
 
 	/* the MPD frontend does not care about timer slack; set it to
 	   a huge value to allow the kernel to reduce CPU wakeups */
-	SetThreadTimerSlackMS(100);
+	SetThreadTimerSlack(std::chrono::milliseconds(100));
 
 #ifdef ENABLE_SYSTEMD_DAEMON
 	sd_notify(0, "READY=1");
 #endif
 
 	/* run the main loop */
-	instance->event_loop.Run();
+	instance.event_loop.Run();
 
 #ifdef _WIN32
 	win32_app_stopping();
@@ -605,60 +535,98 @@ mpd_main_after_fork(const ConfigData &raw_config, const Config &config)
 
 	/* cleanup */
 
-	instance->BeginShutdownUpdate();
-
-	if (instance->state_file != nullptr) {
-		instance->state_file->Write();
-		delete instance->state_file;
-	}
+	instance.BeginShutdownUpdate();
 
 	ZeroconfDeinit();
 
-	instance->BeginShutdownPartitions();
-
-	delete instance->client_list;
-
-#ifdef ENABLE_NEIGHBOR_PLUGINS
-	if (instance->neighbors != nullptr) {
-		instance->neighbors->Close();
-		delete instance->neighbors;
-	}
-#endif
-
-#ifdef ENABLE_SQLITE
-	sticker_global_finish();
-#endif
-
-	return EXIT_SUCCESS;
+	instance.BeginShutdownPartitions();
 }
 
 #ifdef ANDROID
 
+static void
+AndroidMain()
+{
+	struct options options;
+	ConfigData raw_config;
+
+	const auto sdcard = Environment::getExternalStorageDirectory();
+	if (!sdcard.IsNull()) {
+		const auto config_path =
+			sdcard / Path::FromFS("mpd.conf");
+		if (FileExists(config_path))
+			ReadConfigFile(raw_config, config_path);
+	}
+
+	MainConfigured(options, raw_config);
+}
+
 gcc_visibility_default
 JNIEXPORT void JNICALL
 Java_org_musicpd_Bridge_run(JNIEnv *env, jclass, jobject _context, jobject _logListener)
 {
 	Java::Init(env);
+	Java::Object::Initialise(env);
 	Java::File::Initialise(env);
 	Environment::Initialise(env);
+	AtScopeExit(env) { Environment::Deinitialise(env); };
 
 	context = new Context(env, _context);
+	AtScopeExit() { delete context; };
+
 	if (_logListener != nullptr)
 		logListener = new LogListener(env, _logListener);
+	AtScopeExit() { delete logListener; };
 
-	mpd_main(0, nullptr);
-
-	delete logListener;
-	delete context;
-	Environment::Deinitialise(env);
+	try {
+		AndroidMain();
+	} catch (...) {
+		LogError(std::current_exception());
+	}
 }
 
 gcc_visibility_default
 JNIEXPORT void JNICALL
 Java_org_musicpd_Bridge_shutdown(JNIEnv *, jclass)
 {
-	if (instance != nullptr)
-		instance->Break();
+	if (global_instance != nullptr)
+		global_instance->Break();
+}
+
+#else
+
+static inline void
+MainOrThrow(int argc, char *argv[])
+{
+	struct options options;
+	ConfigData raw_config;
+
+	ParseCommandLine(argc, argv, options, raw_config);
+
+	MainConfigured(options, raw_config);
+}
+
+int mpd_main(int argc, char *argv[]) noexcept
+{
+	AtScopeExit() { log_deinit(); };
+
+	try {
+		MainOrThrow(argc, argv);
+		return EXIT_SUCCESS;
+	} catch (...) {
+		LogError(std::current_exception());
+		return EXIT_FAILURE;
+	}
+}
+
+int
+main(int argc, char *argv[]) noexcept
+{
+#ifdef _WIN32
+	return win32_main(argc, argv);
+#else
+	return mpd_main(argc, argv);
+#endif
 }
 
 #endif

src/Main.hxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -20,18 +20,16 @@
 #ifndef MPD_MAIN_HXX
 #define MPD_MAIN_HXX
 
-class EventLoop;
-class Context;
 struct Instance;
 
 #ifdef ANDROID
 #include "android/LogListener.hxx"
 
-extern Context *context;
+extern class Context *context;
 extern LogListener *logListener;
 #endif
 
-extern Instance *instance;
+extern Instance *global_instance;
 
 #ifndef ANDROID
 

src/Mapper.cxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -33,7 +33,7 @@
 #include "Main.hxx"
 #endif
 
-#include <assert.h>
+#include <cassert>
 
 /**
  * The absolute path of the playlist directory encoded in the
@@ -66,10 +66,10 @@ map_uri_fs(const char *uri) noexcept
 	assert(uri != nullptr);
 	assert(*uri != '/');
 
-	if (instance->storage == nullptr)
+	if (global_instance->storage == nullptr)
 		return nullptr;
 
-	const auto music_dir_fs = instance->storage->MapFS("");
+	const auto music_dir_fs = global_instance->storage->MapFS("");
 	if (music_dir_fs.IsNull())
 		return nullptr;
 
@@ -84,10 +84,10 @@ std::string
 map_fs_to_utf8(Path path_fs) noexcept
 {
 	if (path_fs.IsAbsolute()) {
-		if (instance->storage == nullptr)
+		if (global_instance->storage == nullptr)
 			return std::string();
 
-		const auto music_dir_fs = instance->storage->MapFS("");
+		const auto music_dir_fs = global_instance->storage->MapFS("");
 		if (music_dir_fs.IsNull())
 			return std::string();
 
@@ -119,7 +119,7 @@ map_spl_utf8_to_fs(const char *name) noexcept
 	filename_utf8.append(PLAYLIST_FILE_SUFFIX);
 
 	const auto filename_fs =
-		AllocatedPath::FromUTF8(filename_utf8.c_str());
+		AllocatedPath::FromUTF8(filename_utf8);
 	if (filename_fs.IsNull())
 		return nullptr;
 

src/Mapper.hxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify

src/MixRampInfo.hxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify

src/MusicBuffer.cxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -20,7 +20,7 @@
 #include "MusicBuffer.hxx"
 #include "MusicChunk.hxx"
 
-#include <assert.h>
+#include <cassert>
 
 MusicBuffer::MusicBuffer(unsigned num_chunks)
 	:buffer(num_chunks) {

src/MusicBuffer.hxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify

src/MusicChunk.cxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -18,10 +18,10 @@
  */
 
 #include "MusicChunk.hxx"
-#include "AudioFormat.hxx"
+#include "pcm/AudioFormat.hxx"
 #include "tag/Tag.hxx"
 
-#include <assert.h>
+#include <cassert>
 
 MusicChunkInfo::MusicChunkInfo() noexcept = default;
 MusicChunkInfo::~MusicChunkInfo() noexcept = default;

src/MusicChunk.hxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -26,14 +26,13 @@
 #include "util/WritableBuffer.hxx"
 
 #ifndef NDEBUG
-#include "AudioFormat.hxx"
+#include "pcm/AudioFormat.hxx"
 #endif
 
+#include <cstddef>
+#include <cstdint>
 #include <memory>
 
-#include <stdint.h>
-#include <stddef.h>
-
 static constexpr size_t CHUNK_SIZE = 4096;
 
 struct AudioFormat;
@@ -43,15 +42,7 @@ struct MusicChunk;
 /**
  * Meta information for #MusicChunk.
  */
-struct alignas(8) MusicChunkInfo {
-	/* align to multiple of 8 bytes, which adds padding at the
-	   end, so the size of MusicChunk::data is also a multiple of
-	   8 bytes; this is a workaround for a bug in the DSD_U32 and
-	   DoP converters which require processing 8 bytes at a time,
-	   discarding the remainder */
-	/* TODO: once all converters have been fixed, we should remove
-	   this workaround */
-
+struct MusicChunkInfo {
 	/** the next chunk in a linked list */
 	MusicChunkPtr next;
 
@@ -127,10 +118,6 @@ struct MusicChunk : MusicChunkInfo {
 	/** the data (probably PCM) */
 	uint8_t data[CHUNK_SIZE - sizeof(MusicChunkInfo)];
 
-	/* TODO: remove this check once all converters have been fixed
-	   (see comment in struct MusicChunkInfo for details) */
-	static_assert(sizeof(data) % 8 == 0, "Wrong alignment");
-
 	/**
 	 * Prepares appending to the music chunk.  Returns a buffer
 	 * where you may write into.  After you are finished, call

src/MusicChunkPtr.cxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify

src/MusicChunkPtr.hxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify

src/MusicPipe.cxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -20,6 +20,8 @@
 #include "MusicPipe.hxx"
 #include "MusicChunk.hxx"
 
+#include <cassert>
+
 #ifndef NDEBUG
 
 bool

src/MusicPipe.hxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -25,11 +25,9 @@
 #include "util/Compiler.h"
 
 #ifndef NDEBUG
-#include "AudioFormat.hxx"
+#include "pcm/AudioFormat.hxx"
 #endif
 
-#include <assert.h>
-
 /**
  * A queue of #MusicChunk objects.  One party appends chunks at the
  * tail, and the other consumes them from the head.

src/Partition.cxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -20,24 +20,33 @@
 #include "config.h"
 #include "Partition.hxx"
 #include "Instance.hxx"
+#include "Log.hxx"
 #include "song/DetachedSong.hxx"
 #include "mixer/Volume.hxx"
 #include "IdleFlags.hxx"
 #include "client/Listener.hxx"
+#include "client/Client.hxx"
+#include "input/cache/Manager.hxx"
+#include "util/Domain.hxx"
+
+static constexpr Domain cache_domain("cache");
 
 Partition::Partition(Instance &_instance,
 		     const char *_name,
 		     unsigned max_length,
 		     unsigned buffer_chunks,
 		     AudioFormat configured_audio_format,
-		     const ReplayGainConfig &replay_gain_config)
+		     const ReplayGainConfig &replay_gain_config) noexcept
 	:instance(_instance),
 	 name(_name),
 	 listener(new ClientListener(instance.event_loop, *this)),
+	 idle_monitor(instance.event_loop, BIND_THIS_METHOD(OnIdleMonitor)),
 	 global_events(instance.event_loop, BIND_THIS_METHOD(OnGlobalEvent)),
 	 playlist(max_length, *this),
-	 outputs(*this),
-	 pc(*this, outputs, buffer_chunks,
+	 outputs(pc, *this),
+	 pc(*this, outputs,
+	    instance.input_cache.get(),
+	    buffer_chunks,
 	    configured_audio_format, replay_gain_config)
 {
 	UpdateEffectiveReplayGainMode();
@@ -46,13 +55,51 @@ Partition::Partition(Instance &_instance,
 Partition::~Partition() noexcept = default;
 
 void
-Partition::EmitIdle(unsigned mask)
+Partition::BeginShutdown() noexcept
 {
-	instance.EmitIdle(mask);
+	pc.Kill();
+	listener.reset();
+}
+
+static void
+PrefetchSong(InputCacheManager &cache, const char *uri) noexcept
+{
+	if (cache.Contains(uri))
+		return;
+
+	FormatDebug(cache_domain, "Prefetch '%s'", uri);
+
+	try {
+		cache.Prefetch(uri);
+	} catch (...) {
+		FormatError(std::current_exception(),
+			    "Prefetch '%s' failed", uri);
+	}
+}
+
+static void
+PrefetchSong(InputCacheManager &cache, const DetachedSong &song) noexcept
+{
+	PrefetchSong(cache, song.GetURI());
+}
+
+inline void
+Partition::PrefetchQueue() noexcept
+{
+	if (!instance.input_cache)
+		return;
+
+	auto &cache = *instance.input_cache;
+
+	int next = playlist.GetNextPosition();
+	if (next >= 0)
+		PrefetchSong(cache, playlist.queue.Get(next));
+
+	// TODO: prefetch more songs
 }
 
 void
-Partition::UpdateEffectiveReplayGainMode()
+Partition::UpdateEffectiveReplayGainMode() noexcept
 {
 	auto mode = replay_gain_mode;
 	if (mode == ReplayGainMode::AUTO)
@@ -68,7 +115,7 @@ Partition::UpdateEffectiveReplayGainMode()
 #ifdef ENABLE_DATABASE
 
 const Database *
-Partition::GetDatabase() const
+Partition::GetDatabase() const noexcept
 {
 	return instance.GetDatabase();
 }
@@ -80,7 +127,7 @@ Partition::GetDatabaseOrThrow() const
 }
 
 void
-Partition::DatabaseModified(const Database &db)
+Partition::DatabaseModified(const Database &db) noexcept
 {
 	playlist.DatabaseModified(db);
 	EmitIdle(IDLE_DATABASE);
@@ -89,7 +136,7 @@ Partition::DatabaseModified(const Database &db)
 #endif
 
 void
-Partition::TagModified()
+Partition::TagModified() noexcept
 {
 	auto song = pc.LockReadTaggedSong();
 	if (song)
@@ -103,31 +150,35 @@ Partition::TagModified(const char *uri, const Tag &tag) noexcept
 }
 
 void
-Partition::SyncWithPlayer()
+Partition::SyncWithPlayer() noexcept
 {
 	playlist.SyncWithPlayer(pc);
+
+	/* TODO: invoke this function in batches, to let the hard disk
+	   spin down in between */
+	PrefetchQueue();
 }
 
 void
-Partition::BorderPause()
+Partition::BorderPause() noexcept
 {
 	playlist.BorderPause(pc);
 }
 
 void
-Partition::OnQueueModified()
+Partition::OnQueueModified() noexcept
 {
 	EmitIdle(IDLE_PLAYLIST);
 }
 
 void
-Partition::OnQueueOptionsChanged()
+Partition::OnQueueOptionsChanged() noexcept
 {
 	EmitIdle(IDLE_OPTIONS);
 }
 
 void
-Partition::OnQueueSongStarted()
+Partition::OnQueueSongStarted() noexcept
 {
 	EmitIdle(IDLE_PLAYER);
 }
@@ -151,7 +202,7 @@ Partition::OnBorderPause() noexcept
 }
 
 void
-Partition::OnMixerVolumeChanged(gcc_unused Mixer &mixer, gcc_unused int volume)
+Partition::OnMixerVolumeChanged(Mixer &, int) noexcept
 {
 	InvalidateHardwareVolume();
 
@@ -160,7 +211,19 @@ Partition::OnMixerVolumeChanged(gcc_unused Mixer &mixer, gcc_unused int volume)
 }
 
 void
-Partition::OnGlobalEvent(unsigned mask)
+Partition::OnIdleMonitor(unsigned mask) noexcept
+{
+	/* send "idle" notifications to all subscribed
+	   clients */
+	for (auto &client : clients)
+		client.IdleAdd(mask);
+
+	if (mask & (IDLE_PLAYLIST|IDLE_PLAYER|IDLE_MIXER|IDLE_OUTPUT))
+		instance.OnStateModified();
+}
+
+void
+Partition::OnGlobalEvent(unsigned mask) noexcept
 {
 	if ((mask & SYNC_WITH_PLAYER) != 0)
 		SyncWithPlayer();

src/Partition.hxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -30,9 +30,10 @@
 #include "ReplayGainMode.hxx"
 #include "SingleMode.hxx"
 #include "Chrono.hxx"
-#include "util/Compiler.h"
 #include "config.h"
 
+#include <boost/intrusive/list.hpp>
+
 #include <string>
 #include <memory>
 
@@ -40,6 +41,7 @@ struct Instance;
 class MultipleOutputs;
 class SongLoader;
 class ClientListener;
+class Client;
 
 /**
  * A partition of the Music Player Daemon.  It is a separate unit with
@@ -56,6 +58,16 @@ struct Partition final : QueueListener, PlayerListener, MixerListener {
 
 	std::unique_ptr<ClientListener> listener;
 
+	boost::intrusive::list<Client,
+			       boost::intrusive::base_hook<boost::intrusive::list_base_hook<boost::intrusive::tag<Partition>,
+											    boost::intrusive::link_mode<boost::intrusive::normal_link>>>,
+			       boost::intrusive::constant_time_size<false>> clients;
+
+	/**
+	 * Monitor for idle events local to this partition.
+	 */
+	MaskMonitor idle_monitor;
+
 	MaskMonitor global_events;
 
 	struct playlist playlist;
@@ -71,17 +83,34 @@ struct Partition final : QueueListener, PlayerListener, MixerListener {
 		  unsigned max_length,
 		  unsigned buffer_chunks,
 		  AudioFormat configured_audio_format,
-		  const ReplayGainConfig &replay_gain_config);
+		  const ReplayGainConfig &replay_gain_config) noexcept;
 
 	~Partition() noexcept;
 
-	void EmitGlobalEvent(unsigned mask) {
+	void BeginShutdown() noexcept;
+
+	void EmitGlobalEvent(unsigned mask) noexcept {
 		global_events.OrMask(mask);
 	}
 
-	void EmitIdle(unsigned mask);
+	/**
+	 * Emit an "idle" event to all clients of this partition.
+	 *
+	 * This method can be called from any thread.
+	 */
+	void EmitIdle(unsigned mask) noexcept {
+		idle_monitor.OrMask(mask);
+	}
 
-	void ClearQueue() {
+	/**
+	 * Populate the #InputCacheManager with soon-to-be-played song
+	 * files.
+	 *
+	 * Errors will be logged.
+	 */
+	void PrefetchQueue() noexcept;
+
+	void ClearQueue() noexcept {
 		playlist.Clear(pc);
 	}
 
@@ -108,11 +137,11 @@ struct Partition final : QueueListener, PlayerListener, MixerListener {
 		playlist.DeleteRange(pc, start, end);
 	}
 
-	void StaleSong(const char *uri) {
+	void StaleSong(const char *uri) noexcept {
 		playlist.StaleSong(pc, uri);
 	}
 
-	void Shuffle(unsigned start, unsigned end) {
+	void Shuffle(unsigned start, unsigned end) noexcept {
 		playlist.Shuffle(pc, start, end);
 	}
 
@@ -142,7 +171,7 @@ struct Partition final : QueueListener, PlayerListener, MixerListener {
 		playlist.SetPriorityId(pc, song_id, priority);
 	}
 
-	void Stop() {
+	void Stop() noexcept {
 		playlist.Stop(pc);
 	}
 
@@ -174,27 +203,27 @@ struct Partition final : QueueListener, PlayerListener, MixerListener {
 		playlist.SeekCurrent(pc, seek_time, relative);
 	}
 
-	void SetRepeat(bool new_value) {
+	void SetRepeat(bool new_value) noexcept {
 		playlist.SetRepeat(pc, new_value);
 	}
 
-	bool GetRandom() const {
+	bool GetRandom() const noexcept {
 		return playlist.GetRandom();
 	}
 
-	void SetRandom(bool new_value) {
+	void SetRandom(bool new_value) noexcept {
 		playlist.SetRandom(pc, new_value);
 	}
 
-	void SetSingle(SingleMode new_value) {
+	void SetSingle(SingleMode new_value) noexcept {
 		playlist.SetSingle(pc, new_value);
 	}
 
-	void SetConsume(bool new_value) {
+	void SetConsume(bool new_value) noexcept {
 		playlist.SetConsume(new_value);
 	}
 
-	void SetReplayGainMode(ReplayGainMode mode) {
+	void SetReplayGainMode(ReplayGainMode mode) noexcept {
 		replay_gain_mode = mode;
 		UpdateEffectiveReplayGainMode();
 	}
@@ -203,7 +232,7 @@ struct Partition final : QueueListener, PlayerListener, MixerListener {
 	 * Publishes the effective #ReplayGainMode to all subsystems.
 	 * #ReplayGainMode::AUTO is substituted.
 	 */
-	void UpdateEffectiveReplayGainMode();
+	void UpdateEffectiveReplayGainMode() noexcept;
 
 #ifdef ENABLE_DATABASE
 	/**
@@ -211,7 +240,7 @@ struct Partition final : QueueListener, PlayerListener, MixerListener {
 	 * if this MPD configuration has no database (no
 	 * music_directory was configured).
 	 */
-	const Database *GetDatabase() const;
+	const Database *GetDatabase() const noexcept;
 
 	const Database &GetDatabaseOrThrow() const;
 
@@ -219,14 +248,14 @@ struct Partition final : QueueListener, PlayerListener, MixerListener {
 	 * The database has been modified.  Propagate the change to
 	 * all subsystems.
 	 */
-	void DatabaseModified(const Database &db);
+	void DatabaseModified(const Database &db) noexcept;
 #endif
 
 	/**
 	 * A tag in the play queue has been modified by the player
 	 * thread.  Propagate the change to all subsystems.
 	 */
-	void TagModified();
+	void TagModified() noexcept;
 
 	/**
 	 * The tag of the given song has been modified.  Propagate the
@@ -237,19 +266,19 @@ struct Partition final : QueueListener, PlayerListener, MixerListener {
 	/**
 	 * Synchronize the player with the play queue.
 	 */
-	void SyncWithPlayer();
+	void SyncWithPlayer() noexcept;
 
 	/**
 	 * Border pause has just been enabled. Change single mode to off
 	 * if it was one-shot.
 	 */
-	void BorderPause();
+	void BorderPause() noexcept;
 
 private:
 	/* virtual methods from class QueueListener */
-	void OnQueueModified() override;
-	void OnQueueOptionsChanged() override;
-	void OnQueueSongStarted() override;
+	void OnQueueModified() noexcept override;
+	void OnQueueOptionsChanged() noexcept override;
+	void OnQueueSongStarted() noexcept override;
 
 	/* virtual methods from class PlayerListener */
 	void OnPlayerSync() noexcept override;
@@ -257,10 +286,13 @@ private:
 	void OnBorderPause() noexcept override;
 
 	/* virtual methods from class MixerListener */
-	void OnMixerVolumeChanged(Mixer &mixer, int volume) override;
+	void OnMixerVolumeChanged(Mixer &mixer, int volume) noexcept override;
+
+	/* callback for #idle_monitor */
+	void OnIdleMonitor(unsigned mask) noexcept;
 
 	/* callback for #global_events */
-	void OnGlobalEvent(unsigned mask);
+	void OnGlobalEvent(unsigned mask) noexcept;
 };
 
 #endif

src/Permission.cxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -22,14 +22,15 @@
 #include "config/Param.hxx"
 #include "config/Data.hxx"
 #include "config/Option.hxx"
+#include "util/IterableSplitString.hxx"
 #include "util/RuntimeError.hxx"
+#include "util/StringView.hxx"
 
-#include <algorithm>
+#include <cassert>
+#include <cstring>
 #include <map>
 #include <string>
-
-#include <assert.h>
-#include <string.h>
+#include <utility>
 
 static constexpr char PERMISSION_PASSWORD_CHAR = '@';
 static constexpr char PERMISSION_SEPARATOR = ',';
@@ -54,35 +55,25 @@ static unsigned local_permissions;
 #endif
 
 static unsigned
-ParsePermission(const char *p)
+ParsePermission(StringView s)
 {
 	for (auto i = permission_names; i->name != nullptr; ++i)
-		if (strcmp(p, i->name) == 0)
+		if (s.Equals(i->name))
 			return i->value;
 
-	throw FormatRuntimeError("unknown permission \"%s\"", p);
+	throw FormatRuntimeError("unknown permission \"%.*s\"",
+				 int(s.size), s.data);
 }
 
 static unsigned parsePermissions(const char *string)
 {
 	assert(string != nullptr);
 
-	const char *const end = string + strlen(string);
-
 	unsigned permission = 0;
-	while (true) {
-		const char *comma = std::find(string, end,
-					      PERMISSION_SEPARATOR);
-		if (comma > string) {
-			const std::string name(string, comma);
-			permission |= ParsePermission(name.c_str());
-		}
 
-		if (comma == end)
-			break;
-
-		string = comma + 1;
-	}
+	for (const auto i : IterableSplitString(string, PERMISSION_SEPARATOR))
+		if (!i.empty())
+			permission |= ParsePermission(i);
 
 	return permission;
 }
@@ -90,48 +81,44 @@ static unsigned parsePermissions(const char *string)
 void
 initPermissions(const ConfigData &config)
 {
-	unsigned permission;
-
 	permission_default = PERMISSION_READ | PERMISSION_ADD |
 	    PERMISSION_CONTROL | PERMISSION_ADMIN;
 
 	for (const auto &param : config.GetParamList(ConfigOption::PASSWORD)) {
 		permission_default = 0;
 
-		const char *separator = strchr(param.value.c_str(),
-					       PERMISSION_PASSWORD_CHAR);
+		param.With([](const char *value){
+			const char *separator = std::strchr(value,
+						       PERMISSION_PASSWORD_CHAR);
 
-		if (separator == NULL)
-			throw FormatRuntimeError("\"%c\" not found in password string "
-						 "\"%s\", line %i",
-						 PERMISSION_PASSWORD_CHAR,
-						 param.value.c_str(),
-						 param.line);
+			if (separator == nullptr)
+				throw FormatRuntimeError("\"%c\" not found in password string",
+							 PERMISSION_PASSWORD_CHAR);
 
-		std::string password(param.value.c_str(), separator);
+			std::string password(value, separator);
 
-		permission = parsePermissions(separator + 1);
-
-		permission_passwords.insert(std::make_pair(std::move(password),
-							   permission));
+			unsigned permission = parsePermissions(separator + 1);
+			permission_passwords.insert(std::make_pair(std::move(password),
+								   permission));
+		});
 	}
 
-	const ConfigParam *param;
-	param = config.GetParam(ConfigOption::DEFAULT_PERMS);
-
-	if (param)
-		permission_default = parsePermissions(param->value.c_str());
+	config.With(ConfigOption::DEFAULT_PERMS, [](const char *value){
+		if (value != nullptr)
+			permission_default = parsePermissions(value);
+	});
 
 #ifdef HAVE_UN
-	param = config.GetParam(ConfigOption::LOCAL_PERMISSIONS);
-	if (param != nullptr)
-		local_permissions = parsePermissions(param->value.c_str());
-	else
-		local_permissions = permission_default;
+	local_permissions = config.With(ConfigOption::LOCAL_PERMISSIONS, [](const char *value){
+		return value != nullptr
+			? parsePermissions(value)
+			: permission_default;
+	});
 #endif
 }
 
-int getPermissionFromPassword(char const* password, unsigned* permission)
+int
+getPermissionFromPassword(const char *password, unsigned *permission) noexcept
 {
 	auto i = permission_passwords.find(password);
 	if (i == permission_passwords.end())
@@ -141,7 +128,8 @@ int getPermissionFromPassword(char const* password, unsigned* permission)
 	return 0;
 }
 
-unsigned getDefaultPermissions(void)
+unsigned
+getDefaultPermissions() noexcept
 {
 	return permission_default;
 }

src/Permission.hxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -30,10 +30,11 @@ static constexpr unsigned PERMISSION_ADD = 2;
 static constexpr unsigned PERMISSION_CONTROL = 4;
 static constexpr unsigned PERMISSION_ADMIN = 8;
 
-int getPermissionFromPassword(char const* password, unsigned* permission);
+int
+getPermissionFromPassword(const char *password, unsigned *permission) noexcept;
 
 unsigned
-getDefaultPermissions();
+getDefaultPermissions() noexcept;
 
 #ifdef HAVE_UN
 unsigned

src/PlaylistDatabase.cxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -25,7 +25,8 @@
 #include "util/StringStrip.hxx"
 #include "util/RuntimeError.hxx"
 
-#include <string.h>
+#include <cstring>
+
 #include <stdlib.h>
 
 void
@@ -49,8 +50,8 @@ playlist_metadata_load(TextFile &file, PlaylistVector &pv, const char *name)
 	const char *value;
 
 	while ((line = file.ReadLine()) != nullptr &&
-	       strcmp(line, "playlist_end") != 0) {
-		colon = strchr(line, ':');
+	       std::strcmp(line, "playlist_end") != 0) {
+		colon = std::strchr(line, ':');
 		if (colon == nullptr || colon == line)
 			throw FormatRuntimeError("unknown line in db: %s",
 						 line);
@@ -58,7 +59,7 @@ playlist_metadata_load(TextFile &file, PlaylistVector &pv, const char *name)
 		*colon++ = 0;
 		value = StripLeft(colon);
 
-		if (strcmp(line, "mtime") == 0)
+		if (std::strcmp(line, "mtime") == 0)
 			pm.mtime = std::chrono::system_clock::from_time_t(strtol(value, nullptr, 10));
 		else
 			throw FormatRuntimeError("unknown line in db: %s",

src/PlaylistDatabase.hxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify

src/PlaylistError.cxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify

src/PlaylistError.hxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify

src/PlaylistFile.cxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -39,15 +39,11 @@
 #include "fs/FileSystem.hxx"
 #include "fs/FileInfo.hxx"
 #include "fs/DirectoryReader.hxx"
-#include "util/Macros.hxx"
 #include "util/StringCompare.hxx"
-#include "util/UriUtil.hxx"
+#include "util/UriExtract.hxx"
 
-#include <memory>
-
-#include <assert.h>
-#include <string.h>
-#include <errno.h>
+#include <cassert>
+#include <cstring>
 
 static const char PLAYLIST_COMMENT = '#';
 
@@ -84,9 +80,9 @@ spl_valid_name(const char *name_utf8)
 	 * filenames isn't going to happen, either.
 	 */
 
-	return strchr(name_utf8, '/') == nullptr &&
-		strchr(name_utf8, '\n') == nullptr &&
-		strchr(name_utf8, '\r') == nullptr;
+	return std::strchr(name_utf8, '/') == nullptr &&
+		std::strchr(name_utf8, '\n') == nullptr &&
+		std::strchr(name_utf8, '\r') == nullptr;
 }
 
 static const AllocatedPath &

src/PlaylistFile.hxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify

src/PlaylistPrint.cxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -22,11 +22,6 @@
 #include "PlaylistError.hxx"
 #include "queue/Playlist.hxx"
 #include "queue/QueuePrint.hxx"
-#include "SongPrint.hxx"
-#include "Partition.hxx"
-#include "Instance.hxx"
-#include "db/Interface.hxx"
-#include "client/Response.hxx"
 
 #define SONG_FILE "file: "
 #define SONG_TIME "Time: "

src/PlaylistPrint.hxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -20,7 +20,7 @@
 #ifndef MPD_PLAYLIST_PRINT_HXX
 #define MPD_PLAYLIST_PRINT_HXX
 
-#include <stdint.h>
+#include <cstdint>
 
 struct playlist;
 class SongFilter;

src/PlaylistSave.cxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -30,9 +30,7 @@
 #include "fs/FileSystem.hxx"
 #include "fs/io/FileOutputStream.hxx"
 #include "fs/io/BufferedOutputStream.hxx"
-#include "util/UriUtil.hxx"
-
-#include <exception>
+#include "util/UriExtract.hxx"
 
 static void
 playlist_print_path(BufferedOutputStream &os, const Path path)

src/PlaylistSave.hxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify

src/RemoteTagCache.cxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify

src/RemoteTagCache.hxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify

src/RemoteTagCacheHandler.hxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify

src/ReplayGainConfig.hxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify

src/ReplayGainGlobal.cxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -19,13 +19,12 @@
 
 #include "ReplayGainGlobal.hxx"
 #include "ReplayGainConfig.hxx"
-#include "config/Param.hxx"
 #include "config/Data.hxx"
-#include "util/RuntimeError.hxx"
 
-#include <assert.h>
-#include <stdlib.h>
-#include <math.h>
+#include <cassert>
+#include <cmath>
+#include <cstdlib>
+#include <stdexcept>
 
 static float
 ParsePreamp(const char *s)
@@ -33,25 +32,14 @@ ParsePreamp(const char *s)
 	assert(s != nullptr);
 
 	char *endptr;
-	float f = strtod(s, &endptr);
+	float f = std::strtof(s, &endptr);
 	if (endptr == s || *endptr != '\0')
 		throw std::invalid_argument("Not a numeric value");
 
-	if (f < -15 || f > 15)
+	if (f < -15.0f || f > 15.0f)
 		throw std::invalid_argument("Number must be between -15 and 15");
 
-	return pow(10, f / 20.0);
-}
-
-static float
-ParsePreamp(const ConfigParam &p)
-{
-	try {
-		return ParsePreamp(p.value.c_str());
-	} catch (...) {
-		std::throw_with_nested(FormatRuntimeError("Failed to parse line %i",
-							  p.line));
-	}
+	return std::pow(10.0f, f / 20.0f);
 }
 
 ReplayGainConfig
@@ -59,13 +47,17 @@ LoadReplayGainConfig(const ConfigData &config)
 {
 	ReplayGainConfig replay_gain_config;
 
-	const auto *param = config.GetParam(ConfigOption::REPLAYGAIN_PREAMP);
-	if (param)
-		replay_gain_config.preamp = ParsePreamp(*param);
+	replay_gain_config.preamp = config.With(ConfigOption::REPLAYGAIN_PREAMP, [](const char *s){
+		return s != nullptr
+			? ParsePreamp(s)
+			: 1.0f;
+	});
 
-	param = config.GetParam(ConfigOption::REPLAYGAIN_MISSING_PREAMP);
-	if (param)
-		replay_gain_config.missing_preamp = ParsePreamp(*param);
+	replay_gain_config.missing_preamp = config.With(ConfigOption::REPLAYGAIN_MISSING_PREAMP, [](const char *s){
+		return s != nullptr
+			? ParsePreamp(s)
+			: 1.0f;
+	});
 
 	replay_gain_config.limit = config.GetBool(ConfigOption::REPLAYGAIN_LIMIT,
 						  ReplayGainConfig::DEFAULT_LIMIT);

src/ReplayGainGlobal.hxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify

src/ReplayGainInfo.cxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -20,7 +20,7 @@
 #include "ReplayGainInfo.hxx"
 #include "ReplayGainConfig.hxx"
 
-#include <math.h>
+#include <cmath>
 
 float
 ReplayGainTuple::CalculateScale(const ReplayGainConfig &config) const noexcept
@@ -28,13 +28,13 @@ ReplayGainTuple::CalculateScale(const ReplayGainConfig &config) const noexcept
 	float scale;
 
 	if (IsDefined()) {
-		scale = pow(10.0, gain / 20.0);
+		scale = std::pow(10.0f, gain / 20.0f);
 		scale *= config.preamp;
-		if (scale > 15.0)
-			scale = 15.0;
+		if (scale > 15.0f)
+			scale = 15.0f;
 
-		if (config.limit && scale * peak > 1.0)
-			scale = 1.0 / peak;
+		if (config.limit && scale * peak > 1.0f)
+			scale = 1.0f / peak;
 	} else
 		scale = config.missing_preamp;
 

src/ReplayGainInfo.hxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify

src/ReplayGainMode.cxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -19,9 +19,9 @@
 
 #include "ReplayGainMode.hxx"
 
+#include <cassert>
 #include <stdexcept>
 
-#include <assert.h>
 #include <string.h>
 
 const char *

src/ReplayGainMode.hxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -22,7 +22,7 @@
 
 #include "util/Compiler.h"
 
-#include <stdint.h>
+#include <cstdint>
 
 enum class ReplayGainMode : uint8_t {
 	OFF,

src/SingleMode.cxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -19,9 +19,9 @@
 
 #include "SingleMode.hxx"
 
+#include <cassert>
 #include <stdexcept>
 
-#include <assert.h>
 #include <string.h>
 
 const char *

src/SingleMode.hxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -22,7 +22,7 @@
 
 #include "util/Compiler.h"
 
-#include <stdint.h>
+#include <cstdint>
 
 enum class SingleMode : uint8_t {
 	OFF,

src/SongLoader.cxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -26,7 +26,7 @@
 #include "PlaylistError.hxx"
 #include "config.h"
 
-#include <assert.h>
+#include <cassert>
 
 #ifdef ENABLE_DATABASE
 
@@ -54,11 +54,11 @@ SongLoader::LoadFile(const char *path_utf8, Path path_fs) const
 {
 #ifdef ENABLE_DATABASE
 	if (storage != nullptr) {
-		const char *suffix = storage->MapToRelativeUTF8(path_utf8);
-		if (suffix != nullptr)
+		const auto suffix = storage->MapToRelativeUTF8(path_utf8);
+		if (suffix.data() != nullptr)
 			/* this path was relative to the music
 			   directory - obtain it from the database */
-			return LoadFromDatabase(suffix);
+			return LoadFromDatabase(std::string(suffix).c_str());
 	}
 #endif
 

src/SongLoader.hxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify

src/SongPrint.cxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -19,9 +19,6 @@
 
 #include "SongPrint.hxx"
 #include "song/LightSong.hxx"
-#include "Partition.hxx"
-#include "Instance.hxx"
-#include "storage/StorageInterface.hxx"
 #include "song/DetachedSong.hxx"
 #include "TimePrint.hxx"
 #include "TagPrint.hxx"

src/SongPrint.hxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify

src/SongSave.cxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -18,7 +18,7 @@
  */
 
 #include "SongSave.hxx"
-#include "AudioParser.hxx"
+#include "pcm/AudioParser.hxx"
 #include "db/plugins/simple/Song.hxx"
 #include "song/DetachedSong.hxx"
 #include "TagSave.hxx"
@@ -34,7 +34,6 @@
 #include "util/RuntimeError.hxx"
 #include "util/NumberParser.hxx"
 
-#include <string.h>
 #include <stdlib.h>
 
 #define SONG_MTIME "mtime"
@@ -52,7 +51,10 @@ range_save(BufferedOutputStream &os, unsigned start_ms, unsigned end_ms)
 void
 song_save(BufferedOutputStream &os, const Song &song)
 {
-	os.Format(SONG_BEGIN "%s\n", song.uri);
+	os.Format(SONG_BEGIN "%s\n", song.filename.c_str());
+
+	if (!song.target.empty())
+		os.Format("Target: %s\n", song.target.c_str());
 
 	range_save(os, song.start_time.ToMS(), song.end_time.ToMS());
 
@@ -82,18 +84,19 @@ song_save(BufferedOutputStream &os, const DetachedSong &song)
 	os.Format(SONG_END "\n");
 }
 
-std::unique_ptr<DetachedSong>
+DetachedSong
 song_load(TextFile &file, const char *uri,
+	  std::string *target_r,
 	  AudioFormat *audio_format_r)
 {
-	auto song = std::make_unique<DetachedSong>(uri);
+	DetachedSong song(uri);
 
 	TagBuilder tag;
 
 	char *line;
 	while ((line = file.ReadLine()) != nullptr &&
-	       strcmp(line, SONG_END) != 0) {
-		char *colon = strchr(line, ':');
+	       !StringIsEqual(line, SONG_END)) {
+		char *colon = std::strchr(line, ':');
 		if (colon == nullptr || colon == line) {
 			throw FormatRuntimeError("unknown line in db: %s", line);
 		}
@@ -104,8 +107,11 @@ song_load(TextFile &file, const char *uri,
 		TagType type;
 		if ((type = tag_name_parse(line)) != TAG_NUM_OF_ITEM_TYPES) {
 			tag.AddItem(type, value);
-		} else if (strcmp(line, "Time") == 0) {
+		} else if (StringIsEqual(line, "Time")) {
 			tag.SetDuration(SignedSongTime::FromS(ParseDouble(value)));
+		} else if (StringIsEqual(line, "Target")) {
+			if (target_r != nullptr)
+				*target_r = value;
 		} else if (StringIsEqual(line, "Format")) {
 			if (audio_format_r != nullptr) {
 				try {
@@ -115,11 +121,11 @@ song_load(TextFile &file, const char *uri,
 					/* ignore parser errors */
 				}
 			}
-		} else if (strcmp(line, "Playlist") == 0) {
-			tag.SetHasPlaylist(strcmp(value, "yes") == 0);
-		} else if (strcmp(line, SONG_MTIME) == 0) {
-			song->SetLastModified(std::chrono::system_clock::from_time_t(atoi(value)));
-		} else if (strcmp(line, "Range") == 0) {
+		} else if (StringIsEqual(line, "Playlist")) {
+			tag.SetHasPlaylist(StringIsEqual(value, "yes"));
+		} else if (StringIsEqual(line, SONG_MTIME)) {
+			song.SetLastModified(std::chrono::system_clock::from_time_t(atoi(value)));
+		} else if (StringIsEqual(line, "Range")) {
 			char *endptr;
 
 			unsigned start_ms = strtoul(value, &endptr, 10);
@@ -127,13 +133,13 @@ song_load(TextFile &file, const char *uri,
 				? strtoul(endptr + 1, nullptr, 10)
 				: 0;
 
-			song->SetStartTime(SongTime::FromMS(start_ms));
-			song->SetEndTime(SongTime::FromMS(end_ms));
+			song.SetStartTime(SongTime::FromMS(start_ms));
+			song.SetEndTime(SongTime::FromMS(end_ms));
 		} else {
 			throw FormatRuntimeError("unknown line in db: %s", line);
 		}
 	}
 
-	song->SetTag(tag.Commit());
+	song.SetTag(tag.Commit());
 	return song;
 }

src/SongSave.hxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -40,10 +40,11 @@ song_save(BufferedOutputStream &os, const DetachedSong &song);
  * Loads a song from the input file.  Reading stops after the
  * "song_end" line.
  *
- * Throws #std::runtime_error on error.
+ * Throws on error.
  */
-std::unique_ptr<DetachedSong>
+DetachedSong
 song_load(TextFile &file, const char *uri,
+	  std::string *target_r=nullptr,
 	  AudioFormat *audio_format_r=nullptr);
 
 #endif

src/SongUpdate.cxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2020 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -23,36 +23,32 @@
 #include "db/plugins/simple/Directory.hxx"
 #include "storage/StorageInterface.hxx"
 #include "storage/FileInfo.hxx"
-#include "util/UriUtil.hxx"
 #include "fs/AllocatedPath.hxx"
 #include "fs/FileInfo.hxx"
 #include "tag/Builder.hxx"
 #include "TagFile.hxx"
 #include "TagStream.hxx"
+#include "util/UriExtract.hxx"
 
 #ifdef ENABLE_ARCHIVE
 #include "TagArchive.hxx"
 #endif
 
-#include <exception>
+#include <cassert>
 
-#include <assert.h>
 #include <string.h>
 
 #ifdef ENABLE_DATABASE
 
-Song *
-Song::LoadFile(Storage &storage, const char *path_utf8,
-	       Directory &parent) noexcept
+SongPtr
+Song::LoadFile(Storage &storage, const char *path_utf8, Directory &parent)
 {
 	assert(!uri_has_scheme(path_utf8));
-	assert(strchr(path_utf8, '\n') == nullptr);
+	assert(std::strchr(path_utf8, '\n') == nullptr);
 
-	Song *song = NewFile(path_utf8, parent);
-	if (!song->UpdateFile(storage)) {
-		song->Free();
+	auto song = std::make_unique<Song>(path_utf8, parent);
+	if (!song->UpdateFile(storage))
 		return nullptr;
-	}
 
 	return song;
 }
@@ -62,17 +58,11 @@ Song::LoadFile(Storage &storage, const char *path_utf8,
 #ifdef ENABLE_DATABASE
 
 bool
-Song::UpdateFile(Storage &storage) noexcept
+Song::UpdateFile(Storage &storage)
 {
 	const auto &relative_uri = GetURI();
 
-	StorageFileInfo info;
-	try {
-		info = storage.GetInfo(relative_uri.c_str(), true);
-	} catch (...) {
-		return false;
-	}
-
+	const auto info = storage.GetInfo(relative_uri.c_str(), true);
 	if (!info.IsRegular())
 		return false;
 
@@ -105,19 +95,16 @@ Song::UpdateFile(Storage &storage) noexcept
 
 #ifdef ENABLE_ARCHIVE
 
-Song *
+SongPtr
 Song::LoadFromArchive(ArchiveFile &archive, const char *name_utf8,
 		      Directory &parent) noexcept
 {
 	assert(!uri_has_scheme(name_utf8));
-	assert(strchr(name_utf8, '\n') == nullptr);
+	assert(std::strchr(name_utf8, '\n') == nullptr);
 
-	Song *song = NewFile(name_utf8, parent);
-
-	if (!song->UpdateFileInArchive(archive)) {
-		song->Free();
+	auto song = std::make_unique<Song>(name_utf8, parent);
+	if (!song->UpdateFileInArchive(archive))
 		return nullptr;
-	}
 
 	return song;
 }
@@ -125,12 +112,11 @@ Song::LoadFromArchive(ArchiveFile &archive, const char *name_utf8,
 bool
 Song::UpdateFileInArchive(ArchiveFile &archive) noexcept
 {
-	assert(parent != nullptr);
-	assert(parent->device == DEVICE_INARCHIVE);
+	assert(parent.device == DEVICE_INARCHIVE);
 
-	std::string path_utf8(uri);
+	std::string path_utf8(filename);
 
-	for (const Directory *directory = parent;
+	for (const Directory *directory = &parent;
 	     directory->parent != nullptr &&
 		     directory->parent->device == DEVICE_INARCHIVE;
 	     directory = directory->parent) {
@@ -151,10 +137,10 @@ Song::UpdateFileInArchive(ArchiveFile &archive) noexcept
 #endif /* ENABLE_DATABASE */
 
 bool
-DetachedSong::LoadFile(Path path) noexcept
+DetachedSong::LoadFile(Path path)
 {
-	FileInfo fi;
-	if (!GetFileInfo(path, fi) || !fi.IsRegular())
+	const FileInfo fi(path);
+	if (!fi.IsRegular())
 		return false;
 
 	TagBuilder tag_builder;
@@ -173,13 +159,11 @@ DetachedSong::LoadFile(Path path) noexcept
 }
 
 bool
-DetachedSong::Update() noexcept
+DetachedSong::Update()
 {
 	if (IsAbsoluteFile()) {
 		const AllocatedPath path_fs =
-			AllocatedPath::FromUTF8(GetRealURI());
-		if (path_fs.IsNull())
-			return false;
+			AllocatedPath::FromUTF8Throw(GetRealURI());
 
 		return LoadFile(path_fs);
 	} else if (IsRemote()) {