diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-12-11 15:20:33 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-12-11 16:05:58 +0000 |
| commit | 6bd8be029c72180a41d70e590bf2cb85a77317bf (patch) | |
| tree | f31286d8a6f4aa990fce2af549e5eb3cb7909b34 /src/lib/subtitle_content.cc | |
| parent | 5c93e50af883f02eadcf9a7bfe9cbfabbb3be844 (diff) | |
Add language property to SubtitleContent and use it in output DCP subtitle files.
Diffstat (limited to 'src/lib/subtitle_content.cc')
| -rw-r--r-- | src/lib/subtitle_content.cc | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/src/lib/subtitle_content.cc b/src/lib/subtitle_content.cc index 5b370847b..df90a4a1a 100644 --- a/src/lib/subtitle_content.cc +++ b/src/lib/subtitle_content.cc @@ -38,6 +38,7 @@ int const SubtitleContentProperty::SUBTITLE_Y_OFFSET = 501; int const SubtitleContentProperty::SUBTITLE_X_SCALE = 502; int const SubtitleContentProperty::SUBTITLE_Y_SCALE = 503; int const SubtitleContentProperty::USE_SUBTITLES = 504; +int const SubtitleContentProperty::SUBTITLE_LANGUAGE = 505; SubtitleContent::SubtitleContent (shared_ptr<const Film> f) : Content (f) @@ -88,6 +89,8 @@ SubtitleContent::SubtitleContent (shared_ptr<const Film> f, cxml::ConstNodePtr n } else { _subtitle_x_scale = _subtitle_y_scale = node->number_child<float> ("SubtitleScale"); } + + _subtitle_language = node->optional_string_child ("SubtitleLanguage").get_value_or (""); } SubtitleContent::SubtitleContent (shared_ptr<const Film> f, vector<shared_ptr<Content> > c) @@ -125,6 +128,7 @@ SubtitleContent::SubtitleContent (shared_ptr<const Film> f, vector<shared_ptr<Co _subtitle_y_offset = ref->subtitle_y_offset (); _subtitle_x_scale = ref->subtitle_x_scale (); _subtitle_y_scale = ref->subtitle_y_scale (); + _subtitle_language = ref->subtitle_language (); } void @@ -135,6 +139,7 @@ SubtitleContent::as_xml (xmlpp::Node* root) const root->add_child("SubtitleYOffset")->add_child_text (raw_convert<string> (_subtitle_y_offset)); root->add_child("SubtitleXScale")->add_child_text (raw_convert<string> (_subtitle_x_scale)); root->add_child("SubtitleYScale")->add_child_text (raw_convert<string> (_subtitle_y_scale)); + root->add_child("SubtitleLanguage")->add_child_text (_subtitle_language); } void @@ -187,6 +192,16 @@ SubtitleContent::set_subtitle_y_scale (double s) signal_changed (SubtitleContentProperty::SUBTITLE_Y_SCALE); } +void +SubtitleContent::set_subtitle_language (string language) +{ + { + boost::mutex::scoped_lock lm (_mutex); + _subtitle_language = language; + } + signal_changed (SubtitleContentProperty::SUBTITLE_LANGUAGE); +} + string SubtitleContent::identifier () const { @@ -197,5 +212,9 @@ SubtitleContent::identifier () const << "_" << raw_convert<string> (subtitle_x_offset()) << "_" << raw_convert<string> (subtitle_y_offset()); + /* The language is for metadata only, and doesn't affect + how this content looks. + */ + return s.str (); } |