projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add missing file=f so that all desktop shortcuts are uninstalled.
[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 9a16fb7c850dcf92e57ddf1ee7a80f8372386dc1..45a4999ddcf769781bd87c8a577264b6511a6e06 100644
(file)
--- a/
src/lib/dcp_subtitle_decoder.h
+++ b/
src/lib/dcp_subtitle_decoder.h
@@
-1,40
+1,47
@@
/*
/*
- Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014
-2021
Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
This program
is distributed in the hope that it will be useful,
+
DCP-o-matic
is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
*/
-#include "subtitle_decoder.h"
+
+#include "text_decoder.h"
#include "dcp_subtitle.h"
#include "dcp_subtitle.h"
+
class DCPSubtitleContent;
class DCPSubtitleContent;
-class DCPSubtitleDecoder : public SubtitleDecoder, public DCPSubtitle
+
+class DCPSubtitleDecoder : public DCPSubtitle, public Decoder
{
public:
{
public:
- DCPSubtitleDecoder (boost::shared_ptr<const DCPSubtitleContent>);
+ DCPSubtitleDecoder (std::shared_ptr<const Film> film, std::shared_ptr<const DCPSubtitleContent>);
+
+ bool pass () override;
+ void seek (dcpomatic::ContentTime time, bool accurate) override;
-protected:
- void seek (ContentTime time, bool accurate);
- bool pass ();
+ boost::optional<dcpomatic::ContentTime> first () const;
private:
private:
- std::list<ContentTimePeriod> image_subtitles_during (ContentTimePeriod, bool starting) const;
- std::list<ContentTimePeriod> text_subtitles_during (ContentTimePeriod, bool starting) const;
+ dcpomatic::ContentTimePeriod content_time_period (std::shared_ptr<const dcp::Subtitle> s) const;
+ void update_position();
+
+ std::vector<std::shared_ptr<const dcp::Subtitle>> _subtitles;
+ std::vector<std::shared_ptr<const dcp::Subtitle>>::const_iterator _next;
- std::list<dcp::SubtitleString> _subtitles;
- std::list<dcp::SubtitleString>::const_iterator _next;
+ dcp::SubtitleStandard _subtitle_standard;
};
};