Bump libdcp.
[libsub.git] / test / dcp_to_stl_binary_test.cc
index 3c6f1853f3e3c459619cd27f389b6560adf64299..450b73083091c777d74233b8dcbac38aa49b39f4 100644 (file)
@@ -25,7 +25,7 @@
 #include <fstream>
 
 using std::ifstream;
-using std::list;
+using std::vector;
 
 BOOST_AUTO_TEST_CASE (dcp_to_stl_binary_test1)
 {
@@ -35,7 +35,7 @@ BOOST_AUTO_TEST_CASE (dcp_to_stl_binary_test1)
 
        boost::filesystem::path p = private_test / "fd586c30-6d38-48f2-8241-27359acf184c_sub.xml";
        sub::write_stl_binary (
-               sub::collect<list<sub::Subtitle> > (sub::DCPReader(p).subtitles ()),
+               sub::collect<vector<sub::Subtitle>> (sub::DCPReader(p).subtitles()),
                25,
                sub::LANGUAGE_FRENCH,
                "", "",
@@ -62,7 +62,7 @@ BOOST_AUTO_TEST_CASE (dcp_to_stl_binary_test2)
 
        boost::filesystem::path p = private_test / "93e8a6bf-499e-4d36-9350-a9bfa2e6758a_sub.xml";
        sub::write_stl_binary (
-               sub::collect<list<sub::Subtitle> > (sub::DCPReader(p).subtitles ()),
+               sub::collect<vector<sub::Subtitle>> (sub::DCPReader(p).subtitles()),
                25,
                sub::LANGUAGE_FRENCH,
                "", "",
@@ -89,7 +89,7 @@ BOOST_AUTO_TEST_CASE (dcp_to_stl_binary_test3)
 
        boost::filesystem::path p = private_test / "P_FTR_Subs_DE-FR_24fps_R1.xml";
        sub::write_stl_binary (
-               sub::collect<list<sub::Subtitle> > (sub::DCPReader(p).subtitles ()),
+               sub::collect<vector<sub::Subtitle>> (sub::DCPReader(p).subtitles()),
                25,
                sub::LANGUAGE_FRENCH,
                "", "",
@@ -111,7 +111,7 @@ BOOST_AUTO_TEST_CASE (dcp_to_stl_binary_test3)
 BOOST_AUTO_TEST_CASE (dcp_to_stl_binary_test4)
 {
        sub::write_stl_binary (
-               sub::collect<list<sub::Subtitle> > (sub::DCPReader("test/data/test1.xml").subtitles ()),
+               sub::collect<vector<sub::Subtitle>> (sub::DCPReader("test/data/test1.xml").subtitles()),
                25,
                sub::LANGUAGE_FRENCH,
                "", "",
@@ -133,7 +133,7 @@ BOOST_AUTO_TEST_CASE (dcp_to_stl_binary_test5)
 
        boost::filesystem::path p = private_test / "065d39ff-6723-4dbf-a94f-849cde82f5e1_sub.mxf";
        sub::write_stl_binary (
-               sub::collect<list<sub::Subtitle> > (sub::DCPReader(p).subtitles ()),
+               sub::collect<vector<sub::Subtitle>> (sub::DCPReader(p).subtitles()),
                25,
                sub::LANGUAGE_FRENCH,
                "", "",
@@ -160,7 +160,7 @@ BOOST_AUTO_TEST_CASE (dcp_to_stl_binary_test6)
 
        boost::filesystem::path p = private_test / "P_FTR_FullSubs_DE_24fps.xml";
        sub::write_stl_binary (
-               sub::collect<list<sub::Subtitle> > (sub::DCPReader(p).subtitles ()),
+               sub::collect<vector<sub::Subtitle>> (sub::DCPReader(p).subtitles()),
                24,
                sub::LANGUAGE_GERMAN,
                "", "",
@@ -183,7 +183,7 @@ BOOST_AUTO_TEST_CASE (dcp_to_stl_binary_test7)
 {
        boost::filesystem::path p = "test/data/test3.xml";
        sub::write_stl_binary (
-               sub::collect<list<sub::Subtitle> > (sub::DCPReader(p).subtitles ()),
+               sub::collect<vector<sub::Subtitle>> (sub::DCPReader(p).subtitles()),
                24,
                sub::LANGUAGE_GERMAN,
                "", "",
@@ -206,7 +206,7 @@ BOOST_AUTO_TEST_CASE (dcp_to_stl_binary_test8)
 {
        boost::filesystem::path p = private_test / "91a30f25-b415-4ffe-9623-bdae43a381d3_sub.xml";
        sub::write_stl_binary (
-               sub::collect<list<sub::Subtitle> > (sub::DCPReader(p).subtitles()),
+               sub::collect<vector<sub::Subtitle>> (sub::DCPReader(p).subtitles()),
                24,
                sub::LANGUAGE_GERMAN,
                "", "",
@@ -229,7 +229,7 @@ BOOST_AUTO_TEST_CASE (dcp_to_stl_binary_test9)
 {
        boost::filesystem::path p = private_test / "8b95f204-f2a6-4586-8e67-2dc671a78e72_sub.xml";
        sub::write_stl_binary (
-               sub::collect<list<sub::Subtitle> > (sub::DCPReader(p).subtitles()),
+               sub::collect<vector<sub::Subtitle>> (sub::DCPReader(p).subtitles()),
                24,
                sub::LANGUAGE_GERMAN,
                "", "",