diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-12-24 01:12:40 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-12-24 01:12:40 +0000 |
| commit | dc87445987c00b85a44b6372e43894067fae44b3 (patch) | |
| tree | cddc35f1117f5bcb403b31d674791e6a453765ab /src/lib/decoded.h | |
| parent | e194f0003b60b2607da0822485c56cd8267e78dc (diff) | |
Merge 1.0 and some subtitling fixes.
Diffstat (limited to 'src/lib/decoded.h')
| -rw-r--r-- | src/lib/decoded.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/decoded.h b/src/lib/decoded.h index a9b922769..1de2ff79e 100644 --- a/src/lib/decoded.h +++ b/src/lib/decoded.h @@ -94,13 +94,12 @@ public: , dcp_time_to (0) {} - /* XXX: content/dcp time here */ - DecodedSubtitle (boost::shared_ptr<Image> im, dcpomatic::Rect<double> r, DCPTime f, DCPTime t) + DecodedSubtitle (boost::shared_ptr<Image> im, dcpomatic::Rect<double> r, ContentTime f, ContentTime t) : Decoded (f) , image (im) , rect (r) , content_time_to (t) - , dcp_time_to (t) + , dcp_time_to (0) {} void set_dcp_times (float speed_up, DCPTime offset) { |