Add colour, effect and effect colour to ::identifier() to force remake of video when...
authorCarl Hetherington <cth@carlh.net>
Mon, 7 May 2018 23:49:33 +0000 (00:49 +0100)
committerCarl Hetherington <cth@carlh.net>
Mon, 7 May 2018 23:49:33 +0000 (00:49 +0100)
ChangeLog
src/lib/subtitle_content.cc

index bbbee5f..e397d79 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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>
 
        * Updated cs_CZ translation from Tomáš Begeni.
index 9e3ed32..cd93638 100644 (file)
@@ -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.