X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FTimer.hh;h=246b4b1e0188974ea4dc3b600dd988a2d5bb95d1;hp=340f79fa15b53b8d762ae730687eaca147315817;hb=3f6e44698c38b74bb622ad81ea9d2daa636981d2;hpb=c2321281bf12a7efaedde930422c7ddbc92080d4

diff --git a/src/Moof/Timer.hh b/src/Moof/Timer.hh
index 340f79f..246b4b1 100644
--- a/src/Moof/Timer.hh
+++ b/src/Moof/Timer.hh
@@ -34,30 +34,99 @@
  * Functions for measuring time in a friendly unit.
  */
 
+#include <map>
+
+#include <boost/bind.hpp>
+#include <boost/function.hpp>
+
 #include <Moof/Math.hh>
 
 
 namespace Mf {
 
 
-/**
- * Get the number of seconds since a fixed, arbitrary point in the past.
- * @return Seconds.
- */
+class Timer
+{
+public:
 
-Scalar getTicks();
+	enum Mode
+	{
+		INVALID		= -1,
+		NORMAL		=  0,
+		ACTUAL		=  1,
+		REPEAT		=  2
+	};
 
+	typedef boost::function<void(Timer&,Scalar)> Function;
 
-/**
- * Put the thread to sleep for a certain period of time.  If absolute is true,
- * then it will sleep until seconds after the fixed time in the past.  If
- * absolute is false, it will sleep for seconds starting now.  Unlike system
- * sleep functions, this one automatically resumes sleep if sleep was
- * interrupted by a signal.  Therefore, calling this function is guaranteed to
- * sleep for the requested amount of time.
- */
 
-void sleep(Scalar seconds, bool absolute = false);
+	Timer() :
+		mMode(INVALID) {}
+
+	Timer(const Function& function, Scalar seconds, Mode mode = NORMAL)
+	{
+		init(function, seconds, mode);
+	}
+
+	~Timer()
+	{
+		invalidate();
+	}
+
+	void init(const Function& function, Scalar seconds, Mode mode = NORMAL);
+
+	bool isValid() const;
+	void invalidate();
+
+	void fire();
+
+	Scalar getSecondsRemaining() const;
+	bool isExpired() const;
+	bool isRepeating() const;
+
+
+	/**
+	 * Get the number of seconds since a fixed, arbitrary point in the past.
+	 * @return Seconds.
+	 */
+
+	static Scalar getTicks();
+
+
+	/**
+	 * Put the thread to sleep for a certain period of time.  If absolute is true,
+	 * then it will sleep until seconds after the fixed time in the past.  If
+	 * absolute is false, it will sleep for seconds starting now.  Unlike system
+	 * sleep functions, this one automatically resumes sleep if sleep was
+	 * interrupted by a signal.  Therefore, calling this function is guaranteed to
+	 * sleep for the requested amount of time (and maybe longer).
+	 */
+
+	static void sleep(Scalar seconds, Mode mode = NORMAL);
+
+
+	static Scalar getNextFire()
+	{
+		return gNextFire;
+	}
+
+	static void fireIfExpired();
+	static void fireIfExpired(Scalar t);
+
+private:
+
+	static unsigned getNewID();
+	static Scalar findNextFire();
+
+	Function	mFunction;
+	Mode		mMode;
+	Scalar		mAbsolute;
+	Scalar		mInterval;
+	unsigned	mId;
+
+	static Scalar						gNextFire;
+	static std::map<unsigned,Timer*>	gTimers;
+};
 
 
 } // namespace Mf