summaryrefslogtreecommitdiff
path: root/src/dcp/font.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-01-12 22:19:06 +0000
committerCarl Hetherington <cth@carlh.net>2015-01-12 22:19:06 +0000
commit1f6bd6a9128dff57b690827104a683671436eba6 (patch)
tree038f0862e38061e0ba0af537d69daa33b40904b7 /src/dcp/font.h
parent98849307fdb27a4cbf760d358fbb82dc60628b05 (diff)
Tests pass.
Diffstat (limited to 'src/dcp/font.h')
-rw-r--r--src/dcp/font.h7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/dcp/font.h b/src/dcp/font.h
index 564e365..a1d8223 100644
--- a/src/dcp/font.h
+++ b/src/dcp/font.h
@@ -42,20 +42,15 @@ public:
: size (0)
{}
- Font (cxml::ConstNodePtr node, bool smpte);
+ Font (cxml::ConstNodePtr node);
Font (std::list<boost::shared_ptr<Font> > const & font_nodes);
- std::string text;
boost::optional<std::string> id;
int size;
boost::optional<bool> italic;
boost::optional<Colour> colour;
boost::optional<Effect> effect;
boost::optional<Colour> effect_colour;
-
- std::list<boost::shared_ptr<Subtitle> > subtitle_nodes;
- std::list<boost::shared_ptr<Font> > font_nodes;
- std::list<boost::shared_ptr<Text> > text_nodes;
};
}