--- a/src/xs_sidplay2.cc	Mon Nov 05 17:53:22 2012 +0200
+++ b/src/xs_sidplay2.cc	Mon Nov 05 18:42:57 2012 +0200
@@ -103,7 +103,7 @@
 
 /* Check if we can play the given file
  */
-gboolean xs_sidplay2_probe(xs_file_t *f)
+gboolean xs_sidplay2_probe(XSFile *f)
 {
     gchar tmpBuf[5];
     
@@ -121,7 +121,7 @@
 
 /* Initialize SIDPlay2
  */
-gboolean xs_sidplay2_init(xs_status_t * myStatus)
+gboolean xs_sidplay2_init(XSEngineState * myStatus)
 {
     gint i;
     xs_sidplay2_t *myEngine;
@@ -430,7 +430,7 @@
 
 /* Close SIDPlay2 engine
  */
-void xs_sidplay2_close(xs_status_t * myStatus)
+void xs_sidplay2_close(XSEngineState * myStatus)
 {
     xs_sidplay2_t *myEngine;
     assert(myStatus);
@@ -466,7 +466,7 @@
 
 /* Initialize current song and sub-tune
  */
-gboolean xs_sidplay2_initsong(xs_status_t * myStatus)
+gboolean xs_sidplay2_initsong(XSEngineState * myStatus)
 {
     xs_sidplay2_t *myEngine;
     assert(myStatus);
@@ -492,7 +492,7 @@
 
 /* Emulate and render audio data to given buffer
  */
-guint xs_sidplay2_fillbuffer(xs_status_t * myStatus, gchar * audioBuffer, guint audioBufSize)
+guint xs_sidplay2_fillbuffer(XSEngineState * myStatus, gchar * audioBuffer, guint audioBufSize)
 {
     xs_sidplay2_t *myEngine;
     assert(myStatus);
@@ -506,7 +506,7 @@
 
 /* Load a given SID-tune file
  */
-gboolean xs_sidplay2_load(xs_status_t * myStatus, gchar * pcFilename)
+gboolean xs_sidplay2_load(XSEngineState * myStatus, gchar * pcFilename)
 {
     xs_sidplay2_t *myEngine;
     assert(myStatus);
@@ -530,7 +530,7 @@
 
 /* Delete INTERNAL information
  */
-void xs_sidplay2_delete(xs_status_t * myStatus)
+void xs_sidplay2_delete(XSEngineState * myStatus)
 {
     xs_sidplay2_t *myEngine;
     assert(myStatus);
@@ -546,7 +546,7 @@
 
 /* Hardware backend flushing
  */
-void xs_sidplay2_flush(xs_status_t * myStatus)
+void xs_sidplay2_flush(XSEngineState * myStatus)
 {
     assert(myStatus);