summaryrefslogtreecommitdiff
path: root/test/remake_with_subtitle_test.cc
diff options
context:
space:
mode:
Diffstat (limited to 'test/remake_with_subtitle_test.cc')
-rw-r--r--test/remake_with_subtitle_test.cc15
1 files changed, 8 insertions, 7 deletions
diff --git a/test/remake_with_subtitle_test.cc b/test/remake_with_subtitle_test.cc
index 81738c2ea..3b6cf930c 100644
--- a/test/remake_with_subtitle_test.cc
+++ b/test/remake_with_subtitle_test.cc
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2017 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2017-2021 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
@@ -18,6 +18,7 @@
*/
+
#include "lib/ffmpeg_content.h"
#include "lib/content_factory.h"
#include "lib/text_content.h"
@@ -25,28 +26,28 @@
#include "test.h"
#include <boost/test/unit_test.hpp>
+
using std::shared_ptr;
using std::dynamic_pointer_cast;
+
/** Check that if we remake a DCP having turned off subtitles the code notices
* and doesn't re-use the old video data.
*/
BOOST_AUTO_TEST_CASE (remake_with_subtitle_test)
{
- shared_ptr<Film> film = new_test_film2 ("remake_with_subtitle_test");
- shared_ptr<FFmpegContent> content = dynamic_pointer_cast<FFmpegContent>(content_factory(TestPaths::private_data() / "prophet_short_clip.mkv").front());
+ auto film = new_test_film2 ("remake_with_subtitle_test");
+ auto content = dynamic_pointer_cast<FFmpegContent>(content_factory(TestPaths::private_data() / "prophet_short_clip.mkv").front());
film->examine_and_add_content (content);
BOOST_REQUIRE (!wait_for_jobs ());
content->only_text()->set_burn (true);
content->only_text()->set_use (true);
- film->make_dcp ();
- BOOST_REQUIRE (!wait_for_jobs ());
+ make_and_verify_dcp (film);
boost::filesystem::remove_all (film->dir (film->dcp_name(), false));
content->only_text()->set_use (false);
- film->make_dcp ();
- BOOST_REQUIRE (!wait_for_jobs ());
+ make_and_verify_dcp (film);
check_one_frame (film->dir(film->dcp_name()), 325, TestPaths::private_data() / "prophet_frame_325_no_subs.j2c");
}