aboutsummaryrefslogtreecommitdiffstats
path: root/src/screen_browser.c
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2008-10-02 17:48:01 +0200
committerMax Kellermann <max@duempel.org>2008-10-02 17:48:01 +0200
commit45ff31548dc68c27e1af6fdf37945de97579f5f9 (patch)
tree3b33e41d5a47ed04f6c184f6613d9c30e4d6233f /src/screen_browser.c
parent994ffdbde3b12429578a33dcf18204b9d813311f (diff)
downloadmpd-45ff31548dc68c27e1af6fdf37945de97579f5f9.tar.gz
mpd-45ff31548dc68c27e1af6fdf37945de97579f5f9.tar.xz
mpd-45ff31548dc68c27e1af6fdf37945de97579f5f9.zip
removed LIST_FORMAT, STATUS_FORMAT
Use options.list_format and options.status_format directly instead of these two macros.
Diffstat (limited to 'src/screen_browser.c')
-rw-r--r--src/screen_browser.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/screen_browser.c b/src/screen_browser.c
index ab10299c6..52285152b 100644
--- a/src/screen_browser.c
+++ b/src/screen_browser.c
@@ -18,7 +18,6 @@
*/
#include "screen_browser.h"
-#include "ncmpc.h"
#include "i18n.h"
#include "options.h"
#include "support.h"
@@ -143,7 +142,7 @@ browser_lw_callback(unsigned idx, int *highlight, void *data)
} else if( entity->type==MPD_INFO_ENTITY_TYPE_SONG ) {
mpd_Song *song = entity->info.song;
- strfsong(buf, BUFSIZE, LIST_FORMAT, song);
+ strfsong(buf, BUFSIZE, options.list_format, song);
return buf;
} else if( entity->type==MPD_INFO_ENTITY_TYPE_PLAYLISTFILE ) {
mpd_PlaylistFile *plf = entity->info.playlistFile;
@@ -233,7 +232,7 @@ enqueue_and_play(mpdclient_t *c, filelist_entry_t *entry)
char buf[BUFSIZE];
entry->flags |= HIGHLIGHT;
- strfsong(buf, BUFSIZE, LIST_FORMAT, song);
+ strfsong(buf, BUFSIZE, options.list_format, song);
screen_status_printf(_("Adding \'%s\' to playlist\n"), buf);
mpdclient_update(c); /* get song id */
} else
@@ -363,7 +362,7 @@ browser_select_entry(mpdclient_t *c, filelist_entry_t *entry,
if (mpdclient_cmd_add(c, song) == 0) {
char buf[BUFSIZE];
- strfsong(buf, BUFSIZE, LIST_FORMAT, song);
+ strfsong(buf, BUFSIZE, options.list_format, song);
screen_status_printf(_("Adding \'%s\' to playlist\n"), buf);
}
} else {