X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_encoder.h;h=ad77f6951312c03ace8fe91e7fe4d91608f2f743;hb=f4fda1d705adfca0b7c8d3748c0c9df8e9da51bc;hp=cc4e7ae7f50b2ca492d0d1de20879194217fc51d;hpb=66cf5e6f9201183a15d325dd0d779fc7f53efc84;p=dcpomatic.git diff --git a/src/lib/dcp_encoder.h b/src/lib/dcp_encoder.h index cc4e7ae7f..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 + +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, dcpomatic::DCPTimePeriod); void atmos (std::shared_ptr, dcpomatic::DCPTime, AtmosMetadata metadata); - std::shared_ptr _writer; - std::shared_ptr _j2k_encoder; + Writer _writer; + J2KEncoder _j2k_encoder; bool _finishing; bool _non_burnt_subtitles;