X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fstereo_picture_frame.h;h=5be764fe6ccc0b9f6d7f2f5e1a97f6f30468d297;hb=d97e1600057d796c4163cecf28f9f04a6ea6402b;hp=40c2a44140d2e2a1a1e2aa25ee7c63f46276df43;hpb=41fc6e366ad3de85704c35961beaf539ab9ceb8b;p=libdcp.git

diff --git a/src/stereo_picture_frame.h b/src/stereo_picture_frame.h
index 40c2a441..5be764fe 100644
--- a/src/stereo_picture_frame.h
+++ b/src/stereo_picture_frame.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,33 +17,39 @@
 
 */
 
-#include <string>
-#include <stdint.h>
-#include <boost/shared_ptr.hpp>
 #include "types.h"
+#include <boost/shared_ptr.hpp>
+#include <boost/noncopyable.hpp>
+#include <boost/filesystem.hpp>
+#include <stdint.h>
+#include <string>
 
 namespace ASDCP {
 	namespace JP2K {
-		class SFrameBuffer;
+		struct SFrameBuffer;
 	}
-	class AESDecContext;
 }
 
 namespace dcp {
 
-class ARGBFrame;
+class OpenJPEGImage;
 
-/** A single frame of a 3D (stereoscopic) picture asset */	
-class StereoPictureFrame
+/** A single frame of a 3D (stereoscopic) picture asset */
+class StereoPictureFrame : public boost::noncopyable
 {
 public:
-	StereoPictureFrame (boost::filesystem::path mxf_path, int n);
+	StereoPictureFrame (boost::filesystem::path path, int n);
+	StereoPictureFrame ();
 	~StereoPictureFrame ();
 
-	boost::shared_ptr<ARGBFrame> argb_frame (Eye eye, int reduce = 0, float srgb_gamma = 2.4) const;
+	boost::shared_ptr<OpenJPEGImage> xyz_image (Eye eye, int reduce = 0) const;
+
 	uint8_t const * left_j2k_data () const;
+	uint8_t* left_j2k_data ();
 	int left_j2k_size () const;
+
 	uint8_t const * right_j2k_data () const;
+	uint8_t* right_j2k_data ();
 	int right_j2k_size () const;
 
 private: