--- a/src/xs_sidplayfp.cpp	Thu Nov 08 20:58:45 2012 +0200
+++ b/src/xs_sidplayfp.cpp	Thu Nov 08 21:24:38 2012 +0200
@@ -1,7 +1,7 @@
 /*
    XMMS-SID - SIDPlay input plugin for X MultiMedia System (XMMS)
 
-   libSIDPlay v2-FP support
+   libSIDPlay2-FP support
 
    Programmed and designed by Matti 'ccr' Hamalainen <ccr@tnsp.org>
    (C) Copyright 1999-2012 Tecnic Software productions (TNSP)
@@ -22,14 +22,14 @@
 */
 #include "xmms-sid.h"
 
-#ifdef HAVE_SIDPLAY2_FP
+#ifdef HAVE_SIDPLAYFP
 
-#include <stdio.h>
-#include "xs_sidplay2.h"
+#include "xs_sidplayfp.h"
+#include "xs_slsup.h"
 #include "xs_config.h"
 
 
-#ifdef HAVE_SIDPLAY2_FP_V1
+#ifdef HAVE_SIDPLAYFP_V1
 #  include <sidplayfp/SidTune.h>
 #  include <sidplayfp/sidplayfp.h>
 #  include <sidplayfp/event.h>
@@ -44,22 +44,25 @@
 
 class XSSIDPlayFP {
 public:
-#ifdef HAVE_SIDPLAY2_FP_V1
+#ifdef HAVE_SIDPLAYFP_V1
     sidplayfp emu;
     SidConfig config;
 #else
     sidplay2 emu;
     sid2_config_t config;
 #endif
-    SidTune tune;
+    SidTuneMod tune;
 
     XSSIDPlayFP(void);
     virtual ~XSSIDPlayFP(void);
 };
 
 
-#ifdef HAVE_RESID_BUILDER
+#ifdef HAVE_RESID_FP_BUILDER
 #  include <sidplayfp/builders/residfp.h>
+#endif
+
+#ifdef HAVE_RESID_FP_BUILDER
 #  include <sidplayfp/builders/resid.h>
 #endif
 
@@ -91,7 +94,7 @@
 #define TTUNEINFO              SidTuneInfo
 #define TTUNE                  SidTune
 
-#ifdef HAVE_SIDPLAY2_FP_V1
+#ifdef HAVE_SIDPLAYFP_V1
 #define sid2_mono              SidConfig::MONO
 #define sid2_stereo            SidConfig::STEREO
 #define SID2_MOS8580           SidConfig::MOS8580
@@ -160,7 +163,7 @@
         case XS_BLD_RESID:
             {
                 ReSIDBuilder *rs = new ReSIDBuilder("ReSID builder");
-#ifdef HAVE_SIDPLAY2_FP_V1
+#ifdef HAVE_SIDPLAYFP_V1
                 if (rs && rs->getStatus())
                 {
                 }
@@ -173,7 +176,7 @@
                     if (!*rs) return FALSE;
                     rs->bias(0.0f);
                 }
-#endif // HAVE_SIDPLAY2_FP_V1
+#endif // HAVE_SIDPLAYFP_V1
             }
             break;
 #endif // HAVE_RESID_BUILDER
@@ -255,7 +258,7 @@
     engine->config.sidDefault  = xs_cfg.mos8580 ? SID2_MOS8580 : SID2_MOS6581;
     engine->config.clockForced = xs_cfg.forceSpeed;
 
-#ifndef HAVE_SIDPLAY2_FP_V1
+#ifndef HAVE_SIDPLAYFP_V1
     engine->config.sidSamples  = TRUE;
     engine->config.sidModel    = xs_cfg.forceModel ? engine->config.sidDefault : SID2_MODEL_CORRECT;
     engine->config.clockSpeed  = xs_cfg.forceSpeed ? engine->config.clockDefault : SID2_CLOCK_CORRECT;
@@ -359,7 +362,8 @@
  */
 void xs_sidplayfp_delete(XSEngineState * state)
 {
-    XSSIDPlayFP *engine = (XSSIDPlayFP *) state->internal;
+    (void) state;
+//    XSSIDPlayFP *engine = (XSSIDPlayFP *) state->internal;
 }
 
 
@@ -379,4 +383,4 @@
 
 
 }    /* extern "C" */
-#endif    /* HAVE_SIDPLAY2_FP */
+#endif    /* HAVE_SIDPLAYFP */