# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1131526440 0
# Node ID 75f51962c083ac1d3df94469281ed5c37a12dd84
# Parent  df6f12a00305fc9cb522adae46c2948b934674bf
Emulation engine setup fixes.


diff -r df6f12a00305 -r 75f51962c083 src/xs_sidplay2.cc
--- 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!