Mercurial > hg > xmms-sid
changeset 371:75f51962c083
Emulation engine setup fixes.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Wed, 09 Nov 2005 08:54:00 +0000 |
| parents | df6f12a00305 |
| children | 1222cff759c6 |
| files | src/xs_sidplay2.cc |
| diffstat | 1 files changed, 10 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xs_sidplay2.cc Wed Nov 09 05:52:01 2005 +0000 +++ b/src/xs_sidplay2.cc Wed Nov 09 08:54:00 2005 +0000 @@ -258,13 +258,11 @@ /* Clockspeed settings */ switch (xs_cfg.clockSpeed) { case XS_CLOCK_NTSC: - myEngine->currConfig.clockSpeed = myEngine->currConfig.clockDefault = SID2_CLOCK_NTSC; break; case XS_CLOCK_PAL: default: - myEngine->currConfig.clockSpeed = myEngine->currConfig.clockDefault = SID2_CLOCK_PAL; xs_cfg.clockSpeed = XS_CLOCK_PAL; break; @@ -273,7 +271,14 @@ /* Configure rest of the emulation */ myEngine->currConfig.sidEmulation = myEngine->currBuilder; - myEngine->currConfig.clockForced = xs_cfg.forceSpeed; + + if (xs_cfg.forceSpeed) { + myEngine->currConfig.clockForced = true; + myEngine->currConfig.clockSpeed = myEngine->currConfig.clockDefault; + } else { + myEngine->currConfig.clockForced = false; + myEngine->currConfig.clockSpeed = SID2_CLOCK_CORRECT; + } if (xs_cfg.sid2OptLevel) myEngine->currConfig.optimisation = 1; @@ -287,6 +292,8 @@ if (xs_cfg.forceModel) myEngine->currConfig.sidModel = myEngine->currConfig.sidDefault; + else + myEngine->currConfig.sidModel = SID2_MODEL_CORRECT; myEngine->currConfig.sidSamples = TRUE; // FIXME FIX ME, make configurable!