Merge master.

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

diff --git a/src/lib/sndfile_decoder.h b/src/lib/sndfile_decoder.h
index 9a3ef49b017a3983f698a57c89218089d7e3bfa2..1d212cc9b26871bb972f96f135d91cac48736f8c 100644 (file)
--- a/src/lib/sndfile_decoder.h
+++ b/src/lib/sndfile_decoder.h
@@ -26,13 +26,19 @@ class SndfileContent;
 class SndfileDecoder : public AudioDecoder
 {
 public:
-       SndfileDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<SndfileContent>);
+       SndfileDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const SndfileContent>);
+       ~SndfileDecoder ();
 
        bool pass ();
 
-private:
-       SNDFILE* open_file (sf_count_t &);
-       void close_file (SNDFILE*);
+       int audio_channels () const;
+       ContentAudioFrame audio_length () const;
+       int audio_frame_rate () const;
 
-       boost::shared_ptr<SndfileContent> _sndfile_content;
+private:
+       boost::shared_ptr<const SndfileContent> _sndfile_content;
+       SNDFILE* _sndfile;
+       SF_INFO _info;
+       ContentAudioFrame _done;
+       ContentAudioFrame _remaining;
 };