const fix; header guard.

[dcpomatic.git] / src / lib / dcpomatic_time.cc

diff --git a/src/lib/dcpomatic_time.cc b/src/lib/dcpomatic_time.cc
index 4541ced7dc504db73621e9db29e23bbe4b2750d5..28f76607499134933815f888815265fdbceae9c4 100644 (file)
--- a/src/lib/dcpomatic_time.cc
+++ b/src/lib/dcpomatic_time.cc
@@ -23,14 +23,14 @@ using std::ostream;
 
 template <>
 Time<ContentTimeDifferentiator, DCPTimeDifferentiator>::Time (DCPTime d, FrameRateChange f)
-       : _t (rint (d.get() * f.speed_up))
+       : _t (llrint (d.get() * f.speed_up))
 {
 
 }
 
 template <>
 Time<DCPTimeDifferentiator, ContentTimeDifferentiator>::Time (ContentTime d, FrameRateChange f)
-       : _t (rint (d.get() / f.speed_up))
+       : _t (llrint (d.get() / f.speed_up))
 {
 
 }
@@ -45,6 +45,36 @@ min (DCPTime a, DCPTime b)
        return b;
 }
 
+DCPTime
+max (DCPTime a, DCPTime b)
+{
+       if (a > b) {
+               return a;
+       }
+
+       return b;
+}
+
+ContentTime
+min (ContentTime a, ContentTime b)
+{
+       if (a < b) {
+               return a;
+       }
+
+       return b;
+}
+
+ContentTime
+max (ContentTime a, ContentTime b)
+{
+       if (a > b) {
+               return a;
+       }
+
+       return b;
+}
+
 ostream &
 operator<< (ostream& s, ContentTime t)
 {
@@ -62,7 +92,7 @@ operator<< (ostream& s, DCPTime t)
 bool
 ContentTimePeriod::overlaps (ContentTimePeriod const & other) const
 {
-       return (from < other.to && to >= other.from);
+       return (from < other.to && to > other.from);
 }
 
 bool