X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Freel_writer.h;h=804a93c05d3c6103b5e4c0e4fc77364f6a02906d;hb=8963f0007af1a312017b9627c18b82ec2a577591;hp=019917abc9a3f3a8095975e6e61528bf082cb33f;hpb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;p=dcpomatic.git diff --git a/src/lib/reel_writer.h b/src/lib/reel_writer.h index 019917abc..804a93c05 100644 --- a/src/lib/reel_writer.h +++ b/src/lib/reel_writer.h @@ -81,7 +81,7 @@ public: bool ensure_subtitles, std::set ensure_closed_captions ); - void calculate_digests (boost::function set_progress); + void calculate_digests (std::function set_progress); Frame start () const; @@ -122,7 +122,7 @@ private: /** the first picture frame index that does not already exist in our MXF */ int _first_nonexistant_frame; /** the data of the last written frame, if there is one */ - std::shared_ptr _last_written[EYES_COUNT]; + std::shared_ptr _last_written[static_cast(Eyes::COUNT)]; /** index of this reel within the DCP (starting from 0) */ int _reel_index; /** number of reels in the DCP */