X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Finterrupt_encoder_test.cc;h=bc90dab4294b66369f679e231a7b051a7fb2a587;hp=e146d2916f63f8f3931e4a1faeb5e7935e2b7ffd;hb=689fa55d1529ad88449ca464e9107c4dcc54d1cb;hpb=0aabe4060ea4bad7c7caac633aef0737fccff8c2 diff --git a/test/interrupt_encoder_test.cc b/test/interrupt_encoder_test.cc index e146d2916..bc90dab42 100644 --- a/test/interrupt_encoder_test.cc +++ b/test/interrupt_encoder_test.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2016 Carl Hetherington + Copyright (C) 2016-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,34 +18,39 @@ */ + /** @file test/interrupt_encoder_test.cc * @brief Test clean shutdown of threads if a DCP encode is interrupted. * @ingroup feature */ -#include "lib/film.h" + +#include "lib/audio_content.h" +#include "lib/cross.h" #include "lib/dcp_content_type.h" -#include "lib/ratio.h" #include "lib/ffmpeg_content.h" -#include "lib/audio_content.h" +#include "lib/film.h" #include "lib/job_manager.h" -#include "lib/cross.h" +#include "lib/ratio.h" #include "test.h" #include + +using std::make_shared; using std::shared_ptr; + /** Interrupt a DCP encode when it is in progress, as this used to (still does?) * sometimes give an error related to pthreads. */ BOOST_AUTO_TEST_CASE (interrupt_encoder_test) { - shared_ptr film = new_test_film ("interrupt_encoder_test"); - film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR")); - film->set_container (Ratio::from_id ("185")); + auto film = new_test_film ("interrupt_encoder_test"); + film->set_dcp_content_type (DCPContentType::from_isdcf_name("FTR")); + film->set_container (Ratio::from_id("185")); film->set_name ("interrupt_encoder_test"); - shared_ptr content (new FFmpegContent(TestPaths::private_data() / "prophet_long_clip.mkv")); + auto content = make_shared(TestPaths::private_data() / "prophet_long_clip.mkv"); film->examine_and_add_content (content); BOOST_REQUIRE (!wait_for_jobs());