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 83b0d200cee33146c6f92b33a1de1bd0b34df0da..a806c9cbd764125bf56ba72f7ecf34f0fd7dc3e4 100644 (file)
--- a/src/lib/dcp_subtitle_content.cc
+++ b/src/lib/dcp_subtitle_content.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,47 +17,71 @@
 
 */
 
-#include <dcp/subtitle_content.h>
-#include <dcp/raw_convert.h>
+#include "font.h"
 #include "dcp_subtitle_content.h"
+#include "raw_convert.h"
+#include "film.h"
+#include "subtitle_content.h"
+#include <dcp/interop_subtitle_asset.h>
+#include <dcp/smpte_subtitle_asset.h>
+#include <dcp/interop_load_font_node.h>
+#include <libxml++/libxml++.h>
+#include <boost/foreach.hpp>
 
 #include "i18n.h"
 
 using std::string;
 using std::list;
 using boost::shared_ptr;
-using dcp::raw_convert;
+using boost::dynamic_pointer_cast;
 
 DCPSubtitleContent::DCPSubtitleContent (shared_ptr<const Film> film, boost::filesystem::path path)
        : Content (film, path)
-       , SubtitleContent (film, path)
 {
-       
+       subtitle.reset (new SubtitleContent (this, film));
 }
 
 DCPSubtitleContent::DCPSubtitleContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, int version)
        : Content (film, node)
-       , SubtitleContent (film, node, version)
-       , _length (node->number_child<DCPTime::Type> ("Length"))
+       , _length (node->number_child<ContentTime::Type> ("Length"))
 {
-
+       subtitle = SubtitleContent::from_xml (this, film, node, version);
 }
 
 void
 DCPSubtitleContent::examine (shared_ptr<Job> job)
 {
        Content::examine (job);
-       dcp::SubtitleContent sc (path (0), false);
-       _length = DCPTime::from_seconds (sc.latest_subtitle_out().to_seconds ());
+
+       shared_ptr<dcp::SubtitleAsset> sc = load (path (0));
+
+       /* Default to turning these subtitles on */
+       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_language (iop->language ());
+       }
+       shared_ptr<dcp::SMPTESubtitleAsset> smpte = dynamic_pointer_cast<dcp::SMPTESubtitleAsset> (sc);
+       if (smpte) {
+               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 ());
+
+       BOOST_FOREACH (shared_ptr<dcp::LoadFontNode> i, sc->load_font_nodes ()) {
+               subtitle->add_font (shared_ptr<Font> (new Font (i->id)));
+       }
 }
 
 DCPTime
 DCPSubtitleContent::full_length () const
 {
-       /* XXX: this assumes that the timing of the subtitle file is appropriate
-          for the DCP's frame rate.
-       */
-       return _length;
+       FrameRateChange const frc (active_video_frame_rate(), film()->video_frame_rate());
+       return DCPTime (_length, frc);
 }
 
 string
@@ -71,18 +95,16 @@ DCPSubtitleContent::technical_summary () const
 {
        return Content::technical_summary() + " - " + _("DCP XML subtitles");
 }
-      
-string
-DCPSubtitleContent::information () const
-{
-
-}
 
 void
 DCPSubtitleContent::as_xml (xmlpp::Node* node) const
 {
        node->add_child("Type")->add_child_text ("DCPSubtitle");
        Content::as_xml (node);
-       SubtitleContent::as_xml (node);
+
+       if (subtitle) {
+               subtitle->as_xml (node);
+       }
+
        node->add_child("Length")->add_child_text (raw_convert<string> (_length.get ()));
 }