summaryrefslogtreecommitdiff
path: root/src/lib/dcpomatic_time.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-05-26 18:02:53 +0100
committerCarl Hetherington <cth@carlh.net>2015-05-26 18:02:53 +0100
commitc4ea2ff06b31ccd20daadbdc968e397eb13a7e36 (patch)
tree9cba59b5f769a75b3b5970c98df5152f9b35767d /src/lib/dcpomatic_time.cc
parent659ffb220f572b34cf6537a02637d903ebbb407a (diff)
Improve implementation of ContentTime/DCPTime.
Diffstat (limited to 'src/lib/dcpomatic_time.cc')
-rw-r--r--src/lib/dcpomatic_time.cc15
1 files changed, 12 insertions, 3 deletions
diff --git a/src/lib/dcpomatic_time.cc b/src/lib/dcpomatic_time.cc
index 812c756ec..4541ced7d 100644
--- a/src/lib/dcpomatic_time.cc
+++ b/src/lib/dcpomatic_time.cc
@@ -21,13 +21,22 @@
using std::ostream;
-ContentTime::ContentTime (DCPTime d, FrameRateChange f)
- : Time (rint (d.get() * f.speed_up))
+template <>
+Time<ContentTimeDifferentiator, DCPTimeDifferentiator>::Time (DCPTime d, FrameRateChange f)
+ : _t (rint (d.get() * f.speed_up))
{
}
-DCPTime min (DCPTime a, DCPTime b)
+template <>
+Time<DCPTimeDifferentiator, ContentTimeDifferentiator>::Time (ContentTime d, FrameRateChange f)
+ : _t (rint (d.get() / f.speed_up))
+{
+
+}
+
+DCPTime
+min (DCPTime a, DCPTime b)
{
if (a < b) {
return a;