Rename split-by-video content slightly; fix referencing to multi-reel DCPs.

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

diff --git a/src/lib/writer.h b/src/lib/writer.h
index 3455bfd839797c0444b26c3c0f4df708bc188700..8f1e7127852116665e8f2e33b20b0029f3861052 100644 (file)
--- a/src/lib/writer.h
+++ b/src/lib/writer.h
@@ -24,6 +24,7 @@
 #include "types.h"
 #include "player_subtitles.h"
 #include "data.h"
+#include "exception_store.h"
 #include <dcp/picture_asset_writer.h>
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
@@ -36,6 +37,7 @@ class Data;
 class AudioBuffers;
 class Job;
 class Font;
+class ReferencedReelAsset;
 
 namespace dcp {
        class MonoPictureAsset;
@@ -47,6 +49,7 @@ namespace dcp {
        class SoundAsset;
        class SoundAssetWriter;
        class SubtitleAsset;
+       class ReelAsset;
 }
 
 struct QueueItem
@@ -96,6 +99,8 @@ public:
        Writer (boost::shared_ptr<const Film>, boost::weak_ptr<Job>);
        ~Writer ();
 
+       void start ();
+
        bool can_fake_write (int) const;
 
        void write (Data, int, Eyes);
@@ -104,26 +109,45 @@ public:
        void write (boost::shared_ptr<const AudioBuffers>);
        void write (PlayerSubtitles subs);
        void write (std::list<boost::shared_ptr<Font> > fonts);
+       void write (ReferencedReelAsset asset);
        void finish ();
 
        void set_encoder_threads (int threads);
 
 private:
 
+       class Reel {
+       public:
+               Reel ()
+                       : first_nonexistant_frame (0)
+               {}
+
+               DCPTimePeriod period;
+               /** the first frame index that does not already exist in our MXF */
+               int first_nonexistant_frame;
+
+               boost::shared_ptr<dcp::PictureAsset> picture_asset;
+               boost::shared_ptr<dcp::PictureAssetWriter> picture_asset_writer;
+               boost::shared_ptr<dcp::SoundAsset> sound_asset;
+               boost::shared_ptr<dcp::SoundAssetWriter> sound_asset_writer;
+               boost::shared_ptr<dcp::SubtitleAsset> subtitle_asset;
+       };
+
        void thread ();
        void terminate_thread (bool);
-       void check_existing_picture_asset ();
-       bool check_existing_picture_asset_frame (FILE *, int, Eyes);
+       void check_existing_picture_asset (Reel& reel);
        bool have_sequenced_image_at_queue_head ();
        void write_frame_info (int frame, Eyes eyes, dcp::FrameInfo info) const;
        long frame_info_position (int frame, Eyes eyes) const;
        dcp::FrameInfo read_frame_info (FILE* file, int frame, Eyes eyes) const;
+       Reel const & video_reel (int frame) const;
 
        /** our Film */
        boost::shared_ptr<const Film> _film;
        boost::weak_ptr<Job> _job;
-       /** the first frame index that does not already exist in our MXF */
-       int _first_nonexistant_frame;
+       std::list<Reel> _reels;
+       std::list<Reel>::iterator _audio_reel;
+       std::list<Reel>::iterator _subtitle_reel;
 
        /** our thread, or 0 */
        boost::thread* _thread;
@@ -134,7 +158,7 @@ private:
        /** number of FULL frames whose JPEG200 data is currently held in RAM */
        int _queued_full_in_memory;
        /** mutex for thread state */
-       mutable boost::mutex _mutex;
+       mutable boost::mutex _state_mutex;
        /** 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 */
@@ -159,11 +183,9 @@ private:
        */
        int _pushed_to_disk;
 
-       boost::shared_ptr<dcp::PictureAsset> _picture_asset;
-       boost::shared_ptr<dcp::PictureAssetWriter> _picture_asset_writer;
-       boost::shared_ptr<dcp::SoundAsset> _sound_asset;
-       boost::shared_ptr<dcp::SoundAssetWriter> _sound_asset_writer;
-       boost::shared_ptr<dcp::SubtitleAsset> _subtitle_asset;
+       std::list<ReferencedReelAsset> _reel_assets;
 
        std::list<boost::shared_ptr<Font> > _fonts;
+
+       static int const _info_size;
 };