diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-12-18 14:51:49 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-12-18 14:51:49 +0000 |
| commit | 95dc81ecbc031b6ffaee2053884115de4ee4b393 (patch) | |
| tree | b6f7fd430fe5de560bc6505eafc9c4e3729e7bed /src/subtitle.h | |
| parent | c41e0eb748cd39ce6ebe0c7c354e99ccf87a951b (diff) | |
| parent | 485794f8322b090a22da841961025b19642e42a2 (diff) | |
Merge branch '1.0' of git.carlh.net:git/libsub into 1.0
Diffstat (limited to 'src/subtitle.h')
| -rw-r--r-- | src/subtitle.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/subtitle.h b/src/subtitle.h index 3906314..2d22dac 100644 --- a/src/subtitle.h +++ b/src/subtitle.h @@ -49,7 +49,7 @@ public: /** Construct a Block taking any relevant information from a RawSubtitle */ Block (RawSubtitle s); - + /** Subtitle text in UTF-8 */ std::string text; boost::optional<std::string> font; @@ -59,7 +59,7 @@ public: boost::optional<Effect> effect; boost::optional<Colour> effect_colour; - + Colour colour; bool bold; ///< true to use a bold version of font bool italic; ///< true to use an italic version of font @@ -75,7 +75,7 @@ class Line { public: Line () {} - + /** Construct a Line taking any relevant information from a RawSubtitle */ Line (RawSubtitle s); @@ -101,12 +101,12 @@ public: /** Construct a Line taking any relevant information from a RawSubtitle */ Subtitle (RawSubtitle s); - + /** from time */ Time from; /** to time */ Time to; - + boost::optional<Time> fade_up; boost::optional<Time> fade_down; |
