X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fdigest_test.cc;h=7395fe46854841adc73c253a23d357388dae9eea;hb=6c98bac6ec242f8113a23b29a00f740a0ffa1129;hp=f7480132e58660e543c161e609305dbd97496152;hpb=2ae3d1c397dd3ca75c707e46592198b3a83f4444;p=dcpomatic.git diff --git a/test/digest_test.cc b/test/digest_test.cc index f7480132e..7395fe468 100644 --- a/test/digest_test.cc +++ b/test/digest_test.cc @@ -22,6 +22,7 @@ #include "lib/image_content.h" #include "lib/dcp_content_type.h" #include "lib/compose.hpp" +#include "lib/config.h" #include "test.h" #include #include @@ -66,8 +67,10 @@ BOOST_AUTO_TEST_CASE (digest_test) film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT); wait_for_jobs (); + Config::instance()->set_num_local_encoding_threads (4); film->make_dcp (); wait_for_jobs (); + Config::instance()->set_num_local_encoding_threads (1); dcp::DCP dcp (film->dir (film->dcp_name ())); dcp.read (); @@ -76,13 +79,13 @@ BOOST_AUTO_TEST_CASE (digest_test) list >::const_iterator i = reels.begin (); BOOST_REQUIRE (i != reels.end ()); - BOOST_CHECK_EQUAL ((*i)->main_picture()->hash().get(), openssl_hash ((*i)->main_picture()->asset()->file ())); + BOOST_CHECK_EQUAL ((*i)->main_picture()->hash().get(), openssl_hash ((*i)->main_picture()->asset()->file().get())); ++i; BOOST_REQUIRE (i != reels.end ()); - BOOST_CHECK_EQUAL ((*i)->main_picture()->hash().get(), openssl_hash ((*i)->main_picture()->asset()->file ())); + BOOST_CHECK_EQUAL ((*i)->main_picture()->hash().get(), openssl_hash ((*i)->main_picture()->asset()->file().get())); ++i; BOOST_REQUIRE (i != reels.end ()); - BOOST_CHECK_EQUAL ((*i)->main_picture()->hash().get(), openssl_hash ((*i)->main_picture()->asset()->file ())); + BOOST_CHECK_EQUAL ((*i)->main_picture()->hash().get(), openssl_hash ((*i)->main_picture()->asset()->file().get())); ++i; BOOST_REQUIRE (i == reels.end ()); }