Merge branch 'master' into 1.0

[libdcp.git] / src / stereo_picture_frame.h

diff --git a/src/stereo_picture_frame.h b/src/stereo_picture_frame.h
index ab99ceac8e9b7c02893c80718dd265c2cc4dc17d..1fd0545390dc0e47f3ceff9fdcf9918fc29eb560 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,10 +17,12 @@
 
 */
 
-#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 {
@@ -29,12 +31,12 @@ namespace ASDCP {
        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);