--- a/src/xmms-sid.c	Mon Nov 05 18:47:33 2012 +0200
+++ b/src/xmms-sid.c	Mon Nov 05 18:51:11 2012 +0200
@@ -166,8 +166,8 @@
 
     xs_tuneinfo_free(xs_status.tuneInfo);
     xs_status.tuneInfo = NULL;
-    xs_status.sidPlayer->plrDeleteSID(&xs_status);
-    xs_status.sidPlayer->plrClose(&xs_status);
+    xs_status.engine->plrDeleteSID(&xs_status);
+    xs_status.engine->plrClose(&xs_status);
 
     xs_songlen_close();
     xs_stil_close();
@@ -182,7 +182,7 @@
 gint xs_is_our_file(gchar *filename)
 {
     gchar *ext;
-    assert(xs_status.sidPlayer);
+    assert(xs_status.engine);
 
     /* Check the filename */
     if (filename == NULL)
@@ -192,7 +192,7 @@
     if (xs_cfg.detectMagic) {
         XSFile *f;
         if ((f = xs_fopen(filename, "rb")) != NULL) {
-            if (xs_status.sidPlayer->plrProbe(f))
+            if (xs_status.engine->plrProbe(f))
                 return TRUE;
             xs_fclose(f);
         }
@@ -323,7 +323,7 @@
         }
 
         /* Initialize song */
-        if (!myStatus.sidPlayer->plrInitSong(&myStatus)) {
+        if (!myStatus.engine->plrInitSong(&myStatus)) {
             xs_error("Couldn't initialize SID-tune '%s' (sub-tune #%i)!\n",
                   myTune->sidFilename, myStatus.currSong);
             goto xs_err_exit;
@@ -350,7 +350,7 @@
 
         /* Set song information for current subtune */
         XSDEBUG("set tune info\n");
-        myStatus.sidPlayer->plrUpdateSIDInfo(&myStatus);        
+        myStatus.engine->plrUpdateSIDInfo(&myStatus);        
         tmpTitle = xs_make_titlestring(myTune, myStatus.currSong);
         
         xs_plugin_ip.set_info(
@@ -368,7 +368,7 @@
          * Play the subtune
          */
         while (xs_status.isPlaying && myStatus.isPlaying && (xs_status.currSong == myStatus.currSong)) {
-            audioGot = myStatus.sidPlayer->plrFillBuffer(
+            audioGot = myStatus.engine->plrFillBuffer(
                 &myStatus, audioBuffer, XS_AUDIOBUF_SIZE);
 
             /* I <3 visualice/haujobb */
@@ -455,16 +455,16 @@
  */
 void xs_play_file(gchar *filename)
 {
-    assert(xs_status.sidPlayer);
+    assert(xs_status.engine);
 
     XSDEBUG("play '%s'\n", filename);
 
     /* Get tune information */
-    if ((xs_status.tuneInfo = xs_status.sidPlayer->plrGetSIDInfo(filename)) == NULL)
+    if ((xs_status.tuneInfo = xs_status.engine->plrGetSIDInfo(filename)) == NULL)
         return;
 
     /* Initialize the tune */
-    if (!xs_status.sidPlayer->plrLoadSID(&xs_status, filename)) {
+    if (!xs_status.engine->plrLoadSID(&xs_status, filename)) {
         xs_tuneinfo_free(xs_status.tuneInfo);
         xs_status.tuneInfo = NULL;
         return;
@@ -482,7 +482,7 @@
         xs_error("Couldn't create playing thread!\n");
         xs_tuneinfo_free(xs_status.tuneInfo);
         xs_status.tuneInfo = NULL;
-        xs_status.sidPlayer->plrDeleteSID(&xs_status);
+        xs_status.engine->plrDeleteSID(&xs_status);
     }
 
     /* Okay, here the playing thread has started up and we
@@ -530,7 +530,7 @@
 
     /* Free tune information */
     XS_MUTEX_LOCK(xs_status);
-    xs_status.sidPlayer->plrDeleteSID(&xs_status);
+    xs_status.engine->plrDeleteSID(&xs_status);
     xs_tuneinfo_free(xs_status.tuneInfo);
     xs_status.tuneInfo = NULL;
     XS_MUTEX_UNLOCK(xs_status);
@@ -831,7 +831,7 @@
     XS_MUTEX_LOCK(xs_status);
 
     /* Get tune information from emulation engine */
-    info = xs_status.sidPlayer->plrGetSIDInfo(songFilename);
+    info = xs_status.engine->plrGetSIDInfo(songFilename);
     if (!info) {
         XS_MUTEX_UNLOCK(xs_status);
         return;