Mercurial > hg > svcore
diff base/RealTime.h @ 1551:4de4284d0596
Merge from branch zoom
author | Chris Cannam |
---|---|
date | Wed, 10 Oct 2018 08:44:15 +0100 |
parents | 6415ac3becb6 |
children |
line wrap: on
line diff
--- a/base/RealTime.h Wed Oct 03 15:45:57 2018 +0100 +++ b/base/RealTime.h Wed Oct 10 08:44:15 2018 +0100 @@ -57,7 +57,8 @@ sec(r.sec), nsec(r.nsec) { } static RealTime fromSeconds(double sec); - static RealTime fromMilliseconds(int msec); + static RealTime fromMilliseconds(int64_t msec); + static RealTime fromMicroseconds(int64_t usec); static RealTime fromTimeval(const struct timeval &); static RealTime fromXsdDuration(std::string xsdd); @@ -171,7 +172,8 @@ * Unlike toText, this function does not depend on the application * preferences. */ - std::string toFrameText(int fps, bool hms) const; + std::string toFrameText(int fps, bool hms, + std::string frameDelimiter = ":") const; /** * Return a user-readable string to the nearest second, in H:M:S