X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Freel_writer.h;h=741b0914cc9dc2f028844a71797399a164b0f215;hb=93e89bd463bd51de6823a6796288f6283f885b06;hp=a80f51dc255c814311ca9d4356e15cba24b5bc95;hpb=49fc9b8c4282d0e973ac1f4e31357735cf6be218;p=dcpomatic.git

diff --git a/src/lib/reel_writer.h b/src/lib/reel_writer.h
index a80f51dc2..741b0914c 100644
--- a/src/lib/reel_writer.h
+++ b/src/lib/reel_writer.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -21,7 +21,8 @@
 #include "types.h"
 #include "dcpomatic_time.h"
 #include "referenced_reel_asset.h"
-#include "player_subtitles.h"
+#include "player_text.h"
+#include "dcp_text_track.h"
 #include <dcp/picture_asset_writer.h>
 #include <boost/shared_ptr.hpp>
 
@@ -29,6 +30,7 @@ class Film;
 class Job;
 class Font;
 class AudioBuffers;
+struct write_frame_info_test;
 
 namespace dcp {
 	class MonoPictureAsset;
@@ -47,13 +49,20 @@ namespace dcp {
 class ReelWriter
 {
 public:
-	ReelWriter (boost::shared_ptr<const Film> film, DCPTimePeriod period, boost::shared_ptr<Job> job, int reel_index, int reel_count);
+	ReelWriter (
+		boost::shared_ptr<const Film> film,
+		DCPTimePeriod period,
+		boost::shared_ptr<Job> job,
+		int reel_index,
+		int reel_count,
+		boost::optional<std::string> content_summary
+		);
 
 	void write (boost::optional<dcp::Data> encoded, Frame frame, Eyes eyes);
 	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 (PlayerSubtitles subs);
+	void write (PlayerText text, TextType type, boost::optional<DCPTextTrack> track, DCPTimePeriod period);
 
 	void finish ();
 	boost::shared_ptr<dcp::Reel> create_reel (std::list<ReferencedReelAsset> const & refs, std::list<boost::shared_ptr<Font> > const & fonts);
@@ -65,10 +74,6 @@ public:
 		return _period;
 	}
 
-	int total_written_audio_frames () const {
-		return _total_written_audio_frames;
-	}
-
 	int last_written_video_frame () const {
 		return _last_written_video_frame;
 	}
@@ -85,33 +90,35 @@ public:
 
 private:
 
+	friend struct ::write_frame_info_test;
+
 	void write_frame_info (Frame frame, Eyes eyes, dcp::FrameInfo info) const;
 	long frame_info_position (Frame frame, Eyes eyes) const;
-	void check_existing_picture_asset ();
-	bool existing_picture_frame_ok (FILE* asset_file, FILE* info_file) const;
+	Frame check_existing_picture_asset ();
+	bool existing_picture_frame_ok (FILE* asset_file, FILE* info_file, Frame frame) const;
 
 	boost::shared_ptr<const Film> _film;
 
 	DCPTimePeriod _period;
-	/** the first frame index that does not already exist in our MXF */
+	/** 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 */
 	boost::optional<dcp::Data> _last_written[EYES_COUNT];
 	/** the index of the last written video frame within the reel */
 	int _last_written_video_frame;
 	Eyes _last_written_eyes;
-	/** the number of audio frames that have been written to the reel */
-	int _total_written_audio_frames;
 	/** index of this reel within the DCP (starting from 0) */
 	int _reel_index;
 	/** number of reels in the DCP */
 	int _reel_count;
+	boost::optional<std::string> _content_summary;
 
 	boost::shared_ptr<dcp::PictureAsset> _picture_asset;
 	boost::shared_ptr<dcp::PictureAssetWriter> _picture_asset_writer;
 	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;
 };