summaryrefslogtreecommitdiff
path: root/src/lib/dcpomatic_time.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-06-21 01:15:32 +0100
committerCarl Hetherington <cth@carlh.net>2015-06-21 01:15:32 +0100
commite60bb3e51bd1508b149e6b8f6608f09b5196ae26 (patch)
treea7a5b937c9ae138d4eebca8d5130d308bf9ae420 /src/lib/dcpomatic_time.h
parentf07d5125a7b609320682689abe40781f096ca25e (diff)
No-op: remove all trailing whitespace.
Diffstat (limited to 'src/lib/dcpomatic_time.h')
-rw-r--r--src/lib/dcpomatic_time.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/dcpomatic_time.h b/src/lib/dcpomatic_time.h
index 0b78c5390..df9c46c71 100644
--- a/src/lib/dcpomatic_time.h
+++ b/src/lib/dcpomatic_time.h
@@ -62,7 +62,7 @@ public:
/* Explicit conversion from type O */
Time (Time<O, S> d, FrameRateChange f);
-
+
Type get () const {
return _t;
}
@@ -144,7 +144,7 @@ public:
to a frame boundary at the start rather than the end.
*/
int64_t ff = frames (r);
-
+
h = ff / (3600 * r);
ff -= h * 3600 * r;
m = ff / (60 * r);
@@ -173,7 +173,7 @@ public:
return o.str ();
}
-
+
static Time<S, O> from_seconds (double s) {
return Time<S, O> (s * HZ);
}
@@ -191,14 +191,14 @@ public:
static Time<S, O> min () {
return Time<S, O> (-INT64_MAX);
}
-
+
static Time<S, O> max () {
return Time<S, O> (INT64_MAX);
}
-
+
private:
friend struct dcptime_round_up_test;
-
+
Type _t;
static const int HZ = 96000;
};
@@ -223,7 +223,7 @@ class ContentTimePeriod
{
public:
ContentTimePeriod () {}
-
+
ContentTimePeriod (ContentTime f, ContentTime t)
: from (f)
, to (t)