Try to add correct namespace for 3D CPLs.

[libdcp.git] / src / subtitle_asset.h

diff --git a/src/subtitle_asset.h b/src/subtitle_asset.h
index d3f9fa9b6ca95ed9ea1709bdb6434f397d140f02..fc0d932c0790aa788044cb59112b48432f1b9526 100644 (file)
--- a/src/subtitle_asset.h
+++ b/src/subtitle_asset.h
@@ -17,61 +17,20 @@
 
 */
 
+#include <libcxml/cxml.h>
 #include "asset.h"
-#include "xml.h"
 #include "dcp_time.h"
 
 namespace libdcp
 {
 
-class TextNode : public XMLNode
+namespace parse
 {
-public:
-       TextNode () {}
-       TextNode (xmlpp::Node const * node);
-
-       float v_position;
-       std::string text;
-};
-
-class SubtitleNode : public XMLNode
-{
-public:
-       SubtitleNode () {}
-       SubtitleNode (xmlpp::Node const * node);
-
-       Time in;
-       Time out;
-       std::list<boost::shared_ptr<TextNode> > text_nodes;
-};
-
-class FontNode : public XMLNode
-{
-public:
-       FontNode () {}
-       FontNode (xmlpp::Node const * node);
-       FontNode (std::list<boost::shared_ptr<FontNode> > const & font_nodes);
-
-       std::string id;
-       int size;
-       boost::optional<bool> italic;
-       boost::optional<Color> color;
-       std::string effect;
-       boost::optional<Color> effect_color;
-       
-       std::list<boost::shared_ptr<SubtitleNode> > subtitle_nodes;
-       std::list<boost::shared_ptr<FontNode> > font_nodes;
-};
-
-class LoadFontNode : public XMLNode
-{
-public:
-       LoadFontNode () {}
-       LoadFontNode (xmlpp::Node const * node);
-
-       std::string id;
-       std::string uri;
-};
+       class Font;
+       class Text;
+       class Subtitle;
+       class LoadFont;
+}
 
 class Subtitle
 {
@@ -84,9 +43,12 @@ public:
                Time in,
                Time out,
                float v_position,
+               VAlign v_align,
                std::string text,
-               std::string effect,
-               Color effect_color
+               Effect effect,
+               Color effect_color,
+               Time fade_up_time,
+               Time fade_down_time
                );
 
        std::string font () const {
@@ -117,7 +79,11 @@ public:
                return _v_position;
        }
 
-       std::string effect () const {
+       VAlign v_align () const {
+               return _v_align;
+       }
+
+       Effect effect () const {
                return _effect;
        }
 
@@ -125,6 +91,18 @@ public:
                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:
@@ -135,20 +113,28 @@ private:
        Time _in;
        Time _out;
        float _v_position;
+       VAlign _v_align;
        std::string _text;
-       std::string _effect;
+       Effect _effect;
        Color _effect_color;
+       Time _fade_up_time;
+       Time _fade_down_time;
 };
 
-class SubtitleAsset : public Asset, public XMLFile
+bool operator== (Subtitle const & a, Subtitle const & b);
+std::ostream& operator<< (std::ostream& s, Subtitle const & sub);
+
+class SubtitleAsset : public Asset
 {
 public:
-       SubtitleAsset (std::string directory, std::string xml);
+       SubtitleAsset (std::string directory, std::string xml_file);
+       SubtitleAsset (std::string directory, std::string movie_title, std::string language);
 
-       void write_to_cpl (std::ostream&) const {}
-       virtual std::list<std::string> equals (boost::shared_ptr<const Asset>, EqualityOptions) const {
+       void write_to_cpl (xmlpp::Node *, bool) const;
+       virtual bool equals (boost::shared_ptr<const Asset>, EqualityOptions, boost::function<void (NoteType, std::string)> note) const {
                /* XXX */
-               return std::list<std::string> ();
+               note (ERROR, "subtitle assets not compared yet");
+               return true;
        }
 
        std::string language () const {
@@ -156,18 +142,47 @@ public:
        }
 
        std::list<boost::shared_ptr<Subtitle> > subtitles_at (Time t) const;
+       std::list<boost::shared_ptr<Subtitle> > const & subtitles () const {
+               return _subtitles;
+       }
+
+       void add (boost::shared_ptr<Subtitle>);
+
+       void read_xml (std::string);
+       void write_xml () const;
+       void write_xml (std::ostream &) const;
 
 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);
+
+       struct ParseState {
+               std::list<boost::shared_ptr<parse::Font> > font_nodes;
+               std::list<boost::shared_ptr<parse::Text> > text_nodes;
+               std::list<boost::shared_ptr<parse::Subtitle> > subtitle_nodes;
+       };
+
+       void maybe_add_subtitle (std::string text, ParseState const & parse_state);
        
-       std::string _subtitle_id;
+       void examine_font_nodes (
+               boost::shared_ptr<const cxml::Node> xml,
+               std::list<boost::shared_ptr<parse::Font> > const & font_nodes,
+               ParseState& parse_state
+               );
+       
+       void examine_text_nodes (
+               boost::shared_ptr<const cxml::Node> xml,
+               std::list<boost::shared_ptr<parse::Text> > const & text_nodes,
+               ParseState& parse_state
+               );
+
        std::string _movie_title;
-       int64_t _reel_number;
+       /* strangely, this is sometimes a string */
+       std::string _reel_number;
        std::string _language;
-       std::list<boost::shared_ptr<LoadFontNode> > _load_font_nodes;
+       std::list<boost::shared_ptr<parse::LoadFont> > _load_font_nodes;
 
        std::list<boost::shared_ptr<Subtitle> > _subtitles;
+       bool _need_sort;
 };
 
 }