X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Ftime.h;h=5acc15ef7360e26cae13d3ff1824044311bd5282;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=27ada9f3d98999604e0bf7089bb07b78d9d46c35;hpb=28f28705612902c15cd0702cc891fba35bf2d2df;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/time.h b/synfig-core/trunk/src/synfig/time.h
index 27ada9f..5acc15e 100644
--- a/synfig-core/trunk/src/synfig/time.h
+++ b/synfig-core/trunk/src/synfig/time.h
@@ -2,19 +2,21 @@
 /*!	\file time.h
 **	\brief Template Header
 **
-**	$Id: time.h,v 1.1.1.1 2005/01/04 01:23:15 darco Exp $
+**	$Id$
 **
 **	\legal
-**	Copyright (c) 2002 Robert B. Quattlebaum Jr.
+**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007 Chris Moore
 **
-**	This software and associated documentation
-**	are CONFIDENTIAL and PROPRIETARY property of
-**	the above-mentioned copyright holder.
+**	This package is free software; you can redistribute it and/or
+**	modify it under the terms of the GNU General Public License as
+**	published by the Free Software Foundation; either version 2 of
+**	the License, or (at your option) any later version.
 **
-**	You may not copy, print, publish, or in any
-**	other way distribute this software without
-**	a prior written agreement with
-**	the copyright holder.
+**	This package is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+**	General Public License for more details.
 **	\endlegal
 */
 /* ========================================================================= */
@@ -53,15 +55,16 @@ public:
 		FORMAT_NORMAL=0,		//!< Represents the default method of printing the time
 		FORMAT_NOSPACES=(1<<0),	//!< Remove any whitespace
 		FORMAT_FULL=(1<<1),		//!< Do not remove units that have "zero" value
-		FORMAT_VIDEO=(1<<2),	//!< Use the HH:MM:SS.ff format
-	
+		FORMAT_VIDEO=(1<<2),	//!< Use the HH:MM:SS.FF format
+		FORMAT_FRAMES=(1<<3),	//!< Use the FF format (frames only)
+
 		FORMAT_END=(1<<4)		//!< \internal Not used
 	}; // END of enum Format
 
 private:
 	value_type value_;
 
-	static const value_type epsilon_() { return static_cast<value_type>(0.0005); }
+	static value_type epsilon_() { return static_cast<value_type>(0.0005); }
 
 public:
 	Time() { }
@@ -74,7 +77,7 @@ public:
 
 	//! Constructs Time from the given string.
 	/*!	\note If the string references frames, then the
-	**	frame rate (\afps) should be provided from the
+	**	frame rate (\a fps) should be provided from the
 	**	correct source. (Which is most likely the RendDesc
 	**	of the current Canvas)
 	**	The frame count will be ignored if the
@@ -83,30 +86,34 @@ public:
 
 	//! Marks the exclusive negative boundary of time
 	static const Time begin() { return static_cast<synfig::Time>(-32767.0f*512.0f); }
-	
+
 	//! Marks the exclusive positive boundary of time
 	static const Time end() { return static_cast<synfig::Time>(32767.0f*512.0f); }
 
 	//! Marks zero time
 	static const Time zero() { return static_cast<synfig::Time>(0); }
-	
+
 	//! The amount of allowable error in calculations
 	static const Time epsilon() { return static_cast<synfig::Time>(epsilon_()); }
-	
+
 	//! Returns a string describing the current time value
 	/*!	\see Format */
 	String get_string(float fps=0, Time::Format format=FORMAT_NORMAL)const;
-	
+
+#ifdef _DEBUG
+	const char *c_str()const;
+#endif
+
 	//! \writeme
 	bool is_valid()const;
-	
+
 	//! Rounds time to the nearest frame for the given frame rate, \a fps
 	Time round(float fps)const;
 
 	bool is_equal(const Time& rhs)const { return (value_>rhs.value_)?value_-rhs.value_<=epsilon_():rhs.value_-value_<=epsilon_(); }
 	bool is_less_than(const Time& rhs)const { return rhs.value_-value_ > epsilon_(); }
 	bool is_more_than(const Time& rhs)const { return value_-rhs.value_ > epsilon_(); }
-	
+
 	operator double()const { return value_; }
 
 	template<typename U> bool operator<(const U& rhs)const { return value_<rhs; }
@@ -131,7 +138,7 @@ public:
 	bool operator==(const Time& rhs)const { return is_equal(rhs); }
 	bool operator!=(const Time& rhs)const { return !is_equal(rhs); }
 #endif
-	
+
 	template<typename U> const Time& operator+=(const U &rhs) { value_+=static_cast<value_type>(rhs); return *this; }
 	template<typename U> const Time& operator-=(const U &rhs) { value_-=static_cast<value_type>(rhs); return *this; }
 	template<typename U> const Time& operator*=(const U &rhs) { value_*=static_cast<value_type>(rhs); return *this; }
@@ -141,7 +148,7 @@ public:
 	template<typename U> Time operator-(const U &rhs)const { return value_-static_cast<value_type>(rhs); }
 	template<typename U> Time operator*(const U &rhs)const { return value_*static_cast<value_type>(rhs); }
 	template<typename U> Time operator/(const U &rhs)const { return value_/static_cast<value_type>(rhs); }
-	
+
 	Time operator-()const { return -value_; }
 }; // END of class Time
 
@@ -158,7 +165,7 @@ inline bool operator<=(Time::Format lhs, Time::Format rhs)
 { return (static_cast<int>(lhs) & static_cast<int>(rhs))==static_cast<int>(rhs); }
 
 }; // END of namespace synfig
-	
+
 /* === E N D =============================================================== */
 
 #endif