|
|
@@ -26,32 +26,33 @@ |
|
|
|
==============================================================================
|
|
|
|
*/
|
|
|
|
|
|
|
|
RelativeTime::RelativeTime (const double secs) noexcept : seconds (secs) {}
|
|
|
|
RelativeTime::RelativeTime (const RelativeTime& other) noexcept : seconds (other.seconds) {}
|
|
|
|
RelativeTime::RelativeTime (const double secs) noexcept : numSeconds (secs) {}
|
|
|
|
RelativeTime::RelativeTime (const RelativeTime& other) noexcept : numSeconds (other.numSeconds) {}
|
|
|
|
RelativeTime::~RelativeTime() noexcept {}
|
|
|
|
|
|
|
|
//==============================================================================
|
|
|
|
RelativeTime RelativeTime::milliseconds (const int milliseconds) noexcept { return RelativeTime (milliseconds * 0.001); }
|
|
|
|
RelativeTime RelativeTime::milliseconds (const int64 milliseconds) noexcept { return RelativeTime (milliseconds * 0.001); }
|
|
|
|
RelativeTime RelativeTime::seconds (double s) noexcept { return RelativeTime (s); }
|
|
|
|
RelativeTime RelativeTime::minutes (const double numberOfMinutes) noexcept { return RelativeTime (numberOfMinutes * 60.0); }
|
|
|
|
RelativeTime RelativeTime::hours (const double numberOfHours) noexcept { return RelativeTime (numberOfHours * (60.0 * 60.0)); }
|
|
|
|
RelativeTime RelativeTime::days (const double numberOfDays) noexcept { return RelativeTime (numberOfDays * (60.0 * 60.0 * 24.0)); }
|
|
|
|
RelativeTime RelativeTime::weeks (const double numberOfWeeks) noexcept { return RelativeTime (numberOfWeeks * (60.0 * 60.0 * 24.0 * 7.0)); }
|
|
|
|
|
|
|
|
//==============================================================================
|
|
|
|
int64 RelativeTime::inMilliseconds() const noexcept { return (int64) (seconds * 1000.0); }
|
|
|
|
double RelativeTime::inMinutes() const noexcept { return seconds / 60.0; }
|
|
|
|
double RelativeTime::inHours() const noexcept { return seconds / (60.0 * 60.0); }
|
|
|
|
double RelativeTime::inDays() const noexcept { return seconds / (60.0 * 60.0 * 24.0); }
|
|
|
|
double RelativeTime::inWeeks() const noexcept { return seconds / (60.0 * 60.0 * 24.0 * 7.0); }
|
|
|
|
int64 RelativeTime::inMilliseconds() const noexcept { return (int64) (numSeconds * 1000.0); }
|
|
|
|
double RelativeTime::inMinutes() const noexcept { return numSeconds / 60.0; }
|
|
|
|
double RelativeTime::inHours() const noexcept { return numSeconds / (60.0 * 60.0); }
|
|
|
|
double RelativeTime::inDays() const noexcept { return numSeconds / (60.0 * 60.0 * 24.0); }
|
|
|
|
double RelativeTime::inWeeks() const noexcept { return numSeconds / (60.0 * 60.0 * 24.0 * 7.0); }
|
|
|
|
|
|
|
|
//==============================================================================
|
|
|
|
RelativeTime& RelativeTime::operator= (const RelativeTime& other) noexcept { seconds = other.seconds; return *this; }
|
|
|
|
RelativeTime& RelativeTime::operator= (const RelativeTime& other) noexcept { numSeconds = other.numSeconds; return *this; }
|
|
|
|
|
|
|
|
RelativeTime RelativeTime::operator+= (RelativeTime t) noexcept { seconds += t.seconds; return *this; }
|
|
|
|
RelativeTime RelativeTime::operator-= (RelativeTime t) noexcept { seconds -= t.seconds; return *this; }
|
|
|
|
RelativeTime RelativeTime::operator+= (const double secs) noexcept { seconds += secs; return *this; }
|
|
|
|
RelativeTime RelativeTime::operator-= (const double secs) noexcept { seconds -= secs; return *this; }
|
|
|
|
RelativeTime RelativeTime::operator+= (RelativeTime t) noexcept { numSeconds += t.numSeconds; return *this; }
|
|
|
|
RelativeTime RelativeTime::operator-= (RelativeTime t) noexcept { numSeconds -= t.numSeconds; return *this; }
|
|
|
|
RelativeTime RelativeTime::operator+= (const double secs) noexcept { numSeconds += secs; return *this; }
|
|
|
|
RelativeTime RelativeTime::operator-= (const double secs) noexcept { numSeconds -= secs; return *this; }
|
|
|
|
|
|
|
|
RelativeTime operator+ (RelativeTime t1, RelativeTime t2) noexcept { return t1 += t2; }
|
|
|
|
RelativeTime operator- (RelativeTime t1, RelativeTime t2) noexcept { return t1 -= t2; }
|
|
|
@@ -73,13 +74,13 @@ static void translateTimeField (String& result, int n, const char* singular, con |
|
|
|
|
|
|
|
String RelativeTime::getDescription (const String& returnValueForZeroTime) const
|
|
|
|
{
|
|
|
|
if (seconds < 0.001 && seconds > -0.001)
|
|
|
|
if (numSeconds < 0.001 && numSeconds > -0.001)
|
|
|
|
return returnValueForZeroTime;
|
|
|
|
|
|
|
|
String result;
|
|
|
|
result.preallocateBytes (32);
|
|
|
|
|
|
|
|
if (seconds < 0)
|
|
|
|
if (numSeconds < 0)
|
|
|
|
result << '-';
|
|
|
|
|
|
|
|
int fieldsShown = 0;
|
|
|
|