diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-05-08 00:49:33 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-05-14 23:23:34 +0100 |
| commit | d2b086ebd7333e80b77fb54ce04816b27dbf1cb6 (patch) | |
| tree | e6038b3a9ca61a8eb998d7f796bb381b2b183224 | |
| parent | 216d424afaf521e1bd1b95cadbe4d1eac58a6c4a (diff) | |
Add colour, effect and effect colour to ::identifier() to force remake of video when they change (#1290).
(cherry-pick of 4a23fb5dd58c6439f240f678be2e26a5bee17881 from master).
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | src/lib/subtitle_content.cc | 5 |
2 files changed, 10 insertions, 2 deletions
@@ -1,4 +1,9 @@ -2018-05-14 Carl Hetherington <cth@carlh.net> +2018-05-08 Carl Hetherington <cth@carlh.net> + + * Look at subtitle colour and effect when deciding whether or not to + re-make video (should fix #1290). + +2018-05-07 Carl Hetherington <cth@carlh.net> * Fix invalid timings in SMPTE subtitle files (causing failure to play subtitles) in some cases (#1293). diff --git a/src/lib/subtitle_content.cc b/src/lib/subtitle_content.cc index 9e3ed3229..cd9363839 100644 --- a/src/lib/subtitle_content.cc +++ b/src/lib/subtitle_content.cc @@ -319,7 +319,10 @@ SubtitleContent::identifier () const + "_" + raw_convert<string> (line_spacing()) + "_" + raw_convert<string> (fade_in().get_value_or(ContentTime()).get()) + "_" + raw_convert<string> (fade_out().get_value_or(ContentTime()).get()) - + "_" + raw_convert<string> (outline_width()); + + "_" + raw_convert<string> (outline_width()) + + "_" + raw_convert<string> (colour().get_value_or(dcp::Colour(255, 255, 255)).to_argb_string()) + + "_" + raw_convert<string> (dcp::effect_to_string(effect().get_value_or(dcp::NONE))) + + "_" + raw_convert<string> (effect_colour().get_value_or(dcp::Colour(0, 0, 0)).to_argb_string()); /* XXX: I suppose really _fonts shouldn't be in here, since not all types of subtitle content involve fonts. |