X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.cc;h=acfea99918d0baeebc833deea4c759b218876dd4;hb=6d716e405a0781c3d6cdc37d3718a8858faf3dd9;hp=7f6f8e498eb181d02760131d25e77d25fd80721e;hpb=55c007ab910ee9586d6bd2faba165e42f6148622;p=dcpomatic.git

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 7f6f8e498..acfea9991 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -299,6 +299,13 @@ Film::audio_analysis_path (shared_ptr<const Playlist> playlist) const
 			   recompute it.
 			*/
 			digester.add (i->audio->gain());
+
+			/* Likewise we only care about position if we're looking at a
+			 * whole-project view.
+			 */
+			digester.add (i->position().get());
+			digester.add (i->trim_start().get());
+			digester.add (i->trim_end().get());
 		}
 	}
 
@@ -474,6 +481,9 @@ Film::metadata (bool with_content_paths) const
 	if (_release_territory) {
 		root->add_child("ReleaseTerritory")->add_child_text(_release_territory->subtag());
 	}
+	if (_sign_language_video_language) {
+		root->add_child("SignLanguageVideoLanguage")->add_child_text(_sign_language_video_language->to_string());
+	}
 	root->add_child("VersionNumber")->add_child_text(raw_convert<string>(_version_number));
 	root->add_child("Status")->add_child_text(dcp::status_to_string(_status));
 	if (_chain) {
@@ -498,6 +508,9 @@ Film::metadata (bool with_content_paths) const
 	}
 	root->add_child("UserExplicitContainer")->add_child_text(_user_explicit_container ? "1" : "0");
 	root->add_child("UserExplicitResolution")->add_child_text(_user_explicit_resolution ? "1" : "0");
+	if (_audio_language) {
+		root->add_child("AudioLanguage")->add_child_text(_audio_language->to_string());
+	}
 	_playlist->as_xml (root->add_child ("Playlist"), with_content_paths);
 
 	return doc;
@@ -652,6 +665,11 @@ Film::read_metadata (optional<boost::filesystem::path> path)
 		_release_territory = dcp::LanguageTag::RegionSubtag (*release_territory);
 	}
 
+	auto sign_language_video_language = f.optional_string_child("SignLanguageVideoLanguage");
+	if (sign_language_video_language) {
+		_sign_language_video_language = dcp::LanguageTag(*sign_language_video_language);
+	}
+
 	_version_number = f.optional_number_child<int>("VersionNumber").get_value_or(0);
 
 	auto status = f.optional_string_child("Status");
@@ -678,6 +696,11 @@ Film::read_metadata (optional<boost::filesystem::path> path)
 	_user_explicit_container = f.optional_bool_child("UserExplicitContainer").get_value_or(true);
 	_user_explicit_resolution = f.optional_bool_child("UserExplicitResolution").get_value_or(true);
 
+	auto audio_language = f.optional_string_child("AudioLanguage");
+	if (audio_language) {
+		_audio_language = dcp::LanguageTag(*audio_language);
+	}
+
 	list<string> notes;
 	_playlist->set_from_xml (shared_from_this(), f.node_child ("Playlist"), _state_version, notes);
 
@@ -753,23 +776,6 @@ Film::mapped_audio_channels () const
 }
 
 
-vector<dcp::LanguageTag>
-Film::audio_languages () const
-{
-	vector<dcp::LanguageTag> result;
-	for (auto i: content()) {
-		if (i->audio && !i->audio->mapping().mapped_output_channels().empty() && i->audio->language()) {
-			result.push_back (i->audio->language().get());
-		}
-	}
-
-	std::sort (result.begin(), result.end());
-	auto last = std::unique (result.begin(), result.end());
-	result.erase (last, result.end());
-	return result;
-}
-
-
 pair<optional<dcp::LanguageTag>, vector<dcp::LanguageTag>>
 Film::subtitle_languages () const
 {
@@ -904,23 +910,18 @@ Film::isdcf_name (bool if_created_now) const
 
 	/* Interior aspect ratio.  The standard says we don't do this for trailers, for some strange reason */
 	if (dcp_content_type() && dcp_content_type()->libdcp_kind() != dcp::ContentKind::TRAILER) {
-		Ratio const* content_ratio = nullptr;
-		for (auto i: content ()) {
-			if (i->video) {
-				/* Here's the first piece of video content */
-				content_ratio = Ratio::nearest_from_ratio(i->video->scaled_size(frame_size()).ratio());
-				break;
+		auto cl = content();
+		auto first_video = std::find_if(cl.begin(), cl.end(), [](shared_ptr<Content> c) { return static_cast<bool>(c->video); });
+		if (first_video != cl.end()) {
+			auto first_ratio = lrintf((*first_video)->video->scaled_size(frame_size()).ratio() * 100);
+			auto container_ratio = lrintf(container()->ratio() * 100);
+			if (first_ratio != container_ratio) {
+				d += "-" + dcp::raw_convert<string>(first_ratio);
 			}
 		}
-
-		if (content_ratio && content_ratio != container()) {
-			/* This needs to be the numeric version of the ratio, and ::id() is close enough */
-			d += "-" + content_ratio->id();
-		}
 	}
 
-	auto audio_langs = audio_languages();
-	auto audio_language = (audio_langs.empty() || !audio_langs.front().language()) ? "XX" : audio_langs.front().language()->subtag();
+	auto audio_language = (_audio_language && _audio_language->language()) ? _audio_language->language()->subtag() : "XX";
 
 	d += "_" + to_upper (audio_language);
 
@@ -2144,3 +2145,26 @@ Film::set_two_d_version_of_three_d (bool t)
 	_two_d_version_of_three_d = t;
 }
 
+
+void
+Film::set_audio_language (optional<dcp::LanguageTag> language)
+{
+	FilmChangeSignaller ch (this, Property::AUDIO_LANGUAGE);
+	_audio_language = language;
+}
+
+
+bool
+Film::has_sign_language_video_channel () const
+{
+	return _audio_channels >= static_cast<int>(dcp::Channel::SIGN_LANGUAGE);
+}
+
+
+void
+Film::set_sign_language_video_language (optional<dcp::LanguageTag> lang)
+{
+	FilmChangeSignaller ch (this, Property::SIGN_LANGUAGE_VIDEO_LANGUAGE);
+	_sign_language_video_language = lang;
+}
+