From 895b386b6751afd3d068155f4ea71e762297672a Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 24 Oct 2019 00:24:24 +0200 Subject: Avoid unnecessary re-writes of video assets if they are staying the same (#1638). This is particularly useful as it avoids the hard-link-breaking copy step which is necessary if you're going to re-write the video asset with new IDs. --- src/lib/reel_writer.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/lib/reel_writer.h') diff --git a/src/lib/reel_writer.h b/src/lib/reel_writer.h index 46f477616..d241c0fac 100644 --- a/src/lib/reel_writer.h +++ b/src/lib/reel_writer.h @@ -99,7 +99,7 @@ private: 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 (); + Frame check_existing_picture_asset (boost::filesystem::path asset); bool existing_picture_frame_ok (FILE* asset_file, boost::shared_ptr info_file, Frame frame) const; boost::shared_ptr _film; @@ -120,6 +120,7 @@ private: boost::weak_ptr _job; boost::shared_ptr _picture_asset; + /** picture asset writer, or 0 if we are not writing any picture because we already have one */ boost::shared_ptr _picture_asset_writer; boost::shared_ptr _sound_asset; boost::shared_ptr _sound_asset_writer; -- cgit v1.2.3