Renamed %basename% format %shortfile%

git-svn-id: https://svn.musicpd.org/ncmpc/trunk@1498 09075e82-0dd4-0310-85a5-a0d7c8717e4f

diff --git a/doc/config.sample b/doc/config.sample
index ecbc8cc41b2d415a01c7ab330e43b4cf338086f4..b0097dce1f1522447bacc75e1dae496a60e058bd 100644 (file)
--- a/doc/config.sample
+++ b/doc/config.sample
@@ -12,7 +12,7 @@
 #list-format = "%name%|[%artist% - ]%title%|%file%"
 
 ## status-format
-#status-format = "[%artist% - ]%title%|%basename%"
+#status-format = "[%artist% - ]%title%|%shortfile%"
 
 
 ##

diff --git a/src/ncmpc.h b/src/ncmpc.h
index 64160531f2f310aa9f75c7448162d52476ea2ca9..6efe55af60a8f2760a25f9c9a87a027576daa4b6 100644 (file)
--- a/src/ncmpc.h
+++ b/src/ncmpc.h
@@ -43,7 +43,7 @@
 #define LIST_FORMAT (options.list_format ? options.list_format : DEFAULT_LIST_FORMAT)
 
 /* song format - status window */
-#define DEFAULT_STATUS_FORMAT "[%artist% - ]%title%|%basename%"
+#define DEFAULT_STATUS_FORMAT "[%artist% - ]%title%|%shortfile%"
 #define STATUS_FORMAT (options.status_format ? options.status_format : DEFAULT_STATUS_FORMAT)
 
 #endif /* NCMPC_H */

diff --git a/src/strfsong.c b/src/strfsong.c
index a7eb011f87b77a448e3eaabeaff81e293a3e0559..8014472767c1361fcc69a0dac17f5013968ff4bd 100644 (file)
--- a/src/strfsong.c
+++ b/src/strfsong.c
@@ -145,7 +145,7 @@ _strfsong(gchar *s,
       n = end - p + 1;
       if(*end != '%')
        n--;
-      else if (strncmp("%basename%", p, n) == 0)
+      else if (strncmp("%shortfile%", p, n) == 0)
        temp = utf8_to_locale(basename(song->file));
       else if (strncmp("%file%", p, n) == 0)
        temp = utf8_to_locale(song->file);