![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/screen_lyrics.c b/src/screen_lyrics.c
index 5356548c90b5ef691f09196696ceaf28672a9350..6d9c6e4af03ab96a700c0dc647f9d8ed0d114423 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 "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 int lyrics_text_rows = -1;
+
+static const struct mpd_song *next_song;
static struct {
const struct mpd_song *song;
{
guint i;
- assert(current.loader == NULL ||
- lyrics_result(current.loader) == LYRICS_SUCCESS);
-
- current.song = NULL;
-
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 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)
{
if (*p != 0)
g_ptr_array_add(current.lines, g_strdup(p));
+
+ /* paint new data */
+
+ lyrics_repaint_if_active();
}
-static int
-screen_lyrics_poll(void)
+static void
+screen_lyrics_callback(const GString *result, mpd_unused void *data)
{
assert(current.loader != NULL);
- switch (lyrics_result(current.loader)) {
- case LYRICS_BUSY:
- return 0;
-
- case LYRICS_SUCCESS:
- screen_lyrics_set(lyrics_get(current.loader));
- lyrics_free(current.loader);
- current.loader = NULL;
- return 1;
-
- case LYRICS_FAILED:
- lyrics_free(current.loader);
- current.loader = NULL;
+ if (result != NULL)
+ screen_lyrics_set(result);
+ else
screen_status_message (_("No lyrics"));
- return -1;
- }
- assert(0);
- return -1;
+ lyrics_free(current.loader);
+ 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;
+
strfsong(buffer, sizeof(buffer), "%artist%", song);
current.artist = g_strdup(buffer);
strfsong(buffer, sizeof(buffer), "%title%", song);
current.title = g_strdup(buffer);
- current.loader = lyrics_load(current.artist, current.title);
+ current.loader = lyrics_load(current.artist, current.title,
+ screen_lyrics_callback, NULL);
}
-static void lyrics_paint(screen_t *screen, mpdclient_t *c);
-
static FILE *create_lyr_file(const char *artist, const char *title)
{
char path[1024];
static const char *
list_callback(unsigned idx, mpd_unused int *highlight, mpd_unused void *data)
{
- if (current.lines == NULL || idx >= current.lines->len)
- return "";
+ 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);
- else if (current.loader != NULL)
- screen_lyrics_poll();
+ 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 screen_t *screen, mpd_unused mpdclient_t *c)
+lyrics_paint(void)
{
- lw->clear = 1;
list_window_paint(lw, list_callback, NULL);
- wrefresh(lw->w);
-}
-
-
-static void
-lyrics_update(mpd_unused screen_t *screen, mpd_unused mpdclient_t *c)
-{
- if( lw->repaint ) {
- list_window_paint(lw, list_callback, NULL);
- wrefresh(lw->w);
- lw->repaint = 0;
- }
}
-
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))
+ if (list_window_scroll_cmd(lw, current.lines->len, cmd)) {
+ lyrics_repaint();
return 1;
-
- lw->repaint=1;
+ }
switch(cmd) {
- case CMD_SELECT:
- /* XXX */
- if (current.loader != NULL) {
- int ret = screen_lyrics_poll();
- if (ret != 0)
- lyrics_paint(NULL, NULL);
- }
- return 1;
case CMD_INTERRUPT:
if (current.loader != NULL) {
screen_lyrics_abort();
case CMD_LYRICS_UPDATE:
if (c->song != NULL) {
screen_lyrics_load(c->song);
- lyrics_paint(NULL, NULL);
+ lyrics_repaint();
}
return 1;
default:
}
lw->selected = lw->start+lw->rows;
- if (screen_find(screen,
- lw, lyrics_text_rows,
+ if (screen_find(lw, current.lines->len,
cmd, list_callback, NULL)) {
/* center the row */
- lw->start = lw->selected - (lw->rows / 2);
- if (lw->start + lw->rows > (unsigned)lyrics_text_rows) {
- if (lw->rows < (unsigned)lyrics_text_rows)
- lw->start = lyrics_text_rows - lw->rows;
- else
- lw->start = 0;
- }
+ list_window_center(lw, current.lines->len, lw->selected);
+ lyrics_repaint();
return 1;
}
.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);
+}