X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcpomatic_time.h;h=35ddd0199e448ae65420f17ad8bfd637fe24bdc3;hb=a78b741c43830c84bcb4d18e3147746f13a668e5;hp=4fa6db0a4c690311dbb31974861ec349ad2d2392;hpb=9610f4035114f499d098e8fd2d726d55ddd943ee;p=dcpomatic.git

diff --git a/src/lib/dcpomatic_time.h b/src/lib/dcpomatic_time.h
index 4fa6db0a4..35ddd0199 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>
+    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/>.
 
 */
 
@@ -25,12 +26,13 @@
 #define DCPOMATIC_TIME_H
 
 #include "frame_rate_change.h"
-#include "safe_stringstream.h"
 #include "dcpomatic_assert.h"
+#include <boost/optional.hpp>
 #include <stdint.h>
 #include <cmath>
 #include <ostream>
 #include <iomanip>
+#include <cstdio>
 
 class dcpomatic_round_up_test;
 
@@ -116,10 +118,12 @@ public:
 	 *  at some sampling rate.
 	 *  @param r Sampling rate.
 	 */
-	Time<S, O> round_up (float r) const {
-		Type const n = llrintf (HZ / r);
-		Type const a = _t + n - 1;
-		return Time<S, O> (a - (a % n));
+	Time<S, O> ceil (float r) const {
+		return Time<S, O> (llrint (HZ * frames_ceil(r) / double(r)));
+	}
+
+	Time<S, O> floor (float r) const {
+		return Time<S, O> (llrint (HZ * frames_floor(r) / double(r)));
 	}
 
 	double seconds () const {
@@ -132,17 +136,25 @@ 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>
 	int64_t frames_floor (T r) const {
-		return floor (_t * r / HZ);
+		return ::floor (_t * r / HZ);
 	}
 
 	template <typename T>
 	int64_t frames_ceil (T r) const {
-		return ceil (_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 ceil().
+		*/
+		return ::ceil (_t * double(r) / HZ);
 	}
 
 	/** @param r Frames per second */
@@ -172,14 +184,9 @@ public:
 		int f;
 		split (r, h, m, s, f);
 
-		SafeStringStream o;
-		o.width (2);
-		o.fill ('0');
-		o << std::setw(2) << std::setfill('0') << h << ":"
-		  << std::setw(2) << std::setfill('0') << m << ":"
-		  << std::setw(2) << std::setfill('0') << s << ":"
-		  << std::setw(2) << std::setfill('0') << f;
-		return o.str ();
+		char buffer[128];
+		snprintf (buffer, sizeof (buffer), "%02d:%02d:%02d:%02d", h, m, s, f);
+		return buffer;
 	}
 
 
@@ -206,7 +213,8 @@ public:
 	}
 
 private:
-	friend struct dcptime_round_up_test;
+	friend struct dcptime_ceil_test;
+	friend struct dcptime_floor_test;
 
 	Type _t;
 	static const int HZ = 96000;
@@ -239,24 +247,48 @@ public:
 		, to (t)
 	{}
 
+	/** start time of sampling interval that the period is from */
 	T from;
+	/** start time of next sampling interval after the period */
 	T to;
 
+	T duration () const {
+		return to - from;
+	}
+
 	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);
+	boost::optional<TimePeriod<T> > overlap (TimePeriod<T> const & other) const {
+		T const max_from = std::max (from, other.from);
+		T const min_to = std::min (to, other.to);
+
+		if (max_from >= min_to) {
+			return boost::optional<TimePeriod<T> > ();
+		}
+
+		return TimePeriod<T> (max_from, min_to);
 	}
 
 	bool contains (T const & other) const {
 		return (from <= other && other < to);
 	}
 
-	bool operator== (TimePeriod<T> const & other) {
+	bool operator< (TimePeriod<T> const & o) const {
+		if (from != o.from) {
+			return from < o.from;
+		}
+		return to < o.to;
+	}
+
+	bool operator== (TimePeriod<T> const & other) const {
 		return from == other.from && to == other.to;
 	}
+
+	bool operator!= (TimePeriod<T> const & other) const {
+		return !(*this == other);
+	}
 };
 
 typedef TimePeriod<ContentTime> ContentTimePeriod;
@@ -266,7 +298,8 @@ 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::string to_string (ContentTime t);
+std::string to_string (DCPTime t);
+std::string to_string (DCPTimePeriod p);
 
 #endif