projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Explicitly set up Grok logger rather than relying on a static variable.
[dcpomatic.git]
/
src
/
lib
/
player_text.h
diff --git
a/src/lib/player_text.h
b/src/lib/player_text.h
index 45c8bf589f39339b35b5df491b96e25d43271c71..5921b28f6f5a1c3af9e550e86390c5d440f14ed0 100644
(file)
--- a/
src/lib/player_text.h
+++ b/
src/lib/player_text.h
@@
-24,7
+24,6
@@
#include "bitmap_text.h"
#include "bitmap_text.h"
-#include "dcpomatic_time.h"
#include "string_text.h"
#include "string_text.h"
@@
-37,12
+36,9
@@
namespace dcpomatic {
class PlayerText
{
public:
class PlayerText
{
public:
- void add_fonts (std::list<std::shared_ptr<dcpomatic::Font>> fonts_);
- std::list<std::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> bitmap;
- std::
list
<StringText> string;
+ std::
vector
<BitmapText> bitmap;
+ std::
vector
<StringText> string;
};
};