Merge master.

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

diff --git a/src/lib/writer.h b/src/lib/writer.h
index cee20acb952f349c64467af3ce72a32b50852f52..e56e12e75a2255ac95bab0b1563733f3a5521e94 100644 (file)
--- a/src/lib/writer.h
+++ b/src/lib/writer.h
@@ -21,10 +21,12 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/thread.hpp>
 #include <boost/thread/condition.hpp>
+#include "exceptions.h"
 
 class Film;
 class EncodedData;
 class AudioBuffers;
+class Job;
 
 namespace libdcp {
        class MonoPictureAsset;
@@ -59,10 +61,10 @@ public:
 bool operator< (QueueItem const & a, QueueItem const & b);
 bool operator== (QueueItem const & a, QueueItem const & b);
 
-class Writer
+class Writer : public ExceptionStore
 {
 public:
-       Writer (boost::shared_ptr<Film>);
+       Writer (boost::shared_ptr<const Film>, boost::shared_ptr<Job>);
 
        bool can_fake_write (int) const;
        
@@ -78,7 +80,8 @@ private:
        void check_existing_picture_mxf ();
 
        /** our Film */
-       boost::shared_ptr<Film> _film;
+       boost::shared_ptr<const Film> _film;
+       boost::shared_ptr<Job> _job;
        /** the first frame index that does not already exist in our MXF */
        int _first_nonexistant_frame;
 
@@ -113,7 +116,7 @@ private:
            due to the limit of frames to be held in memory.
        */
        int _pushed_to_disk;
-
+       
        boost::shared_ptr<libdcp::MonoPictureAsset> _picture_asset;
        boost::shared_ptr<libdcp::MonoPictureAssetWriter> _picture_asset_writer;
        boost::shared_ptr<libdcp::SoundAsset> _sound_asset;