diff options
| author | Carl Hetherington <cth@carlh.net> | 2022-12-12 00:51:56 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2023-02-18 00:41:34 +0100 |
| commit | ac8e1c0859f9bac157c158ef189f9c1baf43437f (patch) | |
| tree | b26324ae2d28fbaa5f3aa6f84089c90f62c8fdcf /src/lib/text_decoder.h | |
| parent | 5b3311e613d345e4c9d78c11dedd405ffc3f21ae (diff) | |
Support the 2014 version of SMPTE 428-7 in render_text.cc and use it
when placing subtitles (e.g. SRT). Also default to outputting 2014-era
alignment.
Diffstat (limited to 'src/lib/text_decoder.h')
| -rw-r--r-- | src/lib/text_decoder.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/lib/text_decoder.h b/src/lib/text_decoder.h index 5362540c2..3b25e54cb 100644 --- a/src/lib/text_decoder.h +++ b/src/lib/text_decoder.h @@ -23,10 +23,13 @@ #define DCPOMATIC_CAPTION_DECODER_H +#include "content_text.h" #include "decoder.h" +#include "decoder_part.h" #include "rect.h" #include "content_text.h" -#include "decoder_part.h" +#include "types.h" +#include <dcp/subtitle_standard.h> #include <dcp/subtitle_string.h> #include <boost/signals2.hpp> @@ -49,9 +52,9 @@ public: void emit_bitmap_start (ContentBitmapText const& bitmap); void emit_bitmap (dcpomatic::ContentTimePeriod period, std::shared_ptr<const Image> image, dcpomatic::Rect<double> rect); - void emit_plain_start (dcpomatic::ContentTime from, std::vector<dcp::SubtitleString> s, dcp::Standard valign_standard); + void emit_plain_start(dcpomatic::ContentTime from, std::vector<dcp::SubtitleString> s, dcp::SubtitleStandard valign_standard); void emit_plain_start (dcpomatic::ContentTime from, sub::Subtitle const & subtitle); - void emit_plain (dcpomatic::ContentTimePeriod period, std::vector<dcp::SubtitleString> s, dcp::Standard valign_standard); + void emit_plain(dcpomatic::ContentTimePeriod period, std::vector<dcp::SubtitleString> s, dcp::SubtitleStandard valign_standard); void emit_plain (dcpomatic::ContentTimePeriod period, sub::Subtitle const & subtitle); void emit_stop (dcpomatic::ContentTime to); |