X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Ftest.h;h=4968d330162eff74327dd8d1dc8722fec46ed314;hb=5d937606cf96d163be98920fa5619114a28eec9d;hp=8ccebb5feb8c5bed0f56ce3c6d539e0b23ead499;hpb=5ff6b15ef3c58a046fb9eec0273c5e7322988a14;p=dcpomatic.git

diff --git a/test/test.h b/test/test.h
index 8ccebb5fe..4968d3301 100644
--- a/test/test.h
+++ b/test/test.h
@@ -18,18 +18,20 @@
 
 */
 
-#include <Magick++.h>
+#include "lib/warnings.h"
 #include <boost/filesystem.hpp>
+#include <boost/shared_ptr.hpp>
 
 class Film;
 class Image;
+class Log;
 
 
 class TestPaths
 {
 public:
-	static boost::filesystem::path private_data;
-	static boost::filesystem::path xsd;
+	static boost::filesystem::path private_data();
+	static boost::filesystem::path xsd();
 };
 
 extern bool wait_for_jobs ();
@@ -37,16 +39,29 @@ extern void setup_test_config ();
 extern boost::shared_ptr<Film> new_test_film (std::string);
 extern boost::shared_ptr<Film> new_test_film2 (std::string);
 extern void check_dcp (boost::filesystem::path, boost::filesystem::path);
+extern void check_dcp (boost::filesystem::path, boost::shared_ptr<const Film>);
 extern void check_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 = 0.01);
+extern void check_image (boost::filesystem::path, boost::filesystem::path, double threshold = 4);
 extern boost::filesystem::path test_film_dir (std::string);
-extern void write_image (boost::shared_ptr<const Image> image, boost::filesystem::path file, std::string format, MagickCore::StorageType pixel_type = MagickCore::CharPixel);
+extern void write_image (boost::shared_ptr<const Image> image, boost::filesystem::path file);
 boost::filesystem::path dcp_file (boost::shared_ptr<const Film> film, std::string prefix);
 void check_one_frame (boost::filesystem::path dcp, int64_t index, boost::filesystem::path ref);
 extern boost::filesystem::path subtitle_file (boost::shared_ptr<Film> film);
 extern void make_random_file (boost::filesystem::path path, size_t size);
+
+class LogSwitcher
+{
+public:
+	LogSwitcher (boost::shared_ptr<Log> log);
+	~LogSwitcher ();
+
+private:
+	boost::shared_ptr<Log> _old;
+};
+