X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcpomatic_time.cc;h=6563c6e5f9a2835082082a0116ebe489e16a3e72;hb=b1dc9c3a2f7e55c9afc5bf2d5b465371b048e14f;hp=3d4ed11398d67d5f4c034c18406561f75fa694d5;hpb=23b69b228ed5b34b59e1789de4bff052bc905ae4;p=dcpomatic.git

diff --git a/src/lib/dcpomatic_time.cc b/src/lib/dcpomatic_time.cc
index 3d4ed1139..6563c6e5f 100644
--- a/src/lib/dcpomatic_time.cc
+++ b/src/lib/dcpomatic_time.cc
@@ -1,36 +1,38 @@
 /*
-    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::ostream;
+using std::string;
 
 template <>
 Time<ContentTimeDifferentiator, DCPTimeDifferentiator>::Time (DCPTime d, FrameRateChange f)
-	: _t (rint (d.get() * f.speed_up))
+	: _t (llrint (d.get() * f.speed_up))
 {
 
 }
 
 template <>
 Time<DCPTimeDifferentiator, ContentTimeDifferentiator>::Time (ContentTime d, FrameRateChange f)
-	: _t (rint (d.get() / f.speed_up))
+	: _t (llrint (d.get() / f.speed_up))
 {
 
 }
@@ -75,28 +77,26 @@ max (ContentTime a, ContentTime b)
 	return b;
 }
 
-ostream &
-operator<< (ostream& s, ContentTime t)
-{
-	s << "[CONT " << t.get() << " " << t.seconds() << "s]";
-	return s;
-}
-
-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;
 }