X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_encoder.h;h=cc4e7ae7f50b2ca492d0d1de20879194217fc51d;hb=9a97c1b4116d7fb80e8ab145c0cc738dbf14d617;hp=e5df30fb524ac9cb897883bdfe1addb610f65310;hpb=ca981c8cfa23111e92be329f1c2dfbe3a07b4247;p=dcpomatic.git

diff --git a/src/lib/dcp_encoder.h b/src/lib/dcp_encoder.h
index e5df30fb5..cc4e7ae7f 100644
--- a/src/lib/dcp_encoder.h
+++ b/src/lib/dcp_encoder.h
@@ -24,7 +24,6 @@
 #include "dcp_text_track.h"
 #include "encoder.h"
 #include <dcp/atmos_frame.h>
-#include <boost/weak_ptr.hpp>
 
 class Film;
 class J2KEncoder;
@@ -38,28 +37,28 @@ class AudioBuffers;
 class DCPEncoder : public Encoder
 {
 public:
-	DCPEncoder (boost::shared_ptr<const Film> film, boost::weak_ptr<Job> job);
+	DCPEncoder (std::shared_ptr<const Film> film, std::weak_ptr<Job> job);
 	~DCPEncoder ();
 
-	void go ();
+	void go () override;
 
-	boost::optional<float> current_rate () const;
-	Frame frames_done () const;
+	boost::optional<float> current_rate () const override;
+	Frame frames_done () const override;
 
 	/** @return true if we are in the process of calling Encoder::process_end */
-	bool finishing () const {
+	bool finishing () const override {
 		return _finishing;
 	}
 
 private:
 
-	void video (boost::shared_ptr<PlayerVideo>, dcpomatic::DCPTime);
-	void audio (boost::shared_ptr<AudioBuffers>, dcpomatic::DCPTime);
+	void video (std::shared_ptr<PlayerVideo>, dcpomatic::DCPTime);
+	void audio (std::shared_ptr<AudioBuffers>, dcpomatic::DCPTime);
 	void text (PlayerText, TextType, boost::optional<DCPTextTrack>, dcpomatic::DCPTimePeriod);
-	void atmos (boost::shared_ptr<const dcp::AtmosFrame>, dcpomatic::DCPTime, AtmosMetadata metadata);
+	void atmos (std::shared_ptr<const dcp::AtmosFrame>, dcpomatic::DCPTime, AtmosMetadata metadata);
 
-	boost::shared_ptr<Writer> _writer;
-	boost::shared_ptr<J2KEncoder> _j2k_encoder;
+	std::shared_ptr<Writer> _writer;
+	std::shared_ptr<J2KEncoder> _j2k_encoder;
 	bool _finishing;
 	bool _non_burnt_subtitles;