Small tweaks to times in progress reports.

[dcpomatic.git] / src / lib / player_subtitles.h

diff --git a/src/lib/player_subtitles.h b/src/lib/player_subtitles.h
index 804c87cb9e22b2fb62c062572d23599a0af8084b..b43a1d0a9ffeeb5721fa5aa0f366037753be98cd 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.
 
-    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 <http://www.gnu.org/licenses/>.
 
 */
 
@@ -21,8 +22,11 @@
 #define DCPOMATIC_PLAYER_SUBTITLES_H
 
 #include "image_subtitle.h"
+#include "dcpomatic_time.h"
 #include <dcp/subtitle_string.h>
 
+class Font;
+
 class PlayerSubtitles
 {
 public:
@@ -30,15 +34,16 @@ public:
                : from (f)
                , to (t)
        {}
-       
+
+       void add_fonts (std::list<boost::shared_ptr<Font> > fonts_);
+
        DCPTime from;
        DCPTime to;
+       std::list<boost::shared_ptr<Font> > fonts;
 
        /** ImageSubtitles, with their rectangles transformed as specified by their content */
        std::list<ImageSubtitle> image;
        std::list<dcp::SubtitleString> text;
-
-       std::string language;
 };
 
 #endif