Give a slightly better error whn trying to add a KDM using add-file (#1035).

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

diff --git a/src/lib/resampler.h b/src/lib/resampler.h
index f51c3cdb57a3a889e4af224edb22e6975b5ab89d..9e9304fb421c7d46ca529702c635a09c67133ed1 100644 (file)
--- a/src/lib/resampler.h
+++ b/src/lib/resampler.h
@@ -1,19 +1,20 @@
 /*
     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/>.
 
 */
 
@@ -27,15 +28,19 @@ class AudioBuffers;
 class Resampler : public boost::noncopyable
 {
 public:
-       Resampler (int, int, int, bool fast);
+       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:
        SRC_STATE* _src;
        int _in_rate;
        int _out_rate;
        int _channels;
+       boost::optional<Frame> _next_in;
+       boost::optional<Frame> _next_out;
 };