Rationalise #undef-ing of ERROR.

[libdcp.git] / src / types.h

diff --git a/src/types.h b/src/types.h
index a60193a49d75532b16744a2f5cfa35db6aed4f42..340d86133524cae4896ee853ebf135405d5e60be 100644 (file)
--- a/src/types.h
+++ b/src/types.h
@@ -51,7 +51,7 @@ LIBDCP_ENABLE_WARNINGS
 #include <string>
 
 
-/* MinGW seems to define this, but we want to use it */
+/* windows.h defines this but we want to use it */
 #undef ERROR
 
 
@@ -119,7 +119,8 @@ std::vector<dcp::Channel> used_audio_channels ();
 enum class MCASoundField
 {
        FIVE_POINT_ONE,
-       SEVEN_POINT_ONE
+       SEVEN_POINT_ONE,
+       OTHER
 };
 
 
@@ -156,18 +157,18 @@ extern HAlign string_to_halign (std::string s);
 enum class VAlign
 {
        /** vertical position is distance:
-        *    from top of screen to top of subtitle (for SMPTE) or
-        *    from top of screen to subtitle baseline (for Interop)
+        *    from top of screen to top of subtitle (for SMPTE 428-7:{2007,2010} or
+        *    from top of screen to subtitle baseline (for Interop or SMPTE 428-7:2014)
         */
        TOP,
        /** vertical position is distance:
-        *    from centre of screen to centre of subtitle (for SMPTE) or
-        *    from centre of screen to subtitle baseline (for Interop)
+        *    from centre of screen to centre of subtitle (for SMPTE 428-7:{2007,2010}) or
+        *    from centre of screen to subtitle baseline (for Interop or SMPTE 428-7:2014)
         */
        CENTER,
        /** vertical position is distance:
-        *    from bottom of screen to bottom of subtitle (for SMPTE) or
-        *    from bottom of screen to subtitle baseline (for Interop)
+        *    from bottom of screen to bottom of subtitle (for SMPTE 428-7:{2007,2010}) or
+        *    from bottom of screen to subtitle baseline (for Interop or SMPTE 428-7:2014)
         */
        BOTTOM
 };
@@ -228,42 +229,6 @@ extern bool operator== (Fraction const & a, Fraction const & b);
 extern bool operator!= (Fraction const & a, Fraction const & b);
 
 
-/** @struct EqualityOptions
- *  @brief  A class to describe what "equality" means for a particular test.
- *
- *  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
-{
-       /** Construct an EqualityOptions where nothing at all can differ */
-       EqualityOptions () {}
-
-       /** The maximum allowable mean difference in pixel value between two images */
-       double max_mean_pixel_error = 0;
-       /** The maximum standard deviation of the differences in pixel value between two images */
-       double max_std_dev_pixel_error = 0;
-       /** The maximum difference in audio sample value between two soundtracks */
-       int max_audio_sample_error = 0;
-       /** true if the &lt;AnnotationText&gt; nodes of CPLs are allowed to differ */
-       bool cpl_annotation_texts_can_differ = false;
-       /** true if the &lt;AnnotationText&gt; nodes of Reels are allowed to differ */
-       bool reel_annotation_texts_can_differ = false;
-       /** true if <Hash>es in Reels can differ */
-       bool reel_hashes_can_differ = false;
-       /** true if IssueDate nodes can differ */
-       bool issue_dates_can_differ = false;
-       bool load_font_nodes_can_differ = false;
-       bool keep_going = false;
-       /** true to save the first pair of differeng image subtitles to the current working directory */
-       bool export_differing_subtitles = false;
-       /** The maximum allowable absolute difference between the vertical position of subtitles */
-       float max_subtitle_vertical_position_error = 0;
-};
-
-
 enum class NoteType {
        PROGRESS,
        ERROR,
@@ -445,7 +410,7 @@ bool operator== (Luminance const& a, Luminance const& b);
 class MainSoundConfiguration
 {
 public:
-       MainSoundConfiguration (std::string);
+       explicit MainSoundConfiguration(std::string);
        MainSoundConfiguration (MCASoundField field_, int channels);
 
        MCASoundField field () const {