diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-01-07 16:33:22 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-01-07 16:33:22 +0000 |
| commit | 9fc6bcde891567ca04fe2d9835ab48a17c9b69a7 (patch) | |
| tree | 27427b47d26a2fc4312eb5ecbd21a5771624c9bc | |
| parent | 33de896f03af15f1b544b74f177aae917f66bac3 (diff) | |
Rename mxf filename ignoring stuff slightly.
| -rw-r--r-- | src/mxf.cc | 8 | ||||
| -rw-r--r-- | src/types.h | 6 | ||||
| -rw-r--r-- | tools/dcpdiff.cc | 6 |
3 files changed, 10 insertions, 10 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; }; diff --git a/tools/dcpdiff.cc b/tools/dcpdiff.cc index bf2a144c..c99a8523 100644 --- a/tools/dcpdiff.cc +++ b/tools/dcpdiff.cc @@ -37,7 +37,7 @@ help (string n) << " -V, --version show libdcp version\n" << " -h, --help show this help\n" << " -v, --verbose be verbose\n" - << " -n, --mxf-names allow differing MXF names\n" + << " -n, --mxf-filenames allow differing MXF filenames\n" << " --cpl-annotation-texts allow differing CPL annotation texts\n" << " -m, --mean-pixel maximum allowed mean pixel error (default 5)\n" << " -s, --std-dev-pixel maximum allowed standard deviation of pixel error (default 5)\n" @@ -93,7 +93,7 @@ main (int argc, char* argv[]) { "version", no_argument, 0, 'V'}, { "help", no_argument, 0, 'h'}, { "verbose", no_argument, 0, 'v'}, - { "mxf-names", no_argument, 0, 'n'}, + { "mxf-filenames", no_argument, 0, 'n'}, { "mean-pixel", required_argument, 0, 'm'}, { "std-dev-pixel", required_argument, 0, 's'}, { "keep-going", no_argument, 0, 'k'}, @@ -120,7 +120,7 @@ main (int argc, char* argv[]) verbose = true; break; case 'n': - options.mxf_names_can_differ = true; + options.mxf_filenames_can_differ = true; break; case 'm': options.max_mean_pixel_error = atof (optarg); |