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

diff --git a/source/time/timestamp.h b/source/time/timestamp.h
index 44387a2..db3587a 100644
--- a/source/time/timestamp.h
+++ b/source/time/timestamp.h
@@ -1,12 +1,13 @@
-/*
+/* $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"
 
@@ -21,6 +22,9 @@ 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
@@ -40,22 +44,24 @@ public:
 	*/
 	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:
-	RawTime usec;
 };
 
 } // namespace Time