From 7a877ff976b119a39797c1f6e8477b92dfbb30ca Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Wed, 15 Nov 2023 23:07:42 +0100
Subject: Pass through <Ruby> tags in subtitles (#2635) (GH#23).

---
 src/lib/reel_writer.cc  | 3 ++-
 src/lib/text_decoder.cc | 3 ++-
 src/lib/util.cc         | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc
index 78e504697..ca4a2dbb1 100644
--- a/src/lib/reel_writer.cc
+++ b/src/lib/reel_writer.cc
@@ -873,7 +873,8 @@ ReelWriter::empty_text_asset (TextType type, optional<DCPTextTrack> track, bool
 				dcp::Colour(),
 				dcp::Time(),
 				dcp::Time(),
-				0
+				0,
+				std::vector<dcp::Ruby>()
 				)
 		       );
 
diff --git a/src/lib/text_decoder.cc b/src/lib/text_decoder.cc
index aca6946b7..75fa33605 100644
--- a/src/lib/text_decoder.cc
+++ b/src/lib/text_decoder.cc
@@ -301,7 +301,8 @@ TextDecoder::emit_plain_start (ContentTime from, sub::Subtitle const & sub_subti
 				*/
 				dcp::Time (),
 				dcp::Time (),
-				0
+				0,
+				std::vector<dcp::Ruby>()
 				);
 
 			auto font = content()->get_font(block.font.get_value_or(""));
diff --git a/src/lib/util.cc b/src/lib/util.cc
index 71aee88fe..d23989afa 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -470,7 +470,7 @@ LIBDCP_ENABLE_WARNINGS
 	vector<StringText> subs;
 	dcp::SubtitleString ss(
 		optional<string>(), false, false, false, dcp::Colour(), 42, 1, dcp::Time(), dcp::Time(), 0, dcp::HAlign::CENTER, 0, dcp::VAlign::CENTER, 0, dcp::Direction::LTR,
-		"Hello dolly", dcp::Effect::NONE, dcp::Colour(), dcp::Time(), dcp::Time(), 0
+		"Hello dolly", dcp::Effect::NONE, dcp::Colour(), dcp::Time(), dcp::Time(), 0, std::vector<dcp::Ruby>()
 		);
 	subs.push_back(StringText(ss, 0, make_shared<dcpomatic::Font>("foo"), dcp::SubtitleStandard::SMPTE_2014));
 	render_text (subs, dcp::Size(640, 480), DCPTime(), 24);
-- 
cgit v1.2.3