Fix crashes when using templates in some cases (#2491).

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

diff --git a/src/lib/dcp_encoder.h b/src/lib/dcp_encoder.h
index cc4e7ae7f50b2ca492d0d1de20879194217fc51d..ad77f6951312c03ace8fe91e7fe4d91608f2f743 100644 (file)
--- 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
@@ -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;