X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.cc;h=aa16fdad8b485b24125ff7dd0cd9da688493a99d;hb=fe6de8b48ff0a40e229c06932ac5fd497322f208;hp=9be048b65d8caa23c6434d1fe4ff8cfebcc66efc;hpb=33aa4abdc8702205005596618274d727ebca4424;p=dcpomatic.git

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 9be048b65..aa16fdad8 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -478,6 +478,7 @@ Film::read_metadata (optional<boost::filesystem::path> path)
 		_isdcf_date = boost::gregorian::from_undelimited_string (f.string_child ("DCIDate"));
 	}
 
+
 	{
 		optional<string> c = f.optional_string_child ("DCPContentType");
 		if (c) {
@@ -531,7 +532,6 @@ Film::read_metadata (optional<boost::filesystem::path> path)
 	_user_explicit_video_frame_rate = f.optional_bool_child("UserExplicitVideoFrameRate").get_value_or(false);
 
 	list<string> notes;
-	/* This method is the only one that can return notes (so far) */
 	_playlist->set_from_xml (shared_from_this(), f.node_child ("Playlist"), _state_version, notes);
 
 	/* Write backtraces to this film's directory, until another film is loaded */
@@ -722,36 +722,49 @@ Film::isdcf_name (bool if_created_now) const
 
 	if (!dm.audio_language.empty ()) {
 		d += "_" + dm.audio_language;
-		if (!dm.subtitle_language.empty()) {
 
-			/* I'm not clear on the precise details of the convention for CCAP labelling;
-			   for now I'm just appending -CCAP if we have any closed captions.
-			*/
+		/* I'm not clear on the precise details of the convention for CCAP labelling;
+		   for now I'm just appending -CCAP if we have any closed captions.
+		*/
 
-			bool burnt_in = true;
-			bool ccap = false;
-			BOOST_FOREACH (shared_ptr<Content> i, content()) {
-				BOOST_FOREACH (shared_ptr<TextContent> j, i->text) {
-					if (j->type() == TEXT_OPEN_SUBTITLE && j->use() && !j->burn()) {
+		optional<string> subtitle_language;
+		bool burnt_in = true;
+		bool ccap = false;
+		BOOST_FOREACH (shared_ptr<Content> i, content()) {
+			BOOST_FOREACH (shared_ptr<TextContent> j, i->text) {
+				if (j->type() == TEXT_OPEN_SUBTITLE && j->use()) {
+					subtitle_language = j->language ();
+					if (!j->burn()) {
 						burnt_in = false;
-					} else if (j->type() == TEXT_CLOSED_CAPTION) {
-						ccap = true;
 					}
+				} else if (j->type() == TEXT_CLOSED_CAPTION && j->use()) {
+					ccap = true;
 				}
 			}
+		}
 
-			string language = dm.subtitle_language;
-			if (burnt_in && language != "XX") {
-				transform (language.begin(), language.end(), language.begin(), ::tolower);
+		if (dm.subtitle_language) {
+			/* Subtitle language is overridden in ISDCF metadata, primarily to handle
+			   content with pre-burnt subtitles.
+			*/
+			d += "-" + *dm.subtitle_language;
+			if (ccap) {
+				d += "-CCAP";
+			}
+		} else if (subtitle_language) {
+			/* Language is worked out from the content */
+			if (burnt_in && *subtitle_language != "XX") {
+				transform (subtitle_language->begin(), subtitle_language->end(), subtitle_language->begin(), ::tolower);
 			} else {
-				transform (language.begin(), language.end(), language.begin(), ::toupper);
+				transform (subtitle_language->begin(), subtitle_language->end(), subtitle_language->begin(), ::toupper);
 			}
 
-			d += "-" + language;
+			d += "-" + *subtitle_language;
 			if (ccap) {
 				d += "-CCAP";
 			}
 		} else {
+			/* No subtitles */
 			d += "-XX";
 		}
 	}