/*
- 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
*/
/** @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 <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;
+using namespace dcp;
-Time::Time (int frame, int frames_per_second)
- : h (0)
- , m (0)
- , s (0)
- , t (0)
+Time::Time (int frame, int frames_per_second, int tcr_)
{
- set (double (frame) / frames_per_second);
+ set (double (frame) / frames_per_second, tcr_);
+}
+
+Time::Time (double seconds)
+{
+ set (seconds, 24);
}
void
-Time::set (double ss)
+Time::set (double seconds, int tcr_)
{
- t = (int (round (ss * 1000)) % 1000) / 4;
- s = floor (ss);
+ 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)
+Time::Time (string time, int tcr_)
+ : tcr (tcr_)
{
vector<string> b;
split (b, time, is_any_of (":"));
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]);
+ 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
-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.h == b.h && a.m == b.m && a.s == b.s && (a.e * b.tcr) == (b.e * a.tcr));
}
bool
-libdcp::operator!= (Time const & a, Time const & b)
+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)
{
- 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 a < b || a == b;
+}
- return true;
+bool
+dcp::operator>= (Time const & a, Time const & b)
+{
+ return a > b || a == b;
}
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.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;
}
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.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;
}
-libdcp::Time
-libdcp::operator+ (Time a, Time const & b)
+dcp::Time
+dcp::operator+ (Time a, Time b)
{
Time r;
- r.t = a.t + b.t;
- if (r.t >= 250) {
- r.t -= 250;
+ /* 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++;
}
return r;
}
-libdcp::Time
-libdcp::operator- (Time a, Time const & b)
+dcp::Time
+dcp::operator- (Time a, Time b)
{
Time r;
- r.t = a.t - b.t;
- if (r.t < 0) {
- r.t += 250;
+ /* 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--;
}
}
float
-libdcp::operator/ (Time a, Time const & b)
+dcp::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;
+ 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:t */
+/** @return A string of the form h:m:s:e */
string
Time::to_string () const
{
stringstream str;
- str << h << ":" << m << ":" << s << ":" << t;
+ str << h << ":" << m << ":" << s << ":" << e;
return str.str ();
}
-/** @return This time in ticks */
int64_t
-Time::to_ticks () const
+Time::to_editable_units (int tcr_) const
{
- return t + s * 25 + m * 60 * 25 + h * 60 * 60 * 25;
+ return (int64_t(e) * float (tcr_ / tcr)) + int64_t(s) * tcr_ + int64_t(m) * 60 * tcr_ + int64_t(h) * 60 * 60 * tcr_;
}
+double
+Time::to_seconds () const
+{
+ return h * 3600 + m * 60 + s + double(e) / tcr;
+}