Mercurial > hg > xmms-sid
diff src/xs_sidplay.h @ 838:ae1f6418d093
libSIDPlay2-FP backend interface is now in a separate module. Configuration
related things still pending.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Thu, 08 Nov 2012 21:24:38 +0200 |
| parents | 778531e968ed |
| children | 2663b1ac9ce6 |
line wrap: on
line diff
--- a/src/xs_sidplay.h Thu Nov 08 20:58:45 2012 +0200 +++ b/src/xs_sidplay.h Thu Nov 08 21:24:38 2012 +0200 @@ -67,7 +67,7 @@ info.infoString[0], info.infoString[1], info.infoString[2], info.loadAddr, info.initAddr, info.playAddr, info.dataFileLen, info.formatString, -#if defined(XS_SIDPLAY2_H) && defined(HAVE_SIDPLAY2_FP) +#if defined(XS_SIDPLAYFP_H) && defined(HAVE_SIDPLAYFP) info.sidModel1 #else info.sidModel @@ -103,17 +103,18 @@ return FALSE; /* Get currently playing tune information */ -#ifdef XS_SIDPLAY1_H +#if defined(XS_SIDPLAY1_H) engine->tune->getInfo(info); -#endif -#ifdef XS_SIDPLAY2_H +#elif defined(XS_SIDPLAY2_H) + info = engine->tune.getInfo(); +#elif defined(XS_SIDPLAYFP_H) info = engine->tune.getInfo(); #endif /* NOTICE! Here we assume that libSIDPlay[12] headers define * SIDTUNE_SIDMODEL_* similarly to our enums in xs_config.h ... */ -#if defined(XS_SIDPLAY2_H) && defined(HAVE_SIDPLAY2_FP) +#if defined(XS_SIDPLAYFP_H) && defined(HAVE_SIDPLAYFP) state->tuneInfo->sidModel = info.sidModel1; #else state->tuneInfo->sidModel = info.sidModel;