Mercurial > hg > xmms-sid
changeset 710:a6283cf95c99
Updated to work with latest distortion patched libSIDPlay2+reSID from Antti
Lankila.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Mon, 09 Feb 2009 11:12:17 +0200 |
| parents | 5ed24c6b6ac4 |
| children | d18884383ca3 |
| files | src/xs_sidplay2.cc |
| diffstat | 1 files changed, 8 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xs_sidplay2.cc Mon Jun 16 16:10:33 2008 +0300 +++ b/src/xs_sidplay2.cc Mon Feb 09 11:12:17 2009 +0200 @@ -239,6 +239,9 @@ break; } +#ifdef HAVE_SIDPLAY2_DISTORTION + XSDEBUG("filter setting NOT supported for distortion patched libSIDPlay2.\n"); +#else /* Convert filter */ f = &(xs_cfg.sid2Filter); XSDEBUG("using filter '%s', %d points\n", f->name, f->npoints); @@ -253,6 +256,7 @@ tmpFilter.cutoff[i][0] = f->points[i].x; tmpFilter.cutoff[i][1] = f->points[i].y; } +#endif /* Initialize builder object */ XSDEBUG("init builder #%i, maxsids=%i\n", xs_cfg.sid2Builder, (myEngine->currEng->info()).maxsids); @@ -289,11 +293,10 @@ xs_error("reSID->sampling(%d) failed.\n", tmpFreq); return FALSE; } -#endif - if (tmpFilter.points > 0) rs->filter((sid_filter_t *) &tmpFilter); else +#endif rs->filter((sid_filter_t *) NULL); if (!*rs) { @@ -359,7 +362,6 @@ /* Configure rest of the emulation */ - if (xs_cfg.forceSpeed) { myEngine->currConfig.clockForced = true; myEngine->currConfig.clockSpeed = myEngine->currConfig.clockDefault; @@ -368,6 +370,8 @@ myEngine->currConfig.clockSpeed = SID2_CLOCK_CORRECT; } + +#ifndef HAVE_SIDPLAY2_DISTORTION if ((xs_cfg.sid2OptLevel >= 0) && (xs_cfg.sid2OptLevel <= SID2_MAX_OPTIMISATION)) myEngine->currConfig.optimisation = xs_cfg.sid2OptLevel; else { @@ -377,6 +381,7 @@ xs_cfg.sid2OptLevel = myEngine->currConfig.optimisation = SID2_DEFAULT_OPTIMISATION; } +#endif if (xs_cfg.mos8580) myEngine->currConfig.sidDefault = SID2_MOS8580;