X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsndfile_decoder.h;h=41d5faf082ec29c75b2c2e1059f528c59a26e0ff;hb=e80e6a8567dd107f5ea3b708975cb5fd92112a57;hp=46d9c5e5cf24762b5c2733e4f8c0be6c035a4d97;hpb=d7b23d44dec9d6357619e8e009e564e475215470;p=dcpomatic.git diff --git a/src/lib/sndfile_decoder.h b/src/lib/sndfile_decoder.h index 46d9c5e5c..41d5faf08 100644 --- a/src/lib/sndfile_decoder.h +++ b/src/lib/sndfile_decoder.h @@ -20,19 +20,20 @@ #include #include "decoder.h" #include "audio_decoder.h" +#include "audio_examiner.h" class SndfileContent; -class SndfileDecoder : public AudioDecoder +class SndfileDecoder : public AudioDecoder, public AudioExaminer { public: - SndfileDecoder (boost::shared_ptr, boost::shared_ptr); + SndfileDecoder (boost::shared_ptr c); ~SndfileDecoder (); void seek (ContentTime, bool); int audio_channels () const; - AudioFrame audio_length () const; + ContentTime audio_length () const; int audio_frame_rate () const; private: @@ -41,7 +42,7 @@ private: boost::shared_ptr _sndfile_content; SNDFILE* _sndfile; SF_INFO _info; - AudioFrame _done; - AudioFrame _remaining; + int64_t _done; + int64_t _remaining; float* _deinterleave_buffer; };