X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Ftime%2Ftimestamp.h;h=6b264aff6cdadd4ad739e8bb14035bbe8a7798a9;hp=984333da7a357edb51d9464c9b01baa890e5739b;hb=dff78b5a8a1d947eb3391dd919abfa04a48d589c;hpb=fe77fc6b869a71bf94d501a0762579f4ddbc5094

diff --git a/source/time/timestamp.h b/source/time/timestamp.h
index 984333d..6b264af 100644
--- a/source/time/timestamp.h
+++ b/source/time/timestamp.h
@@ -8,14 +8,16 @@ Distributed under the LGPL
 
 #include <stdint.h>
 #include "timedelta.h"
+#include "types.h"
 
 namespace Msp {
 namespace Time {
 
 /**
-Represents a moment in time, such as the last tick.  This class is NOT intended
-to be used for storing arbitary user-defined times, I'll add a DateTime class
-if the need arises.
+Represents a moment in time.  The main source of TimeStamps is the now()
+function.
+
+For representing user-specified times, use the DateTime class.
 */
 class TimeStamp
 {
@@ -30,13 +32,13 @@ public:
 	Constructs a TimeStamp from a plain number.  The purpose of this is to allow
 	serialization together with the raw() function.
 	*/
-	explicit TimeStamp(int64_t u): usec(u) { }
+	explicit TimeStamp(RawTime u): usec(u) { }
 
 	/**
-	Returns the raw number stored inside the TimeStamp.  This should only be used
-	for serialization and the result should not be interpreted in any way.
+	Returns the raw number stored inside the TimeStamp.  This value should be
+	considered opaque and only be used for serialization.
 	*/
-	int64_t   raw() const { return usec; }
+	RawTime raw() const { return usec; }
 
 	TimeStamp operator+(const TimeDelta &t) const  { return TimeStamp(usec+t.raw()); }
 	TimeStamp &operator+=(const TimeDelta &t)      { usec+=t.raw(); return *this; }
@@ -49,11 +51,11 @@ public:
 	bool      operator<(const TimeStamp &t) const  { return usec<t.usec; }
 	bool      operator==(const TimeStamp &t) const { return usec==t.usec; }
 	bool      operator!=(const TimeStamp &t) const { return usec!=t.usec; }
-	operator bool() const                          { return usec>0; }
+	operator const void *() const                  { return usec>0 ? this : 0; }
 
 	static TimeStamp from_unixtime(time_t t) { return TimeStamp(t*1000000LL); }
 private:
-	int64_t usec;
+	RawTime usec;
 };
 
 } // namespace Time