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

diff --git a/source/time/timestamp.h b/source/time/timestamp.h
index 984333d..db3587a 100644
--- a/source/time/timestamp.h
+++ b/source/time/timestamp.h
@@ -1,24 +1,30 @@
-/*
+/* $Id$
+
 This file is part of libmspcore     
-Copyright © 2006  Mikko Rasa, Mikkosoft Productions
+Copyright © 2006, 2009  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
+
 #ifndef MSP_TIME_TIMESTAMP_H_
 #define MSP_TIME_TIMESTAMP_H_
 
-#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
 {
+private:
+	RawTime usec;
+
 public:
 	/**
 	Construct a TimeStamp that represents an arbitarily distant point in the
@@ -30,30 +36,32 @@ 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; }
+
+	time_t to_unixtime() { return usec/1000000LL; }
 
 	TimeStamp operator+(const TimeDelta &t) const  { return TimeStamp(usec+t.raw()); }
 	TimeStamp &operator+=(const TimeDelta &t)      { usec+=t.raw(); return *this; }
 	TimeStamp operator-(const TimeDelta &t) const  { return TimeStamp(usec-t.raw()); }
 	TimeStamp &operator-=(const TimeDelta &t)      { usec-=t.raw(); return *this; }
 	TimeDelta operator-(const TimeStamp &t) const  { return TimeDelta(usec-t.usec); }
+
 	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; }
 	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;
 };
 
 } // namespace Time