From ad1ef39eda58b3a919ea3b7084401a0439409ec6 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 21 Nov 2018 23:17:00 +0000 Subject: Tidy and fix logging. --- test/butler_test.cc | 2 +- test/client_server_test.cc | 35 ++++++++++++++++------------------- test/dcp_playback_test.cc | 1 - test/player_test.cc | 4 ++-- 4 files changed, 19 insertions(+), 23 deletions(-) (limited to 'test') diff --git a/test/butler_test.cc b/test/butler_test.cc index a453bd858..93e141c42 100644 --- a/test/butler_test.cc +++ b/test/butler_test.cc @@ -51,7 +51,7 @@ BOOST_AUTO_TEST_CASE (butler_test1) map.set (i, i, 1); } - Butler butler (shared_ptr(new Player(film, film->playlist())), film->log(), map, 6, bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, false); + Butler butler (shared_ptr(new Player(film, film->playlist())), map, 6, bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, false); BOOST_CHECK (butler.get_video().second == DCPTime()); BOOST_CHECK (butler.get_video().second == DCPTime::from_frames(1, 24)); diff --git a/test/client_server_test.cc b/test/client_server_test.cc index 3ab1c36e1..10286c72a 100644 --- a/test/client_server_test.cc +++ b/test/client_server_test.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2014 Carl Hetherington + Copyright (C) 2012-2018 Carl Hetherington This file is part of DCP-o-matic. @@ -36,6 +36,7 @@ #include "lib/j2k_image_proxy.h" #include "lib/encode_server_description.h" #include "lib/file_log.h" +#include "lib/dcpomatic_log.h" #include #include @@ -84,7 +85,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb) p += sub_image->stride()[0]; } - shared_ptr log (new FileLog ("build/test/client_server_test_rgb.log")); + dcpomatic_log.reset (new FileLog("build/test/client_server_test_rgb.log")); shared_ptr pvf ( new PlayerVideo ( @@ -109,14 +110,13 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb) 0, 24, 200000000, - RESOLUTION_2K, - log + RESOLUTION_2K ) ); - Data locally_encoded = frame->encode_locally (boost::bind (&Log::dcp_log, log.get(), _1, _2)); + Data locally_encoded = frame->encode_locally (); - EncodeServer* server = new EncodeServer (log, true, 2); + EncodeServer* server = new EncodeServer (true, 2); thread* server_thread = new thread (boost::bind (&EncodeServer::run, server)); @@ -169,7 +169,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv) p += sub_image->stride()[0]; } - shared_ptr log (new FileLog ("build/test/client_server_test_yuv.log")); + dcpomatic_log.reset (new FileLog("build/test/client_server_test_yuv.log")); shared_ptr pvf ( new PlayerVideo ( @@ -194,14 +194,13 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv) 0, 24, 200000000, - RESOLUTION_2K, - log + RESOLUTION_2K ) ); - Data locally_encoded = frame->encode_locally (boost::bind (&Log::dcp_log, log.get(), _1, _2)); + Data locally_encoded = frame->encode_locally (); - EncodeServer* server = new EncodeServer (log, true, 2); + EncodeServer* server = new EncodeServer (true, 2); thread* server_thread = new thread (boost::bind (&EncodeServer::run, server)); @@ -241,7 +240,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_j2k) } } - shared_ptr log (new FileLog ("build/test/client_server_test_j2k.log")); + dcpomatic_log.reset (new FileLog("build/test/client_server_test_j2k.log")); shared_ptr raw_pvf ( new PlayerVideo ( @@ -264,12 +263,11 @@ BOOST_AUTO_TEST_CASE (client_server_test_j2k) 0, 24, 200000000, - RESOLUTION_2K, - log + RESOLUTION_2K ) ); - Data raw_locally_encoded = raw_frame->encode_locally (boost::bind (&Log::dcp_log, log.get(), _1, _2)); + Data raw_locally_encoded = raw_frame->encode_locally (); shared_ptr j2k_pvf ( new PlayerVideo ( @@ -292,14 +290,13 @@ BOOST_AUTO_TEST_CASE (client_server_test_j2k) 0, 24, 200000000, - RESOLUTION_2K, - log + RESOLUTION_2K ) ); - Data j2k_locally_encoded = j2k_frame->encode_locally (boost::bind (&Log::dcp_log, log.get(), _1, _2)); + Data j2k_locally_encoded = j2k_frame->encode_locally (); - EncodeServer* server = new EncodeServer (log, true, 2); + EncodeServer* server = new EncodeServer (true, 2); thread* server_thread = new thread (boost::bind (&EncodeServer::run, server)); diff --git a/test/dcp_playback_test.cc b/test/dcp_playback_test.cc index 4bb4d5a5d..afefbac58 100644 --- a/test/dcp_playback_test.cc +++ b/test/dcp_playback_test.cc @@ -40,7 +40,6 @@ BOOST_AUTO_TEST_CASE (dcp_playback_test) shared_ptr butler ( new Butler( shared_ptr(new Player(film, film->playlist())), - shared_ptr(), AudioMapping(6, 6), 6, bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), diff --git a/test/player_test.cc b/test/player_test.cc index 2ebcec4bf..7e2631cc9 100644 --- a/test/player_test.cc +++ b/test/player_test.cc @@ -212,7 +212,7 @@ BOOST_AUTO_TEST_CASE (player_seek_test) player->set_always_burn_open_subtitles (); player->set_play_referenced (); - shared_ptr butler (new Butler (player, film->log(), AudioMapping(), 2, bind(PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true)); + shared_ptr butler (new Butler (player, AudioMapping(), 2, bind(PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true)); butler->disable_audio(); for (int i = 0; i < 10; ++i) { @@ -243,7 +243,7 @@ BOOST_AUTO_TEST_CASE (player_seek_test2) player->set_always_burn_open_subtitles (); player->set_play_referenced (); - shared_ptr butler (new Butler(player, film->log(), AudioMapping(), 2, bind(PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true)); + shared_ptr butler (new Butler(player, AudioMapping(), 2, bind(PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true)); butler->disable_audio(); butler->seek(DCPTime::from_seconds(5), true); -- cgit v1.2.3