diff options
Diffstat (limited to 'test/test.h')
| -rw-r--r-- | test/test.h | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/test/test.h b/test/test.h index 8733c7c3..339dd8aa 100644 --- a/test/test.h +++ b/test/test.h @@ -43,11 +43,30 @@ 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 (boost::filesystem::path path, std::string suffix, int frames = 24); -extern std::shared_ptr<dcp::SoundAsset> simple_sound (boost::filesystem::path path, std::string suffix, dcp::MXFMetadata mxf_meta, std::string language, int frames = 24, int sample_rate = 48000); +extern std::shared_ptr<dcp::MonoPictureAsset> simple_picture ( + boost::filesystem::path path, + std::string suffix, + int frames = 24, + boost::optional<dcp::Key> key = boost::optional<dcp::Key>() + ); +extern std::shared_ptr<dcp::SoundAsset> simple_sound ( + boost::filesystem::path path, + std::string suffix, + dcp::MXFMetadata mxf_meta, + std::string language, + int frames = 24, + int sample_rate = 48000, + boost::optional<dcp::Key> key = boost::optional<dcp::Key>() + ); extern std::shared_ptr<dcp::Subtitle> simple_subtitle (); extern std::shared_ptr<dcp::ReelMarkersAsset> simple_markers (int frames = 24); -extern std::shared_ptr<dcp::DCP> make_simple (boost::filesystem::path path, int reels = 1, int frames = 24, dcp::Standard = dcp::Standard::SMPTE); +extern std::shared_ptr<dcp::DCP> make_simple ( + boost::filesystem::path path, + int reels = 1, + int frames = 24, + dcp::Standard = dcp::Standard::SMPTE, + boost::optional<dcp::Key> key = boost::optional<dcp::Key>() + ); extern std::shared_ptr<dcp::DCP> make_simple_with_interop_subs (boost::filesystem::path path); extern std::shared_ptr<dcp::DCP> make_simple_with_smpte_subs (boost::filesystem::path path); extern std::shared_ptr<dcp::DCP> make_simple_with_interop_ccaps (boost::filesystem::path path); |