X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer_subtitles.h;h=b43a1d0a9ffeeb5721fa5aa0f366037753be98cd;hb=3828baf56467224f5d44049bf1e7a7ed11f43a05;hp=65de500f63d265ca7bea8b6bbd5144122708a3e5;hpb=5f2a57d1c21c3e8067dfd1f68505b1bf96e1d7c7;p=dcpomatic.git diff --git a/src/lib/player_subtitles.h b/src/lib/player_subtitles.h index 65de500f6..b43a1d0a9 100644 --- a/src/lib/player_subtitles.h +++ b/src/lib/player_subtitles.h @@ -1,19 +1,20 @@ /* - 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 . */ @@ -21,8 +22,11 @@ #define DCPOMATIC_PLAYER_SUBTITLES_H #include "image_subtitle.h" +#include "dcpomatic_time.h" #include +class Font; + class PlayerSubtitles { public: @@ -30,9 +34,12 @@ public: : from (f) , to (t) {} - + + void add_fonts (std::list > fonts_); + DCPTime from; DCPTime to; + std::list > fonts; /** ImageSubtitles, with their rectangles transformed as specified by their content */ std::list image;