Refactored plugin warnings.

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@90009 e17a0e51-4ae3-4d35-97c3-1a29b211df97

5 files changed, 69 insertions, 69 deletions

diff --git a/plugins/bladesio1/gui.c b/plugins/bladesio1/gui.c
index e2d2e88d..99979f15 100644
--- a/plugins/bladesio1/gui.c
+++ b/plugins/bladesio1/gui.c
@@ -108,44 +108,44 @@ void configure() {
 
 	settingsRead();
 
-	MainWindow = gtk_builder_get_object(builder, "dlgStart");
+	MainWindow = GTK_WIDGET(gtk_builder_get_object(builder, "dlgStart"));
 	gtk_window_set_title(GTK_WINDOW(MainWindow), _("Link Cable Configuration"));
 
-	widget = gtk_builder_get_object(builder, "btnCopyIP");
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "btnCopyIP"));
 	g_signal_connect_data(G_OBJECT(widget), "clicked",
 		G_CALLBACK(OnCopyIP), NULL, NULL, G_CONNECT_AFTER);
 
 	switch(settings.player) {
 		case PLAYER_DISABLED:
-			widget = gtk_builder_get_object(builder, "rbDisabled");
+			widget = GTK_WIDGET(gtk_builder_get_object(builder, "rbDisabled"));
 			break;
 		case PLAYER_MASTER:
-			widget = gtk_builder_get_object(builder, "rbServer");
+			widget = GTK_WIDGET(gtk_builder_get_object(builder, "rbServer"));
 			break;
 		case PLAYER_SLAVE:
-			widget = gtk_builder_get_object(builder, "rbClient");
+			widget = GTK_WIDGET(gtk_builder_get_object(builder, "rbClient"));
 			break;
 	}
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), TRUE);
 
-	widget = gtk_builder_get_object(builder, "tbServerIP");
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "tbServerIP"));
 	gtk_entry_set_text(GTK_ENTRY(widget), settings.ip);
 
-	widget = gtk_builder_get_object(builder, "tbPort");
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "tbPort"));
 	gtk_spin_button_set_value(GTK_SPIN_BUTTON(widget), settings.port);
 
 	if(gtk_dialog_run(GTK_DIALOG(MainWindow)) == GTK_RESPONSE_OK) {
-		widget = gtk_builder_get_object(builder, "tbServerIP");
+		widget = GTK_WIDGET(gtk_builder_get_object(builder, "tbServerIP"));
 		strncpy(settings.ip, gtk_entry_get_text(GTK_ENTRY(widget)), sizeof(settings.ip) - 1);
 
-		widget = gtk_builder_get_object(builder, "tbPort");
+		widget = GTK_WIDGET(gtk_builder_get_object(builder, "tbPort"));
 		settings.port = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget));
 
-		widget = gtk_builder_get_object(builder, "rbDisabled");
+		widget = GTK_WIDGET(gtk_builder_get_object(builder, "rbDisabled"));
 		if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)))
 			settings.player = PLAYER_DISABLED;
 		else {
-			widget = gtk_builder_get_object(builder, "rbServer");
+			widget = GTK_WIDGET(gtk_builder_get_object(builder, "rbServer"));
 			if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)))
 				settings.player = PLAYER_MASTER;
 			else
diff --git a/plugins/dfcdrom/cdrcfg-0.1df/main.c b/plugins/dfcdrom/cdrcfg-0.1df/main.c
index 9fd97b73..cc55aa36 100755
--- a/plugins/dfcdrom/cdrcfg-0.1df/main.c
+++ b/plugins/dfcdrom/cdrcfg-0.1df/main.c
@@ -178,23 +178,23 @@ void fill_drives_list(GtkWidget *widget) {
 }
 
 static void OnConfigExit(GtkWidget *widget, gpointer user_data) {
-	widget = gtk_builder_get_object(builder, "cddev_comboboxentry");
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "cddev_comboboxentry"));
 	strncpy(CdromDev, gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(widget)))), 255);
 	CdromDev[255] = '\0';
 
-	widget = gtk_builder_get_object(builder, "readmode_combobox");
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "readmode_combobox"));
 	ReadMode = gtk_combo_box_get_active(GTK_COMBO_BOX(widget));
 
