Mercurial > hg > svcore
diff base/RealTime.h @ 1527:710e6250a401 zoom
Merge from default branch
author | Chris Cannam |
---|---|
date | Mon, 17 Sep 2018 13:51:14 +0100 |
parents | 48e9f538e6e9 |
children | 71207822a7e0 |
line wrap: on
line diff
--- a/base/RealTime.h Mon Dec 12 15:18:52 2016 +0000 +++ b/base/RealTime.h Mon Sep 17 13:51:14 2018 +0100 @@ -51,10 +51,10 @@ RealTime(int s, int n); RealTime(const RealTime &r) : - sec(r.sec), nsec(r.nsec) { } + sec(r.sec), nsec(r.nsec) { } RealTime(const Vamp::RealTime &r) : - sec(r.sec), nsec(r.nsec) { } + sec(r.sec), nsec(r.nsec) { } static RealTime fromSeconds(double sec); static RealTime fromMilliseconds(int msec); @@ -65,27 +65,27 @@ Vamp::RealTime toVampRealTime() const { return Vamp::RealTime(sec, nsec); } RealTime &operator=(const RealTime &r) { - sec = r.sec; nsec = r.nsec; return *this; + sec = r.sec; nsec = r.nsec; return *this; } RealTime operator+(const RealTime &r) const { - return RealTime(sec + r.sec, nsec + r.nsec); + return RealTime(sec + r.sec, nsec + r.nsec); } RealTime operator-(const RealTime &r) const { - return RealTime(sec - r.sec, nsec - r.nsec); + return RealTime(sec - r.sec, nsec - r.nsec); } RealTime operator-() const { - return RealTime(-sec, -nsec); + return RealTime(-sec, -nsec); } bool operator <(const RealTime &r) const { - if (sec == r.sec) return nsec < r.nsec; - else return sec < r.sec; + if (sec == r.sec) return nsec < r.nsec; + else return sec < r.sec; } bool operator >(const RealTime &r) const { - if (sec == r.sec) return nsec > r.nsec; - else return sec > r.sec; + if (sec == r.sec) return nsec > r.nsec; + else return sec > r.sec; } bool operator==(const RealTime &r) const {