Merge master.

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

diff --git a/src/lib/writer.h b/src/lib/writer.h
index d922cfce01a4685ed1b5941dc1bf0998f999c3ba..842d6a55d3079474a03b7feab81757c6b5313711 100644 (file)
--- a/src/lib/writer.h
+++ b/src/lib/writer.h
@@ -70,7 +70,7 @@ 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>);
 
        bool can_fake_write (int) const;
        
@@ -85,11 +85,11 @@ private:
        void thread ();
        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;