X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Freel_writer.h;h=ae64c3ac77ed9c73bd6f4f6939c9f5c6710548cf;hb=3c1528e7406becf62d4d57d2515bca17d9bd1067;hp=cd22fa775ca969c414da1996743e806b358107d9;hpb=9cb73fbc0fa4643612f01665bc6d9fc430656f32;p=dcpomatic.git diff --git a/src/lib/reel_writer.h b/src/lib/reel_writer.h index cd22fa775..ae64c3ac7 100644 --- a/src/lib/reel_writer.h +++ b/src/lib/reel_writer.h @@ -21,7 +21,8 @@ #include "types.h" #include "dcpomatic_time.h" #include "referenced_reel_asset.h" -#include "player_caption.h" +#include "player_text.h" +#include "dcp_text_track.h" #include #include @@ -60,7 +61,7 @@ public: void fake_write (Frame frame, Eyes eyes, int size); void repeat_write (Frame frame, Eyes eyes); void write (boost::shared_ptr audio); - void write (PlayerCaption text, TextType type, DCPTimePeriod period); + void write (PlayerText text, TextType type, boost::optional track, DCPTimePeriod period); void finish (); boost::shared_ptr create_reel (std::list const & refs, std::list > const & fonts); @@ -114,6 +115,7 @@ private: boost::shared_ptr _sound_asset; boost::shared_ptr _sound_asset_writer; boost::shared_ptr _subtitle_asset; + std::map > _closed_caption_assets; static int const _info_size; };