projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add more missing override labels.
[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 0756a278f4b475212e2313b2efe40c2dbf76d7d1..4a54aaf2ef09529ead0f04f29b57eda8423a6778 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,30
@@
*/
*/
-#include "subtitle_decoder.h"
+
+#include "text_decoder.h"
#include "dcp_subtitle.h"
#include "dcp_subtitle.h"
+#include "font_data.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 ();
- void seek (ContentTime time, bool accurate);
+ bool pass () override;
+ void seek (dcpomatic::ContentTime time, bool accurate) override;
+
+ std::vector<dcpomatic::FontData> fonts () const override;
private:
private:
- ContentTimePeriod content_time_period (boost::shared_ptr<dcp::Subtitle> s) const;
+ dcpomatic::ContentTimePeriod content_time_period (std::shared_ptr<const dcp::Subtitle> s) const;
+
+ std::vector<std::shared_ptr<const dcp::Subtitle>> _subtitles;
+ std::vector<std::shared_ptr<const dcp::Subtitle>>::const_iterator _next;
- std::list<boost::shared_ptr<dcp::Subtitle> > _subtitles;
- std::list<boost::shared_ptr<dcp::Subtitle> >::const_iterator _next;
+ std::vector<dcpomatic::FontData> _fonts;
};
};