X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.cc;h=c57fc165cf9a1b72db957cccd2ac8ef4dff8092f;hb=d5c220f76907f0113bf0b5d3a7e26e5b27197a17;hp=9857dc1f1adea434d099ad809fcb703c92b153ba;hpb=8d9e73b753ed51067d93aa377bb24400ff22936e;p=dcpomatic.git

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 9857dc1f1..c57fc165c 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -155,7 +155,6 @@ Film::Film (optional<boost::filesystem::path> dir)
 	, _encrypted (false)
 	, _context_id (dcp::make_uuid ())
 	, _j2k_bandwidth (Config::instance()->default_j2k_bandwidth ())
-	, _isdcf_metadata (Config::instance()->default_isdcf_metadata ())
 	, _video_frame_rate (24)
 	, _audio_channels (Config::instance()->default_dcp_audio_channels ())
 	, _three_d (false)
@@ -169,10 +168,8 @@ Film::Film (optional<boost::filesystem::path> dir)
 	, _user_explicit_container (false)
 	, _user_explicit_resolution (false)
 	, _name_language (dcp::LanguageTag("en-US"))
-	, _audio_language (dcp::LanguageTag("en-US"))
 	, _version_number (1)
 	, _status (dcp::Status::FINAL)
-	, _luminance (dcp::Luminance(4.5, dcp::Luminance::Unit::FOOT_LAMBERT))
 	, _state_version (current_state_version)
 	, _dirty (false)
 	, _tolerant (false)
@@ -446,7 +443,6 @@ Film::metadata (bool with_content_paths) const
 
 	root->add_child("Resolution")->add_child_text (resolution_to_string (_resolution));
 	root->add_child("J2KBandwidth")->add_child_text (raw_convert<string> (_j2k_bandwidth));
-	_isdcf_metadata.as_xml (root->add_child ("ISDCFMetadata"));
 	root->add_child("VideoFrameRate")->add_child_text (raw_convert<string> (_video_frame_rate));
 	root->add_child("ISDCFDate")->add_child_text (boost::gregorian::to_iso_string (_isdcf_date));
 	root->add_child("AudioChannels")->add_child_text (raw_convert<string> (_audio_channels));
@@ -475,7 +471,6 @@ Film::metadata (bool with_content_paths) const
 		root->add_child("ContentVersion")->add_child_text(i);
 	}
 	root->add_child("NameLanguage")->add_child_text(_name_language.to_string());
-	root->add_child("AudioLanguage")->add_child_text(_audio_language.to_string());
 	if (_release_territory) {
 		root->add_child("ReleaseTerritory")->add_child_text(_release_territory->subtag());
 	}
@@ -572,11 +567,9 @@ Film::read_metadata (optional<boost::filesystem::path> path)
 	_name = f.string_child ("Name");
 	if (_state_version >= 9) {
 		_use_isdcf_name = f.bool_child ("UseISDCFName");
-		_isdcf_metadata = ISDCFMetadata (f.node_child ("ISDCFMetadata"));
 		_isdcf_date = boost::gregorian::from_undelimited_string (f.string_child ("ISDCFDate"));
 	} else {
 		_use_isdcf_name = f.bool_child ("UseDCIName");
-		_isdcf_metadata = ISDCFMetadata (f.node_child ("DCIMetadata"));
 		_isdcf_date = boost::gregorian::from_undelimited_string (f.string_child ("DCIDate"));
 	}
 
@@ -654,10 +647,6 @@ Film::read_metadata (optional<boost::filesystem::path> path)
 	if (name_language) {
 		_name_language = dcp::LanguageTag (*name_language);
 	}
-	auto audio_language = f.optional_string_child("AudioLanguage");
-	if (audio_language) {
-		_audio_language = dcp::LanguageTag (*audio_language);
-	}
 	auto release_territory = f.optional_string_child("ReleaseTerritory");
 	if (release_territory) {
 		_release_territory = dcp::LanguageTag::RegionSubtag (*release_territory);
@@ -872,8 +861,6 @@ Film::isdcf_name (bool if_created_now) const
 		d += "-" + version;
 	}
 
-	auto const dm = isdcf_metadata ();
-
 	if (_temp_version) {
 		d += "-Temp";
 	}
@@ -886,8 +873,8 @@ Film::isdcf_name (bool if_created_now) const
 		d += "-RedBand";
 	}
 
-	if (!dm.chain.empty ()) {
-		d += "-" + dm.chain;
+	if (_chain && !_chain->empty()) {
+		d += "-" + *_chain;
 	}
 
 	if (three_d ()) {
@@ -898,8 +885,11 @@ Film::isdcf_name (bool if_created_now) const
 		d += "-2D";
 	}
 
-	if (!dm.mastered_luminance.empty ()) {
-		d += "-" + dm.mastered_luminance;
+	if (_luminance) {
+		auto fl = _luminance->value_in_foot_lamberts();
+		char buffer[64];
+		snprintf (buffer, sizeof(buffer), "%.1f", fl);
+		d += String::compose("-%1fl", buffer);
 	}
 
 	if (video_frame_rate() != 24) {
@@ -1129,13 +1119,6 @@ Film::set_j2k_bandwidth (int b)
 	_j2k_bandwidth = b;
 }
 
-void
-Film::set_isdcf_metadata (ISDCFMetadata m)
-{
-	FilmChangeSignaller ch (this, Property::ISDCF_METADATA);
-	_isdcf_metadata = m;
-}
-
 /** @param f New frame rate.
  *  @param user_explicit true if this comes from a direct user instruction, false if it is from
  *  DCP-o-matic being helpful.
@@ -1684,7 +1667,7 @@ Film::make_kdm (
 	map<shared_ptr<const dcp::ReelFileAsset>, dcp::Key> keys;
 
 	for (auto i: cpl->reel_file_assets()) {
-		if (!i->key_id()) {
+		if (!i->encrypted()) {
 			continue;
 		}
 
@@ -1889,7 +1872,6 @@ Film::use_template (string name)
 	_audio_processor = _template_film->_audio_processor;
 	_reel_type = _template_film->_reel_type;
 	_reel_length = _template_film->_reel_length;
-	_isdcf_metadata = _template_film->_isdcf_metadata;
 }
 
 pair<double, double>
@@ -2008,14 +1990,6 @@ Film::set_name_language (dcp::LanguageTag lang)
 }
 
 
-void
-Film::set_audio_language (dcp::LanguageTag lang)
-{
-	FilmChangeSignaller ch (this, Property::AUDIO_LANGUAGE);
-	_audio_language = lang;
-}
-
-
 void
 Film::set_release_territory (optional<dcp::LanguageTag::RegionSubtag> region)
 {