X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fresampler.h;h=9e9304fb421c7d46ca529702c635a09c67133ed1;hb=0a2fe723109c6a8fbb61ea5721b5a475e4b480d0;hp=21ef412deb02d9e79109203ef6e5ad7ea3f05b9f;hpb=e894cfe3d891135d1b92b62603a464e42bd6ed5c;p=dcpomatic.git

diff --git a/src/lib/resampler.h b/src/lib/resampler.h
index 21ef412de..9e9304fb4 100644
--- a/src/lib/resampler.h
+++ b/src/lib/resampler.h
@@ -1,27 +1,25 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
 #include "types.h"
-#include "audio_content.h"
-extern "C" {
-#include <libswresample/swresample.h>
-}
+#include <samplerate.h>
 #include <boost/shared_ptr.hpp>
 #include <boost/utility.hpp>
 
@@ -33,12 +31,16 @@ public:
 	Resampler (int, int, int);
 	~Resampler ();
 
-	boost::shared_ptr<const AudioBuffers> run (boost::shared_ptr<const AudioBuffers>);
-	boost::shared_ptr<const AudioBuffers> flush ();
+	std::pair<boost::shared_ptr<const AudioBuffers>, Frame> run (boost::shared_ptr<const AudioBuffers>, Frame);
+	std::pair<boost::shared_ptr<const AudioBuffers>, Frame> flush ();
+	void reset ();
+	void set_fast ();
 
-private:	
-	SwrContext* _swr_context;
+private:
+	SRC_STATE* _src;
 	int _in_rate;
 	int _out_rate;
 	int _channels;
+	boost::optional<Frame> _next_in;
+	boost::optional<Frame> _next_out;
 };