X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ffont_node.h;h=508156364f80466b6a495ef3d9e3c610065de406;hb=1caefd8541e12e7d205c3d5bb46f3ec84719baa0;hp=97efde739fff293f2e018af24fdc8003e2474512;hpb=2246204c213d61b2cde7a85d6038156283670c9d;p=libdcp.git diff --git a/src/font_node.h b/src/font_node.h index 97efde73..50815636 100644 --- a/src/font_node.h +++ b/src/font_node.h @@ -30,7 +30,7 @@ namespace dcp { -/** @class Font +/** @class FontNode * @brief Helper class for parsing subtitle XML. */ class FontNode @@ -39,18 +39,19 @@ public: FontNode () : size (0) {} - - FontNode (cxml::ConstNodePtr node, int tcr); + + FontNode (cxml::ConstNodePtr node, int tcr, std::string font_id_attribute); FontNode (std::list > const & font_nodes); std::string text; boost::optional id; int size; + boost::optional aspect_adjust; boost::optional italic; boost::optional colour; boost::optional effect; boost::optional effect_colour; - + std::list > subtitle_nodes; std::list > font_nodes; std::list > text_nodes;