X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fscreen_song.c;h=be8a7c02a7b377b624dac3bf034ffabb240fb588;hb=634bed2e83799f604a60bfef62d5e240ea02511c;hp=202025ee81d357899d7c589c6bebd2c6f28d49cb;hpb=b9e06987c6dbbb96b5c7e8c67f29ad489f94f534;p=ncmpc.git

diff --git a/src/screen_song.c b/src/screen_song.c
index 202025e..be8a7c0 100644
--- a/src/screen_song.c
+++ b/src/screen_song.c
@@ -23,7 +23,7 @@
 
 static list_window_t *lw;
 
-struct {
+static struct {
 	struct mpd_song *song;
 	GPtrArray *lines;
 } current;
@@ -56,7 +56,7 @@ screen_song_repaint(void)
 }
 
 static const char *
-screen_song_list_callback(unsigned idx, G_GNUC_UNUSED int *highlight,
+screen_song_list_callback(unsigned idx, G_GNUC_UNUSED bool *highlight,
 			  G_GNUC_UNUSED void *data)
 {
 	static char buffer[256];
@@ -78,7 +78,7 @@ screen_song_init(WINDOW *w, int cols, int rows)
 {
 	current.lines = g_ptr_array_new();
 	lw = list_window_init(w, cols, rows);
-	lw->flags = LW_HIDE_CURSOR;
+	lw->hide_cursor = true;
 }
 
 static void
@@ -128,6 +128,16 @@ screen_song_cmd(mpdclient_t *c, command_t cmd)
 
 		return false;
 
+#ifdef ENABLE_LYRICS_SCREEN
+	case CMD_SCREEN_LYRICS:
+		if (current.song != NULL) {
+			screen_lyrics_switch(c, current.song);
+			return true;
+		}
+
+		return false;
+#endif
+
 	default:
 		break;
 	}