From ec4a182d0cd68bc5b1493b68bd2d9750ea8c6e7a Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 15 Oct 2021 00:30:27 +0200 Subject: [PATCH] Fix test logging setup to actually work. --- test/ffmpeg_encoder_test.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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); } -- 2.30.2