diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-01-12 17:20:54 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-01-12 17:20:54 +0000 |
| commit | fd1d21f713e9b0abd8afebcbab36d70aac9b6cce (patch) | |
| tree | c6c8a1907a64550fb2e6b6d7f4757c0a4d85fb17 /test | |
| parent | 94399f35aea4e37c699918f06eddfa931e4aaefc (diff) | |
Un-compiling work-in-progress.
Diffstat (limited to 'test')
| -rw-r--r-- | test/dcp_reader_test.cc | 6 | ||||
| -rw-r--r-- | test/dcp_to_stl_binary_test.cc | 13 |
2 files changed, 10 insertions, 9 deletions
diff --git a/test/dcp_reader_test.cc b/test/dcp_reader_test.cc index 8d0fda1..ab89f74 100644 --- a/test/dcp_reader_test.cc +++ b/test/dcp_reader_test.cc @@ -17,7 +17,7 @@ */ -#include "dcp_reader.h" +#include "interop_dcp_reader.h" #include "collect.h" #include <boost/test/unit_test.hpp> #include <fstream> @@ -30,7 +30,7 @@ using boost::shared_ptr; /* Test reading of a DCP XML file */ BOOST_AUTO_TEST_CASE (dcp_reader_test1) { - sub::DCPReader reader ("test/data/test1.xml"); + sub::InteropDCPReader reader ("test/data/test1.xml"); list<sub::Subtitle> subs = sub::collect<list<sub::Subtitle> > (reader.subtitles ()); list<sub::Subtitle>::iterator i = subs.begin (); @@ -155,7 +155,7 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test1) /* And another one */ BOOST_AUTO_TEST_CASE (dcp_reader_test2) { - sub::DCPReader reader ("test/data/test2.xml"); + sub::InteropDCPReader reader ("test/data/test2.xml"); list<sub::Subtitle> subs = sub::collect<list<sub::Subtitle> > (reader.subtitles ()); list<sub::Subtitle>::iterator i = subs.begin (); diff --git a/test/dcp_to_stl_binary_test.cc b/test/dcp_to_stl_binary_test.cc index 3643a95..6199c69 100644 --- 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, "", "", |