X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsubtitle_content.cc;h=215829659a296cc179dc9b824073a3057ad2cd48;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=7792f3ef6fafd7a8b9ed84963828e964558dbad9;hpb=fe47588e80b35c07fc25b1d9e79bc13b6e439ff0;p=dcpomatic.git diff --git a/src/lib/subtitle_content.cc b/src/lib/subtitle_content.cc index 7792f3ef6..215829659 100644 --- a/src/lib/subtitle_content.cc +++ b/src/lib/subtitle_content.cc @@ -17,21 +17,23 @@ */ -#include -#include #include "subtitle_content.h" #include "util.h" #include "exceptions.h" #include "safe_stringstream.h" +#include "font.h" +#include "raw_convert.h" +#include +#include #include "i18n.h" using std::string; using std::vector; using std::cout; +using std::list; using boost::shared_ptr; using boost::dynamic_pointer_cast; -using dcp::raw_convert; int const SubtitleContentProperty::SUBTITLE_X_OFFSET = 500; int const SubtitleContentProperty::SUBTITLE_Y_OFFSET = 501; @@ -39,9 +41,10 @@ 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; +int const SubtitleContentProperty::FONTS = 506; -SubtitleContent::SubtitleContent (shared_ptr f) - : Content (f) +SubtitleContent::SubtitleContent (shared_ptr film) + : Content (film) , _use_subtitles (false) , _subtitle_x_offset (0) , _subtitle_y_offset (0) @@ -51,8 +54,8 @@ SubtitleContent::SubtitleContent (shared_ptr f) } -SubtitleContent::SubtitleContent (shared_ptr f, boost::filesystem::path p) - : Content (f, p) +SubtitleContent::SubtitleContent (shared_ptr film, boost::filesystem::path p) + : Content (film, p) , _use_subtitles (false) , _subtitle_x_offset (0) , _subtitle_y_offset (0) @@ -62,8 +65,8 @@ SubtitleContent::SubtitleContent (shared_ptr f, boost::filesystem::p } -SubtitleContent::SubtitleContent (shared_ptr f, cxml::ConstNodePtr node, int version) - : Content (f, node) +SubtitleContent::SubtitleContent (shared_ptr film, cxml::ConstNodePtr node, int version) + : Content (film, node) , _use_subtitles (false) , _subtitle_x_offset (0) , _subtitle_y_offset (0) @@ -75,7 +78,7 @@ SubtitleContent::SubtitleContent (shared_ptr f, cxml::ConstNodePtr n } else { _use_subtitles = false; } - + if (version >= 7) { _subtitle_x_offset = node->number_child ("SubtitleXOffset"); _subtitle_y_offset = node->number_child ("SubtitleYOffset"); @@ -90,15 +93,23 @@ SubtitleContent::SubtitleContent (shared_ptr f, cxml::ConstNodePtr n _subtitle_x_scale = _subtitle_y_scale = node->number_child ("SubtitleScale"); } - _subtitle_language = node->optional_string_child ("SubtitleLanguage"); + _subtitle_language = node->optional_string_child ("SubtitleLanguage").get_value_or (""); + + list fonts = node->node_children ("Font"); + for (list::const_iterator i = fonts.begin(); i != fonts.end(); ++i) { + _fonts.push_back (shared_ptr (new Font (*i))); + } + + connect_to_fonts (); } -SubtitleContent::SubtitleContent (shared_ptr f, vector > c) - : Content (f, c) +SubtitleContent::SubtitleContent (shared_ptr film, vector > c) + : Content (film, c) { shared_ptr ref = dynamic_pointer_cast (c[0]); - assert (ref); - + DCPOMATIC_ASSERT (ref); + list > ref_fonts = ref->fonts (); + for (size_t i = 0; i < c.size(); ++i) { shared_ptr sc = dynamic_pointer_cast (c[i]); @@ -109,7 +120,7 @@ SubtitleContent::SubtitleContent (shared_ptr f, vectorsubtitle_x_offset() != ref->subtitle_x_offset()) { throw JoinError (_("Content to be joined must have the same subtitle X offset.")); } - + if (sc->subtitle_y_offset() != ref->subtitle_y_offset()) { throw JoinError (_("Content to be joined must have the same subtitle Y offset.")); } @@ -121,6 +132,22 @@ SubtitleContent::SubtitleContent (shared_ptr f, vectorsubtitle_y_scale() != ref->subtitle_y_scale()) { throw JoinError (_("Content to be joined must have the same subtitle Y scale.")); } + + list > fonts = sc->fonts (); + if (fonts.size() != ref_fonts.size()) { + throw JoinError (_("Content to be joined must use the same fonts.")); + } + + list >::const_iterator j = ref_fonts.begin (); + list >::const_iterator k = fonts.begin (); + + while (j != ref_fonts.end ()) { + if (**j != **k) { + throw JoinError (_("Content to be joined must use the same fonts.")); + } + ++j; + ++k; + } } _use_subtitles = ref->use_subtitles (); @@ -129,18 +156,26 @@ SubtitleContent::SubtitleContent (shared_ptr f, vectorsubtitle_x_scale (); _subtitle_y_scale = ref->subtitle_y_scale (); _subtitle_language = ref->subtitle_language (); + _fonts = ref_fonts; + + connect_to_fonts (); } +/** _mutex must not be held on entry */ void SubtitleContent::as_xml (xmlpp::Node* root) const { + boost::mutex::scoped_lock lm (_mutex); + root->add_child("UseSubtitles")->add_child_text (raw_convert (_use_subtitles)); root->add_child("SubtitleXOffset")->add_child_text (raw_convert (_subtitle_x_offset)); root->add_child("SubtitleYOffset")->add_child_text (raw_convert (_subtitle_y_offset)); root->add_child("SubtitleXScale")->add_child_text (raw_convert (_subtitle_x_scale)); root->add_child("SubtitleYScale")->add_child_text (raw_convert (_subtitle_y_scale)); - if (_subtitle_language) { - root->add_child("SubtitleLanguage")->add_child_text (_subtitle_language.get ()); + root->add_child("SubtitleLanguage")->add_child_text (_subtitle_language); + + for (list >::const_iterator i = _fonts.begin(); i != _fonts.end(); ++i) { + (*i)->as_xml (root->add_child("Font")); } } @@ -153,7 +188,7 @@ SubtitleContent::set_use_subtitles (bool u) } signal_changed (SubtitleContentProperty::USE_SUBTITLES); } - + void SubtitleContent::set_subtitle_x_offset (double o) { @@ -220,3 +255,31 @@ SubtitleContent::identifier () const return s.str (); } + +void +SubtitleContent::add_font (shared_ptr font) +{ + _fonts.push_back (font); + connect_to_fonts (); +} + +void +SubtitleContent::connect_to_fonts () +{ + BOOST_FOREACH (boost::signals2::connection& i, _font_connections) { + i.disconnect (); + } + + _font_connections.clear (); + + BOOST_FOREACH (shared_ptr i, _fonts) { + _font_connections.push_back (i->Changed.connect (boost::bind (&SubtitleContent::font_changed, this))); + } +} + +void +SubtitleContent::font_changed () +{ + signal_changed (SubtitleContentProperty::FONTS); +} +