Account for split branch in libdcp.

[dcpomatic.git] / src / lib / string_text.h

diff --git a/src/lib/string_text.h b/src/lib/string_text.h
index 4eef7da0562aa79cb6b2a6d507b099ab27a42c6f..827b426cc11f4467088bedcf9280cff563ed02c1 100644 (file)
--- a/src/lib/string_text.h
+++ b/src/lib/string_text.h
@@ -24,7 +24,8 @@
 
 
 #include "font.h"
-#include <dcp/subtitle_string.h>
+#include <dcp/text_standard.h>
+#include <dcp/text_string.h>
 
 
 /** A wrapper for SubtitleString which allows us to:
@@ -35,13 +36,13 @@
  *    - include details of how v_align should be interpreted
  *
  *    - specify the font by referring to a Font object from the content we came from, rather than
- *      having to use a DCP ID like in dcp::SubtitleString.
+ *      having to use a DCP ID like in dcp::TextString.
  */
-class StringText : public dcp::SubtitleString
+class StringText : public dcp::TextString
 {
 public:
-       StringText(dcp::SubtitleString dcp_, int outline_width_, std::shared_ptr<dcpomatic::Font> font_, dcp::Standard valign_standard_)
-               : dcp::SubtitleString (dcp_)
+       StringText(dcp::TextString dcp_, int outline_width_, std::shared_ptr<dcpomatic::Font> font_, dcp::TextStandard valign_standard_)
+               : dcp::TextString(dcp_)
                , outline_width (outline_width_)
                , font (font_)
                , valign_standard (valign_standard_)
@@ -49,18 +50,24 @@ public:
 
        int outline_width;
        std::shared_ptr<dcpomatic::Font> font;
+
        /** Interop and SMPTE use the same VAlign choices (top, center, bottom) but give them different
-        *  meanings.  This is the standard which should be used to interpret v_align() in this subtitle;
-        *  valign_standard == SMPTE means:
+        *  meanings.  To add some extra confusion, it seems that SMPTE changed their minds on this topic
+        *  between the 2010 and 2014 versions of standard 428-7, so there isn't even one answer for SMPTE.
+        *
+        *  This is the standard which should be used to interpret v_align() in this subtitle.
+         *
+        *  valign_standard == SMPTE_{2007,2010} means:
         *     top - top of screen to top of subtitle
         *     center - centre of screen to center of subtitle
         *     bottom - bottom of screen to bottom of subtitle
-        *  valign_standard == Interop means:
+        *
+        *  valign_standard == {INTEROP,SMPTE_2014} means:
         *     top - top of screen to baseline of subtitle
         *     center - centre of screen to baseline of subtitle
         *     bottom - bottom of screen to baseline of subtitle
         */
-       dcp::Standard valign_standard;
+       dcp::TextStandard valign_standard;
 };