[Scummvm-cvs-logs] SF.net SVN: scummvm:[47593] scummvm/trunk/sound/decoders/flac.cpp

[lordhoto at users.sourceforge.net]

Revision: 47593
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47593&view=rev
Author:   lordhoto
Date:     2010-01-27 08:41:08 +0000 (Wed, 27 Jan 2010)

Log Message:
-----------
Fix seeking in FLAC implementation (FLAC's API uses the number of sample pairs, not the number of samples).

Modified Paths:
--------------
    scummvm/trunk/sound/decoders/flac.cpp

Modified: scummvm/trunk/sound/decoders/flac.cpp
===================================================================
--- scummvm/trunk/sound/decoders/flac.cpp	2010-01-27 08:40:48 UTC (rev 47592)
+++ scummvm/trunk/sound/decoders/flac.cpp	2010-01-27 08:41:08 UTC (rev 47593)
@@ -294,7 +294,9 @@
 bool FlacInputStream::seek(const Timestamp &where) {
 	_sampleCache.bufFill = 0;
 	_sampleCache.bufReadPos = NULL;
-	return seekAbsolute((FLAC__uint64)convertTimeToStreamPos(where, getRate(), isStereo()).totalNumberOfFrames());
+	// FLAC uses the sample pair number, thus we always use "false" for the isStereo parameter
+	// of the convertTimeToStreamPos helper.
+	return seekAbsolute((FLAC__uint64)convertTimeToStreamPos(where, getRate(), false).totalNumberOfFrames());
 }
 
 int FlacInputStream::readBuffer(int16 *buffer, const int numSamples) {


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