Actually turn on HMAC use.

[libdcp.git] / src / font_node.h

diff --git a/src/font_node.h b/src/font_node.h
index 97efde739fff293f2e018af24fdc8003e2474512..508156364f80466b6a495ef3d9e3c610065de406 100644 (file)
--- 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<boost::shared_ptr<FontNode> > const & font_nodes);
 
        std::string text;
        boost::optional<std::string> id;
        int size;
+       boost::optional<float> aspect_adjust;
        boost::optional<bool> italic;
        boost::optional<Colour> colour;
        boost::optional<Effect> effect;
        boost::optional<Colour> effect_colour;
-       
+
        std::list<boost::shared_ptr<SubtitleNode> > subtitle_nodes;
        std::list<boost::shared_ptr<FontNode> > font_nodes;
        std::list<boost::shared_ptr<TextNode> > text_nodes;