Remove now-presumed-wrong 2.0 MCA sound field.

[libdcp.git] / src / types.h

diff --git a/src/types.h b/src/types.h
index b6335546c4f3f9aab291ac6288c60fc548f638e5..5f955c4b119f4b07697757fc6e6538ecc630642f 100644 (file)
--- a/src/types.h
+++ b/src/types.h
@@ -129,27 +129,6 @@ extern std::string channel_to_mca_name (Channel c, MCASoundField field);
 extern ASDCP::UL channel_to_mca_universal_label (Channel c, MCASoundField field, ASDCP::Dictionary const* dict);
 
 
-enum class ContentKind
-{
-       FEATURE,
-       SHORT,
-       TRAILER,
-       TEST,
-       TRANSITIONAL,
-       RATING,
-       TEASER,
-       POLICY,
-       PUBLIC_SERVICE_ANNOUNCEMENT,
-       ADVERTISEMENT,
-       EPISODE,
-       PROMO
-};
-
-
-extern std::string content_kind_to_string (ContentKind kind);
-extern ContentKind content_kind_from_string (std::string kind);
-
-
 enum class Effect
 {
        NONE,
@@ -177,18 +156,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
 };
@@ -280,6 +259,8 @@ struct EqualityOptions
        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;
 };