Replace dcp::Data with dcp::ArrayData

[dcpomatic.git] / test / isdcf_name_test.cc

diff --git a/test/isdcf_name_test.cc b/test/isdcf_name_test.cc
index 487f80ea21e04aa85546c5c1dc23a42336387f26..bdb21bfccc42a034b2be7035c842d4fa2643c311 100644 (file)
--- a/test/isdcf_name_test.cc
+++ b/test/isdcf_name_test.cc
@@ -70,7 +70,7 @@ BOOST_AUTO_TEST_CASE (isdcf_name_test)
        film->set_audio_channels (1);
        film->set_resolution (RESOLUTION_4K);
        shared_ptr<Content> text = content_factory("test/data/subrip.srt").front();
-       BOOST_REQUIRE_EQUAL (text->text.size(), 1);
+       BOOST_REQUIRE_EQUAL (text->text.size(), 1U);
        text->text.front()->set_language ("fr");
        text->text.front()->set_burn (true);
        film->examine_and_add_content (text);
@@ -190,22 +190,18 @@ BOOST_AUTO_TEST_CASE (isdcf_name_test)
        BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-fr_US-R_51-HI-VI_4K_DI_20140704_PP_SMPTE_OV");
 
        film->set_audio_channels(10);
-       mapping.set (0, dcp::LC, 1.0);
-       mapping.set (0, dcp::RC, 1.0);
        mapping.set (0, dcp::HI, 0.0);
        mapping.set (0, dcp::VI, 0.0);
        sound->audio->set_mapping (mapping);
-       BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-fr_US-R_71_4K_DI_20140704_PP_SMPTE_OV");
+       BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-fr_US-R_51_4K_DI_20140704_PP_SMPTE_OV");
        mapping.set (0, dcp::HI, 1.0);
        sound->audio->set_mapping (mapping);
-       BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-fr_US-R_71-HI_4K_DI_20140704_PP_SMPTE_OV");
+       BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-fr_US-R_51-HI_4K_DI_20140704_PP_SMPTE_OV");
        mapping.set (0, dcp::VI, 1.0);
        sound->audio->set_mapping (mapping);
-       BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-fr_US-R_71-HI-VI_4K_DI_20140704_PP_SMPTE_OV");
+       BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-fr_US-R_51-HI-VI_4K_DI_20140704_PP_SMPTE_OV");
 
        film->set_audio_channels(12);
-       mapping.set (0, dcp::LC, 0.0);
-       mapping.set (0, dcp::RC, 0.0);
        mapping.set (0, dcp::BSL, 1.0);
        mapping.set (0, dcp::BSR, 1.0);
        mapping.set (0, dcp::HI, 0.0);