}
-static
-string
-escape_text (string text)
-{
- /* We must escape some things, otherwise they might confuse our subtitle
- renderer (which uses entities and some HTML-esque markup to do bold/italic etc.)
- */
- boost::algorithm::replace_all(text, "&", "&");
- boost::algorithm::replace_all(text, "<", "<");
- boost::algorithm::replace_all(text, ">", ">");
- return text;
-}
-
-
static
void
set_forced_appearance(shared_ptr<const TextContent> content, StringText& subtitle)
auto string_text = StringText(
subtitle,
content()->outline_width(),
- subtitle.font() ? content()->get_font(*subtitle.font()) : shared_ptr<Font>(),
+ content()->get_font(subtitle.font().get_value_or("")),
valign_standard
);
- string_text.set_text(escape_text(string_text.text()));
+ string_text.set_text(string_text.text());
set_forced_appearance(content(), string_text);
string_texts.push_back(string_text);
}
content by the other emit_plain_start() above.
*/
+ auto dcp_colour = [](sub::Colour const& c) {
+ return dcp::Colour(lrintf(c.r * 255), lrintf(c.g * 255), lrintf(c.b * 255));
+ };
+
auto dcp_subtitle = dcp::SubtitleString(
optional<string>(),
block.italic,
block.bold,
block.underline,
- block.colour.dcp(),
+ dcp_colour(block.colour),
block.font_size.points (72 * 11),
1.0,
dcp::Time (from.seconds(), 1000),
h_align,
v_position,
v_align,
+ 0,
dcp::Direction::LTR,
- escape_text(block.text),
+ block.text,
dcp::Effect::NONE,
- block.effect_colour.get_value_or(sub::Colour(0, 0, 0)).dcp(),
+ dcp_colour(block.effect_colour.get_value_or(sub::Colour(0, 0, 0))),
/* Hack: we should use subtitle.fade_up and subtitle.fade_down here
but the times of these often don't have a frame rate associated
with them so the sub::Time won't convert them to milliseconds without