X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Faudio_ring_buffers_test.cc;h=265142d533fe9e20b9c4669f6e3b642d7f966168;hb=HEAD;hp=6ec5e22359b93584c94000a734956ccc9d525dc6;hpb=bfd9ce6dd7293b242497cba73a602df8eb2e05cc;p=dcpomatic.git

diff --git a/test/audio_ring_buffers_test.cc b/test/audio_ring_buffers_test.cc
index 6ec5e2235..265142d53 100644
--- a/test/audio_ring_buffers_test.cc
+++ b/test/audio_ring_buffers_test.cc
@@ -18,16 +18,17 @@
 
 */
 
+
 #include "lib/audio_ring_buffers.h"
 #include <boost/test/unit_test.hpp>
-#include <iostream>
 
-using std::cout;
-using boost::shared_ptr;
+
+using std::make_shared;
+using namespace dcpomatic;
+
 
 #define CANARY 9999
 
-/* XXX: these tests don't check the timestamping in AudioRingBuffers */
 
 /** Basic tests fetching the same number of channels as went in */
 BOOST_AUTO_TEST_CASE (audio_ring_buffers_test1)
@@ -57,14 +58,14 @@ BOOST_AUTO_TEST_CASE (audio_ring_buffers_test1)
 	BOOST_CHECK_EQUAL (buffer[240 * 6], CANARY);
 
 	/* Put some data in */
-	shared_ptr<AudioBuffers> data (new AudioBuffers (6, 91));
+	auto data = make_shared<AudioBuffers>(6, 91);
 	int value = 0;
 	for (int i = 0; i < 91; ++i) {
 		for (int j = 0; j < 6; ++j) {
 			data->data(j)[i] = value++;
 		}
 	}
-	rb.put (data, DCPTime());
+	rb.put (data, DCPTime(), 48000);
 	BOOST_CHECK_EQUAL (rb.size(), 91);
 
 	/* Get part of it out */
@@ -98,14 +99,14 @@ BOOST_AUTO_TEST_CASE (audio_ring_buffers_test2)
 	AudioRingBuffers rb;
 
 	/* Put some data in */
-	shared_ptr<AudioBuffers> data (new AudioBuffers (2, 91));
+	auto data = make_shared<AudioBuffers>(2, 91);
 	int value = 0;
 	for (int i = 0; i < 91; ++i) {
 		for (int j = 0; j < 2; ++j) {
 			data->data(j)[i] = value++;
 		}
 	}
-	rb.put (data, DCPTime());
+	rb.put (data, DCPTime(), 48000);
 	BOOST_CHECK_EQUAL (rb.size(), 91);
 
 	/* Get part of it out */
@@ -150,14 +151,14 @@ BOOST_AUTO_TEST_CASE (audio_ring_buffers_test3)
 	AudioRingBuffers rb;
 
 	/* Put some data in */
-	shared_ptr<AudioBuffers> data (new AudioBuffers (6, 91));
+	auto data = make_shared<AudioBuffers>(6, 91);
 	int value = 0;
 	for (int i = 0; i < 91; ++i) {
 		for (int j = 0; j < 6; ++j) {
 			data->data(j)[i] = value++;
 		}
 	}
-	rb.put (data, DCPTime ());
+	rb.put (data, DCPTime(), 48000);
 	BOOST_CHECK_EQUAL (rb.size(), 91);
 
 	/* Get part of it out */