X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fdcpomatic_time.cc;h=f96688979c9504646437846b438738e719d5689f;hp=98888646d0a841e26bcb077a426be8ac66e1e8e4;hb=422be0eece2bf6ee80db1d3c21553cd82efff789;hpb=3574212ee42b2bd924eb95d5c0f4f69ec9e0a2f0

diff --git a/src/lib/dcpomatic_time.cc b/src/lib/dcpomatic_time.cc
index 98888646d..f96688979 100644
--- a/src/lib/dcpomatic_time.cc
+++ b/src/lib/dcpomatic_time.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -21,13 +22,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 (llrint (d.get() * f.speed_up))
+{
+
+}
+
+template <>
+Time<DCPTimeDifferentiator, ContentTimeDifferentiator>::Time (ContentTime d, FrameRateChange f)
+	: _t (llrint (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;
 }
 
-DCPTime min (DCPTime a, DCPTime b)
+ContentTime
+min (ContentTime a, ContentTime b)
 {
 	if (a < b) {
 		return a;
@@ -36,6 +66,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)
 {
@@ -49,3 +89,10 @@ operator<< (ostream& s, DCPTime t)
 	s << "[DCP " << t.get() << " " << t.seconds() << "s]";
 	return s;
 }
+
+ostream &
+operator<< (ostream& s, DCPTimePeriod p)
+{
+	s << "[DCP " << p.from.get() << " " << p.from.seconds() << "s -> " << p.to.get() << " " << p.to.seconds() << "s]";
+	return s;
+}