[Scummvm-cvs-logs] SF.net SVN: scummvm:[48247] scummvm/branches/branch-1-1-0/sound/decoders/ adpcm.cpp

[fingolfin at users.sourceforge.net]

Revision: 48247
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48247&view=rev
Author:   fingolfin
Date:     2010-03-12 22:37:08 +0000 (Fri, 12 Mar 2010)

Log Message:
-----------
Fix bug #2969282: DW2: Weird "PC SPEAKER-like" sound distortion.

Modified Paths:
--------------
    scummvm/branches/branch-1-1-0/sound/decoders/adpcm.cpp

Modified: scummvm/branches/branch-1-1-0/sound/decoders/adpcm.cpp
===================================================================
--- scummvm/branches/branch-1-1-0/sound/decoders/adpcm.cpp	2010-03-12 22:34:54 UTC (rev 48246)
+++ scummvm/branches/branch-1-1-0/sound/decoders/adpcm.cpp	2010-03-12 22:37:08 UTC (rev 48247)
@@ -405,6 +405,7 @@
 		: ADPCMStream(stream, disposeAfterUse, size, rate, channels, blockAlign) {
 		if (blockAlign == 0)
 			error("MS_ADPCMStream(): blockAlign isn't specified for MS ADPCM");
+		memset(&_status, 0, sizeof(_status));
 	}
 
 	virtual int readBuffer(int16 *buffer, const int numSamples);
@@ -505,6 +506,7 @@
 		if (channels != 1)
 			error("Tinsel_ADPCMStream(): Tinsel ADPCM only supports mono");
 
+		memset(&_status, 0, sizeof(_status));
 	}
 
 };
@@ -595,11 +597,15 @@
 	void reset() {
 		ADPCMStream::reset();
 		_chunkPos = 0;
+		_chunkData = 0;
 	}
 
 public:
 	Tinsel6_ADPCMStream(Common::SeekableReadStream *stream, DisposeAfterUse::Flag disposeAfterUse, uint32 size, int rate, int channels, uint32 blockAlign)
-		: Tinsel_ADPCMStream(stream, disposeAfterUse, size, rate, channels, blockAlign) {}
+		: Tinsel_ADPCMStream(stream, disposeAfterUse, size, rate, channels, blockAlign) {
+		_chunkPos = 0;
+		_chunkData = 0;
+	}
 
 	virtual int readBuffer(int16 *buffer, const int numSamples);
 };


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