implement the "lyrics-timeout" config option

diff --git a/doc/ncmpc.1 b/doc/ncmpc.1
index 7ad0c61dc8735d09c2485221db5ab62fdc7e4617..24c0007f7dd18d8c6d2f1ffade8a41f2e68c09d9 100644 (file)
--- a/doc/ncmpc.1
+++ b/doc/ncmpc.1
@@ -119,7 +119,7 @@ Default crossfade time in seconds
 Seek forward/backward by NUM seconds.
 .TP 
 .B lyrics\-timeout = NUM
-Quits downloading lyrics of a song after the timeout of NUM seconds is reached.
+Quits downloading lyrics of a song after the timeout of NUM seconds is reached, if NUM is greater than zero.
 .TP
 .B jump\-prefix\-only = yes|no
 When using the jump command, search for the prefix of an entry. That means typing "m" will start to the first entry which begins with "m".

diff --git a/src/screen_lyrics.c b/src/screen_lyrics.c
index ec723e9e2ee98e5820c9c6adaf3ccf907e5261d3..0819f91424b9d6917cbefff5ed78e29ff996165e 100644 (file)
--- a/src/screen_lyrics.c
+++ b/src/screen_lyrics.c
@@ -48,6 +48,8 @@ static struct {
        char *artist, *title, *plugin_name;
 
        struct plugin_cycle *loader;
+
+       guint loader_timeout;
 } current;
 
 static void
@@ -58,6 +60,11 @@ screen_lyrics_abort(void)
                current.loader = NULL;
        }
 
+       if (current.loader_timeout != 0) {
+               g_source_remove(current.loader_timeout);
+               current.loader_timeout = 0;
+       }
+
        if (current.plugin_name != NULL) {
                g_free(current.plugin_name);
                current.plugin_name = NULL;
@@ -189,8 +196,26 @@ screen_lyrics_callback(const GString *result, const bool success,
                screen_status_message (_("No lyrics"));
        }
 
+       if (current.loader_timeout != 0) {
+               g_source_remove(current.loader_timeout);
+               current.loader_timeout = 0;
+       }
+
+       plugin_stop(current.loader);
+       current.loader = NULL;
+}
+
+static gboolean
+screen_lyrics_timeout_callback(gpointer G_GNUC_UNUSED data)
+{
        plugin_stop(current.loader);
        current.loader = NULL;
+
+       screen_status_printf(_("Lyrics timeout occurred after %d seconds"),
+                            options.lyrics_timeout);
+
+       current.loader_timeout = 0;
+       return FALSE;
 }
 
 static void
@@ -212,6 +237,13 @@ screen_lyrics_load(const struct mpd_song *song)
 
        current.loader = lyrics_load(current.artist, current.title,
                                     screen_lyrics_callback, NULL);
+
+       if (options.lyrics_timeout != 0) {
+               current.loader_timeout =
+                       g_timeout_add_seconds(options.lyrics_timeout,
+                                             screen_lyrics_timeout_callback,
+                                             NULL);
+       }
 }
 
 static void