diff options
Diffstat (limited to 'test/test.h')
| -rw-r--r-- | test/test.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/test/test.h b/test/test.h index bacb9311..d796a4a4 100644 --- a/test/test.h +++ b/test/test.h @@ -21,9 +21,8 @@ #include "cpl.h" #include "dcp.h" #include "reel.h" -#include "reel_subtitle_asset.h" -#include "subtitle.h" #include "reel_asset.h" +#include "text.h" #include <boost/filesystem.hpp> #include <boost/optional.hpp> #include <boost/test/unit_test.hpp> @@ -34,7 +33,7 @@ namespace xmlpp { namespace dcp { class DCP; - class MonoPictureAsset; + class MonoJ2KPictureAsset; class SoundAsset; } @@ -44,7 +43,7 @@ extern boost::filesystem::path xsd_test; extern void check_xml (xmlpp::Element* ref, xmlpp::Element* test, std::vector<std::string> ignore_tags, bool ignore_whitespace = false); extern void check_xml (std::string ref, std::string test, std::vector<std::string> ignore, bool ignore_whitespace = false); extern void check_file (boost::filesystem::path ref, boost::filesystem::path check); -extern std::shared_ptr<dcp::MonoPictureAsset> simple_picture ( +extern std::shared_ptr<dcp::MonoJ2KPictureAsset> simple_picture ( boost::filesystem::path path, std::string suffix, int frames = 24, @@ -60,7 +59,7 @@ extern std::shared_ptr<dcp::SoundAsset> simple_sound ( boost::optional<dcp::Key> key = boost::optional<dcp::Key>(), int channels = 6 ); -extern std::shared_ptr<dcp::Subtitle> simple_subtitle (); +extern std::shared_ptr<dcp::Text> simple_text(); extern std::shared_ptr<dcp::ReelMarkersAsset> simple_markers (int frames = 24); extern std::shared_ptr<dcp::DCP> make_simple ( boost::filesystem::path path, |