projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improve a variable name.
[dcpomatic.git]
/
src
/
lib
/
dcp_subtitle_decoder.h
diff --git
a/src/lib/dcp_subtitle_decoder.h
b/src/lib/dcp_subtitle_decoder.h
index 359d191457379f8713ed9ee78035c3ac0a6b0a42..16f89b53002b0023dd09e4baa37704aa6b3afdde 100644
(file)
--- a/
src/lib/dcp_subtitle_decoder.h
+++ b/
src/lib/dcp_subtitle_decoder.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014
-2021
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,22
+18,28
@@
*/
*/
-#include "subtitle_decoder.h"
+
+#include "text_decoder.h"
#include "dcp_subtitle.h"
#include "dcp_subtitle.h"
+
class DCPSubtitleContent;
class DCPSubtitleContent;
+
class DCPSubtitleDecoder : public DCPSubtitle, public Decoder
{
public:
class DCPSubtitleDecoder : public DCPSubtitle, public Decoder
{
public:
- DCPSubtitleDecoder (boost::shared_ptr<const DCPSubtitleContent>, boost::shared_ptr<Log> log);
+ DCPSubtitleDecoder (std::shared_ptr<const Film> film, std::shared_ptr<const DCPSubtitleContent>);
+
+ bool pass () override;
+ void seek (dcpomatic::ContentTime time, bool accurate) override;
- bool pass ();
- void seek (ContentTime time, bool accurate);
+ boost::optional<dcpomatic::ContentTime> first () const;
private:
private:
- ContentTimePeriod content_time_period (dcp::SubtitleString s) const;
+ dcpomatic::ContentTimePeriod content_time_period (std::shared_ptr<const dcp::Subtitle> s) const;
+ void update_position();
- std::
list<dcp::SubtitleString
> _subtitles;
- std::
list<dcp::SubtitleString
>::const_iterator _next;
+ std::
vector<std::shared_ptr<const dcp::Subtitle>
> _subtitles;
+ std::
vector<std::shared_ptr<const dcp::Subtitle>
>::const_iterator _next;
};
};