projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Assert that reel assets are all the same length.
[dcpomatic.git]
/
src
/
lib
/
player_subtitles.h
diff --git
a/src/lib/player_subtitles.h
b/src/lib/player_subtitles.h
index 65de500f63d265ca7bea8b6bbd5144122708a3e5..e1a104f2127c89a4d56e865f513f5f5320baab7b 100644
(file)
--- a/
src/lib/player_subtitles.h
+++ b/
src/lib/player_subtitles.h
@@
-1,19
+1,20
@@
/*
/*
- Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014
-2015
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/>.
*/
*/
@@
-21,22
+22,21
@@
#define DCPOMATIC_PLAYER_SUBTITLES_H
#include "image_subtitle.h"
#define DCPOMATIC_PLAYER_SUBTITLES_H
#include "image_subtitle.h"
-#include <dcp/subtitle_string.h>
+#include "dcpomatic_time.h"
+#include "subtitle_string.h"
+
+class Font;
+/** A set of subtitles which span the same time period */
class PlayerSubtitles
{
public:
class PlayerSubtitles
{
public:
- PlayerSubtitles (DCPTime f, DCPTime t)
- : from (f)
- , to (t)
- {}
-
- DCPTime from;
- DCPTime to;
+ void add_fonts (std::list<boost::shared_ptr<Font> > fonts_);
+ std::list<boost::shared_ptr<Font> > fonts;
/** ImageSubtitles, with their rectangles transformed as specified by their content */
std::list<ImageSubtitle> image;
/** ImageSubtitles, with their rectangles transformed as specified by their content */
std::list<ImageSubtitle> image;
- std::list<
dcp::
SubtitleString> text;
+ std::list<SubtitleString> text;
};
#endif
};
#endif