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 46994ea3bd4f7924576f23b00c495ce1d23887ac..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
@@ -20,8 +20,11 @@
 #ifndef DCPOMATIC_PLAYER_SUBTITLES_H
 #define DCPOMATIC_PLAYER_SUBTITLES_H
 
-#include <dcp/subtitle_string.h>
 #include "image_subtitle.h"
+#include "dcpomatic_time.h"
+#include <dcp/subtitle_string.h>
+
+class Font;
 
 class PlayerSubtitles
 {
@@ -30,13 +33,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::list<dcp::SubtitleString> text;
 };
 
 #endif