X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fresampler.h;h=9d620b96282ecba02139414fa5612a5d070d7d3e;hb=5c145bd08401405af7351a5a2eac767756f5dd5e;hp=4ee11a7f0954958e69a99bf09be75196394838c3;hpb=b6c780d3107557d452c6612d715d01e2be52dbda;p=dcpomatic.git

diff --git a/src/lib/resampler.h b/src/lib/resampler.h
index 4ee11a7f0..9d620b962 100644
--- a/src/lib/resampler.h
+++ b/src/lib/resampler.h
@@ -1,29 +1,27 @@
 /*
-    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 <samplerate.h>
 #include <boost/shared_ptr.hpp>
 #include <boost/utility.hpp>
-extern "C" {
-#include <libswresample/swresample.h>
-}
-#include "types.h"
-#include "audio_content.h"
 
 class AudioBuffers;
 
@@ -33,12 +31,15 @@ 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 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;
 };