: Content (node)
, _length (node->number_child<ContentTime::Type> ("Length"))
{
- text = TextContent::from_xml (this, node, version);
+ list<string> notes;
+ text = TextContent::from_xml (this, node, version, notes);
}
void
auto iop = dynamic_pointer_cast<dcp::InteropSubtitleAsset>(sc);
auto smpte = dynamic_pointer_cast<dcp::SMPTESubtitleAsset>(sc);
if (smpte) {
- set_video_frame_rate (smpte->edit_rate().numerator);
+ set_video_frame_rate(film, smpte->edit_rate().numerator);
}
boost::mutex::scoped_lock lm (_mutex);
sc->fix_empty_font_ids ();
- for (auto i: sc->load_font_nodes()) {
- only_text()->add_font(make_shared<Font>(i->id));
+ auto font_data = sc->font_data();
+ for (auto node: sc->load_font_nodes()) {
+ auto data = font_data.find(node->id);
+ if (data != font_data.end()) {
+ only_text()->add_font(make_shared<Font>(node->id, data->second));
+ } else {
+ only_text()->add_font(make_shared<Font>(node->id));
+ }
+ }
+
+ if (only_text()->fonts().empty()) {
+ only_text()->add_font(make_shared<Font>(""));
}
}