diff --git a/src/screen_lyrics.c b/src/screen_lyrics.c
index 931b114fb86eb789d697ef4a5b7e827ac5f3361a..d83bf5b36b993d9acfdca8cd8d2356aa8f3873d5 100644 (file)
--- a/src/screen_lyrics.c
+++ b/src/screen_lyrics.c
g_ptr_array_set_size(current.lines, 0);
}
-static const char *
-list_callback(unsigned idx, int *highlight, void *data);
+static void
+lyrics_paint(mpdclient_t *c);
+
+/**
+ * Repaint and update the screen.
+ */
+static void
+lyrics_repaint(void)
+{
+ lyrics_paint(NULL);
+ wrefresh(lw->w);
+}
+
+/**
+ * Repaint and update the screen, if it is currently active.
+ */
+static void
+lyrics_repaint_if_active(void)
+{
+ if (get_cur_mode_id() == 104) { /* XXX don't use the literal number */
+ lyrics_repaint();
+
+ /* XXX repaint the screen title */
+ }
+}
static void
screen_lyrics_set(const GString *str)
/* paint new data */
- if (get_cur_mode_id() == 104) { /* XXX don't use the literal number */
- list_window_paint(lw, list_callback, NULL);
- wrefresh(lw->w);
-
- /* XXX repaint the screen title */
- }
+ lyrics_repaint_if_active();
}
static void
list_window_paint(lw, list_callback, NULL);
}
-
-static void
-lyrics_update(mpd_unused screen_t *screen, mpd_unused mpdclient_t *c)
-{
- if( lw->repaint ) {
- list_window_paint(lw, list_callback, NULL);
- lw->repaint = 0;
- }
-}
-
-
static int
lyrics_cmd(screen_t *screen, mpdclient_t *c, command_t cmd)
{
- if (list_window_scroll_cmd(lw, current.lines->len, cmd))
+ if (list_window_scroll_cmd(lw, current.lines->len, cmd)) {
+ lyrics_repaint();
return 1;
+ }
switch(cmd) {
case CMD_INTERRUPT:
case CMD_LYRICS_UPDATE:
if (c->song != NULL) {
screen_lyrics_load(c->song);
- lyrics_paint(NULL);
- wrefresh(lw->w);
+ lyrics_repaint();
}
return 1;
default:
cmd, list_callback, NULL)) {
/* center the row */
list_window_center(lw, current.lines->len, lw->selected);
+ lyrics_repaint();
return 1;
}
.close = NULL,
.resize = lyrics_resize,
.paint = lyrics_paint,
- .update = lyrics_update,
.cmd = lyrics_cmd,
.get_title = lyrics_title,
};