X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcpomatic_time.h;h=3d792467b465d4a433b5425942018b0e7b06d78b;hb=6a646daeb7586fdf42bfd344960d9ba1e83466bf;hp=ad5b6768edb1140c9ac04570bab6f8a8af1651b2;hpb=bc9bd13a2d9df75057511deca71b943ab1183e19;p=dcpomatic.git

diff --git a/src/lib/dcpomatic_time.h b/src/lib/dcpomatic_time.h
index ad5b6768e..3d792467b 100644
--- a/src/lib/dcpomatic_time.h
+++ b/src/lib/dcpomatic_time.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2017 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -117,12 +117,16 @@ public:
 	 *  at some sampling rate.
 	 *  @param r Sampling rate.
 	 */
-	Time<S, O> ceil (float r) const {
-		return Time<S, O> (llrint (HZ * frames_ceil(r) / double(r)));
+	Time<S, O> ceil (double r) const {
+		return Time<S, O> (llrint (HZ * frames_ceil(r) / r));
 	}
 
-	Time<S, O> floor (float r) const {
-		return Time<S, O> (llrint (HZ * frames_floor(r) / double(r)));
+	Time<S, O> floor (double r) const {
+		return Time<S, O> (llrint (HZ * frames_floor(r) / r));
+	}
+
+	Time<S, O> round (double r) const {
+		return Time<S, O> (llrint (HZ * frames_round(r) / r));
 	}
 
 	double seconds () const {
@@ -218,8 +222,8 @@ public:
 	}
 
 private:
-	friend struct dcptime_ceil_test;
-	friend struct dcptime_floor_test;
+	friend struct dcpomatic_time_ceil_test;
+	friend struct dcpomatic_time_floor_test;
 
 	Type _t;
 	static const int HZ = 96000;