Clarify success message from dcpverify a little.

[libdcp.git] / test / test.h

diff --git a/test/test.h b/test/test.h
index 5ed424bc0ec5c0a000ba0cb530acd25ce7098003..82e6afd54f33eca2bedbf3279d5aab1bc4767b56 100644 (file)
--- a/test/test.h
+++ b/test/test.h
@@ -43,16 +43,38 @@ 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>(),
+       int channels = 6
+       );
 extern std::shared_ptr<dcp::Subtitle> simple_subtitle ();
-extern std::shared_ptr<dcp::DCP> make_simple (boost::filesystem::path path, int reels = 1, int frames = 24);
+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,
+       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);
 extern std::shared_ptr<dcp::DCP> make_simple_with_smpte_ccaps (boost::filesystem::path path);
 extern std::shared_ptr<dcp::OpenJPEGImage> black_image (dcp::Size size = dcp::Size(1998, 1080));
 extern std::shared_ptr<dcp::ReelAsset> black_picture_asset (boost::filesystem::path dir, int frames = 24);
+extern boost::filesystem::path find_file (boost::filesystem::path dir, std::string filename_part);
 
 /** Creating an object of this class will make asdcplib's random number generation
  *  (more) predictable.