[Scummvm-cvs-logs] SF.net SVN: scummvm:[36195] scummvm/trunk/sound/adpcm.cpp

[thebluegr at users.sourceforge.net]

Revision: 36195
          http://scummvm.svn.sourceforge.net/scummvm/?rev=36195&view=rev
Author:   thebluegr
Date:     2009-02-01 22:21:57 +0000 (Sun, 01 Feb 2009)

Log Message:
-----------
Fixed regression in the ADPCM decoder. DW2 music should be played correctly again

Modified Paths:
--------------
    scummvm/trunk/sound/adpcm.cpp

Modified: scummvm/trunk/sound/adpcm.cpp
===================================================================
--- scummvm/trunk/sound/adpcm.cpp	2009-02-01 22:06:43 UTC (rev 36194)
+++ scummvm/trunk/sound/adpcm.cpp	2009-02-01 22:21:57 UTC (rev 36195)
@@ -134,7 +134,8 @@
 	
 	_startpos = stream->pos();
 	_endpos = _startpos + size;
-	_curLoop = 0;	
+	_curLoop = 0;
+	_blockPos = 0;
 	reset();
 }
 
@@ -148,7 +149,6 @@
 	_blockLen = 0;
 	_blockPos = _blockAlign; // To make sure first header is read
 	_chunkPos = 0;
-	_blockPos = 0;
 }
 
 int ADPCMInputStream::readBuffer(int16 *buffer, const int numSamples) {


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