X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_subtitle_content.cc;h=3feb8947abc13261fad49575fffbff8325bd9142;hb=65b331d32c383f3a9049f29bf03ab3fe3193b31a;hp=742773043a8fc931b319e9af9a8110736dfe767b;hpb=3e7b4caf9be417bc1c80f1389d01e9dc98a25f21;p=dcpomatic.git

diff --git a/src/lib/dcp_subtitle_content.cc b/src/lib/dcp_subtitle_content.cc
index 742773043..3feb8947a 100644
--- a/src/lib/dcp_subtitle_content.cc
+++ b/src/lib/dcp_subtitle_content.cc
@@ -20,9 +20,12 @@
 #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"
@@ -34,17 +37,15 @@ 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.reset (new SubtitleContent (this, film, node, version));
 }
 
 void
@@ -55,33 +56,32 @@ DCPSubtitleContent::examine (shared_ptr<Job> job)
 	shared_ptr<dcp::SubtitleAsset> sc = load (path (0));
 
 	/* Default to turning these subtitles on */
-	set_use_subtitles (true);
-	
+	subtitle->set_use_subtitles (true);
+
 	boost::mutex::scoped_lock lm (_mutex);
 
 	shared_ptr<dcp::InteropSubtitleAsset> iop = dynamic_pointer_cast<dcp::InteropSubtitleAsset> (sc);
 	if (iop) {
-		_subtitle_language = iop->language ();
+		subtitle->set_subtitle_language (iop->language ());
 	}
 	shared_ptr<dcp::SMPTESubtitleAsset> smpte = dynamic_pointer_cast<dcp::SMPTESubtitleAsset> (sc);
 	if (smpte) {
-		_subtitle_language = smpte->language().get_value_or ("");
+		subtitle->set_subtitle_language (smpte->language().get_value_or (""));
+		subtitle->set_subtitle_video_frame_rate (smpte->edit_rate().numerator);
 	}
 
-	_length = DCPTime::from_seconds (sc->latest_subtitle_out().as_seconds ());
+	_length = ContentTime::from_seconds (sc->latest_subtitle_out().as_seconds ());
 
 	BOOST_FOREACH (shared_ptr<dcp::LoadFontNode> i, sc->load_font_nodes ()) {
-		_fonts.push_back (shared_ptr<Font> (new Font (i->id)));
+		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 (subtitle->subtitle_video_frame_rate(), film()->video_frame_rate());
+	return DCPTime (_length, frc);
 }
 
 string
@@ -95,12 +95,12 @@ DCPSubtitleContent::technical_summary () const
 {
 	return Content::technical_summary() + " - " + _("DCP XML subtitles");
 }
-      
+
 void
 DCPSubtitleContent::as_xml (xmlpp::Node* node) const
 {
 	node->add_child("Type")->add_child_text ("DCPSubtitle");
 	Content::as_xml (node);
-	SubtitleContent::as_xml (node);
+	subtitle->as_xml (node);
 	node->add_child("Length")->add_child_text (raw_convert<string> (_length.get ()));
 }