X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Freel_writer.h;h=9ea576d7ab371dd01ba659cd519c2f1cf512030b;hb=c4403784febdbdd42e9c32e67fadb147f11fe566;hp=6de1de68dbb9e8e63fc92ff55d92bc95436f839f;hpb=11fe3ab56ad59b8b5525fa795d44d2323ef6d5b8;p=dcpomatic.git

diff --git a/src/lib/reel_writer.h b/src/lib/reel_writer.h
index 6de1de68d..9ea576d7a 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 <dcp/picture_asset_writer.h>
 #include <boost/shared_ptr.hpp>
 
@@ -49,7 +50,7 @@ class ReelWriter
 public:
 	ReelWriter (
 		boost::shared_ptr<const Film> film,
-		DCPTimePeriod period,
+		dcpomatic::DCPTimePeriod period,
 		boost::shared_ptr<Job> job,
 		int reel_index,
 		int reel_count,
@@ -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<const AudioBuffers> audio);
-	void write (PlayerText text, TextType type, DCPTimePeriod period);
+	void write (PlayerText text, TextType type, boost::optional<DCPTextTrack> track, dcpomatic::DCPTimePeriod period);
 
 	void finish ();
 	boost::shared_ptr<dcp::Reel> create_reel (std::list<ReferencedReelAsset> const & refs, std::list<boost::shared_ptr<Font> > const & fonts);
@@ -68,7 +69,7 @@ public:
 
 	Frame start () const;
 
-	DCPTimePeriod period () const {
+	dcpomatic::DCPTimePeriod period () const {
 		return _period;
 	}
 
@@ -95,7 +96,7 @@ private:
 
 	boost::shared_ptr<const Film> _film;
 
-	DCPTimePeriod _period;
+	dcpomatic::DCPTimePeriod _period;
 	/** the first picture frame index that does not already exist in our MXF */
 	int _first_nonexistant_frame;
 	/** the data of the last written frame, if there is one */
@@ -114,6 +115,7 @@ private:
 	boost::shared_ptr<dcp::SoundAsset> _sound_asset;
 	boost::shared_ptr<dcp::SoundAssetWriter> _sound_asset_writer;
 	boost::shared_ptr<dcp::SubtitleAsset> _subtitle_asset;
+	std::map<DCPTextTrack, boost::shared_ptr<dcp::SubtitleAsset> > _closed_caption_assets;
 
 	static int const _info_size;
 };