X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fstring_text_file_content.cc;h=2ce343f2edb4d700eabff7c8c8916aa52bf1a4af;hb=c7916079e06d985121842962b9736a6673e22dfe;hp=8b740546e82004c47299b514650e5384f11fe197;hpb=f67bc45820b4e56f90eecb97ba3b7762c119f9b5;p=dcpomatic.git

diff --git a/src/lib/string_text_file_content.cc b/src/lib/string_text_file_content.cc
index 8b740546e..2ce343f2e 100644
--- a/src/lib/string_text_file_content.cc
+++ b/src/lib/string_text_file_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.
 
@@ -18,6 +18,7 @@
 
 */
 
+
 #include "string_text_file_content.h"
 #include "util.h"
 #include "string_text_file.h"
@@ -28,69 +29,97 @@
 #include <libxml++/libxml++.h>
 #include <iostream>
 
+
 #include "i18n.h"
 
-using std::string;
+
 using std::cout;
-using boost::shared_ptr;
-using boost::optional;
+using std::list;
+using std::make_shared;
+using std::shared_ptr;
+using std::string;
 using dcp::raw_convert;
+using namespace dcpomatic;
+
 
 StringTextFileContent::StringTextFileContent (boost::filesystem::path path)
 	: Content (path)
 {
-	text.push_back (shared_ptr<TextContent> (new TextContent (this, TEXT_OPEN_SUBTITLE, TEXT_UNKNOWN)));
+	text.push_back (make_shared<TextContent>(this, TextType::OPEN_SUBTITLE, TextType::UNKNOWN));
 }
 
-StringTextFileContent::StringTextFileContent (cxml::ConstNodePtr node, int version)
+
+StringTextFileContent::StringTextFileContent (cxml::ConstNodePtr node, int version, list<string>& notes)
 	: Content (node)
-	, _length (node->number_child<ContentTime::Type> ("Length"))
+	, _length (node->number_child<ContentTime::Type>("Length"))
 {
-	text = TextContent::from_xml (this, node, version);
+	text = TextContent::from_xml (this, node, version, notes);
 }
 
+
 void
 StringTextFileContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job)
 {
 	Content::examine (film, job);
-	StringTextFile s (shared_from_this ());
+	StringTextFile s (shared_from_this());
 
 	/* Default to turning these subtitles on */
 	only_text()->set_use (true);
 
 	boost::mutex::scoped_lock lm (_mutex);
 	_length = s.length ();
-	only_text()->add_font (shared_ptr<Font> (new Font (TEXT_FONT_ID)));
+	only_text()->add_font (make_shared<Font>(TEXT_FONT_ID));
 }
 
+
 string
 StringTextFileContent::summary () const
 {
 	return path_summary() + " " + _("[subtitles]");
 }
 
+
 string
 StringTextFileContent::technical_summary () const
 {
 	return Content::technical_summary() + " - " + _("Text subtitles");
+
 }
 
+
 void
 StringTextFileContent::as_xml (xmlpp::Node* node, bool with_paths) const
 {
-	node->add_child("Type")->add_child_text ("TextSubtitle");
+	node->add_child("Type")->add_child_text("TextSubtitle");
 	Content::as_xml (node, with_paths);
 
 	if (only_text()) {
-		only_text()->as_xml (node);
+		only_text()->as_xml(node);
 	}
 
-	node->add_child("Length")->add_child_text (raw_convert<string> (_length.get ()));
+	node->add_child("Length")->add_child_text(raw_convert<string>(_length.get ()));
 }
 
+
 DCPTime
 StringTextFileContent::full_length (shared_ptr<const Film> film) const
 {
 	FrameRateChange const frc (film, shared_from_this());
 	return DCPTime (_length, frc);
 }
+
+
+DCPTime
+StringTextFileContent::approximate_length () const
+{
+	return DCPTime (_length, FrameRateChange());
+}
+
+
+string
+StringTextFileContent::identifier () const
+{
+	auto s = Content::identifier ();
+	s += "_" + only_text()->identifier();
+	return s;
+}