projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix alignment of mail protocol control (#2042).
[dcpomatic.git]
/
src
/
lib
/
string_text_file_decoder.h
diff --git
a/src/lib/string_text_file_decoder.h
b/src/lib/string_text_file_decoder.h
index 6a9552bbec918f8b2c885f8adb9253bc450cdfe1..aa8c80e6e9152341d2f114a0118e4934dcf3fc4e 100644
(file)
--- a/
src/lib/string_text_file_decoder.h
+++ b/
src/lib/string_text_file_decoder.h
@@
-25,18
+25,19
@@
#include "decoder.h"
class StringTextFileContent;
#include "decoder.h"
class StringTextFileContent;
-class Log;
class StringTextFileDecoder : public Decoder, public StringTextFile
{
public:
class StringTextFileDecoder : public Decoder, public StringTextFile
{
public:
- StringTextFileDecoder (
boost::shared_ptr<const StringTextFileContent>, boost::shared_ptr<Log> log
);
+ StringTextFileDecoder (
std::shared_ptr<const Film> film, std::shared_ptr<const StringTextFileContent>
);
- void seek (ContentTime time, bool accurate);
+ void seek (
dcpomatic::
ContentTime time, bool accurate);
bool pass ();
bool pass ();
+ std::vector<dcpomatic::FontData> fonts () const;
+
private:
private:
- ContentTimePeriod content_time_period (sub::Subtitle s) const;
+
dcpomatic::
ContentTimePeriod content_time_period (sub::Subtitle s) const;
size_t _next;
};
size_t _next;
};