X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fwriter.h;h=cb1bdc5cc3fbc44a6a08db16dd83b5b2ed32639e;hb=c3e2b2051f4c50d92c7bbe59c42174984c2f3e54;hp=5c974f0f37ee68b7d2382752ff853c78e03c0f54;hpb=84cab4dbc3beba84ba53cec1054ede7c250a4c9c;p=dcpomatic.git

diff --git a/src/lib/writer.h b/src/lib/writer.h
index 5c974f0f3..cb1bdc5cc 100644
--- a/src/lib/writer.h
+++ b/src/lib/writer.h
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -23,7 +24,6 @@
 
 #include "types.h"
 #include "player_subtitles.h"
-#include "data.h"
 #include "exception_store.h"
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
@@ -31,8 +31,11 @@
 #include <boost/thread/condition.hpp>
 #include <list>
 
+namespace dcp {
+	class Data;
+}
+
 class Film;
-class Data;
 class AudioBuffers;
 class Job;
 class Font;
@@ -44,6 +47,9 @@ struct QueueItem
 public:
 	QueueItem ()
 		: size (0)
+		, reel (0)
+		, frame (0)
+		, eyes (EYES_BOTH)
 	{}
 
 	enum Type {
@@ -58,7 +64,7 @@ public:
 	} type;
 
 	/** encoded data for FULL */
-	boost::optional<Data> encoded;
+	boost::optional<dcp::Data> encoded;
 	/** size of data for FAKE */
 	int size;
 	/** reel index */
@@ -79,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.
  */
 
@@ -93,12 +99,12 @@ public:
 
 	bool can_fake_write (Frame) const;
 
-	void write (Data, Frame, Eyes);
+	void write (dcp::Data, Frame, Eyes);
 	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 (PlayerSubtitles subs, DCPTimePeriod period);
 	void write (std::list<boost::shared_ptr<Font> > fonts);
 	void write (ReferencedReelAsset asset);
 	void finish ();
@@ -110,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;
@@ -147,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;