--- a/modules/timer/timer.cpp	Thu Jun 02 16:56:11 2016 +0200
+++ b/modules/timer/timer.cpp	Thu Jun 02 16:56:30 2016 +0200
@@ -1,4 +1,23 @@
+/*
+ * timer.cpp -- threaded timers
+ *
+ * Copyright (c) 2016 David Demelier <markand@malikania.fr>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
 #include <cassert>
+#include <chrono>
 
 #include "timer.hpp"
 
@@ -50,36 +69,4 @@
 		m_condition.notify_one();
 		m_thread.join();
 	}
-}
-
-
-
-
-
-
-
-
-#include <iostream>
-
-int main()
-{
-	Timer timer(Timer::Repeat, 500);
-
-	timer.setHandler([] () { std::puts("tu me chatouilles"); });
-	auto f = std::move(timer.handler());
-	timer.setHandler([&] () {
-		std::puts("preums");
-		f();
-	});
-	timer.start();
-
-	std::this_thread::sleep_for(std::chrono::seconds(2));
-	std::puts("Je coupe le son...");
-	timer.stop();
-	std::this_thread::sleep_for(std::chrono::seconds(5));
-	std::puts("Je remets le son...");
-	timer.start();
-	std::this_thread::sleep_for(std::chrono::seconds(2));
-
-	return 0;
 }
\ No newline at end of file

--- a/modules/timer/timer.hpp	Thu Jun 02 16:56:11 2016 +0200
+++ b/modules/timer/timer.hpp	Thu Jun 02 16:56:30 2016 +0200
@@ -1,18 +1,48 @@
+/*
+ * timer.hpp -- threaded timers
+ *
+ * Copyright (c) 2016 David Demelier <markand@malikania.fr>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
 #ifndef TIMER_HPP
 #define TIMER_HPP
 
+/**
+ * \file timer.hpp
+ * \brief Threaded timers.
+ */
+
 #include <atomic>
 #include <condition_variable>
-#include <chrono>
 #include <cstdint>
 #include <functional>
 #include <mutex>
 #include <thread>
 
+/**
+ * \brief Threaded timer.
+ */
 class Timer {
 public:
+	/**
+	 * \brief Type of timer.
+	 */
 	enum Type {
+		/// Periodic timer.
 		Repeat,
+		/// Oneshot timer.
 		Single
 	};
 
@@ -31,34 +61,81 @@
 	void runForever();
 
 public:
+	/**
+	 * Constructor.
+	 *
+	 * \param type the type of timer
+	 * \param delay the delay in milliseconds
+	 */
 	inline Timer(Type type, std::uint32_t delay) noexcept
 		: m_type(type)
 		, m_delay(delay)
 	{
 	}
 
+	/**
+	 * Stop the timer.
+	 */
 	inline ~Timer()
 	{
 		stop();
 	}
 
+	/**
+	 * Get the current handler.
+	 *
+	 * \return the handler
+	 */
 	inline const std::function<void ()> &handler() const noexcept
 	{
 		return m_handler;
 	}
 
+	/**
+	 * Overloaded function.
+	 *
+	 * \return the handler
+	 */
 	inline std::function<void ()> &handler() noexcept
 	{
 		return m_handler;
 	}
 
+	/**
+	 * Set the handler.
+	 *
+	 * \pre !isActive()
+	 * \param handler the handler
+	 */
 	inline void setHandler(std::function<void ()> handler)
 	{
+		assert(!m_thread.joinable());
+
 		m_handler = std::move(handler);
 	}
 
+	/**
+	 * Tells if a pending thread is still active even if the execution has finished.
+	 *
+	 * \return true if active
+	 */
+	inline bool isActive() const noexcept
+	{
+		return m_thread.joinable();
+	}
+
+	/**
+	 * Start the timer.
+	 *
+	 * \pre the timer must not be running
+	 */
 	void start();
 
+	/**
+	 * Stop the timer.
+	 *
+	 * Can be safely called multiple times.
+	 */
 	void stop();
 };