X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fmono_picture_frame.h;h=68e4edf8fc39c006dd3c6c14ce7a4f5e0442bc8e;hb=273fd9a4f1b43ae0de0071e5efd3b6347b166ff1;hp=83b80c5cb5c246fc95c090ea10ffa6659282f840;hpb=566608b965e8ec0e08d9de128405d22ec7fedcd6;p=libdcp.git

diff --git a/src/mono_picture_frame.h b/src/mono_picture_frame.h
index 83b80c5c..68e4edf8 100644
--- a/src/mono_picture_frame.h
+++ b/src/mono_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,10 +17,17 @@
 
 */
 
+/** @file  src/mono_picture_frame.h
+ *  @brief MonoPictureFrame class.
+ */
+
+#include "types.h"
+#include <boost/shared_ptr.hpp>
+#include <boost/noncopyable.hpp>
+#include <boost/filesystem.hpp>
+#include <boost/optional.hpp>
 #include <string>
 #include <stdint.h>
-#include <boost/shared_ptr.hpp>
-#include "types.h"
 
 namespace ASDCP {
 	namespace JP2K {
@@ -29,19 +36,25 @@ namespace ASDCP {
 	class AESDecContext;
 }
 
-namespace libdcp {
+namespace dcp {
 
-class ARGBFrame;
+class OpenJPEGImage;
 
-/** A single frame of a 2D (monoscopic) picture asset */	
-class MonoPictureFrame
+/** @class MonoPictureFrame
+ *  @brief A single frame of a 2D (monoscopic) picture asset.
+ */
+class MonoPictureFrame : public boost::noncopyable
 {
 public:
-	MonoPictureFrame (std::string mxf_path, int n, ASDCP::AESDecContext *);
+	MonoPictureFrame (boost::filesystem::path path, int n, ASDCP::AESDecContext *);
+	MonoPictureFrame (boost::filesystem::path path);
+	MonoPictureFrame ();
 	~MonoPictureFrame ();
 
-	boost::shared_ptr<ARGBFrame> argb_frame (int reduce = 0, float srgb_gamma = 2.4) const;
+	boost::shared_ptr<OpenJPEGImage> xyz_image (int reduce = 0) const;
+
 	uint8_t const * j2k_data () const;
+	uint8_t* j2k_data ();
 	int j2k_size () const;
 
 private: