diff --git a/src/screen_lyrics.c b/src/screen_lyrics.c
index ec723e9e2ee98e5820c9c6adaf3ccf907e5261d3..6de59d5ef073869bb109728e91d36cdd524f6987 100644 (file)
--- a/src/screen_lyrics.c
+++ b/src/screen_lyrics.c
/* ncmpc (Ncurses MPD Client)
* (c) 2004-2010 The Music Player Daemon Project
* Project homepage: http://musicpd.org
-
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
-
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
-
+ *
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
+ */
#include "screen_lyrics.h"
#include "screen_interface.h"
-#include "screen_message.h"
+#include "screen_status.h"
#include "screen_file.h"
#include "screen_song.h"
#include "i18n.h"
char *artist, *title, *plugin_name;
struct plugin_cycle *loader;
+
+ guint loader_timeout;
} current;
static 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;
if (current.title != NULL) {
g_free(current.title);
- current.artist = NULL;
+ current.title = NULL;
}
if (current.song != NULL) {
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
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
mpd_song_get_uri(current.song)) != 0))
screen_lyrics_load(next_song_c);
- if (next_song != NULL)
+ if (next_song != NULL) {
mpd_song_free(next_song);
- next_song = NULL;
+ next_song = NULL;
+ }
}
static void
n = snprintf(str, size, "%s: %s - %s",
_("Lyrics"),
current.artist, current.title);
- if (options.lyrics_show_plugin && current.plugin_name != NULL)
+
+ if (options.lyrics_show_plugin && current.plugin_name != NULL &&
+ (unsigned int) n < size - 1)
snprintf(str + n, size - n, " (%s)",
current.plugin_name);
+
return str;
} else
return _("Lyrics");