From aab6630b945371038cc49e456a766ae45cab1f47 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 8 Oct 2021 12:08:10 +0200 Subject: Fix problems when adding KDMs to a VF, before adding the OV. If we have a KDM which contains keys for all the assets referred to by a VF (even the ones in the OV) we would previously throw an exception because we tried to give the KDM to the resolved assets when it was given to the Reel. Here we change things so that the addition of KDMs to assets can be deferred if the asset is not yet resolved. --- test/test.h | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) (limited to 'test/test.h') 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 ignore_tags, bool ignore_whitespace = false); extern void check_xml (std::string ref, std::string test, std::vector ignore, bool ignore_whitespace = false); extern void check_file (boost::filesystem::path ref, boost::filesystem::path check); -extern std::shared_ptr simple_picture (boost::filesystem::path path, std::string suffix, int frames = 24); -extern std::shared_ptr 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 simple_picture ( + boost::filesystem::path path, + std::string suffix, + int frames = 24, + boost::optional key = boost::optional() + ); +extern std::shared_ptr 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 key = boost::optional() + ); extern std::shared_ptr simple_subtitle (); extern std::shared_ptr simple_markers (int frames = 24); -extern std::shared_ptr make_simple (boost::filesystem::path path, int reels = 1, int frames = 24, dcp::Standard = dcp::Standard::SMPTE); +extern std::shared_ptr make_simple ( + boost::filesystem::path path, + int reels = 1, + int frames = 24, + dcp::Standard = dcp::Standard::SMPTE, + boost::optional key = boost::optional() + ); extern std::shared_ptr make_simple_with_interop_subs (boost::filesystem::path path); extern std::shared_ptr make_simple_with_smpte_subs (boost::filesystem::path path); extern std::shared_ptr make_simple_with_interop_ccaps (boost::filesystem::path path); -- cgit v1.2.3