Use enum class for the things in types.h

[libdcp.git] / src / mono_picture_asset_writer.cc

diff --git a/src/mono_picture_asset_writer.cc b/src/mono_picture_asset_writer.cc
index b6f8cc1b20e3f6b9dae0b29477ed7ea6d6357a45..01fb11f0a482dbd676b0a2db4d91503c0bb6dd4f 100644 (file)
--- a/src/mono_picture_asset_writer.cc
+++ b/src/mono_picture_asset_writer.cc
@@ -39,14 +39,14 @@
 #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>
 
 #include "picture_asset_writer_common.cc"
 
 using std::string;
-using boost::shared_ptr;
+using std::shared_ptr;
 using namespace dcp;
 
 struct MonoPictureAssetWriter::ASDCPState : public ASDCPStateBase
@@ -57,22 +57,22 @@ 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)
 {
 
 }
 
 void
-MonoPictureAssetWriter::start (uint8_t* data, int size)
+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());
 }
 
 FrameInfo
-MonoPictureAssetWriter::write (uint8_t* data, int size)
+MonoPictureAssetWriter::write (uint8_t const * data, int size)
 {
        DCP_ASSERT (!_finalized);
 
@@ -87,7 +87,7 @@ MonoPictureAssetWriter::write (uint8_t* 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));
        }