--- a/src/xs_sidplayfp.cpp	Fri Nov 09 00:19:21 2012 +0200
+++ b/src/xs_sidplayfp.cpp	Fri Nov 09 02:11:21 2012 +0200
@@ -34,7 +34,7 @@
 #  include <sidplayfp/sidplayfp.h>
 #  include <sidplayfp/event.h>
 #  include <sidplayfp/SidConfig.h>
-#  include <sidplayfp/SidTuneInfo.h>
+#  include <sidplayfp/SidInfo.h>
 #else
 #  include <sidplayfp/sidplay2.h>
 #  include <sidplayfp/SidTuneMod.h>
@@ -51,7 +51,7 @@
     sidplay2 emu;
     sid2_config_t config;
 #endif
-    SidTuneMod tune;
+    SidTune tune;
 
     XSSIDPlayFP(void);
     virtual ~XSSIDPlayFP(void);
@@ -73,6 +73,7 @@
 
 XSSIDPlayFP::XSSIDPlayFP(void) : tune(0)
 {
+    emu.load(NULL);
 }
 
 
@@ -88,19 +89,19 @@
 
 /* Return song information
  */
-#define TFUNCTION              xs_sidplayfp_getinfo
-#define TFUNCTION2             xs_sidplayfp_updateinfo
-#define TENGINE                XSSIDPlayFP
-#define TTUNEINFO              SidTuneInfo
-#define TTUNE                  SidTune
-
 #ifdef HAVE_SIDPLAYFP_V1
 #define sid2_mono              SidConfig::MONO
 #define sid2_stereo            SidConfig::STEREO
+
+#define SID2_INTERPOLATE       SidConfig::INTERPOLATE
+#define SID2_RESAMPLE_INTERPOLATE SidConfig::RESAMPLE_INTERPOLATE
+
 #define SID2_MOS8580           SidConfig::MOS8580
 #define SID2_MOS6581           SidConfig::MOS6581
+
 #define SID2_CLOCK_PAL         SidConfig::CLOCK_PAL
 #define SID2_CLOCK_NTSC        SidConfig::CLOCK_NTSC
+
 #define SIDTUNE_CLOCK_UNKNOWN  SidTuneInfo::CLOCK_UNKNOWN
 #define SIDTUNE_CLOCK_PAL      SidTuneInfo::CLOCK_PAL
 #define SIDTUNE_CLOCK_NTSC     SidTuneInfo::CLOCK_NTSC
@@ -109,8 +110,6 @@
 #define SIDTUNE_SPEED_CIA_1A   SidTuneInfo::SPEED_CIA_1A
 #endif
 
-#include "xs_sidplay.h"
-
 
 /* Check if we can play the given file
  */
@@ -181,10 +180,12 @@
     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;
-#endif
 
     /* Initialize builder object */
     XSDEBUG("init builder #%i, maxsids=%i\n", xs_cfg.sid2Builder, (engine->emu.info()).maxsids);
+#else
+    XSDEBUG("init builder #%i, maxsids=%i\n", xs_cfg.sid2Builder, (engine->emu.info()).maxsids());
+#endif
 
     switch (xs_cfg.sid2Builder)
     {
@@ -195,17 +196,21 @@
 #ifdef HAVE_SIDPLAYFP_V1
                 if (rs && rs->getStatus())
                 {
+                    engine->config.sidEmulation = rs;
+                    if (!rs->getStatus()) return FALSE;
+                    rs->create((engine->emu.info()).maxsids());
+                    if (!rs->getStatus()) return FALSE;
                 }
 #else
                 if (rs && *rs)
                 {
                     engine->config.sidEmulation = rs;
-                    if (!(*rs)) return FALSE;
+                    if (!*rs) return FALSE;
                     rs->create((engine->emu.info()).maxsids);
-                    if (!(*rs)) return FALSE;
-                    rs->bias(0.0f);
+                    if (!*rs) return FALSE;
                 }
-#endif // HAVE_SIDPLAYFP_V1
+#endif
+                rs->bias(0.0f);
             }
             break;
 #endif // HAVE_RESID_BUILDER
