[Scummvm-cvs-logs] SF.net SVN: scummvm:[52689] scummvm/trunk/graphics/video

[mthreepwood at users.sourceforge.net]

Revision: 52689
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52689&view=rev
Author:   mthreepwood
Date:     2010-09-12 18:31:10 +0000 (Sun, 12 Sep 2010)

Log Message:
-----------
VIDEO: Fix rounding the Smacker frame rate

_frameRate is now stored using Common::Rational instead of uint32.

Modified Paths:
--------------
    scummvm/trunk/graphics/video/smk_decoder.cpp
    scummvm/trunk/graphics/video/smk_decoder.h

Modified: scummvm/trunk/graphics/video/smk_decoder.cpp
===================================================================
--- scummvm/trunk/graphics/video/smk_decoder.cpp	2010-09-12 18:13:14 UTC (rev 52688)
+++ scummvm/trunk/graphics/video/smk_decoder.cpp	2010-09-12 18:31:10 UTC (rev 52689)
@@ -390,9 +390,9 @@
 	int32 frameRate = _fileStream->readSint32LE();
 
 	if (frameRate > 0)
-		_frameRate = 1000 / frameRate;
+		_frameRate = Common::Rational(1000, frameRate);
 	else if (frameRate < 0)
-		_frameRate = 100000 / (-frameRate);
+		_frameRate = Common::Rational(100000, -frameRate);
 	else
 		_frameRate = 10;
 

Modified: scummvm/trunk/graphics/video/smk_decoder.h
===================================================================
--- scummvm/trunk/graphics/video/smk_decoder.h	2010-09-12 18:13:14 UTC (rev 52688)
+++ scummvm/trunk/graphics/video/smk_decoder.h	2010-09-12 18:31:10 UTC (rev 52689)
@@ -120,7 +120,7 @@
 	byte *_palette;
 	bool _dirtyPalette;
 
-	uint32 _frameRate;
+	Common::Rational _frameRate;
 	uint32 _frameCount;
 	Surface *_surface;
 


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