X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcpomatic_time.h;h=16d93ca28bc83abc01c8273c6ece6cd092b42359;hb=736f9d8154080ea5837b31af623ef863eea1a7c5;hp=a94b605d2b94f61d7a1eebb68d0835d7856174ac;hpb=9c01623c3038b978ba732de2ad147d29fad60afe;p=dcpomatic.git

diff --git a/src/lib/dcpomatic_time.h b/src/lib/dcpomatic_time.h
index a94b605d2..16d93ca28 100644
--- a/src/lib/dcpomatic_time.h
+++ b/src/lib/dcpomatic_time.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2016 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -27,12 +27,12 @@
 
 #include "frame_rate_change.h"
 #include "dcpomatic_assert.h"
-#include <locked_sstream.h>
 #include <boost/optional.hpp>
 #include <stdint.h>
 #include <cmath>
 #include <ostream>
 #include <iomanip>
+#include <cstdio>
 
 class dcpomatic_round_up_test;
 
@@ -118,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 {
@@ -143,7 +145,7 @@ public:
 
 	template <typename T>
 	int64_t frames_floor (T r) const {
-		return floor (_t * r / HZ);
+		return ::floor (_t * r / HZ);
 	}
 
 	template <typename T>
@@ -152,7 +154,7 @@ public:
 		   the calculation will round down before we get the chance
 		   to ceil().
 		*/
-		return ceil (_t * double(r) / HZ);
+		return ::ceil (_t * double(r) / HZ);
 	}
 
 	/** @param r Frames per second */
@@ -182,14 +184,9 @@ public:
 		int f;
 		split (r, h, m, s, f);
 
-		locked_stringstream 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;
 	}
 
 
@@ -216,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;
@@ -277,9 +275,20 @@ public:
 		return (from <= other && other < to);
 	}
 
+	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;
@@ -289,8 +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::ostream& operator<< (std::ostream& s, DCPTimePeriod p);
+std::string to_string (ContentTime t);
+std::string to_string (DCPTime t);
+std::string to_string (DCPTimePeriod p);
 
 #endif