X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fmxf.h;h=aef8b12d53f00dedee93157ccc6fc7bc94adafa0;hb=56ab90d4e9fde3be3a34947e4a48937326566fb3;hp=d490e9e4a8a2e66a80a3d8b868448923bce63813;hpb=a68b877d96a9e9f366f27752e071bc0e895e9dc7;p=libdcp.git

diff --git a/src/mxf.h b/src/mxf.h
index d490e9e4..aef8b12d 100644
--- a/src/mxf.h
+++ b/src/mxf.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.
 */
 
 #ifndef LIBDCP_MXF_H
@@ -23,6 +37,7 @@
 #include "asset.h"
 #include "key.h"
 #include "metadata.h"
+#include "dcp_assert.h"
 
 #include <boost/signals2.hpp>
 
@@ -47,6 +62,7 @@ class PictureAssetWriter;
 class MXF
 {
 public:
+	MXF (Standard standard);
 	virtual ~MXF () {}
 
 	/** @return true if the data is encrypted */
@@ -66,13 +82,25 @@ public:
 		return _key_id;
 	}
 
-	void set_key (Key);
+	virtual void set_key (Key);
 
 	/** @return encryption/decryption key, if one has been set */
 	boost::optional<Key> key () const {
 		return _key;
 	}
 
+	/** Set the context ID to be used when encrypting.
+	 *  @param id New ID.
+	 */
+	void set_context_id (std::string id) {
+		_context_id = id;
+	}
+
+	/** @return context ID used when encrypting; this starts off as a random value */
+	std::string context_id () const {
+		return _context_id;
+	}
+
 	/** Set the metadata that is written to the MXF file.
 	 *  @param m Metadata.
 	 */
@@ -85,22 +113,30 @@ public:
 		return _metadata;
 	}
 
+	Standard standard () const {
+		DCP_ASSERT (_standard);
+		return *_standard;
+	}
+
 protected:
 	template <class P, class Q>
-	friend void start (PictureAssetWriter* writer, boost::shared_ptr<P> state, Standard standard, Q* mxf, uint8_t* data, int size);
+	friend void start (PictureAssetWriter* writer, boost::shared_ptr<P> state, Q* mxf, uint8_t const * data, int size);
+
+	MXF ();
 
 	std::string read_writer_info (ASDCP::WriterInfo const &);
 	/** Fill in a ADSCP::WriteInfo struct.
 	 *  @param w struct to fill in.
-	 *  @param standard INTEROP or SMPTE.
 	 */
-	void fill_writer_info (ASDCP::WriterInfo* w, std::string id, Standard standard) const;
+	void fill_writer_info (ASDCP::WriterInfo* w, std::string id) const;
 
 	/** ID of the key used for encryption/decryption, if there is one */
 	boost::optional<std::string> _key_id;
 	/** Key used for encryption/decryption, if there is one */
 	boost::optional<Key> _key;
+	std::string _context_id;
 	MXFMetadata _metadata;
+	boost::optional<Standard> _standard;
 };
 
 }