Cleanup: fix more comments/guards (and add check script).

[libdcp.git] / src / subtitle_asset_internal.h

diff --git a/src/subtitle_asset_internal.h b/src/subtitle_asset_internal.h
index 558807976ba6c45262fb1da1ffda309014078f8e..557db2e495f2c48087f40c2b9b22b725e0fb95aa 100644 (file)
--- a/src/subtitle_asset_internal.h
+++ b/src/subtitle_asset_internal.h
@@ -43,8 +43,9 @@
 
 #include "array_data.h"
 #include "dcp_time.h"
+#include "h_align.h"
 #include "raw_convert.h"
-#include "types.h"
+#include "v_align.h"
 #include "warnings.h"
 LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
@@ -61,6 +62,7 @@ struct pull_fonts_test3;
 namespace dcp {
 
 
+class Ruby;
 class SubtitleString;
 
 
@@ -144,13 +146,15 @@ private:
 class Text : public Part
 {
 public:
-       Text (std::shared_ptr<Part> parent, HAlign h_align, float h_position, VAlign v_align, float v_position, Direction direction)
+       Text(std::shared_ptr<Part> parent, HAlign h_align, float h_position, VAlign v_align, float v_position, float z_position, Direction direction, std::vector<Ruby> rubies)
                : Part (parent)
                , _h_align (h_align)
                , _h_position (h_position)
                , _v_align (v_align)
                , _v_position (v_position)
+               , _z_position(z_position)
                , _direction (direction)
+               , _rubies(rubies)
        {}
 
        xmlpp::Element* as_xml (xmlpp::Element* parent, Context& context) const override;
@@ -160,7 +164,9 @@ private:
        float _h_position;
        VAlign _v_align;
        float _v_position;
+       float _z_position;
        Direction _direction;
+       std::vector<Ruby> _rubies;
 };
 
 
@@ -188,7 +194,7 @@ private:
 class Image : public Part
 {
 public:
-       Image (std::shared_ptr<Part> parent, std::string id, ArrayData png_data, HAlign h_align, float h_position, VAlign v_align, float v_position)
+       Image (std::shared_ptr<Part> parent, std::string id, ArrayData png_data, HAlign h_align, float h_position, VAlign v_align, float v_position, float z_position)
                : Part (parent)
                , _png_data (png_data)
                , _id (id)
@@ -196,6 +202,7 @@ public:
                , _h_position (h_position)
                , _v_align (v_align)
                , _v_position (v_position)
+               , _z_position(z_position)
        {}
 
        xmlpp::Element* as_xml (xmlpp::Element* parent, Context& context) const override;
@@ -207,6 +214,7 @@ private:
        float _h_position;
        VAlign _v_align;
        float _v_position;
+       float _z_position;
 };