projects
/
libdcp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add equality option to allow reel annotation texts to differ.
[libdcp.git]
/
src
/
reel_asset.cc
diff --git
a/src/reel_asset.cc
b/src/reel_asset.cc
index 037a39780e55a4a5f43eee630da1955ce77611a6..57b709a78613a03a34e32adbfe940e73f2b28043 100644
(file)
--- 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";
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) {
}
if (_edit_rate != other->_edit_rate) {