Use an enum class for Marker.

[libdcp.git] / src / picture_asset_writer.h

diff --git a/src/picture_asset_writer.h b/src/picture_asset_writer.h
index e263d479f1bb67435f59afefeae06655d4deb668..12530513bc12d90e73279ea224b2c4294f9e6730 100644 (file)
--- a/src/picture_asset_writer.h
+++ b/src/picture_asset_writer.h
@@ -1,20 +1,34 @@
 /*
     Copyright (C) 2012-2014 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.
 */
 
 /** @file  src/picture_asset_writer.h
@@ -27,11 +41,10 @@
 #include "metadata.h"
 #include "types.h"
 #include "asset_writer.h"
-#include <boost/shared_ptr.hpp>
+#include <memory>
 #include <boost/utility.hpp>
 #include <stdint.h>
 #include <string>
-#include <fstream>
 
 namespace dcp {
 
@@ -64,18 +77,16 @@ struct FrameInfo
 class PictureAssetWriter : public AssetWriter
 {
 public:
-       virtual FrameInfo write (uint8_t *, int) = 0;
+       virtual FrameInfo write (uint8_t const *, int) = 0;
        virtual void fake_write (int) = 0;
 
 protected:
        template <class P, class Q>
-       friend void start (PictureAssetWriter *, boost::shared_ptr<P>, Standard, Q *, uint8_t *, int);
+       friend void start (PictureAssetWriter *, std::shared_ptr<P>, Q *, uint8_t const *, int);
 
-       PictureAssetWriter (PictureAsset *, boost::filesystem::path, Standard standard, bool);
+       PictureAssetWriter (PictureAsset *, boost::filesystem::path, bool);
 
        PictureAsset* _picture_asset;
-       bool _started;
-       Standard _standard;
        bool _overwrite;
 };