X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Faudio_merger_test.cc;h=336dfcdf38e5d58a87d47e1252154065f284ace1;hb=HEAD;hp=2ac42964ad80318732cc6dc5a19e59e2054fcdf2;hpb=95f4d8740de74cdecf6658ab2607c0af9732904e;p=dcpomatic.git

diff --git a/test/audio_merger_test.cc b/test/audio_merger_test.cc
index 2ac42964a..0138475bd 100644
--- a/test/audio_merger_test.cc
+++ b/test/audio_merger_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2020 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,45 +18,53 @@
 
 */
 
+
 /** @file  test/audio_merger_test.cc
  *  @brief Test AudioMerger class.
  *  @ingroup selfcontained
  */
 
+
 #include "lib/cross.h"
 #include "lib/audio_merger.h"
 #include "lib/audio_buffers.h"
 #include "lib/dcpomatic_time.h"
 #include "test.h"
+#include <dcp/file.h>
 #include <dcp/raw_convert.h>
 #include <boost/test/unit_test.hpp>
-#include <boost/bind.hpp>
-#include <boost/function.hpp>
+#include <boost/bind/bind.hpp>
 #include <boost/signals2.hpp>
 #include <iostream>
 
+
 using std::pair;
+using std::make_shared;
 using std::list;
 using std::cout;
 using std::string;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::bind;
 using namespace dcpomatic;
 
+
 static shared_ptr<const AudioBuffers> last_audio;
 
+
 int const sampling_rate = 48000;
 
+
 static void
 push (AudioMerger& merger, int from, int to, int at)
 {
-	shared_ptr<AudioBuffers> buffers (new AudioBuffers (1, to - from));
+	auto buffers = make_shared<AudioBuffers>(1, to - from);
 	for (int i = 0; i < (to - from); ++i) {
 		buffers->data()[0][i] = from + i;
 	}
 	merger.push (buffers, DCPTime(at, sampling_rate));
 }
 
+
 /* Basic mixing, 2 overlapping pushes */
 BOOST_AUTO_TEST_CASE (audio_merger_test1)
 {
@@ -65,8 +73,8 @@ BOOST_AUTO_TEST_CASE (audio_merger_test1)
 	push (merger, 0, 64, 0);
 	push (merger, 0, 64, 22);
 
-	list<pair<shared_ptr<AudioBuffers>, DCPTime> > tb = merger.pull (DCPTime::from_frames (22, sampling_rate));
-	BOOST_REQUIRE (tb.size() == 1);
+	auto tb = merger.pull (DCPTime::from_frames (22, sampling_rate));
+	BOOST_REQUIRE (tb.size() == 1U);
 	BOOST_CHECK (tb.front().first != shared_ptr<const AudioBuffers> ());
 	BOOST_CHECK_EQUAL (tb.front().first->frames(), 22);
 	BOOST_CHECK_EQUAL (tb.front().second.get(), 0);
@@ -77,7 +85,7 @@ BOOST_AUTO_TEST_CASE (audio_merger_test1)
 	}
 
 	tb = merger.pull (DCPTime::from_frames (22 + 64, sampling_rate));
-	BOOST_REQUIRE (tb.size() == 1);
+	BOOST_REQUIRE (tb.size() == 1U);
 	BOOST_CHECK_EQUAL (tb.front().first->frames(), 64);
 	BOOST_CHECK_EQUAL (tb.front().second.get(), DCPTime::from_frames(22, sampling_rate).get());
 
@@ -91,6 +99,7 @@ BOOST_AUTO_TEST_CASE (audio_merger_test1)
 	}
 }
 
