X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fmxf.cc;h=6ec634da053adb94121349d10ec042d23676ddf7;hb=refs%2Fheads%2F1.0-templates;hp=f902212ee4a1e10cc5b8bb833b38182d7420a099;hpb=f9cba324c8160a70b108d9e5b60a4ccad6ee9be2;p=libdcp.git
diff --git a/src/mxf.cc b/src/mxf.cc
index f902212e..6ec634da 100644
--- a/src/mxf.cc
+++ b/src/mxf.cc
@@ -16,6 +16,19 @@
You should have received a copy of the GNU General Public License
along with libdcp. If not, see .
+ 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.cc
@@ -23,15 +36,15 @@
*/
#include "raw_convert.h"
-#include "AS_DCP.h"
-#include "KM_prng.h"
-#include "KM_util.h"
#include "mxf.h"
#include "util.h"
#include "metadata.h"
#include "exceptions.h"
#include "dcp_assert.h"
#include "compose.hpp"
+#include
+#include
+#include
#include
#include
#include
@@ -44,17 +57,6 @@ using boost::shared_ptr;
using boost::dynamic_pointer_cast;
using namespace dcp;
-MXF::MXF ()
- : _decryption_context (0)
-{
-
-}
-
-MXF::~MXF ()
-{
- delete _decryption_context;
-}
-
void
MXF::fill_writer_info (ASDCP::WriterInfo* writer_info, string id, Standard standard) const
{
@@ -97,11 +99,6 @@ MXF::set_key (Key key)
/* No key ID so far; we now need one */
_key_id = make_uuid ();
}
-
- _decryption_context = new ASDCP::AESDecContext;
- if (ASDCP_FAILURE (_decryption_context->InitKey (_key->value ()))) {
- throw MiscError ("could not set up decryption context");
- }
}
string