Remove unnecessary parameters to fill_writer_info.

5 files changed, 10 insertions, 11 deletions

diff --git a/src/mono_picture_asset.cc b/src/mono_picture_asset.cc
index c446408d..0ac48d37 100644
--- a/src/mono_picture_asset.cc
+++ b/src/mono_picture_asset.cc
@@ -58,7 +58,7 @@ MonoPictureAsset::create (boost::function<boost::filesystem::path (int)> get_pat
 	picture_desc.EditRate = ASDCP::Rational (_edit_rate, 1);
 	
 	ASDCP::WriterInfo writer_info;
-	fill_writer_info (&writer_info, _uuid, _metadata);
+	fill_writer_info (&writer_info);
 	
 	ASDCP::JP2K::MXFWriter mxf_writer;
 	r = mxf_writer.OpenWrite (path().string().c_str(), writer_info, picture_desc, 16384, false);
diff --git a/src/mxf_asset.cc b/src/mxf_asset.cc
index a2ee9f25..c2428a3c 100644
--- a/src/mxf_asset.cc
+++ b/src/mxf_asset.cc
@@ -59,11 +59,11 @@ MXFAsset::~MXFAsset ()
 }
 
 void
-MXFAsset::fill_writer_info (ASDCP::WriterInfo* writer_info, string uuid, MXFMetadata const & metadata)
+MXFAsset::fill_writer_info (ASDCP::WriterInfo* writer_info)
 {
-	writer_info->ProductVersion = metadata.product_version;
-	writer_info->CompanyName = metadata.company_name;
-	writer_info->ProductName = metadata.product_name.c_str();
+	writer_info->ProductVersion = _metadata.product_version;
+	writer_info->CompanyName = _metadata.company_name;
+	writer_info->ProductName = _metadata.product_name.c_str();
 
 	if (_interop) {
 		writer_info->LabelSetType = ASDCP::LS_MXF_INTEROP;
@@ -71,7 +71,7 @@ MXFAsset::fill_writer_info (ASDCP::WriterInfo* writer_info, string uuid, MXFMeta
 		writer_info->LabelSetType = ASDCP::LS_MXF_SMPTE;
 	}
 	unsigned int c;
-	Kumu::hex2bin (uuid.c_str(), writer_info->AssetUUID, Kumu::UUID_Length, &c);
+	Kumu::hex2bin (_uuid.c_str(), writer_info->AssetUUID, Kumu::UUID_Length, &c);
 	assert (c == Kumu::UUID_Length);
 
 	if (_key) {
diff --git a/src/mxf_asset.h b/src/mxf_asset.h
index e406f400..7a645b7c 100644
--- a/src/mxf_asset.h
+++ b/src/mxf_asset.h
@@ -55,9 +55,8 @@ public:
 	
 	/** Fill in a ADSCP::WriteInfo struct.
 	 *  @param w struct to fill in.
-	 *  @param uuid uuid to use.
 	 */
-	void fill_writer_info (ASDCP::WriterInfo* w, std::string uuid, MXFMetadata const & metadata);
+	void fill_writer_info (ASDCP::WriterInfo* w);
 
 	void set_progress (boost::signals2::signal<void (float)>* progress) {
 		_progress = progress;
diff --git a/src/picture_asset_writer_common.cc b/src/picture_asset_writer_common.cc
index bb418fe0..52848745 100644
--- a/src/picture_asset_writer_common.cc
+++ b/src/picture_asset_writer_common.cc
@@ -42,7 +42,7 @@ void libdcp::start (PictureAssetWriter* writer, shared_ptr<P> state, Q* asset, u
 	state->j2k_parser.FillPictureDescriptor (state->picture_descriptor);
 	state->picture_descriptor.EditRate = ASDCP::Rational (asset->edit_rate(), 1);
 	
-	asset->fill_writer_info (&state->writer_info, asset->uuid(), writer->_asset->metadata());
+	asset->fill_writer_info (&state->writer_info);
 	
 	Kumu::Result_t r = state->mxf_writer.OpenWrite (
 		asset->path().string().c_str(),
diff --git a/src/sound_asset.cc b/src/sound_asset.cc
index 0cc7cdba..95244b90 100644
--- a/src/sound_asset.cc
+++ b/src/sound_asset.cc
@@ -150,7 +150,7 @@ SoundAsset::create (boost::function<boost::filesystem::path (Channel)> get_path)
 	frame_buffer.Size (ASDCP::PCM::CalcFrameBufferSize (audio_desc));
 
 	ASDCP::WriterInfo writer_info;
-	MXFAsset::fill_writer_info (&writer_info, _uuid, _metadata);
+	MXFAsset::fill_writer_info (&writer_info);
 
 	ASDCP::PCM::MXFWriter mxf_writer;
 	r = mxf_writer.OpenWrite (path().string().c_str(), writer_info, audio_desc);
@@ -332,7 +332,7 @@ SoundAssetWriter::SoundAssetWriter (SoundAsset* a)
 	_state->frame_buffer.Size (ASDCP::PCM::CalcFrameBufferSize (_state->audio_desc));
 	memset (_state->frame_buffer.Data(), 0, _state->frame_buffer.Capacity());
 	
-	_asset->fill_writer_info (&_state->writer_info, _asset->uuid (), _asset->metadata());
+	_asset->fill_writer_info (&_state->writer_info);
 	
 	Kumu::Result_t r = _state->mxf_writer.OpenWrite (_asset->path().string().c_str(), _state->writer_info, _state->audio_desc);
 	if (ASDCP_FAILURE (r)) {