X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcpomatic_time.h;h=62d8a28ccf1ddee397e85ed014e77beb929fae92;hb=a5d004b0773f633401528392fc28e66d70e13ac8;hp=5f00807bdf2c3c4da605e577e3c18f7214d90391;hpb=35e5de23b21a1fc9788fadd9ecd8beae9cfc18e3;p=dcpomatic.git

diff --git a/src/lib/dcpomatic_time.h b/src/lib/dcpomatic_time.h
index 5f00807bd..62d8a28cc 100644
--- a/src/lib/dcpomatic_time.h
+++ b/src/lib/dcpomatic_time.h
@@ -28,15 +28,19 @@
 #include "frame_rate_change.h"
 #include "dcpomatic_assert.h"
 #include <boost/optional.hpp>
-#include <boost/foreach.hpp>
 #include <stdint.h>
 #include <cmath>
 #include <ostream>
 #include <iomanip>
 #include <cstdio>
 
+struct dcpomatic_time_ceil_test;
+struct dcpomatic_time_floor_test;
+
+namespace dcpomatic {
+
 /** A time in seconds, expressed as a number scaled up by Time::HZ.  We want two different
- *  versions of this class, ContentTime and DCPTime, and we want it to be impossible to
+ *  versions of this class, dcpomatic::ContentTime and dcpomatic::DCPTime, and we want it to be impossible to
  *  convert implicitly between the two.  Hence there's this template hack.  I'm not
  *  sure if it's the best way to do it.
  *
@@ -113,16 +117,24 @@ public:
 		return *this;
 	}
 
+	Time<S, O> operator/ (int o) const {
+		return Time<S, O> (_t / o);
+	}
+
 	/** Round up to the nearest sampling interval
 	 *  at some sampling rate.
 	 *  @param r Sampling rate.
 	 */
-	Time<S, O> ceil (float r) const {
-		return Time<S, O> (llrint (HZ * frames_ceil(r) / double(r)));
+	Time<S, O> ceil (double r) const {
+		return Time<S, O> (llrint (HZ * frames_ceil(r) / r));
+	}
+
+	Time<S, O> floor (double r) const {
+		return Time<S, O> (llrint (HZ * frames_floor(r) / r));
 	}
 
-	Time<S, O> floor (float r) const {
-		return Time<S, O> (llrint (HZ * frames_floor(r) / double(r)));
+	Time<S, O> round (double r) const {
+		return Time<S, O> (llrint (HZ * frames_round(r) / r));
 	}
 
 	double seconds () const {
@@ -217,12 +229,13 @@ public:
 		return Time<S, O> (INT64_MAX);
 	}
 
+	static const int HZ = 96000;
+
 private:
-	friend struct dcpomatic_time_ceil_test;
-	friend struct dcpomatic_time_floor_test;
+	friend struct ::dcpomatic_time_ceil_test;
+	friend struct ::dcpomatic_time_floor_test;
 
 	Type _t;
-	static const int HZ = 96000;
 };
 
 class ContentTimeDifferentiator {};
@@ -305,9 +318,9 @@ std::list<TimePeriod<T> > subtract (TimePeriod<T> A, std::list<TimePeriod<T> > c
 	std::list<TimePeriod<T> > result;
 	result.push_back (A);
 
-	BOOST_FOREACH (TimePeriod<T> i, B) {
+	for (auto i: B) {
 		std::list<TimePeriod<T> > new_result;
-		BOOST_FOREACH (TimePeriod<T> j, result) {
+		for (auto j: result) {
 			boost::optional<TimePeriod<T> > ov = i.overlap (j);
 			if (ov) {
 				if (*ov == i) {
@@ -348,4 +361,6 @@ std::string to_string (ContentTime t);
 std::string to_string (DCPTime t);
 std::string to_string (DCPTimePeriod p);
 
+}
+
 #endif