From 7bc2134d658778e04f1756c255e604b4ab5a5831 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 7 Apr 2021 22:15:01 +0200 Subject: Assorted C++11/formatting cleanups. --- src/lib/player_text.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src/lib/player_text.h') diff --git a/src/lib/player_text.h b/src/lib/player_text.h index 232ba6516..cd4be984c 100644 --- a/src/lib/player_text.h +++ b/src/lib/player_text.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2014-2018 Carl Hetherington + Copyright (C) 2014-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,22 +18,26 @@ */ + #ifndef DCPOMATIC_PLAYER_CAPTION_H #define DCPOMATIC_PLAYER_CAPTION_H + #include "bitmap_text.h" #include "dcpomatic_time.h" #include "string_text.h" + namespace dcpomatic { class Font; } + /** A set of text (subtitle/CCAP) which span the same time period */ class PlayerText { public: - void add_fonts (std::list > fonts_); + void add_fonts (std::list> fonts_); std::list > fonts; /** BitmapTexts, with their rectangles transformed as specified by their content */ @@ -41,4 +45,5 @@ public: std::list string; }; + #endif -- cgit v1.2.3