projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Put Font and Screen into dcpomatic namespace.
[dcpomatic.git]
/
src
/
lib
/
text_content.h
diff --git
a/src/lib/text_content.h
b/src/lib/text_content.h
index c7d1b590d101cbdf5e5acb4c08a822c3c6a0c231..5eda8764ffeaa91ea5c20758fb46c2cad71e1844 100644
(file)
--- a/
src/lib/text_content.h
+++ b/
src/lib/text_content.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2013-201
8
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-201
9
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-27,7
+27,9
@@
#include <dcp/types.h>
#include <boost/signals2.hpp>
#include <dcp/types.h>
#include <boost/signals2.hpp>
-class Font;
+namespace dcpomatic {
+ class Font;
+}
class TextContentProperty
{
class TextContentProperty
{
@@
-67,7
+69,7
@@
public:
std::string identifier () const;
void take_settings_from (boost::shared_ptr<const TextContent> c);
std::string identifier () const;
void take_settings_from (boost::shared_ptr<const TextContent> c);
- void add_font (boost::shared_ptr<Font> font);
+ void add_font (boost::shared_ptr<
dcpomatic::
Font> font);
void set_use (bool);
void set_burn (bool);
void set_use (bool);
void set_burn (bool);
@@
-122,7
+124,7
@@
public:
return _y_scale;
}
return _y_scale;
}
- std::list<boost::shared_ptr<Font> > fonts () const {
+ std::list<boost::shared_ptr<
dcpomatic::
Font> > fonts () const {
boost::mutex::scoped_lock lm (_mutex);
return _fonts;
}
boost::mutex::scoped_lock lm (_mutex);
return _fonts;
}
@@
-211,7
+213,7
@@
private:
double _x_scale;
/** y scale factor to apply to subtitles */
double _y_scale;
double _x_scale;
/** y scale factor to apply to subtitles */
double _y_scale;
- std::list<boost::shared_ptr<Font> > _fonts;
+ std::list<boost::shared_ptr<
dcpomatic::
Font> > _fonts;
boost::optional<dcp::Colour> _colour;
boost::optional<dcp::Effect> _effect;
boost::optional<dcp::Colour> _effect_colour;
boost::optional<dcp::Colour> _colour;
boost::optional<dcp::Effect> _effect;
boost::optional<dcp::Colour> _effect_colour;