X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Freel_writer.h;h=ae64c3ac77ed9c73bd6f4f6939c9f5c6710548cf;hb=d5804f33fbd01d104ed2b04400992ef32b81cf49;hp=8007b7f2900231e94f2e4f4f378fb469edea5640;hpb=df17bbd25da69fc38eb2dcd8b4a2531cf0bab0bc;p=dcpomatic.git diff --git a/src/lib/reel_writer.h b/src/lib/reel_writer.h index 8007b7f29..ae64c3ac7 100644 --- a/src/lib/reel_writer.h +++ b/src/lib/reel_writer.h @@ -22,6 +22,7 @@ #include "dcpomatic_time.h" #include "referenced_reel_asset.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 (PlayerText 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); @@ -113,7 +114,8 @@ private: boost::shared_ptr _picture_asset_writer; boost::shared_ptr _sound_asset; boost::shared_ptr _sound_asset_writer; - boost::shared_ptr _caption_asset[CAPTION_COUNT]; + boost::shared_ptr _subtitle_asset; + std::map > _closed_caption_assets; static int const _info_size; };