projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reword again: Text -> Caption and Plain -> Text.
[dcpomatic.git]
/
src
/
lib
/
ffmpeg_subtitle_stream.h
diff --git
a/src/lib/ffmpeg_subtitle_stream.h
b/src/lib/ffmpeg_subtitle_stream.h
index a39b10ffd6624804baa80916a1cfe1f894d32a9e..064c72f8d6166b1beef064cf16d39bd21fb82e8e 100644
(file)
--- a/
src/lib/ffmpeg_subtitle_stream.h
+++ b/
src/lib/ffmpeg_subtitle_stream.h
@@
-1,24
+1,27
@@
/*
/*
- Copyright (C) 2013-201
5
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-201
7
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 "dcpomatic_time.h"
*/
#include "dcpomatic_time.h"
+#include "rgba.h"
#include "ffmpeg_stream.h"
#include "ffmpeg_stream.h"
+#include <map>
class FFmpegSubtitleStream : public FFmpegStream
{
class FFmpegSubtitleStream : public FFmpegStream
{
@@
-27,15
+30,13
@@
public:
: FFmpegStream (n, i)
{}
: FFmpegStream (n, i)
{}
- FFmpegSubtitleStream (cxml::ConstNodePtr);
+ FFmpegSubtitleStream (cxml::ConstNodePtr
node, int version
);
void as_xml (xmlpp::Node *) const;
void as_xml (xmlpp::Node *) const;
- void add_subtitle (ContentTimePeriod period);
- std::list<ContentTimePeriod> subtitles_during (ContentTimePeriod period, bool starting) const;
- ContentTime find_subtitle_to (ContentTime from) const;
+ void set_colour (RGBA from, RGBA to);
+ std::map<RGBA, RGBA> colours () const;
private:
private:
- std::map<
ContentTime, ContentTime> _subtitle
s;
+ std::map<
RGBA, RGBA> _colour
s;
};
};
-