diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-07-09 02:13:01 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-07-09 02:13:01 +0100 |
| commit | 3a69e2805f4b2119194ba2357fa9895bf1ae147f (patch) | |
| tree | ad5e3eee08ad0651599e2e9cac38005d2aed397e /src/subtitle_image.cc | |
| parent | d630b7b1e1c77742ff131a7d0c9497f061f87142 (diff) | |
Store image subtitle ID in the object, rather than a separate map. Start of reading image subtitles.
Diffstat (limited to 'src/subtitle_image.cc')
| -rw-r--r-- | src/subtitle_image.cc | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/src/subtitle_image.cc b/src/subtitle_image.cc index 974b496f..49c00f77 100644 --- a/src/subtitle_image.cc +++ b/src/subtitle_image.cc @@ -32,8 +32,10 @@ */ #include "subtitle_image.h" +#include "util.h" using std::ostream; +using std::string; using namespace dcp; SubtitleImage::SubtitleImage ( @@ -49,6 +51,26 @@ SubtitleImage::SubtitleImage ( ) : Subtitle (in, out, h_position, h_align, v_position, v_align, fade_up_time, fade_down_time) , _png_image (png_image) + , _id (make_uuid ()) +{ + +} + +SubtitleImage::SubtitleImage ( + Data png_image, + string id, + Time in, + Time out, + float h_position, + HAlign h_align, + float v_position, + VAlign v_align, + Time fade_up_time, + Time fade_down_time + ) + : Subtitle (in, out, h_position, h_align, v_position, v_align, fade_up_time, fade_down_time) + , _png_image (png_image) + , _id (id) { } @@ -57,7 +79,8 @@ bool dcp::operator== (SubtitleImage const & a, SubtitleImage const & b) { return ( - a.png_image() == b.png_image(), + a.png_image() == b.png_image() && + a.id() == b.id() && a.in() == b.in() && a.out() == b.out() && a.h_position() == b.h_position() && |