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/render_text.cc | |
| parent | 138882d651c5fb9d1dc66d092fcca7f3762a1226 (diff) | |
Account for split branch in libdcp.split
Diffstat (limited to 'src/lib/render_text.cc')
| -rw-r--r-- | src/lib/render_text.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/render_text.cc b/src/lib/render_text.cc index 870f3045d..6aed15181 100644 --- a/src/lib/render_text.cc +++ b/src/lib/render_text.cc @@ -242,12 +242,12 @@ x_position(dcp::HAlign align, float position, int target_width, int layout_width * @return y position of the top of the subtitle bounding box (in pixels) from the top of the screen. */ static int -y_position(dcp::SubtitleStandard standard, dcp::VAlign align, float position, int target_height, int baseline_to_bottom, int layout_height) +y_position(dcp::TextStandard standard, dcp::VAlign align, float position, int target_height, int baseline_to_bottom, int layout_height) { int y = 0; switch (standard) { - case dcp::SubtitleStandard::INTEROP: - case dcp::SubtitleStandard::SMPTE_2014: + case dcp::TextStandard::INTEROP: + case dcp::TextStandard::SMPTE_2014: switch (align) { case dcp::VAlign::TOP: /* position is distance from top of frame to subtitle baseline */ @@ -263,8 +263,8 @@ y_position(dcp::SubtitleStandard standard, dcp::VAlign align, float position, in break; } break; - case dcp::SubtitleStandard::SMPTE_2007: - case dcp::SubtitleStandard::SMPTE_2010: + case dcp::TextStandard::SMPTE_2007: + case dcp::TextStandard::SMPTE_2010: switch (align) { case dcp::VAlign::TOP: /* v_position is distance from top of frame to top of subtitle */ @@ -452,7 +452,7 @@ render_text(vector<StringText> subtitles, dcp::Size target, DCPTime time, int fr vector<dcpomatic::Rect<int>> -bounding_box(vector<StringText> subtitles, dcp::Size target, optional<dcp::SubtitleStandard> override_standard) +bounding_box(vector<StringText> subtitles, dcp::Size target, optional<dcp::TextStandard> override_standard) { vector<StringText> pending; vector<dcpomatic::Rect<int>> rects; |