Merge remote-tracking branch 'origin/master' into 2.0

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

diff --git a/src/lib/player_video.h b/src/lib/player_video.h
index 73557bbfda96ac8fbad9b1d27bdfd3605605ddc7..74e05d1e91b46ea654b31148f7439576d0c065e1 100644 (file)
--- a/src/lib/player_video.h
+++ b/src/lib/player_video.h
@@ -28,6 +28,7 @@ class ImageProxy;
 class Scaler;
 class Socket;
 class Log;
+class EncodedData;
 
 /** Everything needed to describe a video frame coming out of the player, but with the
  *  bits still their raw form.  We may want to combine the bits on a remote machine,
@@ -36,15 +37,22 @@ class Log;
 class PlayerVideo
 {
 public:
-       PlayerVideo (boost::shared_ptr<const ImageProxy>, Crop, dcp::Size, dcp::Size, Scaler const *, Eyes, Part, ColourConversion);
+       PlayerVideo (boost::shared_ptr<const ImageProxy>, DCPTime, Crop, 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);
        
-       boost::shared_ptr<Image> image () const;
+       boost::shared_ptr<Image> image (bool burn_subtitle) const;
 
-       void add_metadata (xmlpp::Node* node) const;
-       void send_binary (boost::shared_ptr<Socket> socket) const;
+       void add_metadata (xmlpp::Node* node, bool send_subtitles) const;
+       void send_binary (boost::shared_ptr<Socket> socket, bool send_subtitles) const;
+
+       bool has_j2k () const;
+       boost::shared_ptr<EncodedData> j2k () const;
+
+       DCPTime time () const {
+               return _time;
+       }
 
        Eyes eyes () const {
                return _eyes;
@@ -54,8 +62,17 @@ public:
                return _colour_conversion;
        }
 
+       /** @return Position of the content within the overall image once it has been scaled up */
+       Position<int> inter_position () const;
+
+       /** @return Size of the content within the overall image once it has been scaled up */
+       dcp::Size inter_size () const {
+               return _inter_size;
+       }
+
 private:
        boost::shared_ptr<const ImageProxy> _in;
+       DCPTime _time;
        Crop _crop;
        dcp::Size _inter_size;
        dcp::Size _out_size;