diff -ur sonic-rainbow.orig/src/cdplayer.c sonic-rainbow/src/cdplayer.c
--- sonic-rainbow.orig/src/cdplayer.c	2004-09-01 00:41:27.000000000 +0300
+++ sonic-rainbow/src/cdplayer.c	2007-07-27 16:49:47.000000000 +0300
@@ -474,7 +474,7 @@
 {
   for(i=1;i<matches;i++)
   {
-   if(id==disc->discid)break;
+   if(id==cddb_disc_calc_discid(disc))break;
    back=cddb_query_next(conn,disc);
    }
 
diff -ur sonic-rainbow.orig/src/cdripper.c sonic-rainbow/src/cdripper.c
--- sonic-rainbow.orig/src/cdripper.c	2004-09-01 00:41:27.000000000 +0300
+++ sonic-rainbow/src/cdripper.c	2007-07-27 16:49:47.000000000 +0300
@@ -976,7 +976,7 @@
 {
 for(i=1;i<matches;i++)
 {
-if(id==disc->discid)break;
+if(id==cddb_disc_calc_discid(disc))break;
 back=cddb_query_next(conn,disc);
 }
 
Only in sonic-rainbow/src: cdripper.c.orig
diff -ur sonic-rainbow.orig/src/oggplayer.c sonic-rainbow/src/oggplayer.c
--- sonic-rainbow.orig/src/oggplayer.c	2004-09-01 00:41:27.000000000 +0300
+++ sonic-rainbow/src/oggplayer.c	2007-07-27 16:49:47.000000000 +0300
@@ -264,7 +264,7 @@
 dowhat=-1;
 
 
-db=data->data;
+db=(char *)data->data;
 
 
 while(1)
@@ -3324,7 +3324,7 @@
 	}
 	}
 
-(long)x=ftell(fptr);
+x=(float)ftell(fptr);
 x=x/length;
 x=x*100;
 
Only in sonic-rainbow/src: oggplayer.c.orig