X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Ftime.cpp;h=5cf03f18640ecd2f2f12dd1d13a438b54fb50490;hb=37600b4b217caa5e316984ec0b035c5e8f9698af;hp=acc6bcf95f23b75c35c5232686dc3fd8917e26d4;hpb=716b28d513455e159096dff4777db6f60f9f3c8f;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/time.cpp b/synfig-core/trunk/src/synfig/time.cpp
index acc6bcf..5cf03f1 100644
--- a/synfig-core/trunk/src/synfig/time.cpp
+++ b/synfig-core/trunk/src/synfig/time.cpp
@@ -6,6 +6,7 @@
 **
 **	\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
@@ -186,6 +187,7 @@ Time::get_string(float fps, Time::Format format)const
 	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;
@@ -203,12 +205,19 @@ Time::get_string(float fps, Time::Format format)const
 	}
 
 	String ret;
+	bool started = false;
 
 	if(format<=FORMAT_FULL || hour)
+	{
 		ret+=strprintf(format<=FORMAT_NOSPACES?"%dh":"%dh ",hour);
+		started = true;
+	}
 
-	if(format<=FORMAT_FULL || hour || minute)
+	if(format<=FORMAT_FULL || minute)
+	{
 		ret+=strprintf(format<=FORMAT_NOSPACES?"%dm":"%dm ",minute);
+		started = true;
+	}
 
 	if(fps)
 	{
@@ -217,21 +226,30 @@ Time::get_string(float fps, Time::Format format)const
 		second=time;time-=second;
 		frame=time*fps;
 		if(format<=FORMAT_FULL || second)
+		{
 			ret+=strprintf(format<=FORMAT_NOSPACES?"%ds":"%ds ",(int)second);
+			started = true;
+		}
 
-		if(abs(frame-floor(frame)>=epsilon_()))
-			ret+=strprintf("%0.3ff",frame);
-		else
-			ret+=strprintf("%0.0ff",frame);
+		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_())
+				ret+=strprintf("%0.8fs",second);
+			else
+				ret+=strprintf("%0.0fs",second);
+		}
 	}
 
 	return ret;