-	widget = gtk_builder_get_object(builder, "subQ_button");
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "subQ_button"));
 	UseSubQ = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
 
-	widget = gtk_builder_get_object(builder, "spinCacheSize");
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "spinCacheSize"));
 	CacheSize = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget));
 
-	widget = gtk_builder_get_object(builder, "spinCdrSpeed");
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "spinCdrSpeed"));
 	CdrSpeed = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget));
 
-	widget = gtk_builder_get_object(builder, "comboSpinDown");
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "comboSpinDown"));
 	SpinDown = gtk_combo_box_get_active(GTK_COMBO_BOX(widget));
 
 	SaveConf();
@@ -213,34 +213,34 @@ long CDRconfigure() {
 		return 0;
 	}
 
-	MainWindow = gtk_builder_get_object(builder, "CfgWnd");
+	MainWindow = GTK_WIDGET(gtk_builder_get_object(builder, "CfgWnd"));
 	gtk_window_set_title(GTK_WINDOW(MainWindow), _("CDR configuration"));
 
-	widget = gtk_builder_get_object(builder, "CfgWnd");
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "CfgWnd"));
 	g_signal_connect_data(G_OBJECT(widget), "delete_event",
 		G_CALLBACK(OnConfigExit), NULL, NULL, G_CONNECT_AFTER);
 
-	widget = gtk_builder_get_object(builder, "cfg_closebutton");
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "cfg_closebutton"));
 	g_signal_connect_data(G_OBJECT(widget), "clicked",
 		G_CALLBACK(OnConfigExit), NULL, NULL, G_CONNECT_AFTER);
 
-	widget = gtk_builder_get_object(builder, "cddev_comboboxentry");
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "cddev_comboboxentry"));
 	fill_drives_list(widget);
 	gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(widget))), CdromDev);
 
-	widget = gtk_builder_get_object(builder, "readmode_combobox");
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "readmode_combobox"));
 	gtk_combo_box_set_active(GTK_COMBO_BOX(widget), ReadMode);
 
-	widget = gtk_builder_get_object(builder, "subQ_button");
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "subQ_button"));
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), UseSubQ);
 
-	widget = gtk_builder_get_object(builder, "spinCacheSize");
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "spinCacheSize"));
 	gtk_spin_button_set_value(GTK_SPIN_BUTTON(widget), (float)CacheSize);
 
-	widget = gtk_builder_get_object(builder, "spinCdrSpeed");
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "spinCdrSpeed"));
 	gtk_spin_button_set_value(GTK_SPIN_BUTTON(widget), (float)CdrSpeed);
 
-	widget = gtk_builder_get_object(builder, "comboSpinDown");
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "comboSpinDown"));
 	gtk_combo_box_set_active(GTK_COMBO_BOX(widget), SpinDown);
 
 	gtk_widget_show(MainWindow);
@@ -276,16 +276,16 @@ int main(int argc, char *argv[]) {
 	gtk_init(&argc, &argv);
 
 	if (argc < 2) {
-    	printf ("Usage: cfgBladeSio1 {about | configure}\n");
+		printf ("Usage: cfgBladeSio1 {about | configure}\n");
 		return 0;
 	}
 
-    if (strcmp(argv[1], "configure") != 0 && 
+	if (strcmp(argv[1], "configure") != 0 && 
 		strcmp(argv[1], "about") != 0) {
 		printf ("Usage: cfgBladeSio1 {about | configure}\n");
 		return 0;
-    }
-    
+	}
+
 	if(!strcmp(argv[1], "configure"))
 		CDRconfigure();
 	else if(!strcmp(argv[1], "about"))
diff --git a/plugins/dfnet/gui.c b/plugins/dfnet/gui.c
index a3268658..06c4b888 100755
--- a/plugins/dfnet/gui.c
+++ b/plugins/dfnet/gui.c
@@ -108,36 +108,36 @@ long CFGopen() {
 		return 0;
 	}
 
-	MainWindow = gtk_builder_get_object(builder, "dlgStart");
+	MainWindow = GTK_WIDGET(gtk_builder_get_object(builder, "dlgStart"));
 	gtk_window_set_title(GTK_WINDOW(MainWindow), _("NetPlay"));
 
-	widget = gtk_builder_get_object(builder, "btnCopyIP");
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "btnCopyIP"));
 	g_signal_connect_data(G_OBJECT(widget), "clicked",
 		G_CALLBACK(OnCopyIP), NULL, NULL, G_CONNECT_AFTER);
 
