projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup: use some more vector instead of list.
[dcpomatic.git]
/
src
/
lib
/
player_text.h
diff --git
a/src/lib/player_text.h
b/src/lib/player_text.h
index fb1d846d8217d2c4f85af36c7b81270deff45db4..5921b28f6f5a1c3af9e550e86390c5d440f14ed0 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,27
+18,28
@@
*/
*/
+
#ifndef DCPOMATIC_PLAYER_CAPTION_H
#define DCPOMATIC_PLAYER_CAPTION_H
#ifndef DCPOMATIC_PLAYER_CAPTION_H
#define DCPOMATIC_PLAYER_CAPTION_H
+
#include "bitmap_text.h"
#include "bitmap_text.h"
-#include "dcpomatic_time.h"
#include "string_text.h"
#include "string_text.h"
+
namespace dcpomatic {
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<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> bitmap;
- std::
list
<StringText> string;
+ std::
vector
<BitmapText> bitmap;
+ std::
vector
<StringText> string;
};
};
+
#endif
#endif