diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-06-10 09:54:28 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-06-10 09:54:28 +0100 |
| commit | 91e1e17b4c9771e00b48d9fcc0dcbe2bdfa94c17 (patch) | |
| tree | 8407855717e0b27563caf74f3d46aad35263dc6c /src | |
| parent | d228090b2f095d9233c1762a5e75968ca5377bf5 (diff) | |
Optionally allow subtitle issue dates to differ.
Diffstat (limited to 'src')
| -rw-r--r-- | src/smpte_subtitle_asset.cc | 8 | ||||
| -rw-r--r-- | src/types.h | 3 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/smpte_subtitle_asset.cc b/src/smpte_subtitle_asset.cc index dc0c86ad..362211cf 100644 --- a/src/smpte_subtitle_asset.cc +++ b/src/smpte_subtitle_asset.cc @@ -309,8 +309,12 @@ SMPTESubtitleAsset::equals (shared_ptr<const Asset> other_asset, EqualityOptions } if (_issue_date != other->_issue_date) { - note (DCP_ERROR, "Subtitle issue dates differ"); - return false; + if (options.issue_dates_can_differ) { + note (DCP_NOTE, "Subtitle issue dates differ"); + } else { + note (DCP_ERROR, "Subtitle issue dates differ"); + return false; + } } if (_reel_number != other->_reel_number) { diff --git a/src/types.h b/src/types.h index f364572b..bfcc5a3f 100644 --- a/src/types.h +++ b/src/types.h @@ -165,6 +165,7 @@ struct EqualityOptions , cpl_annotation_texts_can_differ (false) , reel_annotation_texts_can_differ (false) , reel_hashes_can_differ (false) + , issue_dates_can_differ (false) {} /** The maximum allowable mean difference in pixel value between two images */ @@ -179,6 +180,8 @@ struct EqualityOptions bool reel_annotation_texts_can_differ; /** true if <Hash>es in Reels can differ */ bool reel_hashes_can_differ; + /** true if IssueDate nodes can differ */ + bool issue_dates_can_differ; }; /* I've been unable to make mingw happy with ERROR as a symbol, so |