X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsndfile_decoder.h;h=844d1cdc42818219e81e82a7cf1f04077851e6b6;hb=eb0bdad79aa8a8b32e7d23149cf0a0c8f1dfd380;hp=52590ef24a3b99bc841edff4687b2a97ced69a9c;hpb=74fe68e5895654e27a7cf8097917c1e95fa89519;p=dcpomatic.git

diff --git a/src/lib/sndfile_decoder.h b/src/lib/sndfile_decoder.h
index 52590ef24..844d1cdc4 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,30 +17,21 @@
 
 */
 
-#include <sndfile.h>
-#include "decoder.h"
 #include "audio_decoder.h"
+#include "sndfile_base.h"
 
 class SndfileContent;
 
-class SndfileDecoder : public AudioDecoder
+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, bool);
 	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;