X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftiff_decoder.cc;h=2c050def67e8098e63056640fac2d095b7ad650d;hb=752bba7eb39d6f775a3ecb3ca3e19d7884626a4e;hp=e75f2c4829d23cde369ead11cc9a680f646cddfc;hpb=e193babcec6a26bc1ee83d99d009bd5a3751a5bc;p=dcpomatic.git diff --git a/src/lib/tiff_decoder.cc b/src/lib/tiff_decoder.cc index e75f2c482..2c050def6 100644 --- a/src/lib/tiff_decoder.cc +++ b/src/lib/tiff_decoder.cc @@ -46,10 +46,9 @@ using namespace boost; * @param j Job that we are associated with, or 0. * @param minimal true to do the bare minimum of work; just run through the content. Useful for acquiring * accurate frame counts as quickly as possible. This generates no video or audio output. - * @param ignore_length Ignore the content's claimed length when computing progress. */ -TIFFDecoder::TIFFDecoder (boost::shared_ptr f, boost::shared_ptr o, Job* j, bool minimal, bool ignore_length) - : Decoder (f, o, j, minimal, ignore_length) +TIFFDecoder::TIFFDecoder (boost::shared_ptr f, boost::shared_ptr o, Job* j, bool minimal) + : Decoder (f, o, j, minimal) { string const dir = _film->content_path (); @@ -198,7 +197,7 @@ TIFFDecoder::pixel_format () const int TIFFDecoder::time_base_numerator () const { - return rint (_film->frames_per_second()); + return dcp_frame_rate(_film->frames_per_second()).frames_per_second; }