X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fdcp_time.cc;h=d34804e981ba3f4cd19e2cd7960a04041694b7fd;hb=951572c6eb7e31834d2d7f1fbc67a9cdb1336696;hp=0cc6b264894c00be6c11b257ddbe73084c523f17;hpb=fd23bf276facab3892a00f010ac7e991bc79af09;p=libdcp.git

diff --git a/src/dcp_time.cc b/src/dcp_time.cc
index 0cc6b264..d34804e9 100644
--- a/src/dcp_time.cc
+++ b/src/dcp_time.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -18,68 +18,252 @@
 */
 
 /** @file  src/dcp_time.cc
- *  @brief A representation of time within a DCP.
+ *  @brief Time class.
  */
 
+#include "raw_convert.h"
+#include "dcp_time.h"
+#include "exceptions.h"
+#include <boost/algorithm/string.hpp>
 #include <iostream>
+#include <vector>
 #include <cmath>
-#include "dcp_time.h"
 
 using namespace std;
-using namespace libdcp;
+using namespace boost;
+using namespace dcp;
+
+Time::Time (int frame, int frames_per_second, int tcr_)
+{
+	set (double (frame) / frames_per_second, tcr_);
+}
 
-Time::Time (int frame, int frames_per_second)
-	: h (0)
-	, m (0)
-	, s (0)
-	, t (0)
+Time::Time (double seconds)
 {
-	float sec_float = float (frame) / frames_per_second;
-	t = (int (floor (sec_float * 1000)) % 1000) / 4;
-	s = floor (sec_float);
+	set (seconds, 24);
+}
+
+void
+Time::set (double seconds, int tcr_)
+{
+	s = floor (seconds);
+	tcr = tcr_;
+	
+	e = int (round ((seconds - s) * tcr));
 
-	if (s > 60) {
+	if (s >= 60) {
 		m = s / 60;
 		s -= m * 60;
+	} else {
+		m = 0;
 	}
 
-	if (m > 60) {
+	if (m >= 60) {
 		h = m / 60;
 		m -= h * 60;
+	} else {
+		h = 0;
+	}
+}
+
+Time::Time (string time, int tcr_)
+	: tcr (tcr_)
+{
+	vector<string> b;
+	split (b, time, is_any_of (":"));
+	if (b.size() != 4) {
+		boost::throw_exception (DCPReadError ("unrecognised time specification"));
 	}
+	
+	h = raw_convert<int> (b[0]);
+	m = raw_convert<int> (b[1]);
+	s = raw_convert<int> (b[2]);
+	e = raw_convert<int> (b[3]);
+}
+
+bool
+dcp::operator== (Time const & a, Time const & b)
+{
+	return (a.h == b.h && a.m == b.m && a.s == b.s && (a.e * b.tcr) == (b.e * a.tcr));
+}
+
+bool
+dcp::operator!= (Time const & a, Time const & b)
+{
+	return !(a == b);
 }
 
 bool
-libdcp::operator== (Time const & a, Time const & b)
+dcp::operator<= (Time const & a, Time const & b)
 {
-	return (a.h == b.h && a.m == b.m && a.s == b.s && a.t == b.t);
+	return a < b || a == b;
+}
+
+bool
+dcp::operator>= (Time const & a, Time const & b)
+{
+	return a > b || a == b;
+}
+
+bool
+dcp::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.e * b.tcr) != (b.e * a.tcr)) {
+		return (a.e * b.tcr) < (b.e * a.tcr);
+	}
+
+	return true;
 }
 
 bool
-libdcp::operator<= (Time const & a, Time const & b)
+dcp::operator> (Time const & a, Time const & b)
 {
 	if (a.h != b.h) {
-		return a.h <= b.h;
+		return a.h > b.h;
 	}
 
 	if (a.m != b.m) {
-		return a.m <= b.m;
+		return a.m > b.m;
 	}
 
 	if (a.s != b.s) {
-		return a.s <= b.s;
+		return a.s > b.s;
 	}
 
-	if (a.t != b.t) {
-		return a.t <= b.t;
+	if ((a.e * b.tcr) != (b.e * a.tcr)) {
+		return (a.e * b.tcr) > (b.e * a.tcr);
 	}
 
 	return true;
 }
 
 ostream &
-libdcp::operator<< (ostream& s, Time const & t)
+dcp::operator<< (ostream& s, Time const & t)
 {
-	s << t.h << ":" << t.m << ":" << t.s << "." << t.t;
+	s << t.h << ":" << t.m << ":" << t.s << "." << t.e;
 	return s;
 }
+
+dcp::Time
+dcp::operator+ (Time a, Time b)
+{
+	Time r;
+
+	/* Make sure we have a common tcr */
+	if (a.tcr != b.tcr) {
+		a.e *= b.tcr;
+		b.e *= a.tcr;
+		r.tcr = a.tcr * b.tcr;
+	} else {
+		r.tcr = a.tcr;
+	}
+
+	r.e = a.e + b.e;
+	if (r.e >= r.tcr) {
+		r.e -= r.tcr;
+		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;
+}
+
+dcp::Time
+dcp::operator- (Time a, Time b)
+{
+	Time r;
+
+	/* Make sure we have a common tcr */
+	if (a.tcr != b.tcr) {
+		a.e *= b.tcr;
+		b.e *= a.tcr;
+		r.tcr = a.tcr * b.tcr;
+	} else {
+		r.tcr = a.tcr;
+	}
+	
+	r.e = a.e - b.e;
+	if (r.e < 0) {
+		r.e += r.tcr;
+		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
+dcp::operator/ (Time a, Time const & b)
+{
+	int64_t const at = a.h * 3600 + a.m * 60 + a.s * float (a.e) / a.tcr;
+	int64_t const bt = b.h * 3600 + b.m * 60 + b.s * float (b.e) / b.tcr;
+	return float (at) / bt;
+}
+
+/** @return A string of the form h:m:s:e padded as in 00:00:00:000 */
+string
+Time::as_string () const
+{
+	stringstream str;
+	str << setw(2) << setfill('0') << h << ":"
+	    << setw(2) << setfill('0') << m << ":"
+	    << setw(2) << setfill('0') << s << ":"
+	    << setw(3) << setfill('0') << e;
+	return str.str ();
+}
+
+int64_t
+Time::as_editable_units (int tcr_) const
+{
+	return (int64_t(e) * float (tcr_ / tcr)) + int64_t(s) * tcr_ + int64_t(m) * 60 * tcr_ + int64_t(h) * 60 * 60 * tcr_;
+}
+
+double
+Time::as_seconds () const
+{
+	return h * 3600 + m * 60 + s + double(e) / tcr;
+}
+
+Time
+Time::rebase (int tcr_) const
+{
+	return Time (h, m, s, rint (float (e) * tcr_ / tcr), tcr_);
+}