@@ -215,16 +220,25 @@
         case XS_BLD_RESID_FP:
             {
                 ReSIDfpBuilder *rs = new ReSIDfpBuilder("ReSID builder FP!");
+#ifdef HAVE_SIDPLAYFP_V1
+                if (rs && rs->getStatus())
+                {
+                    engine->config.sidEmulation = rs;
+                    if (!rs->getStatus()) return FALSE;
+                    rs->create((engine->emu.info()).maxsids());
+                    if (!rs->getStatus()) return FALSE;
+                }
+#else
                 if (rs && *rs)
                 {
                     engine->config.sidEmulation = rs;
-                    if (!(*rs)) return FALSE;
+                    if (!*rs) return FALSE;
                     rs->create((engine->emu.info()).maxsids);
-                    if (!(*rs)) return FALSE;
-
-                    rs->filter6581Curve(0.0);
-                    rs->filter8580Curve(0.0);
+                    if (!*rs) return FALSE;
                 }
+#endif
+                rs->filter6581Curve(0.0);
+                rs->filter8580Curve(0.0);
             }
             break;
 #endif
@@ -234,15 +248,19 @@
             {
                 HardSIDBuilder *hs = new HardSIDBuilder("HardSID builder (FP)");
                 engine->config.sidEmulation = (sidbuilder *) hs;
-                if (hs)
+#ifdef HAVE_SIDPLAYFP_V1
+                if (hs && hs->getStatus())
+                {
+                    hs->create((engine->emu.info()).maxsids());
+                    if (!hs->getStatus()) return FALSE;
+                }
+#else
+                if (hs && *hs)
                 {
                     hs->create((engine->emu.info()).maxsids);
-                    if (!*hs)
-                    {
-                        xs_error("hardSID->create() failed.\n");
-                        return FALSE;
-                    }
+                    if (!*hs) return FALSE;
                 }
+#endif
             }
             break;
 #endif
@@ -260,7 +278,11 @@
 
     // Setup filter
     engine->config.sidEmulation->filter(xs_cfg.emulateFilters);
+#ifdef HAVE_SIDPLAYFP_V1
+    if (!engine->config.sidEmulation->getStatus())
+#else
     if (!*(engine->config.sidEmulation))
+#endif
     {
         xs_error("builder->filter(%d) failed.\n", xs_cfg.emulateFilters);
         return FALSE;
@@ -333,14 +355,7 @@
     if (!engine)
         return 0;
 
-#if 1
-    int nsamples = audioBufSize / sizeof(short);
-    return engine->emu.play((short *) audioBuffer, nsamples) * sizeof(short);
-#else
-    int nsamples = audioBufSize / sizeof(short);
-    fprintf(stderr, "%p, %d -> %d\n", audioBuffer, audioBufSize, nsamples);
-    return 0;
-#endif
+    return engine->emu.play((short *) audioBuffer, audioBufSize / sizeof(short)) * sizeof(short);
 }
 
 
@@ -354,10 +369,13 @@
         return FALSE;
     
     engine->tune.load(filename);
+#ifdef HAVE_SIDPLAYFP_V1
+    if (!engine->tune.getStatus())
+#else
     if (!engine->tune)
+#endif
     {
-        xs_error("Could not load file '%s': %s\n",
-            filename, (engine->tune.getInfo()).statusString);
+        xs_error("Could not load file '%s'\n", filename);
         return FALSE;
     }
 
@@ -389,5 +407,128 @@
 }
 
 
