X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fdcpomatic_time.h;h=c687569ecb0dac578809d0ae9294ccaf607960ad;hb=8872a0a0028048e277a623fa08e8242dd43f4824;hp=5f00807bdf2c3c4da605e577e3c18f7214d90391;hpb=35e5de23b21a1fc9788fadd9ecd8beae9cfc18e3;p=dcpomatic.git diff --git a/src/lib/dcpomatic_time.h b/src/lib/dcpomatic_time.h index 5f00807bd..c687569ec 100644 --- a/src/lib/dcpomatic_time.h +++ b/src/lib/dcpomatic_time.h @@ -117,12 +117,16 @@ public: * at some sampling rate. * @param r Sampling rate. */ - Time ceil (float r) const { - return Time (llrint (HZ * frames_ceil(r) / double(r))); + Time ceil (double r) const { + return Time (llrint (HZ * frames_ceil(r) / r)); } - Time floor (float r) const { - return Time (llrint (HZ * frames_floor(r) / double(r))); + Time floor (double r) const { + return Time (llrint (HZ * frames_floor(r) / r)); + } + + Time round (double r) const { + return Time (llrint (HZ * frames_round(r) / r)); } double seconds () const { @@ -217,12 +221,13 @@ public: return Time (INT64_MAX); } + static const int HZ = 96000; + private: friend struct dcpomatic_time_ceil_test; friend struct dcpomatic_time_floor_test; Type _t; - static const int HZ = 96000; }; class ContentTimeDifferentiator {};