screen_song: support CMD_SCREEN_LYRICS

[ncmpc.git] / src / screen_song.c

diff --git a/src/screen_song.c b/src/screen_song.c
index cf7fd606b394b4ed50364243e054aa8b6b553e60..bda200ad74f9f645f98fbf1a265094c141132d55 100644 (file)
--- a/src/screen_song.c
+++ b/src/screen_song.c
@@ -16,14 +16,9 @@
  *
  */
 
-#include <sys/stat.h>
 #include "i18n.h"
-#include "options.h"
-#include "mpdclient.h"
-#include "command.h"
 #include "screen.h"
 #include "screen_utils.h"
-#include "strfsong.h"
 #include "charset.h"
 
 static list_window_t *lw;
@@ -40,6 +35,11 @@ screen_song_clear(void)
                g_free(g_ptr_array_index(current.lines, i));
 
        g_ptr_array_set_size(current.lines, 0);
+
+       if (current.song != NULL) {
+               mpd_freeSong(current.song);
+               current.song = NULL;
+       }
 }
 
 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;
        }