diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-10-17 00:06:10 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-10-17 00:06:10 +0100 |
| commit | 7ef2ba523ca2ddc0470f5837bc88ad9c597361e2 (patch) | |
| tree | 9aaa33632f2c41e8c3129543c8214c8c3d7274cb /src/lib/subtitle.h | |
| parent | 9e93c860759b8d04277596781706488f59a3cc12 (diff) | |
| parent | c37c744bbb236b1fd39f86e4f0ab36652d403d67 (diff) | |
Merge branch 'master' of /home/carl/git/dvdomatic
Diffstat (limited to 'src/lib/subtitle.h')
| -rw-r--r-- | src/lib/subtitle.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/lib/subtitle.h b/src/lib/subtitle.h index de8f02596..1cc906ce0 100644 --- a/src/lib/subtitle.h +++ b/src/lib/subtitle.h @@ -17,6 +17,10 @@ */ +/** @file src/subtitle.h + * @brief Representations of subtitles. + */ + #include <list> #include <boost/shared_ptr.hpp> #include "util.h" @@ -24,6 +28,7 @@ struct AVSubtitle; class Image; +/** A subtitle, consisting of an image and a position */ class Subtitle { public: @@ -53,7 +58,8 @@ subtitle_transformed_area ( float target_x_scale, float target_y_scale, Rectangle sub_area, int subtitle_offset, float subtitle_scale ); - + +/** A Subtitle class with details of the time over which it should be shown */ class TimedSubtitle { public: @@ -66,8 +72,8 @@ public: } private: + /** the subtitle */ boost::shared_ptr<Subtitle> _subtitle; - /** display from time in seconds from the start of the film */ double _from; /** display to time in seconds from the start of the film */ |