diff options
| -rw-r--r-- | src/ncmpc.h | 8 | ||||
| -rw-r--r-- | src/options.c | 2 |
2 files changed, 5 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 diff --git a/src/options.c b/src/options.c index 5b2b47c47..f6e206aea 100644 --- a/src/options.c +++ b/src/options.c @@ -333,6 +333,8 @@ options_init( void ) options.port = DEFAULT_PORT; /* default option values */ + options.list_format = g_strdup(DEFAULT_LIST_FORMAT); + options.status_format = g_strdup(DEFAULT_STATUS_FORMAT); options.reconnect = TRUE; options.find_wrap = TRUE; options.wide_cursor = TRUE; |