X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fscreen_lyrics.c;h=a8c721068542563a57713d8c1503733b0e07fac5;hb=c64c37477b87ec545365b8923d6f9ff745469617;hp=7b9d1df4a816fce0407093f022fb8784c5a781ea;hpb=905266256e0a564d8b5421fa9cd897901e583314;p=ncmpc.git diff --git a/src/screen_lyrics.c b/src/screen_lyrics.c index 7b9d1df..a8c7210 100644 --- a/src/screen_lyrics.c +++ b/src/screen_lyrics.c @@ -1,25 +1,25 @@ /* ncmpc (Ncurses MPD Client) - * (c) 2004-2009 The Music Player Daemon Project + * (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" @@ -45,9 +45,11 @@ static bool follow = false; static struct { struct mpd_song *song; - char *artist, *title; + char *artist, *title, *plugin_name; struct plugin_cycle *loader; + + guint loader_timeout; } current; static void @@ -58,6 +60,16 @@ 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; + } + if (current.artist != NULL) { g_free(current.artist); current.artist = NULL; @@ -65,7 +77,7 @@ screen_lyrics_abort(void) if (current.title != NULL) { g_free(current.title); - current.artist = NULL; + current.title = NULL; } if (current.song != NULL) { @@ -87,14 +99,21 @@ lyrics_repaint_if_active(void) } } +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; - snprintf(path, 1024, "%s/.lyrics/%s - %s.txt", - getenv("HOME"), artist, title); + path_lyr_file(path, 1024, artist, title); return (stat(path, &result) == 0); } @@ -108,8 +127,7 @@ create_lyr_file(const char *artist, const char *title) 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"); } @@ -132,6 +150,21 @@ store_lyr_hd(void) 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) { @@ -144,10 +177,12 @@ screen_lyrics_set(const GString *str) 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); + current.plugin_name = g_strdup(plugin_name); + /* Display result, which may be lyrics or error messages */ if (result != NULL) screen_lyrics_set(result); @@ -161,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 @@ -184,6 +237,24 @@ 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 +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 @@ -218,9 +289,10 @@ lyrics_open(struct mpdclient *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); - next_song = NULL; + next_song = NULL; + } } static void @@ -248,9 +320,16 @@ lyrics_title(char *str, size_t size) 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"); @@ -281,12 +360,28 @@ lyrics_cmd(struct mpdclient *c, command_t cmd) /* 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_SELECT: + screen_lyrics_reload(); + return true; #ifdef ENABLE_SONG_SCREEN case CMD_SCREEN_SONG: