X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftime%2Ftimedelta.cpp;h=d94d8c5f0e7463ad8e454ab214b6b1126206b67a;hb=cb8ed1df371834fb7766e0b7754cdf83c474d394;hp=891d56007a0316ff5b5a447383aaa72a6dd7ee54;hpb=e1ea831a640fba534e7e42e399f04cdf681ef8d3;p=libs%2Fcore.git

diff --git a/source/time/timedelta.cpp b/source/time/timedelta.cpp
index 891d560..d94d8c5 100644
--- a/source/time/timedelta.cpp
+++ b/source/time/timedelta.cpp
@@ -1,91 +1,79 @@
-/*
-This file is part of libmspframework
+/* $Id$
+
+This file is part of libmspcore
 Copyright © 2006  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
+
 #include <sstream>
+#include <iomanip>
 #include "timedelta.h"
 #include "units.h"
 
 using namespace std;
 
-namespace Msp {
-namespace Time {
+namespace {
 
-void print_part(ostream &out, int64_t &value, int64_t unit, char sep, bool &first)
+using Msp::Time::RawTime;
+
+void print_part(ostream &out, RawTime &value, RawTime unit, char sep, bool &first)
 {
-	if(value>=unit || !first)
-	{
-		if(first)
-			out<<value/unit;
-		else
-		{
-			out.width(2);
-			out<<value/unit;
-		}
-		if(sep) out<<sep;
-		value%=unit;
-		first=false;
-	}
+	if(value<unit && first)
+		return;
+	
+	if(!first)
+		out<<sep<<setw(2);
+	
+	out<<value/unit;
+	value%=unit;
+	first=false;
+}
+
 }
 
+namespace Msp {
+namespace Time {
+
 ostream &operator<<(ostream &out, const TimeDelta &td)
 {
 	ostringstream ss;
 	ss.fill('0');
-	if(td.usec<1000)
-		ss<<td.usec<<"µs";
-	else if(td.usec<1000000)
+
+	RawTime value=td.raw();
+
+	if(value<0)
 	{
-		ss<<td.usec/1000;
-		if(td.usec%1000)
-		{
-			ss<<'.';
-			ss.width(3);
-			ss<<td.usec%1000;
-		}
-		ss<<"ms";
+		ss<<'-';
+		value=-value;
 	}
-	else if(td.usec<60000000)
+
+	if(value==0)
+		ss<<'0';
+	else if(value<1000)
+		ss<<value<<"µs";
+	else if(value<1000000)
 	{
-		ss<<td.usec/1000000;
-		if(td.usec%1000000)
-		{
-			ss<<'.';
-			if(td.usec%1000)
-			{
-				ss.width(6);
-				ss<<td.usec%1000000;
-			}
-			else
-			{
-				ss.width(3);
-				ss<<td.usec/1000%1000;
-			}
-		}
-		ss<<"s";
+		ss<<value/1000;
+		value%=1000;
+		if(value)
+			ss<<'.'<<setw(3)<<value;
+		ss<<"ms";
 	}
 	else
 	{
-		int64_t temp=td.usec;
-		bool    first=true;
-		print_part(ss, temp, day.raw(),  '-', first);
-		print_part(ss, temp, hour.raw(), ':', first);
-		print_part(ss, temp, min.raw(),  ':', first);
-		print_part(ss, temp, sec.raw(),  0,   first);
-		if(temp)
+		bool first=true;
+		print_part(ss, value, 86400000000LL,  0,  first);
+		print_part(ss, value, 3600000000LL,  '-', first);
+		print_part(ss, value, 60000000LL,    ':', first);
+		print_part(ss, value, 1000000LL,     ':', first);
+
+		if(value)
 		{
 			ss<<'.';
-			if(temp%1000)
-			{
-				ss.width(6);
-				ss<<temp;
-			}
+			if(value%1000)
+				ss<<setw(6)<<value;
 			else
-			{
-				ss.width(3);
-				ss<<temp/1000;
-			}
+				ss<<setw(3)<<value/1000;
 		}
 		ss<<"s";
 	}