Include trimming.

[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 9dd4c8ccb229c0068ac653bd7e40e64d4e1afa18..1cee12028ce4b00a652c8c65e5a64dbca77b2f33 100644 (file)
--- a/src/stereo_picture_asset_writer.h
+++ b/src/stereo_picture_asset_writer.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -15,53 +15,75 @@
 
     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/stereo_picture_asset_writer.h
+ *  @brief StereoPictureAssetWriter class
+ */
+
+
 #include "picture_asset_writer.h"
-#include "types.h"
-#include <boost/shared_ptr.hpp>
-#include <boost/utility.hpp>
+#include <memory>
 #include <stdint.h>
 #include <string>
-#include <fstream>
+
 
 namespace dcp {
 
+
 /** @class StereoPictureAssetWriter
  *  @brief A helper class for writing to StereoPictureAssets.
  *
  *  Objects of this class can only be created with StereoPictureAsset::start_write().
  *
  *  Frames can be written to the StereoPictureAsset by calling write() with a JPEG2000 image
- *  (a verbatim .j2c file).  finalize() must be called after the last frame has been written.
- *  The action of finalize() can't be done in StereoPictureAssetWriter's destructor as it may
- *  throw an exception.
+ *  (a verbatim .j2c file).  finalize() should be called after the last frame has been written,
+ *  but if it is not, it will be called by the destructor (though in that case any error
+ *  during finalization will be ignored).
  */
 class StereoPictureAssetWriter : public PictureAssetWriter
 {
 public:
+       ~StereoPictureAssetWriter();
+
        /** Write a frame for one eye.  Frames must be written left, then right, then left etc.
         *  @param data JPEG2000 data.
         *  @param size Size of data.
         */
-       FrameInfo write (uint8_t* data, int size);
-       void fake_write (int size);
-       bool finalize ();
+       FrameInfo write (uint8_t const * data, int size) override;
+       void fake_write (int size) override;
+       bool finalize () override;
 
 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;
+       dcp::Eye _next_eye = Eye::LEFT;
 };
 
+
 }