X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_subtitle_content.cc;h=19f38c5f64732fd230c0dfa713ea968aa3e846aa;hb=aeb835a18c8df347e0ed68fb24631b320abeb611;hp=e9998dd2a2eb10b1b6bd549169eddf80ed908fa6;hpb=bde76c3341775bd02da59932d285e14eade64ae0;p=dcpomatic.git

diff --git a/src/lib/dcp_subtitle_content.cc b/src/lib/dcp_subtitle_content.cc
index e9998dd2a..19f38c5f6 100644
--- 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,27 +17,35 @@
 
 */
 
-#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 <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)
 {
-	
+
 }
 
 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"))
 {
 
 }
@@ -46,17 +54,38 @@ void
 DCPSubtitleContent::examine (shared_ptr<Job> job)
 {
 	Content::examine (job);
-	dcp::SubtitleContent sc (path (0), false);
-	_length = DCPTime::from_frames (sc.intrinsic_duration(), sc.edit_rate().as_float ());
+
+	shared_ptr<dcp::SubtitleAsset> sc = load (path (0));
+
+	/* Default to turning these subtitles on */
+	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 ();
+	}
+	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;
+	shared_ptr<const Film> film = _film.lock ();
+	DCPOMATIC_ASSERT (film);
+	FrameRateChange const frc (subtitle_video_frame_rate(), film->video_frame_rate());
+	return DCPTime (_length, frc);
 }
 
 string
@@ -70,12 +99,6 @@ DCPSubtitleContent::technical_summary () const
 {
 	return Content::technical_summary() + " - " + _("DCP XML subtitles");
 }
-      
-string
-DCPSubtitleContent::information () const
-{
-
-}
 
 void
 DCPSubtitleContent::as_xml (xmlpp::Node* node) const
@@ -85,3 +108,32 @@ 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.
+	*/
+	shared_ptr<const Film> film = _film.lock ();
+	DCPOMATIC_ASSERT (film);
+	return film->active_frame_rate_change(position()).source;
+}