Add colour, effect and effect colour to ::identifier() to force remake of video when...

(cherry-pick of 4a23fb5dd58c6439f240f678be2e26a5bee17881 from master).

diff --git a/ChangeLog b/ChangeLog
index 035dee09efd685bf2673d59b3a3ab4386b733c25..9afa60bdbe9abbf1daf7272885699b6a8fb50763 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 9e3ed322969b71b3e65fedec84d5f0824b510b41..cd93638398ce4777cd511388bfdb53e62c4db03b 100644 (file)
--- 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.