diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-01-13 11:31:55 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-01-13 11:31:55 +0000 |
| commit | d15ef17dccf87b633d1971c38032a2049abe3db0 (patch) | |
| tree | 3bbde3c1959bae6b0ad064972f95bd9406416fbb /src/dcp/subtitle.h | |
| parent | acca8cb950de132fbc4be40e7dc7d294c6cb0a38 (diff) | |
Re-work time.
Diffstat (limited to 'src/dcp/subtitle.h')
| -rw-r--r-- | src/dcp/subtitle.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/dcp/subtitle.h b/src/dcp/subtitle.h index 95c96cf..672dc9a 100644 --- a/src/dcp/subtitle.h +++ b/src/dcp/subtitle.h @@ -20,7 +20,7 @@ #ifndef LIBSUB_DCP_SUBTITLE_H #define LIBSUB_DCP_SUBTITLE_H -#include "../time_pair.h" +#include "../sub_time.h" #include <boost/shared_ptr.hpp> #include <boost/optional.hpp> #include <list> @@ -39,16 +39,16 @@ class Subtitle { public: Subtitle () {} - Subtitle (boost::shared_ptr<const cxml::Node> node, bool smpte); + Subtitle (boost::shared_ptr<const cxml::Node> node, boost::optional<int> tcr); - TimePair in; - TimePair out; - TimePair fade_up_time; - TimePair fade_down_time; + Time in; + Time out; + Time fade_up_time; + Time fade_down_time; private: - boost::optional<FrameTime> smpte_time (boost::shared_ptr<const cxml::Node> node, std::string name); - boost::optional<MetricTime> interop_time (boost::shared_ptr<const cxml::Node> node, std::string name); + boost::optional<Time> smpte_time (boost::shared_ptr<const cxml::Node> node, std::string name, int tcr); + boost::optional<Time> interop_time (boost::shared_ptr<const cxml::Node> node, std::string name); }; } |