fixed permissions for stlplus files

[chaz/yoink] / src / Moof / Timer.cc

diff --git a/src/Moof/Timer.cc b/src/Moof/Timer.cc
index 733f54ca7f6326a826b0a5013cd1904a94cab4ac..b428f0aade848d1813b9d125b2acd9c238dbd5c1 100644 (file)
--- a/src/Moof/Timer.cc
+++ b/src/Moof/Timer.cc
@@ -30,6 +30,8 @@
 #include <ctime>
 #include <limits>
 
+#include <SDL/SDL.h>
+
 #include "Log.hh"
 #include "Timer.hh"
 
@@ -37,14 +39,12 @@
 #include "config.h"
 #endif
 
-#include <SDL/SDL.h>
-
 
 namespace Mf {
 
 
 Scalar Timer::gNextFire = std::numeric_limits<Scalar>::max();
-std::map<unsigned,Timer&> Timer::gTimers;
+std::map<unsigned,Timer*> Timer::gTimers;
 
 
 unsigned Timer::getNewID()
@@ -64,7 +64,7 @@ void Timer::init(const Function& function, Scalar seconds, Mode mode)
        {
                mFunction = function;
 
-               if (mode == ABSOLUTEE)
+               if (mode == ACTUAL)
                {
                        mAbsolute = seconds;
                }
@@ -75,7 +75,7 @@ void Timer::init(const Function& function, Scalar seconds, Mode mode)
                }
 
                mId = getNewID();
-               gTimers.insert(std::pair<unsigned,Timer&>(mId, *this));
+               gTimers.insert(std::pair<unsigned,Timer*>(mId, this));
 
                if (mAbsolute < gNextFire) gNextFire = mAbsolute;
        }
@@ -123,12 +123,12 @@ void Timer::fire()
 
 Scalar Timer::findNextFire()
 {
-       std::map<unsigned,Timer&>::iterator it;
+       std::map<unsigned,Timer*>::iterator it;
        Scalar nextFire = std::numeric_limits<Scalar>::max();
 
        for (it = gTimers.begin(); it != gTimers.end(); ++it)
        {
-               Scalar absolute = (*it).second.mAbsolute;
+               Scalar absolute = (*it).second->mAbsolute;
                if (absolute < nextFire) nextFire = absolute;
        }
 
@@ -154,14 +154,14 @@ bool Timer::isRepeating() const
 
 void Timer::fireIfExpired(Scalar t)
 {
-       std::map<unsigned,Timer&>::iterator it;
+       std::map<unsigned,Timer*>::iterator it;
 
        if (gNextFire > t) return;
 
        for (it = gTimers.begin(); it != gTimers.end(); ++it)
        {
-               Timer& timer = (*it).second;
-               if (timer.isExpired()) timer.fire();
+               Timer* timer = (*it).second;
+               if (timer->isExpired()) timer->fire();
        }
 }
 
@@ -194,17 +194,18 @@ Scalar Timer::getTicks()
 {
        struct timespec ts;
 
-       ASSERT(clock_gettime(CLOCK_MONOTONIC, &ts) == 0 && "cannot access clock");
+       int result = clock_gettime(CLOCK_MONOTONIC, &ts);
+       ASSERT(result == 0 && "cannot access clock");
 
        return Scalar(ts.tv_sec - reference) + Scalar(ts.tv_nsec) / 1000000000.0;
 }
 
-void Timer::sleep(Scalar seconds, bool absolute)
+void Timer::sleep(Scalar seconds, Mode mode)
 {
        struct timespec ts;
        int ret;
 
-       if (absolute) seconds -= getTicks();
+       if (mode == ACTUAL) seconds -= getTicks();
        ts.tv_sec = time_t(seconds);
        ts.tv_nsec = long((seconds - Scalar(ts.tv_sec)) * 1000000000.0);
 
@@ -229,9 +230,9 @@ Scalar Timer::getTicks()
        return Scalar(ms / 1000) + Scalar(ms % 1000) / 1000.0;
 }
 
-void Timer::sleep(Scalar seconds, bool absolute)
+void Timer::sleep(Scalar seconds, Mode mode)
 {
-       if (absolute) seconds -= getTicks();
+       if (mode == ACTUAL) seconds -= getTicks();
        SDL_Delay(Uint32(cml::clamp(int(seconds * 1000.0), 0, 1000)));
 }