X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_encoder.h;h=ad77f6951312c03ace8fe91e7fe4d91608f2f743;hb=2b0e9dd97a5773f52eba5704903b82e90f4c6f63;hp=65782d968c2580c2bde0d2a7e4b6b4cca227dad2;hpb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;p=dcpomatic.git

diff --git a/src/lib/dcp_encoder.h b/src/lib/dcp_encoder.h
index 65782d968..ad77f6951 100644
--- a/src/lib/dcp_encoder.h
+++ b/src/lib/dcp_encoder.h
@@ -18,20 +18,23 @@
 
 */
 
+
 #include "atmos_metadata.h"
-#include "types.h"
-#include "player_text.h"
 #include "dcp_text_track.h"
+#include "dcpomatic_time.h"
 #include "encoder.h"
+#include "player_text.h"
+#include "j2k_encoder.h"
+#include "writer.h"
 #include <dcp/atmos_frame.h>
 
+
+class AudioBuffers;
 class Film;
-class J2KEncoder;
-class Player;
-class Writer;
 class Job;
+class Player;
 class PlayerVideo;
-class AudioBuffers;
+
 
 /** @class DCPEncoder */
 class DCPEncoder : public Encoder
@@ -40,13 +43,13 @@ public:
 	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;
 	}
 
@@ -57,8 +60,8 @@ private:
 	void text (PlayerText, TextType, boost::optional<DCPTextTrack>, dcpomatic::DCPTimePeriod);
 	void atmos (std::shared_ptr<const dcp::AtmosFrame>, dcpomatic::DCPTime, AtmosMetadata metadata);
 
-	std::shared_ptr<Writer> _writer;
-	std::shared_ptr<J2KEncoder> _j2k_encoder;
+	Writer _writer;
+	J2KEncoder _j2k_encoder;
 	bool _finishing;
 	bool _non_burnt_subtitles;