projects
/
libdcp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
namespace libdcp -> dcp.
[libdcp.git]
/
src
/
dcp_time.cc
diff --git
a/src/dcp_time.cc
b/src/dcp_time.cc
index 7d3111d270fbef814e05a7a398f8eadd9978023e..605c4a4028d82e8fe1c3fa3cf46b301cacb891d6 100644
(file)
--- a/
src/dcp_time.cc
+++ b/
src/dcp_time.cc
@@
-31,7
+31,7
@@
using namespace std;
using namespace boost;
using namespace std;
using namespace boost;
-using namespace
lib
dcp;
+using namespace dcp;
Time::Time (int frame, int frames_per_second)
: h (0)
Time::Time (int frame, int frames_per_second)
: h (0)
@@
-42,6
+42,17
@@
Time::Time (int frame, int frames_per_second)
set (double (frame) / frames_per_second);
}
set (double (frame) / frames_per_second);
}
+Time::Time (int64_t ticks)
+{
+ h = ticks / (60 * 60 * 250);
+ ticks -= int64_t (h) * 60 * 60 * 250;
+ m = ticks / (60 * 250);
+ ticks -= int64_t (m) * 60 * 250;
+ s = ticks / 250;
+ ticks -= int64_t (s) * 250;
+ t = ticks;
+}
+
void
Time::set (double ss)
{
void
Time::set (double ss)
{
@@
-74,19
+85,19
@@
Time::Time (string time)
}
bool
}
bool
-
lib
dcp::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);
}
bool
{
return (a.h == b.h && a.m == b.m && a.s == b.s && a.t == b.t);
}
bool
-
lib
dcp::operator!= (Time const & a, Time const & b)
+dcp::operator!= (Time const & a, Time const & b)
{
return !(a == b);
}
bool
{
return !(a == b);
}
bool
-
lib
dcp::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.h != b.h) {
return a.h <= b.h;
@@
-108,7
+119,7
@@
libdcp::operator<= (Time const & a, Time const & b)
}
bool
}
bool
-
lib
dcp::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.h != b.h) {
return a.h < b.h;
@@
-130,7
+141,7
@@
libdcp::operator< (Time const & a, Time const & b)
}
bool
}
bool
-
lib
dcp::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.h != b.h) {
return a.h > b.h;
@@
-152,14
+163,14
@@
libdcp::operator> (Time const & a, Time const & b)
}
ostream &
}
ostream &
-
lib
dcp::operator<< (ostream& s, Time const & t)
+dcp::operator<< (ostream& s, Time const & t)
{
s << t.h << ":" << t.m << ":" << t.s << "." << t.t;
return s;
}
{
s << t.h << ":" << t.m << ":" << t.s << "." << t.t;
return s;
}
-
lib
dcp::Time
-
lib
dcp::operator+ (Time a, Time const & b)
+dcp::Time
+dcp::operator+ (Time a, Time const & b)
{
Time r;
{
Time r;
@@
-186,8
+197,8
@@
libdcp::operator+ (Time a, Time const & b)
return r;
}
return r;
}
-
lib
dcp::Time
-
lib
dcp::operator- (Time a, Time const & b)
+dcp::Time
+dcp::operator- (Time a, Time const & b)
{
Time r;
{
Time r;
@@
-215,7
+226,7
@@
libdcp::operator- (Time a, Time const & b)
}
float
}
float
-
lib
dcp::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 * 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;
@@
-235,6
+246,6
@@
Time::to_string () const
int64_t
Time::to_ticks () const
{
int64_t
Time::to_ticks () const
{
- return
t + s * 25 + m * 60 * 25 + h * 60 * 60 * 25
;
+ return
int64_t(t) + int64_t(s) * 250 + int64_t(m) * 60 * 250 + int64_t(h) * 60 * 60 * 250
;
}
}