X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fwriter.h;h=d304133dcb98f2c3d380e191fda78d0d0eef61b1;hb=54af50c3b8e9082f9751e809d63540c51197a4a1;hp=14b21f35975c84b8a791bf7c25730f37bb1b9f1a;hpb=a78b741c43830c84bcb4d18e3147746f13a668e5;p=dcpomatic.git

diff --git a/src/lib/writer.h b/src/lib/writer.h
index 14b21f359..d304133dc 100644
--- a/src/lib/writer.h
+++ b/src/lib/writer.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -23,8 +23,9 @@
  */
 
 #include "types.h"
-#include "player_subtitles.h"
+#include "player_text.h"
 #include "exception_store.h"
+#include "dcp_text_track.h"
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
 #include <boost/thread.hpp>
@@ -35,10 +36,13 @@ namespace dcp {
 	class Data;
 }
 
+namespace dcpomatic {
+	class Font;
+}
+
 class Film;
 class AudioBuffers;
 class Job;
-class Font;
 class ReferencedReelAsset;
 class ReelWriter;
 
@@ -47,6 +51,9 @@ struct QueueItem
 public:
 	QueueItem ()
 		: size (0)
+		, reel (0)
+		, frame (0)
+		, eyes (EYES_BOTH)
 	{}
 
 	enum Type {
@@ -82,7 +89,7 @@ bool operator== (QueueItem const & a, QueueItem const & b);
  *  or AudioBuffers objects (containing image or sound data respectively)
  *  and writes them to the assets.
  *
- *  ::write() for Data (picture) can be called out of order, and the Writer
+ *  write() for Data (picture) can be called out of order, and the Writer
  *  will sort it out.  write() for AudioBuffers must be called in order.
  */
 
@@ -100,9 +107,9 @@ public:
 	void fake_write (Frame, Eyes);
 	bool can_repeat (Frame) const;
 	void repeat (Frame, Eyes);
-	void write (boost::shared_ptr<const AudioBuffers>);
-	void write (PlayerSubtitles subs, DCPTimePeriod period);
-	void write (std::list<boost::shared_ptr<Font> > fonts);
+	void write (boost::shared_ptr<const AudioBuffers>, dcpomatic::DCPTime time);
+	void write (PlayerText text, TextType type, boost::optional<DCPTextTrack>, dcpomatic::DCPTimePeriod period);
+	void write (std::list<boost::shared_ptr<dcpomatic::Font> > fonts);
 	void write (ReferencedReelAsset asset);
 	void finish ();
 
@@ -114,6 +121,7 @@ private:
 	bool have_sequenced_image_at_queue_head ();
 	size_t video_reel (int frame) const;
 	void set_digest_progress (Job* job, float progress);
+	void write_cover_sheet ();
 
 	/** our Film */
 	boost::shared_ptr<const Film> _film;
@@ -121,9 +129,10 @@ private:
 	std::vector<ReelWriter> _reels;
 	std::vector<ReelWriter>::iterator _audio_reel;
 	std::vector<ReelWriter>::iterator _subtitle_reel;
+	std::map<DCPTextTrack, std::vector<ReelWriter>::iterator> _caption_reels;
 
-	/** our thread, or 0 */
-	boost::thread* _thread;
+	/** our thread */
+	boost::thread _thread;
 	/** true if our thread should finish */
 	bool _finish;
 	/** queue of things to write to disk */
@@ -140,6 +149,7 @@ private:
 	 *  ordering
 	 */
 	int _maximum_frames_in_memory;
+	unsigned int _maximum_queue_size;
 
 	/** number of FULL written frames */
 	int _full_written;
@@ -156,5 +166,5 @@ private:
 
 	std::list<ReferencedReelAsset> _reel_assets;
 
-	std::list<boost::shared_ptr<Font> > _fonts;
+	std::list<boost::shared_ptr<dcpomatic::Font> > _fonts;
 };