[Scummvm-cvs-logs] SF.net SVN: scummvm:[44374] scummvm/trunk

[aquadran at users.sourceforge.net]

Revision: 44374
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44374&view=rev
Author:   aquadran
Date:     2009-09-26 09:31:05 +0000 (Sat, 26 Sep 2009)

Log Message:
-----------
added option to allow control digital imuse tempo callback. it's related to volume fading, lip sync quality and platform resource costs.

Modified Paths:
--------------
    scummvm/trunk/base/commandLine.cpp
    scummvm/trunk/engines/scumm/scumm.cpp

Modified: scummvm/trunk/base/commandLine.cpp
===================================================================
--- scummvm/trunk/base/commandLine.cpp	2009-09-26 04:38:25 UTC (rev 44373)
+++ scummvm/trunk/base/commandLine.cpp	2009-09-26 09:31:05 UTC (rev 44374)
@@ -122,7 +122,11 @@
 #ifdef ENABLE_SCUMM
 	"  --tempo=NUM              Set music tempo (in percent, 50-200) for SCUMM games\n"
 	"                           (default: 100)\n"
+#ifdef ENABLE_SCUMM_7_8
+	"  --dimuse-tempo=NUM       Set internal Digital iMuse tempo (10 - 100) per second\n"
+	"                           (default: 10)\n"
 #endif
+#endif
 	"\n"
 	"The meaning of boolean long options can be inverted by prefixing them with\n"
 	"\"no-\", e.g. \"--no-aspect-ratio\".\n"
@@ -198,7 +202,10 @@
 #endif
 #ifdef ENABLE_SCUMM
 	ConfMan.registerDefault("tempo", 0);
+#ifdef ENABLE_SCUMM_7_8
+	ConfMan.registerDefault("dimuse_tempo", 10);
 #endif
+#endif
 
 #if defined(ENABLE_SKY) || defined(ENABLE_QUEEN)
 	ConfMan.registerDefault("alt_intro", false);
@@ -509,7 +516,11 @@
 #ifdef ENABLE_SCUMM
 			DO_LONG_OPTION_INT("tempo")
 			END_OPTION
+#ifdef ENABLE_SCUMM_7_8
+			DO_LONG_OPTION_INT("dimuse-tempo")
+			END_OPTION
 #endif
+#endif
 #if defined(ENABLE_SCUMM) || defined(ENABLE_GROOVIE)
 			DO_LONG_OPTION_BOOL("demo-mode")
 			END_OPTION

Modified: scummvm/trunk/engines/scumm/scumm.cpp
===================================================================
--- scummvm/trunk/engines/scumm/scumm.cpp	2009-09-26 04:38:25 UTC (rev 44373)
+++ scummvm/trunk/engines/scumm/scumm.cpp	2009-09-26 09:31:05 UTC (rev 44374)
@@ -1236,7 +1236,10 @@
 	else
 		_smushFrameRate = (_game.id == GID_FT) ? 10 : 12;
 
-	_musicEngine = _imuseDigital = new IMuseDigital(this, _mixer, 10);
+	int dimuseTempo = CLIP(ConfMan.getInt("dimuse_tempo"), 10, 100);
+	ConfMan.setInt("dimuse_tempo", dimuseTempo);
+	ConfMan.flushToDisk();
+	_musicEngine = _imuseDigital = new IMuseDigital(this, _mixer, dimuseTempo);
 
 	ScummEngine::setupScumm();
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.