diff options
| author | Carl Hetherington <cth@carlh.net> | 2022-04-28 13:47:57 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2022-04-28 13:47:57 +0200 |
| commit | a1d11f2e9cc3678bd68b95c0e444c8245ef776b5 (patch) | |
| tree | 12ce72513712ed36af1a89c3384cf8bf25ca202b /src/lib/content_text.h | |
| parent | 8cabf6045c7b101fda647ed65db6a9066b8a0efd (diff) | |
Allow ContentBitmapText to contain multiple BitmapText objects.
Diffstat (limited to 'src/lib/content_text.h')
| -rw-r--r-- | src/lib/content_text.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/content_text.h b/src/lib/content_text.h index 5edb9af20..fb86bc786 100644 --- a/src/lib/content_text.h +++ b/src/lib/content_text.h @@ -50,11 +50,11 @@ class ContentBitmapText : public ContentText public: ContentBitmapText (dcpomatic::ContentTime f, std::shared_ptr<const Image> im, dcpomatic::Rect<double> r) : ContentText (f) - , sub (im, r) + , subs{ {im, r} } {} - /* Our text, with its rectangle unmodified by any offsets or scales that the content specifies */ - BitmapText sub; + /* Our texts, with their rectangles unmodified by any offsets or scales that the content specifies */ + std::vector<BitmapText> subs; }; /** A text caption. We store the time period separately (as well as in the dcp::SubtitleStrings) |