X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fmono_picture_asset_writer.cc;h=30a6ee96959f9c78ec3d9847b82c56c2ce47afaf;hb=201b6fdf572c04424d870ac4d07d1d1a8725b24c;hp=a51c3861ca56a734e61b9e0ed475860732e64d62;hpb=568241745673e68031a72739a5e5a73ba3ee20a7;p=libdcp.git

diff --git a/src/mono_picture_asset_writer.cc b/src/mono_picture_asset_writer.cc
index a51c3861..30a6ee96 100644
--- a/src/mono_picture_asset_writer.cc
+++ b/src/mono_picture_asset_writer.cc
@@ -39,7 +39,7 @@
 #include "exceptions.h"
 #include "picture_asset.h"
 #include "dcp_assert.h"
-#include "encryption_context.h"
+#include "crypto_context.h"
 #include <asdcp/AS_DCP.h>
 #include <asdcp/KM_fileio.h>
 
@@ -57,8 +57,8 @@ struct MonoPictureAssetWriter::ASDCPState : public ASDCPStateBase
 /** @param a Asset to write to.  `a' must not be deleted while
  *  this writer class still exists, or bad things will happen.
  */
-MonoPictureAssetWriter::MonoPictureAssetWriter (PictureAsset* asset, boost::filesystem::path file, Standard standard, bool overwrite)
-	: PictureAssetWriter (asset, file, standard, overwrite)
+MonoPictureAssetWriter::MonoPictureAssetWriter (PictureAsset* asset, boost::filesystem::path file, bool overwrite)
+	: PictureAssetWriter (asset, file, overwrite)
 	, _state (new MonoPictureAssetWriter::ASDCPState)
 {
 
@@ -67,7 +67,7 @@ MonoPictureAssetWriter::MonoPictureAssetWriter (PictureAsset* asset, boost::file
 void
 MonoPictureAssetWriter::start (uint8_t const * data, int size)
 {
-	dcp::start (this, _state, _standard, _picture_asset, data, size);
+	dcp::start (this, _state, _picture_asset, data, size);
 	_picture_asset->set_frame_rate (_picture_asset->edit_rate());
 }
 
@@ -87,7 +87,7 @@ MonoPictureAssetWriter::write (uint8_t const * data, int size)
 	uint64_t const before_offset = _state->mxf_writer.Tell ();
 
 	string hash;
-	ASDCP::Result_t const r = _state->mxf_writer.WriteFrame (_state->frame_buffer, _encryption_context->encryption(), _encryption_context->hmac(), &hash);
+	ASDCP::Result_t const r = _state->mxf_writer.WriteFrame (_state->frame_buffer, _crypto_context->context(), _crypto_context->hmac(), &hash);
 	if (ASDCP_FAILURE (r)) {
 		boost::throw_exception (MXFFileError ("error in writing video MXF", _file.string(), r));
 	}