Rename write_to_cpl_base -> write_to_cpl_asset.

[libdcp.git] / src / mono_picture_frame.h

diff --git a/src/mono_picture_frame.h b/src/mono_picture_frame.h
index ea15f6a3268efae50ef18ab9bb71071c353bfef4..1b818144394e23304e85b3a5ceecd27a89eb0d1a 100644 (file)
--- a/src/mono_picture_frame.h
+++ b/src/mono_picture_frame.h
@@ -31,11 +31,15 @@
     files in the program, then also delete it here.
 */
 
+#ifndef LIBDCP_MONO_PICTURE_FRAME_H
+#define LIBDCP_MONO_PICTURE_FRAME_H
+
 /** @file  src/mono_picture_frame.h
  *  @brief MonoPictureFrame class.
  */
 
 #include "types.h"
+#include "asset_reader.h"
 #include <boost/shared_ptr.hpp>
 #include <boost/noncopyable.hpp>
 #include <boost/filesystem.hpp>
@@ -72,11 +76,16 @@ public:
        int j2k_size () const;
 
 private:
-       friend class MonoPictureAssetReader;
+       /* XXX: this is a bit of a shame, but I tried friend MonoPictureAssetReader and it's
+          rejected by some (seemingly older) GCCs.
+       */
+       friend class AssetReader<ASDCP::JP2K::MXFReader, MonoPictureFrame>;
 
-       MonoPictureFrame (ASDCP::JP2K::MXFReader* reader, int n, ASDCP::AESDecContext *);
+       MonoPictureFrame (ASDCP::JP2K::MXFReader* reader, int n, boost::shared_ptr<DecryptionContext>);
 
        ASDCP::JP2K::FrameBuffer* _buffer;
 };
 
 }
+
+#endif