diff options
Diffstat (limited to 'src/lib/film.cc')
| -rw-r--r-- | src/lib/film.cc | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/src/lib/film.cc b/src/lib/film.cc index c70e82cda..aa16fdad8 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -478,12 +478,6 @@ Film::read_metadata (optional<boost::filesystem::path> path) _isdcf_date = boost::gregorian::from_undelimited_string (f.string_child ("DCIDate")); } - list<string> notes; - - if (_isdcf_metadata.has_subtitle_language) { - notes.push_back(_("This film had a subtitle language, configured within the ISDCF metadata dialogue, which will be ignored by this version of DCP-o-matic. " - "Please set the language for each piece of subtitle or closed-caption content in the film.")); - } { optional<string> c = f.optional_string_child ("DCPContentType"); @@ -537,6 +531,7 @@ Film::read_metadata (optional<boost::filesystem::path> path) _reencode_j2k = f.optional_bool_child("ReencodeJ2K").get_value_or(false); _user_explicit_video_frame_rate = f.optional_bool_child("UserExplicitVideoFrameRate").get_value_or(false); + list<string> notes; _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 */ @@ -748,7 +743,16 @@ Film::isdcf_name (bool if_created_now) const } } - if (subtitle_language) { + 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 { @@ -760,6 +764,7 @@ Film::isdcf_name (bool if_created_now) const d += "-CCAP"; } } else { + /* No subtitles */ d += "-XX"; } } |