projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move luminance to Interop/SMPTE metadata and remove the ISDCF metadata dialogue.
[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 070562458b64d396468728892c438027637756bc..a9540c3cf05e6896901683d1eaf5c9a20f770889 100644
(file)
--- a/
src/lib/dcp_subtitle_decoder.h
+++ b/
src/lib/dcp_subtitle_decoder.h
@@
-1,38
+1,44
@@
/*
/*
- Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014
-2020
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 "font_data.h"
class DCPSubtitleContent;
class DCPSubtitleContent;
-class DCPSubtitleDecoder : public
Subtitle
Decoder
+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>);
-protected:
- void seek (ContentTime time, bool accurate);
bool pass ();
bool pass ();
+ void seek (dcpomatic::ContentTime time, bool accurate);
+
+ std::vector<dcpomatic::FontData> fonts () const;
private:
private:
- std::list<ContentTimePeriod> subtitles_during (ContentTimePeriod, bool starting) 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<dcp::SubtitleString> _subtitles;
- std::list<dcp::SubtitleString>::const_iterator _next;
+ std::vector<dcpomatic::FontData> _fonts;
};
};