Use FileGroup in FFmpeg.

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

diff --git a/src/lib/writer.h b/src/lib/writer.h
index 023107d9756555be0e144b9b363801e670cda33e..17ce42572c52da3df2d9e1a2eea96dd182da2847 100644 (file)
--- a/src/lib/writer.h
+++ b/src/lib/writer.h
@@ -32,6 +32,10 @@ class Job;
 namespace libdcp {
        class MonoPictureAsset;
        class MonoPictureAssetWriter;
+       class StereoPictureAsset;
+       class StereoPictureAssetWriter;
+       class PictureAsset;
+       class PictureAssetWriter;
        class SoundAsset;
        class SoundAssetWriter;
 }
@@ -66,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,7 +89,7 @@ private:
 
        /** 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;
 
@@ -102,7 +106,7 @@ private:
        /** condition to manage thread wakeups */
        boost::condition _condition;
        /** the data of the last written frame, or 0 if there isn't one */
-       boost::shared_ptr<const EncodedData> _last_written;
+       boost::shared_ptr<const EncodedData> _last_written[EYES_COUNT];
        /** the index of the last written frame */
        int _last_written_frame;
        Eyes _last_written_eyes;
@@ -122,8 +126,8 @@ private:
        */
        int _pushed_to_disk;
        
-       boost::shared_ptr<libdcp::MonoPictureAsset> _picture_asset;
-       boost::shared_ptr<libdcp::MonoPictureAssetWriter> _picture_asset_writer;
+       boost::shared_ptr<libdcp::PictureAsset> _picture_asset;
+       boost::shared_ptr<libdcp::PictureAssetWriter> _picture_asset_writer;
        boost::shared_ptr<libdcp::SoundAsset> _sound_asset;
        boost::shared_ptr<libdcp::SoundAssetWriter> _sound_asset_writer;
 };