X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fpicture_asset_writer.h;h=698d02af82d427a9573b0a57802c6bd17ca5a08c;hb=7cbb0cd253c483644d237ec6874032e72d2ed9d4;hp=bc2f65e50fb1e397e3ef10b5aa048452235f8662;hpb=566608b965e8ec0e08d9de128405d22ec7fedcd6;p=libdcp.git

diff --git a/src/picture_asset_writer.h b/src/picture_asset_writer.h
index bc2f65e5..698d02af 100644
--- a/src/picture_asset_writer.h
+++ b/src/picture_asset_writer.h
@@ -1,76 +1,104 @@
 /*
-    Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 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 <stdint.h>
-#include <string>
-#include <fstream>
-#include <boost/shared_ptr.hpp>
-#include <boost/utility.hpp>
+
+/** @file  src/picture_asset_writer.h
+ *  @brief PictureAssetWriter and FrameInfo classes.
+ */
+
+
+#ifndef LIBDCP_PICTURE_ASSET_WRITER_H
+#define LIBDCP_PICTURE_ASSET_WRITER_H
+
+
+#include "asset_writer.h"
 #include "metadata.h"
 #include "types.h"
+#include <boost/utility.hpp>
+#include <memory>
+#include <stdint.h>
+#include <string>
 
-namespace libdcp {
 
-class PictureAsset;	
+namespace dcp {
 
+
+class Data;
+class PictureAsset;
+
+
+/** @class FrameInfo
+ *  @brief Information about a single frame (either a monoscopic frame or a left *or* right eye stereoscopic frame)
+ */
 struct FrameInfo
 {
+	FrameInfo () {}
+
 	FrameInfo (uint64_t o, uint64_t s, std::string h)
 		: offset (o)
 		, size (s)
 		, hash (h)
 	{}
 
-	FrameInfo (std::istream& s);
-
-	void write (std::ostream& s);
-	
-	uint64_t offset;
-	uint64_t size;
+	uint64_t offset = 0;
+	uint64_t size = 0;
 	std::string hash;
 };
 
-class PictureAssetWriter : public boost::noncopyable
+
+/** @class PictureAssetWriter
+ *  @brief Parent class for classes which write picture assets.
+ */
+class PictureAssetWriter : public AssetWriter
 {
 public:
-	virtual ~PictureAssetWriter () {}
-	virtual FrameInfo write (uint8_t *, int) = 0;
-	virtual void finalize () = 0;
+	virtual FrameInfo write (uint8_t const *, int) = 0;
 	virtual void fake_write (int) = 0;
-	
+
+	FrameInfo write (Data const& data);
+
 protected:
 	template <class P, class Q>
-	friend void start (PictureAssetWriter *, boost::shared_ptr<P>, Q *, uint8_t *, int);
-
-	PictureAssetWriter (PictureAsset *, bool);
-
-	PictureAsset* _asset;
-	
-	/** Number of picture frames written to the asset so far.  For stereo assets
-	 *  this will be incremented for each eye (i.e. there will be twice the number
-	 *  of frames as in a mono asset).
-	 */
-	int _frames_written;
-	bool _started;
-	/** true if finalize() has been called */
-	bool _finalized;
-	bool _overwrite;
+	friend void start (PictureAssetWriter *, std::shared_ptr<P>, Q *, uint8_t const *, int);
+
+	PictureAssetWriter (PictureAsset *, boost::filesystem::path, bool);
+
+	PictureAsset* _picture_asset = nullptr;
+	bool _overwrite = false;
 };
 
+
 }
+
+
+#endif