Add test() to cscript.

[libdcp.git] / src / subtitle_asset.h

diff --git a/src/subtitle_asset.h b/src/subtitle_asset.h
index 3dfbe7e2a388cefe31ee5803c7f56e0ad93027e0..335b9f37b0af22c3456b12b003348339d34e2d1a 100644 (file)
--- a/src/subtitle_asset.h
+++ b/src/subtitle_asset.h
@@ -47,6 +47,7 @@ public:
                Time out,
                float v_position,
                VAlign v_align,
+               HAlign h_align,
                std::string text,
                Effect effect,
                Color effect_color,
@@ -90,6 +91,10 @@ public:
                return _v_align;
        }
 
+       HAlign h_align () const {
+               return _h_align;
+       }
+
        Effect effect () const {
                return _effect;
        }
@@ -123,10 +128,11 @@ private:
        Time _in;
        Time _out;
        /** Vertical position as a proportion of the screen height from the top
-        *  (between 0 and 1)
+        *  (between 0 and 100).
         */
        float _v_position;
        VAlign _v_align;
+       HAlign _h_align;
        std::string _text;
        Effect _effect;
        Color _effect_color;
@@ -154,7 +160,7 @@ public:
                return _language;
        }
 
-       std::list<boost::shared_ptr<Subtitle> > subtitles_at (Time t) const;
+       std::list<boost::shared_ptr<Subtitle> > subtitles_during (Time from, Time to) const;
        std::list<boost::shared_ptr<Subtitle> > const & subtitles () const {
                return _subtitles;
        }
@@ -174,27 +180,17 @@ protected:
 private:
        std::string font_id_to_name (std::string id) const;
        void read_mxf (std::string);
-       void read_xml (boost::shared_ptr<cxml::Document>);
+       void read_xml (boost::shared_ptr<cxml::Document>, bool smpte);
 
        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;
+               boost::shared_ptr<Subtitle> current;
        };
 
-       void maybe_add_subtitle (std::string text, ParseState const & parse_state);
-       
-       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
-               );
+       void parse_node (xmlpp::Node* node, ParseState& parse_state, boost::optional<int> tcr);
+       void maybe_add_subtitle (std::string text, ParseState& parse_state);
 
        boost::optional<std::string> _movie_title;
        /* strangely, this is sometimes a string */