Move a couple of tests to a more appropriate place.

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

diff --git a/src/lib/dcpomatic_time.h b/src/lib/dcpomatic_time.h
index 16d93ca28bc83abc01c8273c6ece6cd092b42359..5f00807bdf2c3c4da605e577e3c18f7214d90391 100644 (file)
--- a/src/lib/dcpomatic_time.h
+++ b/src/lib/dcpomatic_time.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -28,14 +28,13 @@
 #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>
 
-class dcpomatic_round_up_test;
-
 /** 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
  *  convert implicitly between the two.  Hence there's this template hack.  I'm not
@@ -157,7 +156,13 @@ public:
                return ::ceil (_t * double(r) / HZ);
        }
 
-       /** @param r Frames per second */
+       /** Split a time into hours, minutes, seconds and frames.
+        *  @param r Frames per second.
+        *  @param h Returned hours.
+        *  @param m Returned minutes.
+        *  @param s Returned seconds.
+        *  @param f Returned frames.
+        */
        template <typename T>
        void split (T r, int& h, int& m, int& s, int& f) const
        {
@@ -213,8 +218,8 @@ public:
        }
 
 private:
-       friend struct dcptime_ceil_test;
-       friend struct dcptime_floor_test;
+       friend struct dcpomatic_time_ceil_test;
+       friend struct dcpomatic_time_floor_test;
 
        Type _t;
        static const int HZ = 96000;
@@ -260,7 +265,7 @@ public:
                return TimePeriod<T> (from + o, to + o);
        }
 
-       boost::optional<TimePeriod<T> > overlap (TimePeriod<T> const & other) {
+       boost::optional<TimePeriod<T> > overlap (TimePeriod<T> const & other) const {
                T const max_from = std::max (from, other.from);
                T const min_to = std::min (to, other.to);
 
@@ -291,6 +296,47 @@ public:
        }
 };
 
+/** @param A Period which is subtracted from.
+ *  @param B Periods to subtract from `A', must be in ascending order of start time and must not overlap.
+ */
+template <class T>
+std::list<TimePeriod<T> > subtract (TimePeriod<T> A, std::list<TimePeriod<T> > const & B)
+{
+       std::list<TimePeriod<T> > result;
+       result.push_back (A);
+
+       BOOST_FOREACH (TimePeriod<T> i, B) {
+               std::list<TimePeriod<T> > new_result;
+               BOOST_FOREACH (TimePeriod<T> j, result) {
+                       boost::optional<TimePeriod<T> > ov = i.overlap (j);
+                       if (ov) {
+                               if (*ov == i) {
+                                       /* A contains all of B */
+                                       if (i.from != j.from) {
+                                               new_result.push_back (TimePeriod<T> (j.from, i.from));
+                                       }
+                                       if (i.to != j.to) {
+                                               new_result.push_back (TimePeriod<T> (i.to, j.to));
+                                       }
+                               } else if (*ov == j) {
+                                       /* B contains all of A */
+                               } else if (i.from < j.from) {
+                                       /* B overlaps start of A */
+                                       new_result.push_back (TimePeriod<T> (i.to, j.to));
+                               } else if (i.to > j.to) {
+                                       /* B overlaps end of A */
+                                       new_result.push_back (TimePeriod<T> (j.from, i.from));
+                               }
+                       } else {
+                               new_result.push_back (j);
+                       }
+               }
+               result = new_result;
+       }
+
+       return result;
+}
+
 typedef TimePeriod<ContentTime> ContentTimePeriod;
 typedef TimePeriod<DCPTime> DCPTimePeriod;