Supporters update.

[dcpomatic.git] / test / audio_ring_buffers_test.cc

diff --git a/test/audio_ring_buffers_test.cc b/test/audio_ring_buffers_test.cc
index 506a6350ecf5a1c2d456766d4155d7fab7551e71..265142d533fe9e20b9c4669f6e3b642d7f966168 100644 (file)
--- 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 */
@@ -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++);
        }
@@ -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 */
@@ -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++);
@@ -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 */
@@ -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++);