diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-04-13 14:46:01 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-05-18 11:50:29 +0100 |
| commit | 334b94526f2c1271718a94fe97cfa843cf6ef7a1 (patch) | |
| tree | 67fa8769c7fb72ec6bff799c2a3d1b087454734a /src/lib/text_subtitle_content.cc | |
| parent | 78664f8073256de51355c9162f61a4ae4fa560d7 (diff) | |
Basics of subtitle split.
Diffstat (limited to 'src/lib/text_subtitle_content.cc')
| -rw-r--r-- | src/lib/text_subtitle_content.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/lib/text_subtitle_content.cc b/src/lib/text_subtitle_content.cc index 0de219574..88890ebdc 100644 --- a/src/lib/text_subtitle_content.cc +++ b/src/lib/text_subtitle_content.cc @@ -23,6 +23,7 @@ #include "film.h" #include "font.h" #include "raw_convert.h" +#include "subtitle_content.h" #include <libxml++/libxml++.h> #include <iostream> @@ -40,17 +41,15 @@ int const TextSubtitleContentProperty::TEXT_SUBTITLE_OUTLINE_COLOUR = 302; TextSubtitleContent::TextSubtitleContent (shared_ptr<const Film> film, boost::filesystem::path path) : Content (film, path) - , SubtitleContent (film, path) , _colour (255, 255, 255) , _outline (false) , _outline_colour (0, 0, 0) { - + subtitle.reset (new SubtitleContent (this, film, path)); } TextSubtitleContent::TextSubtitleContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, int version) : Content (film, node) - , SubtitleContent (film, node, version) , _length (node->number_child<ContentTime::Type> ("Length")) , _frame_rate (node->optional_number_child<double>("SubtitleVideoFrameRate")) , _colour ( @@ -65,7 +64,7 @@ TextSubtitleContent::TextSubtitleContent (shared_ptr<const Film> film, cxml::Con node->optional_number_child<int>("OutlineBlue").get_value_or(255) ) { - + subtitle.reset (new SubtitleContent (this, film, node, version)); } void @@ -99,7 +98,7 @@ TextSubtitleContent::as_xml (xmlpp::Node* node) const { node->add_child("Type")->add_child_text ("TextSubtitle"); Content::as_xml (node); - SubtitleContent::as_xml (node); + subtitle->as_xml (node); node->add_child("Length")->add_child_text (raw_convert<string> (_length.get ())); if (_frame_rate) { node->add_child("SubtitleVideoFrameRate")->add_child_text (raw_convert<string> (_frame_rate.get())); |