Merge branch 'v0.21.x'

NEWS

@@ -14,6 +14,7 @@ ver 0.21.8 (not yet released)
   - httpd: fix use-after-free bug
 * fix Bonjour bug
 * fix build failure with GCC 9
+* systemd: add user socket unit
 
 ver 0.21.7 (2019/04/03)
 * input

doc/developer.rst

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

doc/protocol.rst

@@ -414,9 +414,10 @@ Querying :program:`MPD`'s status
     - ``songid``: playlist songid of the current song stopped on or playing
     - ``nextsong`` [#since_0_15]_: playlist song number of the next song to be played
     - ``nextsongid`` [#since_0_15]_: playlist songid of the next song to be played
-    - ``time``: total time elapsed (of current playing/paused song)
+    - ``time``: total time elapsed (of current playing/paused song) in seconds
       (deprecated, use ``elapsed`` instead)
-    - ``elapsed`` [#since_0_16]_: Total time elapsed within the current song, but with higher resolution.
+    - ``elapsed`` [#since_0_16]_: Total time elapsed within the
+      current song in seconds, but with higher resolution.
     - ``duration`` [#since_0_20]_: Duration of the current song in seconds.
     - ``bitrate``: instantaneous bitrate in kbps
     - ``xfade``: ``crossfade`` in seconds
@@ -437,7 +438,7 @@ Querying :program:`MPD`'s status
     - ``albums``: number of albums
     - ``songs``: number of songs
     - ``uptime``: daemon uptime in seconds
-    - ``db_playtime``: sum of all song times in the db
+    - ``db_playtime``: sum of all song times in the database in seconds
     - ``db_update``: last db update in UNIX time
     - ``playtime``: time length of music played
 
@@ -599,7 +600,7 @@ Whenever possible, ids should be used.
     Deletes the song ``SONGID`` from the
     playlist
 
-:command:`move {FROM} [{START:END} | {TO}]`
+:command:`move [{FROM} | {START:END}] {TO}`
     Moves the song at ``FROM`` or range of songs
     at ``START:END`` [#since_0_15]_ to ``TO``
     in the playlist.
@@ -1065,7 +1066,8 @@ Stickers
 "Stickers" [#since_0_15]_ are pieces of
 information attached to existing
 :program:`MPD` objects (e.g. song files,
-directories, albums).  Clients can create arbitrary name/value
+directories, albums; but currently, they are only implemented for
+song).  Clients can create arbitrary name/value
 pairs.  :program:`MPD` itself does not assume
 any special meaning in them.
 

systemd/system/mpd.socket

@@ -1,5 +1,5 @@
 [Socket]
-ListenStream=/run/mpd/socket
+ListenStream=%t/mpd/socket
 ListenStream=6600
 Backlog=5
 KeepAlive=true

systemd/user/meson.build

@@ -3,6 +3,12 @@ if systemd_user_unit_dir == ''
   systemd_user_unit_dir = join_paths(get_option('prefix'), 'lib', 'systemd', 'user')
 endif
 
+# copy the system socket unit to the "user" directory
+install_data(
+  join_paths('..', 'system', 'mpd.socket'),
+  install_dir: systemd_user_unit_dir,
+)
+
 configure_file(
   input: 'mpd.service.in',
   output: 'mpd.service',