Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

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

diff --git a/src/lib/player_subtitles.h b/src/lib/player_subtitles.h
index 65de500f63d265ca7bea8b6bbd5144122708a3e5..d6c19561e0628e40e8fdaa699dffed3b651dda8d 100644 (file)
--- a/src/lib/player_subtitles.h
+++ b/src/lib/player_subtitles.h
@@ -1,5 +1,5 @@
 /*
-    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
     it under the terms of the GNU General Public License as published by
@@ -21,8 +21,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,9 +33,12 @@ 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;