diff options
| author | Carl Hetherington <cth@carlh.net> | 2023-02-27 15:00:34 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2023-02-27 15:00:34 +0100 |
| commit | e163200eaaf65c63d5105949432140f4084de037 (patch) | |
| tree | 7c35507485aa46b79627c10a215023311e41b6bb /src/lib/text_decoder.h | |
| parent | 8ff6586d568c4a2b0a2ac24e690d172f4c01e3c4 (diff) | |
| parent | f4f6f4828430dc72e0276c245d32fde228aaa176 (diff) | |
Merge branch '2389-vpos'
Here we are trying to fix a variety of confusions related to vertical
subtitle position (#2389).
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); |