X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fsubtitle_reel_number_test.cc;h=23e03b7bc6ed8704d79c1148ba8566a498cc6d8a;hb=b29eb5107c5e77fe01e43010e1582e733f6ceea1;hp=749ef9e73773d798b2da70b79f76a47b6ea9fdb8;hpb=d7ac100c0eb1b5efdcfbec59be870fd869252840;p=dcpomatic.git diff --git a/test/subtitle_reel_number_test.cc b/test/subtitle_reel_number_test.cc index 749ef9e73..23e03b7bc 100644 --- a/test/subtitle_reel_number_test.cc +++ b/test/subtitle_reel_number_test.cc @@ -18,7 +18,7 @@ */ -#include "lib/text_text_content.h" +#include "lib/string_text_file_content.h" #include "lib/film.h" #include "lib/ratio.h" #include "lib/text_content.h" @@ -43,11 +43,11 @@ BOOST_AUTO_TEST_CASE (subtitle_reel_number_test) film->set_container (Ratio::from_id ("185")); film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR")); film->set_name ("frobozz"); - shared_ptr content (new TextTextContent (film, "test/data/subrip5.srt")); + shared_ptr content (new StringTextFileContent("test/data/subrip5.srt")); film->examine_and_add_content (content); BOOST_REQUIRE (!wait_for_jobs ()); - content->subtitle->set_use (true); - content->subtitle->set_burn (false); + content->only_text()->set_use (true); + content->only_text()->set_burn (false); film->set_reel_type (REELTYPE_BY_LENGTH); film->set_interop (true); film->set_reel_length (1024 * 1024 * 512); @@ -56,9 +56,9 @@ BOOST_AUTO_TEST_CASE (subtitle_reel_number_test) dcp::DCP dcp ("build/test/subtitle_reel_number_test/" + film->dcp_name()); dcp.read (); - BOOST_REQUIRE_EQUAL (dcp.cpls().size(), 1); + BOOST_REQUIRE_EQUAL (dcp.cpls().size(), 1U); shared_ptr cpl = dcp.cpls().front(); - BOOST_REQUIRE_EQUAL (cpl->reels().size(), 6); + BOOST_REQUIRE_EQUAL (cpl->reels().size(), 6U); int n = 1; BOOST_FOREACH (shared_ptr i, cpl->reels()) {