--- a/src/xs_sidplay2.h	Mon Nov 05 17:53:22 2012 +0200
+++ b/src/xs_sidplay2.h	Mon Nov 05 18:42:57 2012 +0200
@@ -9,16 +9,16 @@
 extern "C" {
 #endif
 
-gboolean    xs_sidplay2_probe(xs_file_t *);
-void        xs_sidplay2_close(xs_status_t *);
-gboolean    xs_sidplay2_init(xs_status_t *);
-gboolean    xs_sidplay2_initsong(xs_status_t *);
-guint        xs_sidplay2_fillbuffer(xs_status_t *, gchar *, guint);
-gboolean    xs_sidplay2_load(xs_status_t *, gchar *);
-void        xs_sidplay2_delete(xs_status_t *);
-xs_tuneinfo_t*    xs_sidplay2_getinfo(const gchar *);
-gboolean    xs_sidplay2_updateinfo(xs_status_t *);
-void        xs_sidplay2_flush(xs_status_t *);
+gboolean    xs_sidplay2_probe(XSFile *);
+void        xs_sidplay2_close(XSEngineState *);
+gboolean    xs_sidplay2_init(XSEngineState *);
+gboolean    xs_sidplay2_initsong(XSEngineState *);
+guint        xs_sidplay2_fillbuffer(XSEngineState *, gchar *, guint);
+gboolean    xs_sidplay2_load(XSEngineState *, gchar *);
+void        xs_sidplay2_delete(XSEngineState *);
+XSTuneInfo*    xs_sidplay2_getinfo(const gchar *);
+gboolean    xs_sidplay2_updateinfo(XSEngineState *);
+void        xs_sidplay2_flush(XSEngineState *);
 
 #ifdef __cplusplus
 }