X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_subtitle_content.cc;h=39f24b21514c01d1bdb7247ac44366aff4fc2e16;hb=6fde557864505b470c438e4161ee494f29b90d63;hp=f3198c58d2b918adfd1c5f8d0282395579a6d5d7;hpb=769c71b5c3e050ccfc1c13771d24328fbf76a495;p=dcpomatic.git

diff --git a/src/lib/dcp_subtitle_content.cc b/src/lib/dcp_subtitle_content.cc
index f3198c58d..39f24b215 100644
--- a/src/lib/dcp_subtitle_content.cc
+++ b/src/lib/dcp_subtitle_content.cc
@@ -20,27 +20,32 @@
 #include "font.h"
 #include "dcp_subtitle_content.h"
 #include "raw_convert.h"
-#include <dcp/interop_subtitle_content.h>
-#include <dcp/smpte_subtitle_content.h>
-#include <dcp/interop_load_font.h>
+#include "film.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 boost::dynamic_pointer_cast;
 
 DCPSubtitleContent::DCPSubtitleContent (shared_ptr<const Film> film, boost::filesystem::path path)
 	: Content (film, path)
 	, SubtitleContent (film, path)
 {
-	
+
 }
 
 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"))
+	, _frame_rate (node->optional_number_child<int>("SubtitleFrameRate"))
 {
 
 }
@@ -50,26 +55,35 @@ DCPSubtitleContent::examine (shared_ptr<Job> job)
 {
 	Content::examine (job);
 
-	shared_ptr<dcp::SubtitleContent> sc = load (path (0));
-	
+	shared_ptr<dcp::SubtitleAsset> sc = load (path (0));
+
+	/* Default to turning these subtitles on */
+	set_use_subtitles (true);
+
 	boost::mutex::scoped_lock lm (_mutex);
-	
-	_subtitle_language = sc->language ();
-	_length = DCPTime::from_seconds (sc->latest_subtitle_out().to_seconds ());
 
-	list<shared_ptr<dcp::LoadFont> > fonts = sc->load_font_nodes ();
-	for (list<shared_ptr<dcp::LoadFont> >::const_iterator i = fonts.begin(); i != fonts.end(); ++i) {
-		_fonts.push_back (shared_ptr<Font> (new Font ((*i)->id)));
+	shared_ptr<dcp::InteropSubtitleAsset> iop = dynamic_pointer_cast<dcp::InteropSubtitleAsset> (sc);
+	if (iop) {
+		_subtitle_language = iop->language ();
+	}
+	shared_ptr<dcp::SMPTESubtitleAsset> smpte = dynamic_pointer_cast<dcp::SMPTESubtitleAsset> (sc);
+	if (smpte) {
+		_subtitle_language = smpte->language().get_value_or ("");
+		_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 ()) {
+		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_video_frame_rate(), film()->video_frame_rate());
+	return DCPTime (_length, frc);
 }
 
 string
@@ -83,7 +97,7 @@ DCPSubtitleContent::technical_summary () const
 {
 	return Content::technical_summary() + " - " + _("DCP XML subtitles");
 }
-      
+
 void
 DCPSubtitleContent::as_xml (xmlpp::Node* node) const
 {
@@ -92,3 +106,30 @@ DCPSubtitleContent::as_xml (xmlpp::Node* node) const
 	SubtitleContent::as_xml (node);
 	node->add_child("Length")->add_child_text (raw_convert<string> (_length.get ()));
 }
+
+void
+DCPSubtitleContent::set_subtitle_video_frame_rate (int r)
+{
+	{
+		boost::mutex::scoped_lock lm (_mutex);
+		_frame_rate = r;
+	}
+
+	signal_changed (SubtitleContentProperty::SUBTITLE_VIDEO_FRAME_RATE);
+}
+
+double
+DCPSubtitleContent::subtitle_video_frame_rate () const
+{
+	{
+		boost::mutex::scoped_lock lm (_mutex);
+		if (_frame_rate) {
+			return _frame_rate.get ();
+		}
+	}
+
+	/* No frame rate specified, so assume this content has been
+	   prepared for any concurrent video content.
+	*/
+	return film()->active_frame_rate_change(position()).source;
+}