summaryrefslogtreecommitdiff
path: root/src/lib/text_decoder.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/text_decoder.h')
-rw-r--r--src/lib/text_decoder.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/text_decoder.h b/src/lib/text_decoder.h
index 1a7632fd8..91f452b60 100644
--- a/src/lib/text_decoder.h
+++ b/src/lib/text_decoder.h
@@ -29,8 +29,8 @@
#include "rect.h"
#include "content_text.h"
#include "types.h"
-#include <dcp/subtitle_standard.h>
-#include <dcp/subtitle_string.h>
+#include <dcp/text_standard.h>
+#include <dcp/text_string.h>
#include <boost/signals2.hpp>
@@ -52,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::SubtitleStandard valign_standard);
+ void emit_plain_start(dcpomatic::ContentTime from, std::vector<dcp::TextString> s, dcp::TextStandard 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::SubtitleStandard valign_standard);
+ void emit_plain(dcpomatic::ContentTimePeriod period, std::vector<dcp::TextString> s, dcp::TextStandard valign_standard);
void emit_plain (dcpomatic::ContentTimePeriod period, sub::Subtitle const & subtitle);
void emit_stop (dcpomatic::ContentTime to);