Fix duplicate name of _mutex in ExceptionStore and some of its children.

[dcpomatic.git] / src / lib / player_video.cc

diff --git a/src/lib/player_video.cc b/src/lib/player_video.cc
index 765896a0eb532d9c314143b6ce6929408bf82b85..ad6219d4f12f4f496ae0c7ee2589445fad68ca31 100644 (file)
--- a/src/lib/player_video.cc
+++ b/src/lib/player_video.cc
@@ -23,6 +23,7 @@
 #include "j2k_image_proxy.h"
 #include "film.h"
 #include "raw_convert.h"
+#include <libxml++/libxml++.h>
 
 using std::string;
 using std::cout;
@@ -34,7 +35,7 @@ PlayerVideo::PlayerVideo (
        shared_ptr<const ImageProxy> in,
        DCPTime time,
        Crop crop,
-       boost::optional<float> fade,
+       boost::optional<double> fade,
        dcp::Size inter_size,
        dcp::Size out_size,
        Eyes eyes,
@@ -58,7 +59,7 @@ PlayerVideo::PlayerVideo (shared_ptr<cxml::Node> node, shared_ptr<Socket> socket
 {
        _time = DCPTime (node->number_child<DCPTime::Type> ("Time"));
        _crop = Crop (node);
-       _fade = node->optional_number_child<float> ("Fade");
+       _fade = node->optional_number_child<double> ("Fade");
 
        _inter_size = dcp::Size (node->number_child<int> ("InterWidth"), node->number_child<int> ("InterHeight"));
        _out_size = dcp::Size (node->number_child<int> ("OutWidth"), node->number_child<int> ("OutHeight"));
@@ -167,14 +168,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 && !_colour_conversion;
 }
 
 Data