Improve implementation of ContentTime/DCPTime.

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

diff --git a/src/lib/dcpomatic_time.cc b/src/lib/dcpomatic_time.cc
index 5344915c0c71c31639629ad58995ff6a3a96c25d..4541ced7dc504db73621e9db29e23bbe4b2750d5 100644 (file)
--- a/src/lib/dcpomatic_time.cc
+++ b/src/lib/dcpomatic_time.cc
@@ -19,13 +19,24 @@
 
 #include "dcpomatic_time.h"
 
-ContentTime::ContentTime (DCPTime d, FrameRateChange f)
-       : Time (rint (d.get() * f.speed_up))
+using std::ostream;
+
+template <>
+Time<ContentTimeDifferentiator, DCPTimeDifferentiator>::Time (DCPTime d, FrameRateChange f)
+       : _t (rint (d.get() * f.speed_up))
+{
+
+}
+
+template <>
+Time<DCPTimeDifferentiator, ContentTimeDifferentiator>::Time (ContentTime d, FrameRateChange f)
+       : _t (rint (d.get() / f.speed_up))
 {
 
 }
 
-DCPTime min (DCPTime a, DCPTime b)
+DCPTime
+min (DCPTime a, DCPTime b)
 {
        if (a < b) {
                return a;
@@ -33,3 +44,29 @@ DCPTime min (DCPTime a, DCPTime b)
 
        return b;
 }
+
+ostream &
+operator<< (ostream& s, ContentTime t)
+{
+       s << "[CONT " << t.get() << " " << t.seconds() << "s]";
+       return s;
+}
+
+ostream &
+operator<< (ostream& s, DCPTime t)
+{
+       s << "[DCP " << t.get() << " " << t.seconds() << "s]";
+       return s;
+}
+
+bool
+ContentTimePeriod::overlaps (ContentTimePeriod const & other) const
+{
+       return (from < other.to && to >= other.from);
+}
+
+bool
+ContentTimePeriod::contains (ContentTime const & other) const
+{
+       return (from <= other && other < to);
+}