projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rearrange subtitle font management.
[dcpomatic.git]
/
src
/
lib
/
content_text.h
diff --git
a/src/lib/content_text.h
b/src/lib/content_text.h
index cd9d34bf90bce7de028a930b63d15e5316b6d830..06fb39cfce6c423166c465a07d4d59af5367ef7e 100644
(file)
--- a/
src/lib/content_text.h
+++ b/
src/lib/content_text.h
@@
-26,6
+26,7
@@
#include "bitmap_text.h"
#include "dcpomatic_time.h"
#include "rect.h"
#include "bitmap_text.h"
#include "dcpomatic_time.h"
#include "rect.h"
+#include "string_text.h"
#include "types.h"
#include <dcp/subtitle_string.h>
#include <vector>
#include "types.h"
#include <dcp/subtitle_string.h>
#include <vector>
@@
-74,12
+75,12
@@
public:
class ContentStringText : public ContentText
{
public:
class ContentStringText : public ContentText
{
public:
- ContentStringText (dcpomatic::ContentTime f, std::vector<
dcp::SubtitleString
> s)
+ ContentStringText (dcpomatic::ContentTime f, std::vector<
StringText
> s)
: ContentText (f)
, subs (s)
{}
: ContentText (f)
, subs (s)
{}
- std::vector<
dcp::SubtitleString
> subs;
+ std::vector<
StringText
> subs;
};
};