Merge 1.0-seek and subtitle-content.

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

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