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

diff --git a/source/time/timestamp.h b/source/time/timestamp.h
index 984333d..1317b26 100644
--- a/source/time/timestamp.h
+++ b/source/time/timestamp.h
@@ -1,59 +1,54 @@
-/*
-This file is part of libmspcore     
-Copyright © 2006  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 "rawtime.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
-	past.  It's guaranteed to be less than any valid timestamp.
-	*/
+	/** Construct a TimeStamp that represents an arbitarily distant point in the
+	past.  It's guaranteed to be less than any valid timestamp. */
 	TimeStamp(): usec(0) { }
 
-	/**
-	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) { }
-
-	/**
-	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.
-	*/
-	int64_t   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; }
-	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; }
+	/** Constructs a TimeStamp from a plain number.  The purpose of this is to allow
+	serialization together with the raw() function. */
+	explicit TimeStamp(RawTime u): usec(u) { }
+
+	/** Returns the raw number stored inside the TimeStamp.  This value should be
+	considered opaque and only be used for serialization. */
+	RawTime raw() const { return usec; }
+
+	time_t to_unixtime() const { 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 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