X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fasset_writer.h;h=8842917aabf633b15d1be6cbf746708b5ade8350;hb=d39880eef211a296fa8ef4712cdef5945d08527c;hp=66d7396f4faaf3bacbec6970de8c314f0afe98b9;hpb=a6070a8af446620ab16ad172b94041601c95700d;p=libdcp.git

diff --git a/src/asset_writer.h b/src/asset_writer.h
index 66d7396f..8842917a 100644
--- a/src/asset_writer.h
+++ b/src/asset_writer.h
@@ -1,20 +1,34 @@
 /*
     Copyright (C) 2012-2015 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/asset_writer.h
@@ -24,11 +38,10 @@
 #ifndef LIBDCP_ASSET_WRITER_H
 #define LIBDCP_ASSET_WRITER_H
 
+#include "types.h"
+#include "crypto_context.h"
 #include <boost/filesystem.hpp>
-
-namespace ASDCP {
-	class AESEncContext;
-}
+#include <boost/noncopyable.hpp>
 
 namespace dcp {
 
@@ -43,8 +56,12 @@ class MXF;
 class AssetWriter : public boost::noncopyable
 {
 public:
-	virtual ~AssetWriter ();
-	virtual void finalize ();
+	virtual ~AssetWriter () {}
+	virtual bool finalize ();
+
+	int64_t frames_written () const {
+		return _frames_written;
+	}
 
 protected:
 	AssetWriter (MXF* mxf, boost::filesystem::path file);
@@ -61,7 +78,7 @@ protected:
 	bool _finalized;
 	/** true if something has been written to this asset */
 	bool _started;
-	ASDCP::AESEncContext* _encryption_context;
+	std::shared_ptr<EncryptionContext> _crypto_context;
 };
 
 }