Fix some code duplication and crashes when decoding FFmpeg-embedded ASS subtitles...

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

diff --git a/src/lib/text_subtitle_content.cc b/src/lib/text_subtitle_content.cc
index 79a225c47f14f74d7170cdad151745553214bac8..24a328d088e3c05001f9be31f2f1b614233010da 100644 (file)
--- a/src/lib/text_subtitle_content.cc
+++ b/src/lib/text_subtitle_content.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2014-2016 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/>.
 
 */
 
@@ -33,19 +34,17 @@ using std::string;
 using std::cout;
 using boost::shared_ptr;
 
-std::string const TextSubtitleContent::font_id = "font";
-
 TextSubtitleContent::TextSubtitleContent (shared_ptr<const Film> film, boost::filesystem::path path)
        : Content (film, path)
 {
-       subtitle.reset (new SubtitleContent (this, film));
+       subtitle.reset (new SubtitleContent (this));
 }
 
 TextSubtitleContent::TextSubtitleContent (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
@@ -55,11 +54,11 @@ TextSubtitleContent::examine (boost::shared_ptr<Job> job)
        TextSubtitle s (shared_from_this ());
 
        /* Default to turning these subtitles on */
-       subtitle->set_use_subtitles (true);
+       subtitle->set_use (true);
 
        boost::mutex::scoped_lock lm (_mutex);
        _length = s.length ();
-       subtitle->add_font (shared_ptr<Font> (new Font (font_id)));
+       subtitle->add_font (shared_ptr<Font> (new Font (TEXT_FONT_ID)));
 }
 
 string
@@ -79,13 +78,17 @@ TextSubtitleContent::as_xml (xmlpp::Node* node) const
 {
        node->add_child("Type")->add_child_text ("TextSubtitle");
        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 ()));
 }
 
 DCPTime
 TextSubtitleContent::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);
 }