Use an enum class for Marker.

[libdcp.git] / src / stereo_picture_asset_writer.h

diff --git a/src/stereo_picture_asset_writer.h b/src/stereo_picture_asset_writer.h
index b68b2ce9789d3713829b3e07c1a73d503f819e36..d4dfa0f6fb6b270b60c7c1f743a17beff73db0ac 100644 (file)
--- a/src/stereo_picture_asset_writer.h
+++ b/src/stereo_picture_asset_writer.h
@@ -1,25 +1,39 @@
 /*
     Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    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.
 */
 
 #include "picture_asset_writer.h"
 #include "types.h"
-#include <boost/shared_ptr.hpp>
+#include <memory>
 #include <boost/utility.hpp>
 #include <stdint.h>
 #include <string>
@@ -44,22 +58,22 @@ public:
         *  @param data JPEG2000 data.
         *  @param size Size of data.
         */
-       FrameInfo write (uint8_t* data, int size);
+       FrameInfo write (uint8_t const * data, int size);
        void fake_write (int size);
        bool finalize ();
 
 private:
        friend class StereoPictureAsset;
 
-       StereoPictureAssetWriter (PictureAsset *, boost::filesystem::path file, Standard, bool);
-       void start (uint8_t *, int);
+       StereoPictureAssetWriter (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;
 
        dcp::Eye _next_eye;
 };