summaryrefslogtreecommitdiff
path: root/src/lib/dcpomatic_time.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2017-01-04 01:28:54 +0000
committerCarl Hetherington <cth@carlh.net>2017-01-04 01:28:54 +0000
commit11ac33e140f3aa9d6e992880a1e1b3a4ca649355 (patch)
tree6bf84806228017259803c3cd972166dd410c3b33 /src/lib/dcpomatic_time.h
parent3327fcba6db6c0b2e70ccca81340f5d5781cae0d (diff)
Rename Time::round_up to Time::ceil.
Diffstat (limited to 'src/lib/dcpomatic_time.h')
-rw-r--r--src/lib/dcpomatic_time.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/dcpomatic_time.h b/src/lib/dcpomatic_time.h
index 893bce257..6834ee099 100644
--- a/src/lib/dcpomatic_time.h
+++ b/src/lib/dcpomatic_time.h
@@ -118,7 +118,7 @@ public:
* at some sampling rate.
* @param r Sampling rate.
*/
- Time<S, O> round_up (float r) const {
+ Time<S, O> ceil (float r) const {
Type const n = llrintf (HZ / r);
Type const a = _t + n - 1;
return Time<S, O> (a - (a % n));
@@ -152,7 +152,7 @@ public:
the calculation will round down before we get the chance
to ceil().
*/
- return ceil (_t * double(r) / HZ);
+ return ::ceil (_t * double(r) / HZ);
}
/** @param r Frames per second */
@@ -211,7 +211,7 @@ public:
}
private:
- friend struct dcptime_round_up_test;
+ friend struct dcptime_ceil_test;
Type _t;
static const int HZ = 96000;