+
 /* Push at non-zero time */
 BOOST_AUTO_TEST_CASE (audio_merger_test2)
 {
@@ -99,8 +108,8 @@ BOOST_AUTO_TEST_CASE (audio_merger_test2)
 	push (merger, 0, 64, 9);
 
 	/* There's nothing from 0 to 9 */
-	list<pair<shared_ptr<AudioBuffers>, DCPTime> > tb = merger.pull (DCPTime::from_frames (9, sampling_rate));
-	BOOST_CHECK_EQUAL (tb.size(), 0);
+	auto tb = merger.pull (DCPTime::from_frames (9, sampling_rate));
+	BOOST_CHECK_EQUAL (tb.size(), 0U);
 
 	/* Then there's our data at 9 */
 	tb = merger.pull (DCPTime::from_frames (9 + 64, sampling_rate));
@@ -114,6 +123,7 @@ BOOST_AUTO_TEST_CASE (audio_merger_test2)
 	}
 }
 
+
 /* Push two non contiguous blocks */
 BOOST_AUTO_TEST_CASE (audio_merger_test3)
 {
@@ -124,8 +134,8 @@ BOOST_AUTO_TEST_CASE (audio_merger_test3)
 
 	/* Get them back */
 
-	list<pair<shared_ptr<AudioBuffers>, DCPTime> > tb = merger.pull (DCPTime::from_frames (100, sampling_rate));
-	BOOST_REQUIRE (tb.size() == 1);
+	auto tb = merger.pull (DCPTime::from_frames (100, sampling_rate));
+	BOOST_REQUIRE (tb.size() == 1U);
 	BOOST_CHECK_EQUAL (tb.front().first->frames(), 64);
 	BOOST_CHECK_EQUAL (tb.front().second.get(), DCPTime::from_frames(17, sampling_rate).get());
 	for (int i = 0; i < 64; ++i) {
@@ -133,7 +143,7 @@ BOOST_AUTO_TEST_CASE (audio_merger_test3)
 	}
 
 	tb = merger.pull (DCPTime::from_frames (200, sampling_rate));
-	BOOST_REQUIRE (tb.size() == 1);
+	BOOST_REQUIRE (tb.size() == 1U);
 	BOOST_CHECK_EQUAL (tb.front().first->frames(), 64);
 	BOOST_CHECK_EQUAL (tb.front().second.get(), DCPTime::from_frames(114, sampling_rate).get());
 	for (int i = 0; i < 64; ++i) {
@@ -141,19 +151,20 @@ BOOST_AUTO_TEST_CASE (audio_merger_test3)
 	}
 }
 
+
 /* Reply a sequence of calls to AudioMerger that resulted in a crash */
 BOOST_AUTO_TEST_CASE (audio_merger_test4)
 {
-	FILE* f = fopen_boost("test/data/audio_merger_bug1.log", "r");
+	dcp::File f("test/data/audio_merger_bug1.log", "r");
 	BOOST_REQUIRE (f);
 	list<string> tokens;
 	char buf[64];
-	while (fscanf(f, "%63s", buf) == 1) {
+	while (fscanf(f.get(), "%63s", buf) == 1) {
 		tokens.push_back (buf);
 	}
 
 	shared_ptr<AudioMerger> merger;
-	list<string>::const_iterator i = tokens.begin ();
+	auto i = tokens.begin ();
 	while (i != tokens.end()) {
 		BOOST_CHECK (*i++ == "I/AM");
 		string const cmd = *i++;
@@ -161,13 +172,14 @@ BOOST_AUTO_TEST_CASE (audio_merger_test4)
 			BOOST_REQUIRE (i != tokens.end());
 			merger.reset (new AudioMerger(dcp::raw_convert<int>(*i++)));
 		} else if (cmd == "clear") {
+			BOOST_REQUIRE(merger);
 			merger->clear ();
 		} else if (cmd == "push") {
 			BOOST_REQUIRE (i != tokens.end());
 			DCPTime time(dcp::raw_convert<DCPTime::Type>(*i++));
 			BOOST_REQUIRE (i != tokens.end());
 			int const frames = dcp::raw_convert<int>(*i++);
-			shared_ptr<AudioBuffers> buffers(new AudioBuffers(1, frames));
+			auto buffers = make_shared<AudioBuffers>(1, frames);
 			BOOST_REQUIRE (merger);
 			merger->push (buffers, time);
 		} else if (cmd == "pull") {
@@ -178,4 +190,3 @@ BOOST_AUTO_TEST_CASE (audio_merger_test4)
 	}
 }
 
-