X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fwriter.h;h=ca0bdeb92a2189983cd3b6ff3758c9387eb887ed;hb=c28b3d6f168607aca9995282b96647eb64a26dc9;hp=db2c042faa3671e8407072afdd77cb891a9e282d;hpb=58bca31a6e1e20f20bf924af4cd27b54edd39be7;p=dcpomatic.git

diff --git a/src/lib/writer.h b/src/lib/writer.h
index db2c042fa..ca0bdeb92 100644
--- a/src/lib/writer.h
+++ b/src/lib/writer.h
@@ -29,15 +29,15 @@ class EncodedData;
 class AudioBuffers;
 class Job;
 
-namespace libdcp {
-	class MonoPictureAsset;
-	class MonoPictureAssetWriter;
-	class StereoPictureAsset;
-	class StereoPictureAssetWriter;
-	class PictureAsset;
-	class PictureAssetWriter;
-	class SoundAsset;
-	class SoundAssetWriter;
+namespace dcp {
+	class MonoPictureMXF;
+	class MonoPictureMXFWriter;
+	class StereoPictureMXF;
+	class StereoPictureMXFWriter;
+	class PictureMXF;
+	class PictureMXFWriter;
+	class SoundMXF;
+	class SoundMXFWriter;
 }
 
 struct QueueItem
@@ -70,7 +70,8 @@ bool operator== (QueueItem const & a, QueueItem const & b);
 class Writer : public ExceptionStore, public boost::noncopyable
 {
 public:
-	Writer (boost::shared_ptr<const Film>, boost::shared_ptr<Job>);
+	Writer (boost::shared_ptr<const Film>, boost::weak_ptr<Job>);
+	~Writer ();
 
 	bool can_fake_write (int) const;
 	
@@ -83,13 +84,14 @@ public:
 private:
 
 	void thread ();
+	void terminate_thread (bool);
 	void check_existing_picture_mxf ();
 	bool check_existing_picture_mxf_frame (FILE *, int, Eyes);
-	bool have_sequenced_image_at_queue_head () const;
+	bool have_sequenced_image_at_queue_head ();
 
 	/** our Film */
 	boost::shared_ptr<const Film> _film;
-	boost::shared_ptr<Job> _job;
+	boost::weak_ptr<Job> _job;
 	/** the first frame index that does not already exist in our MXF */
 	int _first_nonexistant_frame;
 
@@ -103,8 +105,10 @@ private:
 	int _queued_full_in_memory;
 	/** mutex for thread state */
 	mutable boost::mutex _mutex;
-	/** condition to manage thread wakeups */
-	boost::condition _condition;
+	/** condition to manage thread wakeups when we have nothing to do  */
+	boost::condition _empty_condition;
+	/** condition to manage thread wakeups when we have too much to do */
+	boost::condition _full_condition;
 	/** the data of the last written frame, or 0 if there isn't one */
 	boost::shared_ptr<const EncodedData> _last_written[EYES_COUNT];
 	/** the index of the last written frame */
@@ -126,12 +130,8 @@ private:
 	*/
 	int _pushed_to_disk;
 	
-	boost::shared_ptr<libdcp::PictureAsset> _picture_asset;
-	boost::shared_ptr<libdcp::PictureAssetWriter> _picture_asset_writer;
-	boost::shared_ptr<libdcp::MonoPictureAsset> _mono_picture_asset;
-	boost::shared_ptr<libdcp::MonoPictureAssetWriter> _mono_picture_asset_writer;
-	boost::shared_ptr<libdcp::StereoPictureAsset> _stereo_picture_asset;
-	boost::shared_ptr<libdcp::StereoPictureAssetWriter> _stereo_picture_asset_writer;
-	boost::shared_ptr<libdcp::SoundAsset> _sound_asset;
-	boost::shared_ptr<libdcp::SoundAssetWriter> _sound_asset_writer;
+	boost::shared_ptr<dcp::PictureMXF> _picture_mxf;
+	boost::shared_ptr<dcp::PictureMXFWriter> _picture_mxf_writer;
+	boost::shared_ptr<dcp::SoundMXF> _sound_mxf;
+	boost::shared_ptr<dcp::SoundMXFWriter> _sound_mxf_writer;
 };