X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_encoder.h;h=cc2de3e0c924bb1881aa3eef57907ba86de793a6;hb=cc8ea498a3ff9421765a99c347e03533cb0595d4;hp=8a2ad947dcc95d3f391d878f7ef18cad0a9ed2e6;hpb=a5c629cb9b638b67a0e4c2d26fe9ab2e124bf0eb;p=dcpomatic.git diff --git a/src/lib/dcp_encoder.h b/src/lib/dcp_encoder.h index 8a2ad947d..cc2de3e0c 100644 --- a/src/lib/dcp_encoder.h +++ b/src/lib/dcp_encoder.h @@ -20,6 +20,7 @@ #include "types.h" #include "player_text.h" +#include "dcp_text_track.h" #include "encoder.h" #include @@ -40,7 +41,7 @@ public: void go (); - float current_rate () const; + boost::optional current_rate () const; Frame frames_done () const; /** @return true if we are in the process of calling Encoder::process_end */ @@ -50,9 +51,9 @@ public: private: - void video (boost::shared_ptr, DCPTime); - void audio (boost::shared_ptr, DCPTime); - void text (PlayerText, TextType, DCPTimePeriod); + void video (boost::shared_ptr, dcpomatic::DCPTime); + void audio (boost::shared_ptr, dcpomatic::DCPTime); + void text (PlayerText, TextType, boost::optional, dcpomatic::DCPTimePeriod); boost::shared_ptr _writer; boost::shared_ptr _j2k_encoder;