Fix audio analysis after recent breakage.
[dcpomatic.git] / src / lib / dcp_video.h
index af4712b2b1cd2ff2e4ba262c646ce95ea5991fed..c1c48623def2595f4979f0a36bb2da2d3363c777 100644 (file)
@@ -19,7 +19,7 @@
 */
 
 #include "util.h"
-#include <dcp/picture_mxf_writer.h>
+#include <dcp/picture_asset_writer.h>
 #include <libcxml/cxml.h>
 
 /** @file  src/dcp_video_frame.h
@@ -32,7 +32,7 @@ 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,8 +49,8 @@ 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 (dcp::NoteHandler note);
-       boost::shared_ptr<EncodedData> encode_remotely (ServerDescription);
+       Data encode_locally (dcp::NoteHandler note);
+       Data encode_remotely (ServerDescription);
 
        int index () const {
                return _index;