# HG changeset patch
# User Yoshiki Yazawa <yaz@cc.rim.or.jp>
# Date 1197896731 -32400
# Node ID e8de4c4a3cacfe0af94200750a4322e3579d05c3
# Parent  a5c96af75300ce807892072e1ea81ed70d358395# Parent  31e6845e722a355f7867e268c79cdccb915cf9fc
branch merge

diff -r a5c96af75300 -r e8de4c4a3cac src/adplug/adplug-xmms.cc
--- a/src/adplug/adplug-xmms.cc	Mon Dec 17 22:04:37 2007 +0900
+++ b/src/adplug/adplug-xmms.cc	Mon Dec 17 22:05:31 2007 +0900
@@ -139,6 +139,7 @@
   return GTK_WIDGET (label);
 }
 
+#if 0
 static void
 MessageBox (const char *title, const char *text, const char *button)
 {
@@ -158,6 +159,7 @@
   free (tmptxt);
   free (tmpbutton);
 }
+#endif
 
 /***** Dialog boxes *****/
 
diff -r a5c96af75300 -r e8de4c4a3cac src/adplug/core/dmo.cxx
--- a/src/adplug/core/dmo.cxx	Mon Dec 17 22:04:37 2007 +0900
+++ b/src/adplug/core/dmo.cxx	Mon Dec 17 22:05:31 2007 +0900
@@ -349,8 +349,10 @@
       if (opos + cx >= oend)
         return -1;
 
-      for (int i = 0; i < cx; i++)
-        *opos++ = *(opos - ax);
+      for (int i = 0; i < cx; i++) {
+        *opos = *(opos - ax);
+        opos++;
+      }
 
       continue;
     }
@@ -370,8 +372,10 @@
       if (opos + bx + cx >= oend)
         return -1;
 
-      for (i = 0; i < cx; i++)
-        *opos++ = *(opos - ax);
+      for (i = 0; i < cx; i++) {
+        *opos = *(opos - ax);
+        opos++;
+      }
 
       for (i = 0; i < bx; i++)
         *opos++ = *ipos++;
@@ -395,8 +399,10 @@
       if (opos + ax + cx >= oend)
         return -1;
 
-      for (i = 0; i < cx; i++)
-        *opos++ = *(opos - bx);
+      for (i = 0; i < cx; i++) {
+        *opos = *(opos - bx);
+        opos++;
+      }
 
       for (i = 0; i < ax; i++)
         *opos++ = *ipos++;
diff -r a5c96af75300 -r e8de4c4a3cac src/adplug/core/jbm.cxx
--- a/src/adplug/core/jbm.cxx	Mon Dec 17 22:04:37 2007 +0900
+++ b/src/adplug/core/jbm.cxx	Mon Dec 17 22:05:31 2007 +0900
@@ -75,7 +75,7 @@
   // Allocate memory buffer m[] and read entire file into it
 
   m = new unsigned char[filelen];
-  if (f->readString((char *)m, filelen) != filelen) goto loaderr;
+  if (f->readString((char *)m, filelen) != (unsigned int)filelen) goto loaderr;
 
   fp.close(f);
 
diff -r a5c96af75300 -r e8de4c4a3cac src/rootvis/config_frontend_widgets.c
--- a/src/rootvis/config_frontend_widgets.c	Mon Dec 17 22:04:37 2007 +0900
+++ b/src/rootvis/config_frontend_widgets.c	Mon Dec 17 22:05:31 2007 +0900
@@ -371,8 +371,7 @@
 
 	{
 		GtkWidget *vbox_0, *notebook_1, *button_box_1,
-			*vbox_2[4], *frame_3[4], *vbox_3[1], *hbox_4[5],
-			*check_debug, *check_stereo,
+			*vbox_2[4], *frame_3[4], *hbox_4[5],
 			*close_button, *revert_button;
 
 		vbox_0 = frontend_create_box(VBOX, window, "rootvis_config_vbox", ATTACH_TO_CONTAINER);
@@ -427,7 +426,7 @@
 {
 	GtkWidget *window, *channel_button[2],
 		  *button_box[2], *channels_frame, *main_frame, *vbox,
-		  *main_vbox, *channels_hbox, *channel_vbox[2],
+		  *main_vbox, *channel_vbox[2],
 		  *save_button, *revert_button, *close_button;
 
 	window = frontend_create_window(GTK_WINDOW_TOPLEVEL, "Main");
diff -r a5c96af75300 -r e8de4c4a3cac src/rootvis/rootvis.c
--- a/src/rootvis/rootvis.c	Mon Dec 17 22:04:37 2007 +0900
+++ b/src/rootvis/rootvis.c	Mon Dec 17 22:05:31 2007 +0900
@@ -13,7 +13,6 @@
 // Forward declarations
 static void rootvis_init(void);
 static void rootvis_cleanup(void);
-static void rootvis_about(void);
 static void rootvis_configure(void);
 static void rootvis_playback_start(void);
 static void rootvis_playback_stop(void);
@@ -416,11 +415,6 @@
   }
 }
 
-static void rootvis_about(void)
-{
-	print_status("About");
-}
-
 static void rootvis_configure(void)
 {
 	print_status("Configuration trigger");