Use an enum class for Marker.

[libdcp.git] / src / stereo_picture_frame.h

diff --git a/src/stereo_picture_frame.h b/src/stereo_picture_frame.h
index e31bc01bf257a5a29614aec3960d9d06bf02bb5d..13c02232ebaf52fcc4434954e61da9667f84ac2f 100644 (file)
--- a/src/stereo_picture_frame.h
+++ b/src/stereo_picture_frame.h
@@ -15,10 +15,28 @@
 
     You should have received a copy of the GNU General Public License
     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_STEREO_PICTURE_FRAME_H
+#define LIBDCP_STEREO_PICTURE_FRAME_H
+
 #include "types.h"
-#include <boost/shared_ptr.hpp>
+#include "asset_reader.h"
+#include <memory>
 #include <boost/noncopyable.hpp>
 #include <boost/filesystem.hpp>
 #include <stdint.h>
@@ -34,31 +52,50 @@ namespace ASDCP {
 
 namespace dcp {
 
+
 class OpenJPEGImage;
+class StereoPictureFrame;
+
 
 /** A single frame of a 3D (stereoscopic) picture asset */
 class StereoPictureFrame : public boost::noncopyable
 {
 public:
        StereoPictureFrame ();
-       ~StereoPictureFrame ();
 
-       boost::shared_ptr<OpenJPEGImage> xyz_image (Eye eye, int reduce = 0) const;
+       std::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;
+       class Part : public Data
+       {
+       public:
+               uint8_t const * data () const;
+               uint8_t * data ();
+               int size () const;
 
-       uint8_t const * right_j2k_data () const;
-       uint8_t* right_j2k_data ();
-       int right_j2k_size () const;
+       private:
+               friend class StereoPictureFrame;
+
+               Part (std::shared_ptr<ASDCP::JP2K::SFrameBuffer> buffer, Eye eye);
+               ASDCP::JP2K::FrameBuffer& mono () const;
+
+               std::shared_ptr<ASDCP::JP2K::SFrameBuffer> _buffer;
+               Eye _eye;
+       };
+
+       std::shared_ptr<Part> left () const;
+       std::shared_ptr<Part> right () const;
 
 private:
-       friend class 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, ASDCP::AESDecContext *);
+       StereoPictureFrame (ASDCP::JP2K::MXFSReader* reader, int n, std::shared_ptr<DecryptionContext>);
 
-       ASDCP::JP2K::SFrameBuffer* _buffer;
+       std::shared_ptr<ASDCP::JP2K::SFrameBuffer> _buffer;
 };
 
 }
+
+#endif