Fix build on some GCCs.

[libsub.git] / test / dcp_to_stl_binary_test.cc

diff --git a/test/dcp_to_stl_binary_test.cc b/test/dcp_to_stl_binary_test.cc
index 3643a95a2deca3fda7f95e71de8b18fc0aac9b94..6199c692ecd37ef914f2fe69d676507dbc7650ae 100644 (file)
--- a/test/dcp_to_stl_binary_test.cc
+++ b/test/dcp_to_stl_binary_test.cc
@@ -18,7 +18,8 @@
 */
 
 #include "test.h"
-#include "dcp_reader.h"
+#include "interop_dcp_reader.h"
+#include "smpte_dcp_reader.h"
 #include "stl_binary_writer.h"
 #include "collect.h"
 #include <boost/test/unit_test.hpp>
@@ -35,7 +36,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<list<sub::Subtitle> > (sub::InteropDCPReader(p).subtitles ()),
                25,
                sub::LANGUAGE_FRENCH,
                "", "",
@@ -62,7 +63,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<list<sub::Subtitle> > (sub::InteropDCPReader(p).subtitles ()),
                25,
                sub::LANGUAGE_FRENCH,
                "", "",
@@ -89,7 +90,7 @@ BOOST_AUTO_TEST_CASE (dcp_to_stl_binary_test3)
 
        boost::filesystem::path p = private_test / "Paddington_FTR_Subs_DE-FR_24fps_R1.xml";
        sub::write_stl_binary (
-               sub::collect<list<sub::Subtitle> > (sub::DCPReader(p).subtitles ()),
+               sub::collect<list<sub::Subtitle> > (sub::InteropDCPReader(p).subtitles ()),
                25,
                sub::LANGUAGE_FRENCH,
                "", "",
@@ -111,7 +112,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<list<sub::Subtitle> > (sub::InteropDCPReader("test/data/test1.xml").subtitles ()),
                25,
                sub::LANGUAGE_FRENCH,
                "", "",
@@ -133,7 +134,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<list<sub::Subtitle> > (sub::SMPTEDCPReader(p, true).subtitles ()),
                25,
                sub::LANGUAGE_FRENCH,
                "", "",