aboutsummaryrefslogtreecommitdiffstats
path: root/src/ncmpc.h
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2008-10-02 16:15:56 +0200
committerMax Kellermann <max@duempel.org>2008-10-02 16:15:56 +0200
commitb543b982624593ab767d0734b08d053662434380 (patch)
treead487ad3058b36c92d646b957d1304963e78a42e /src/ncmpc.h
parent36470979d9f3518217fc26987558dafb3ab36f5c (diff)
downloadmpd-b543b982624593ab767d0734b08d053662434380.tar.gz
mpd-b543b982624593ab767d0734b08d053662434380.tar.xz
mpd-b543b982624593ab767d0734b08d053662434380.zip
options: initialize options.list_format
Instead of checking whether options.list_format is set in the LIST_FORMAT macro, initialize it once with options.list_format. Same for options.status_format / STATUS_FORMAT.
Diffstat (limited to '')
-rw-r--r--src/ncmpc.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/ncmpc.h b/src/ncmpc.h
index ad6a6e302..746bc8beb 100644
--- a/src/ncmpc.h
+++ b/src/ncmpc.h
@@ -47,14 +47,12 @@
/* song format - list window */
#define DEFAULT_LIST_FORMAT "%name%|[%artist% - ]%title%|%shortfile%"
-#define LIST_FORMAT (options.list_format ? options.list_format : \
- DEFAULT_LIST_FORMAT)
+#define LIST_FORMAT options.list_format
/* song format - status window */
#define DEFAULT_STATUS_FORMAT "[%artist% - ]%title%|%shortfile%"
-#define STATUS_FORMAT (options.status_format ? options.status_format : \
- DEFAULT_STATUS_FORMAT)
-
+#define STATUS_FORMAT options.status_format
+
#define DEFAULT_LYRICS_TIMEOUT 100
#define DEFAULT_SCROLL TRUE