X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Ftime.cpp;h=6755b80f3ebb6336ec7b46577fb2905a0147b098;hb=4cd211467061154545ef7b5f5617dce7b177bf16;hp=946ac0bdedbcf6069e8fc1e2f52230f2182b9abe;hpb=b494445bc3ba5344e65869c7c6bab2b008438f1c;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/time.cpp b/synfig-core/trunk/src/synfig/time.cpp
index 946ac0b..6755b80 100644
--- a/synfig-core/trunk/src/synfig/time.cpp
+++ b/synfig-core/trunk/src/synfig/time.cpp
@@ -2,10 +2,11 @@
 /*!	\file time.cpp
 **	\brief Template File
 **
-**	$Id: time.cpp,v 1.1.1.1 2005/01/04 01:23:15 darco Exp $
+**	$Id$
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007 Chris Moore
 **
 **	This package is free software; you can redistribute it and/or
 **	modify it under the terms of the GNU General Public License as
@@ -35,10 +36,10 @@
 #include "general.h"
 #include <cmath>
 #include <cassert>
+#include <algorithm>
 #include <ctype.h>
 #include <math.h>
 
-#ifndef isnan
 
 #ifdef WIN32
 #include <float.h>
@@ -48,12 +49,18 @@ extern "C" { int _isnan(double x); }
 #endif
 #endif
 
-#ifdef __APPLE__
-#define isnan __isnanf
+// For some reason isnan() isn't working on macosx any more.
+// This is a quick fix.
+#if defined(__APPLE__) && !defined(SYNFIG_ISNAN_FIX)
+#ifdef isnan
+#undef isnan
 #endif
-
+inline bool isnan(double x) { return x != x; }
+inline bool isnan(float x) { return x != x; }
+#define SYNFIG_ISNAN_FIX 1
 #endif
 
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -93,8 +100,8 @@ Time::Time(const String &str_, float fps):
 	unsigned int pos=0;
 	int read;
 	float amount;
-	
-	// Now try to read it in the letter-abreviated format
+
+	// Now try to read it in the letter-abbreviated format
 	while(pos<str.size() && sscanf(String(str,pos).c_str(),"%f%n",&amount,&read))
 	{
 		pos+=read;
@@ -140,7 +147,7 @@ Time::Time(const String &str_, float fps):
 							value_=frame/fps+(hour*3600+minute*60+second);
 							return;
 					}
-			
+
 					if(sscanf(str.c_str(),"%d:%d:%d",&hour,&minute,&second)==3)
 					{
 						value_=hour*3600+minute*60+second;
@@ -164,28 +171,29 @@ String
 Time::get_string(float fps, Time::Format format)const
 {
 	Time time(*this);
-	
+
 	if(time<=begin())
 		return "SOT";	// Start Of Time
 	if(time>=end())
 		return "EOT";	// End Of Time
-	
+
 	if(fps<0)fps=0;
-	
+
 	if(ceil(time.value_)-time.value_<epsilon_())
 		time.value_=ceil(time.value_);
-	
+
 	int hour,minute;
-	
+
 	hour=time/3600;time-=hour*3600;
 	minute=time/60;time-=minute*60;
-	
+
+	// <= is redefined, so this means "is the FORMAT_VIDEO bit set in the format?"
 	if(format<=FORMAT_VIDEO)
 	{
 		int second;
 		second=time;time-=second;
 
-		if(fps)
+		if(fps && fps>1)
 		{
 			int frame;
 			frame=round_to_int(time*fps);
@@ -195,39 +203,68 @@ Time::get_string(float fps, Time::Format format)const
 		else
 			return strprintf("%02d:%02d:%02d",hour,minute,second);
 	}
-	
+
 	String ret;
+	bool started = false;
 
 	if(format<=FORMAT_FULL || hour)
+	{
 		ret+=strprintf(format<=FORMAT_NOSPACES?"%dh":"%dh ",hour);
-	
-	if(format<=FORMAT_FULL || hour || minute)
+		started = true;
+	}
+
+	if(format<=FORMAT_FULL || minute)
+	{
 		ret+=strprintf(format<=FORMAT_NOSPACES?"%dm":"%dm ",minute);
-	
-	if(fps)
+		started = true;
+	}
+
+	if(fps && fps>1)
 	{
 		int second;
 		float frame;
 		second=time;time-=second;
 		frame=time*fps;
 		if(format<=FORMAT_FULL || second)
+		{
 			ret+=strprintf(format<=FORMAT_NOSPACES?"%ds":"%ds ",(int)second);
-		
-		if(abs(frame-floor(frame)>=epsilon_()))
-			ret+=strprintf("%0.3ff",frame);
-		else
-			ret+=strprintf("%0.0ff",frame);
+			started = true;
+		}
+
+		if(format<=FORMAT_FULL || frame || !started)
+		{
+			if(abs(frame-floor(frame)>=epsilon_()))
+				ret+=strprintf("%0.3ff",frame);
+			else
+				ret+=strprintf("%0.0ff",frame);
+		}
 	}
 	else
 	{
 		float second;
 		second=time;
-		if(abs(second-floor(second))>=epsilon_())
-			ret+=strprintf("%0.8fs",second);
-		else
-			ret+=strprintf("%0.0fs",second);
+		if(format<=FORMAT_FULL || second || !started)
+		{
+			if(abs(second-floor(second))>=epsilon_())
+			{
+				String seconds(strprintf("%0.8f",second));
+
+				// skip trailing zeros
+				int count = 0;
+				String::reverse_iterator i = seconds.rbegin();
+				for ( ; (*i) == '0'; i++)
+					count++;
+
+				// if we removed too many, go back one place, leaving one zero
+				if (*i < '0' || *i > '9') count--;
+
+				ret += seconds.substr(0, seconds.size()-count) + "s";
+			}
+			else
+				ret+=strprintf("%0.0fs",second);
+		}
 	}
-	
+
 	return ret;
 }
 
@@ -246,6 +283,14 @@ Time::round(float fps)const
 		return ceil(time)/fps;
 }
 
+#ifdef _DEBUG
+const char *
+Time::c_str()const
+{
+	return get_string().c_str();
+}
+#endif
+
 //! \writeme
 bool
 Time::is_valid()const