X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmono_picture_frame.h;h=67784509a7ba7d9169e79b95fe286c2add2238d3;hb=6af628a0404e7135cb77cfa6d49a8419c883f2bf;hp=68e4edf8fc39c006dd3c6c14ce7a4f5e0442bc8e;hpb=41ab9a3ad26bb2fd17eca4d99780c46e315c393a;p=libdcp.git

diff --git a/src/mono_picture_frame.h b/src/mono_picture_frame.h
index 68e4edf8..67784509 100644
--- a/src/mono_picture_frame.h
+++ b/src/mono_picture_frame.h
@@ -1,28 +1,46 @@
 /*
     Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
 
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    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 <boost/shared_ptr.hpp>
+#include "asset_reader.h"
+#include <memory>
 #include <boost/noncopyable.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/optional.hpp>
@@ -32,6 +50,7 @@
 namespace ASDCP {
 	namespace JP2K {
 		class FrameBuffer;
+		class MXFReader;
 	}
 	class AESDecContext;
 }
@@ -43,22 +62,29 @@ class OpenJPEGImage;
 /** @class MonoPictureFrame
  *  @brief A single frame of a 2D (monoscopic) picture asset.
  */
-class MonoPictureFrame : public boost::noncopyable
+class MonoPictureFrame : public Data, public boost::noncopyable
 {
 public:
-	MonoPictureFrame (boost::filesystem::path path, int n, ASDCP::AESDecContext *);
-	MonoPictureFrame (boost::filesystem::path path);
-	MonoPictureFrame ();
-	~MonoPictureFrame ();
+	explicit MonoPictureFrame (boost::filesystem::path path);
+	MonoPictureFrame (uint8_t const * data, int size);
 
-	boost::shared_ptr<OpenJPEGImage> xyz_image (int reduce = 0) const;
+	std::shared_ptr<OpenJPEGImage> xyz_image (int reduce = 0) const;
 
-	uint8_t const * j2k_data () const;
-	uint8_t* j2k_data ();
-	int j2k_size () const;
+	uint8_t const * data () const;
+	uint8_t* data ();
+	int size () const;
 
 private:
-	ASDCP::JP2K::FrameBuffer* _buffer;
+	/* 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, std::shared_ptr<DecryptionContext>);
+
+	std::shared_ptr<ASDCP::JP2K::FrameBuffer> _buffer;
 };
 
 }
+
+#endif