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

diff --git a/src/lib/writer.h b/src/lib/writer.h
index 170307d8d..cb1bdc5cc 100644
--- a/src/lib/writer.h
+++ b/src/lib/writer.h
@@ -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.
  */
 
@@ -101,7 +104,7 @@ public:
 	bool can_repeat (Frame) const;
 	void repeat (Frame, Eyes);
 	void write (boost::shared_ptr<const AudioBuffers>);
-	void write (PlayerSubtitles subs);
+	void write (PlayerSubtitles subs, DCPTimePeriod period);
 	void write (std::list<boost::shared_ptr<Font> > fonts);
 	void write (ReferencedReelAsset asset);
 	void finish ();
@@ -113,6 +116,8 @@ 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;
@@ -150,6 +155,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;