X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fsndfile_decoder.h;h=5ebe1da7b251852ee523df1e24fc9597406570f2;hb=4e5c1b91ff04bebc692e52115a741948037dda54;hp=63f2f7dc49f7553b9c265732dc683f79c58c718d;hpb=e0c59417c6a52dbd853114fbc0f88c6d8c1dd276;p=dcpomatic.git diff --git a/src/lib/sndfile_decoder.h b/src/lib/sndfile_decoder.h index 63f2f7dc4..5ebe1da7b 100644 --- a/src/lib/sndfile_decoder.h +++ b/src/lib/sndfile_decoder.h @@ -17,34 +17,32 @@ */ -#include #include "decoder.h" #include "audio_decoder.h" +#include "audio_examiner.h" +#include 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; - AudioContent::Frame audio_length () const; + ContentTime audio_length () const; int audio_frame_rate () const; private: - bool has_audio () const { - return true; - } bool pass (); boost::shared_ptr _sndfile_content; SNDFILE* _sndfile; SF_INFO _info; - AudioContent::Frame _done; - AudioContent::Frame _remaining; + int64_t _done; + int64_t _remaining; float* _deinterleave_buffer; };