Fix incorrect free and leak.

[libdcp.git] / src / dcp_time.cc

diff --git a/src/dcp_time.cc b/src/dcp_time.cc
index 900d7c6ee1bfbd00b209c5f3242a72ca0a0936e8..7d3111d270fbef814e05a7a398f8eadd9978023e 100644 (file)
--- a/src/dcp_time.cc
+++ b/src/dcp_time.cc
@@ -22,10 +22,15 @@
  */
 
 #include <iostream>
+#include <vector>
+#include <boost/algorithm/string.hpp>
+#include <boost/lexical_cast.hpp>
 #include <cmath>
 #include "dcp_time.h"
+#include "exceptions.h"
 
 using namespace std;
+using namespace boost;
 using namespace libdcp;
 
 Time::Time (int frame, int frames_per_second)
@@ -34,9 +39,14 @@ Time::Time (int frame, int frames_per_second)
        , s (0)
        , t (0)
 {
-       float sec_float = float (frame) / frames_per_second;
-       t = (int (sec_float * 1000) % 1000) / 4;
-       s = floor (sec_float);
+       set (double (frame) / frames_per_second);
+}
+
+void
+Time::set (double ss)
+{
+       t = (int (round (ss * 1000)) % 1000) / 4;
+       s = floor (ss);
 
        if (s > 60) {
                m = s / 60;
@@ -49,12 +59,32 @@ Time::Time (int frame, int frames_per_second)
        }
 }
 
+Time::Time (string time)
+{
+       vector<string> b;
+       split (b, time, is_any_of (":"));
+       if (b.size() != 4) {
+               boost::throw_exception (DCPReadError ("unrecognised time specification"));
+       }
+       
+       h = lexical_cast<int> (b[0]);
+       m = lexical_cast<int> (b[1]);
+       s = lexical_cast<int> (b[2]);
+       t = lexical_cast<int> (b[3]);
+}
+
 bool
 libdcp::operator== (Time const & a, Time const & b)
 {
        return (a.h == b.h && a.m == b.m && a.s == b.s && a.t == b.t);
 }
 
+bool
+libdcp::operator!= (Time const & a, Time const & b)
+{
+       return !(a == b);
+}
+
 bool
 libdcp::operator<= (Time const & a, Time const & b)
 {
@@ -77,9 +107,134 @@ libdcp::operator<= (Time const & a, Time const & b)
        return true;
 }
 
+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;
+}
+
+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;
+}
+
 ostream &
 libdcp::operator<< (ostream& s, Time const & t)
 {
        s << t.h << ":" << t.m << ":" << t.s << "." << t.t;
        return s;
 }
+
+libdcp::Time
+libdcp::operator+ (Time a, Time const & b)
+{
+       Time r;
+
+       r.t = a.t + b.t;
+       if (r.t >= 250) {
+               r.t -= 250;
+               r.s++;
+       }
+
+       r.s += a.s + b.s;
+       if (r.s >= 60) {
+               r.s -= 60;
+               r.m++;
+       }
+
+       r.m += a.m + b.m;
+       if (r.m >= 60) {
+               r.m -= 60;
+               r.h++;
+       }
+
+       r.h += a.h + b.h;
+
+       return r;
+}
+
+libdcp::Time
+libdcp::operator- (Time a, Time const & b)
+{
+       Time r;
+
+       r.t = a.t - b.t;
+       if (r.t < 0) {
+               r.t += 250;
+               r.s--;
+       }
+
+       r.s += (a.s - b.s);
+       if (r.s < 0) {
+               r.s += 60;
+               r.m--;
+       }
+
+       r.m += (a.m - b.m);
+       if (r.m < 0) {
+               r.m += 60;
+               r.h--;
+       }
+
+       r.h += (a.h - b.h);
+
+       return r;
+}
+
+float
+libdcp::operator/ (Time a, Time const & b)
+{
+       int64_t const at = a.h * 3600 * 250 + a.m * 60 * 250 + a.s * 250 + a.t;
+       int64_t const bt = b.h * 3600 * 250 + b.m * 60 * 250 + b.s * 250 + b.t;
+       return float (at) / bt;
+}
+
+/** @return A string of the form h:m:s:t */
+string
+Time::to_string () const
+{
+       stringstream str;
+       str << h << ":" << m << ":" << s << ":" << t;
+       return str.str ();
+}
+
+/** @return This time in ticks */
+int64_t
+Time::to_ticks () const
+{
+       return t + s * 25 + m * 60 * 25 + h * 60 * 60 * 25;
+}
+