# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1127464863 0
# Node ID e065deeb086fd626222a833ee2ae8e1185d56d0b
# Parent  ca351adcc8d6815d547a372f381797e0970814d6
Removed 'unused argument' warnings, some cleanups.


diff -r ca351adcc8d6 -r e065deeb086f src/xmms-sid.c
--- a/src/xmms-sid.c	Thu Sep 22 05:21:01 2005 +0000
+++ b/src/xmms-sid.c	Fri Sep 23 08:41:03 2005 +0000
@@ -311,6 +311,8 @@
  gchar audioBuffer[XS_AUDIOBUF_SIZE], oversampleBuffer[(XS_AUDIOBUF_SIZE * XS_MAX_OVERSAMPLE)];
 #endif
 
+ (void)argPointer;
+ 
  /* Initialize */
  XSDEBUG("entering player thread\n");
  XS_MUTEX_LOCK(xs_status);
@@ -768,6 +770,8 @@
 
 gboolean xs_subctrl_keypress(GtkWidget *win, GdkEventKey *ev)
 {
+ (void)win;
+ 
  if (ev->keyval == GDK_Escape)
  	xs_subctrl_close();
 
diff -r ca351adcc8d6 -r e065deeb086f src/xs_config.c
--- a/src/xs_config.c	Thu Sep 22 05:21:01 2005 +0000
+++ b/src/xs_config.c	Fri Sep 23 08:41:03 2005 +0000
@@ -255,7 +255,10 @@
  */
 void xs_read_configuration(void)
 {
- gchar *cfgFilename, *tmpStr;
+#ifdef HAVE_NODEFAULTCFG
+ gchar *cfgFilename;
+#endif
+ gchar *tmpStr;
  ConfigFile *cfgFile;
  gint i;
 
@@ -324,7 +327,9 @@
  */
 gint xs_write_configuration(void)
 {
+#ifdef HAVE_NODEFAULTCFG
  gchar *cfgFilename;
+#endif
  ConfigFile *cfgFile;
  gint i;
 
@@ -498,6 +503,8 @@
  */
 void xs_cfg_sld_dbbrowse(GtkButton *button, gpointer user_data)
 {
+ (void)button; (void)user_data;
+ 
  if (xs_sldb_fileselector != NULL)
 	{
 	gdk_window_raise(xs_sldb_fileselector->window);
@@ -539,6 +546,8 @@
  */
 void xs_cfg_stil_browse(GtkButton *button, gpointer user_data)
 {
+ (void)button; (void)user_data;
+
  if (xs_stil_fileselector != NULL)
 	{
 	gdk_window_raise(xs_stil_fileselector->window);
@@ -580,6 +589,8 @@
  */
 void xs_cfg_hvsc_browse(GtkButton *button, gpointer user_data)
 {
+ (void)button; (void)user_data;
+
  if (xs_hvsc_pathselector != NULL)
 	{
 	gdk_window_raise(xs_hvsc_pathselector->window);
@@ -621,7 +632,9 @@
  */
 void xs_cfg_emu_filters_toggled(GtkToggleButton *togglebutton, gpointer user_data)
 {
- gboolean isActive = GTK_TOGGLE_BUTTON(LUW("cfg_emu_filters"))->active;
+ gboolean isActive = GTK_TOGGLE_BUTTON(togglebutton)->active;
+
+ (void)user_data;
 
  gtk_widget_set_sensitive(LUW("cfg_frm_fs"), isActive);
  gtk_widget_set_sensitive(LUW("cfg_frm_fm"), isActive);
@@ -637,7 +650,9 @@
 
 void xs_cfg_ftitle_override_toggled(GtkToggleButton *togglebutton, gpointer user_data)
 {
- gboolean isActive = GTK_TOGGLE_BUTTON(LUW("cfg_ftitle_override"))->active;
+ gboolean isActive = GTK_TOGGLE_BUTTON(togglebutton)->active;
+
+ (void)user_data;
 
  gtk_widget_set_sensitive(LUW("cfg_ftitle_format"), isActive);
  gtk_widget_set_sensitive(LUW("cfg_ftitle_desc1"), isActive);
@@ -647,12 +662,15 @@
 
 void xs_cfg_emu_sidplay1_toggled(GtkToggleButton *togglebutton, gpointer user_data)
 {
+ (void)togglebutton; (void)user_data;
 }
 
 
 void xs_cfg_emu_sidplay2_toggled(GtkToggleButton *togglebutton, gpointer user_data)
 {
- gboolean isActive = GTK_TOGGLE_BUTTON(LUW("cfg_emu_sidplay2"))->active;
+ gboolean isActive = GTK_TOGGLE_BUTTON(togglebutton)->active;
+
+ (void)user_data;
 
  gtk_widget_set_sensitive(LUW("cfg_emu_mem_real"), isActive);
 
@@ -677,7 +695,9 @@
 
 void xs_cfg_oversample_toggled(GtkToggleButton *togglebutton, gpointer user_data)
 {
- gboolean isActive = GTK_TOGGLE_BUTTON(LUW("cfg_oversample"))->active;
+ gboolean isActive = GTK_TOGGLE_BUTTON(togglebutton)->active;
+
+ (void)user_data;
 
  gtk_widget_set_sensitive(LUW("cfg_oversample_factor"), isActive);
  gtk_widget_set_sensitive(LUW("cfg_oversample_label1"), isActive);
@@ -687,7 +707,9 @@
 
 void xs_cfg_mintime_enable_toggled(GtkToggleButton *togglebutton, gpointer user_data)
 {
- gboolean isActive = GTK_TOGGLE_BUTTON(LUW("cfg_mintime_enable"))->active;
+ gboolean isActive = GTK_TOGGLE_BUTTON(togglebutton)->active;
+
+ (void)user_data;
 
  gtk_widget_set_sensitive(LUW("cfg_mintime"), isActive);
  gtk_widget_set_sensitive(LUW("cfg_mintime_label1"), isActive);
@@ -699,6 +721,8 @@
 {
  gboolean isActive = GTK_TOGGLE_BUTTON(LUW("cfg_maxtime_enable"))->active;
 
+ (void)togglebutton; (void)user_data;
+
  gtk_widget_set_sensitive(LUW("cfg_maxtime_unknown"), isActive);
  gtk_widget_set_sensitive(LUW("cfg_maxtime"), isActive);
  gtk_widget_set_sensitive(LUW("cfg_maxtime_label1"), isActive);
@@ -708,7 +732,9 @@
 
 void xs_cfg_sld_enable_toggled(GtkToggleButton *togglebutton, gpointer user_data)
 {
- gboolean isActive = GTK_TOGGLE_BUTTON(LUW("cfg_sld_enable"))->active;
+ gboolean isActive = GTK_TOGGLE_BUTTON(togglebutton)->active;
+
+ (void)user_data;
 
  gtk_widget_set_sensitive(LUW("cfg_sld_dbpath"), isActive);
  gtk_widget_set_sensitive(LUW("cfg_sld_dbbrowse"), isActive);
@@ -718,7 +744,9 @@
 
 void xs_cfg_stil_enable_toggled(GtkToggleButton *togglebutton, gpointer user_data)
 {
- gboolean isActive = GTK_TOGGLE_BUTTON(LUW("cfg_stil_enable"))->active;
+ gboolean isActive = GTK_TOGGLE_BUTTON(togglebutton)->active;
+
+ (void)user_data;
 
  gtk_widget_set_sensitive(LUW("cfg_stil_dbpath"), isActive);
  gtk_widget_set_sensitive(LUW("cfg_stil_browse"), isActive);
@@ -732,7 +760,9 @@
 
 void xs_cfg_subauto_enable_toggled(GtkToggleButton *togglebutton, gpointer user_data)
 {
- gboolean isActive = GTK_TOGGLE_BUTTON(LUW("cfg_subauto_enable"))->active;
+ gboolean isActive = GTK_TOGGLE_BUTTON(togglebutton)->active;
+
+ (void)user_data;
 
  gtk_widget_set_sensitive(LUW("cfg_subauto_min_only"), isActive);
  gtk_widget_set_sensitive(LUW("cfg_subauto_mintime"), isActive);
@@ -741,9 +771,11 @@
 
 void xs_cfg_subauto_min_only_toggled(GtkToggleButton *togglebutton, gpointer user_data)
 {
- gboolean isActive = GTK_TOGGLE_BUTTON(LUW("cfg_subauto_min_only"))->active &&
+ gboolean isActive = GTK_TOGGLE_BUTTON(togglebutton)->active &&
 		GTK_TOGGLE_BUTTON(LUW("cfg_subauto_enable"))->active;
 
+ (void)user_data;
+
  gtk_widget_set_sensitive(LUW("cfg_subauto_mintime"), isActive);
 }
 
@@ -752,6 +784,8 @@
 {
  gint tmpValue;
  GtkAdjustment *tmpAdj;
+
+ (void)user_data;
  
  tmpAdj = gtk_spin_button_get_adjustment(
  	GTK_SPIN_BUTTON(LUW("cfg_maxtime")));
@@ -768,6 +802,8 @@
 {
  gint tmpValue;
  GtkAdjustment *tmpAdj;
+
+ (void)user_data;
  
  tmpAdj = gtk_spin_button_get_adjustment(
  	GTK_SPIN_BUTTON(LUW("cfg_mintime")));
diff -r ca351adcc8d6 -r e065deeb086f src/xs_fileinfo.c
--- a/src/xs_fileinfo.c	Thu Sep 22 05:21:01 2005 +0000
+++ b/src/xs_fileinfo.c	Fri Sep 23 08:41:03 2005 +0000
@@ -108,6 +108,8 @@
 
 gboolean xs_fileinfo_delete(GtkWidget *widget, GdkEvent *event, gpointer user_data)
 {
+ (void)widget; (void)event; (void)user_data;
+ 
  XSDEBUG("delete_event\n");
  xs_fileinfo_ok();
  return FALSE;
@@ -122,6 +124,8 @@
  gint tmpIndex;
  gchar *subName, *subAuthor;
 
+ (void)widget; (void)data;
+ 
  /* Freeze text-widget and delete the old text */
  tmpText = LUW("fileinfo_sub_info");
  gtk_text_freeze(GTK_TEXT(tmpText));