diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-12-19 02:13:12 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-12-19 02:13:12 +0100 |
| commit | ea67859b383a31496a604e65a166974b20a1c94e (patch) | |
| tree | 1740b2658f5033b59442e3958ba77b53905b16fa /src/lib/player_text.h | |
| parent | b5335ed37e52c216a6773789c0edba5f335c8df2 (diff) | |
Hack: delay decisions about subtitle position late enough that we can refresh the preview image quickly.attic/hack-faster-subtitle-moving
Diffstat (limited to 'src/lib/player_text.h')
| -rw-r--r-- | src/lib/player_text.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/lib/player_text.h b/src/lib/player_text.h index fb1d846d8..37c55db4a 100644 --- a/src/lib/player_text.h +++ b/src/lib/player_text.h @@ -18,17 +18,20 @@ */ -#ifndef DCPOMATIC_PLAYER_CAPTION_H -#define DCPOMATIC_PLAYER_CAPTION_H +#ifndef DCPOMATIC_PLAYER_TEXT_H +#define DCPOMATIC_PLAYER_TEXT_H #include "bitmap_text.h" #include "dcpomatic_time.h" #include "string_text.h" +#include <boost/weak_ptr.hpp> namespace dcpomatic { class Font; } +class TextContent; + /** A set of text (subtitle/CCAP) which span the same time period */ class PlayerText { @@ -36,9 +39,13 @@ public: void add_fonts (std::list<boost::shared_ptr<dcpomatic::Font> > fonts_); std::list<boost::shared_ptr<dcpomatic::Font> > fonts; + boost::weak_ptr<const TextContent> content; /** BitmapTexts, with their rectangles transformed as specified by their content */ std::list<BitmapText> bitmap; std::list<StringText> string; }; +extern bool operator== (PlayerText const & a, PlayerText const & b); +extern bool operator!= (PlayerText const & a, PlayerText const & b); + #endif |