diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-10-09 00:43:22 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-10-15 11:55:56 +0000 |
| commit | 0e0696155ba56a2c7d4adde87b70bd2739d334f9 (patch) | |
| tree | f3090125cd4ef57eb5e2a1f49c045ee7f64c920b /src/lib/reel_writer.h | |
| parent | b6f681b802642ba38625a4d574c0a9e4f630fa3d (diff) | |
Fix cross-thread access to info files. May help with #1618.
Diffstat (limited to 'src/lib/reel_writer.h')
| -rw-r--r-- | src/lib/reel_writer.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/reel_writer.h b/src/lib/reel_writer.h index 741b0914c..f13f05dde 100644 --- a/src/lib/reel_writer.h +++ b/src/lib/reel_writer.h @@ -30,6 +30,7 @@ class Film; class Job; class Font; class AudioBuffers; +class InfoFileHandle; struct write_frame_info_test; namespace dcp { @@ -86,7 +87,7 @@ public: 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: @@ -95,7 +96,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 (); - bool existing_picture_frame_ok (FILE* asset_file, FILE* info_file, Frame frame) const; + bool existing_picture_frame_ok (FILE* asset_file, boost::shared_ptr<InfoFileHandle> info_file, Frame frame) const; boost::shared_ptr<const Film> _film; |