diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-01-14 17:39:32 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-01-20 11:20:25 +0000 |
| commit | 3f630fb8334238ab8a58fbe1a0f513ae2c00de80 (patch) | |
| tree | 4b773b91029d6374bfd4f2194053d3e249d597cd /src/raw_subtitle.h | |
| parent | 49cafda01b3e07c47e3b20dd5ee91e1426446aea (diff) | |
Simplify time representation; better in-tree DCP subtitle parser.
Diffstat (limited to 'src/raw_subtitle.h')
| -rw-r--r-- | src/raw_subtitle.h | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/raw_subtitle.h b/src/raw_subtitle.h index 8a8ac7f..a27329a 100644 --- a/src/raw_subtitle.h +++ b/src/raw_subtitle.h @@ -20,12 +20,10 @@ #ifndef LIBSUB_RAW_SUBTITLE_H #define LIBSUB_RAW_SUBTITLE_H -#include "frame_time.h" -#include "metric_time.h" +#include "sub_time.h" #include "colour.h" #include "vertical_reference.h" #include "effect.h" -#include "time_pair.h" #include "font_size.h" #include "vertical_position.h" #include <boost/optional.hpp> @@ -49,7 +47,7 @@ public: /** Subtitle text in UTF-8 */ std::string text; - std::string font; + boost::optional<std::string> font; /** font size */ FontSize font_size; @@ -66,12 +64,12 @@ public: VerticalPosition vertical_position; /** from time */ - TimePair from; + Time from; /** to time */ - TimePair to; + Time to; - boost::optional<MetricTime> fade_up; - boost::optional<MetricTime> fade_down; + boost::optional<Time> fade_up; + boost::optional<Time> fade_down; }; bool operator< (RawSubtitle const &, RawSubtitle const &); |