projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated nl_NL translation from Rob van Nieuwkerk.
[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 b16b825e7d76b3a401bc36c94a28b382771b1cd8..0809b359a1a6daa7b5349455fadab624ec08e418 100644
(file)
--- a/
src/lib/ffmpeg_subtitle_stream.h
+++ b/
src/lib/ffmpeg_subtitle_stream.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2013-201
4
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-201
5
Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-26,11
+26,16
@@
public:
FFmpegSubtitleStream (std::string n, int i)
: FFmpegStream (n, i)
{}
FFmpegSubtitleStream (std::string n, int i)
: FFmpegStream (n, i)
{}
-
+
FFmpegSubtitleStream (cxml::ConstNodePtr);
void as_xml (xmlpp::Node *) const;
FFmpegSubtitleStream (cxml::ConstNodePtr);
void as_xml (xmlpp::Node *) const;
- std::vector<ContentTimePeriod> periods;
-};
+ void add_subtitle (ContentTimePeriod period);
+ std::list<ContentTimePeriod> subtitles_during (ContentTimePeriod period, bool starting) const;
+ ContentTime find_subtitle_to (ContentTime from) const;
+ void add_offset (ContentTime offset);
+private:
+ std::map<ContentTime, ContentTime> _subtitles;
+};