X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.cc;h=64fc04f5ddbcbc4172502b443bab05ca32617857;hb=5262ef3dc8ba67b51ea6ce59136a2c4680796a06;hp=296066f58756d5d48e903cea458bc1202802cebc;hpb=185756ffbbba5d2b356860e75232fec9582c5800;p=dcpomatic.git

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 296066f58..64fc04f5d 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -729,6 +729,43 @@ Film::read_metadata (optional<boost::filesystem::path> path)
 		_audio_language = dcp::LanguageTag(*audio_language);
 	}
 
+	/* Read the old ISDCFMetadata tag from 2.14.x metadata */
+	auto isdcf = f.optional_node_child("ISDCFMetadata");
+	if (isdcf) {
+		if (auto territory = isdcf->optional_string_child("Territory")) {
+			try {
+				_release_territory = dcp::LanguageTag::RegionSubtag(*territory);
+			} catch (...) {
+				/* Invalid region subtag; just ignore it */
+			}
+		}
+		if (auto audio_language = isdcf->optional_string_child("AudioLanguage")) {
+			try {
+				_audio_language = dcp::LanguageTag(*audio_language);
+			} catch (...) {
+				/* Invalid language tag; just ignore it */
+			}
+		}
+		if (auto content_version = isdcf->optional_string_child("ContentVersion")) {
+			_content_versions.push_back (*content_version);
+		}
+		if (auto rating = isdcf->optional_string_child("Rating")) {
+			_ratings.push_back (dcp::Rating("", *rating));
+		}
+		if (auto mastered_luminance = isdcf->optional_number_child<float>("MasteredLuminance")) {
+			if (*mastered_luminance > 0) {
+				_luminance = dcp::Luminance(*mastered_luminance, dcp::Luminance::Unit::FOOT_LAMBERT);
+			}
+		}
+		_studio = isdcf->optional_string_child("Studio");
+		_facility = isdcf->optional_string_child("Facility");
+		_temp_version = isdcf->optional_bool_child("TempVersion").get_value_or("false");
+		_pre_release = isdcf->optional_bool_child("PreRelease").get_value_or("false");
+		_red_band = isdcf->optional_bool_child("RedBand").get_value_or("false");
+		_two_d_version_of_three_d = isdcf->optional_bool_child("TwoDVersionOfThreeD").get_value_or("false");
+		_chain = isdcf->optional_string_child("Chain");
+	}
+
 	list<string> notes;
 	_playlist->set_from_xml (shared_from_this(), f.node_child ("Playlist"), _state_version, notes);
 
@@ -1886,7 +1923,7 @@ void
 Film::use_template (string name)
 {
 	_template_film.reset (new Film (optional<boost::filesystem::path>()));
-	_template_film->read_metadata (Config::instance()->template_path (name));
+	_template_film->read_metadata (Config::instance()->template_read_path(name));
 	_use_isdcf_name = _template_film->_use_isdcf_name;
 	_dcp_content_type = _template_film->_dcp_content_type;
 	_container = _template_film->_container;