X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Ftime%2Ftimedelta.h;h=c290f260a7600fd3bbb5d0de80512187bbae8b6d;hp=0ced98ecd3e7e581795056959895a8941ae3e966;hb=967785734be5c3fc6f75da122c2d93ebbb338271;hpb=b56eb5ec1da675da0c66abc53c1e4f6c4e4cccbd

diff --git a/source/time/timedelta.h b/source/time/timedelta.h
index 0ced98e..c290f26 100644
--- a/source/time/timedelta.h
+++ b/source/time/timedelta.h
@@ -1,17 +1,9 @@
-/* $Id$
-
-This file is part of libmspcore     
-Copyright © 2006  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_TIME_TIMEDELTA_H_
 #define MSP_TIME_TIMEDELTA_H_
 
 #include <time.h>
-#include <sys/time.h>
-#include <ostream>
-#include "types.h"
+#include <msp/strings/lexicalcast.h>
+#include "rawtime.h"
 
 namespace Msp {
 namespace Time {
@@ -43,16 +35,6 @@ public:
 	*/
 	RawTime raw() const { return usec; }
 
-#ifndef WIN32
-	/**
-	Fills in a timespec struct.  To get a meaningful scalar value from the
-	TimeDelta, divide with one of the values in units.h.
-	*/
-	void fill_timespec(timespec &ts) const { ts.tv_sec=usec/1000000; ts.tv_nsec = (usec%1000000)*1000; }
-
-	void fill_timeval(timeval &tv) const { tv.tv_sec=usec/1000000; tv.tv_usec = usec%1000000; }
-#endif
-
 	TimeDelta operator+(const TimeDelta &t) const  { return TimeDelta(usec+t.usec); }
 	TimeDelta &operator+=(const TimeDelta &t)      { usec+=t.usec; return *this; }
 	TimeDelta operator-(const TimeDelta &t) const  { return TimeDelta(usec-t.usec); }
@@ -77,13 +59,18 @@ public:
 	bool      operator==(const TimeDelta &t) const { return usec==t.usec; }
 	bool      operator!=(const TimeDelta &t) const { return usec!=t.usec; }
 
+#ifndef WIN32
+	operator timeval() const { return rawtime_to_timeval(usec); }
+	operator timespec() const { return rawtime_to_timespec(usec); }
+#endif
+
 	operator const void *() const                  { return usec ? this : 0; }
 };
 
 template<typename T>
 inline TimeDelta operator*(T a, const TimeDelta &t)   { return t*a; }
 
-extern std::ostream &operator<<(std::ostream &, const TimeDelta &);
+void operator<<(LexicalConverter &, const TimeDelta &);
 
 } // namespace Time
 } // namespace Msp