X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Faudio_ring_buffers_test.cc;h=782451a7d07a3861ab48f649d9b2df7ec32afc28;hp=506a6350ecf5a1c2d456766d4155d7fab7551e71;hb=8fcd1dc3bdec69d4aa7bc76926993733952a10be;hpb=54e6f206305d4275808cfce36987edcc61a6a779 diff --git a/test/audio_ring_buffers_test.cc b/test/audio_ring_buffers_test.cc index 506a6350e..782451a7d 100644 --- a/test/audio_ring_buffers_test.cc +++ b/test/audio_ring_buffers_test.cc @@ -24,6 +24,7 @@ using std::cout; using boost::shared_ptr; +using namespace dcpomatic; #define CANARY 9999 @@ -64,7 +65,7 @@ BOOST_AUTO_TEST_CASE (audio_ring_buffers_test1) 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 */ @@ -79,7 +80,7 @@ BOOST_AUTO_TEST_CASE (audio_ring_buffers_test1) /* Get the rest */ buffer[51 * 6] = CANARY; - BOOST_CHECK (*rb.get(buffer, 6, 51) == DCPTime()); + BOOST_CHECK (*rb.get(buffer, 6, 51) == DCPTime::from_frames(40, 48000)); for (int i = 0; i < 51 * 6; ++i) { BOOST_REQUIRE_EQUAL (buffer[i], check++); } @@ -105,7 +106,7 @@ BOOST_AUTO_TEST_CASE (audio_ring_buffers_test2) 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 */ @@ -126,7 +127,7 @@ BOOST_AUTO_TEST_CASE (audio_ring_buffers_test2) /* Get the rest */ buffer[51 * 6] = CANARY; - BOOST_CHECK (*rb.get(buffer, 6, 51) == DCPTime()); + BOOST_CHECK (*rb.get(buffer, 6, 51) == DCPTime::from_frames(40, 48000)); for (int i = 0; i < 51; ++i) { for (int j = 0; j < 2; ++j) { BOOST_REQUIRE_EQUAL (buffer[i * 6 + j], check++); @@ -157,7 +158,7 @@ BOOST_AUTO_TEST_CASE (audio_ring_buffers_test3) 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 */ @@ -176,7 +177,7 @@ BOOST_AUTO_TEST_CASE (audio_ring_buffers_test3) /* Get the rest */ buffer[51 * 2] = CANARY; - BOOST_CHECK (*rb.get(buffer, 2, 51) == DCPTime()); + BOOST_CHECK (*rb.get(buffer, 2, 51) == DCPTime::from_frames(40, 48000)); for (int i = 0; i < 51; ++i) { for (int j = 0; j < 2; ++j) { BOOST_REQUIRE_EQUAL (buffer[i * 2 + j], check++);