[Scummvm-cvs-logs] SF.net SVN: scummvm:[45266] scummvm/trunk/engines/agi

[fingolfin at users.sourceforge.net]

Revision: 45266
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45266&view=rev
Author:   fingolfin
Date:     2009-10-20 12:22:30 +0000 (Tue, 20 Oct 2009)

Log Message:
-----------
AGI: Change g_useChorus to SoundMgr::_useChorus, and add FIXME comment about it always being true (so maybe it can be removed?)

Modified Paths:
--------------
    scummvm/trunk/engines/agi/sound.cpp
    scummvm/trunk/engines/agi/sound.h

Modified: scummvm/trunk/engines/agi/sound.cpp
===================================================================
--- scummvm/trunk/engines/agi/sound.cpp	2009-10-20 12:21:43 UTC (rev 45265)
+++ scummvm/trunk/engines/agi/sound.cpp	2009-10-20 12:22:30 UTC (rev 45266)
@@ -35,7 +35,6 @@
 namespace Agi {
 
 #define USE_INTERPOLATION
-static bool g_useChorus = true;
 
 //
 // TODO: add support for variable sampling rate in the output device
@@ -504,7 +503,7 @@
 void SoundMgr::stopNote(int i) {
 	_chn[i].adsr = AGI_SOUND_ENV_RELEASE;
 
-	if (g_useChorus) {
+	if (_useChorus) {
 		// Stop chorus ;)
 		if (_chn[i].type == AGI_SOUND_4CHN &&
 			_vm->_soundemu == SOUND_EMU_NONE && i < 3) {
@@ -525,7 +524,7 @@
 	_chn[i].env = 0x10000;
 	_chn[i].adsr = AGI_SOUND_ENV_ATTACK;
 
-	if (g_useChorus) {
+	if (_useChorus) {
 		// Add chorus ;)
 		if (_chn[i].type == AGI_SOUND_4CHN &&
 			_vm->_soundemu == SOUND_EMU_NONE && i < 3) {
@@ -880,7 +879,7 @@
 				_chn[i].vol = 0;
 				_chn[i].env = 0;
 
-				if (g_useChorus) {
+				if (_useChorus) {
 					// chorus
 					if (_chn[i].type == AGI_SOUND_4CHN && _vm->_soundemu == SOUND_EMU_NONE && i < 3) {
 						_chn[i + 4].vol = 0;
@@ -1305,6 +1304,7 @@
 	_sndBuffer = (int16 *)calloc(2, BUFFER_SIZE);
 	_waveform = 0;
 	_disabledMidi = false;
+	_useChorus = true;	// FIXME: Currently always true?
 }
 
 void SoundMgr::premixerCall(int16 *data, uint len) {

Modified: scummvm/trunk/engines/agi/sound.h
===================================================================
--- scummvm/trunk/engines/agi/sound.h	2009-10-20 12:21:43 UTC (rev 45265)
+++ scummvm/trunk/engines/agi/sound.h	2009-10-20 12:22:30 UTC (rev 45266)
@@ -489,6 +489,8 @@
 	int16 *_sndBuffer;
 	const int16 *_waveform;
 
+	bool _useChorus;
+
 	void premixerCall(int16 *buf, uint len);
 	void fillAudio(void *udata, int16 *stream, uint len);
 


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