Tidy operator<= for libdcp::Time somewhat. Change subtitles_at to subtitles_during as it's a better API for dcptocomps.

1 files changed, 7 insertions, 17 deletions

diff --git a/src/dcp_time.cc b/src/dcp_time.cc
index 9b93391b..428215cb 100644
--- a/src/dcp_time.cc
+++ b/src/dcp_time.cc
@@ -99,23 +99,7 @@ libdcp::operator!= (Time const & a, Time const & b)
 bool
 libdcp::operator<= (Time const & a, Time const & b)
 {
-	if (a.h != b.h) {
-		return a.h <= b.h;
-	}
-
-	if (a.m != b.m) {
-		return a.m <= b.m;
-	}
-
-	if (a.s != b.s) {
-		return a.s <= b.s;
-	}
-
-	if (a.t != b.t) {
-		return a.t <= b.t;
-	}
-
-	return true;
+	return a < b || a == b;
 }
 
 bool
@@ -162,6 +146,12 @@ libdcp::operator> (Time const & a, Time const & b)
 	return true;
 }
 
+bool
+libdcp::operator>= (Time const & a, Time const & b)
+{
+	return a == b || a > b;
+}
+
 ostream &
 libdcp::operator<< (ostream& s, Time const & t)
 {