summaryrefslogtreecommitdiff
path: root/src/dcp_time.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-10-24 16:27:35 +0100
committerCarl Hetherington <cth@carlh.net>2013-10-24 16:27:35 +0100
commit3941ebc04432fdbb92e1c2b25bbbd10d4fcecd51 (patch)
tree66cdb1458159ce0c49f72e786bbb07dc6be22851 /src/dcp_time.cc
parent91f94491733d790d41e39b3604d67d3c3561bf01 (diff)
Fix ticks calculations.
Diffstat (limited to 'src/dcp_time.cc')
-rw-r--r--src/dcp_time.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/dcp_time.cc b/src/dcp_time.cc
index ccedd8ce..df753efd 100644
--- a/src/dcp_time.cc
+++ b/src/dcp_time.cc
@@ -44,12 +44,12 @@ Time::Time (int frame, int frames_per_second)
Time::Time (int64_t ticks)
{
- h = ticks / (60 * 60 * 25);
- ticks -= int64_t (h) * 60 * 60 * 25;
- m = ticks / (60 * 25);
- ticks -= int64_t (m) * 60 * 25;
- s = ticks / 25;
- ticks -= int64_t (s) * 25;
+ 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;
std::cout << "Hello: " << h << " " << m << " " << s << " " << t << "\n";
@@ -248,6 +248,6 @@ Time::to_string () const
int64_t
Time::to_ticks () const
{
- return int64_t(t) + int64_t(s) * 25 + int64_t(m) * 60 * 25 + int64_t(h) * 60 * 60 * 25;
+ return int64_t(t) + int64_t(s) * 250 + int64_t(m) * 60 * 250 + int64_t(h) * 60 * 60 * 250;
}