X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FTimer.cc;h=3e42818962d5df7e124f7edc96ed4384ca3dc171;hp=7f51510ce60189320383f25272e87da9914dc353;hb=837bae9f2bf7b25e1d3d2625eeaf39c1d2f48827;hpb=c9e20ac06383b20ceb5404c9237e319c2e90d157

diff --git a/src/Moof/Timer.cc b/src/Moof/Timer.cc
index 7f51510..3e42818 100644
--- a/src/Moof/Timer.cc
+++ b/src/Moof/Timer.cc
@@ -1,30 +1,13 @@
 
-/*******************************************************************************
-
- Copyright (c) 2009, Charles McGarvey
- All rights reserved.
- 
- Redistribution   and   use  in  source  and  binary  forms,  with  or  without
- modification, are permitted provided that the following conditions are met:
- 
-   * Redistributions  of  source  code  must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
-   * Redistributions  in binary form must reproduce the above copyright notice,
-     this  list of conditions and the following disclaimer in the documentation
-     and/or other materials provided with the distribution.
- 
- THIS  SOFTWARE  IS  PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND  ANY  EXPRESS  OR  IMPLIED  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED.  IN  NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR  ANY  DIRECT,  INDIRECT,  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES  (INCLUDING,  BUT  NOT  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES;  LOSS  OF  USE,  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED  AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR  TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
+/*]  Copyright (c) 2009-2010, Charles McGarvey  [**************************
+**]  All rights reserved.
+*
+* vi:ts=4 sw=4 tw=75
+*
+* Distributable under the terms and conditions of the 2-clause BSD license;
+* see the file COPYING for a complete text of the license.
+*
+**************************************************************************/
 
 #include <cerrno>
 #include <ctime>
@@ -64,7 +47,7 @@ void Timer::init(const Function& function, Scalar seconds, Mode mode)
 	{
 		mFunction = function;
 
-		if (mode == ABSOLUTEE)
+		if (mode == ACTUAL)
 		{
 			mAbsolute = seconds;
 		}
@@ -152,6 +135,11 @@ bool Timer::isRepeating() const
 }
 
 
+void Timer::fireIfExpired()
+{
+	fireIfExpired(getTicks());
+}
+
 void Timer::fireIfExpired(Scalar t)
 {
 	std::map<unsigned,Timer*>::iterator it;
@@ -168,12 +156,12 @@ void Timer::fireIfExpired(Scalar t)
 
 #if HAVE_CLOCK_GETTIME
 
-// Since the monotonic clock will provide us with the time since the computer
-// started, the number of seconds since that time could easily become so large
-// that it cannot be accurately stored in a float (even with as little two days
-// uptime), therefore we need to start from a more recent reference (when the
-// program starts).  Of course this isn't much of an issue if scalar is a
-// double-precision number.
+// Since the monotonic clock will provide us with the time since the
+// computer started, the number of seconds since that time could easily
+// become so large that it cannot be accurately stored in a float (even
+// with as little two days uptime), therefore we need to start from a more
+// recent reference (when the program starts).  Of course this isn't much
+// of an issue if scalar is a double-precision number.
 
 static time_t setReference_()
 {
@@ -197,15 +185,16 @@ Scalar Timer::getTicks()
 	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;
+	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);
 
@@ -220,9 +209,9 @@ void Timer::sleep(Scalar seconds, bool absolute)
 #else // ! HAVE_CLOCK_GETTIME
 
 
-// If we don't have posix timers, we'll have to use a different timing method.
-// SDL only promises centisecond accuracy, but that's better than a kick in the
-// butt.
+// If we don't have posix timers, we'll have to use a different timing
+// method.  SDL only promises centisecond accuracy, but that's better than
+// a kick in the pants.
 
 Scalar Timer::getTicks()
 {
@@ -230,9 +219,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)));
 }
 
@@ -241,5 +230,3 @@ void Timer::sleep(Scalar seconds, bool absolute)
 
 } // namespace Mf
 
-/** vim: set ts=4 sw=4 tw=80: *************************************************/
-