diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-12-11 16:47:48 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-12-11 16:47:48 +0000 |
| commit | 5d117c316fe68686885a931bf028cbd8afa5c0e1 (patch) | |
| tree | 90b2e60eb06137b35d9683b349ece51a765e6f3b /src/lib/subtitle_content.cc | |
| parent | fe47588e80b35c07fc25b1d9e79bc13b6e439ff0 (diff) | |
| parent | 6bd8be029c72180a41d70e590bf2cb85a77317bf (diff) | |
Merge.
Diffstat (limited to 'src/lib/subtitle_content.cc')
| -rw-r--r-- | src/lib/subtitle_content.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/lib/subtitle_content.cc b/src/lib/subtitle_content.cc index 7792f3ef6..f10fa58b2 100644 --- a/src/lib/subtitle_content.cc +++ b/src/lib/subtitle_content.cc @@ -90,7 +90,7 @@ SubtitleContent::SubtitleContent (shared_ptr<const Film> f, cxml::ConstNodePtr n _subtitle_x_scale = _subtitle_y_scale = node->number_child<float> ("SubtitleScale"); } - _subtitle_language = node->optional_string_child ("SubtitleLanguage"); + _subtitle_language = node->optional_string_child ("SubtitleLanguage").get_value_or (""); } SubtitleContent::SubtitleContent (shared_ptr<const Film> f, vector<shared_ptr<Content> > c) @@ -139,9 +139,13 @@ 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)); +<<<<<<< HEAD if (_subtitle_language) { root->add_child("SubtitleLanguage")->add_child_text (_subtitle_language.get ()); } +======= + root->add_child("SubtitleLanguage")->add_child_text (_subtitle_language); +>>>>>>> 30a2bb95980d74a33baeb18d18f2e4ac72d66845 } void |