projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change video content scaling so that it either:
[dcpomatic.git]
/
src
/
lib
/
player_text.h
diff --git
a/src/lib/player_text.h
b/src/lib/player_text.h
index 5a8799116fff7510790ca577edcaf8a7cf3d823e..fb1d846d8217d2c4f85af36c7b81270deff45db4 100644
(file)
--- a/
src/lib/player_text.h
+++ b/
src/lib/player_text.h
@@
-25,18
+25,20
@@
#include "dcpomatic_time.h"
#include "string_text.h"
#include "dcpomatic_time.h"
#include "string_text.h"
-class Font;
+namespace dcpomatic {
+ class Font;
+}
/** A set of text (subtitle/CCAP) which span the same time period */
class PlayerText
{
public:
/** A set of text (subtitle/CCAP) which span the same time period */
class PlayerText
{
public:
- void add_fonts (std::list<boost::shared_ptr<Font> > fonts_);
- std::list<boost::shared_ptr<Font> > fonts;
+ void add_fonts (std::list<boost::shared_ptr<
dcpomatic::
Font> > fonts_);
+ std::list<boost::shared_ptr<
dcpomatic::
Font> > fonts;
/** BitmapTexts, with their rectangles transformed as specified by their content */
/** BitmapTexts, with their rectangles transformed as specified by their content */
- std::list<BitmapText>
image
;
- std::list<StringText>
text
;
+ std::list<BitmapText>
bitmap
;
+ std::list<StringText>
string
;
};
#endif
};
#endif