X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fresampler.h;h=359598b122b17b4f1dbe30139eaba8ce91409bbe;hb=89aa9d4ba69e471949f791cdafe4ae20cea554d2;hp=5a69d09834e81bc483c350f26fc5ca5553263341;hpb=f227d182fa5a829fdeabf9eca8f33da5ce7f4e0d;p=dcpomatic.git

diff --git a/src/lib/resampler.h b/src/lib/resampler.h
index 5a69d0983..359598b12 100644
--- a/src/lib/resampler.h
+++ b/src/lib/resampler.h
@@ -1,19 +1,20 @@
 /*
-    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/>.
 
 */
 
@@ -30,12 +31,15 @@ public:
 	Resampler (int, int, int);
 	~Resampler ();
 
-	boost::shared_ptr<const AudioBuffers> run (boost::shared_ptr<const AudioBuffers>);
+	std::pair<boost::shared_ptr<const AudioBuffers>, Frame> run (boost::shared_ptr<const AudioBuffers>, Frame);
 	boost::shared_ptr<const AudioBuffers> flush ();
+	void set_fast ();
 
 private:
 	SRC_STATE* _src;
 	int _in_rate;
 	int _out_rate;
 	int _channels;
+	boost::optional<Frame> _next_in;
+	boost::optional<Frame> _next_out;
 };