X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Ftest.h;h=82e6afd54f33eca2bedbf3279d5aab1bc4767b56;hb=2cb2078282c8b799d7a0d0016e1518f1a4b55af1;hp=9009a58bcdcbdc7388a111561bee076e6a6c2a5e;hpb=cdc8bc6a7da0b4f8c3dbfcf560fea61473cf1ca3;p=libdcp.git

diff --git a/test/test.h b/test/test.h
index 9009a58b..82e6afd5 100644
--- a/test/test.h
+++ b/test/test.h
@@ -19,7 +19,6 @@
 
 
 #include "cpl.h"
-#include "data.h"
 #include "dcp.h"
 #include "reel.h"
 #include "reel_subtitle_asset.h"
@@ -35,22 +34,47 @@ namespace xmlpp {
 namespace dcp {
 	class DCP;
 	class MonoPictureAsset;
+	class SoundAsset;
 }
 
 extern boost::filesystem::path private_test;
 extern boost::filesystem::path xsd_test;
 
-extern void check_xml (xmlpp::Element* ref, xmlpp::Element* test, std::list<std::string> ignore_tags, bool ignore_whitespace = false);
-extern void check_xml (std::string ref, std::string test, std::list<std::string> ignore);
+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 boost::shared_ptr<dcp::MonoPictureAsset> simple_picture (boost::filesystem::path path, std::string suffix);
-extern boost::shared_ptr<dcp::DCP> make_simple (boost::filesystem::path path, int reels = 1);
-extern boost::shared_ptr<dcp::DCP> make_simple_with_interop_subs (boost::filesystem::path path);
-extern boost::shared_ptr<dcp::DCP> make_simple_with_smpte_subs (boost::filesystem::path path);
-extern boost::shared_ptr<dcp::DCP> make_simple_with_interop_ccaps (boost::filesystem::path path);
-extern boost::shared_ptr<dcp::DCP> make_simple_with_smpte_ccaps (boost::filesystem::path path);
-extern boost::shared_ptr<dcp::OpenJPEGImage> black_image ();
-extern boost::shared_ptr<dcp::ReelAsset> black_picture_asset (boost::filesystem::path dir, int frames = 24);
+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::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.