X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fdcp_encoder.h;h=cc2de3e0c924bb1881aa3eef57907ba86de793a6;hp=3ccd5695eea0c30ffe90cd9ff8e1641dc36b3362;hb=f515b8daea9d28200be803bb64ff17e9f30343c4;hpb=1db0293ad36605da9ca8daa8736ef581f4f6a34e diff --git a/src/lib/dcp_encoder.h b/src/lib/dcp_encoder.h index 3ccd5695e..cc2de3e0c 100644 --- a/src/lib/dcp_encoder.h +++ b/src/lib/dcp_encoder.h @@ -41,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 */ @@ -51,9 +51,9 @@ public: private: - void video (boost::shared_ptr, DCPTime); - void audio (boost::shared_ptr, DCPTime); - void text (PlayerText, TextType, boost::optional, 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;