Rename some mxf variables to asset.1.0-shuffle

2 files changed, 15 insertions, 16 deletions

diff --git a/src/decrypted_kdm.cc b/src/decrypted_kdm.cc
index 68429a73..d3b2d322 100644
--- a/src/decrypted_kdm.cc
+++ b/src/decrypted_kdm.cc
@@ -24,7 +24,6 @@
 #include "util.h"
 #include "exceptions.h"
 #include "cpl.h"
-#include "mxf.h"
 #include "signer.h"
 #include "dcp_assert.h"
 #include "AS_DCP.h"
@@ -198,14 +197,14 @@ DecryptedKDM::DecryptedKDM (
 	, _content_title_text (content_title_text)
 	, _issue_date (issue_date)
 {
-	/* Create DecryptedKDMKey objects for each MXF asset */
+	/* Create DecryptedKDMKey objects for each encryptable asset */
 	BOOST_FOREACH(shared_ptr<const ReelAsset> i, cpl->reel_assets ()) {
-		shared_ptr<const ReelEncryptableAsset> mxf = boost::dynamic_pointer_cast<const ReelEncryptableAsset> (i);
-		if (mxf) {
-			if (!mxf->key_id ()) {
-				throw NotEncryptedError (mxf->id());
+		shared_ptr<const ReelEncryptableAsset> asset = boost::dynamic_pointer_cast<const ReelEncryptableAsset> (i);
+		if (asset) {
+			if (!asset->key_id ()) {
+				throw NotEncryptedError (asset->id());
 			}
-			_keys.push_back (DecryptedKDMKey (mxf->key_type(), mxf->key_id().get(), key, cpl->id ()));
+			_keys.push_back (DecryptedKDMKey (asset->key_type(), asset->key_id().get(), key, cpl->id ()));
 		}
 	}
 }
diff --git a/src/picture_asset_writer_common.cc b/src/picture_asset_writer_common.cc
index b463cb4a..9b46e55e 100644
--- a/src/picture_asset_writer_common.cc
+++ b/src/picture_asset_writer_common.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -32,24 +32,24 @@ struct ASDCPStateBase
 };
 
 template <class P, class Q>
-void dcp::start (PictureAssetWriter* writer, shared_ptr<P> state, Standard standard, Q* mxf, uint8_t* data, int size)
+void dcp::start (PictureAssetWriter* writer, shared_ptr<P> state, Standard standard, Q* asset, uint8_t* data, int size)
 {
-	mxf->set_file (writer->_file);
+	asset->set_file (writer->_file);
 	
 	if (ASDCP_FAILURE (state->j2k_parser.OpenReadFrame (data, size, state->frame_buffer))) {
 		boost::throw_exception (MiscError ("could not parse J2K frame"));
 	}
 
 	state->j2k_parser.FillPictureDescriptor (state->picture_descriptor);
-	state->picture_descriptor.EditRate = ASDCP::Rational (mxf->edit_rate().numerator, mxf->edit_rate().denominator);
+	state->picture_descriptor.EditRate = ASDCP::Rational (asset->edit_rate().numerator, asset->edit_rate().denominator);
 
-	mxf->set_size (Size (state->picture_descriptor.StoredWidth, state->picture_descriptor.StoredHeight));
-	mxf->set_screen_aspect_ratio (Fraction (state->picture_descriptor.AspectRatio.Numerator, state->picture_descriptor.AspectRatio.Denominator));
+	asset->set_size (Size (state->picture_descriptor.StoredWidth, state->picture_descriptor.StoredHeight));
+	asset->set_screen_aspect_ratio (Fraction (state->picture_descriptor.AspectRatio.Numerator, state->picture_descriptor.AspectRatio.Denominator));
 	
-	mxf->fill_writer_info (&state->writer_info, mxf->id(), standard);
+	asset->fill_writer_info (&state->writer_info, asset->id(), standard);
 	
 	Kumu::Result_t r = state->mxf_writer.OpenWrite (
-		mxf->file().string().c_str(),
+		asset->file().string().c_str(),
 		state->writer_info,
 		state->picture_descriptor,
 		16384,
@@ -57,7 +57,7 @@ void dcp::start (PictureAssetWriter* writer, shared_ptr<P> state, Standard stand
 		);
 
 	if (ASDCP_FAILURE (r)) {
-		boost::throw_exception (MXFFileError ("could not open MXF file for writing", mxf->file().string(), r));
+		boost::throw_exception (MXFFileError ("could not open MXF file for writing", asset->file().string(), r));
 	}
 
 	writer->_started = true;