aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKalle Wallin <kaw@linux.se>2004-06-15 13:31:19 +0000
committerKalle Wallin <kaw@linux.se>2004-06-15 13:31:19 +0000
commit2cd55f67e6fd74337d48936ff4020cbe7f60c476 (patch)
tree74d27988ec10ac4aa164f319e3bcbb7978f0ceae
parentddd7adff6d0e02c31b371559cd822f3b5feba345 (diff)
downloadmpd-2cd55f67e6fd74337d48936ff4020cbe7f60c476.tar.gz
mpd-2cd55f67e6fd74337d48936ff4020cbe7f60c476.tar.xz
mpd-2cd55f67e6fd74337d48936ff4020cbe7f60c476.zip
Renamed %basename% format %shortfile%
git-svn-id: https://svn.musicpd.org/ncmpc/trunk@1498 09075e82-0dd4-0310-85a5-a0d7c8717e4f
-rw-r--r--doc/config.sample2
-rw-r--r--src/ncmpc.h2
-rw-r--r--src/strfsong.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/doc/config.sample b/doc/config.sample
index ecbc8cc41..b0097dce1 100644
--- 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 64160531f..6efe55af6 100644
--- 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 a7eb011f8..801447276 100644
--- 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);