summaryrefslogtreecommitdiff
path: root/src/lib/subtitle_encoder.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2020-11-18 01:06:49 +0100
committerCarl Hetherington <cth@carlh.net>2020-11-20 22:57:59 +0100
commite519feaca11005d330e7b8403b948d4ad9cc3ae8 (patch)
tree5c43aba1dd590d1abad189ac7f39b5d4ecbb1f5e /src/lib/subtitle_encoder.cc
parent556dd9cc254bf3ef18c41fcfe5948484c91cc440 (diff)
Store subtitle language(s) in Film, and allow setup of those
languages from the Interop/SMPTE metadata dialogues.
Diffstat (limited to 'src/lib/subtitle_encoder.cc')
-rw-r--r--src/lib/subtitle_encoder.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/subtitle_encoder.cc b/src/lib/subtitle_encoder.cc
index 19241bd6e..5e76f5e73 100644
--- a/src/lib/subtitle_encoder.cc
+++ b/src/lib/subtitle_encoder.cc
@@ -130,18 +130,18 @@ SubtitleEncoder::text (PlayerText subs, TextType type, optional<DCPTextTrack> tr
if (!_assets[_reel_index].first) {
shared_ptr<dcp::SubtitleAsset> asset;
- string lang = _film->subtitle_language ();
+ vector<dcp::LanguageTag> lang = _film->subtitle_languages ();
if (_film->interop ()) {
shared_ptr<dcp::InteropSubtitleAsset> s (new dcp::InteropSubtitleAsset());
s->set_movie_title (_film->name());
- s->set_language (lang.empty() ? "Unknown" : lang);
+ s->set_language (lang.empty() ? "Unknown" : lang.front().to_string());
s->set_reel_number (raw_convert<string>(_reel_index + 1));
_assets[_reel_index].first = s;
} else {
shared_ptr<dcp::SMPTESubtitleAsset> s (new dcp::SMPTESubtitleAsset());
s->set_content_title_text (_film->name());
if (!lang.empty()) {
- s->set_language (lang);
+ s->set_language (lang.front().to_string());
} else {
s->set_language (track->language);
}