Merge branch 'master' of ssh://main.carlh.net/home/carl/git/dcpomatic

[dcpomatic.git] / src / lib / writer.h

diff --git a/src/lib/writer.h b/src/lib/writer.h
index d922cfce01a4685ed1b5941dc1bf0998f999c3ba..7af79a417ed193780931e805eda92d5ca1d58515 100644 (file)
--- a/src/lib/writer.h
+++ b/src/lib/writer.h
@@ -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 */