X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Freel_writer.h;h=c0e98f6ebf89b7bd2bdd06858c2cd605995c1054;hb=ab1c8a67afba072b1c29f0c3c34aa9779643e66a;hp=274f62b9fa0d8cf7af1440a18304e63f118ba857;hpb=9c01623c3038b978ba732de2ad147d29fad60afe;p=dcpomatic.git diff --git a/src/lib/reel_writer.h b/src/lib/reel_writer.h index 274f62b9f..c0e98f6eb 100644 --- a/src/lib/reel_writer.h +++ b/src/lib/reel_writer.h @@ -72,10 +72,6 @@ public: return _period; } - int total_written_audio_frames () const { - return _total_written_audio_frames; - } - int last_written_video_frame () const { return _last_written_video_frame; } @@ -94,21 +90,19 @@ private: void write_frame_info (Frame frame, Eyes eyes, dcp::FrameInfo info) const; long frame_info_position (Frame frame, Eyes eyes) const; - void check_existing_picture_asset (); - bool existing_picture_frame_ok (FILE* asset_file, FILE* info_file) const; + Frame check_existing_picture_asset (); + bool existing_picture_frame_ok (FILE* asset_file, FILE* info_file, Frame frame) const; boost::shared_ptr _film; DCPTimePeriod _period; - /** the first frame index that does not already exist in our MXF */ + /** the first picture frame index that does not already exist in our MXF */ int _first_nonexistant_frame; /** the data of the last written frame, if there is one */ boost::optional _last_written[EYES_COUNT]; /** the index of the last written video frame within the reel */ int _last_written_video_frame; Eyes _last_written_eyes; - /** the number of audio frames that have been written to the reel */ - int _total_written_audio_frames; /** index of this reel within the DCP (starting from 0) */ int _reel_index; /** number of reels in the DCP */