Rename new_test_film2 -> new_test_film.

1 files changed, 12 insertions, 12 deletions

diff --git a/test/audio_content_test.cc b/test/audio_content_test.cc
index f2c095fab..72023a66f 100644
--- a/test/audio_content_test.cc
+++ b/test/audio_content_test.cc
@@ -30,7 +30,7 @@
 BOOST_AUTO_TEST_CASE (audio_content_fade_empty_region)
 {
 	auto content = content_factory("test/data/impulse_train.wav");
-	auto film = new_test_film2("audio_content_fade_empty_region", content);
+	auto film = new_test_film("audio_content_fade_empty_region", content);
 
 	BOOST_CHECK(content[0]->audio->fade(content[0]->audio->stream(), 0, 0, 48000).empty());
 }
@@ -39,7 +39,7 @@ BOOST_AUTO_TEST_CASE (audio_content_fade_empty_region)
 BOOST_AUTO_TEST_CASE (audio_content_fade_no_fade)
 {
 	auto content = content_factory("test/data/impulse_train.wav");
-	auto film = new_test_film2("audio_content_fade_no_fade", content);
+	auto film = new_test_film("audio_content_fade_no_fade", content);
 
 	auto const stream = content[0]->audio->stream();
 
@@ -52,7 +52,7 @@ BOOST_AUTO_TEST_CASE (audio_content_fade_no_fade)
 BOOST_AUTO_TEST_CASE (audio_content_fade_unfaded_part)
 {
 	auto content = content_factory("test/data/impulse_train.wav")[0];
-	auto film = new_test_film2("audio_content_fade_unfaded_part", { content });
+	auto film = new_test_film("audio_content_fade_unfaded_part", { content });
 
 	auto const stream = content->audio->stream();
 
@@ -68,7 +68,7 @@ BOOST_AUTO_TEST_CASE (audio_content_fade_unfaded_part)
 BOOST_AUTO_TEST_CASE (audio_content_within_the_fade_in)
 {
 	auto content = content_factory("test/data/impulse_train.wav")[0];
-	auto film = new_test_film2("audio_content_within_the_fade_in", { content });
+	auto film = new_test_film("audio_content_within_the_fade_in", { content });
 
 	content->audio->set_fade_in(dcpomatic::ContentTime::from_frames(2000, 48000));
 
@@ -83,7 +83,7 @@ BOOST_AUTO_TEST_CASE (audio_content_within_the_fade_in)
 BOOST_AUTO_TEST_CASE (audio_content_within_the_fade_out)
 {
 	auto content = content_factory("test/data/impulse_train.wav")[0];
-	auto film = new_test_film2("audio_content_within_the_fade_out", { content });
+	auto film = new_test_film("audio_content_within_the_fade_out", { content });
 
 	auto const stream = content->audio->stream();
 
@@ -101,7 +101,7 @@ BOOST_AUTO_TEST_CASE (audio_content_within_the_fade_out)
 BOOST_AUTO_TEST_CASE (audio_content_overlapping_the_fade_in)
 {
 	auto content = content_factory("test/data/impulse_train.wav")[0];
-	auto film = new_test_film2("audio_content_overlapping_the_fade_in", { content });
+	auto film = new_test_film("audio_content_overlapping_the_fade_in", { content });
 
 	content->audio->set_fade_in(dcpomatic::ContentTime::from_frames(2000, 48000));
 	content->audio->set_fade_out(dcpomatic::ContentTime::from_frames(2000, 48000));
@@ -120,7 +120,7 @@ BOOST_AUTO_TEST_CASE (audio_content_overlapping_the_fade_in)
 BOOST_AUTO_TEST_CASE (audio_content_overlapping_the_fade_out)
 {
 	auto content = content_factory("test/data/impulse_train.wav")[0];
-	auto film = new_test_film2("audio_content_overlapping_the_fade_out", { content });
+	auto film = new_test_film("audio_content_overlapping_the_fade_out", { content });
 
 	auto const stream = content->audio->stream();
 
@@ -141,7 +141,7 @@ BOOST_AUTO_TEST_CASE (audio_content_overlapping_the_fade_out)
 BOOST_AUTO_TEST_CASE (audio_content_fade_in_and_out)
 {
 	auto content = content_factory("test/data/impulse_train.wav")[0];
-	auto film = new_test_film2("audio_content_fade_in_and_out", { content });
+	auto film = new_test_film("audio_content_fade_in_and_out", { content });
 
 	auto const stream = content->audio->stream();
 	auto const length = stream->length();
@@ -160,7 +160,7 @@ BOOST_AUTO_TEST_CASE (audio_content_fade_in_and_out)
 BOOST_AUTO_TEST_CASE (audio_content_fade_in_with_trim)
 {
 	auto content = content_factory("test/data/impulse_train.wav")[0];
-	auto film = new_test_film2("audio_content_fade_in_with_trim", { content });
+	auto film = new_test_film("audio_content_fade_in_with_trim", { content });
 
 	auto const stream = content->audio->stream();
 
@@ -187,7 +187,7 @@ BOOST_AUTO_TEST_CASE (audio_content_fade_in_with_trim)
 BOOST_AUTO_TEST_CASE (audio_content_fade_out_with_trim)
 {
 	auto content = content_factory("test/data/impulse_train.wav")[0];
-	auto film = new_test_film2("audio_content_fade_out_with_trim", { content });
+	auto film = new_test_film("audio_content_fade_out_with_trim", { content });
 
 	auto const stream = content->audio->stream();
 	auto const length = stream->length();
@@ -217,7 +217,7 @@ BOOST_AUTO_TEST_CASE (audio_content_fade_out_with_trim_at_44k1)
 {
 	/* 5s at 44.1kHz */
 	auto content = content_factory("test/data/white.wav")[0];
-	auto film = new_test_film2("audio_content_fade_out_with_trim_at_44k1", { content });
+	auto film = new_test_film("audio_content_fade_out_with_trim_at_44k1", { content });
 
 	auto const stream = content->audio->stream();
 
@@ -249,7 +249,7 @@ BOOST_AUTO_TEST_CASE (audio_content_fade_out_with_trim_at_44k1)
 BOOST_AUTO_TEST_CASE (audio_content_fades_same_as_video)
 {
 	auto content = content_factory("test/data/staircase.mov")[0];
-	auto film = new_test_film2("audio_content_fades_same_as_video", { content });
+	auto film = new_test_film("audio_content_fades_same_as_video", { content });
 
 	content->audio->set_use_same_fades_as_video(true);
 	content->video->set_fade_in(9);