# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1364475700 -7200
# Node ID d9ad299059a4b67f532e48888f856cf74b1aafa8
# Parent  56368ab7d282c77d803d11b4d5638f1c0cf41e12
Update to be compatible with libsidplayfp 1.0.1 API.

diff -r 56368ab7d282 -r d9ad299059a4 src/xs_sidplayfp.cpp
--- a/src/xs_sidplayfp.cpp	Sat Dec 01 11:03:46 2012 +0200
+++ b/src/xs_sidplayfp.cpp	Thu Mar 28 15:01:40 2013 +0200
@@ -101,8 +101,8 @@
 #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 SID2_CLOCK_PAL         SidConfig::PAL
+#define SID2_CLOCK_NTSC        SidConfig::NTSC
 
 #define SIDTUNE_CLOCK_UNKNOWN  SidTuneInfo::CLOCK_UNKNOWN
 #define SIDTUNE_CLOCK_PAL      SidTuneInfo::CLOCK_PAL
@@ -139,6 +139,7 @@
  */
 gboolean xs_sidplayfp_init(XSEngineState * state)
 {
+    (void) state;
     assert(state);
 
     XSDEBUG("SIDPlayFP backend initializing.\n");
@@ -252,30 +253,39 @@
     switch (xs_cfg.clockSpeed)
     {
         case XS_CLOCK_NTSC:
+#ifdef HAVE_SIDPLAYFP_V1
+            engine->config.defaultC64Model = SID2_CLOCK_NTSC;
+#else
             engine->config.clockDefault = SID2_CLOCK_NTSC;
+#endif
             break;
 
         default:
         case XS_CLOCK_PAL:
-            engine->config.clockDefault = SID2_CLOCK_PAL;
+#ifdef HAVE_SIDPLAYFP_V1
+#else
+            engine->config.defaultC64Model = SID2_CLOCK_PAL;
+#endif
             xs_cfg.clockSpeed = XS_CLOCK_PAL;
             break;
     }
 
 
     /* Configure rest of the emulation */
+
+#ifdef HAVE_SIDPLAYFP_V1
+    engine->config.forceC64Model   = xs_cfg.forceSpeed;
+    engine->config.defaultSidModel = xs_cfg.mos8580 ? SID2_MOS8580 : SID2_MOS6581;
+    XSDEBUG("init builder #%i, maxsids=%i\n", xs_cfg.sid2Builder, (engine->emu.info()).maxsids());
+#else
     engine->config.sidDefault  = xs_cfg.mos8580 ? SID2_MOS8580 : SID2_MOS6581;
     engine->config.clockForced = xs_cfg.forceSpeed;
-
-#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;
 
     /* 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)