Merge master.

[dcpomatic.git] / src / lib / sndfile_decoder.h

diff --git a/src/lib/sndfile_decoder.h b/src/lib/sndfile_decoder.h
index b999a66d15f40644bb0313614c5d9c771e7b17cf..41d5faf082ec29c75b2c2e1059f528c59a26e0ff 100644 (file)
--- a/src/lib/sndfile_decoder.h
+++ b/src/lib/sndfile_decoder.h
@@ -20,28 +20,29 @@
 #include <sndfile.h>
 #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<const Film>, boost::shared_ptr<const SndfileContent>);
+       SndfileDecoder (boost::shared_ptr<const SndfileContent> c);
        ~SndfileDecoder ();
 
-       bool pass ();
+       void seek (ContentTime, bool);
 
        int audio_channels () const;
-       ContentAudioFrame audio_length () const;
+       ContentTime audio_length () const;
        int audio_frame_rate () const;
 
 private:
-       SNDFILE* open_file (sf_count_t &);
-       void close_file (SNDFILE*);
-
+       bool pass ();
+       
        boost::shared_ptr<const SndfileContent> _sndfile_content;
        SNDFILE* _sndfile;
        SF_INFO _info;
-       ContentAudioFrame _done;
-       ContentAudioFrame _remaining;
+       int64_t _done;
+       int64_t _remaining;
+       float* _deinterleave_buffer;
 };