Revert mac rdisk vs disk stuff as I'm not convinced it makes much difference.

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

diff --git a/src/lib/reel_writer.h b/src/lib/reel_writer.h
index fff2e0b9ea7568d646b4ef0b18b86e5104757799..0b5a3dad59c321101b161fbdfb0eaf01d409dded 100644 (file)
--- a/src/lib/reel_writer.h
+++ b/src/lib/reel_writer.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -25,6 +25,7 @@
 #include "dcp_text_track.h"
 #include <dcp/picture_asset_writer.h>
 #include <boost/shared_ptr.hpp>
+#include <boost/weak_ptr.hpp>
 
 namespace dcpomatic {
        class Font;
@@ -33,6 +34,8 @@ namespace dcpomatic {
 class Film;
 class Job;
 class AudioBuffers;
+class InfoFileHandle;
+struct write_frame_info_test;
 
 namespace dcp {
        class MonoPictureAsset;
@@ -61,7 +64,7 @@ public:
                );
 
        void write (boost::optional<dcp::Data> encoded, Frame frame, Eyes eyes);
-       void fake_write (Frame frame, Eyes eyes, int size);
+       void fake_write (int size);
        void repeat_write (Frame frame, Eyes eyes);
        void write (boost::shared_ptr<const AudioBuffers> audio);
        void write (PlayerText text, TextType type, boost::optional<DCPTextTrack> track, dcpomatic::DCPTimePeriod period);
@@ -76,26 +79,20 @@ public:
                return _period;
        }
 
-       int last_written_video_frame () const {
-               return _last_written_video_frame;
-       }
-
-       Eyes last_written_eyes () const {
-               return _last_written_eyes;
-       }
-
        int first_nonexistant_frame () const {
                return _first_nonexistant_frame;
        }
 
-       dcp::FrameInfo read_frame_info (FILE* file, Frame frame, Eyes eyes) const;
+       dcp::FrameInfo read_frame_info (boost::shared_ptr<InfoFileHandle> info, Frame frame, Eyes eyes) const;
 
 private:
 
+       friend struct ::write_frame_info_test;
+
        void write_frame_info (Frame frame, Eyes eyes, dcp::FrameInfo info) const;
        long frame_info_position (Frame frame, Eyes eyes) const;
-       Frame check_existing_picture_asset ();
-       bool existing_picture_frame_ok (FILE* asset_file, FILE* info_file, Frame frame) const;
+       Frame check_existing_picture_asset (boost::filesystem::path asset);
+       bool existing_picture_frame_ok (FILE* asset_file, boost::shared_ptr<InfoFileHandle> info_file, Frame frame) const;
 
        boost::shared_ptr<const Film> _film;
 
@@ -104,16 +101,15 @@ private:
        int _first_nonexistant_frame;
        /** the data of the last written frame, if there is one */
        boost::optional<dcp::Data> _last_written[EYES_COUNT];
-       /** the index of the last written video frame within the reel */
-       int _last_written_video_frame;
-       Eyes _last_written_eyes;
        /** index of this reel within the DCP (starting from 0) */
        int _reel_index;
        /** number of reels in the DCP */
        int _reel_count;
        boost::optional<std::string> _content_summary;
+       boost::weak_ptr<Job> _job;
 
        boost::shared_ptr<dcp::PictureAsset> _picture_asset;
+       /** picture asset writer, or 0 if we are not writing any picture because we already have one */
        boost::shared_ptr<dcp::PictureAssetWriter> _picture_asset_writer;
        boost::shared_ptr<dcp::SoundAsset> _sound_asset;
        boost::shared_ptr<dcp::SoundAssetWriter> _sound_asset_writer;