  cb_on_playback_current_id(xmmsc_result_t* result,
                            void* data);
  
-diff -x Makefile -x Makefile.in -x 'config.*' -x configure -x autom4te.cache -ru blastwave-0-1-1/src/client_result_notifiers.c blastwave-0-1-1-with-lyrics/src/client_result_notifiers.c
+diff -x 'config.*' -x autom4te.cache -x Makefile -x Makefile.in -ru blastwave-0-1-1/src/client_result_notifiers.c blastwave-0-1-1-with-lyrics/src/client_result_notifiers.c
 --- blastwave-0-1-1/src/client_result_notifiers.c	2007-06-19 18:41:16.000000000 +0100
 +++ blastwave-0-1-1-with-lyrics/src/client_result_notifiers.c	2008-10-29 19:16:27.000000000 +0000
 @@ -138,6 +138,9 @@

 cb_on_playback_current_id(xmmsc_result_t* result,
                           void* data)
 {
diff -x Makefile -x Makefile.in -x 'config.*' -x configure -x autom4te.cache -ru blastwave-0-1-1/src/client_callbacks.h blastwave-0-1-1-with-lyrics/src/client_callbacks.h
--- blastwave-0-1-1/src/client_callbacks.h	2007-06-19 18:41:16.000000000 +0100
+++ blastwave-0-1-1-with-lyrics/src/client_callbacks.h	2008-10-29 09:10:56.000000000 +0000
@@ -47,6 +47,10 @@

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 @@
