-diff -x Makefile -x Makefile.in -x 'config.*' -x configure -x autom4te.cache -ru blastwave-0-1-1/src/client.c blastwave-0-1-1-with-lyrics/src/client.c
+diff -x 'config.*' -x autom4te.cache -x Makefile -x Makefile.in -ru blastwave-0-1-1/src/client.c blastwave-0-1-1-with-lyrics/src/client.c
 --- blastwave-0-1-1/src/client.c	2007-06-19 18:41:16.000000000 +0100
 +++ blastwave-0-1-1-with-lyrics/src/client.c	2008-10-29 19:11:57.000000000 +0000
 @@ -150,6 +150,11 @@

 	}
 	else
 	{
diff -x Makefile -x Makefile.in -x 'config.*' -x configure -x autom4te.cache -ru blastwave-0-1-1/src/interface.c blastwave-0-1-1-with-lyrics/src/interface.c
--- blastwave-0-1-1/src/interface.c	2007-06-19 18:41:16.000000000 +0100
+++ blastwave-0-1-1-with-lyrics/src/interface.c	2008-10-29 20:58:46.000000000 +0000
@@ -48,6 +48,8 @@

+cb_on_signal_playback_lyrics(xmmsc_result_t* result,
+                             void* data)
+{
+	const gchar *lyrics = NULL;
+
+	if(!xmmsc_result_iserror(result) &&
+	   xmmsc_result_get_string(result, &lyrics))
