projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Try larger menu bar icon on OS X.
[dcpomatic.git]
/
src
/
lib
/
text_subtitle_decoder.h
diff --git
a/src/lib/text_subtitle_decoder.h
b/src/lib/text_subtitle_decoder.h
index 9e37ecc3bcfc3e09711e5c3182d1fca84c686bb4..72bb89b77e57a89c8da71ecb449f663c0edb89d6 100644
(file)
--- a/
src/lib/text_subtitle_decoder.h
+++ b/
src/lib/text_subtitle_decoder.h
@@
-1,19
+1,20
@@
/*
Copyright (C) 2014-2016 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2014-2016 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/>.
*/
*/
@@
-28,15
+29,12
@@
class TextSubtitleContent;
class TextSubtitleDecoder : public Decoder, public TextSubtitle
{
public:
class TextSubtitleDecoder : public Decoder, public TextSubtitle
{
public:
- TextSubtitleDecoder (boost::shared_ptr<const TextSubtitleContent>);
+ TextSubtitleDecoder (boost::shared_ptr<const TextSubtitleContent>
, boost::shared_ptr<Log> log
);
-protected:
void seek (ContentTime time, bool accurate);
void seek (ContentTime time, bool accurate);
- bool pass (
PassReason, bool accurate
);
+ bool pass ();
private:
private:
- std::list<ContentTimePeriod> image_subtitles_during (ContentTimePeriod, bool starting) const;
- std::list<ContentTimePeriod> text_subtitles_during (ContentTimePeriod, bool starting) const;
ContentTimePeriod content_time_period (sub::Subtitle s) const;
size_t _next;
ContentTimePeriod content_time_period (sub::Subtitle s) const;
size_t _next;