Mercurial > hg > xmms-sid
changeset 366:29c4484f1de2
Fixes in emulator engine configuration, make 'forceModel' option work.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Tue, 08 Nov 2005 10:34:01 +0000 |
| parents | 5a92a2aee74c |
| children | 8338cc14bbdb |
| files | src/xs_sidplay2.cc |
| diffstat | 1 files changed, 25 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xs_sidplay2.cc Tue Nov 08 09:33:02 2005 +0000 +++ b/src/xs_sidplay2.cc Tue Nov 08 10:34:01 2005 +0000 @@ -137,20 +137,6 @@ } - /* 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; - } - - /* Audio parameters sanity checking and setup */ myEngine->currConfig.precision = myStatus->audioBitsPerSample; tmpFreq = myStatus->audioFrequency; @@ -269,16 +255,39 @@ XSDEBUG("%s\n", myEngine->currBuilder->credits()); + /* 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; + } + + /* Configure rest of the emulation */ myEngine->currConfig.sidEmulation = myEngine->currBuilder; myEngine->currConfig.clockForced = xs_cfg.forceSpeed; - myEngine->currConfig.optimisation = (xs_cfg.sid2OptLevel) ? 1 : 0; + + if (xs_cfg.sid2OptLevel) + myEngine->currConfig.optimisation = 1; + else + myEngine->currConfig.optimisation = 0; + if (xs_cfg.mos8580) myEngine->currConfig.sidDefault = SID2_MOS8580; else myEngine->currConfig.sidDefault = SID2_MOS6581; - myEngine->currConfig.sidModel = myEngine->currConfig.sidDefault; + if (xs_cfg.forceModel) + myEngine->currConfig.sidModel = myEngine->currConfig.sidDefault; + myEngine->currConfig.sidSamples = TRUE; // FIXME FIX ME, make configurable!