projects
/
libdcp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Some OS X build fixes.
[libdcp.git]
/
src
/
font.h
diff --git
a/src/font.h
b/src/font.h
index 0250e997242c436b3865af7aab618239fac33434..a2589be4a934ac52de14ef229b49a73cc35b6382 100644
(file)
--- a/
src/font.h
+++ b/
src/font.h
@@
-23,14
+23,11
@@
#include "types.h"
#include "subtitle.h"
#include "types.h"
#include "subtitle.h"
+#include <libcxml/cxml.h>
#include <boost/shared_ptr.hpp>
#include <boost/optional.hpp>
#include <list>
#include <boost/shared_ptr.hpp>
#include <boost/optional.hpp>
#include <list>
-namespace cxml {
- class Node;
-}
-
namespace dcp {
/** @class Font
namespace dcp {
/** @class Font
@@
-43,16
+40,16
@@
public:
: size (0)
{}
: size (0)
{}
- Font (
boost::shared_ptr<const cxml::Node> node
);
+ Font (
cxml::ConstNodePtr node, int tcr
);
Font (std::list<boost::shared_ptr<Font> > const & font_nodes);
std::string text;
Font (std::list<boost::shared_ptr<Font> > const & font_nodes);
std::string text;
-
std::string
id;
+
boost::optional<std::string>
id;
int size;
boost::optional<bool> italic;
int size;
boost::optional<bool> italic;
- boost::optional<Colo
r> colo
r;
+ boost::optional<Colo
ur> colou
r;
boost::optional<Effect> effect;
boost::optional<Effect> effect;
- boost::optional<Colo
r> effect_colo
r;
+ boost::optional<Colo
ur> effect_colou
r;
std::list<boost::shared_ptr<Subtitle> > subtitle_nodes;
std::list<boost::shared_ptr<Font> > font_nodes;
std::list<boost::shared_ptr<Subtitle> > subtitle_nodes;
std::list<boost::shared_ptr<Font> > font_nodes;