From d2b086ebd7333e80b77fb54ce04816b27dbf1cb6 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 8 May 2018 00:49:33 +0100 Subject: [PATCH] Add colour, effect and effect colour to ::identifier() to force remake of video when they change (#1290). (cherry-pick of 4a23fb5dd58c6439f240f678be2e26a5bee17881 from master). --- ChangeLog | 7 ++++++- src/lib/subtitle_content.cc | 5 ++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 035dee09e..9afa60bdb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,9 @@ -2018-05-14 Carl Hetherington +2018-05-08 Carl Hetherington + + * Look at subtitle colour and effect when deciding whether or not to + re-make video (should fix #1290). + +2018-05-07 Carl Hetherington * 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 (line_spacing()) + "_" + raw_convert (fade_in().get_value_or(ContentTime()).get()) + "_" + raw_convert (fade_out().get_value_or(ContentTime()).get()) - + "_" + raw_convert (outline_width()); + + "_" + raw_convert (outline_width()) + + "_" + raw_convert (colour().get_value_or(dcp::Colour(255, 255, 255)).to_argb_string()) + + "_" + raw_convert (dcp::effect_to_string(effect().get_value_or(dcp::NONE))) + + "_" + raw_convert (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. -- 2.30.2