summaryrefslogtreecommitdiff
path: root/src/lib/reel_writer.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2019-10-09 00:43:22 +0200
committerCarl Hetherington <cth@carlh.net>2019-10-09 00:43:22 +0200
commit1580bdc52a257870c908f32d2abe6fed84d83c50 (patch)
treede57d49257fd4805b0674b2a041736e0e3b5cb58 /src/lib/reel_writer.h
parent940b4a72b6242c19570acc7a629ce271de565322 (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.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/reel_writer.h b/src/lib/reel_writer.h
index b96bcfc68..8649ea37f 100644
--- a/src/lib/reel_writer.h
+++ b/src/lib/reel_writer.h
@@ -33,6 +33,7 @@ namespace dcpomatic {
class Film;
class Job;
class AudioBuffers;
+class InfoFileHandle;
struct write_frame_info_test;
namespace dcp {
@@ -89,7 +90,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:
@@ -98,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 ();
- 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;