No-op; fix GPL address and use the explicit-program-name version.

[dcpomatic.git] / src / lib / resampler.h

diff --git a/src/lib/resampler.h b/src/lib/resampler.h
index 4ee11a7f0954958e69a99bf09be75196394838c3..5ce766f809612fa96904491660d4c2149cd85c70 100644 (file)
--- a/src/lib/resampler.h
+++ b/src/lib/resampler.h
@@ -1,43 +1,41 @@
 /*
-    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;
 
 class Resampler : public boost::noncopyable
 {
 public:
-       Resampler (int, int, int);
+       Resampler (int, int, int, bool fast);
        ~Resampler ();
 
        boost::shared_ptr<const AudioBuffers> run (boost::shared_ptr<const AudioBuffers>);
        boost::shared_ptr<const AudioBuffers> flush ();
 
-private:       
-       SwrContext* _swr_context;
+private:
+       SRC_STATE* _src;
        int _in_rate;
        int _out_rate;
        int _channels;