Incorporate Film::_with_subtitles in the Film::video_identifier

Reported-by: Matthias Damm

diff --git a/ChangeLog b/ChangeLog
index 26bd287dc7bc60f86cfa3ec46e3e7c999d675062..55f1dea8b94c688ca2944a7d3ea52c527f32f1bc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-12  Carl Hetherington  <cth@carlh.net>
+
+       * Fix bug where DCP-o-matic does not recreate video after
+       subtitles are turned on or off.
+
 2014-06-10  Carl Hetherington  <cth@carlh.net>
 
        * Support ISDCF naming convention version 9 (#257).

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 5b709ab1c70a43891f4f5e7bfb00c76321a050db..609003bbae7f2f632c1d190da567b70ce6133e18 100644 (file)
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -184,6 +184,10 @@ Film::video_identifier () const
                s << "_3D";
        }
 
+       if (_with_subtitles) {
+               s << "_WS";
+       }
+
        return s.str ();
 }