std::shared_ptr

[libdcp.git] / src / mono_picture_asset_writer.h

diff --git a/src/mono_picture_asset_writer.h b/src/mono_picture_asset_writer.h
index 041cc0600358c46ce2fcd697df1920f537e36518..2dce922ef460b40b0e603564c5e1ade98a4973e0 100644 (file)
--- a/src/mono_picture_asset_writer.h
+++ b/src/mono_picture_asset_writer.h
@@ -15,6 +15,20 @@
 
     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.
 */
 
 /** @file  src/mono_picture_asset_writer.h
@@ -25,11 +39,10 @@
 #define LIBDCP_MONO_PICTURE_ASSET_WRITER_H
 
 #include "picture_asset_writer.h"
-#include <boost/shared_ptr.hpp>
+#include <memory>
 #include <boost/utility.hpp>
 #include <stdint.h>
 #include <string>
-#include <fstream>
 
 namespace dcp {
 
@@ -46,22 +59,22 @@ namespace dcp {
 class MonoPictureAssetWriter : public PictureAssetWriter
 {
 public:
-       FrameInfo write (uint8_t *, int);
+       FrameInfo write (uint8_t const *, int);
        void fake_write (int size);
        bool finalize ();
 
 private:
        friend class MonoPictureAsset;
 
-       MonoPictureAssetWriter (PictureAsset *, boost::filesystem::path file, Standard standard, bool);
-       void start (uint8_t *, int);
+       MonoPictureAssetWriter (PictureAsset *, boost::filesystem::path file, bool);
+       void start (uint8_t const *, int);
 
        /* do this with an opaque pointer so we don't have to include
           ASDCP headers
        */
 
        struct ASDCPState;
-       boost::shared_ptr<ASDCPState> _state;
+       std::shared_ptr<ASDCPState> _state;
 };
 
 }