X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_subtitle_content.cc;h=3bae6e88fb572e686c418995759adcc2d698752f;hb=5723d8d8518ad1cc0fef8bcc34a47671ab959fb3;hp=5acc51ac4da1d8bc0119ae66fbc0513b383ba66c;hpb=a5c629cb9b638b67a0e4c2d26fe9ab2e124bf0eb;p=dcpomatic.git

diff --git a/src/lib/dcp_subtitle_content.cc b/src/lib/dcp_subtitle_content.cc
index 5acc51ac4..3bae6e88f 100644
--- a/src/lib/dcp_subtitle_content.cc
+++ b/src/lib/dcp_subtitle_content.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -27,38 +27,40 @@
 #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::dynamic_pointer_cast;
 using std::list;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::make_shared;
+using std::shared_ptr;
+using std::string;
 using dcp::raw_convert;
+using namespace dcpomatic;
 
-DCPSubtitleContent::DCPSubtitleContent (shared_ptr<const Film> film, boost::filesystem::path path)
-	: Content (film, path)
+DCPSubtitleContent::DCPSubtitleContent (boost::filesystem::path path)
+	: Content (path)
 {
-	text.push_back (shared_ptr<TextContent> (new TextContent (this, TEXT_OPEN_SUBTITLE)));
+	text.push_back (make_shared<TextContent>(this, TextType::OPEN_SUBTITLE, TextType::OPEN_SUBTITLE));
 }
 
-DCPSubtitleContent::DCPSubtitleContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, int version)
-	: Content (film, node)
+DCPSubtitleContent::DCPSubtitleContent (cxml::ConstNodePtr node, int version)
+	: Content (node)
 	, _length (node->number_child<ContentTime::Type> ("Length"))
 {
-	text = TextContent::from_xml (this, node, version);
+	list<string> notes;
+	text = TextContent::from_xml (this, node, version, notes);
 }
 
 void
-DCPSubtitleContent::examine (shared_ptr<Job> job)
+DCPSubtitleContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job)
 {
-	Content::examine (job);
+	Content::examine (film, job);
 
-	shared_ptr<dcp::SubtitleAsset> sc = load (path (0));
+	auto sc = load (path(0));
 
-	shared_ptr<dcp::InteropSubtitleAsset> iop = dynamic_pointer_cast<dcp::InteropSubtitleAsset> (sc);
-	shared_ptr<dcp::SMPTESubtitleAsset> smpte = dynamic_pointer_cast<dcp::SMPTESubtitleAsset> (sc);
+	auto iop = dynamic_pointer_cast<dcp::InteropSubtitleAsset>(sc);
+	auto smpte = dynamic_pointer_cast<dcp::SMPTESubtitleAsset>(sc);
 	if (smpte) {
 		set_video_frame_rate (smpte->edit_rate().numerator);
 	}
@@ -68,26 +70,28 @@ DCPSubtitleContent::examine (shared_ptr<Job> job)
 	/* Default to turning these subtitles on */
 	only_text()->set_use (true);
 
-	if (iop) {
-		only_text()->set_language (iop->language ());
-	} else if (smpte) {
-		only_text()->set_language (smpte->language().get_value_or (""));
-	}
+	_length = ContentTime::from_seconds (sc->latest_subtitle_out().as_seconds());
 
-	_length = ContentTime::from_seconds (sc->latest_subtitle_out().as_seconds ());
+	sc->fix_empty_font_ids ();
 
-	BOOST_FOREACH (shared_ptr<dcp::LoadFontNode> i, sc->load_font_nodes ()) {
-		only_text()->add_font (shared_ptr<Font> (new Font (i->id)));
+	for (auto i: sc->load_font_nodes()) {
+		only_text()->add_font(make_shared<Font>(i->id));
 	}
 }
 
 DCPTime
-DCPSubtitleContent::full_length () const
+DCPSubtitleContent::full_length (shared_ptr<const Film> film) const
 {
-	FrameRateChange const frc (active_video_frame_rate(), film()->video_frame_rate());
+	FrameRateChange const frc (film, shared_from_this());
 	return DCPTime (_length, frc);
 }
 
+DCPTime
+DCPSubtitleContent::approximate_length () const
+{
+	return DCPTime (_length, FrameRateChange());
+}
+
 string
 DCPSubtitleContent::summary () const
 {