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

diff --git a/source/time/timedelta.h b/source/time/timedelta.h
index 2d46498..c290f26 100644
--- a/source/time/timedelta.h
+++ b/source/time/timedelta.h
@@ -1,14 +1,9 @@
-/*
-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 <stdint.h>
 #include <time.h>
-#include <ostream>
+#include <msp/strings/lexicalcast.h>
+#include "rawtime.h"
 
 namespace Msp {
 namespace Time {
@@ -18,6 +13,9 @@ Represents a quantity of time, such as five seconds.
 */
 class TimeDelta
 {
+private:
+	RawTime usec;
+
 public:
 	/**
 	Constructs a zero TimeDelta.
@@ -29,21 +27,13 @@ public:
 	serialization together with the raw() function.  For creating TimeDeltas
 	with a specific length, see units.h.
 	*/
-	explicit TimeDelta(int64_t u): usec(u) { }
+	explicit TimeDelta(RawTime u): usec(u) { }
 
 	/**
 	Returns the raw number stored inside the TimeDelta.  This should only be used
 	for serialization and the result should not be interpreted in any way.
 	*/
-	int64_t 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; }
-#endif
+	RawTime raw() const { return usec; }
 
 	TimeDelta operator+(const TimeDelta &t) const  { return TimeDelta(usec+t.usec); }
 	TimeDelta &operator+=(const TimeDelta &t)      { usec+=t.usec; return *this; }
@@ -51,16 +41,16 @@ public:
 	TimeDelta &operator-=(const TimeDelta &t)      { usec-=t.usec; return *this; }
 
 	template<typename T>
-	TimeDelta operator*(T a) const                 { return TimeDelta((int64_t)(usec*a)); }
+	TimeDelta operator*(T a) const                 { return TimeDelta(RawTime(usec*a)); }
 	template<typename T>
-	TimeDelta &operator*=(T a)                     { usec=(int64_t)(usec*a); return *this; }
+	TimeDelta &operator*=(T a)                     { usec=RawTime(usec*a); return *this; }
 
 	template<typename T>
-	TimeDelta operator/(T a) const                 { return TimeDelta((int64_t)(usec/a)); }
+	TimeDelta operator/(T a) const                 { return TimeDelta(RawTime(usec/a)); }
 	template<typename T>
-	TimeDelta &operator/=(T a)                     { usec=(int64_t)(usec/a); return *this; }
+	TimeDelta &operator/=(T a)                     { usec=RawTime(usec/a); return *this; }
 
-	double    operator/(const TimeDelta &t) const  { return (double)usec/t.usec; }
+	double    operator/(const TimeDelta &t) const  { return double(usec)/t.usec; }
 
 	bool      operator>(const TimeDelta &t) const  { return usec>t.usec; }
 	bool      operator>=(const TimeDelta &t) const { return usec>=t.usec; }
@@ -69,15 +59,18 @@ public:
 	bool      operator==(const TimeDelta &t) const { return usec==t.usec; }
 	bool      operator!=(const TimeDelta &t) const { return usec!=t.usec; }
 
-	operator bool() const                          { return usec; }
-private:
-	int64_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