Untested merge of master.

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

diff --git a/src/lib/sndfile_decoder.h b/src/lib/sndfile_decoder.h
index c06b97a609aae1d73ff5ed4557d5d22104345de5..b999a66d15f40644bb0313614c5d9c771e7b17cf 100644 (file)
--- a/src/lib/sndfile_decoder.h
+++ b/src/lib/sndfile_decoder.h
@@ -26,13 +26,22 @@ class SndfileContent;
 class SndfileDecoder : public AudioDecoder
 {
 public:
-       SndfileDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<SndfileContent>, DecodeOptions);
+       SndfileDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const SndfileContent>);
+       ~SndfileDecoder ();
 
        bool pass ();
 
+       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<SndfileContent> _sndfile_content;
+       boost::shared_ptr<const SndfileContent> _sndfile_content;
+       SNDFILE* _sndfile;
+       SF_INFO _info;
+       ContentAudioFrame _done;
+       ContentAudioFrame _remaining;
 };