Tweaks to test setup; don't always compute coverage.

[libdcp.git] / src / stereo_picture_frame.h

diff --git a/src/stereo_picture_frame.h b/src/stereo_picture_frame.h
index ab99ceac8e9b7c02893c80718dd265c2cc4dc17d..e8ef689d26e1e041fa70ec7542a0682ff3d3fcf9 100644 (file)
--- 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 libdcp {
+namespace dcp {
 
 class ARGBFrame;
 
 /** A single frame of a 3D (stereoscopic) picture asset */     
-class StereoPictureFrame
+class StereoPictureFrame : public boost::noncopyable
 {
 public:
        StereoPictureFrame (boost::filesystem::path mxf_path, int n);
+       StereoPictureFrame ();
        ~StereoPictureFrame ();
 
        boost::shared_ptr<ARGBFrame> argb_frame (Eye eye, int reduce = 0, float srgb_gamma = 2.4) const;
+       void rgb_frame (Eye eye, uint16_t* buffer) 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: