X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fmono_picture_asset_writer.cc;h=1abdcccc3a83e2df5c6074426063823764863486;hb=refs%2Ftags%2Fv1.8.4;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..1abdcccc 100644
--- a/src/mono_picture_asset_writer.cc
+++ b/src/mono_picture_asset_writer.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -31,46 +31,57 @@
     files in the program, then also delete it here.
 */
 
+
 /** @file  src/mono_picture_asset_writer.cc
  *  @brief MonoPictureAssetWriter class
  */
 
-#include "mono_picture_asset_writer.h"
+
+#include "crypto_context.h"
+#include "dcp_assert.h"
 #include "exceptions.h"
+#include "mono_picture_asset_writer.h"
 #include "picture_asset.h"
-#include "dcp_assert.h"
-#include "encryption_context.h"
+#include "warnings.h"
+LIBDCP_DISABLE_WARNINGS
 #include <asdcp/AS_DCP.h>
 #include <asdcp/KM_fileio.h>
+LIBDCP_ENABLE_WARNINGS
+
 
 #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
 {
 	ASDCP::JP2K::MXFWriter mxf_writer;
 };
 
+
 /** @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 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 const * data, int size)
 {
@@ -80,15 +91,15 @@ MonoPictureAssetWriter::write (uint8_t const * data, int size)
 		start (data, size);
 	}
 
- 	if (ASDCP_FAILURE (_state->j2k_parser.OpenReadFrame (data, size, _state->frame_buffer))) {
+ 	if (ASDCP_FAILURE (_state->j2k_parser.OpenReadFrame(data, size, _state->frame_buffer))) {
  		boost::throw_exception (MiscError ("could not parse J2K frame"));
  	}
 
 	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);
-	if (ASDCP_FAILURE (r)) {
+	auto 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));
 	}
 
@@ -96,27 +107,29 @@ MonoPictureAssetWriter::write (uint8_t const * data, int size)
 	return FrameInfo (before_offset, _state->mxf_writer.Tell() - before_offset, hash);
 }
 
+
 void
 MonoPictureAssetWriter::fake_write (int size)
 {
 	DCP_ASSERT (_started);
 	DCP_ASSERT (!_finalized);
 
-	Kumu::Result_t r = _state->mxf_writer.FakeWriteFrame (size);
-	if (ASDCP_FAILURE (r)) {
-		boost::throw_exception (MXFFileError ("error in writing video MXF", _file.string(), r));
+	auto r = _state->mxf_writer.FakeWriteFrame (size);
+	if (ASDCP_FAILURE(r)) {
+		boost::throw_exception (MXFFileError("error in writing video MXF", _file.string(), r));
 	}
 
 	++_frames_written;
 }
 
+
 bool
 MonoPictureAssetWriter::finalize ()
 {
 	if (_started) {
-		Kumu::Result_t r = _state->mxf_writer.Finalize();
-		if (ASDCP_FAILURE (r)) {
-			boost::throw_exception (MXFFileError ("error in finalizing video MXF", _file.string(), r));
+		auto r = _state->mxf_writer.Finalize();
+		if (ASDCP_FAILURE(r)) {
+			boost::throw_exception (MXFFileError("error in finalizing video MXF", _file.string(), r));
 		}
 	}