X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Ftime%2Ftimestamp.h;h=cb38279501ff7e0026aca3e1e23a890ab843fcea;hb=967785734be5c3fc6f75da122c2d93ebbb338271;hp=faa200c6590cb9ae14de30cc69286193fd83222f;hpb=cfc8e0b7b15ea505bd6a6a9599cbc5ce1e316963;p=libs%2Fcore.git

diff --git a/source/time/timestamp.h b/source/time/timestamp.h
index faa200c..cb38279 100644
--- a/source/time/timestamp.h
+++ b/source/time/timestamp.h
@@ -1,15 +1,8 @@
-/* $Id$
-
-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 "timedelta.h"
-#include "types.h"
+#include "rawtime.h"
 
 namespace Msp {
 namespace Time {
@@ -44,6 +37,8 @@ public:
 	*/
 	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()); }
@@ -59,6 +54,11 @@ public:
 
 	operator const void *() const                  { return usec>0 ? this : 0; }
 
+#ifndef WIN32
+	operator timeval() const { return rawtime_to_timeval(usec); }
+	operator timespec() const { return rawtime_to_timespec(usec); }
+#endif
+
 	static TimeStamp from_unixtime(time_t t) { return TimeStamp(t*1000000LL); }
 };