[Scummvm-cvs-logs] SF.net SVN: scummvm:[52842] scummvm/trunk/engines/kyra/sound_towns.cpp

[athrxx at users.sourceforge.net]

Revision: 52842
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52842&view=rev
Author:   athrxx
Date:     2010-09-21 16:05:33 +0000 (Tue, 21 Sep 2010)

Log Message:
-----------
KYRA2/LOL PC-98: fix sfx rate

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/sound_towns.cpp

Modified: scummvm/trunk/engines/kyra/sound_towns.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound_towns.cpp	2010-09-21 07:02:29 UTC (rev 52841)
+++ scummvm/trunk/engines/kyra/sound_towns.cpp	2010-09-21 16:05:33 UTC (rev 52842)
@@ -587,7 +587,7 @@
 }
 
 int32 SoundTownsPC98_v2::voicePlay(const char *file, Audio::SoundHandle *handle, uint8, bool) {
-	//static const uint16 rates[] =	{ 0x10E1, 0x0CA9, 0x0870, 0x0654, 0x0438, 0x032A, 0x021C, 0x0194 };
+	static const uint16 rates[] = { 0x10E1, 0x0CA9, 0x0870, 0x0654, 0x0438, 0x032A, 0x021C, 0x0194 };
 	static const char patternHOF[] = "%s.PCM";
 	static const char patternLOL[] = "%s.VOC";
 
@@ -608,7 +608,7 @@
 	if (!src)
 		return 0;
 
-	//uint16 sfxRate = rates[READ_LE_UINT16(src)];
+	uint16 sfxRate = rates[READ_LE_UINT16(src)];
 	src += 2;
 	bool compressed = (READ_LE_UINT16(src) & 1) ? true : false;
 	src += 2;
@@ -648,8 +648,7 @@
 		sfx[i] = cmd;
 	}
 
-	_currentSFX = Audio::makeRawStream(sfx, outsize, 11025,
-							Audio::FLAG_UNSIGNED | Audio::FLAG_LITTLE_ENDIAN);
+	_currentSFX = Audio::makeRawStream(sfx, outsize, sfxRate * 10, Audio::FLAG_UNSIGNED | Audio::FLAG_LITTLE_ENDIAN);
 	_mixer->playStream(Audio::Mixer::kSFXSoundType, &_soundChannels[h], _currentSFX);
 	if (handle)
 		*handle = _soundChannels[h];


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