From c4ea2ff06b31ccd20daadbdc968e397eb13a7e36 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Tue, 26 May 2015 18:02:53 +0100
Subject: Improve implementation of ContentTime/DCPTime.

---
 src/lib/dcpomatic_time.cc | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'src/lib/dcpomatic_time.cc')

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;
-- 
cgit v1.2.3