Mercurial > hg > xmms-sid
diff src/xs_sidplay2.cc @ 761:641b7693fecc
Cosmetic cleanups.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Mon, 05 Nov 2012 20:04:05 +0200 |
parents | 6c8c968595d9 |
children | 1294df516d2e |
line wrap: on
line diff
--- a/src/xs_sidplay2.cc Mon Nov 05 20:03:14 2012 +0200 +++ b/src/xs_sidplay2.cc Mon Nov 05 20:04:05 2012 +0200 @@ -265,19 +265,26 @@ /* Initialize builder object */ XSDEBUG("init builder #%i, maxsids=%i\n", xs_cfg.sid2Builder, (engine->currEng->info()).maxsids); + #ifdef HAVE_RESID_BUILDER if (xs_cfg.sid2Builder == XS_BLD_RESID) { + #ifdef HAVE_SIDPLAY2_FP - ReSIDBuilder *rs = new ReSIDBuilder("ReSID builder"); + ReSIDBuilder *rs = new ReSIDBuilder("ReSID builder FP!"); engine->currBuilder = (sidbuilder *) rs; if (rs) { + rs->create((engine->currEng->info()).maxsids); + if (!*rs) { + xs_error("reSID->create() failed.\n"); + return FALSE; + } + rs->bias(0.0f); + } #else - engine->currBuilder = ReSIDBuilderCreate(""); + engine->currBuilder = ReSIDBuilderCreate("ReSID builder"); SidLazyIPtr<IReSIDBuilder> rs(engine->currBuilder); if (rs) { engine->currConfig.sidEmulation = rs->iaggregate(); -#endif - /* Builder object created, initialize it */ rs->create((engine->currEng->info()).maxsids); if (!*rs) { xs_error("reSID->create() failed.\n"); @@ -309,6 +316,7 @@ return FALSE; } } +#endif } #endif @@ -377,16 +385,15 @@ } -#if !defined(HAVE_SIDPLAY2_FP) - if ((xs_cfg.sid2OptLevel >= 0) && (xs_cfg.sid2OptLevel <= SID2_MAX_OPTIMISATION)) - engine->currConfig.optimisation = xs_cfg.sid2OptLevel; - else { +#ifndef HAVE_SIDPLAY2_FP + if (xs_cfg.sid2OptLevel < 0 || xs_cfg.sid2OptLevel > SID2_MAX_OPTIMISATION) + { xs_error("Invalid sid2OptLevel=%d, falling back to %d.\n", xs_cfg.sid2OptLevel, SID2_DEFAULT_OPTIMISATION); - xs_cfg.sid2OptLevel = - engine->currConfig.optimisation = SID2_DEFAULT_OPTIMISATION; + xs_cfg.sid2OptLevel = SID2_DEFAULT_OPTIMISATION; } + engine->currConfig.optimisation = xs_cfg.sid2OptLevel; #endif if (xs_cfg.mos8580)