X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Freel_writer.h;h=d241c0fac16c067336179170050b99a427d66d4b;hb=3b31d2d8a129ae6d8d267427bd6b5bc444b40b2a;hp=24a5e9a8a08db4a755b6532aee0bf062ddfcd396;hpb=d4edaca0842cc7e51fbfdd6d054a499b52c1424b;p=dcpomatic.git

diff --git a/src/lib/reel_writer.h b/src/lib/reel_writer.h
index 24a5e9a8a..d241c0fac 100644
--- a/src/lib/reel_writer.h
+++ b/src/lib/reel_writer.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -21,14 +21,21 @@
 #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 <dcp/picture_asset_writer.h>
 #include <boost/shared_ptr.hpp>
+#include <boost/weak_ptr.hpp>
+
+namespace dcpomatic {
+	class Font;
+}
 
 class Film;
 class Job;
-class Font;
 class AudioBuffers;
+class InfoFileHandle;
+struct write_frame_info_test;
 
 namespace dcp {
 	class MonoPictureAsset;
@@ -49,7 +56,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,15 +67,15 @@ 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 (PlayerCaption text, CaptionType 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);
+	boost::shared_ptr<dcp::Reel> create_reel (std::list<ReferencedReelAsset> const & refs, std::list<boost::shared_ptr<dcpomatic::Font> > const & fonts);
 	void calculate_digests (boost::function<void (float)> set_progress);
 
 	Frame start () const;
 
-	DCPTimePeriod period () const {
+	dcpomatic::DCPTimePeriod period () const {
 		return _period;
 	}
 
@@ -84,18 +91,20 @@ public:
 		return _first_nonexistant_frame;
 	}
 
-	dcp::FrameInfo read_frame_info (FILE* file, Frame frame, Eyes eyes) const;
+	dcp::FrameInfo read_frame_info (boost::shared_ptr<InfoFileHandle> info, Frame frame, Eyes eyes) const;
 
 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;
-	Frame check_existing_picture_asset ();
-	bool existing_picture_frame_ok (FILE* asset_file, FILE* info_file, Frame frame) const;
+	Frame check_existing_picture_asset (boost::filesystem::path asset);
+	bool existing_picture_frame_ok (FILE* asset_file, boost::shared_ptr<InfoFileHandle> info_file, Frame frame) const;
 
 	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 */
@@ -108,12 +117,15 @@ private:
 	/** number of reels in the DCP */
 	int _reel_count;
 	boost::optional<std::string> _content_summary;
+	boost::weak_ptr<Job> _job;
 
 	boost::shared_ptr<dcp::PictureAsset> _picture_asset;
+	/** picture asset writer, or 0 if we are not writing any picture because we already have one */
 	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> _caption_asset[CAPTION_COUNT];
+	boost::shared_ptr<dcp::SubtitleAsset> _subtitle_asset;
+	std::map<DCPTextTrack, boost::shared_ptr<dcp::SubtitleAsset> > _closed_caption_assets;
 
 	static int const _info_size;
 };