diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-11-21 02:31:12 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-11-21 22:12:37 +0100 |
| commit | 3ea24566e4591c0160379a6bee97c5e62b60a028 (patch) | |
| tree | 6ff9e59d6da1951e998851466634d259d91d996e /src | |
| parent | 7ff118767009697b51718e027546a65489c9adbc (diff) | |
Subtitle language test updates.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/reel_writer.cc | 6 | ||||
| -rw-r--r-- | src/lib/subtitle_encoder.cc | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc index 16b34d785..3c516f54c 100644 --- a/src/lib/reel_writer.cc +++ b/src/lib/reel_writer.cc @@ -608,7 +608,9 @@ ReelWriter::create_reel (list<ReferencedReelAsset> const & refs, list<shared_ptr ); if (a) { a->set_annotation_text (i->first.name); - a->set_language (dcp::LanguageTag(i->first.language)); + if (!i->first.language.empty()) { + a->set_language (dcp::LanguageTag(i->first.language)); + } } } @@ -697,7 +699,7 @@ ReelWriter::write (PlayerText subs, TextType type, optional<DCPTextTrack> track, s->set_movie_title (_film->name ()); if (type == TEXT_OPEN_SUBTITLE) { s->set_language (lang.empty() ? "Unknown" : lang.front().to_string()); - } else { + } else if (!track->language.empty()) { s->set_language (track->language); } s->set_reel_number (raw_convert<string> (_reel_index + 1)); diff --git a/src/lib/subtitle_encoder.cc b/src/lib/subtitle_encoder.cc index 61c4dc3ae..1ef7fcd94 100644 --- a/src/lib/subtitle_encoder.cc +++ b/src/lib/subtitle_encoder.cc @@ -134,7 +134,9 @@ SubtitleEncoder::text (PlayerText subs, TextType type, optional<DCPTextTrack> tr if (_film->interop ()) { shared_ptr<dcp::InteropSubtitleAsset> s (new dcp::InteropSubtitleAsset()); s->set_movie_title (_film->name()); - s->set_language (lang.empty() ? "Unknown" : lang.front().to_string()); + if (!lang.empty()) { + s->set_language (lang.front().to_string()); + } s->set_reel_number (raw_convert<string>(_reel_index + 1)); _assets[_reel_index].first = s; } else { @@ -142,7 +144,7 @@ SubtitleEncoder::text (PlayerText subs, TextType type, optional<DCPTextTrack> tr s->set_content_title_text (_film->name()); if (!lang.empty()) { s->set_language (lang.front()); - } else { + } else if (!track->language.empty()) { s->set_language (dcp::LanguageTag(track->language)); } s->set_edit_rate (dcp::Fraction (_film->video_frame_rate(), 1)); |