diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-04-16 13:36:22 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-04-16 13:36:22 +0100 |
| commit | da4c216fb48b230eac4297e237c379f2a1449fc1 (patch) | |
| tree | 4743cdc6d54e380c2a1a5faebafbd7048d53692c /src | |
| parent | 9ce517d0c789e0e1ef98f25e3449a75945fc62ab (diff) | |
| parent | 2ad4929f4b3fec0413633c00364f4a6fda3e6c0c (diff) | |
Merge branch 'master' of /home/carl/git/libdcp
Diffstat (limited to 'src')
| -rw-r--r-- | src/mxf_asset.cc | 6 | ||||
| -rw-r--r-- | src/types.h | 2 |
2 files changed, 6 insertions, 2 deletions
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<const Asset> other, EqualityOptions, boost::function<void (NoteType, string)> note) const +MXFAsset::equals (shared_ptr<const Asset> other, EqualityOptions opt, boost::function<void (NoteType, string)> note) const { shared_ptr<const MXFAsset> other_mxf = dynamic_pointer_cast<const MXFAsset> (other); if (!other_mxf) { @@ -81,7 +81,9 @@ MXFAsset::equals (shared_ptr<const Asset> 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 928e6a30..3fcbd58f 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 { |