[Scummvm-cvs-logs] scummvm master -> 6092b324f39f7370da0257c0a2d32ccae55f81fe

[CeRiAl]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
6092b324f3 WINCE: Change default values for "FM_high_quality" & "high_sample_rate"


Commit: 6092b324f39f7370da0257c0a2d32ccae55f81fe
    https://github.com/scummvm/scummvm/commit/6092b324f39f7370da0257c0a2d32ccae55f81fe
Author: CeRiAl (ikhatib at gmail.com)
Date: 2011-07-14T16:39:21-07:00

Commit Message:
WINCE: Change default values for "FM_high_quality" & "high_sample_rate"

Changed the default values from "false" to "true" as current devices are
fast enough to handle this. It's still possible to change the values to
"false" if the device isn't fast enough.

Changed paths:
    backends/mixer/wincesdl/wincesdl-mixer.cpp
    backends/platform/wince/README-WinCE.txt



diff --git a/backends/mixer/wincesdl/wincesdl-mixer.cpp b/backends/mixer/wincesdl/wincesdl-mixer.cpp
index 36ac310..c7659cb 100644
--- a/backends/mixer/wincesdl/wincesdl-mixer.cpp
+++ b/backends/mixer/wincesdl/wincesdl-mixer.cpp
@@ -131,15 +131,20 @@ uint32 WINCESdlMixerManager::compute_sample_rate() {
 			ConfMan.setBool("FM_medium_quality", true);
 			ConfMan.flushToDisk();
 		}
+	} else {
+		if (!ConfMan.hasKey("FM_high_quality") && !ConfMan.hasKey("FM_medium_quality")) {
+			ConfMan.setBool("FM_high_quality", true);
+			ConfMan.flushToDisk();
+		}
 	}
 	// See if the output frequency is forced by the game
 	if (gameid == "ft" || gameid == "dig" || gameid == "comi" || gameid == "queen" || gameid == "sword" || gameid == "agi")
 			sampleRate = SAMPLES_PER_SEC_NEW;
 	else {
-		if (ConfMan.hasKey("high_sample_rate") && ConfMan.getBool("high_sample_rate"))
-			sampleRate = SAMPLES_PER_SEC_NEW;
-		else
+		if (ConfMan.hasKey("high_sample_rate") && !ConfMan.getBool("high_sample_rate"))
 			sampleRate = SAMPLES_PER_SEC_OLD;
+		else
+			sampleRate = SAMPLES_PER_SEC_NEW;
 	}
 
 #ifdef USE_VORBIS
diff --git a/backends/platform/wince/README-WinCE.txt b/backends/platform/wince/README-WinCE.txt
index 8f12620..87f6e78 100644
--- a/backends/platform/wince/README-WinCE.txt
+++ b/backends/platform/wince/README-WinCE.txt
@@ -1,10 +1,15 @@
 ScummVM Windows CE FAQ
-Last updated: 2011-07-01
-Release version: 1.3.1
+Last updated: 2011-07-14
+Release version: x.x.x
 ------------------------------------------------------------------------
 
 New in this version
 -------------------
+x.x.x:
+- Changed default values for "high_sample_rate" & "FM_high_quality" to "true" as
+  most devices today are fast enough to handle this. It's still possible to set
+  this to "false" if you have a slower device.
+
 1.3.1:
 - Fix for Normal2xAspect scaler which was causing screen update issues in some
   games.
@@ -361,14 +366,13 @@ Some parameters are specific to this port :
 Game specific sections (f.e. [monkey2]) - performance options
 
  *  high_sample_rate       bool     Desktop quality (22 kHz) sound output if
-                                    set.  The default is 11 kHz.
-                                    If you have a fast device, you can set this
-                                    to true to enjoy better sound effects and
-                                    music.
+                                    set.  This is the default.
+                                    If you have a slow device, you can set this
+                                    to false to prevent lags/delays in the game.
  *  FM_high_quality        bool     Desktop quality FM synthesis if set. Lower
-                                    quality otherwise. The default is low
+                                    quality otherwise. The default is high
                                     quality. You can change this if you have a
-                                    fast device.
+                                    slow device.
  *  sound_thread_priority  int      Set the priority of the sound thread (0, 1,
                                     2). Depending on the release, this is set
                                     to 1 internally (above normal).