Switch to testing on Ubuntu 16.04 and 22.04.

[libdcp.git] / src / subtitle_asset_internal.h

diff --git a/src/subtitle_asset_internal.h b/src/subtitle_asset_internal.h
index 0af1623887fecdab84c40eddc21dedb9a38cf684..adf2c994788f037bbc8d0e52311d70c6fb3401d6 100644 (file)
--- a/src/subtitle_asset_internal.h
+++ b/src/subtitle_asset_internal.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -31,15 +31,26 @@
     files in the program, then also delete it here.
 */
 
+
+/** @file  src/subtitle_asset_internal.h
+ *  @brief Internal SubtitleAsset helpers
+ */
+
+
 #ifndef LIBDCP_SUBTITLE_ASSET_INTERNAL_H
 #define LIBDCP_SUBTITLE_ASSET_INTERNAL_H
 
 
 #include "array_data.h"
-#include "raw_convert.h"
-#include "types.h"
 #include "dcp_time.h"
+#include "h_align.h"
+#include "raw_convert.h"
+#include "v_align.h"
+#include "warnings.h"
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
+LIBDCP_ENABLE_WARNINGS
+
 
 struct take_intersection_test;
 struct take_difference_test;
@@ -47,21 +58,24 @@ struct pull_fonts_test1;
 struct pull_fonts_test2;
 struct pull_fonts_test3;
 
+
 namespace dcp {
 
+
 class SubtitleString;
 
+
 namespace order {
 
+
 struct Context
 {
-       std::string xmlns () const;
-
        int time_code_rate;
        Standard standard;
        int spot_number;
 };
 
+
 class Font
 {
 public:
@@ -87,6 +101,7 @@ private:
        std::map<std::string, std::string> _values;
 };
 
+
 class Part
 {
 public:
@@ -109,41 +124,49 @@ public:
        std::vector<std::shared_ptr<Part>> children;
 };
 
+
 class String : public Part
 {
 public:
-       String (std::shared_ptr<Part> parent, Font font, std::string text_)
+       String (std::shared_ptr<Part> parent, Font font, std::string text, float space_before)
                : Part (parent, font)
-               , text (text_)
+               , _text (text)
+               , _space_before (space_before)
        {}
 
-       virtual xmlpp::Element* as_xml (xmlpp::Element* parent, Context &) const;
+       virtual xmlpp::Element* as_xml (xmlpp::Element* parent, Context &) const override;
 
-       std::string text;
+private:
+       std::string _text;
+       float _space_before;
 };
 
+
 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)
                : Part (parent)
                , _h_align (h_align)
                , _h_position (h_position)
                , _v_align (v_align)
                , _v_position (v_position)
+               , _z_position(z_position)
                , _direction (direction)
        {}
 
-       xmlpp::Element* as_xml (xmlpp::Element* parent, Context& context) const;
+       xmlpp::Element* as_xml (xmlpp::Element* parent, Context& context) const override;
 
 private:
        HAlign _h_align;
        float _h_position;
        VAlign _v_align;
        float _v_position;
+       float _z_position;
        Direction _direction;
 };
 
+
 class Subtitle : public Part
 {
 public:
@@ -155,7 +178,7 @@ public:
                , _fade_down (fade_down)
        {}
 
-       xmlpp::Element* as_xml (xmlpp::Element* parent, Context& context) const;
+       xmlpp::Element* as_xml (xmlpp::Element* parent, Context& context) const override;
 
 private:
        Time _in;
@@ -164,10 +187,11 @@ private:
        Time _fade_down;
 };
 
+
 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)
@@ -175,9 +199,10 @@ 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;
+       xmlpp::Element* as_xml (xmlpp::Element* parent, Context& context) const override;
 
 private:
        ArrayData _png_data;
@@ -186,10 +211,12 @@ private:
        float _h_position;
        VAlign _v_align;
        float _v_position;
+       float _z_position;
 };
 
-}
 
 }
+}
+
 
 #endif