**
** \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
if(format<=FORMAT_FULL || hour)
{
- ret+=strprintf(format<=FORMAT_NOSPACES?"%dh":"%dh ",hour);
+ ret+=strprintf("%dh",hour);
started = true;
}
if(format<=FORMAT_FULL || minute)
{
- ret+=strprintf(format<=FORMAT_NOSPACES?"%dm":"%dm ",minute);
+ if (!(format<=FORMAT_NOSPACES) && started)
+ ret += " ";
+
+ ret += strprintf("%dm", minute);
started = true;
}
float frame;
second=time;time-=second;
frame=time*fps;
+
if(format<=FORMAT_FULL || second)
{
- ret+=strprintf(format<=FORMAT_NOSPACES?"%ds":"%ds ",(int)second);
+ if (!(format<=FORMAT_NOSPACES) && started)
+ ret += " ";
+
+ ret += strprintf("%ds", (int)second);
started = true;
}
if(format<=FORMAT_FULL || frame || !started)
{
- if(abs(frame-floor(frame)>=epsilon_()))
- ret+=strprintf("%0.3ff",frame);
+ if (!(format<=FORMAT_NOSPACES) && started)
+ ret += " ";
+
+ if(abs(frame-floor(frame) >= epsilon_()))
+ ret += strprintf("%0.3ff", frame);
else
- ret+=strprintf("%0.0ff",frame);
+ ret += strprintf("%0.0ff", frame);
}
}
else
second=time;
if(format<=FORMAT_FULL || second || !started)
{
+ if (!(format<=FORMAT_NOSPACES) && started)
+ ret += " ";
+
if(abs(second-floor(second))>=epsilon_())
{
String seconds(strprintf("%0.8f",second));