diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/mxf.cc | 8 | ||||
| -rw-r--r-- | src/types.h | 6 |
2 files changed, 7 insertions, 7 deletions
@@ -114,12 +114,12 @@ MXF::equals (shared_ptr<const Asset> other, EqualityOptions opt, NoteHandler not return false; } - if (_file != other_mxf->file ()) { - if (!opt.mxf_names_can_differ) { - note (DCP_ERROR, "MXF: names differ"); + if (_file.leaf() != other_mxf->file().leaf()) { + if (!opt.mxf_filenames_can_differ) { + note (DCP_ERROR, "MXF: filenames differ"); return false; } else { - note (DCP_NOTE, "MXF: names differ"); + note (DCP_NOTE, "MXF: filenames differ"); } } diff --git a/src/types.h b/src/types.h index 08613c79..594bd7b7 100644 --- a/src/types.h +++ b/src/types.h @@ -127,7 +127,7 @@ struct EqualityOptions , max_std_dev_pixel_error (0) , max_audio_sample_error (0) , cpl_annotation_texts_can_differ (false) - , mxf_names_can_differ (false) + , mxf_filenames_can_differ (false) , reel_hashes_can_differ (false) {} @@ -139,8 +139,8 @@ struct EqualityOptions int max_audio_sample_error; /** true if the <AnnotationText> nodes of CPLs are allowed to differ */ bool cpl_annotation_texts_can_differ; - /** true if MXF filenames are allowed to differ */ - bool mxf_names_can_differ; + /** true if MXF file leafnames are allowed to differ */ + bool mxf_filenames_can_differ; /** true if <Hash>es in Reels can differ */ bool reel_hashes_can_differ; }; |