Use libdcp's compress_j2k; move Data into libdcp.

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

diff --git a/src/lib/dcp_video.h b/src/lib/dcp_video.h
index cb38cd542db16471aa2580325ff7c4b659b47e60..995ceb5479244c1079ed93f975d5c129ff48c2ba 100644 (file)
--- a/src/lib/dcp_video.h
+++ b/src/lib/dcp_video.h
@@ -19,9 +19,9 @@
 */
 
 #include "types.h"
-#include "data.h"
 #include "server_description.h"
 #include <libcxml/cxml.h>
+#include <dcp/data.h>
 
 /** @file  src/dcp_video_frame.h
  *  @brief A single frame of video destined for a DCP.
@@ -45,8 +45,8 @@ 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>);
 
-       Data encode_locally (dcp::NoteHandler note);
-       Data encode_remotely (ServerDescription);
+       dcp::Data encode_locally (dcp::NoteHandler note);
+       dcp::Data encode_remotely (ServerDescription);
 
        int index () const {
                return _index;