X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Ftime.cpp;h=35232d4ac9ffe50b1156c0c2730caeaf144c2a39;hb=9bc1b052a60474037035c6e5b9558cc8c1c824d3;hp=e62527812b8451630fee7aa6ba4518a2255915c1;hpb=41c73ed08565103a6004b768d9c198453d98cb62;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/time.cpp b/synfig-core/trunk/src/synfig/time.cpp
index e625278..35232d4 100644
--- a/synfig-core/trunk/src/synfig/time.cpp
+++ b/synfig-core/trunk/src/synfig/time.cpp
@@ -6,7 +6,7 @@
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
-**	Copyright (c) 2007 Chris Moore
+**	Copyright (c) 2007, 2008 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
@@ -183,10 +183,11 @@ Time::get_string(float fps, Time::Format format)const
 		time.value_=ceil(time.value_);
 
 	int hour,minute;
-
-	hour=time/3600;time-=hour*3600;
-	minute=time/60;time-=minute*60;
-
+	if(!(format<=FORMAT_FRAMES))
+	{
+		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)
 	{
@@ -204,6 +205,14 @@ Time::get_string(float fps, Time::Format format)const
 			return strprintf("%02d:%02d:%02d",hour,minute,second);
 	}
 
+	if (format <= FORMAT_FRAMES)
+	{
+		if (fps && fps>0)
+			return strprintf("%df", round_to_int(time * fps));
+		else
+			return strprintf("%ds", round_to_int(time * 1));
+	}
+
 	String ret;
 	bool started = false;
 
@@ -238,7 +247,7 @@ Time::get_string(float fps, Time::Format format)const
 			started = true;
 		}
 
-		if(format<=FORMAT_FULL || frame || !started)
+		if(format<=FORMAT_FULL || abs(frame) > epsilon_() || !started)
 		{
 			if (!(format<=FORMAT_NOSPACES) && started)
 				ret += " ";