No-op: remove all trailing whitespace.

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

diff --git a/src/lib/dcp_video.h b/src/lib/dcp_video.h
index e8e90260ce9955fd390be34a4135489187710a07..97be0779802b8cc7653feed28b24f68fcb2957bb 100644 (file)
--- a/src/lib/dcp_video.h
+++ b/src/lib/dcp_video.h
@@ -18,21 +18,21 @@
 
 */
 
-#include <dcp/picture_mxf_writer.h>
 #include "util.h"
+#include <dcp/picture_asset_writer.h>
+#include <libcxml/cxml.h>
 
 /** @file  src/dcp_video_frame.h
  *  @brief A single frame of video destined for a DCP.
  */
 
-class Film;
 class ServerDescription;
 class Scaler;
 class Image;
 class Log;
 class Subtitle;
 class PlayerVideo;
-class EncodedData;
+class Data;
 
 /** @class DCPVideo
  *  @brief A single frame of video destined for a DCP.
@@ -49,19 +49,21 @@ public:
        DCPVideo (boost::shared_ptr<const PlayerVideo>, int, int, int, Resolution, bool b, boost::shared_ptr<Log>);
        DCPVideo (boost::shared_ptr<const PlayerVideo>, cxml::ConstNodePtr, boost::shared_ptr<Log>);
 
-       boost::shared_ptr<EncodedData> encode_locally ();
-       boost::shared_ptr<EncodedData> encode_remotely (ServerDescription);
+       Data encode_locally (dcp::NoteHandler note);
+       Data encode_remotely (ServerDescription);
 
        int index () const {
                return _index;
        }
 
        Eyes eyes () const;
-       
+
+       bool same (boost::shared_ptr<const DCPVideo> other) const;
+
 private:
 
        void add_metadata (xmlpp::Element *) const;
-       
+
        boost::shared_ptr<const PlayerVideo> _frame;
        int _index;                      ///< frame index within the DCP's intrinsic duration
        int _frames_per_second;          ///< Frames per second that we will use for the DCP