Merge master.

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

diff --git a/src/lib/dcp_video_frame.h b/src/lib/dcp_video_frame.h
index e988b663a80493158b552a959d8b8ec09010fea3..6794765acefbc1f7a7f85a9cb57449fa1d3e5fe4 100644 (file)
--- a/src/lib/dcp_video_frame.h
+++ b/src/lib/dcp_video_frame.h
@@ -19,13 +19,13 @@
 */
 
 #include <openjpeg.h>
+#include <libdcp/picture_asset.h>
 #include "util.h"
 
 /** @file  src/dcp_video_frame.h
  *  @brief A single frame of video destined for a DCP.
  */
 
-class FilmState;
 class Film;
 class ServerDescription;
 class Scaler;
@@ -48,7 +48,7 @@ public:
 
        void send (boost::shared_ptr<Socket> socket);
        void write (boost::shared_ptr<const Film>, int) const;
-       void write_hash (boost::shared_ptr<const Film>, int) const;
+       void write_info (boost::shared_ptr<const Film>, int, libdcp::FrameInfo) const;
 
        /** @return data */
        uint8_t* data () const {
@@ -107,7 +107,7 @@ class DCPVideoFrame
 public:
        DCPVideoFrame (
                boost::shared_ptr<const Image>, boost::shared_ptr<Subtitle>, libdcp::Size,
-               int, int, float, Scaler const *, int, float, std::string, int, int, Log *
+               int, int, float, Scaler const *, int, int, std::string, int, int, Log *
                );
        
        virtual ~DCPVideoFrame ();
@@ -130,7 +130,7 @@ private:
        float _subtitle_scale;
        Scaler const * _scaler;          ///< scaler to use
        int _frame;                      ///< frame index within the DCP's intrinsic duration
-       int _frames_per_second;          ///< Frames per second that we will use for the DCP (rounded)
+       int _frames_per_second;          ///< Frames per second that we will use for the DCP
        std::string _post_process;       ///< FFmpeg post-processing string to use
        int _colour_lut;                 ///< Colour look-up table to use
        int _j2k_bandwidth;              ///< J2K bandwidth to use