Noisy change to get film into AudioContent::modify_trim_start().

[dcpomatic.git] / src / lib / dcp_subtitle_content.cc

diff --git a/src/lib/dcp_subtitle_content.cc b/src/lib/dcp_subtitle_content.cc
index 3bae6e88fb572e686c418995759adcc2d698752f..8908d34e6d49a4b5d18f6fb631d55a15f6dbc7a9 100644 (file)
--- a/src/lib/dcp_subtitle_content.cc
+++ b/src/lib/dcp_subtitle_content.cc
@@ -62,7 +62,7 @@ DCPSubtitleContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job)
        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);
@@ -74,8 +74,18 @@ DCPSubtitleContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job)
 
        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>(""));
        }
 }