From: Carl Hetherington <cth@carlh.net>
Date: Thu, 14 Oct 2021 22:30:27 +0000 (+0200)
Subject: Fix test logging setup to actually work.
X-Git-Tag: checked-for-v2.16.x~252
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=ec4a182d0cd68bc5b1493b68bd2d9750ea8c6e7a

Fix test logging setup to actually work.
---

diff --git a/test/ffmpeg_encoder_test.cc b/test/ffmpeg_encoder_test.cc
index c3e8c9a81..993da4d23 100644
--- a/test/ffmpeg_encoder_test.cc
+++ b/test/ffmpeg_encoder_test.cc
@@ -24,6 +24,7 @@
 #include "lib/config.h"
 #include "lib/content_factory.h"
 #include "lib/dcp_content.h"
+#include "lib/dcpomatic_log.h"
 #include "lib/ffmpeg_content.h"
 #include "lib/ffmpeg_encoder.h"
 #include "lib/ffmpeg_examiner.h"
@@ -471,8 +472,8 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_regression_1)
 /** Regression test for Butler video buffers reached 480 frames (audio is 0) (#2101) */
 BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_regression_2)
 {
-	auto logs = Config::instance()->log_types();
-	Config::instance()->set_log_types(logs | LogEntry::TYPE_DEBUG_PLAYER);
+	auto logs = dcpomatic_log->types();
+	dcpomatic_log->set_types(logs | LogEntry::TYPE_DEBUG_PLAYER);
 
 	auto content = content_factory(TestPaths::private_data() / "tge_clip.mkv").front();
 	auto film = new_test_film2 ("ffmpeg_encoder_prores_regression_2", { content });
@@ -481,6 +482,6 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_regression_2)
 	FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_regression_2.mov", ExportFormat::PRORES, false, true, false, 23);
 	encoder.go ();
 
-	Config::instance()->set_log_types(logs);
+	dcpomatic_log->set_types(logs);
 }