X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftime%2Ftimer.h;h=7566c3dd03a6a86eef6619c2d4ddd24ddbb373ca;hb=1f0843257065789231a9949e0a81b79afd7bbebe;hp=403e484cba7376412ca0a068c58f908e258d1ff1;hpb=967785734be5c3fc6f75da122c2d93ebbb338271;p=libs%2Fcore.git

diff --git a/source/time/timer.h b/source/time/timer.h
index 403e484..7566c3d 100644
--- a/source/time/timer.h
+++ b/source/time/timer.h
@@ -3,8 +3,8 @@
 
 #include <vector>
 #include <sigc++/sigc++.h>
-#include "../core/mutex.h"
-#include "../core/semaphore.h"
+#include <msp/core/mutex.h>
+#include <msp/core/semaphore.h>
 #include "timedelta.h"
 #include "timestamp.h"
 
@@ -53,30 +53,22 @@ private:
 public:
 	~Timer();
 
-	/**
-	Adds a timer that will be executed periodically as long as the timeout
-	signal hander returns true.
-	*/
+	/** Adds a timer that will be executed periodically as long as the timeout
+	signal hander returns true. */
 	Slot &add(const TimeDelta &);
 
-	/**
-	Adds a timer that will be executed once at a specific time.  The return
-	value of the timeout signal handler is ignored.
-	*/
+	/** Adds a timer that will be executed once at a specific time.  The return
+	value of the timeout signal handler is ignored. */
 	Slot &add(const TimeStamp &);
 
-	/**
-	Cancels a previously added timer.
-	*/
+	/** Cancels a previously added timer. */
 	void cancel(Slot &);
 
-	/**
-	Checks all timers, executing any that have timed out.  If block is true,
+	/** Checks all timers, executing any that have timed out.  If block is true,
 	waits until one times out.
 
 	Note: If there are no active timers when a blocking tick is executed, it
-	won't return until a timer is added from another thread.
-	*/
+	won't return until a timer is added from another thread. */
 	void tick(bool block = true);
 
 	TimeStamp get_next_timeout() const;