diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-05-25 22:25:05 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-05-25 22:25:05 +0100 |
| commit | 484a9009ff684bedca3f2cf4868e7dd03215d8e8 (patch) | |
| tree | 3c41d4aa1a608ebf147940a9bf892ab75ec566bc | |
| parent | 6d5c9b454e586ca53c9d59d93fc4b721d6dbf68f (diff) | |
Add equality option to allow reel annotation texts to differ.
| -rw-r--r-- | src/reel_asset.cc | 8 | ||||
| -rw-r--r-- | src/types.h | 3 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/reel_asset.cc b/src/reel_asset.cc index 037a3978..57b709a7 100644 --- a/src/reel_asset.cc +++ b/src/reel_asset.cc @@ -105,8 +105,12 @@ ReelAsset::equals (shared_ptr<const ReelAsset> other, EqualityOptions opt, NoteH if (_annotation_text != other->_annotation_text) { stringstream s; s << "Reel: annotation texts differ (" << _annotation_text << " vs " << other->_annotation_text << ")\n"; - note (DCP_ERROR, s.str ()); - return false; + if (!opt.reel_annotation_texts_can_differ) { + note (DCP_ERROR, s.str ()); + return false; + } else { + note (DCP_NOTE, s.str ()); + } } if (_edit_rate != other->_edit_rate) { diff --git a/src/types.h b/src/types.h index 133abfd5..3c74c45c 100644 --- a/src/types.h +++ b/src/types.h @@ -151,6 +151,7 @@ struct EqualityOptions , max_audio_sample_error (0) , cpl_annotation_texts_can_differ (false) , mxf_filenames_can_differ (false) + , reel_annotation_texts_can_differ (false) , reel_hashes_can_differ (false) {} @@ -164,6 +165,8 @@ struct EqualityOptions bool cpl_annotation_texts_can_differ; /** true if MXF file leafnames are allowed to differ */ bool mxf_filenames_can_differ; + /** true if the <AnnotationText> nodes of Reels are allowed to differ */ + bool reel_annotation_texts_can_differ; /** true if <Hash>es in Reels can differ */ bool reel_hashes_can_differ; }; |