![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/screen_lyrics.c b/src/screen_lyrics.c
index 931b114fb86eb789d697ef4a5b7e827ac5f3361a..93a47cc8d3f3bae0b3a45094c5e7f7aa225e4a61 100644 (file)
--- a/src/screen_lyrics.c
+++ b/src/screen_lyrics.c
*
*/
-#include "config.h"
-#ifndef DISABLE_LYRICS_SCREEN
#include <sys/stat.h>
-#include "ncmpc.h"
+#include "i18n.h"
#include "options.h"
#include "mpdclient.h"
#include "command.h"
#include "screen_utils.h"
#include "strfsong.h"
#include "lyrics.h"
-#include "gcc.h"
+#include "charset.h"
#define _GNU_SOURCE
#include <stdlib.h>
#include <string.h>
#include <glib.h>
-#include <ncurses.h>
#include <unistd.h>
#include <stdio.h>
static list_window_t *lw = NULL;
+static const struct mpd_song *next_song;
+
static struct {
- const struct mpd_song *song;
+ struct mpd_song *song;
char *artist, *title;
current.artist = NULL;
}
- current.song = NULL;
+ if (current.song != NULL) {
+ mpd_freeSong(current.song);
+ current.song = NULL;
+ }
}
static void
{
guint i;
+ list_window_reset(lw);
+
for (i = 0; i < current.lines->len; ++i)
g_free(g_ptr_array_index(current.lines, i));
g_ptr_array_set_size(current.lines, 0);
}
-static const char *
-list_callback(unsigned idx, int *highlight, void *data);
+static void
+lyrics_paint(void);
+
+/**
+ * Repaint and update the screen.
+ */
+static void
+lyrics_repaint(void)
+{
+ lyrics_paint();
+ wrefresh(lw->w);
+}
+
+/**
+ * Repaint and update the screen, if it is currently active.
+ */
+static void
+lyrics_repaint_if_active(void)
+{
+ if (screen_is_visible(&screen_lyrics)) {
+ lyrics_repaint();
+
+ /* XXX repaint the screen title */
+ }
+}
static void
screen_lyrics_set(const GString *str)
/* paint new data */
- if (get_cur_mode_id() == 104) { /* XXX don't use the literal number */
- list_window_paint(lw, list_callback, NULL);
- wrefresh(lw->w);
-
- /* XXX repaint the screen title */
- }
+ lyrics_repaint_if_active();
}
static void
-screen_lyrics_callback(const GString *result, mpd_unused void *data)
+screen_lyrics_callback(const GString *result, G_GNUC_UNUSED void *data)
{
assert(current.loader != NULL);
}
static void
-screen_lyrics_load(struct mpd_song *song)
+screen_lyrics_load(const struct mpd_song *song)
{
char buffer[MAX_SONGNAME_LENGTH];
screen_lyrics_abort();
screen_lyrics_clear();
- current.song = song;
+ current.song = mpd_songDup(song);
strfsong(buffer, sizeof(buffer), "%artist%", song);
current.artist = g_strdup(buffer);
}
static const char *
-list_callback(unsigned idx, mpd_unused int *highlight, mpd_unused void *data)
+list_callback(unsigned idx, G_GNUC_UNUSED int *highlight,
+ G_GNUC_UNUSED void *data)
{
+ static char buffer[256];
+ char *value;
+
if (idx >= current.lines->len)
return NULL;
- return g_ptr_array_index(current.lines, idx);
+ value = utf8_to_locale(g_ptr_array_index(current.lines, idx));
+ g_strlcpy(buffer, value, sizeof(buffer));
+ free(value);
+
+ return buffer;
}
}
static void
-lyrics_open(mpd_unused screen_t *screen, mpdclient_t *c)
+lyrics_open(mpdclient_t *c)
{
- if (c->song != NULL && c->song != current.song)
- screen_lyrics_load(c->song);
+ if (next_song == NULL)
+ next_song = c->song;
+
+ if (next_song != NULL &&
+ (current.song == NULL ||
+ strcmp(next_song->file, current.song->file) != 0))
+ screen_lyrics_load(next_song);
+
+ next_song = NULL;
}
static const char *
lyrics_title(char *str, size_t size)
{
- if (current.loader != NULL)
- return "Lyrics (loading)";
- else if (current.artist != NULL && current.title != NULL &&
- current.lines->len > 0) {
- snprintf(str, size, "Lyrics: %s - %s",
+ if (current.loader != NULL) {
+ snprintf(str, size, "%s (%s)",
+ _("Lyrics"), _("loading..."));
+ return str;
+ } else if (current.artist != NULL && current.title != NULL &&
+ current.lines->len > 0) {
+ snprintf(str, size, "%s: %s - %s",
+ _("Lyrics"),
current.artist, current.title);
return str;
} else
- return "Lyrics";
+ return _("Lyrics");
}
static void
-lyrics_paint(mpd_unused mpdclient_t *c)
+lyrics_paint(void)
{
list_window_paint(lw, list_callback, NULL);
}
-
-static void
-lyrics_update(mpd_unused screen_t *screen, mpd_unused mpdclient_t *c)
+static bool
+lyrics_cmd(mpdclient_t *c, command_t cmd)
{
- if( lw->repaint ) {
- list_window_paint(lw, list_callback, NULL);
- lw->repaint = 0;
+ if (list_window_scroll_cmd(lw, current.lines->len, cmd)) {
+ lyrics_repaint();
+ return true;
}
-}
-
-
-static int
-lyrics_cmd(screen_t *screen, mpdclient_t *c, command_t cmd)
-{
- if (list_window_scroll_cmd(lw, current.lines->len, cmd))
- return 1;
switch(cmd) {
case CMD_INTERRUPT:
screen_lyrics_abort();
screen_lyrics_clear();
}
- return 1;
+ return true;
case CMD_ADD:
if (current.loader == NULL && current.artist != NULL &&
current.title != NULL && store_lyr_hd() == 0)
- screen_status_message (_("Lyrics saved!"));
- return 1;
+ screen_status_message (_("Lyrics saved"));
+ return true;
case CMD_LYRICS_UPDATE:
if (c->song != NULL) {
screen_lyrics_load(c->song);
- lyrics_paint(NULL);
- wrefresh(lw->w);
+ lyrics_repaint();
+ }
+ return true;
+
+#ifdef ENABLE_SONG_SCREEN
+ case CMD_VIEW:
+ if (current.song != NULL) {
+ screen_song_switch(c, current.song);
+ return true;
}
- return 1;
+
+ break;
+#endif
+
+ case CMD_LOCATE:
+ if (current.song != NULL) {
+ screen_file_goto_song(c, current.song);
+ return true;
+ }
+
+ return false;
+
default:
break;
}
lw->selected = lw->start+lw->rows;
- if (screen_find(screen,
- lw, current.lines->len,
+ if (screen_find(lw, current.lines->len,
cmd, list_callback, NULL)) {
/* center the row */
list_window_center(lw, current.lines->len, lw->selected);
- return 1;
+ lyrics_repaint();
+ return true;
}
- return 0;
+ return false;
}
const struct screen_functions screen_lyrics = {
.close = NULL,
.resize = lyrics_resize,
.paint = lyrics_paint,
- .update = lyrics_update,
.cmd = lyrics_cmd,
.get_title = lyrics_title,
};
-#endif /* ENABLE_LYRICS_SCREEN */
+void
+screen_lyrics_switch(struct mpdclient *c, const struct mpd_song *song)
+{
+ assert(song != NULL);
+
+ next_song = song;
+ screen_switch(&screen_lyrics, c);
+}