diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-04-03 00:37:21 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-04-03 00:37:21 +0000 |
| commit | cd22846b748141261db1243588fe11d1a1504ce4 (patch) | |
| tree | cc213f98e53c853cd6aa33430f8b9aaf607061c0 /src/lib | |
| parent | 53a0a3879cf00cfd91f8dc7860a143e4764d9952 (diff) | |
Make a note about ISDCFMetadata SubtitleLanguage being set (part of #1516).
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/film.cc | 9 | ||||
| -rw-r--r-- | src/lib/isdcf_metadata.cc | 2 | ||||
| -rw-r--r-- | src/lib/isdcf_metadata.h | 1 |
3 files changed, 10 insertions, 2 deletions
diff --git a/src/lib/film.cc b/src/lib/film.cc index caa95c6be..c70e82cda 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -478,6 +478,13 @@ 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"); if (c) { @@ -530,8 +537,6 @@ 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; - /* 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 */ diff --git a/src/lib/isdcf_metadata.cc b/src/lib/isdcf_metadata.cc index 5e689ee27..0d7d02cde 100644 --- a/src/lib/isdcf_metadata.cc +++ b/src/lib/isdcf_metadata.cc @@ -33,6 +33,8 @@ using dcp::raw_convert; ISDCFMetadata::ISDCFMetadata (cxml::ConstNodePtr node) : content_version (node->number_child<int> ("ContentVersion")) , audio_language (node->string_child ("AudioLanguage")) + /* Old versions contained this tag, but not these details are held in content */ + , has_subtitle_language (static_cast<bool>(node->optional_node_child("SubtitleLanguage"))) , territory (node->string_child ("Territory")) , rating (node->string_child ("Rating")) , studio (node->string_child ("Studio")) diff --git a/src/lib/isdcf_metadata.h b/src/lib/isdcf_metadata.h index 0c70fb6bc..20f840416 100644 --- a/src/lib/isdcf_metadata.h +++ b/src/lib/isdcf_metadata.h @@ -46,6 +46,7 @@ public: int content_version; std::string audio_language; + bool has_subtitle_language; std::string territory; std::string rating; std::string studio; |