--- a/src/xs_sidplay2.cc	Wed Jan 24 22:08:02 2007 +0000
+++ b/src/xs_sidplay2.cc	Wed Jan 24 22:10:00 2007 +0000
@@ -24,8 +24,8 @@
 
 #ifdef HAVE_SIDPLAY2
 
+#include <stdio.h>
 #include "xs_sidplay2.h"
-#include <stdio.h>
 #include "xs_config.h"
 #include "xs_support.h"
 
@@ -53,7 +53,7 @@
 
 /* Check if we can play the given file
  */
-gboolean xs_sidplay2_isourfile(gchar * pcFilename)
+gboolean xs_sidplay2_isourfile(gchar *pcFilename)
 {
 	SidTune *testTune = new SidTune(pcFilename);
 
@@ -69,10 +69,9 @@
 }
 
 
-
 /* Initialize SIDPlay2
  */
-gboolean xs_sidplay2_init(t_xs_status * myStatus)
+gboolean xs_sidplay2_init(t_xs_ t_xs_status * myStatus)
 {
 	gint tmpFreq;
 	t_xs_sidplay2 *myEngine;
@@ -376,7 +375,7 @@
 		return FALSE;
 	}
 	
-	myEngine->isInitialized = TRUE;
+	myStatus->isInitialized = TRUE;
 
 	return TRUE;
 }
@@ -398,7 +397,7 @@
 
 /* Load a given SID-tune file
  */
-gboolean xs_sidplay2_loadsid(t_xs_status * myStatus, gchar * pcFilename)
+gboolean xs_sidplay2_load(t_xs_status * myStatus, gchar * pcFilename)
 {
 	t_xs_sidplay2 *myEngine;
 	assert(myStatus);
@@ -406,7 +405,7 @@
 	myEngine = (t_xs_sidplay2 *) myStatus->sidEngine;
 	if (!myEngine) return FALSE;
 	
-	myEngine->isInitialized = FALSE;
+	myStatus->isInitialized = FALSE;
 
 	/* Try to get the tune */
 	if (!pcFilename) return FALSE;
@@ -420,7 +419,7 @@
 
 /* Delete INTERNAL information
  */
-void xs_sidplay2_deletesid(t_xs_status * myStatus)
+void xs_sidplay2_delete(t_xs_status * myStatus)
 {
 	assert(myStatus);
 
@@ -430,7 +429,8 @@
 
 /* Return song information
  */
-#define TFUNCTION	xs_sidplay2_getsidinfo
+#define TFUNCTION	xs_sidplay2_getinfo
+#define TFUNCTION2	xs_sidplay2_updateinfo
 #define TTUNEINFO	SidTuneInfo
 #define TTUNE		SidTune
 #include "xs_sidplay.h"