Fix subtitle_file() to find both Interop and SMPTE subtitles.

[dcpomatic.git] / test / torture_test.cc

diff --git a/test/torture_test.cc b/test/torture_test.cc
index 6b8cbffbfb96e8344f1286499caf477cbc7a6826..f8951932b7956f3b574539824b662c17642fcdd2 100644 (file)
--- a/test/torture_test.cc
+++ b/test/torture_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2017 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2017-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,11 +18,13 @@
 
 */
 
+
 /** @file  test/torture_test.cc
  *  @brief Tricky arrangements of content whose resulting DCPs are checked programmatically.
  *  @ingroup completedcp
  */
 
+
 #include "lib/audio_content.h"
 #include "lib/film.h"
 #include "lib/dcp_content_type.h"
@@ -41,12 +43,14 @@
 #include <boost/test/unit_test.hpp>
 #include <iostream>
 
+
 using std::list;
 using std::cout;
 using std::shared_ptr;
 using std::dynamic_pointer_cast;
 using namespace dcpomatic;
 
+
 /** Test start/end trim and positioning of some audio content */
 BOOST_AUTO_TEST_CASE (torture_test1)
 {
@@ -54,7 +58,7 @@ BOOST_AUTO_TEST_CASE (torture_test1)
        film->set_sequence (false);
 
        /* Staircase at an offset of 2000 samples, trimmed both start and end, with a gain of exactly 2 (linear) */
-       auto staircase = content_factory("test/data/staircase.wav").front();
+       auto staircase = content_factory("test/data/staircase.wav")[0];
        film->examine_and_add_content (staircase);
        BOOST_REQUIRE (!wait_for_jobs());
        staircase->set_position (film, DCPTime::from_frames(2000, film->audio_frame_rate()));
@@ -63,7 +67,7 @@ BOOST_AUTO_TEST_CASE (torture_test1)
        staircase->audio->set_gain (20 * log10(2));
 
        /* And again at an offset of 50000 samples, trimmed both start and end, with a gain of exactly 2 (linear) */
-       staircase = content_factory("test/data/staircase.wav").front ();
+       staircase = content_factory("test/data/staircase.wav")[0];
        film->examine_and_add_content (staircase);
        BOOST_REQUIRE (!wait_for_jobs());
        staircase->set_position (film, DCPTime::from_frames(50000, film->audio_frame_rate()));
@@ -72,7 +76,7 @@ BOOST_AUTO_TEST_CASE (torture_test1)
        staircase->audio->set_gain (20 * log10(2));
 
        /* 1s of red at 5s in */
-       auto red = content_factory("test/data/flat_red.png").front();
+       auto red = content_factory("test/data/flat_red.png")[0];
        film->examine_and_add_content (red);
        BOOST_REQUIRE (!wait_for_jobs());
        red->set_position (film, DCPTime::from_seconds(5));