Another try at sorting out the thorny question of timing.

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

diff --git a/src/lib/sndfile_decoder.h b/src/lib/sndfile_decoder.h
index 1d212cc9b26871bb972f96f135d91cac48736f8c..77fa6d17734da4096757dae504a759c9925e0e8b 100644 (file)
--- a/src/lib/sndfile_decoder.h
+++ b/src/lib/sndfile_decoder.h
@@ -29,16 +29,18 @@ public:
        SndfileDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const SndfileContent>);
        ~SndfileDecoder ();
 
-       bool pass ();
+       void pass ();
+       bool done () const;
 
        int audio_channels () const;
-       ContentAudioFrame audio_length () const;
+       AudioContent::Frame audio_length () const;
        int audio_frame_rate () const;
 
 private:
        boost::shared_ptr<const SndfileContent> _sndfile_content;
        SNDFILE* _sndfile;
        SF_INFO _info;
-       ContentAudioFrame _done;
-       ContentAudioFrame _remaining;
+       AudioContent::Frame _done;
+       AudioContent::Frame _remaining;
+       float* _deinterleave_buffer;
 };