X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fresampler.h;h=5a3a7fa40406c8dca974fa61da7cb4c18a71b8f6;hb=da44da6f31f97d39ca91c35955e573e76371f2c2;hp=69ec83ba93047f3493cd23005487b7845580944e;hpb=373f010a7f04add1f49169cbaa60cb7ae5f508d4;p=dcpomatic.git

diff --git a/src/lib/resampler.h b/src/lib/resampler.h
index 69ec83ba9..5a3a7fa40 100644
--- a/src/lib/resampler.h
+++ b/src/lib/resampler.h
@@ -1,43 +1,47 @@
 /*
-    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 <boost/shared_ptr.hpp>
-#include <boost/utility.hpp>
-extern "C" {
-#include <libswresample/swresample.h>
-}
+
 #include "types.h"
-#include "audio_content.h"
+#include <samplerate.h>
+
 
 class AudioBuffers;
 
-class Resampler : public boost::noncopyable
+
+class Resampler
 {
 public:
 	Resampler (int, int, int);
 	~Resampler ();
 
-	std::pair<boost::shared_ptr<const AudioBuffers>, AudioContent::Frame> run (boost::shared_ptr<const AudioBuffers>, AudioContent::Frame);
-	boost::shared_ptr<const AudioBuffers> flush ();
+	Resampler (Resampler const&) = delete;
+	Resampler& operator= (Resampler const&) = delete;
+
+	std::shared_ptr<const AudioBuffers> run (std::shared_ptr<const AudioBuffers>);
+	std::shared_ptr<const AudioBuffers> flush ();
+	void reset ();
+	void set_fast ();
 
-private:	
-	SwrContext* _swr_context;
+private:
+	SRC_STATE* _src;
 	int _in_rate;
 	int _out_rate;
 	int _channels;