X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fmxf.h;h=73ada433510b640041beba4afdf2556a5a2dfe96;hb=refs%2Fheads%2F1.0-templates;hp=60c635be2c0c7a874431769b2d675eb168521a83;hpb=42a65cba0d8da23c12af52015e66cd9dc0b5a5fa;p=libdcp.git

diff --git a/src/mxf.h b/src/mxf.h
index 60c635be..73ada433 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
@@ -28,7 +42,7 @@
 
 namespace ASDCP {
 	class AESDecContext;
-	class WriterInfo;
+	struct WriterInfo;
 }
 
 /* Undefine some stuff that the OS X 10.5 SDK defines */
@@ -39,20 +53,19 @@ namespace dcp
 {
 
 class MXFMetadata;
-class PictureAssetWriter;	
+class PictureAssetWriter;
 
 /** @class MXF
- *  @brief Parent class for classes which represent MXF files.
+ *  @brief Parent for classes which represent MXF files.
  */
 class MXF
 {
 public:
-	MXF ();
-	virtual ~MXF ();
+	virtual ~MXF () {}
 
 	/** @return true if the data is encrypted */
 	bool encrypted () const {
-		return _key_id;
+		return static_cast<bool>(_key_id);
 	}
 
 	/** Set the ID of the key that is used for encryption/decryption.
@@ -67,7 +80,7 @@ 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 {
@@ -85,7 +98,7 @@ public:
 	MXFMetadata metadata () const {
 		return _metadata;
 	}
-	
+
 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);
@@ -97,7 +110,6 @@ protected:
 	 */
 	void fill_writer_info (ASDCP::WriterInfo* w, std::string id, Standard standard) const;
 
-	ASDCP::AESDecContext* _decryption_context;
 	/** 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 */