X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsubtitle_content.cc;h=da3b97e2ffd3942f87f452181b97fe5315de8f63;hb=1858190cff2f960f3d1f0a5cc02c69da86088f5b;hp=2bed5413c61d2b8797cae544a3a995440a5ef4c1;hpb=4dbc6ef917aeceb906b1ef1caf6911033e7e2c54;p=dcpomatic.git diff --git a/src/lib/subtitle_content.cc b/src/lib/subtitle_content.cc index 2bed5413c..da3b97e2f 100644 --- a/src/lib/subtitle_content.cc +++ b/src/lib/subtitle_content.cc @@ -17,13 +17,16 @@ */ -#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 +#include #include "i18n.h" @@ -33,19 +36,20 @@ 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; 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; +int const SubtitleContentProperty::BURN_SUBTITLES = 505; +int const SubtitleContentProperty::SUBTITLE_LANGUAGE = 506; +int const SubtitleContentProperty::FONTS = 507; -SubtitleContent::SubtitleContent (shared_ptr f) - : Content (f) +SubtitleContent::SubtitleContent (shared_ptr film) + : Content (film) , _use_subtitles (false) + , _burn_subtitles (false) , _subtitle_x_offset (0) , _subtitle_y_offset (0) , _subtitle_x_scale (1) @@ -54,9 +58,10 @@ 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) + , _burn_subtitles (false) , _subtitle_x_offset (0) , _subtitle_y_offset (0) , _subtitle_x_scale (1) @@ -65,9 +70,10 @@ 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) + , _burn_subtitles (false) , _subtitle_x_offset (0) , _subtitle_y_offset (0) , _subtitle_x_scale (1) @@ -75,10 +81,9 @@ SubtitleContent::SubtitleContent (shared_ptr f, cxml::ConstNodePtr n { if (version >= 32) { _use_subtitles = node->bool_child ("UseSubtitles"); - } else { - _use_subtitles = false; + _burn_subtitles = node->bool_child ("BurnSubtitles"); } - + if (version >= 7) { _subtitle_x_offset = node->number_child ("SubtitleXOffset"); _subtitle_y_offset = node->number_child ("SubtitleYOffset"); @@ -99,15 +104,17 @@ SubtitleContent::SubtitleContent (shared_ptr f, cxml::ConstNodePtr n 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]); 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]); @@ -115,10 +122,14 @@ SubtitleContent::SubtitleContent (shared_ptr f, vectorburn_subtitles() != ref->burn_subtitles()) { + throw JoinError (_("Content to be joined must have the same 'burn subtitles' setting.")); + } + if (sc->subtitle_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.")); } @@ -149,12 +160,15 @@ SubtitleContent::SubtitleContent (shared_ptr f, vectoruse_subtitles (); + _burn_subtitles = ref->burn_subtitles (); _subtitle_x_offset = ref->subtitle_x_offset (); _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 (); _fonts = ref_fonts; + + connect_to_fonts (); } /** _mutex must not be held on entry */ @@ -162,8 +176,9 @@ 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("BurnSubtitles")->add_child_text (raw_convert (_burn_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)); @@ -184,7 +199,17 @@ SubtitleContent::set_use_subtitles (bool u) } signal_changed (SubtitleContentProperty::USE_SUBTITLES); } - + +void +SubtitleContent::set_burn_subtitles (bool b) +{ + { + boost::mutex::scoped_lock lm (_mutex); + _burn_subtitles = b; + } + signal_changed (SubtitleContentProperty::BURN_SUBTITLES); +} + void SubtitleContent::set_subtitle_x_offset (double o) { @@ -245,9 +270,49 @@ SubtitleContent::identifier () const << "_" << raw_convert (subtitle_x_offset()) << "_" << raw_convert (subtitle_y_offset()); + /* XXX: I suppose really _fonts shouldn't be in here, since not all + types of subtitle content involve fonts. + */ + BOOST_FOREACH (shared_ptr f, _fonts) { + s << f->file().get_value_or ("Default"); + } + /* The language is for metadata only, and doesn't affect how this content looks. */ 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); +} + +bool +SubtitleContent::has_subtitles () const +{ + return has_text_subtitles() || has_image_subtitles(); +}