diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-12-06 23:11:15 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-12-08 11:19:19 +0100 |
| commit | d9dc816a1961258eaa145863f3762a3f9f90cfaa (patch) | |
| tree | e17f1526b0a0805f56b37dd7a5593d6d5c0c1c4e /src/lib/writer.h | |
| parent | 152197adf5b060602ecdd99e6f272c4e8b2b410e (diff) | |
Use a weak_ptr<Film> in Writer.
Diffstat (limited to 'src/lib/writer.h')
| -rw-r--r-- | src/lib/writer.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/lib/writer.h b/src/lib/writer.h index 4c22ef48e..085cd2a32 100644 --- a/src/lib/writer.h +++ b/src/lib/writer.h @@ -27,6 +27,7 @@ #include "player_text.h" #include "exception_store.h" #include "dcp_text_track.h" +#include "weak_film.h" #include <dcp/atmos_frame.h> #include <boost/shared_ptr.hpp> #include <boost/weak_ptr.hpp> @@ -95,10 +96,10 @@ bool operator== (QueueItem const & a, QueueItem const & b); * will sort it out. write() for AudioBuffers must be called in order. */ -class Writer : public ExceptionStore, public boost::noncopyable +class Writer : public ExceptionStore, public boost::noncopyable, public WeakConstFilm { public: - Writer (boost::shared_ptr<const Film>, boost::weak_ptr<Job>); + Writer (boost::weak_ptr<const Film>, boost::weak_ptr<Job>); ~Writer (); void start (); @@ -127,8 +128,6 @@ private: void write_cover_sheet (); void calculate_referenced_digests (boost::function<void (float)> set_progress); - /** our Film */ - boost::shared_ptr<const Film> _film; boost::weak_ptr<Job> _job; std::vector<ReelWriter> _reels; std::vector<ReelWriter>::iterator _audio_reel; |
