Fix equals() with image subtitles to not compare unique IDs.

[libdcp.git] / src / types.h

diff --git a/src/types.h b/src/types.h
index ed0b7b843757f8f7e06306fc70c77e37e9bc4806..1102f16b56bbaea6a30c078ed5619e117e2e4b5d 100644 (file)
--- a/src/types.h
+++ b/src/types.h
@@ -88,17 +88,18 @@ enum Channel {
        RS = 5,        ///< right surround
        HI = 6,
        VI = 7,
-       LC = 8,
-       RC = 9,
+       /* 8 and 9 are not used */
        BSL = 10,
        BSR = 11,
        MOTION_DATA = 12,
        SYNC_SIGNAL = 13,
        SIGN_LANGUAGE = 14,
-       UNUSED = 15,
+       /* 15 is not used */
        CHANNEL_COUNT = 16
 };
 
+std::vector<dcp::Channel> used_audio_channels ();
+
 
 enum MCASoundField
 {
@@ -214,6 +215,8 @@ extern std::ostream& operator<< (std::ostream& s, Fraction const & f);
  *
  *  When comparing things, we want to be able to ignore some differences;
  *  this class expresses those differences.
+ *
+ *  It also contains some settings for how the comparison should be done.
  */
 struct EqualityOptions
 {
@@ -228,6 +231,7 @@ struct EqualityOptions
                , issue_dates_can_differ (false)
                , load_font_nodes_can_differ (false)
                , keep_going (false)
+               , export_differing_subtitles (false)
        {}
 
        /** The maximum allowable mean difference in pixel value between two images */
@@ -246,6 +250,8 @@ struct EqualityOptions
        bool issue_dates_can_differ;
        bool load_font_nodes_can_differ;
        bool keep_going;
+       /** true to save the first pair of differeng image subtitles to the current working directory */
+       bool export_differing_subtitles;
 };
 
 /* I've been unable to make mingw happy with ERROR as a symbol, so