Some allowances for video/audio/subtitle possibly being null.

[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 3feb8947abc13261fad49575fffbff8325bd9142..a806c9cbd764125bf56ba72f7ecf34f0fd7dc3e4 100644 (file)
--- a/src/lib/dcp_subtitle_content.cc
+++ b/src/lib/dcp_subtitle_content.cc
@@ -45,7 +45,7 @@ DCPSubtitleContent::DCPSubtitleContent (shared_ptr<const Film> film, cxml::Const
        : Content (film, node)
        , _length (node->number_child<ContentTime::Type> ("Length"))
 {
-       subtitle.reset (new SubtitleContent (this, film, node, version));
+       subtitle = SubtitleContent::from_xml (this, film, node, version);
 }
 
 void
@@ -56,18 +56,18 @@ DCPSubtitleContent::examine (shared_ptr<Job> job)
        shared_ptr<dcp::SubtitleAsset> sc = load (path (0));
 
        /* Default to turning these subtitles on */
-       subtitle->set_use_subtitles (true);
+       subtitle->set_use (true);
 
        boost::mutex::scoped_lock lm (_mutex);
 
        shared_ptr<dcp::InteropSubtitleAsset> iop = dynamic_pointer_cast<dcp::InteropSubtitleAsset> (sc);
        if (iop) {
-               subtitle->set_subtitle_language (iop->language ());
+               subtitle->set_language (iop->language ());
        }
        shared_ptr<dcp::SMPTESubtitleAsset> smpte = dynamic_pointer_cast<dcp::SMPTESubtitleAsset> (sc);
        if (smpte) {
-               subtitle->set_subtitle_language (smpte->language().get_value_or (""));
-               subtitle->set_subtitle_video_frame_rate (smpte->edit_rate().numerator);
+               subtitle->set_language (smpte->language().get_value_or (""));
+               set_video_frame_rate (smpte->edit_rate().numerator);
        }
 
        _length = ContentTime::from_seconds (sc->latest_subtitle_out().as_seconds ());
@@ -80,7 +80,7 @@ DCPSubtitleContent::examine (shared_ptr<Job> job)
 DCPTime
 DCPSubtitleContent::full_length () const
 {
-       FrameRateChange const frc (subtitle->subtitle_video_frame_rate(), film()->video_frame_rate());
+       FrameRateChange const frc (active_video_frame_rate(), film()->video_frame_rate());
        return DCPTime (_length, frc);
 }
 
@@ -101,6 +101,10 @@ DCPSubtitleContent::as_xml (xmlpp::Node* node) const
 {
        node->add_child("Type")->add_child_text ("DCPSubtitle");
        Content::as_xml (node);
-       subtitle->as_xml (node);
+
+       if (subtitle) {
+               subtitle->as_xml (node);
+       }
+
        node->add_child("Length")->add_child_text (raw_convert<string> (_length.get ()));
 }