diff --git a/src/screen_lyrics.c b/src/screen_lyrics.c
index 3c0393488fde736866ae6a669f20a8fbab42f23d..6d9c6e4af03ab96a700c0dc647f9d8ed0d114423 100644 (file)
--- a/src/screen_lyrics.c
+++ b/src/screen_lyrics.c
*/
#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 "charset.h"
#include "gcc.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;
}
static void
-lyrics_paint(mpdclient_t *c);
+lyrics_paint(void);
/**
* Repaint and update the screen.
static void
lyrics_repaint(void)
{
- lyrics_paint(NULL);
+ lyrics_paint();
wrefresh(lw->w);
}
static void
lyrics_repaint_if_active(void)
{
- if (get_cur_mode_id() == 104) { /* XXX don't use the literal number */
+ if (screen_is_visible(&screen_lyrics)) {
lyrics_repaint();
/* XXX repaint the screen title */
}
static void
-screen_lyrics_load(struct mpd_song *song)
+screen_lyrics_load(const struct mpd_song *song)
{
char buffer[MAX_SONGNAME_LENGTH];
static const char *
list_callback(unsigned idx, mpd_unused int *highlight, mpd_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 && next_song != current.song)
+ screen_lyrics_load(next_song);
+
+ next_song = NULL;
}
}
static void
-lyrics_paint(mpd_unused mpdclient_t *c)
+lyrics_paint(void)
{
list_window_paint(lw, list_callback, NULL);
}
static int
-lyrics_cmd(screen_t *screen, mpdclient_t *c, command_t cmd)
+lyrics_cmd(mpdclient_t *c, command_t cmd)
{
if (list_window_scroll_cmd(lw, current.lines->len, cmd)) {
lyrics_repaint();
}
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);
.cmd = lyrics_cmd,
.get_title = lyrics_title,
};
+
+void
+screen_lyrics_switch(struct mpdclient *c, const struct mpd_song *song)
+{
+ assert(song != NULL);
+
+ next_song = song;
+ screen_switch(&screen_lyrics, c);
+}