strfsong: implement "%disc%"

https://bugs.musicpd.org/view.php?id=4479

diff --git a/NEWS b/NEWS
index 70cf71b704bcf5521a4d02297ee7421758db000d..2d326e731bb2b29bbd49febd702fc8c3840d4dca 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,5 @@
 ncmpc 0.25 - not yet released
+* implement "%disc%"
 * lyricswiki: handle redirects
 * lyricswiki: update XML format
 

diff --git a/doc/ncmpc.1 b/doc/ncmpc.1
index 69e591945f23b03c9ecb698781eeb9d5df3b9e0a..77119635220b3d0d631fb6ccd00823db7a7bb420 100644 (file)
--- a/doc/ncmpc.1
+++ b/doc/ncmpc.1
@@ -249,7 +249,9 @@ You can view ncmpc's key bindings by pressing '1' (help) when
 ncmpc is running. To edit key bindings press 'K' and use the key editor in ncmpc.
 .SH "SONG FORMAT"
 Format of song display for status and the list window.
-The metadata delimiters are: %artist%, %albumartist%, %composer%, %performer%, %title%, %album%, %shortalbum%, %track%, %genre%, %name%, %time%, %date%, %file%, %shortfile%.
+The metadata delimiters are: %artist%, %albumartist%, %composer%,
+%performer%, %title%, %album%, %shortalbum%, %track%, %disc,
+%genre%, %name%, %time%, %date%, %file%, %shortfile%.
 
 The [] operators are used to group output such that if none of the metadata delimiters between '[' and ']' are matched, then none of the characters between '[' and ']' are output; literal text is always output. '&' and '|' are logical operators for AND and OR. '#' is used to escape characters.
 

diff --git a/src/strfsong.c b/src/strfsong.c
index 5107ba0bd2606f9a8cc28fecf9159701b0b3988a..2d88d1f4b9e16908ea5a9c08d38494d5e494d9dd 100644 (file)
--- a/src/strfsong.c
+++ b/src/strfsong.c
@@ -232,6 +232,8 @@ _strfsong(gchar *s,
                }
                else if (strncmp("%track%", p, n) == 0)
                        temp = song_tag_locale(song, MPD_TAG_TRACK);
+               else if (strncmp("%disc%", p, n) == 0)
+                       temp = song_tag_locale(song, MPD_TAG_DISC);
                else if (strncmp("%name%", p, n) == 0)
                        temp = song_tag_locale(song, MPD_TAG_NAME);
                else if (strncmp("%date%", p, n) == 0)