X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsndfile_decoder.h;h=41d5faf082ec29c75b2c2e1059f528c59a26e0ff;hb=8d58a7c5f4320ad5c111e336c45e44d6b51ab509;hp=a5edc196c87a7efeeb06688f70feaf6f5e092beb;hpb=883d885dc8690519d205c8baa275385af8a39f4b;p=dcpomatic.git

diff --git a/src/lib/sndfile_decoder.h b/src/lib/sndfile_decoder.h
index a5edc196c..41d5faf08 100644
--- a/src/lib/sndfile_decoder.h
+++ b/src/lib/sndfile_decoder.h
@@ -20,31 +20,29 @@
 #include <sndfile.h>
 #include "decoder.h"
 #include "audio_decoder.h"
+#include "audio_examiner.h"
 
 class SndfileContent;
 
-class SndfileDecoder : public AudioDecoder
+class SndfileDecoder : public AudioDecoder, public AudioExaminer
 {
 public:
-	SndfileDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const SndfileContent>);
+	SndfileDecoder (boost::shared_ptr<const SndfileContent> c);
 	~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;
+	ContentTime 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;
+	int64_t _done;
+	int64_t _remaining;
 	float* _deinterleave_buffer;
 };