Make FileError say what path the problem was with.

[dcpomatic.git] / src / lib / reel_writer.h

diff --git a/src/lib/reel_writer.h b/src/lib/reel_writer.h
index 741b0914cc9dc2f028844a71797399a164b0f215..0c9b72184bec8a70768a65239ddf29af43a3a1f5 100644 (file)
--- a/src/lib/reel_writer.h
+++ b/src/lib/reel_writer.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -25,11 +25,13 @@
 #include "dcp_text_track.h"
 #include <dcp/picture_asset_writer.h>
 #include <boost/shared_ptr.hpp>
+#include <boost/weak_ptr.hpp>
 
 class Film;
 class Job;
 class Font;
 class AudioBuffers;
+class InfoFileHandle;
 struct write_frame_info_test;
 
 namespace dcp {
@@ -86,7 +88,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 +97,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;
 
@@ -112,6 +114,7 @@ private:
        /** number of reels in the DCP */
        int _reel_count;
        boost::optional<std::string> _content_summary;
+       boost::weak_ptr<Job> _job;
 
        boost::shared_ptr<dcp::PictureAsset> _picture_asset;
        boost::shared_ptr<dcp::PictureAssetWriter> _picture_asset_writer;