X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fatmos_asset_writer.cc;h=07d310f65867bd78e1918e4cbe8bd8adb6ca307d;hb=5ad493e6900f621284748fe50b3f60f67929ffc2;hp=eb0d608aa8f4d3c5f8bad07c44ff8c3a4b9fb2d8;hpb=eb772d227c378e17c99b5d609b81d0cc4b664d2c;p=libdcp.git

diff --git a/src/atmos_asset_writer.cc b/src/atmos_asset_writer.cc
index eb0d608a..07d310f6 100644
--- a/src/atmos_asset_writer.cc
+++ b/src/atmos_asset_writer.cc
@@ -36,7 +36,7 @@
 #include "exceptions.h"
 #include "dcp_assert.h"
 #include "compose.hpp"
-#include "encryption_context.h"
+#include "crypto_context.h"
 #include <asdcp/AS_DCP.h>
 
 using std::min;
@@ -52,7 +52,7 @@ struct AtmosAssetWriter::ASDCPState
 };
 
 AtmosAssetWriter::AtmosAssetWriter (AtmosAsset* asset, boost::filesystem::path file)
-	: AssetWriter (asset, file, SMPTE)
+	: AssetWriter (asset, file)
 	, _state (new AtmosAssetWriter::ASDCPState)
 	, _asset (asset)
 {
@@ -67,7 +67,7 @@ AtmosAssetWriter::AtmosAssetWriter (AtmosAsset* asset, boost::filesystem::path f
 
 	_state->desc.AtmosVersion = 0;
 
-	_asset->fill_writer_info (&_state->writer_info, _asset->id(), SMPTE);
+	_asset->fill_writer_info (&_state->writer_info, _asset->id());
 }
 
 void
@@ -89,7 +89,7 @@ AtmosAssetWriter::write (uint8_t const * data, int size)
 	_state->frame_buffer.Size (size);
 	memcpy (_state->frame_buffer.Data(), data, size);
 
-	ASDCP::Result_t const r = _state->mxf_writer.WriteFrame (_state->frame_buffer, _encryption_context->encryption(), _encryption_context->hmac());
+	ASDCP::Result_t const r = _state->mxf_writer.WriteFrame (_state->frame_buffer, _crypto_context->context(), _crypto_context->hmac());
 	if (ASDCP_FAILURE (r)) {
 		boost::throw_exception (MiscError (String::compose ("could not write atmos MXF frame (%1)", int (r))));
 	}