X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer_subtitles.h;h=e1a104f2127c89a4d56e865f513f5f5320baab7b;hb=a78b741c43830c84bcb4d18e3147746f13a668e5;hp=46994ea3bd4f7924576f23b00c495ce1d23887ac;hpb=73f52e94953848c696725defd3d7f5c4c30707e2;p=dcpomatic.git diff --git a/src/lib/player_subtitles.h b/src/lib/player_subtitles.h index 46994ea3b..e1a104f21 100644 --- a/src/lib/player_subtitles.h +++ b/src/lib/player_subtitles.h @@ -1,42 +1,42 @@ /* - Copyright (C) 2014 Carl Hetherington + Copyright (C) 2014-2015 Carl Hetherington - 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. - 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 - 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 . */ #ifndef DCPOMATIC_PLAYER_SUBTITLES_H #define DCPOMATIC_PLAYER_SUBTITLES_H -#include #include "image_subtitle.h" +#include "dcpomatic_time.h" +#include "subtitle_string.h" + +class Font; +/** A set of subtitles which span the same time period */ class PlayerSubtitles { public: - PlayerSubtitles (DCPTime f, DCPTime t) - : from (f) - , to (t) - {} - - DCPTime from; - DCPTime to; + void add_fonts (std::list > fonts_); + std::list > fonts; /** ImageSubtitles, with their rectangles transformed as specified by their content */ std::list image; - std::list text; + std::list text; }; #endif