X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fresampler_test.cc;h=893fad3b59d9d6110cb7372b1df086816c490509;hp=3be251b3a75129c0daa83f8182ab19f7df51dc42;hb=e81c5eb9e8ff875240dde9fdaaab0a46f99af615;hpb=7f2e74604a51b984e4c8cbb5d5f4bb642677ec00

diff --git a/test/resampler_test.cc b/test/resampler_test.cc
index 3be251b3a..893fad3b5 100644
--- a/test/resampler_test.cc
+++ b/test/resampler_test.cc
@@ -1,25 +1,33 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2014 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/>.
 
 */
 
+/** @file  test/resampler_test.cc
+ *  @brief Check that the timings that come back from Resampler correspond
+ *  to the number of samples it generates.
+ *  @ingroup selfcontained
+ */
+
 #include <boost/test/unit_test.hpp>
 #include "lib/audio_buffers.h"
 #include "lib/resampler.h"
+#include <iostream>
 
 using std::pair;
 using std::cout;
@@ -30,23 +38,17 @@ resampler_test_one (int from, int to)
 {
 	Resampler resamp (from, to, 1);
 
-	int total_out = 0;
-
 	/* 3 hours */
 	int64_t const N = int64_t (from) * 60 * 60 * 3;
-		
+
 	/* XXX: no longer checks anything */
 	for (int64_t i = 0; i < N; i += 1000) {
 		shared_ptr<AudioBuffers> a (new AudioBuffers (1, 1000));
 		a->make_silent ();
-		shared_ptr<const AudioBuffers> r = resamp.run (a);
-		total_out += r->frames ();
+		pair<shared_ptr<const AudioBuffers>, Frame> r = resamp.run (a, 0);
 	}
-}	
-		
-/** Check that the timings that come back from the resampler correspond
-    to the number of samples it generates.
-*/
+}
+
 BOOST_AUTO_TEST_CASE (resampler_test)
 {
 	resampler_test_one (44100, 48000);