# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1056283801 0
# Node ID 05220299c6e81a9db1a340a44a345c08ca773cb4
# Parent  0d1df20745dd73f3327173e1d25bfe0456888421
Kuumaa paskaa


diff -r 0d1df20745dd -r 05220299c6e8 src/xmms-sid.cc
--- a/src/xmms-sid.cc	Sun Jun 22 11:38:00 2003 +0000
+++ b/src/xmms-sid.cc	Sun Jun 22 12:10:01 2003 +0000
@@ -51,24 +51,22 @@
  * Global variables
  */
 #ifdef HAVE_SIDPLAY1
-static struct emuConfig	xs_emuConf;
-static emuEngine	xs_emuEngine;
-typedef	sidTune		t_xs_tune;
+static struct emuConfig		xs_emuConf;
+static emuEngine		xs_emuEngine;
+typedef	sidTune			t_xs_tune;
 typedef struct sidTuneInfo	t_xs_tuneinfo;
 #endif
 
 #ifdef HAVE_SIDPLAY2
 static struct sid2_config_t	xs_emuConf;
-static sidplay2		xs_emuEngine;
-typedef SidTune		t_xs_tune;
+static sidplay2			xs_emuEngine;
+typedef SidTune			t_xs_tune;
 typedef struct SidTuneInfo	t_xs_tuneinfo;
 #endif
 
-
-static GtkWidget	*xs_ctrlwin	= NULL;
-static pthread_t	xs_decode_thread;
-struct t_xs_cfg		xs_cfg;
-
+static GtkWidget		*xs_ctrlwin	= NULL;
+static pthread_t		xs_decode_thread;
+struct t_xs_cfg			xs_cfg;
 
 struct {
 	gboolean	isError, isPlaying, allowNext;
@@ -77,7 +75,7 @@
 	gchar		*currFilename;
 } xs_status;
 
-pthread_mutex_t xs_mutex = PTHREAD_MUTEX_INITIALIZER;
+pthread_mutex_t			xs_mutex = PTHREAD_MUTEX_INITIALIZER;
 
 /*
  * Create sub-song control window
diff -r 0d1df20745dd -r 05220299c6e8 src/xs_about.c
--- a/src/xs_about.c	Sun Jun 22 11:38:00 2003 +0000
+++ b/src/xs_about.c	Sun Jun 22 12:10:01 2003 +0000
@@ -83,11 +83,17 @@
  gtk_container_set_border_width (GTK_CONTAINER (about_frame), 4);
  gtk_frame_set_shadow_type (GTK_FRAME (about_frame), GTK_SHADOW_OUT);
 
+ /* Create the Gdk data for logo pixmap */
+ gtk_widget_realize (xs_aboutwin);
  about_logo_pixmap = gdk_pixmap_create_from_xpm_d(
- 	xs_aboutwin, &about_logo_mask, NULL, xmms_sid_logo_xpm);
+ 	xs_aboutwin->window,
+ 	&about_logo_mask,
+ 	NULL,
+ 	(gchar **) xmms_sid_logo_xpm);
 
  about_logo = gtk_pixmap_new(about_logo_pixmap, about_logo_mask);
- 
+
+ /* Create logo widget */
  gtk_widget_set_name (about_logo, "about_logo");
  gtk_widget_ref (about_logo);
  gtk_object_set_data_full (GTK_OBJECT (xs_aboutwin), "about_logo", about_logo,
@@ -128,11 +134,13 @@
 	"Original XMMS-SID created by\n"
 	"\tWillem Monsuwe\n"
 	"\n"
+#if 0
 	"\"XMMS-SID Theme\"-song (SIDtune)\n"
 	"\tPeter 'Brite-Lite' Halin of Dekadence\n"
 	"\t(C) Copyright 2003 Dekadence\n"
 	"\thttp://www.dekadence64.org/\n"
 	"\n"
+#endif
 	"Thanks and greetings ...\n"
 	"\tEveryone at #Linux.Fi, #Fireball,\n"
 	"\t#TNSP and #c-64 of IRCNet...\n"
diff -r 0d1df20745dd -r 05220299c6e8 src/xs_config.c
--- a/src/xs_config.c	Sun Jun 22 11:38:00 2003 +0000
+++ b/src/xs_config.c	Sun Jun 22 12:10:01 2003 +0000
@@ -24,7 +24,7 @@
 #include <stdio.h>
 #include "xs_glade.h"
 #include "xs_interface.h"
-
+#include "xs_support.h"
 
 /*
  * Global widgets
@@ -351,6 +351,9 @@
 			tmpValue = gtk_range_get_adjustment(
 				GTK_RANGE(LUW(xs_widtable[i].widName)))->value;
 			break;
+
+		default:
+			tmpValue = -1;
 		}
 		
 		/* Set the value */
@@ -544,6 +547,9 @@
 		case CTYPE_FLOAT:
 			tmpValue = *((gfloat *) xs_widtable[i].valData);
 			break;
+
+		default:
+			tmpValue = -1;
 		}
 		
 		/* Set the value */