projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix merge.
[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 688aaa9938633aaf0984ce332277d16ac5c63543..6d4853b8d2a4a83f5bd206158504e731f2f57c78 100644
(file)
--- a/
src/lib/ffmpeg_subtitle_stream.h
+++ b/
src/lib/ffmpeg_subtitle_stream.h
@@
-1,24
+1,27
@@
/*
Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2013-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/>.
*/
#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
{
@@
-37,13
+40,11
@@
public:
std::list<ContentTimePeriod> text_subtitles_during (ContentTimePeriod period, bool starting) const;
ContentTime find_subtitle_to (std::string id) const;
void add_offset (ContentTime offset);
std::list<ContentTimePeriod> text_subtitles_during (ContentTimePeriod period, bool starting) const;
ContentTime find_subtitle_to (std::string id) const;
void add_offset (ContentTime offset);
+ void set_colour (RGBA from, RGBA to);
+ std::map<RGBA, RGBA> colours () const;
- bool has_image_subtitles () const {
- return !_image_subtitles.empty ();
- }
- bool has_text_subtitles () const {
- return !_text_subtitles.empty ();
- }
+ bool has_text () const;
+ bool has_image () const;
private:
private:
@@
-54,4
+55,5
@@
private:
PeriodMap _image_subtitles;
PeriodMap _text_subtitles;
PeriodMap _image_subtitles;
PeriodMap _text_subtitles;
+ std::map<RGBA, RGBA> _colours;
};
};