X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftext_content.cc;h=a85b271a88d23dbfca216491e5777e701c720f03;hb=3476d6760f1efe3e8d51ba5ae535b38af9cf955a;hp=4ba2de348d076c79aee657aac4b79086bab60e4b;hpb=7516040b28194058c03ef930e316763ee288dbed;p=dcpomatic.git

diff --git a/src/lib/text_content.cc b/src/lib/text_content.cc
index 4ba2de348..a85b271a8 100644
--- a/src/lib/text_content.cc
+++ b/src/lib/text_content.cc
@@ -84,7 +84,7 @@ TextContent::TextContent (Content* parent, TextType type, TextType original_type
  *  The list could be empty if no TextContents are found.
  */
 list<shared_ptr<TextContent>>
-TextContent::from_xml (Content* parent, cxml::ConstNodePtr node, int version)
+TextContent::from_xml (Content* parent, cxml::ConstNodePtr node, int version, list<string>& notes)
 {
 	if (version < 34) {
 		/* With old metadata FFmpeg content has the subtitle-related tags even with no
@@ -101,22 +101,18 @@ TextContent::from_xml (Content* parent, cxml::ConstNodePtr node, int version)
 		if (!node->optional_number_child<double>("SubtitleXOffset") && !node->optional_number_child<double>("SubtitleOffset")) {
 			return {};
 		}
-		return { make_shared<TextContent>(parent, node, version) };
-	}
-
-	if (!node->optional_node_child("Text")) {
-		return {};
+		return { make_shared<TextContent>(parent, node, version, notes) };
 	}
 
 	list<shared_ptr<TextContent>> c;
 	for (auto i: node->node_children("Text")) {
-		c.push_back (make_shared<TextContent>(parent, i, version));
+		c.push_back (make_shared<TextContent>(parent, i, version, notes));
 	}
 
 	return c;
 }
 
-TextContent::TextContent (Content* parent, cxml::ConstNodePtr node, int version)
+TextContent::TextContent (Content* parent, cxml::ConstNodePtr node, int version, list<string>& notes)
 	: ContentPart (parent)
 	, _use (false)
 	, _burn (false)
@@ -238,9 +234,24 @@ TextContent::TextContent (Content* parent, cxml::ConstNodePtr node, int version)
 
 	auto lang = node->optional_node_child("Language");
 	if (lang) {
-		_language = dcp::LanguageTag(lang->content());
-		auto add = lang->optional_bool_attribute("Additional");
-		_language_is_additional = add && *add;
+		try {
+			_language = dcp::LanguageTag(lang->content());
+			auto add = lang->optional_bool_attribute("Additional");
+			_language_is_additional = add && *add;
+		} catch (dcp::LanguageTagError&) {
+			/* The language tag can be empty or invalid if it was loaded from a
+			 * 2.14.x metadata file; we'll just ignore it in that case.
+			 */
+			if (version <= 37) {
+				if (!lang->content().empty()) {
+					notes.push_back (String::compose(
+						_("A subtitle or closed caption file in this project is marked with the language '%1', "
+						  "which DCP-o-matic does not recognise.  The file's language has been cleared."), lang->content()));
+				}
+			} else {
+				throw;
+			}
+		}
 	}
 }
 
@@ -434,6 +445,9 @@ TextContent::identifier () const
 void
 TextContent::add_font (shared_ptr<Font> font)
 {
+	boost::mutex::scoped_lock lm(_mutex);
+
+	DCPOMATIC_ASSERT(!get_font_unlocked(font->id()));
 	_fonts.push_back (font);
 	connect_to_fonts ();
 }
@@ -636,3 +650,36 @@ TextContent::take_settings_from (shared_ptr<const TextContent> c)
 	set_language (c->_language);
 	set_language_is_additional (c->_language_is_additional);
 }
+
+
+shared_ptr<dcpomatic::Font>
+TextContent::get_font(string id) const
+{
+	boost::mutex::scoped_lock lm(_mutex);
+	return get_font_unlocked(id);
+}
+
+
+shared_ptr<dcpomatic::Font>
+TextContent::get_font_unlocked(string id) const
+{
+	auto iter = std::find_if(_fonts.begin(), _fonts.end(), [&id](shared_ptr<dcpomatic::Font> font) {
+		return font->id() == id;
+	});
+
+	if (iter == _fonts.end()) {
+		return {};
+	}
+
+	return *iter;
+}
+
+
+void
+TextContent::clear_fonts()
+{
+	boost::mutex::scoped_lock lm(_mutex);
+
+	_fonts.clear();
+}
+