projects / dcpomatic.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
More enum class additions.
[dcpomatic.git] / test / vf_test.cc
diff --git a/test/vf_test.cc b/test/vf_test.cc
index 35c32e603f4e1eba37fd3487dce9306087ee76a6..b538f967ce23d4477b358ee4fa7ce0c27454037d 100644 (file)
--- a/test/vf_test.cc
+++ b/test/vf_test.cc
@@ -20,7 +20,7 @@
 
 /** @file  test/vf_Test.cc
  *  @brief Various VF-related tests.
- *  @ingroup specific
+ *  @ingroup feature
  */
 
 #include "lib/film.h"
@@ -37,14 +37,13 @@
 #include <dcp/reel_picture_asset.h>
 #include <dcp/reel_sound_asset.h>
 #include <boost/test/unit_test.hpp>
-#include <boost/foreach.hpp>
 #include <iostream>
 
 using std::list;
 using std::string;
 using std::cout;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::dynamic_pointer_cast;
 using namespace dcpomatic;
 
 /** Test the logic which decides whether a DCP can be referenced or not */
@@ -57,20 +56,20 @@ BOOST_AUTO_TEST_CASE (vf_test1)
        BOOST_REQUIRE (!wait_for_jobs());
 
        /* Multi-reel DCP can't be referenced if we are using a single reel for the project */
-       film->set_reel_type (REELTYPE_SINGLE);
+       film->set_reel_type (ReelType::SINGLE);
        string why_not;
        BOOST_CHECK (!dcp->can_reference_video(film, why_not));
        BOOST_CHECK (!dcp->can_reference_audio(film, why_not));
-       BOOST_CHECK (!dcp->can_reference_text(film, TEXT_OPEN_SUBTITLE, why_not));
-       BOOST_CHECK (!dcp->can_reference_text(film, TEXT_CLOSED_CAPTION, why_not));
+       BOOST_CHECK (!dcp->can_reference_text(film, TextType::OPEN_SUBTITLE, why_not));
+       BOOST_CHECK (!dcp->can_reference_text(film, TextType::CLOSED_CAPTION, why_not));
 
        /* Multi-reel DCP can be referenced if we are using by-video-content */
-       film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
+       film->set_reel_type (ReelType::BY_VIDEO_CONTENT);
        BOOST_CHECK (dcp->can_reference_video(film, why_not));
        BOOST_CHECK (dcp->can_reference_audio(film, why_not));
        /* (but reels_test2 has no texts to reference) */
-       BOOST_CHECK (!dcp->can_reference_text(film, TEXT_OPEN_SUBTITLE, why_not));
-       BOOST_CHECK (!dcp->can_reference_text(film, TEXT_CLOSED_CAPTION, why_not));
+       BOOST_CHECK (!dcp->can_reference_text(film, TextType::OPEN_SUBTITLE, why_not));
+       BOOST_CHECK (!dcp->can_reference_text(film, TextType::CLOSED_CAPTION, why_not));
 
        shared_ptr<FFmpegContent> other (new FFmpegContent("test/data/test.mp4"));
        film->examine_and_add_content (other);
@@ -86,8 +85,8 @@ BOOST_AUTO_TEST_CASE (vf_test1)
        BOOST_CHECK (dcp->can_reference_video(film, why_not));
        BOOST_CHECK (dcp->can_reference_audio(film, why_not));
        /* (reels_test2 has no texts to reference) */
-       BOOST_CHECK (!dcp->can_reference_text(film, TEXT_OPEN_SUBTITLE, why_not));
-       BOOST_CHECK (!dcp->can_reference_text(film, TEXT_CLOSED_CAPTION, why_not));
+       BOOST_CHECK (!dcp->can_reference_text(film, TextType::OPEN_SUBTITLE, why_not));
+       BOOST_CHECK (!dcp->can_reference_text(film, TextType::CLOSED_CAPTION, why_not));
 }
 
 /** Make a OV with video and audio and a VF referencing the OV and adding subs */
@@ -111,7 +110,7 @@ BOOST_AUTO_TEST_CASE (vf_test2)
        shared_ptr<Film> vf = new_test_film ("vf_test2_vf");
        vf->set_name ("vf_test2_vf");
        vf->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
-       vf->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
+       vf->set_reel_type (ReelType::BY_VIDEO_CONTENT);
        shared_ptr<DCPContent> dcp (new DCPContent(ov->dir (ov->dcp_name ())));
        BOOST_REQUIRE (dcp);
        vf->examine_and_add_content (dcp);
