Replace dcp::Data with dcp::ArrayData

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

diff --git a/src/lib/dcp_video.h b/src/lib/dcp_video.h
index 32cd1a1699ac56382ee547c04830af88b0808777..aa11d7d3c62b4b1591efd3d0ec77d774e1f57355 100644 (file)
--- a/src/lib/dcp_video.h
+++ b/src/lib/dcp_video.h
@@ -21,7 +21,7 @@
 #include "types.h"
 #include "encode_server_description.h"
 #include <libcxml/cxml.h>
-#include <dcp/data.h>
+#include <dcp/array_data.h>
 
 /** @file  src/dcp_video_frame.h
  *  @brief A single frame of video destined for a DCP.
@@ -42,11 +42,11 @@ class PlayerVideo;
 class DCPVideo : public boost::noncopyable
 {
 public:
-       DCPVideo (boost::shared_ptr<const PlayerVideo>, int, int, int, Resolution, boost::shared_ptr<Log>);
-       DCPVideo (boost::shared_ptr<const PlayerVideo>, cxml::ConstNodePtr, boost::shared_ptr<Log>);
+       DCPVideo (boost::shared_ptr<const PlayerVideo>, int, int, int, Resolution);
+       DCPVideo (boost::shared_ptr<const PlayerVideo>, cxml::ConstNodePtr);
 
-       dcp::Data encode_locally (dcp::NoteHandler note);
-       dcp::Data encode_remotely (EncodeServerDescription, int timeout = 30);
+       dcp::ArrayData encode_locally ();
+       dcp::ArrayData encode_remotely (EncodeServerDescription, int timeout = 30);
 
        int index () const {
                return _index;
@@ -67,6 +67,4 @@ private:
        int _frames_per_second;          ///< Frames per second that we will use for the DCP
        int _j2k_bandwidth;              ///< J2K bandwidth to use
        Resolution _resolution;          ///< Resolution (2K or 4K)
-
-       boost::shared_ptr<Log> _log; ///< log
 };