X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcpomatic_time.h;h=e6ca493b2bb921e58fbe0fb5c7e7f3c23c9aaf4c;hb=422be0eece2bf6ee80db1d3c21553cd82efff789;hp=7d755a46cf1a7e53a826f3f7ddd1f596b35ccc81;hpb=924dd6e5356f401c325a42ccb43607b79027bb59;p=dcpomatic.git

diff --git a/src/lib/dcpomatic_time.h b/src/lib/dcpomatic_time.h
index 7d755a46c..e6ca493b2 100644
--- a/src/lib/dcpomatic_time.h
+++ b/src/lib/dcpomatic_time.h
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2014-2015 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/>.
 
 */
 
@@ -25,8 +26,8 @@
 #define DCPOMATIC_TIME_H
 
 #include "frame_rate_change.h"
-#include "safe_stringstream.h"
 #include "dcpomatic_assert.h"
+#include <locked_sstream.h>
 #include <stdint.h>
 #include <cmath>
 #include <ostream>
@@ -132,7 +133,11 @@ public:
 
 	template <typename T>
 	int64_t frames_round (T r) const {
-		return llrint (_t * r / HZ);
+		/* We must cast to double here otherwise if T is integer
+		   the calculation will round down before we get the chance
+		   to llrint().
+		*/
+		return llrint (_t * double(r) / HZ);
 	}
 
 	template <typename T>
@@ -140,6 +145,15 @@ public:
 		return floor (_t * r / HZ);
 	}
 
+	template <typename T>
+	int64_t frames_ceil (T r) const {
+		/* We must cast to double here otherwise if T is integer
+		   the calculation will round down before we get the chance
+		   to ceil().
+		*/
+		return ceil (_t * double(r) / HZ);
+	}
+
 	/** @param r Frames per second */
 	template <typename T>
 	void split (T r, int& h, int& m, int& s, int& f) const
@@ -167,7 +181,7 @@ public:
 		int f;
 		split (r, h, m, s, f);
 
-		SafeStringStream o;
+		locked_stringstream o;
 		o.width (2);
 		o.fill ('0');
 		o << std::setw(2) << std::setfill('0') << h << ":"
@@ -223,36 +237,52 @@ typedef Time<ContentTimeDifferentiator, DCPTimeDifferentiator> ContentTime;
 /** Time relative to the start of the output DCP in its frame rate */
 typedef Time<DCPTimeDifferentiator, ContentTimeDifferentiator> DCPTime;
 
-class ContentTimePeriod
+template <class T>
+class TimePeriod
 {
 public:
-	ContentTimePeriod () {}
+	TimePeriod () {}
 
-	ContentTimePeriod (ContentTime f, ContentTime t)
+	TimePeriod (T f, T t)
 		: from (f)
 		, to (t)
 	{}
 
-	ContentTime from;
-	ContentTime to;
+	/** start time of sampling interval that the period is from */
+	T from;
+	/** start time of next sampling interval after the period */
+	T to;
 
-	ContentTimePeriod operator+ (ContentTime const & o) const {
-		return ContentTimePeriod (from + o, to + o);
+	T duration () const {
+		return to - from;
 	}
 
-	bool overlaps (ContentTimePeriod const & o) const;
-	bool contains (ContentTime const & o) const;
+	TimePeriod<T> operator+ (T const & o) const {
+		return TimePeriod<T> (from + o, to + o);
+	}
+
+	bool overlaps (TimePeriod<T> const & other) const {
+		return (from < other.to && to > other.from);
+	}
 
-	bool operator== (ContentTimePeriod const & o) const {
-		return from == o.from && to == o.to;
+	bool contains (T const & other) const {
+		return (from <= other && other < to);
+	}
+
+	bool operator== (TimePeriod<T> const & other) const {
+		return from == other.from && to == other.to;
 	}
 };
 
+typedef TimePeriod<ContentTime> ContentTimePeriod;
+typedef TimePeriod<DCPTime> DCPTimePeriod;
+
 DCPTime min (DCPTime a, DCPTime b);
 DCPTime max (DCPTime a, DCPTime b);
 ContentTime min (ContentTime a, ContentTime b);
 ContentTime max (ContentTime a, ContentTime b);
 std::ostream& operator<< (std::ostream& s, ContentTime t);
 std::ostream& operator<< (std::ostream& s, DCPTime t);
+std::ostream& operator<< (std::ostream& s, DCPTimePeriod p);
 
 #endif