diff options
| author | Carl Hetherington <cth@carlh.net> | 2023-12-05 01:59:44 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2023-12-05 01:59:44 +0100 |
| commit | 751379da4be48f9b911a91cf17686330dd999d0c (patch) | |
| tree | eeb73eebfe9224956e8dde72b127872b23459dd5 /src/lib/string_text.h | |
| parent | 138882d651c5fb9d1dc66d092fcca7f3762a1226 (diff) | |
Account for split branch in libdcp.split
Diffstat (limited to 'src/lib/string_text.h')
| -rw-r--r-- | src/lib/string_text.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/string_text.h b/src/lib/string_text.h index 787231b8c..827b426cc 100644 --- a/src/lib/string_text.h +++ b/src/lib/string_text.h @@ -24,8 +24,8 @@ #include "font.h" -#include <dcp/subtitle_standard.h> -#include <dcp/subtitle_string.h> +#include <dcp/text_standard.h> +#include <dcp/text_string.h> /** A wrapper for SubtitleString which allows us to: @@ -36,13 +36,13 @@ * - include details of how v_align should be interpreted * * - specify the font by referring to a Font object from the content we came from, rather than - * having to use a DCP ID like in dcp::SubtitleString. + * having to use a DCP ID like in dcp::TextString. */ -class StringText : public dcp::SubtitleString +class StringText : public dcp::TextString { public: - StringText(dcp::SubtitleString dcp_, int outline_width_, std::shared_ptr<dcpomatic::Font> font_, dcp::SubtitleStandard valign_standard_) - : dcp::SubtitleString (dcp_) + StringText(dcp::TextString dcp_, int outline_width_, std::shared_ptr<dcpomatic::Font> font_, dcp::TextStandard valign_standard_) + : dcp::TextString(dcp_) , outline_width (outline_width_) , font (font_) , valign_standard (valign_standard_) @@ -67,7 +67,7 @@ public: * center - centre of screen to baseline of subtitle * bottom - bottom of screen to baseline of subtitle */ - dcp::SubtitleStandard valign_standard; + dcp::TextStandard valign_standard; }; |