From: Carl Hetherington Date: Sun, 6 Jan 2019 23:18:37 +0000 (+0000) Subject: Don't write tags to SMPTE subs unless we know the language, X-Git-Tag: v2.13.95~6 X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=d59096a931025f787b88eee5169374575bb1a0f9 Don't write tags to SMPTE subs unless we know the language, as "Unknown" is an invalid value and is optional in SMPTE. --- diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc index e34874a14..d699adfba 100644 --- a/src/lib/reel_writer.cc +++ b/src/lib/reel_writer.cc @@ -566,19 +566,22 @@ ReelWriter::write (PlayerText subs, TextType type, optional track, if (!asset) { string lang = _film->subtitle_language (); - if (lang.empty ()) { - lang = "Unknown"; - } if (_film->interop ()) { shared_ptr s (new dcp::InteropSubtitleAsset ()); s->set_movie_title (_film->name ()); - s->set_language (lang); + if (lang.empty()) { + s->set_language ("Unknown"); + } else { + s->set_language (lang); + } s->set_reel_number (raw_convert (_reel_index + 1)); asset = s; } else { shared_ptr s (new dcp::SMPTESubtitleAsset ()); s->set_content_title_text (_film->name ()); - s->set_language (lang); + if (!lang.empty()) { + s->set_language (lang); + } s->set_edit_rate (dcp::Fraction (_film->video_frame_rate (), 1)); s->set_reel_number (_reel_index + 1); s->set_time_code_rate (_film->video_frame_rate ());