![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/screen_lyrics.c b/src/screen_lyrics.c
index 106d439b7f4a44aa2159ff1b865377c07d82c78e..6cb7b46efddf71590f40d010936a701f18b80d46 100644 (file)
--- a/src/screen_lyrics.c
+++ b/src/screen_lyrics.c
-/*
- * $Id: screen_lyrics.c 3355 2006-09-1 17:44:04Z tradiaz $
- *
- * (c) 2006 by Kalle Wallin <kaw@linux.se>
- * Tue Aug 1 23:17:38 2006
- * lyrics enhancement written by Andreas Obergrusberger <tradiaz@yahoo.de>
- * using www.leoslyrics.com XML API
- *
+/* 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 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- */
-#define _GNU_SOURCE
-#include <stdlib.h>
-#include <string.h>
-#include <glib.h>
-#include <ncurses.h>
-#include <expat.h>
-#include <unistd.h>
-#include <glib/gstdio.h>
-#include <stdio.h>
+ * 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 "config.h"
-#ifndef DISABLE_LYRICS_SCREEN
-#include <sys/stat.h>
-#include "ncmpc.h"
+#include "screen_lyrics.h"
+#include "screen_interface.h"
+#include "screen_message.h"
+#include "screen_file.h"
+#include "screen_song.h"
+#include "i18n.h"
#include "options.h"
#include "mpdclient.h"
-#include "command.h"
#include "screen.h"
-#include "screen_utils.h"
-#include "easy_download.h"
-#include "strfsong.h"
+#include "lyrics.h"
+#include "screen_text.h"
+#include <assert.h>
+#include <sys/stat.h>
+#include <stdlib.h>
+#include <string.h>
+#include <glib.h>
+#include <unistd.h>
+#include <stdio.h>
-#define LEOSLYRICS_SEARCH_URL "http://api.leoslyrics.com/api_search.php?auth=ncmpc&artist=%s&songtitle=%s"
-
-#define LEOSLYRICS_CONTENT_URL "http://api.leoslyrics.com/api_lyrics.php?auth=ncmpc&hid=%s"
+static struct screen_text text;
-#define CREDITS "Lyrics provided by www.LeosLyrics.com"
+static struct mpd_song *next_song;
+static bool follow = false;
-typedef struct _formed_text
-{
- GString *text;
- GArray *lines;
- int val;
-} formed_text;
+static struct {
+ struct mpd_song *song;
-typedef struct _retrieval_spec
-{
- mpdclient_t *client;
- int way;
-} retrieval_spec;
+ char *artist, *title;
-typedef struct _lyrics
-{
- int header_len;
-
- guint8 result
- char *hid;
- GTimer *dltime;
-
- XML_Parser parser;
- XML_Parser contentp;
-
- formed_text content;
-
-} lyrics;
-
-XML_Parser parser, contentp;
-static int lyrics_text_rows = -1;
-static list_window_t *lw = NULL;
-short int lock;
-/* result is a bitset in which the succes when searching 4 lyrics is logged
-countend by position - backwards
-0: lyrics in database
-1: proper access to the lyrics provider
-2: lyrics found
-3: exact match
-4: lyrics downloaded
-5: lyrics saved
-wasting 3 bits doesn't mean being a fat memory hog like kde.... does it?
-*/
-static void lyrics_paint(screen_t *screen, mpdclient_t *c);
+ struct plugin_cycle *loader;
+} current;
-int get_text_line(formed_text *text, int num, char *dest, int len)
+static void
+screen_lyrics_abort(void)
{
- memset(dest, '\0', len*sizeof(char));
- if(num >= text->lines->len-1) return -1;
- int linelen;
- if(num == 0)
- {
- linelen = g_array_index(text->lines, int, num);
- memcpy(dest, text->text->str, linelen*sizeof(char));
- }
- else if(num == 1)
- { //dont ask me why, but this is needed....
- linelen = g_array_index(text->lines, int, num)
- - g_array_index(text->lines, int, num-1);
- memcpy(dest, &text->text->str[g_array_index(text->lines, int, num-1)],
- linelen*sizeof(char));
- }
- else
- {
- linelen = g_array_index(text->lines, int, num+1)
- - g_array_index(text->lines, int, num);
- memcpy(dest, &text->text->str[g_array_index(text->lines, int, num)],
- linelen*sizeof(char));
+ if (current.loader != NULL) {
+ plugin_stop(current.loader);
+ current.loader = NULL;
}
- dest[linelen] = '\n';
- dest[linelen+1] = '\0';
-
- return 0;
-}
-
-void add_text_line(formed_text *dest, const char *src, int len)
-{
- // need this because g_array_append_val doesnt work with literals
- // and expat sends "\n" as an extra line everytime
- if(len == 0)
- {
- dest->val = strlen(src);
- if(dest->lines->len > 0) dest->val += g_array_index(dest->lines, int,
- dest->lines->len-1);
- g_string_append(dest->text, src);
- g_array_append_val(dest->lines, dest->val);
- return;
+
+ if (current.artist != NULL) {
+ g_free(current.artist);
+ current.artist = NULL;
}
- if(len > 1 || dest->val == 0)
- {
- dest->val = len;
- if(dest->lines->len > 0) dest->val += g_array_index(dest->lines, int,
- dest->lines->len-1);
+
+ if (current.title != NULL) {
+ g_free(current.title);
+ current.artist = NULL;
}
- else if (len == 1 && dest->val != 0) dest->val = 0;
-
- if(dest->val > 0)
- {
- g_string_append_len(dest->text, src, len);
- g_array_append_val(dest->lines, dest->val);
+
+ if (current.song != NULL) {
+ mpd_song_free(current.song);
+ current.song = NULL;
}
}
-void formed_text_init(formed_text *text)
+/**
+ * Repaint and update the screen, if it is currently active.
+ */
+static void
+lyrics_repaint_if_active(void)
{
- if(text->text != NULL) g_string_free(text->text, TRUE);
- text->text = g_string_new("");
-
- if(text->lines != NULL) g_array_free(text->lines, TRUE);
- text->lines = g_array_new(FALSE, TRUE, 4);
-
- text->val = 0;
-}
-
-static void check_content(void *data, const char *name, const char **atts)
-{
- if(strstr(name, "text") != NULL)
- {
+ if (screen_is_visible(&screen_lyrics)) {
+ screen_text_repaint(&text);
- lyrics.result |= 16;
+ /* XXX repaint the screen title */
}
}
-
-static void check_search_response(void *data, const char *name,
- const char **atts)
+static void
+path_lyr_file(char *path, size_t size,
+ const char *artist, const char *title)
{
- if(strstr(name, "response") != NULL)
- {
- lyrics.result |=2;
- return;
- }
-
- if(lyrics.result & 4)
- {
- if(strstr(name, "lyrics.result") != NULL)
- {
- if(strstr(atts[2], "hid") != NULL)
- {
- lyrics.hid = atts[3];
- }
-
- if(strstr(atts[2], "exactMatch") != NULL)
- {
- lyrics.result |= 8;
- }
- }
- }
-
+ snprintf(path, size, "%s/.lyrics/%s - %s.txt",
+ getenv("HOME"), artist, title);
}
-static void end_tag(void *data, const char *name)
+static bool
+exists_lyr_file(const char *artist, const char *title)
{
- //hmmmmmm
-}
+ char path[1024];
+ struct stat result;
- static void check_search_success(void *userData, const XML_Char *s, int len)
- {
- if(lyrics.result & 2) //lets first check whether we're right
- { //we don't really want to search in the wrong string
- if(strstr((char*) s, "SUCCESS"))
- {
- lyrics.result |=4;
- }
- }
- }
+ path_lyr_file(path, 1024, artist, title);
-static void
-fetch_text(void *userData, const XML_Char *s, int len)
-{
- if(lyrics.result & 16)
- {
- add_text_line(&lyrics.content, s, len);
- }
+ return (stat(path, &result) == 0);
}
-int
-check_dl_progress(void *clientp, double dltotal, double dlnow,
- double ultotal, double ulnow)
+static FILE *
+create_lyr_file(const char *artist, const char *title)
{
- if(g_timer_elapsed(lyrics.dltime, NULL) >= options.lyrics_timeout || lock == 4)
- {
- formed_text_init(&lyrics.content);
- return -1;
- }
+ char path[1024];
- return 0;
-}
+ snprintf(path, 1024, "%s/.lyrics",
+ getenv("HOME"));
+ mkdir(path, S_IRWXU);
+ path_lyr_file(path, 1024, artist, title);
+
+ return fopen(path, "w");
+}
-int
-check_lyr_http(char *artist, char *title, char *url)
+static int
+store_lyr_hd(void)
{
- char url_avail[256];
-
- //this replacess the whitespaces with '+'
- g_strdelimit(artist, " ", '+');
- g_strdelimit(title, " ", '+');
-
- //we insert the artist and the title into the url
- snprintf(url_avail, 512, LEOSLYRICS_SEARCH_URL, artist, title);
-
- //download that xml!
- easy_download_struct lyr_avail = {NULL, 0,-1};
-
- g_timer_start(lyrics.dltime);
- if(!easy_download(url_avail, &lyr_avail, check_dl_progress)) return -1;
- g_timer_stop(lyrics.dltime);
-
- //we gotta parse that stuff with expat
- parser = XML_ParserCreate(NULL);
- XML_SetUserData(parser, NULL);
-
- XML_SetElementHandler(parser, check_search_response, end_tag);
- XML_SetCharacterDataHandler(parser, check_search_success);
- XML_Parse(parser, lyr_avail.data, strlen(lyr_avail.data), 0);
- XML_ParserFree(parser);
-
- if(!(lyrics.result & 4)) return -1; //check whether lyrics found
- snprintf(url, 512, LEOSLYRICS_CONTENT_URL, lyrics.hid);
+ FILE *lyr_file;
+ unsigned i;
+ lyr_file = create_lyr_file(current.artist, current.title);
+ if (lyr_file == NULL)
+ return -1;
+
+ for (i = 0; i < text.lines->len; ++i)
+ fprintf(lyr_file, "%s\n",
+ (const char*)g_ptr_array_index(text.lines, i));
+
+ fclose(lyr_file);
return 0;
}
-int get_lyr_http(char *artist, char *title)
+
+static void
+screen_lyrics_set(const GString *str)
{
- char url_hid[256];
- if(lyrics.dltime == NULL) lyrics.dltime = g_timer_new();
-
- if(check_lyr_http(artist, title, url_hid) != 0) return -1;
-
- easy_download_struct lyr_content = {NULL, 0,-1};
- g_timer_continue(lyrics.dltime);
- if(!(easy_download(url_hid, &lyr_content, check_dl_progress))) return -1;
- g_timer_stop(lyrics.dltime);
-
- contentp = XML_ParserCreate(NULL);
- XML_SetUserData(contentp, NULL);
- XML_SetElementHandler(contentp, check_content, end_tag);
- XML_SetCharacterDataHandler(contentp, fetch_text);
- XML_Parse(contentp, lyr_content.data, strlen(lyr_content.data), 0);
- XML_ParserFree(contentp);
+ screen_text_set(&text, str);
- return 0;
-
+ /* paint new data */
+
+ lyrics_repaint_if_active();
}
-FILE *create_lyr_file(char *artist, char *title)
-{
- char path[1024];
-
- snprintf(path, 1024, "%s/.lyrics",
- getenv("HOME"));
- if(g_access(path, W_OK) != 0) if(mkdir(path, S_IRWXU) != 0) return NULL;
-
- snprintf(path, 1024, "%s/.lyrics/%s",
- getenv("HOME"), artist);
-
- if(g_access(path, W_OK) != 0) if(mkdir(path, S_IRWXU) != 0) return NULL;
-
- snprintf(path, 1024, "%s/.lyrics/%s/%s.lyric",
- getenv("HOME"), artist, title);
-
- return fopen(path, "w");
-}
-
-char *check_lyr_hd(char *artist, char *title, int how)
-{ //checking whether for lyrics file existence and proper access
- static char path[1024];
- snprintf(path, 1024, "%s/.lyrics/%s/%s.lyric",
- getenv("HOME"), artist, title);
-
- if(g_access(path, how) != 0) return NULL;
-
- return path;
-}
-
-
-int get_lyr_hd(char *artist, char *title)
-{
- char *path = check_lyr_hd(artist, title, R_OK);
- if(path == NULL) return -1;
-
- FILE *lyr_file;
- lyr_file = fopen(path, "r");
- if(lyr_file == NULL) return -1;
-
- char *buf = NULL;
- char **line = &buf;
- size_t n = 0;
-
- while(1)
- {
- n = getline(line, &n, lyr_file);
- if( n < 1 || *line == NULL || feof(lyr_file) != 0 ) return 0;
- add_text_line(&lyrics.content, *line, n);
- free(*line);
- *line = NULL; n = 0;
- }
-
- return 0;
-}
-
-int store_lyr_hd()
+
+static void
+screen_lyrics_callback(const GString *result, const bool success,
+ G_GNUC_UNUSED void *data)
{
- char artist[512];
- char title[512];
- static char path[1024];
- FILE *lyr_file;
-
- get_text_line(&lyrics.content, 0, artist, 512);
- get_text_line(&lyrics.content, 1, title, 512);
- artist[strlen(artist)-1] = '\0';
- title[strlen(title)-1] = '\0';
-
- snprintf(path, 1024, "%s/.lyrics/%s/%s.lyric",
- getenv("HOME"), artist, title);
- lyr_file = create_lyr_file(artist, title);
- if(lyr_file == NULL) return -1;
- int i;
- char line_buf[1024];
-
- for(i = 3; i <= lyrics.content.text->len; i++)
- {
- if(get_text_line(&lyrics.content, i, line_buf, 1024) == -1);
- fputs(line_buf, lyr_file);
- }
- fclose(lyr_file);
- return 0;
+ assert(current.loader != NULL);
+
+ /* Display result, which may be lyrics or error messages */
+ if (result != NULL)
+ screen_lyrics_set(result);
+
+ if (success == true) {
+ if (options.lyrics_autosave &&
+ !exists_lyr_file(current.artist, current.title))
+ store_lyr_hd();
+ } else {
+ /* translators: no lyrics were found for the song */
+ screen_status_message (_("No lyrics"));
+ }
+
+ plugin_stop(current.loader);
+ current.loader = NULL;
}
-
-
-void check_repaint()
+
+static void
+screen_lyrics_load(const struct mpd_song *song)
{
- if(screen_get_id("lyrics") == get_cur_mode_id())lyrics_paint(NULL, NULL);
-}
+ const char *artist, *title;
+ assert(song != NULL);
-gpointer get_lyr(void *c)
-{
- mpd_Status *status = ((retrieval_spec*)c)->client->status;
- mpd_Song *cur = ((retrieval_spec*)c)->client->song;
- //mpdclient_update((mpdclient_t*)c);
-
- if(!(IS_PAUSED(status->state)||IS_PLAYING(status->state)))
- {
- formed_text_init(&lyrics.content);
- return NULL;
- }
-
-
- char artist[MAX_SONGNAME_LENGTH];
- char title[MAX_SONGNAME_LENGTH];
- lock = 2;
- lyrics.result = 0;
-
- formed_text_init(&lyrics.content);
-
- strfsong(artist, MAX_SONGNAME_LENGTH, "%artist%", cur);
- strfsong(title, MAX_SONGNAME_LENGTH, "%title%", cur);
-
- //write header..
- formed_text_init(&lyrics.content);
- add_text_line(&lyrics.content, artist, 0);
- add_text_line(&lyrics.content, title, 0);
- add_text_line(&lyrics.content, "", 0);
- add_text_line(&lyrics.content, "", 0);
-
- if (((retrieval_spec*)c)->way == 1)
- {
- if(get_lyr_http(artist, title) != 0) return NULL;
- }
- else{
- if(get_lyr_hd(artist, title) != 0)
- {
- if(get_lyr_http(artist, title) != 0) return NULL;
- }
- else lyrics.result |= 1;
- }
-
- lw->start = 0;
- check_repaint();
- lock = 1;
- return &lyrics.content;
-}
-
-static char *
-list_callback(int index, int *highlight, void *data)
-{
- static char buf[512];
-
- //i think i'ts fine to write it into the 1st line...
- if((index == lyrics.content.lines->len && lyrics.content.lines->len > 4)||
- ((lyrics.content.lines->len == 0
- ||lyrics.content.lines->len == 4) && index == 0))
- {
- *highlight=3;
- return CREDITS;
- }
-
- if(index < 2 && lyrics.content.lines->len > 4) *highlight=3;
- else if(index >= lyrics.content.lines->len ||
- ( index < 4 && index != 0 && lyrics.content.lines->len < 5))
- {
- return "";
- }
-
- get_text_line(&lyrics.content, index, buf, 512);
- return buf;
-}
+ screen_lyrics_abort();
+ screen_text_clear(&text);
+
+ artist = mpd_song_get_tag(song, MPD_TAG_ARTIST, 0);
+ title = mpd_song_get_tag(song, MPD_TAG_TITLE, 0);
+ current.song = mpd_song_dup(song);
+ current.artist = g_strdup(artist);
+ current.title = g_strdup(title);
+
+ current.loader = lyrics_load(current.artist, current.title,
+ screen_lyrics_callback, NULL);
+}
static void
-lyrics_init(WINDOW *w, int cols, int rows)
+lyrics_screen_init(WINDOW *w, int cols, int rows)
{
- lw = list_window_init(w, cols, rows);
- lw->flags = LW_HIDE_CURSOR;
- //lyrics.content.lines = g_array_new(FALSE, TRUE, 4);
- formed_text_init(&lyrics.content);
- if (!g_thread_supported()) g_thread_init(NULL);
-
+ screen_text_init(&text, w, cols, rows);
}
static void
lyrics_resize(int cols, int rows)
{
- lw->cols = cols;
- lw->rows = rows;
+ screen_text_resize(&text, cols, rows);
}
static void
lyrics_exit(void)
{
- list_window_free(lw);
-}
+ screen_lyrics_abort();
+ screen_text_deinit(&text);
+}
-static char *
-lyrics_title(char *str, size_t size)
+static void
+lyrics_open(struct mpdclient *c)
{
- if(lyrics.content.lines->len == 4)
- {
- if(lock == 1)
- {
- if(!(lyrics.result & 1))
- {
- if(!(lyrics.result & 2)) return _("Lyrics [No connection]");
- if(!(lyrics.result & 4)) return _("Lyrics [Not found]");
- }
- }
- if(lock == 2) return _("Lyrics [retrieving]");
- }
- /*if(lyrics.content.lines->len > 2)
- {
- static char buf[512];
- char artist[512];
- char title[512];
- get_text_line(&lyrics.content, 0, artist, 512);
- get_text_line(&lyrics.content, 1, artist, 512);
- snprintf(buf, 512, "Lyrics %s - %s", artist, title);
- return buf;
- }*/
- return "Lyrics";
+ const struct mpd_song *next_song_c =
+ next_song != NULL ? next_song : c->song;
+
+ if (next_song_c != NULL &&
+ (current.song == NULL ||
+ strcmp(mpd_song_get_uri(next_song_c),
+ mpd_song_get_uri(current.song)) != 0))
+ screen_lyrics_load(next_song_c);
+
+ if (next_song != NULL)
+ mpd_song_free(next_song);
+ next_song = NULL;
}
-static void
-lyrics_paint(screen_t *screen, mpdclient_t *c)
+static void
+lyrics_update(struct mpdclient *c)
{
- lw->clear = 1;
- list_window_paint(lw, list_callback, NULL);
- wrefresh(lw->w);
-}
+ if (!follow)
+ return;
-static void
-lyrics_update(screen_t *screen, mpdclient_t *c)
-{
- if( lw->repaint )
- {
- list_window_paint(lw, list_callback, NULL);
- wrefresh(lw->w);
- lw->repaint = 0;
- }
+ if (c->song != NULL &&
+ (current.song == NULL ||
+ strcmp(mpd_song_get_uri(c->song),
+ mpd_song_get_uri(current.song)) != 0))
+ screen_lyrics_load(c->song);
}
+static const char *
+lyrics_title(char *str, size_t size)
+{
+ if (current.loader != NULL) {
+ snprintf(str, size, "%s (%s)",
+ _("Lyrics"),
+ /* translators: this message is displayed
+ while data is retrieved */
+ _("loading..."));
+ 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);
+ return str;
+ } else
+ return _("Lyrics");
+}
-static int
-lyrics_cmd(screen_t *screen, mpdclient_t *c, command_t cmd)
+static void
+lyrics_paint(void)
{
- lw->repaint=1;
- static retrieval_spec spec;
- switch(cmd)
- {
- case CMD_LIST_NEXT:
- if( lw->start+lw->rows < lyrics.content.lines->len+1 )
- lw->start++;
- return 1;
- case CMD_LIST_PREVIOUS:
- if( lw->start >0 )
- lw->start--;
- return 1;
- case CMD_LIST_FIRST:
- lw->start = 0;
- return 1;
- case CMD_LIST_LAST:
- lw->start = lyrics_text_rows-lw->rows;
- if( lw->start<0 )
- lw->start = 0;
- return 1;
- case CMD_LIST_NEXT_PAGE:
- lw->start = lw->start + lw->rows-1;
- if( lw->start+lw->rows >= lyrics.content.lines->len+1 )
- lw->start = lyrics.content.lines->len-lw->rows+1;
- if( lw->start<0 )
- lw->start = 0;
- return 1;
- case CMD_LIST_PREVIOUS_PAGE:
- lw->start = lw->start - lw->rows;
- if( lw->start<0 )
- lw->start = 0;
- return 1;
- case CMD_SELECT:
- spec.client = c;
- spec.way = 0;
- g_thread_create(get_lyr, &spec, FALSE, NULL);
- return 1;
- case CMD_INTERRUPT:
- if(lock > 1) lock = 4;
- return 1;
- case CMD_ADD:
- if(lock > 0 && lock != 4)
- {
- if(store_lyr_hd() == 0) screen_status_message (_("Lyrics saved!"));
- }
- return 1;
- case CMD_LYRICS_UPDATE:
- spec.client = c;
- spec.way = 1;
- g_thread_create(get_lyr, &spec, FALSE, NULL);
-
- default:
- break;
- }
-
- lw->selected = lw->start+lw->rows;
- if( screen_find(screen, c,
- lw, lyrics_text_rows,
- cmd, list_callback, NULL) )
- {
- /* center the row */
- lw->start = lw->selected-(lw->rows/2);
- if( lw->start+lw->rows > lyrics_text_rows )
- lw->start = lyrics_text_rows-lw->rows;
- if( lw->start<0 )
- lw->start=0;
- return 1;
- }
-
- return 0;
+ screen_text_paint(&text);
}
-static list_window_t *
-lyrics_lw(void)
+static bool
+lyrics_cmd(struct mpdclient *c, command_t cmd)
{
- return lw;
+ if (screen_text_cmd(&text, c, cmd))
+ return true;
+
+ switch(cmd) {
+ case CMD_INTERRUPT:
+ if (current.loader != NULL) {
+ screen_lyrics_abort();
+ screen_text_clear(&text);
+ }
+ return true;
+ case CMD_SAVE_PLAYLIST:
+ if (current.loader == NULL && current.artist != NULL &&
+ current.title != NULL && store_lyr_hd() == 0)
+ /* lyrics for the song were saved on hard disk */
+ screen_status_message (_("Lyrics saved"));
+ return true;
+ case CMD_LYRICS_UPDATE:
+ if (c->song != NULL) {
+ screen_lyrics_load(c->song);
+ screen_text_repaint(&text);
+ }
+ return true;
+
+#ifdef ENABLE_SONG_SCREEN
+ case CMD_SCREEN_SONG:
+ if (current.song != NULL) {
+ screen_song_switch(c, current.song);
+ return true;
+ }
+
+ break;
+#endif
+ case CMD_SCREEN_SWAP:
+ screen_swap(c, current.song);
+ return true;
+
+ case CMD_LOCATE:
+ if (current.song != NULL) {
+ screen_file_goto_song(c, current.song);
+ return true;
+ }
+
+ return false;
+
+ default:
+ break;
+ }
+
+ return false;
}
-screen_functions_t *
-get_screen_lyrics(void)
+const struct screen_functions screen_lyrics = {
+ .init = lyrics_screen_init,
+ .exit = lyrics_exit,
+ .open = lyrics_open,
+ .update = lyrics_update,
+ .close = NULL,
+ .resize = lyrics_resize,
+ .paint = lyrics_paint,
+ .cmd = lyrics_cmd,
+ .get_title = lyrics_title,
+};
+
+void
+screen_lyrics_switch(struct mpdclient *c, const struct mpd_song *song, bool f)
{
- static screen_functions_t functions;
-
- memset(&functions, 0, sizeof(screen_functions_t));
- functions.init = lyrics_init;
- functions.exit = lyrics_exit;
- functions.open = NULL;
- functions.close = NULL;
- functions.resize = lyrics_resize;
- functions.paint = lyrics_paint;
- functions.update = lyrics_update;
- functions.cmd = lyrics_cmd;
- functions.get_lw = lyrics_lw;
- functions.get_title = lyrics_title;
-
- return &functions;
+ assert(song != NULL);
+
+ follow = f;
+ next_song = mpd_song_dup(song);
+ screen_switch(&screen_lyrics, c);
}
-#endif /* ENABLE_LYRICS_SCREEN */