X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsndfile_decoder.h;h=5ebe1da7b251852ee523df1e24fc9597406570f2;hb=4e5c1b91ff04bebc692e52115a741948037dda54;hp=a5edc196c87a7efeeb06688f70feaf6f5e092beb;hpb=a0856e3fbef17f24073b01cb96be6bbcb229ecbc;p=dcpomatic.git

diff --git a/src/lib/sndfile_decoder.h b/src/lib/sndfile_decoder.h
index a5edc196c..5ebe1da7b 100644
--- a/src/lib/sndfile_decoder.h
+++ b/src/lib/sndfile_decoder.h
@@ -17,34 +17,32 @@
 
 */
 
-#include <sndfile.h>
 #include "decoder.h"
 #include "audio_decoder.h"
+#include "audio_examiner.h"
+#include <sndfile.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;
 };