[Scummvm-cvs-logs] CVS: scummvm/scumm sound.cpp,1.481,1.482

[Eugene Sandulenko]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3971/scumm

Modified Files:
	sound.cpp 
Log Message:
Improved IMA ADPCM decoder. It appeared that MS violated yet another standard
and nibbles order in samples appeared to be swapped. Had to untemplate
whole thing over again because I have no idea how to speicalize one of two
parameters in templates.

Now voices are clean but have some ticks, looks like overload. ITE wasn't
broken ;)


Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.481
retrieving revision 1.482
diff -u -d -r1.481 -r1.482
--- sound.cpp	19 Oct 2005 03:29:55 -0000	1.481
+++ sound.cpp	19 Oct 2005 04:59:18 -0000	1.482
@@ -316,7 +316,7 @@
 		}
 
 		if (type == 17) {
-			AudioStream *voxStream = makeADPCMStream(stream, size, kADPCMIma);
+			AudioStream *voxStream = new ADPCMInputStream(&stream, size, kADPCMIma, (flags & Audio::Mixer::FLAG_STEREO) ? 2 : 1);
 
 			sound = (char *)malloc(size * 2);
 			size = voxStream->readBuffer((int16*)sound, size * 2);