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

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Mon Jan 18 00:10:38 CET 2010


Revision: 47352
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47352&view=rev
Author:   lordhoto
Date:     2010-01-17 23:10:38 +0000 (Sun, 17 Jan 2010)

Log Message:
-----------
Fix SubSeekableAudioStream for stereo streams.

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

Modified: scummvm/trunk/sound/audiostream.cpp
===================================================================
--- scummvm/trunk/sound/audiostream.cpp	2010-01-17 23:09:40 UTC (rev 47351)
+++ scummvm/trunk/sound/audiostream.cpp	2010-01-17 23:10:38 UTC (rev 47352)
@@ -222,8 +222,9 @@
     : _parent(parent), _disposeAfterUse(disposeAfterUse),
       _start(start.convertToFramerate(getRate())),
        _pos(0, getRate() * (isStereo() ? 2 : 1)),
-      _length((end - start).convertToFramerate(getRate())) {
+      _length((end - start).convertToFramerate(getRate() * (isStereo() ? 2 : 1))) {
 
+	assert(_length.totalNumberOfFrames() % (isStereo() ? 2 : 1) == 0);
 	_parent->seek(_start);
 }
 


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




More information about the Scummvm-git-logs mailing list