summaryrefslogtreecommitdiff
path: root/src/subtitle_asset.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-02-26 17:48:29 +0000
committerCarl Hetherington <cth@carlh.net>2014-02-26 17:48:29 +0000
commit471c9d05fc19484f3e50cf805d14237b72bbb7b2 (patch)
tree579ff1520617941734365a8e9f53985a86396507 /src/subtitle_asset.h
parentd7d879c988d484cb1a5fd65831001f656605c34e (diff)
Hacks to support MXF-wrapped subtitles.
Diffstat (limited to 'src/subtitle_asset.h')
-rw-r--r--src/subtitle_asset.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/subtitle_asset.h b/src/subtitle_asset.h
index 0598a296..a7ec641c 100644
--- a/src/subtitle_asset.h
+++ b/src/subtitle_asset.h
@@ -169,6 +169,8 @@ 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>);
struct ParseState {
std::list<boost::shared_ptr<parse::Font> > font_nodes;
@@ -190,7 +192,7 @@ private:
ParseState& parse_state
);
- std::string _movie_title;
+ boost::optional<std::string> _movie_title;
/* strangely, this is sometimes a string */
std::string _reel_number;
std::string _language;