screen: remove unnecessary doupdate() call from screen_init()

[ncmpc.git] / src / screen_browser.c

diff --git a/src/screen_browser.c b/src/screen_browser.c
index 0835241ed2c9f46852c257620f70d1baa51bd14d..c38ae9ea81490f539723a4e7e6dd2e8da0fc76d8 100644 (file)
--- a/src/screen_browser.c
+++ b/src/screen_browser.c
@@ -1,5 +1,5 @@
 /* ncmpc (Ncurses MPD Client)
- * (c) 2004-2010 The Music Player Daemon Project
+ * (c) 2004-2017 The Music Player Daemon Project
  * Project homepage: http://musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -378,7 +378,7 @@ browser_handle_mouse_event(struct screen_browser *browser, struct mpdclient *c)
 
 static void
 screen_browser_paint_callback(WINDOW *w, unsigned i, unsigned y,
-                             unsigned width, bool selected, void *data);
+                             unsigned width, bool selected, const void *data);
 
 bool
 browser_cmd(struct screen_browser *browser,
@@ -403,8 +403,9 @@ browser_cmd(struct screen_browser *browser,
                            browser->filelist);
                return true;
        case CMD_LIST_JUMP:
-               screen_jump(browser->lw, browser_lw_callback,
-                           screen_browser_paint_callback, browser->filelist);
+               screen_jump(browser->lw,
+                           browser_lw_callback, browser->filelist,
+                           screen_browser_paint_callback, browser);
                return true;
 
 #ifdef HAVE_GETMOUSE
@@ -503,14 +504,15 @@ screen_browser_paint_playlist(WINDOW *w, unsigned width,
 static void
 screen_browser_paint_callback(WINDOW *w, unsigned i,
                              unsigned y, unsigned width,
-                             bool selected, void *data)
+                             bool selected, const void *data)
 {
-       const struct filelist *fl = (const struct filelist *) data;
+       const struct screen_browser *browser = (const struct screen_browser *) data;
 
-       assert(fl != NULL);
-       assert(i < filelist_length(fl));
+       assert(browser != NULL);
+       assert(browser->filelist != NULL);
+       assert(i < filelist_length(browser->filelist));
 
-       const struct filelist_entry *entry = filelist_get(fl, i);
+       const struct filelist_entry *entry = filelist_get(browser->filelist, i);
        assert(entry != NULL);
 
        const struct mpd_entity *entity = entry->entity;
@@ -539,7 +541,7 @@ screen_browser_paint_callback(WINDOW *w, unsigned i,
 
        case MPD_ENTITY_TYPE_SONG:
                paint_song_row(w, y, width, selected, highlight,
-                              mpd_entity_get_song(entity), NULL);
+                              mpd_entity_get_song(entity), NULL, browser->song_format);
                break;
 
        case MPD_ENTITY_TYPE_PLAYLIST:
@@ -559,5 +561,5 @@ void
 screen_browser_paint(const struct screen_browser *browser)
 {
        list_window_paint2(browser->lw, screen_browser_paint_callback,
-                          browser->filelist);
+                          browser);
 }