diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-01-08 23:22:05 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-01-08 23:22:05 +0000 |
| commit | 7ca029dea19ab0aa1b7e96d363fe6de61350d2e7 (patch) | |
| tree | d520d2f6597fa4ccbe2a78e3aea4d1d2614d9373 /src/parse/subtitle.h | |
| parent | bbb3db16cc7e6f2262a89da4bec9fc356d6c3c12 (diff) | |
Change libdcp::Time to allow sub-second units to be anything, so that
we can support SMPTE subtitles which use TimeCodeRate as the base rather
than the arbitrary "ticks" (4ms) of Interop.
Diffstat (limited to 'src/parse/subtitle.h')
| -rw-r--r-- | src/parse/subtitle.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/parse/subtitle.h b/src/parse/subtitle.h index 3d99d9bc..867b3f0e 100644 --- a/src/parse/subtitle.h +++ b/src/parse/subtitle.h @@ -37,7 +37,7 @@ public: , v_align (TOP) {} - Text (boost::shared_ptr<const cxml::Node> node); + Text (boost::shared_ptr<const cxml::Node> node, boost::optional<int> tcr); float v_position; VAlign v_align; @@ -49,7 +49,7 @@ class Subtitle { public: Subtitle () {} - Subtitle (boost::shared_ptr<const cxml::Node> node); + Subtitle (boost::shared_ptr<const cxml::Node> node, boost::optional<int> tcr); Time in; Time out; @@ -59,7 +59,7 @@ public: std::list<boost::shared_ptr<Text> > text_nodes; private: - Time fade_time (boost::shared_ptr<const cxml::Node>, std::string name); + Time fade_time (boost::shared_ptr<const cxml::Node>, std::string name, boost::optional<int> tcr); }; class Font @@ -69,7 +69,7 @@ public: : size (0) {} - Font (boost::shared_ptr<const cxml::Node> node); + Font (boost::shared_ptr<const cxml::Node> node, boost::optional<int> tcr); Font (std::list<boost::shared_ptr<Font> > const & font_nodes); std::string text; |