X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsndfile_decoder.h;h=a9d2935b6c36ac75b20e52a644f468f20af8cf48;hb=e0adfd85dd7987ee2b77eea7f6d3c13885729a38;hp=5ebe1da7b251852ee523df1e24fc9597406570f2;hpb=cf8e0e9e26dbaefab768000ebc1655b34ad11105;p=dcpomatic.git

diff --git a/src/lib/sndfile_decoder.h b/src/lib/sndfile_decoder.h
index 5ebe1da7b..a9d2935b6 100644
--- a/src/lib/sndfile_decoder.h
+++ b/src/lib/sndfile_decoder.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,31 +17,21 @@
 
 */
 
-#include "decoder.h"
 #include "audio_decoder.h"
-#include "audio_examiner.h"
-#include <sndfile.h>
+#include "sndfile_base.h"
 
 class SndfileContent;
 
-class SndfileDecoder : public AudioDecoder, public AudioExaminer
+class SndfileDecoder : public Sndfile, public AudioDecoder
 {
 public:
-	SndfileDecoder (boost::shared_ptr<const SndfileContent> c);
+	SndfileDecoder (boost::shared_ptr<const SndfileContent> c, bool fast);
 	~SndfileDecoder ();
 
+private:
+	bool pass (PassReason);
 	void seek (ContentTime, bool);
 
-	int audio_channels () 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;
 	int64_t _done;
 	int64_t _remaining;
 	float* _deinterleave_buffer;