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

[lordhoto at users.sourceforge.net]

Revision: 47054
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47054&view=rev
Author:   lordhoto
Date:     2010-01-05 22:01:05 +0000 (Tue, 05 Jan 2010)

Log Message:
-----------
Implement Timestamp::operator== as equality in time.

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

Modified: scummvm/trunk/sound/timestamp.cpp
===================================================================
--- scummvm/trunk/sound/timestamp.cpp	2010-01-05 22:00:38 UTC (rev 47053)
+++ scummvm/trunk/sound/timestamp.cpp	2010-01-05 22:01:05 UTC (rev 47054)
@@ -66,11 +66,8 @@
 }
 
 bool Timestamp::operator==(const Timestamp &ts) const {
-	// TODO: Alternatively, we could define equality to mean that
-	// two timestamps describe the exacts same moment in time.
-	return (_msecs == ts._msecs) &&
-	       (_numberOfFrames == ts._numberOfFrames) &&
-	       (_framerate == ts._framerate);
+	// TODO: Improve this
+	return (ts.msecs() == msecs()) && !frameDiff(ts);
 }
 
 bool Timestamp::operator!=(const Timestamp &ts) const {


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