diff --git a/src/screen_lyrics.c b/src/screen_lyrics.c
index ba197a04c22a54905f3eba51fd217662aa62c3e3..a8c721068542563a57713d8c1503733b0e07fac5 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
/* 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 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.
* 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.
* 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_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"
#include "screen_file.h"
#include "screen_song.h"
#include "i18n.h"
static struct {
struct mpd_song *song;
static struct {
struct mpd_song *song;
- char *artist, *title;
+ char *artist, *title, *plugin_name;
struct plugin_cycle *loader;
struct plugin_cycle *loader;
+
+ guint loader_timeout;
} current;
static void
} current;
static void
current.loader = NULL;
}
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.artist != NULL) {
g_free(current.artist);
current.artist = NULL;
if (current.artist != NULL) {
g_free(current.artist);
current.artist = NULL;
if (current.title != NULL) {
g_free(current.title);
if (current.title != NULL) {
g_free(current.title);
- current.artist = NULL;
+ current.title = NULL;
}
if (current.song != NULL) {
}
if (current.song != NULL) {
}
}
}
}
+static void
+path_lyr_file(char *path, size_t size,
+ const char *artist, const char *title)
+{
+ snprintf(path, size, "%s/.lyrics/%s - %s.txt",
+ getenv("HOME"), artist, title);
+}
+
static bool
exists_lyr_file(const char *artist, const char *title)
{
char path[1024];
struct stat result;
static bool
exists_lyr_file(const char *artist, const char *title)
{
char path[1024];
struct stat result;
- snprintf(path, 1024, "%s/.lyrics/%s - %s.txt",
- getenv("HOME"), artist, title);
+ path_lyr_file(path, 1024, artist, title);
return (stat(path, &result) == 0);
}
return (stat(path, &result) == 0);
}
getenv("HOME"));
mkdir(path, S_IRWXU);
getenv("HOME"));
mkdir(path, S_IRWXU);
- snprintf(path, 1024, "%s/.lyrics/%s - %s.txt",
- getenv("HOME"), artist, title);
+ path_lyr_file(path, 1024, artist, title);
return fopen(path, "w");
}
return fopen(path, "w");
}
return 0;
}
return 0;
}
+static int
+delete_lyr_hd(void)
+{
+ char path[1024];
+
+ if (!exists_lyr_file(current.artist, current.title))
+ return -1;
+
+ path_lyr_file(path, 1024, current.artist, current.title);
+ if (unlink(path) != 0)
+ return -2;
+
+ return 0;
+}
+
static void
screen_lyrics_set(const GString *str)
{
static void
screen_lyrics_set(const GString *str)
{
static void
screen_lyrics_callback(const GString *result, const bool success,
static void
screen_lyrics_callback(const GString *result, const bool success,
- G_GNUC_UNUSED void *data)
+ const char *plugin_name, G_GNUC_UNUSED void *data)
{
assert(current.loader != NULL);
{
assert(current.loader != NULL);
+ current.plugin_name = g_strdup(plugin_name);
+
/* Display result, which may be lyrics or error messages */
if (result != NULL)
screen_lyrics_set(result);
/* Display result, which may be lyrics or error messages */
if (result != NULL)
screen_lyrics_set(result);
screen_status_message (_("No lyrics"));
}
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;
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
}
static void
current.loader = lyrics_load(current.artist, current.title,
screen_lyrics_callback, NULL);
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
+screen_lyrics_reload(void)
+{
+ if (current.loader == NULL && current.artist != NULL &&
+ current.title != NULL) {
+ current.loader = lyrics_load(current.artist, current.title,
+ screen_lyrics_callback, NULL);
+ screen_text_repaint(&text);
+ }
}
static void
}
static void
mpd_song_get_uri(current.song)) != 0))
screen_lyrics_load(next_song_c);
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);
mpd_song_free(next_song);
- next_song = NULL;
+ next_song = NULL;
+ }
}
static void
}
static void
return str;
} else if (current.artist != NULL && current.title != NULL &&
!screen_text_is_empty(&text)) {
return str;
} else if (current.artist != NULL && current.title != NULL &&
!screen_text_is_empty(&text)) {
- snprintf(str, size, "%s: %s - %s",
- _("Lyrics"),
- current.artist, current.title);
+ int n;
+ n = snprintf(str, size, "%s: %s - %s",
+ _("Lyrics"),
+ current.artist, current.title);
+
+ 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");
return str;
} else
return _("Lyrics");
/* lyrics for the song were saved on hard disk */
screen_status_message (_("Lyrics saved"));
return true;
/* lyrics for the song were saved on hard disk */
screen_status_message (_("Lyrics saved"));
return true;
+ case CMD_DELETE:
+ if (current.loader == NULL && current.artist != NULL &&
+ current.title != NULL) {
+ switch (delete_lyr_hd()) {
+ case 0:
+ screen_status_message (_("Lyrics deleted"));
+ break;
+ case -1:
+ screen_status_message (_("No saved lyrics"));
+ break;
+ }
+ }
+ return true;
case CMD_LYRICS_UPDATE:
if (c->song != NULL) {
screen_lyrics_load(c->song);
screen_text_repaint(&text);
}
return true;
case CMD_LYRICS_UPDATE:
if (c->song != NULL) {
screen_lyrics_load(c->song);
screen_text_repaint(&text);
}
return true;
+ case CMD_SELECT:
+ screen_lyrics_reload();
+ return true;
#ifdef ENABLE_SONG_SCREEN
case CMD_SCREEN_SONG:
#ifdef ENABLE_SONG_SCREEN
case CMD_SCREEN_SONG: