Merge.

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

diff --git a/src/lib/sndfile_decoder.h b/src/lib/sndfile_decoder.h
index 2900afea0b3f258aaa5c1031328a716b800f9bef..a5edc196c87a7efeeb06688f70feaf6f5e092beb 100644 (file)
--- a/src/lib/sndfile_decoder.h
+++ b/src/lib/sndfile_decoder.h
@@ -29,18 +29,22 @@ public:
        SndfileDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const SndfileContent>);
        ~SndfileDecoder ();
 
-       bool pass ();
+       void pass ();
+       void seek (Time) {}
+       void seek_back () {}
+       void seek_forward () {}
+       Time next () const;
+       bool done () const;
 
        int audio_channels () const;
        ContentAudioFrame audio_length () const;
        int audio_frame_rate () const;
 
 private:
-       SNDFILE* open_file (sf_count_t &);
-       void close_file (SNDFILE*);
-
        boost::shared_ptr<const SndfileContent> _sndfile_content;
        SNDFILE* _sndfile;
        SF_INFO _info;
+       ContentAudioFrame _done;
        ContentAudioFrame _remaining;
+       float* _deinterleave_buffer;
 };