projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Basic and slightly inaccurate support for <Space> in subtitles (#2103).
[dcpomatic.git]
/
src
/
lib
/
content_text.h
diff --git
a/src/lib/content_text.h
b/src/lib/content_text.h
index 2d8910577926c38bd259b1e10a7a7c82c90f356d..5edb9af2083be0993339caefa876dc09e3627e7d 100644
(file)
--- a/
src/lib/content_text.h
+++ b/
src/lib/content_text.h
@@
-33,22
+33,22
@@
class Image;
class ContentText
{
public:
class ContentText
{
public:
- explicit ContentText (ContentTime f)
+ explicit ContentText (
dcpomatic::
ContentTime f)
: _from (f)
{}
: _from (f)
{}
- ContentTime from () const {
+
dcpomatic::
ContentTime from () const {
return _from;
}
private:
return _from;
}
private:
- ContentTime _from;
+
dcpomatic::
ContentTime _from;
};
class ContentBitmapText : public ContentText
{
public:
};
class ContentBitmapText : public ContentText
{
public:
- ContentBitmapText (
ContentTime f, boost::shared_ptr<
Image> im, dcpomatic::Rect<double> r)
+ ContentBitmapText (
dcpomatic::ContentTime f, std::shared_ptr<const
Image> im, dcpomatic::Rect<double> r)
: ContentText (f)
, sub (im, r)
{}
: ContentText (f)
, sub (im, r)
{}
@@
-64,7
+64,7
@@
public:
class ContentStringText : public ContentText
{
public:
class ContentStringText : public ContentText
{
public:
- ContentStringText (ContentTime f, std::list<dcp::SubtitleString> s)
+ ContentStringText (
dcpomatic::
ContentTime f, std::list<dcp::SubtitleString> s)
: ContentText (f)
, subs (s)
{}
: ContentText (f)
, subs (s)
{}