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

diff --git a/src/lib/dcpomatic_time.cc b/src/lib/dcpomatic_time.cc
index 812c756ec..6563c6e5f 100644
--- a/src/lib/dcpomatic_time.cc
+++ b/src/lib/dcpomatic_time.cc
@@ -1,33 +1,64 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2016 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/>.
 
 */
 
 #include "dcpomatic_time.h"
+#include <inttypes.h>
+
+using std::string;
+
+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;
+	}
 
-using std::ostream;
+	return b;
+}
 
-ContentTime::ContentTime (DCPTime d, FrameRateChange f)
-	: Time (rint (d.get() * f.speed_up))
+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,28 +67,36 @@ DCPTime min (DCPTime a, DCPTime b)
 	return b;
 }
 
-ostream &
-operator<< (ostream& s, ContentTime t)
+ContentTime
+max (ContentTime a, ContentTime b)
 {
-	s << "[CONT " << t.get() << " " << t.seconds() << "s]";
-	return s;
+	if (a > b) {
+		return a;
+	}
+
+	return b;
 }
 
-ostream &
-operator<< (ostream& s, DCPTime t)
+string
+to_string (ContentTime t)
 {
-	s << "[DCP " << t.get() << " " << t.seconds() << "s]";
-	return s;
+	char buffer[64];
+	snprintf (buffer, sizeof(buffer), "[CONT %" PRId64 " %fs]", t.get(), t.seconds());
+	return buffer;
 }
 
-bool
-ContentTimePeriod::overlaps (ContentTimePeriod const & other) const
+string
+to_string (DCPTime t)
 {
-	return (from < other.to && to >= other.from);
+	char buffer[64];
+	snprintf (buffer, sizeof(buffer), "[DCP %" PRId64 " %fs]", t.get(), t.seconds());
+	return buffer;
 }
 
-bool
-ContentTimePeriod::contains (ContentTime const & other) const
+string
+to_string (DCPTimePeriod p)
 {
-	return (from <= other && other < to);
+	char buffer[64];
+	snprintf (buffer, sizeof(buffer), "[DCP %" PRId64 " %fs -> %" PRId64 " %fs]", p.from.get(), p.from.seconds(), p.to.get(), p.to.seconds());
+	return buffer;
 }