Use a vector rather than a list when returning from content_factory().

[dcpomatic.git] / test / subtitle_charset_test.cc

diff --git a/test/subtitle_charset_test.cc b/test/subtitle_charset_test.cc
index 8233bf023c9b7b1df9d74c4aa232b8ce09860bc7..333a895bfdf10bc16653079121f0f0de5fbf6468 100644 (file)
--- a/test/subtitle_charset_test.cc
+++ b/test/subtitle_charset_test.cc
@@ -35,18 +35,18 @@ using std::dynamic_pointer_cast;
 /** Test parsing of UTF16 CR/LF input */
 BOOST_AUTO_TEST_CASE (subtitle_charset_test1)
 {
-       auto content = content_factory (TestPaths::private_data() / "PADDINGTON soustitresVFdef.srt").front();
-       auto film = new_test_film2 ("subtitle_charset_test1", { content });
+       auto content = content_factory(TestPaths::private_data() / "PADDINGTON soustitresVFdef.srt");
+       auto film = new_test_film2 ("subtitle_charset_test1", content);
 }
 
 
 /** Test parsing of OSX input */
 BOOST_AUTO_TEST_CASE (subtitle_charset_test2)
 {
-       auto content = content_factory ("test/data/osx.srt").front();
-       auto film = new_test_film2 ("subtitle_charset_test2", { content });
-       auto ts = dynamic_pointer_cast<StringTextFileContent> (content);
+       auto content = content_factory("test/data/osx.srt");
+       auto film = new_test_film2 ("subtitle_charset_test2", content);
+       auto ts = dynamic_pointer_cast<StringTextFileContent>(content[0]);
        BOOST_REQUIRE (ts);
        /* Make sure we got the subtitle data from the file */
-       BOOST_REQUIRE_EQUAL (content->full_length(film).get(), 6052032);
+       BOOST_REQUIRE_EQUAL(content[0]->full_length(film).get(), 6052032);
 }