X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Ftime%2Ftimedelta.h;h=1a4274ba3a35c05822ad6f18c43775cf02e592e4;hp=694136ec8e78477a0acbcb82227c607824491b67;hb=HEAD;hpb=e1ea831a640fba534e7e42e399f04cdf681ef8d3

diff --git a/source/time/timedelta.h b/source/time/timedelta.h
index 694136e..2ff4bdd 100644
--- a/source/time/timedelta.h
+++ b/source/time/timedelta.h
@@ -1,14 +1,11 @@
-/*
-This file is part of libmspframework     
-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 <cstdlib>
+#include <ctime>
+#include <msp/core/mspcore_api.h>
+#include <msp/strings/lexicalcast.h>
+#include "rawtime.h"
 
 namespace Msp {
 namespace Time {
@@ -16,66 +13,69 @@ namespace Time {
 /**
 Represents a quantity of time, such as five seconds.
 */
-class TimeDelta
+class MSPCORE_API TimeDelta
 {
+private:
+	RawTime usec = 0;
+
 public:
-	/**
-	Constructs a zero TimeDelta.
-	*/
-	TimeDelta(): usec(0) { }
-
-	/**
-	Constructs a TimeDelta from a plain number.  The purpose of this is to allow
-	serialization together with the raw() function.  For creating TimeDeltas
-	with a specific length, see units.h.
-	*/
-	explicit TimeDelta(int64_t 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; }
-
-	/**
-	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; }
-
-	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); }
-	TimeDelta &operator-=(const TimeDelta &t)      { usec-=t.usec; return *this; }
+	/** Constructs a zero TimeDelta. */
+	constexpr TimeDelta() = default;
+
+	/** Constructs a TimeDelta from a plain number.  The purpose of this is to
+	allow serialization together with the raw() function. */
+	explicit constexpr 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. */
+	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; }
+	TimeDelta operator-(const TimeDelta &t) const { return TimeDelta(usec-t.usec); }
+	TimeDelta &operator-=(const TimeDelta &t) { usec -= t.usec; return *this; }
+	TimeDelta operator-() const { return TimeDelta(-usec); }
 
 	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; }
-	bool      operator<(const TimeDelta &t) const  { return usec<t.usec; }
-	bool      operator<=(const TimeDelta &t) const { return usec<=t.usec; }
-	bool      operator==(const TimeDelta &t) const { return usec==t.usec; }
-	bool      operator!=(const TimeDelta &t) const { return usec!=t.usec; }
+	bool operator>(const TimeDelta &t) const { return usec>t.usec; }
+	bool operator>=(const TimeDelta &t) const { return usec>=t.usec; }
+	bool operator<(const TimeDelta &t) const { return usec<t.usec; }
+	bool operator<=(const TimeDelta &t) const { return usec<=t.usec; }
+	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; }
-
-	friend std::ostream &operator<<(std::ostream &, const TimeDelta &);
-private:
-	int64_t usec;
+	explicit operator bool() const { return usec; }
 };
 
 template<typename T>
-inline TimeDelta operator*(T a, const TimeDelta &t)   { return t*a; }
+inline TimeDelta operator*(T a, const TimeDelta &t) { return t*a; }
+
+MSPCORE_API void operator<<(LexicalConverter &, const TimeDelta &);
+
+
+// Constants to be used in creation of TimeDeltas
+constexpr TimeDelta zero(0);
+constexpr TimeDelta usec(1);
+constexpr TimeDelta msec(1000);
+constexpr TimeDelta sec(1000000);
+constexpr TimeDelta min(60*1000000);
+constexpr TimeDelta hour(3600*1000000LL);
+constexpr TimeDelta day(86400*1000000LL);
+constexpr TimeDelta week(7*86400*1000000LL);
+
+inline TimeDelta abs(const TimeDelta &t) { return t>=zero ? t : -t; }
+using std::abs;
 
 } // namespace Time
 } // namespace Msp