Correctly parse \c tags in SSA (with no specified colour) to return to PrimaryColour.

[libsub.git] / src / ssa_reader.h

diff --git a/src/ssa_reader.h b/src/ssa_reader.h
index 07a0901d41d5f573e8819f74d970162134f5469c..45cc271382b74c4bff37de442ffab01a6e38a8f7 100644 (file)
--- a/src/ssa_reader.h
+++ b/src/ssa_reader.h
@@ -39,9 +39,10 @@ class SSAReader : public Reader
 {
 public:
        SSAReader (FILE* f);
-       SSAReader (std::string const & subs);
+       SSAReader (std::string subs);
 
-       static std::list<RawSubtitle> parse_line (RawSubtitle base, std::string line, int play_res_x, int play_res_y);
+       static std::vector<RawSubtitle> parse_line(RawSubtitle base, std::string line, int play_res_x, int play_res_y, Colour primary_colour);
+       static void parse_style(RawSubtitle& sub, std::string style, int play_res_x, int play_res_y, Colour primary_colour);
 
 private:
        void read (boost::function<boost::optional<std::string> ()> get_line);