From d54c8291f83bd9f2cf964ca0372f74734ccb0ae2 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 13 Jan 2018 01:00:08 +0000 Subject: Forcing for fade in/out. --- src/lib/subtitle_content.cc | 43 +++++++++++++++++++++++++++++++++++-------- src/lib/subtitle_content.h | 10 ++++++---- src/lib/subtitle_decoder.cc | 8 ++++++-- 3 files changed, 47 insertions(+), 14 deletions(-) (limited to 'src/lib') diff --git a/src/lib/subtitle_content.cc b/src/lib/subtitle_content.cc index 4bb414af7..dbe6dd43a 100644 --- a/src/lib/subtitle_content.cc +++ b/src/lib/subtitle_content.cc @@ -100,8 +100,6 @@ SubtitleContent::SubtitleContent (Content* parent, cxml::ConstNodePtr node, int , _x_scale (1) , _y_scale (1) , _line_spacing (node->optional_number_child("LineSpacing").get_value_or (1)) - , _fade_in (node->optional_number_child("SubtitleFadeIn").get_value_or (0)) - , _fade_out (node->optional_number_child("SubtitleFadeOut").get_value_or (0)) , _outline_width (node->optional_number_child("OutlineWidth").get_value_or (2)) { if (version >= 32) { @@ -164,6 +162,15 @@ SubtitleContent::SubtitleContent (Content* parent, cxml::ConstNodePtr node, int ); } + optional fi = node->optional_number_child("SubtitleFadeIn"); + if (fi) { + _fade_in = ContentTime (*fi); + } + optional fo = node->optional_number_child("SubtitleFadeOut"); + if (fo) { + _fade_out = ContentTime (*fo); + } + _language = node->optional_string_child ("SubtitleLanguage").get_value_or (""); list fonts = node->node_children ("Font"); @@ -289,8 +296,12 @@ SubtitleContent::as_xml (xmlpp::Node* root) const root->add_child("EffectBlue")->add_child_text (raw_convert (_effect_colour->b)); } root->add_child("LineSpacing")->add_child_text (raw_convert (_line_spacing)); - root->add_child("SubtitleFadeIn")->add_child_text (raw_convert (_fade_in.get())); - root->add_child("SubtitleFadeOut")->add_child_text (raw_convert (_fade_out.get())); + if (_fade_in) { + root->add_child("SubtitleFadeIn")->add_child_text (raw_convert (_fade_in->get())); + } + if (_fade_out) { + root->add_child("SubtitleFadeOut")->add_child_text (raw_convert (_fade_out->get())); + } root->add_child("OutlineWidth")->add_child_text (raw_convert (_outline_width)); for (list >::const_iterator i = _fonts.begin(); i != _fonts.end(); ++i) { @@ -306,8 +317,8 @@ SubtitleContent::identifier () const + "_" + raw_convert (x_offset()) + "_" + raw_convert (y_offset()) + "_" + raw_convert (line_spacing()) - + "_" + raw_convert (fade_in().get()) - + "_" + raw_convert (fade_out().get()) + + "_" + raw_convert (fade_in().get_value_or(ContentTime()).get()) + + "_" + raw_convert (fade_out().get_value_or(ContentTime()).get()) + "_" + raw_convert (outline_width()); /* XXX: I suppose really _fonts shouldn't be in here, since not all @@ -443,12 +454,24 @@ SubtitleContent::set_fade_in (ContentTime t) maybe_set (_fade_in, t, SubtitleContentProperty::FADE_IN); } +void +SubtitleContent::unset_fade_in () +{ + maybe_set (_fade_in, optional(), SubtitleContentProperty::FADE_IN); +} + void SubtitleContent::set_fade_out (ContentTime t) { maybe_set (_fade_out, t, SubtitleContentProperty::FADE_OUT); } +void +SubtitleContent::unset_fade_out () +{ + maybe_set (_fade_out, optional(), SubtitleContentProperty::FADE_OUT); +} + void SubtitleContent::set_outline_width (int w) { @@ -479,7 +502,11 @@ SubtitleContent::take_settings_from (shared_ptr c) unset_effect_colour (); } set_line_spacing (c->_line_spacing); - set_fade_in (c->_fade_in); - set_fade_out (c->_fade_out); + if (c->_fade_in) { + set_fade_in (*c->_fade_in); + } + if (c->_fade_out) { + set_fade_out (*c->_fade_out); + } set_outline_width (c->_outline_width); } diff --git a/src/lib/subtitle_content.h b/src/lib/subtitle_content.h index 47b7b5cd9..58dc51510 100644 --- a/src/lib/subtitle_content.h +++ b/src/lib/subtitle_content.h @@ -81,8 +81,10 @@ public: void unset_effect_colour (); void set_line_spacing (double s); void set_fade_in (ContentTime); + void unset_fade_in (); void set_fade_out (ContentTime); void set_outline_width (int); + void unset_fade_out (); bool use () const { boost::mutex::scoped_lock lm (_mutex); @@ -144,12 +146,12 @@ public: return _line_spacing; } - ContentTime fade_in () const { + boost::optional fade_in () const { boost::mutex::scoped_lock lm (_mutex); return _fade_in; } - ContentTime fade_out () const { + boost::optional fade_out () const { boost::mutex::scoped_lock lm (_mutex); return _fade_out; } @@ -194,8 +196,8 @@ private: boost::optional _effect_colour; /** scaling factor for line spacing; 1 is "standard", < 1 is closer together, > 1 is further apart */ double _line_spacing; - ContentTime _fade_in; - ContentTime _fade_out; + boost::optional _fade_in; + boost::optional _fade_out; int _outline_width; }; diff --git a/src/lib/subtitle_decoder.cc b/src/lib/subtitle_decoder.cc index 9351d6865..39c36415a 100644 --- a/src/lib/subtitle_decoder.cc +++ b/src/lib/subtitle_decoder.cc @@ -85,8 +85,12 @@ SubtitleDecoder::emit_text_start (ContentTime from, list s) if (content()->effect()) { i.set_effect (*content()->effect()); } - i.set_fade_up_time (dcp::Time(content()->fade_in().seconds(), 1000)); - i.set_fade_down_time (dcp::Time(content()->fade_out().seconds(), 1000)); + if (content()->fade_in()) { + i.set_fade_up_time (dcp::Time(content()->fade_in()->seconds(), 1000)); + } + if (content()->fade_out()) { + i.set_fade_down_time (dcp::Time(content()->fade_out()->seconds(), 1000)); + } } TextStart (ContentTextSubtitle (from, s)); -- cgit v1.2.3