Merge master.

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

diff --git a/src/lib/sndfile_decoder.h b/src/lib/sndfile_decoder.h
index 46d9c5e5cf24762b5c2733e4f8c0be6c035a4d97..52590ef24a3b99bc841edff4687b2a97ced69a9c 100644 (file)
--- a/src/lib/sndfile_decoder.h
+++ b/src/lib/sndfile_decoder.h
@@ -26,13 +26,13 @@ class SndfileContent;
 class SndfileDecoder : public AudioDecoder
 {
 public:
-       SndfileDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const SndfileContent>);
+       SndfileDecoder (boost::shared_ptr<const SndfileContent> c);
        ~SndfileDecoder ();
 
        void seek (ContentTime, bool);
 
        int audio_channels () const;
-       AudioFrame audio_length () const;
+       ContentTime audio_length () const;
        int audio_frame_rate () const;
 
 private:
@@ -41,7 +41,7 @@ private:
        boost::shared_ptr<const SndfileContent> _sndfile_content;
        SNDFILE* _sndfile;
        SF_INFO _info;
-       AudioFrame _done;
-       AudioFrame _remaining;
+       int64_t _done;
+       int64_t _remaining;
        float* _deinterleave_buffer;
 };