X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fresampler_test.cc;h=0c792879b6c98800d4fff4e88d1c8abad6e8eb7f;hb=refs%2Ftags%2Fv2.8.4;hp=1ef69b0c26bbb71f0851b15808c0ce1482ad0d9b;hpb=78e5a331074a456097a162d47501daf1df1ab1a3;p=dcpomatic.git

diff --git a/test/resampler_test.cc b/test/resampler_test.cc
index 1ef69b0c2..0c792879b 100644
--- a/test/resampler_test.cc
+++ b/test/resampler_test.cc
@@ -1,5 +1,5 @@
 /*
-    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
     it under the terms of the GNU General Public License as published by
@@ -17,9 +17,15 @@
 
 */
 
+/** @file  test/resampler_test.cc
+ *  @brief Check that the timings that come back from the resampler correspond
+ *  to the number of samples it generates.
+ */
+
 #include <boost/test/unit_test.hpp>
 #include "lib/audio_buffers.h"
 #include "lib/resampler.h"
+#include <iostream>
 
 using std::pair;
 using std::cout;
@@ -28,25 +34,19 @@ using boost::shared_ptr;
 static void
 resampler_test_one (int from, int to)
 {
-	Resampler resamp (from, to, 1);
-
-	int total_out = 0;
+	Resampler resamp (from, to, 1, false);
 
 	/* 3 hours */
-	int64_t const N = from * 60 * 60 * 3;
-	
+	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 ();
-		pair<shared_ptr<const AudioBuffers>, AudioContent::Frame> r = resamp.run (a, i);
-		BOOST_CHECK_EQUAL (r.second, total_out);
-		total_out += r.first->frames ();
+		shared_ptr<const AudioBuffers> r = resamp.run (a);
 	}
-}	
-		
-/** 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);