[Scummvm-cvs-logs] SF.net SVN: scummvm:[49846] scummvm/trunk/engines/sci/sound/audio.cpp

[fingolfin at users.sourceforge.net]

Revision: 49846
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49846&view=rev
Author:   fingolfin
Date:     2010-06-15 12:34:33 +0000 (Tue, 15 Jun 2010)

Log Message:
-----------
SCI: Saner and simpler conversion from msecs to ticks

Modified Paths:
--------------
    scummvm/trunk/engines/sci/sound/audio.cpp

Modified: scummvm/trunk/engines/sci/sound/audio.cpp
===================================================================
--- scummvm/trunk/engines/sci/sound/audio.cpp	2010-06-15 12:34:12 UTC (rev 49845)
+++ scummvm/trunk/engines/sci/sound/audio.cpp	2010-06-15 12:34:33 UTC (rev 49846)
@@ -353,9 +353,7 @@
 	}
 
 	if (audioSeekStream) {
-		*sampleLen = (audioSeekStream->getLength().msecs() * 10000) / 166666; // we translate msecs to ticks
-		// Original code
-		//*sampleLen = (flags & Audio::FLAG_16BITS ? size >> 1 : size) * 60 / _audioRate;
+		*sampleLen = (audioSeekStream->getLength().msecs() * 60) / 1000; // we translate msecs to ticks
 		audioStream = audioSeekStream;
 	}
 	// We have to make sure that we don't depend on resource manager pointers after this point, because the actual


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