Merge master.

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

diff --git a/src/lib/player_video.h b/src/lib/player_video.h
index 74e05d1e91b46ea654b31148f7439576d0c065e1..0f5e83b10298ff93c85f0b1dee3ee5dc388d282e 100644 (file)
--- a/src/lib/player_video.h
+++ b/src/lib/player_video.h
@@ -37,7 +37,19 @@ class EncodedData;
 class PlayerVideo
 {
 public:
-       PlayerVideo (boost::shared_ptr<const ImageProxy>, DCPTime, Crop, dcp::Size, dcp::Size, Scaler const *, Eyes, Part, ColourConversion);
+       PlayerVideo (
+               boost::shared_ptr<const ImageProxy>,
+               DCPTime,
+               Crop,
+               boost::optional<float>,
+               dcp::Size,
+               dcp::Size,
+               Scaler const *,
+               Eyes,
+               Part,
+               ColourConversion
+               );
+       
        PlayerVideo (boost::shared_ptr<cxml::Node>, boost::shared_ptr<Socket>, boost::shared_ptr<Log>);
 
        void set_subtitle (PositionImage);
@@ -70,10 +82,13 @@ public:
                return _inter_size;
        }
 
+       bool same (boost::shared_ptr<const PlayerVideo> other) const;
+
 private:
        boost::shared_ptr<const ImageProxy> _in;
        DCPTime _time;
        Crop _crop;
+       boost::optional<float> _fade;
        dcp::Size _inter_size;
        dcp::Size _out_size;
        Scaler const * _scaler;