From 2ad4929f4b3fec0413633c00364f4a6fda3e6c0c Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 16 Apr 2013 09:54:23 +0100 Subject: Merge and add option to ignore differing MXF names. --- src/mxf_asset.cc | 6 ++++-- src/types.h | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/mxf_asset.cc b/src/mxf_asset.cc index 9b491dd7..144532f8 100644 --- a/src/mxf_asset.cc +++ b/src/mxf_asset.cc @@ -71,7 +71,7 @@ MXFAsset::fill_writer_info (ASDCP::WriterInfo* writer_info, string uuid) } bool -MXFAsset::equals (shared_ptr other, EqualityOptions, boost::function note) const +MXFAsset::equals (shared_ptr other, EqualityOptions opt, boost::function note) const { shared_ptr other_mxf = dynamic_pointer_cast (other); if (!other_mxf) { @@ -81,7 +81,9 @@ MXFAsset::equals (shared_ptr other, EqualityOptions, boost::functio if (_file_name != other_mxf->_file_name) { note (ERROR, "MXF names differ"); - return false; + if (!opt.mxf_names_can_differ) { + return false; + } } if (_edit_rate != other_mxf->_edit_rate) { diff --git a/src/types.h b/src/types.h index 4c824080..b6372e9a 100644 --- a/src/types.h +++ b/src/types.h @@ -100,11 +100,13 @@ struct EqualityOptions { : max_mean_pixel_error (0) , max_std_dev_pixel_error (0) , max_audio_sample_error (0) + , mxf_names_can_differ (false) {} double max_mean_pixel_error; double max_std_dev_pixel_error; int max_audio_sample_error; + bool mxf_names_can_differ; }; enum NoteType { -- cgit v1.2.3