screen_lyrics: removed the "update" method

[ncmpc.git] / src / screen_lyrics.c

diff --git a/src/screen_lyrics.c b/src/screen_lyrics.c
index cae07a73be14149fed98e75278a26c01f6b224eb..d83bf5b36b993d9acfdca8cd8d2356aa8f3873d5 100644 (file)
--- a/src/screen_lyrics.c
+++ b/src/screen_lyrics.c
@@ -76,17 +76,38 @@ screen_lyrics_clear(void)
 {
        guint i;
 
-       assert(current.loader == NULL ||
-              lyrics_result(current.loader) == LYRICS_SUCCESS);
-
-       current.song = NULL;
-
        for (i = 0; i < current.lines->len; ++i)
                g_free(g_ptr_array_index(current.lines, i));
 
        g_ptr_array_set_size(current.lines, 0);
 }
 
+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)
 {
@@ -124,32 +145,24 @@ screen_lyrics_set(const GString *str)
 
        if (*p != 0)
                g_ptr_array_add(current.lines, g_strdup(p));
+
+       /* paint new data */
+
+       lyrics_repaint_if_active();
 }
 
-static int
-screen_lyrics_poll(void)
+static void
+screen_lyrics_callback(const GString *result, mpd_unused void *data)
 {
        assert(current.loader != NULL);
 
-       switch (lyrics_result(current.loader)) {
-       case LYRICS_BUSY:
-               return 0;
-
-       case LYRICS_SUCCESS:
-               screen_lyrics_set(lyrics_get(current.loader));
-               lyrics_free(current.loader);
-               current.loader = NULL;
-               return 1;
-
-       case LYRICS_FAILED:
-               lyrics_free(current.loader);
-               current.loader = NULL;
+       if (result != NULL)
+               screen_lyrics_set(result);
+       else
                screen_status_message (_("No lyrics"));
-               return -1;
-       }
 
-       assert(0);
-       return -1;
+       lyrics_free(current.loader);
+       current.loader = NULL;
 }
 
 static void
@@ -162,17 +175,18 @@ screen_lyrics_load(struct mpd_song *song)
        screen_lyrics_abort();
        screen_lyrics_clear();
 
+       current.song = song;
+
        strfsong(buffer, sizeof(buffer), "%artist%", song);
        current.artist = g_strdup(buffer);
 
        strfsong(buffer, sizeof(buffer), "%title%", song);
        current.title = g_strdup(buffer);
 
-       current.loader = lyrics_load(current.artist, current.title);
+       current.loader = lyrics_load(current.artist, current.title,
+                                    screen_lyrics_callback, NULL);
 }
 
-static void lyrics_paint(screen_t *screen, mpdclient_t *c);
-
 static FILE *create_lyr_file(const char *artist, const char *title)
 {
        char path[1024];
@@ -207,8 +221,8 @@ static int store_lyr_hd(void)
 static const char *
 list_callback(unsigned idx, mpd_unused int *highlight, mpd_unused void *data)
 {
-       if (current.lines == NULL || idx >= current.lines->len)
-               return "";
+       if (idx >= current.lines->len)
+               return NULL;
 
        return g_ptr_array_index(current.lines, idx);
 }
@@ -246,8 +260,6 @@ lyrics_open(mpd_unused screen_t *screen, mpdclient_t *c)
 {
        if (c->song != NULL && c->song != current.song)
                screen_lyrics_load(c->song);
-       else if (current.loader != NULL)
-               screen_lyrics_poll();
 }
 
 
@@ -266,40 +278,20 @@ lyrics_title(char *str, size_t size)
 }
 
 static void
-lyrics_paint(mpd_unused screen_t *screen, mpd_unused mpdclient_t *c)
+lyrics_paint(mpd_unused mpdclient_t *c)
 {
-       lw->clear = 1;
        list_window_paint(lw, list_callback, NULL);
-       wrefresh(lw->w);
 }
 
-
-static void
-lyrics_update(mpd_unused screen_t *screen, mpd_unused mpdclient_t *c)
-{
-       if( lw->repaint ) {
-               list_window_paint(lw, list_callback, NULL);
-               wrefresh(lw->w);
-               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_SELECT:
-               /* XXX */
-               if (current.loader != NULL) {
-                       int ret = screen_lyrics_poll();
-                       if (ret != 0)
-                               lyrics_paint(NULL, NULL);
-               }
-               return 1;
        case CMD_INTERRUPT:
                if (current.loader != NULL) {
                        screen_lyrics_abort();
@@ -314,7 +306,7 @@ lyrics_cmd(screen_t *screen, mpdclient_t *c, command_t cmd)
        case CMD_LYRICS_UPDATE:
                if (c->song != NULL) {
                        screen_lyrics_load(c->song);
-                       lyrics_paint(NULL, NULL);
+                       lyrics_repaint();
                }
                return 1;
        default:
@@ -327,6 +319,7 @@ lyrics_cmd(screen_t *screen, mpdclient_t *c, command_t cmd)
                        cmd, list_callback, NULL)) {
                /* center the row */
                list_window_center(lw, current.lines->len, lw->selected);
+               lyrics_repaint();
                return 1;
        }
 
@@ -340,7 +333,6 @@ const struct screen_functions screen_lyrics = {
        .close = NULL,
        .resize = lyrics_resize,
        .paint = lyrics_paint,
-       .update = lyrics_update,
        .cmd = lyrics_cmd,
        .get_title = lyrics_title,
 };