summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-01-13 21:43:02 +0000
committerCarl Hetherington <cth@carlh.net>2016-01-13 21:43:02 +0000
commit38ff2954f40131a12aa8a037b9fc6c4abd3894b9 (patch)
treebfadae4e6d2c59b67aa64ec98288fb34f8c6ac90 /src
parent1bcf0b11634647a2a6b99330b2854704e5c1bc38 (diff)
Allow fractional frames per second when computing Time from frames.
Diffstat (limited to 'src')
-rw-r--r--src/dcp_time.cc2
-rw-r--r--src/dcp_time.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/dcp_time.cc b/src/dcp_time.cc
index 4e7ab6f2..ca99e584 100644
--- a/src/dcp_time.cc
+++ b/src/dcp_time.cc
@@ -33,7 +33,7 @@ using namespace std;
using namespace boost;
using namespace dcp;
-Time::Time (int frame, int frames_per_second, int tcr_)
+Time::Time (int frame, double frames_per_second, int tcr_)
{
set (double (frame) / frames_per_second, tcr_);
}
diff --git a/src/dcp_time.h b/src/dcp_time.h
index 44e3cf02..f40860d7 100644
--- a/src/dcp_time.h
+++ b/src/dcp_time.h
@@ -45,7 +45,7 @@ public:
* @param frames_per_second Frames per second.
* @param tcr Timecode rate.
*/
- Time (int frame, int frames_per_second, int tcr);
+ Time (int frame, double frames_per_second, int tcr);
/** Construct a Time from hours, minutes, seconds, editable units and a timecode rate.
* @param h_ Hours.