projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Setup Butler::_prepare_only_proxy on construction.
[dcpomatic.git]
/
src
/
lib
/
player_text.h
diff --git
a/src/lib/player_text.h
b/src/lib/player_text.h
index 93b6cd9706d99a07ca298b10da3e3eb0682d3c92..45c8bf589f39339b35b5df491b96e25d43271c71 100644
(file)
--- a/
src/lib/player_text.h
+++ b/
src/lib/player_text.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2014-20
18
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014-20
21
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,25
+18,32
@@
*/
*/
-#ifndef DCPOMATIC_PLAYER_TEXT_H
-#define DCPOMATIC_PLAYER_TEXT_H
+
+#ifndef DCPOMATIC_PLAYER_CAPTION_H
+#define DCPOMATIC_PLAYER_CAPTION_H
+
#include "bitmap_text.h"
#include "dcpomatic_time.h"
#include "bitmap_text.h"
#include "dcpomatic_time.h"
-#include "plain_text.h"
+#include "string_text.h"
+
+
+namespace dcpomatic {
+ class Font;
+}
-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<
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>
image
;
- std::list<
PlainText> text
;
+ std::list<BitmapText>
bitmap
;
+ std::list<
StringText> string
;
};
};
+
#endif
#endif