+/* This function gets most of the information, though we do miss some
+ * (those variables that are only set by libSIDPlay when tune is initialized).
+ * Rest of the information is acquired in xs_sidplayfp_updateinfo()
+ */
+XSTuneInfo *xs_sidplayfp_getinfo(const gchar *filename)
+{
+    XSTuneInfo *res;
+    SidTune *tune;
+
+    /* Check if the tune exists and is readable */
+    if ((tune = new SidTune(filename)) == NULL)
+    {
+        XSDEBUG("could not initialize tune from '%s'.\n", filename);
+        return NULL;
+    }
+
+    if (!tune->getStatus())
+    {
+        XSDEBUG("tune->getStatus() returned false for '%s'.\n", filename);
+        delete tune;
+        return NULL;
+    }
+
+    /* Get general tune information */
+#ifdef HAVE_SIDPLAYFP_V1
+    const SidTuneInfo *info = tune->getInfo();
+
+    res = xs_tuneinfo_new(filename,
+        info->songs(), info->startSong(),
+        info->infoString(0), info->infoString(1), info->infoString(2),
+        info->loadAddr(), info->initAddr(), info->playAddr(),
+        info->dataFileLen(), info->formatString(),
+        info->sidModel1()
+        );
+#else
+    const SidTuneInfo info = tune->getInfo();
+
+    res = xs_tuneinfo_new(filename,
+        info.songs, info.startSong,
+        info.infoString[0], info.infoString[1], info.infoString[2],
+        info.loadAddr, info.initAddr, info.playAddr,
+        info.dataFileLen, info.formatString,
+        info.sidModel1
+        );
+#endif
+
+    delete tune;
+    return res;
+}
+
+
+/* Updates the information of currently playing tune
+ */
+gboolean xs_sidplayfp_updateinfo(XSEngineState *state)
+{
+    XSSIDPlayFP *engine;
+    
+    /* Check if we have required structures initialized */
+    if (!state || !state->tuneInfo || !state->internal)
+        return FALSE;
+
+    engine = (XSSIDPlayFP *) state->internal;
+
+#ifdef HAVE_SIDPLAYFP_V1
+    if (!engine->tune.getStatus())
+        return FALSE;
+
+    const SidTuneInfo *info = engine->tune.getInfo();
+
+    state->tuneInfo->sidModel = info.sidModel1();
+
+    if (state->currSong > 0 && state->currSong <= state->tuneInfo->nsubTunes)
+    {
+        gint tmpSpeed = info->clockSpeed();
+        switch (info->clockSpeed())
+        {
+            case SIDTUNE_CLOCK_PAL:      tmpSpeed = XS_CLOCK_PAL; break;
+            case SIDTUNE_CLOCK_NTSC:     tmpSpeed = XS_CLOCK_NTSC; break;
+            case SIDTUNE_CLOCK_ANY:      tmpSpeed = XS_CLOCK_ANY; break;
+            case SIDTUNE_CLOCK_UNKNOWN:
+                switch (info->songSpeed())
+                {
+                    case SIDTUNE_SPEED_VBI:      tmpSpeed = XS_CLOCK_VBI; break;
+                    case SIDTUNE_SPEED_CIA_1A:   tmpSpeed = XS_CLOCK_CIA; break;
+                    default:                     tmpSpeed = info->songSpeed(); break;
+                }
+                break;
+        }
+        state->tuneInfo->subTunes[state->currSong - 1].tuneSpeed = tmpSpeed;
+    }
+#else
+    if (!(engine->tune))
+        return FALSE;
+
+    const SidTuneInfo info = engine->tune.getInfo();
+
+    state->tuneInfo->sidModel = info.sidModel1;
+
+    if (state->currSong > 0 && state->currSong <= state->tuneInfo->nsubTunes)
+    {
+        gint tmpSpeed = info.clockSpeed;
+        switch (info.clockSpeed)
+        {
+            case SIDTUNE_CLOCK_PAL:      tmpSpeed = XS_CLOCK_PAL; break;
+            case SIDTUNE_CLOCK_NTSC:     tmpSpeed = XS_CLOCK_NTSC; break;
+            case SIDTUNE_CLOCK_ANY:      tmpSpeed = XS_CLOCK_ANY; break;
+            case SIDTUNE_CLOCK_UNKNOWN:
+                switch (info.songSpeed)
+                {
+                    case SIDTUNE_SPEED_VBI:      tmpSpeed = XS_CLOCK_VBI; break;
+                    case SIDTUNE_SPEED_CIA_1A:   tmpSpeed = XS_CLOCK_CIA; break;
+                    default:                     tmpSpeed = info.songSpeed; break;
+                }
+                break;
+        }
+        state->tuneInfo->subTunes[state->currSong - 1].tuneSpeed = tmpSpeed;
+    }
+#endif
+
+    return TRUE;
+}
+
+
 }    /* extern "C" */
 #endif    /* HAVE_SIDPLAYFP */