Fix crash when loading old state files.

[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 eabcaaafe14680c5054c6bd29769bd37a4534a2d..e8ac75e36b8eb7cca0818b390d3bc3cf1b50187f 100644 (file)
--- a/src/lib/dcp_subtitle_content.cc
+++ b/src/lib/dcp_subtitle_content.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -38,14 +39,14 @@ using boost::dynamic_pointer_cast;
 DCPSubtitleContent::DCPSubtitleContent (shared_ptr<const Film> film, boost::filesystem::path path)
        : Content (film, path)
 {
-       subtitle.reset (new SubtitleContent (this, film));
+       subtitle.reset (new SubtitleContent (this));
 }
 
 DCPSubtitleContent::DCPSubtitleContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, int version)
        : Content (film, node)
        , _length (node->number_child<ContentTime::Type> ("Length"))
 {
-       subtitle.reset (new SubtitleContent (this, film, node, version));
+       subtitle = SubtitleContent::from_xml (this, node, version);
 }
 
 void
@@ -67,7 +68,7 @@ DCPSubtitleContent::examine (shared_ptr<Job> job)
        shared_ptr<dcp::SMPTESubtitleAsset> smpte = dynamic_pointer_cast<dcp::SMPTESubtitleAsset> (sc);
        if (smpte) {
                subtitle->set_language (smpte->language().get_value_or (""));
-               subtitle->set_video_frame_rate (smpte->edit_rate().numerator);
+               set_video_frame_rate (smpte->edit_rate().numerator);
        }
 
        _length = ContentTime::from_seconds (sc->latest_subtitle_out().as_seconds ());
@@ -80,7 +81,7 @@ DCPSubtitleContent::examine (shared_ptr<Job> job)
 DCPTime
 DCPSubtitleContent::full_length () const
 {
-       FrameRateChange const frc (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 +102,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 ()));
 }