Allow canceling timers

[libs/core.git] / source / time / timer.h

diff --git a/source/time/timer.h b/source/time/timer.h
index cfa00bb0d1511f42f09591b04dbc5527ee8deb91..8b4e5957ebd17257e55bf8a5e2979dc99f75868f 100644 (file)
--- a/source/time/timer.h
+++ b/source/time/timer.h
@@ -7,7 +7,7 @@ Distributed under the LGPL
 #ifndef MSP_TIME_TIMER_H_
 #define MSP_TIME_TIMER_H_
 
-#include <queue>
+#include <set>
 #include <sigc++/sigc++.h>
 #include "../core/mutex.h"
 #include "../core/semaphore.h"
@@ -41,18 +41,22 @@ public:
                Slot(const TimeStamp &);
                const TimeStamp &get_timeout() const { return timeout; }
                bool increment();
-               bool operator<(const Slot &) const;
        };
 
 private:
-       typedef bool (*fSlotCompare)(Slot *, Slot *);
+       struct SlotProxy
+       {
+               Slot *slot;
+
+               SlotProxy(Slot *);
+               bool operator<(const SlotProxy &) const;
+       };
 
-       std::priority_queue<Slot *, std::vector<Slot *>, fSlotCompare> slots;
+       std::set<SlotProxy> slots;
        Semaphore sem;
        Mutex mutex;
 
 public:
-       Timer();
        ~Timer();
 
        /**
@@ -67,6 +71,11 @@ public:
        */
        Slot &add(const TimeStamp &);
 
+       /**
+       Cancels a previously added timer.
+       */
+       void cancel(Slot &);
+
        /**
        Checks all timers, executing any that have timed out.  If block is true,
        waits until one times out.
@@ -75,8 +84,8 @@ public:
        won't return until a timer is added from another thread.
        */
        void tick(bool block=true);
-private:
-       static bool slot_compare(Slot *, Slot *);
+
+       TimeStamp get_next_timeout() const;
 };
 
 } // namespace Time