@@ -127,8 +126,8 @@ BOOST_AUTO_TEST_CASE (vf_test2)
 
        dcp::DCP ov_c (ov->dir (ov->dcp_name ()));
        ov_c.read ();
-       BOOST_REQUIRE_EQUAL (ov_c.cpls().size(), 1);
-       BOOST_REQUIRE_EQUAL (ov_c.cpls().front()->reels().size(), 1);
+       BOOST_REQUIRE_EQUAL (ov_c.cpls().size(), 1U);
+       BOOST_REQUIRE_EQUAL (ov_c.cpls().front()->reels().size(), 1U);
        BOOST_REQUIRE (ov_c.cpls().front()->reels().front()->main_picture());
        string const pic_id = ov_c.cpls().front()->reels().front()->main_picture()->id();
        BOOST_REQUIRE (ov_c.cpls().front()->reels().front()->main_sound());
@@ -137,8 +136,8 @@ BOOST_AUTO_TEST_CASE (vf_test2)
 
        dcp::DCP vf_c (vf->dir (vf->dcp_name ()));
        vf_c.read ();
-       BOOST_REQUIRE_EQUAL (vf_c.cpls().size(), 1);
-       BOOST_REQUIRE_EQUAL (vf_c.cpls().front()->reels().size(), 1);
+       BOOST_REQUIRE_EQUAL (vf_c.cpls().size(), 1U);
+       BOOST_REQUIRE_EQUAL (vf_c.cpls().front()->reels().size(), 1U);
        BOOST_REQUIRE (vf_c.cpls().front()->reels().front()->main_picture());
        BOOST_CHECK_EQUAL (vf_c.cpls().front()->reels().front()->main_picture()->id(), pic_id);
        BOOST_REQUIRE (vf_c.cpls().front()->reels().front()->main_sound());
@@ -169,7 +168,7 @@ BOOST_AUTO_TEST_CASE (vf_test3)
        shared_ptr<Film> vf = new_test_film ("vf_test3_vf");
        vf->set_name ("vf_test3_vf");
        vf->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
-       vf->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
+       vf->set_reel_type (ReelType::BY_VIDEO_CONTENT);
        shared_ptr<DCPContent> dcp (new DCPContent(ov->dir(ov->dcp_name())));
        BOOST_REQUIRE (dcp);
        dcp->set_trim_start (ContentTime::from_seconds (1));
@@ -184,8 +183,8 @@ BOOST_AUTO_TEST_CASE (vf_test3)
 
        dcp::DCP vf_c (vf->dir (vf->dcp_name ()));
        vf_c.read ();
-       BOOST_REQUIRE_EQUAL (vf_c.cpls().size(), 1);
-       BOOST_REQUIRE_EQUAL (vf_c.cpls().front()->reels().size(), 1);
+       BOOST_REQUIRE_EQUAL (vf_c.cpls().size(), 1U);
+       BOOST_REQUIRE_EQUAL (vf_c.cpls().front()->reels().size(), 1U);
        BOOST_REQUIRE (vf_c.cpls().front()->reels().front()->main_picture());
        BOOST_CHECK_EQUAL (vf_c.cpls().front()->reels().front()->main_picture()->entry_point().get_value_or(0), 24);
        BOOST_CHECK_EQUAL (vf_c.cpls().front()->reels().front()->main_picture()->actual_duration(), 72);
@@ -215,7 +214,7 @@ BOOST_AUTO_TEST_CASE (vf_test4)
        shared_ptr<Film> vf = new_test_film ("vf_test4_vf");
        vf->set_name ("vf_test4_vf");
        vf->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
-       vf->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
+       vf->set_reel_type (ReelType::BY_VIDEO_CONTENT);
        vf->set_sequence (false);
        shared_ptr<DCPContent> dcp (new DCPContent(ov->dir(ov->dcp_name())));
        BOOST_REQUIRE (dcp);
@@ -234,8 +233,8 @@ BOOST_AUTO_TEST_CASE (vf_test4)
 
        dcp::DCP ov_c (ov->dir (ov->dcp_name ()));
        ov_c.read ();
-       BOOST_REQUIRE_EQUAL (ov_c.cpls().size(), 1);
-       BOOST_REQUIRE_EQUAL (ov_c.cpls().front()->reels().size(), 1);
+       BOOST_REQUIRE_EQUAL (ov_c.cpls().size(), 1U);
+       BOOST_REQUIRE_EQUAL (ov_c.cpls().front()->reels().size(), 1U);
        BOOST_REQUIRE (ov_c.cpls().front()->reels().front()->main_picture());
        string const pic_id = ov_c.cpls().front()->reels().front()->main_picture()->id();
        BOOST_REQUIRE (ov_c.cpls().front()->reels().front()->main_sound());
