Optionally allow subtitle issue dates to differ.

diff --git a/src/smpte_subtitle_asset.cc b/src/smpte_subtitle_asset.cc
index dc0c86ada581f7daf18483cfef13db77c5ecf19a..362211cfe62e478d3560c02021e4bfa340da54e7 100644 (file)
--- 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 f364572b8d33df912218e8cffe68393b318fd569..bfcc5a3f6e4fb0ce63b8730c64fa36abd92fb7b9 100644 (file)
--- 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