Allow round-up to non-integer sample rates.

diff --git a/src/lib/dcpomatic_time.h b/src/lib/dcpomatic_time.h
index e0d47d9c8c49ff76cec5d0525408384efb5542c9..59986e6d892994787301325b7a4fc15316d89911 100644 (file)
--- a/src/lib/dcpomatic_time.h
+++ b/src/lib/dcpomatic_time.h
@@ -123,12 +123,11 @@ public:
         *  at some sampling rate.
         *  @param r Sampling rate.
         */
-       ContentTime round_up (int r) {
-               int64_t const n = HZ / r;
+       ContentTime round_up (float r) {
+               int64_t const n = rint (HZ / r);
                int64_t const a = _t + n - 1;
                return ContentTime (a - (a % n));
        }
-       
 
        static ContentTime from_seconds (double s) {
                return ContentTime (s * HZ);
@@ -199,8 +198,8 @@ public:
         *  at some sampling rate.
         *  @param r Sampling rate.
         */
-       DCPTime round_up (int r) {
-               int64_t const n = HZ / r;
+       DCPTime round_up (float r) {
+               int64_t const n = rint (HZ / r);
                int64_t const a = _t + n - 1;
                return DCPTime (a - (a % n));
        }