X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Ftime.cpp;h=5cf03f18640ecd2f2f12dd1d13a438b54fb50490;hb=47a6485b6c2602a8bce63cbf09ded0952566a70a;hp=73a4dc50cf3e7b331781a16971ee02c5d89b4343;hpb=cc54c38609ee9745ad678e5e9b9d7d2912be9c95;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/time.cpp b/synfig-core/trunk/src/synfig/time.cpp
index 73a4dc5..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
@@ -35,6 +36,7 @@
 #include "general.h"
 #include <cmath>
 #include <cassert>
+#include <algorithm>
 #include <ctype.h>
 #include <math.h>
 
@@ -185,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;
@@ -202,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)
 	{
@@ -216,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;