Very slightly less verbose subs checking.

[libdcp.git] / src / subtitle_asset.h

diff --git a/src/subtitle_asset.h b/src/subtitle_asset.h
index 607b054d91a3ed6ea054d611211022824df7cdb5..72563470c982c1609a6fba31b35c6e68c4e11a7e 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:
@@ -49,6 +51,7 @@ public:
 
        Time in;
        Time out;
+       std::list<boost::shared_ptr<FontNode> > font_nodes;
        std::list<boost::shared_ptr<TextNode> > text_nodes;
 };
 
@@ -68,6 +71,7 @@ public:
        
        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
@@ -147,6 +151,10 @@ public:
                return _fade_down_time;
        }
 
+       int size () const {
+               return _size;
+       }
+       
        int size_in_pixels (int screen_height) const;
 
 private:
@@ -165,6 +173,9 @@ private:
        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:
@@ -181,10 +192,24 @@ 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);
+
+       void examine_font_nodes (
+               std::list<boost::shared_ptr<FontNode> > const & font_nodes,
+               std::list<boost::shared_ptr<FontNode> >& current_font_nodes,
+               std::list<boost::shared_ptr<SubtitleNode> >& current_subtitle_nodes
+               );
+       
+       void examine_text_nodes (
+               boost::shared_ptr<SubtitleNode> subtitle_node,
+               std::list<boost::shared_ptr<TextNode> > const & text_nodes,
+               std::list<boost::shared_ptr<FontNode> >& current_font_nodes
+               );
        
        std::string _subtitle_id;
        std::string _movie_title;