diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-10-24 00:24:24 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-10-26 20:53:08 +0200 |
| commit | 895b386b6751afd3d068155f4ea71e762297672a (patch) | |
| tree | 2decddacc7264cf09ba91b7f5cfd2d683eab0541 /src/lib/reel_writer.h | |
| parent | 114fad7b8c36a0aa1c6f924870e186ab60e32009 (diff) | |
Avoid unnecessary re-writes of video assets if they are staying the same (#1638).v2.15.26
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.
Diffstat (limited to 'src/lib/reel_writer.h')
| -rw-r--r-- | src/lib/reel_writer.h | 3 |
1 files changed, 2 insertions, 1 deletions
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<InfoFileHandle> info_file, Frame frame) const; boost::shared_ptr<const Film> _film; @@ -120,6 +120,7 @@ private: 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; |