X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Foptimise_stills_test.cc;h=d9f8d262a1c17ad0353d018a56aefc3beaca2261;hb=fa5f3a8bf77209da27acc33cf144e2e4500a2600;hp=7bd7f3b8543aaf51e9f8ff574fffe7ed3c00f341;hpb=d0a0a4839f0e1e8d37f9f9ad41784c4d18210a6b;p=dcpomatic.git

diff --git a/test/optimise_stills_test.cc b/test/optimise_stills_test.cc
index 7bd7f3b85..d9f8d262a 100644
--- a/test/optimise_stills_test.cc
+++ b/test/optimise_stills_test.cc
@@ -28,6 +28,7 @@
 #include "lib/dcp_content_type.h"
 #include "lib/content.h"
 #include "lib/video_content.h"
+#include "lib/dcpomatic_log.h"
 #include "test.h"
 #include <boost/test/unit_test.hpp>
 #include <boost/algorithm/string.hpp>
@@ -46,7 +47,8 @@ void
 check (string name, int check_full, int check_repeat)
 {
 	/* The encoder will have been destroyed so parse the logs */
-	ifstream log ("build/test/" + name + "/log");
+	string log_file = "build/test/" + name + "/log";
+	ifstream log (log_file.c_str());
 	string line;
 	int repeat = 0;
 	int full = 0;
@@ -71,10 +73,11 @@ check (string name, int check_full, int check_repeat)
 BOOST_AUTO_TEST_CASE (optimise_stills_test1)
 {
 	shared_ptr<Film> film = new_test_film ("optimise_stills_test1");
+	dcpomatic_log = film->log ();
 	film->set_container (Ratio::from_id ("185"));
 	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
 	film->set_name ("frobozz");
-	shared_ptr<Content> content = content_factory(film, "test/data/flat_red.png").front ();
+	shared_ptr<Content> content = content_factory("test/data/flat_red.png").front ();
 	film->examine_and_add_content (content);
 	BOOST_REQUIRE (!wait_for_jobs ());
 	film->make_dcp ();
@@ -87,10 +90,11 @@ BOOST_AUTO_TEST_CASE (optimise_stills_test1)
 BOOST_AUTO_TEST_CASE (optimise_stills_test2)
 {
 	shared_ptr<Film> film = new_test_film ("optimise_stills_test2");
+	dcpomatic_log = film->log ();
 	film->set_container (Ratio::from_id ("185"));
 	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
 	film->set_name ("frobozz");
-	shared_ptr<Content> content = content_factory(film, "test/data/flat_red.png").front ();
+	shared_ptr<Content> content = content_factory("test/data/flat_red.png").front ();
 	film->examine_and_add_content (content);
 	BOOST_REQUIRE (!wait_for_jobs ());
 	content->video->set_frame_type (VIDEO_FRAME_TYPE_3D_LEFT_RIGHT);