Fix PlayerVideo::has_j2k to cope with subtitles and fades.

diff --git a/ChangeLog b/ChangeLog
index 11231523469e215011e8252c4d218f656054cde9..bd586f198b5e87c8d7f84bbf72c34312fd25260f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2015-07-02  c.hetherington  <cth@carlh.net>
 
+       * Fix failure to burn subs over existing DCP sources.
+
        * Remove output gamma configuration option.
 
 2015-07-02  Carl Hetherington  <cth@carlh.net>

diff --git a/src/lib/player_video.cc b/src/lib/player_video.cc
index 765896a0eb532d9c314143b6ce6929408bf82b85..2b1e85fc95cb2fd33af6b96b7875b496daa17137 100644 (file)
--- a/src/lib/player_video.cc
+++ b/src/lib/player_video.cc
@@ -167,14 +167,14 @@ PlayerVideo::send_binary (shared_ptr<Socket> socket) const
 bool
 PlayerVideo::has_j2k () const
 {
-       /* XXX: burnt-in subtitle; maybe other things */
+       /* XXX: maybe other things */
 
        shared_ptr<const J2KImageProxy> j2k = dynamic_pointer_cast<const J2KImageProxy> (_in);
        if (!j2k) {
                return false;
        }
 
-       return _crop == Crop () && _inter_size == j2k->size();
+       return _crop == Crop () && _inter_size == j2k->size() && !_subtitle && !_fade;
 }
 
 Data