X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcpomatic_time.cc;h=3d4ed11398d67d5f4c034c18406561f75fa694d5;hb=502475a5001f580a8540e84880564d9e4c7502d4;hp=812c756ec27891224495b1a57b3e374ee793321d;hpb=22b9f3b2090d8bdfe52cda1e69d3acbe874f1ce5;p=dcpomatic.git

diff --git a/src/lib/dcpomatic_time.cc b/src/lib/dcpomatic_time.cc
index 812c756ec..3d4ed1139 100644
--- a/src/lib/dcpomatic_time.cc
+++ b/src/lib/dcpomatic_time.cc
@@ -21,13 +21,42 @@
 
 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;
+	}
+
+	return b;
+}
+
+DCPTime
+max (DCPTime a, DCPTime b)
+{
+	if (a > b) {
+		return a;
+	}
+
+	return b;
+}
+
+ContentTime
+min (ContentTime a, ContentTime b)
 {
 	if (a < b) {
 		return a;
@@ -36,6 +65,16 @@ DCPTime min (DCPTime a, DCPTime b)
 	return b;
 }
 
+ContentTime
+max (ContentTime a, ContentTime b)
+{
+	if (a > b) {
+		return a;
+	}
+
+	return b;
+}
+
 ostream &
 operator<< (ostream& s, ContentTime t)
 {