X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fsndfile_decoder.h;h=da9016ee09a958c26211df60e4ae68b6a1d9620d;hp=41d5faf082ec29c75b2c2e1059f528c59a26e0ff;hb=aeb835a18c8df347e0ed68fb24631b320abeb611;hpb=22b9f3b2090d8bdfe52cda1e69d3acbe874f1ce5 diff --git a/src/lib/sndfile_decoder.h b/src/lib/sndfile_decoder.h index 41d5faf08..da9016ee0 100644 --- a/src/lib/sndfile_decoder.h +++ b/src/lib/sndfile_decoder.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2013 Carl Hetherington + Copyright (C) 2012-2015 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,31 +17,21 @@ */ -#include -#include "decoder.h" #include "audio_decoder.h" -#include "audio_examiner.h" +#include "sndfile_base.h" class SndfileContent; -class SndfileDecoder : public AudioDecoder, public AudioExaminer +class SndfileDecoder : public Sndfile, public AudioDecoder { public: - SndfileDecoder (boost::shared_ptr c); + SndfileDecoder (boost::shared_ptr c, bool fast); ~SndfileDecoder (); - void seek (ContentTime, bool); - - int audio_channels () const; - ContentTime audio_length () const; - int audio_frame_rate () const; - private: bool pass (); - - boost::shared_ptr _sndfile_content; - SNDFILE* _sndfile; - SF_INFO _info; + void seek (ContentTime, bool); + int64_t _done; int64_t _remaining; float* _deinterleave_buffer;