From cb6282e0a7360c21ecc7b7a86a5eb04d0703a143 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 10 Apr 2019 11:36:03 +0200 Subject: [PATCH 1/6] doc/developer.rst: remove mailing list, refer to GitHub instead --- doc/developer.rst | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/doc/developer.rst b/doc/developer.rst index c75305521..630ca3399 100644 --- a/doc/developer.rst +++ b/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 `_ - -:program:`git pull` requests are preferred. +Submit pull requests on GitHub: +https://github.com/MusicPlayerDaemon/MPD/pulls Development Tools ================= From 1bc78e9f2c9e459a52ca7fa2d44a59b297a86d0d Mon Sep 17 00:00:00 2001 From: cotko Date: Sat, 6 Apr 2019 12:26:40 +0200 Subject: [PATCH 2/6] Fid move doc args --- doc/protocol.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/protocol.rst b/doc/protocol.rst index c103efe64..47b6cabee 100644 --- a/doc/protocol.rst +++ b/doc/protocol.rst @@ -599,7 +599,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. From 6cbd77fc574e6edfbaa0b3ea4878c83f0bae1b49 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 10 Apr 2019 16:30:21 +0200 Subject: [PATCH 3/6] doc/protocol.rst: mention "in seconds" where it was missing Closes https://github.com/MusicPlayerDaemon/MPD/issues/523 --- doc/protocol.rst | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/protocol.rst b/doc/protocol.rst index 47b6cabee..d07b0a4bb 100644 --- a/doc/protocol.rst +++ b/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 From f4b5a28596049e4a7add507ef30e86cb70c59827 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 10 Apr 2019 16:33:17 +0200 Subject: [PATCH 4/6] doc/protocol: mention that stickers are only implemented for songs Closes https://github.com/MusicPlayerDaemon/MPD/issues/524 --- doc/protocol.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/protocol.rst b/doc/protocol.rst index d07b0a4bb..5ccbaa92f 100644 --- a/doc/protocol.rst +++ b/doc/protocol.rst @@ -1054,7 +1054,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. From b4fcbdb235881e71ff59a36fdcb05a984d718a65 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 10 Apr 2019 16:34:40 +0200 Subject: [PATCH 5/6] systemd/socket: use %t instead of hard-coding /run This allows using the file as a user unit, where "%t" maps to "$XDG_RUNTIME_DIR". Proposed in https://github.com/MusicPlayerDaemon/MPD/issues/530 --- systemd/system/mpd.socket | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/systemd/system/mpd.socket b/systemd/system/mpd.socket index c4692592c..56c4a27fc 100644 --- a/systemd/system/mpd.socket +++ b/systemd/system/mpd.socket @@ -1,5 +1,5 @@ [Socket] -ListenStream=/run/mpd/socket +ListenStream=%t/mpd/socket ListenStream=6600 Backlog=5 KeepAlive=true From fe8621906d077344dc5439d5fc786a26a058c17e Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 10 Apr 2019 16:37:13 +0200 Subject: [PATCH 6/6] systemd: add user socket unit Copy the system socket unit to the "user" directory. Closes https://github.com/MusicPlayerDaemon/MPD/issues/530 --- NEWS | 1 + systemd/user/meson.build | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/NEWS b/NEWS index 83362a28d..e0d567722 100644 --- a/NEWS +++ b/NEWS @@ -4,6 +4,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 diff --git a/systemd/user/meson.build b/systemd/user/meson.build index b1e94b14f..fdce339e4 100644 --- a/systemd/user/meson.build +++ b/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',