-	widget = gtk_builder_get_object(builder, "tbServerIP");
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "tbServerIP"));
 	gtk_entry_set_text(GTK_ENTRY(widget), conf.ipAddress);
 
-	widget = gtk_builder_get_object(builder, "tbPort");
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "tbPort"));
 	sprintf(buf, "%d", conf.PortNum);
 	gtk_entry_set_text(GTK_ENTRY(widget), buf);
 
 	if (conf.PlayerNum == 1) {
-		widget = gtk_builder_get_object(builder, "rbServer");
+		widget = GTK_WIDGET(gtk_builder_get_object(builder, "rbServer"));
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), TRUE);
 	} else {
-		widget = gtk_builder_get_object(builder, "rbClient");
+		widget = GTK_WIDGET(gtk_builder_get_object(builder, "rbClient"));
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), TRUE);
 	}
 
 	if (gtk_dialog_run(GTK_DIALOG(MainWindow)) == GTK_RESPONSE_OK) {
-		widget = gtk_builder_get_object(builder, "tbServerIP");
+		widget = GTK_WIDGET(gtk_builder_get_object(builder, "tbServerIP"));
 		strcpy(conf.ipAddress, gtk_entry_get_text(GTK_ENTRY(widget)));
 
-		widget = gtk_builder_get_object(builder, "tbPort");
+		widget = GTK_WIDGET(gtk_builder_get_object(builder, "tbPort"));
 		conf.PortNum = atoi(gtk_entry_get_text(GTK_ENTRY(widget)));
 
-		widget = gtk_builder_get_object(builder, "rbServer");
+		widget = GTK_WIDGET(gtk_builder_get_object(builder, "rbServer"));
 		if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))) {
 			conf.PlayerNum = 1;
 		} else {
@@ -215,11 +215,11 @@ int main(int argc, char *argv[]) {
 	gtk_init(&argc, &argv);
 
 	if (argc < 2) {
-    	printf ("Usage: cfgDFNet {about | configure | open | wait | pause | message}\n");
+		printf ("Usage: cfgDFNet {about | configure | open | wait | pause | message}\n");
 		return 0;
 	}
 
-    if (strcmp(argv[1], "about") != 0 && 
+	if (strcmp(argv[1], "about") != 0 && 
 		strcmp(argv[1], "configure") != 0 && 
 		strcmp(argv[1], "open") != 0 && 
 		strcmp(argv[1], "wait") != 0 && 
@@ -227,7 +227,7 @@ int main(int argc, char *argv[]) {
 		strcmp(argv[1], "message") != 0) {
 		printf ("Usage: cfgDFNet {about | configure | open | wait | pause | message}\n");
 		return 0;
-    }
+	}
 	
 	if(argc > 1) {
 		if (!strcmp(argv[1], "configure")) {
diff --git a/plugins/dfsound/freeze.c b/plugins/dfsound/freeze.c
index 268e03ef..015956eb 100755
--- a/plugins/dfsound/freeze.c
+++ b/plugins/dfsound/freeze.c
@@ -217,8 +217,8 @@ void LoadStateUnknown(SPUFreeze_t * pF)
    s_chan[i].bNew=0;
    s_chan[i].bStop=0;
    s_chan[i].ADSR.lVolume=0;
-   s_chan[i].pLoop=(unsigned char *)((int)spuMemC+4096);
-   s_chan[i].pStart=(unsigned char *)((int)spuMemC+4096);
+   s_chan[i].pLoop=(unsigned char *)(spuMemC+4096);
+   s_chan[i].pStart=(unsigned char *)(spuMemC+4096);
    s_chan[i].iMute=0;
    s_chan[i].iIrqDone=0;
   }
diff --git a/plugins/dfsound/spucfg-0.1df/main.c b/plugins/dfsound/spucfg-0.1df/main.c
index ed78a280..2a57a67f 100755
--- a/plugins/dfsound/spucfg-0.1df/main.c
+++ b/plugins/dfsound/spucfg-0.1df/main.c
@@ -29,14 +29,14 @@ int set_limit (char *p, int len, int lower, int upper)
 	int val = 0;
 
 	if (p)
-	    val = atoi(p + len);
+		val = atoi(p + len);
 
 	if (val < lower)
-	    val = lower;
+		val = lower;
 	if (val > upper)
-	    val = upper;
+		val = upper;
 
-    return val;
+	return val;
 }
 
 void on_about_clicked (GtkWidget *widget, gpointer user_data)
@@ -47,39 +47,39 @@ void on_about_clicked (GtkWidget *widget, gpointer user_data)
 
 void OnConfigClose(GtkWidget *widget, gpointer user_data)
 {
-	gtk_widget_destroy(gtk_builder_get_object(builder, "CfgWnd"));
+	gtk_widget_destroy(GTK_WIDGET(gtk_builder_get_object(builder, "CfgWnd")));
 	exit(0);
 }
 
 int main(int argc, char *argv[])
 {
-    FILE *in;
-    char t[256];
-    int len, val = 0;
-    char *pB, *p;
-    char cfg[255];
+	FILE *in;
+	char t[256];
+	int len, val = 0;
+	char *pB, *p;
+	char cfg[255];
 
 #ifdef ENABLE_NLS
-    setlocale (LC_ALL, "");
-    bindtextdomain (GETTEXT_PACKAGE, LOCALE_DIR);
-    bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-    textdomain (GETTEXT_PACKAGE);
+	setlocale (LC_ALL, "");
+	bindtextdomain (GETTEXT_PACKAGE, LOCALE_DIR);
+	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+	textdomain (GETTEXT_PACKAGE);
 #endif
 
-    if (argc < 2) {
-    	printf ("Usage: cfgDFSound {about | configure}\n");
+	if (argc < 2) {
+		printf ("Usage: cfgDFSound {about | configure}\n");
 		return 0;
 	}
 
-    if (strcmp(argv[1], "configure") != 0 && 
+	if (strcmp(argv[1], "configure") != 0 && 
 		strcmp(argv[1], "about") != 0) {
 		printf ("Usage: cfgDFSound {about | configure}\n");
 		return 0;
-    }
+	}
 
-    gtk_init(&argc, &argv);
+	gtk_init(&argc, &argv);
 
-    if (strcmp(argv[1], "about") == 0) {
+	if (strcmp(argv[1], "about") == 0) {
 		const char *authors[]= {"Pete Bernert and the P.E.Op.S. team", "Ryan Schultz", "Andrew Burton", NULL};
 		widget = gtk_about_dialog_new ();
 		gtk_about_dialog_set_program_name (GTK_ABOUT_DIALOG (widget), "dfsound PCSXR Sound Plugin");
@@ -94,7 +94,7 @@ int main(int argc, char *argv[])
 		gtk_main();
 
 		return 0;
-    }
+	}
 	else if (strcmp(argv[1], "configure") == 0) {
 		builder = gtk_builder_new();
 
@@ -103,7 +103,7 @@ int main(int argc, char *argv[])
 			return 0;
 		}
 		
-		MainWindow = gtk_builder_get_object(builder, "CfgWnd");
+		MainWindow = GTK_WIDGET(gtk_builder_get_object(builder, "CfgWnd"));
 
 		strcpy(cfg, CONFIG_FILENAME);
 
@@ -222,11 +222,11 @@ int main(int argc, char *argv[])
 		if (pB)
 			free(pB);
 
-		widget = gtk_builder_get_object(builder, "CfgWnd");
+		widget = GTK_WIDGET(gtk_builder_get_object(builder, "CfgWnd"));
 		g_signal_connect_data(G_OBJECT(widget), "destroy",
 			G_CALLBACK(SaveConfig), builder, NULL, 0);
 
-		widget = gtk_builder_get_object(builder, "btn_close");
+		widget = GTK_WIDGET(gtk_builder_get_object(builder, "btn_close"));
 		g_signal_connect_data(G_OBJECT(widget), "clicked",
 			G_CALLBACK(OnConfigClose), builder, NULL, G_CONNECT_AFTER);
 
@@ -234,7 +234,7 @@ int main(int argc, char *argv[])
 		gtk_main();
 	}
 	
-    return 0;
+	return 0;
 }
 
 void SaveConfig(GtkWidget *widget, gpointer user_data)