@@ -244,8 +243,8 @@ BOOST_AUTO_TEST_CASE (vf_test4)
 
        dcp::DCP vf_c (vf->dir (vf->dcp_name ()));
        vf_c.read ();
-       BOOST_REQUIRE_EQUAL (vf_c.cpls().size(), 1);
-       BOOST_REQUIRE_EQUAL (vf_c.cpls().front()->reels().size(), 2);
+       BOOST_REQUIRE_EQUAL (vf_c.cpls().size(), 1U);
+       BOOST_REQUIRE_EQUAL (vf_c.cpls().front()->reels().size(), 2U);
        BOOST_REQUIRE (vf_c.cpls().front()->reels().back()->main_picture());
        BOOST_CHECK_EQUAL (vf_c.cpls().front()->reels().back()->main_picture()->id(), pic_id);
        BOOST_REQUIRE (vf_c.cpls().front()->reels().back()->main_sound());
@@ -258,7 +257,7 @@ BOOST_AUTO_TEST_CASE (vf_test5)
        /* Make the OV */
        shared_ptr<Film> ov = new_test_film ("vf_test5_ov");
        ov->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
-       ov->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
+       ov->set_reel_type (ReelType::BY_VIDEO_CONTENT);
        for (int i = 0; i < 3; ++i) {
                shared_ptr<Content> video = content_factory("test/data/flat_red.png").front();
                ov->examine_and_add_content (video);
@@ -274,7 +273,7 @@ BOOST_AUTO_TEST_CASE (vf_test5)
        shared_ptr<Film> vf = new_test_film ("vf_test5_vf");
        vf->set_name ("vf_test5_vf");
        vf->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
-       vf->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
+       vf->set_reel_type (ReelType::BY_VIDEO_CONTENT);
        vf->set_sequence (false);
        shared_ptr<DCPContent> dcp (new DCPContent(ov->dir(ov->dcp_name())));
        BOOST_REQUIRE (dcp);
@@ -287,9 +286,9 @@ BOOST_AUTO_TEST_CASE (vf_test5)
        BOOST_REQUIRE (!wait_for_jobs());
 
        /* Check that the selected reel assets are right */
-       shared_ptr<Player> player (new Player(vf, vf->playlist(), vf->length()));
+       shared_ptr<Player> player (new Player(vf));
        list<ReferencedReelAsset> a = player->get_reel_assets();
-       BOOST_REQUIRE_EQUAL (a.size(), 4);
+       BOOST_REQUIRE_EQUAL (a.size(), 4U);
        list<ReferencedReelAsset>::const_iterator i = a.begin();
        BOOST_CHECK (i->period == DCPTimePeriod(DCPTime(0), DCPTime(960000)));
        ++i;
@@ -307,7 +306,7 @@ BOOST_AUTO_TEST_CASE (vf_test6)
        /* Make the OV */
        shared_ptr<Film> ov = new_test_film ("vf_test6_ov");
        ov->set_dcp_content_type (DCPContentType::from_isdcf_name("TST"));
-       ov->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
+       ov->set_reel_type (ReelType::BY_VIDEO_CONTENT);
        shared_ptr<Content> video = content_factory("test/data/flat_red.png").front();
        ov->examine_and_add_content (video);
        BOOST_REQUIRE (!wait_for_jobs());
@@ -319,7 +318,7 @@ BOOST_AUTO_TEST_CASE (vf_test6)
        shared_ptr<Film> vf = new_test_film ("vf_test6_vf");
        vf->set_name ("vf_test6_vf");
        vf->set_dcp_content_type (DCPContentType::from_isdcf_name("TST"));
-       vf->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
+       vf->set_reel_type (ReelType::BY_VIDEO_CONTENT);
        vf->set_sequence (false);
        shared_ptr<DCPContent> dcp (new DCPContent(ov->dir(ov->dcp_name())));
        BOOST_REQUIRE (dcp);
@@ -362,7 +361,7 @@ BOOST_AUTO_TEST_CASE (vf_test7)
        shared_ptr<DCPContent> ov2_dcp (new DCPContent(ov1->dir(ov1->dcp_name())));
        vf->examine_and_add_content (ov2_dcp);
        BOOST_REQUIRE (!wait_for_jobs());
-       vf->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
+       vf->set_reel_type (ReelType::BY_VIDEO_CONTENT);
        ov1_dcp->set_reference_video (true);
        ov2_dcp->set_reference_video (true);
        ov1_dcp->set_position (vf, DCPTime::from_seconds(1));
2.0 development branch of dcpomatic