Tidy up diffing of frames a bit.

[libdcp.git] / src / subtitle_asset.h

diff --git a/src/subtitle_asset.h b/src/subtitle_asset.h
index 04154a450f768c7cd83e7b02d637d3359c06fa0c..4d62bfb4d8335578618b3281ba32838178bb2dc2 100644 (file)
--- a/src/subtitle_asset.h
+++ b/src/subtitle_asset.h
@@ -24,6 +24,8 @@
 namespace libdcp
 {
 
+class FontNode;
+
 class TextNode : public XMLNode
 {
 public:
@@ -31,7 +33,9 @@ public:
        TextNode (xmlpp::Node const * node);
 
        float v_position;
+       VAlign v_align;
        std::string text;
+       std::list<boost::shared_ptr<FontNode> > font_nodes;
 };
 
 class SubtitleNode : public XMLNode
@@ -42,7 +46,13 @@ public:
 
        Time in;
        Time out;
+       Time fade_up_time;
+       Time fade_down_time;
+       std::list<boost::shared_ptr<FontNode> > font_nodes;
        std::list<boost::shared_ptr<TextNode> > text_nodes;
+
+private:
+       Time fade_time (std::string name);
 };
 
 class FontNode : public XMLNode
@@ -50,13 +60,19 @@ class FontNode : public XMLNode
 public:
        FontNode () {}
        FontNode (xmlpp::Node const * node);
+       FontNode (std::list<boost::shared_ptr<FontNode> > const & font_nodes);
 
+       std::string text;
        std::string id;
        int size;
        boost::optional<bool> italic;
+       boost::optional<Color> color;
+       boost::optional<Effect> effect;
+       boost::optional<Color> effect_color;
        
        std::list<boost::shared_ptr<SubtitleNode> > subtitle_nodes;
        std::list<boost::shared_ptr<FontNode> > font_nodes;
+       std::list<boost::shared_ptr<TextNode> > text_nodes;
 };
 
 class LoadFontNode : public XMLNode
@@ -75,11 +91,17 @@ public:
        Subtitle (
                std::string font,
                bool italic,
+               Color color,
                int size,
                Time in,
                Time out,
                float v_position,
-               std::string text
+               VAlign v_align,
+               std::string text,
+               Effect effect,
+               Color effect_color,
+               Time fade_up_time,
+               Time fade_down_time
                );
 
        std::string font () const {
@@ -90,6 +112,10 @@ public:
                return _italic;
        }
 
+       Color color () const {
+               return _color;
+       }
+
        Time in () const {
                return _in;
        }
@@ -106,18 +132,51 @@ public:
                return _v_position;
        }
 
+       VAlign v_align () const {
+               return _v_align;
+       }
+
+       Effect effect () const {
+               return _effect;
+       }
+
+       Color effect_color () const {
+               return _effect_color;
+       }
+
+       Time fade_up_time () const {
+               return _fade_up_time;
+       }
+
+       Time fade_down_time () const {
+               return _fade_down_time;
+       }
+
+       int size () const {
+               return _size;
+       }
+       
        int size_in_pixels (int screen_height) const;
 
 private:
        std::string _font;
        bool _italic;
+       Color _color;
        int _size;
        Time _in;
        Time _out;
        float _v_position;
+       VAlign _v_align;
        std::string _text;
+       Effect _effect;
+       Color _effect_color;
+       Time _fade_up_time;
+       Time _fade_down_time;
 };
 
+bool operator== (Subtitle const & a, Subtitle const & b);
+std::ostream& operator<< (std::ostream& s, Subtitle const & sub);
+
 class SubtitleAsset : public Asset, public XMLFile
 {
 public:
@@ -134,13 +193,30 @@ public:
        }
 
        std::list<boost::shared_ptr<Subtitle> > subtitles_at (Time t) const;
+       std::list<boost::shared_ptr<Subtitle> > const & subtitles () const {
+               return _subtitles;
+       }
 
 private:
        std::string font_id_to_name (std::string id) const;
-       void examine_font_node (boost::shared_ptr<FontNode> font_node, std::list<boost::shared_ptr<FontNode> >& current_font_nodes);
-       std::string id_from_font_nodes (std::list<boost::shared_ptr<FontNode> > const & font_nodes) const;
-       int size_from_font_nodes (std::list<boost::shared_ptr<FontNode> > const & font_nodes) const;
-       bool italic_from_font_nodes (std::list<boost::shared_ptr<FontNode> > const & font_nodes) const;
+
+       struct ParseState {
+               std::list<boost::shared_ptr<FontNode> > font_nodes;
+               std::list<boost::shared_ptr<TextNode> > text_nodes;
+               std::list<boost::shared_ptr<SubtitleNode> > subtitle_nodes;
+       };
+
+       void maybe_add_subtitle (std::string text, ParseState const & parse_state);
+       
+       void examine_font_nodes (
+               std::list<boost::shared_ptr<FontNode> > const & font_nodes,
+               ParseState& parse_state
+               );
+       
+       void examine_text_nodes (
+               std::list<boost::shared_ptr<TextNode> > const & text_nodes,
+               ParseState& parse_state
+               );
        
        std::string _subtitle_id;
        std::string _movie_title;