X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fstereo_picture_frame.h;h=a173b1c14cc7e36c50657b2900358c6f7318c48c;hb=e54d5448174c3f61ed828ce7146a497948290a8d;hp=42d88b3f5c979bf6f41cf17a3f3430d8f45cd30b;hpb=eb772d227c378e17c99b5d609b81d0cc4b664d2c;p=libdcp.git

diff --git a/src/stereo_picture_frame.h b/src/stereo_picture_frame.h
index 42d88b3f..a173b1c1 100644
--- a/src/stereo_picture_frame.h
+++ b/src/stereo_picture_frame.h
@@ -31,8 +31,11 @@
     files in the program, then also delete it here.
 */
 
+#ifndef LIBDCP_STEREO_PICTURE_FRAME_H
+#define LIBDCP_STEREO_PICTURE_FRAME_H
+
 #include "types.h"
-#include "stereo_picture_asset_reader.h"
+#include "asset_reader.h"
 #include <boost/shared_ptr.hpp>
 #include <boost/noncopyable.hpp>
 #include <boost/filesystem.hpp>
@@ -50,7 +53,6 @@ namespace ASDCP {
 namespace dcp {
 
 class OpenJPEGImage;
-class DecryptionContext;
 
 /** A single frame of a 3D (stereoscopic) picture asset */
 class StereoPictureFrame : public boost::noncopyable
@@ -70,7 +72,10 @@ public:
 	int right_j2k_size () const;
 
 private:
-	friend StereoPictureAssetReader;
+	/* XXX: this is a bit of a shame, but I tried friend StereoPictureAssetReader and it's
+	   rejected by some (seemingly older) GCCs.
+	*/
+	friend class AssetReader<ASDCP::JP2K::MXFSReader, StereoPictureFrame>;
 
 	StereoPictureFrame (ASDCP::JP2K::MXFSReader* reader, int n, boost::shared_ptr<DecryptionContext>);
 
@@ -78,3 +83,5 @@ private:
 };
 
 }
+
+#endif