X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fwriter.h;h=71d11b773242fe7b9038ae36b1304241b1314327;hp=170307d8d5580862a2412995b9d29e5bd4f7711a;hb=df17bbd25da69fc38eb2dcd8b4a2531cf0bab0bc;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05

diff --git a/src/lib/writer.h b/src/lib/writer.h
index 170307d8d..71d11b773 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-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -23,7 +23,7 @@
  */
 
 #include "types.h"
-#include "player_subtitles.h"
+#include "player_text.h"
 #include "exception_store.h"
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
@@ -47,6 +47,9 @@ struct QueueItem
 public:
 	QueueItem ()
 		: size (0)
+		, reel (0)
+		, frame (0)
+		, eyes (EYES_BOTH)
 	{}
 
 	enum Type {
@@ -82,7 +85,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,8 +103,8 @@ 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);
+	void write (boost::shared_ptr<const AudioBuffers>, DCPTime time);
+	void write (PlayerText text, TextType type, DCPTimePeriod period);
 	void write (std::list<boost::shared_ptr<Font> > fonts);
 	void write (ReferencedReelAsset asset);
 	void finish ();
@@ -113,13 +116,15 @@ private:
 	void terminate_thread (bool);
 	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;
 	boost::weak_ptr<Job> _job;
 	std::vector<ReelWriter> _reels;
 	std::vector<ReelWriter>::iterator _audio_reel;
-	std::vector<ReelWriter>::iterator _subtitle_reel;
+	std::vector<ReelWriter>::iterator _caption_reel[CAPTION_COUNT];
 
 	/** our thread, or 0 */
 	boost::thread* _thread;
@@ -139,6 +144,7 @@ private:
 	 *  ordering
 	 */
 	int _maximum_frames_in_memory;
+	unsigned int _maximum_queue_size;
 
 	/** number of FULL written frames */
 	int _full_written;
@@ -150,6 +156,9 @@ private:
 	*/
 	int _pushed_to_disk;
 
+	boost::mutex _digest_progresses_mutex;
+	std::map<boost::thread::id, float> _digest_progresses;
+
 	std::list<ReferencedReelAsset> _reel_assets;
 
 	std::list<boost::shared_ptr<Font> > _fonts;