diff --git a/src/screen_lyrics.c b/src/screen_lyrics.c
index 0819f91424b9d6917cbefff5ed78e29ff996165e..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"
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
+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
lyrics_screen_init(WINDOW *w, int cols, int rows)
{
static void
lyrics_screen_init(WINDOW *w, int cols, int rows)
{
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
n = snprintf(str, size, "%s: %s - %s",
_("Lyrics"),
current.artist, current.title);
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);
snprintf(str + n, size - n, " (%s)",
current.plugin_name);
+
return str;
} else
return _("Lyrics");
return str;
} else
return _("Lyrics");
}
return true;
case CMD_SELECT:
}
return true;
case CMD_SELECT:
- 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);
- }
+ screen_lyrics_reload();
return true;
#ifdef ENABLE_SONG_SCREEN
return true;
#ifdef ENABLE_SONG_SCREEN