std::shared_ptr

[dcpomatic.git] / test / subtitle_reel_number_test.cc

diff --git a/test/subtitle_reel_number_test.cc b/test/subtitle_reel_number_test.cc
index 317f93ff5ed2eccf951f7ca0cf48d420e1280bfa..e5f1667ef7ea8f6064738b822a39feb437b357e4 100644 (file)
--- a/test/subtitle_reel_number_test.cc
+++ b/test/subtitle_reel_number_test.cc
@@ -18,7 +18,7 @@
 
 */
 
-#include "lib/plain_text_content.h"
+#include "lib/string_text_file_content.h"
 #include "lib/film.h"
 #include "lib/ratio.h"
 #include "lib/text_content.h"
@@ -33,8 +33,8 @@
 #include <boost/test/unit_test.hpp>
 
 using std::string;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::dynamic_pointer_cast;
 
 /* Check that ReelNumber is setup correctly when making multi-reel subtitled DCPs */
 BOOST_AUTO_TEST_CASE (subtitle_reel_number_test)
@@ -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<PlainTextContent> content (new PlainTextContent (film, "test/data/subrip5.srt"));
+       shared_ptr<StringTextFileContent> 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<dcp::CPL> 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<dcp::Reel> i, cpl->reels()) {