X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Ftest.h;h=01ddb19874e525ced470ae9c029a1af8261d528c;hp=5a2246894992da9cfa71d0f6b9e575a24f8b8969;hb=a4c510f8e3730d918c5ba54b1b4aaf307d748e0f;hpb=369821c41e62d4cce506cd4206f9db0d91b4f643

diff --git a/test/test.h b/test/test.h
index 5a2246894..01ddb1987 100644
--- a/test/test.h
+++ b/test/test.h
@@ -19,11 +19,14 @@
 */
 
 
-#include "lib/warnings.h"
-#include "lib/types.h"
+#include "lib/video_frame_type.h"
+#include <dcp/types.h>
+#include <dcp/verify.h>
 #include <boost/filesystem.hpp>
+#include <vector>
 
 
+class Content;
 class Film;
 class Image;
 class Log;
@@ -54,17 +57,16 @@ private:
 
 
 extern bool wait_for_jobs ();
-extern void setup_test_config ();
 extern std::shared_ptr<Film> new_test_film (std::string);
-extern std::shared_ptr<Film> new_test_film2 (std::string, Cleanup* cleanup = nullptr);
+extern std::shared_ptr<Film> new_test_film2 (std::string, std::vector<std::shared_ptr<Content>> content = {}, Cleanup* cleanup = nullptr);
 extern void check_dcp (boost::filesystem::path, boost::filesystem::path);
 extern void check_dcp (boost::filesystem::path, std::shared_ptr<const Film>);
 extern void check_file (boost::filesystem::path ref, boost::filesystem::path check);
+extern void check_text_file (boost::filesystem::path ref, boost::filesystem::path check);
 extern void check_wav_file (boost::filesystem::path ref, boost::filesystem::path check);
 extern void check_mxf_audio_file (boost::filesystem::path ref, boost::filesystem::path check);
 extern bool mxf_atmos_files_same (boost::filesystem::path ref, boost::filesystem::path check, bool verbose = false);
 extern void check_xml (boost::filesystem::path, boost::filesystem::path, std::list<std::string>);
-extern void check_file (boost::filesystem::path, boost::filesystem::path);
 extern void check_ffmpeg (boost::filesystem::path, boost::filesystem::path, int audio_tolerance);
 extern void check_image (boost::filesystem::path, boost::filesystem::path, double threshold = 4);
 extern boost::filesystem::path test_film_dir (std::string);
@@ -73,6 +75,11 @@ boost::filesystem::path dcp_file (std::shared_ptr<const Film> film, std::string
 void check_one_frame (boost::filesystem::path dcp, int64_t index, boost::filesystem::path ref);
 extern boost::filesystem::path subtitle_file (std::shared_ptr<Film> film);
 extern void make_random_file (boost::filesystem::path path, size_t size);
+extern void verify_dcp(boost::filesystem::path dir, std::vector<dcp::VerificationNote::Code> ignore);
+extern void make_and_verify_dcp (std::shared_ptr<Film> film, std::vector<dcp::VerificationNote::Code> ignore = {});
+extern void check_int_close (int a, int b, int d);
+extern void check_int_close (std::pair<int, int>, std::pair<int, int>, int d);
+extern boost::filesystem::path find_file (boost::filesystem::path dir, std::string filename_part);
 
 
 class LogSwitcher
@@ -86,6 +93,27 @@ private:
 };
 
 
+class ConfigRestorer
+{
+public:
+	~ConfigRestorer();
+};
+
+
+class Editor
+{
+public:
+	Editor(boost::filesystem::path path);
+	~Editor();
+
+	void replace(std::string a, std::string b);
+
+private:
+	boost::filesystem::path _path;
+	std::string _content;
+};
+
+
 namespace dcp {
 
 std::ostream& operator<< (std::ostream& s, dcp::Size i);