Purge rint() and use llrint and friends.

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

diff --git a/src/lib/dcpomatic_time.cc b/src/lib/dcpomatic_time.cc
index ae4dea44f5c0752f6b387365713f772336e8d867..6f8f5efa2d4eb01b8b7249447c271ac79dc33bc4 100644 (file)
--- a/src/lib/dcpomatic_time.cc
+++ b/src/lib/dcpomatic_time.cc
@@ -21,13 +21,42 @@
 
 using std::ostream;
 
-ContentTime::ContentTime (DCPTime d, FrameRateChange f)
-       : Time (rint (d.get() * f.speed_up))
+template <>
+Time<ContentTimeDifferentiator, DCPTimeDifferentiator>::Time (DCPTime d, FrameRateChange f)
+       : _t (llrint (d.get() * f.speed_up))
 {
 
 }
 
-DCPTime min (DCPTime a, DCPTime b)
+template <>
+Time<DCPTimeDifferentiator, ContentTimeDifferentiator>::Time (ContentTime d, FrameRateChange f)
+       : _t (llrint (d.get() / f.speed_up))
+{
+
+}
+
+DCPTime
+min (DCPTime a, DCPTime b)
+{
+       if (a < b) {
+               return a;
+       }
+
+       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;
@@ -36,6 +65,16 @@ DCPTime min (DCPTime a, DCPTime b)
        return b;
 }
 
+ContentTime
+max (ContentTime a, ContentTime b)
+{
+       if (a > b) {
+               return a;
+       }
+
+       return b;
+}
+
 ostream &
 operator<< (ostream& s, ContentTime t)
 {
@@ -53,5 +92,11 @@ 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
+ContentTimePeriod::contains (ContentTime const & other) const
+{
+       return (from <= other && other < to);
 }