X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fisdcf_name_test.cc;h=dc2263206963367ea389d163ffbc8fb5d9202912;hb=7a1563c37d6e4e8ab016e8d3b2bcf5e29a327053;hp=bdb21bfccc42a034b2be7035c842d4fa2643c311;hpb=b29eb5107c5e77fe01e43010e1582e733f6ceea1;p=dcpomatic.git

diff --git a/test/isdcf_name_test.cc b/test/isdcf_name_test.cc
index bdb21bfcc..dc2263206 100644
--- a/test/isdcf_name_test.cc
+++ b/test/isdcf_name_test.cc
@@ -20,7 +20,7 @@
 
 /** @file  test/isdcf_name_test.cc
  *  @brief Test creation of ISDCF names.
- *  @ingroup specific
+ *  @ingroup feature
  */
 
 #include <boost/test/unit_test.hpp>
@@ -38,7 +38,7 @@
 #include <iostream>
 
 using std::cout;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 BOOST_AUTO_TEST_CASE (isdcf_name_test)
 {
@@ -68,10 +68,10 @@ BOOST_AUTO_TEST_CASE (isdcf_name_test)
 	film->set_container (Ratio::from_id ("239"));
 	film->_isdcf_date = boost::gregorian::date (2014, boost::gregorian::Jul, 4);
 	film->set_audio_channels (1);
-	film->set_resolution (RESOLUTION_4K);
+	film->set_resolution (Resolution::FOUR_K);
+	film->set_subtitle_language (dcp::LanguageTag("fr-FR"));
 	shared_ptr<Content> text = content_factory("test/data/subrip.srt").front();
 	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);
 	BOOST_REQUIRE (!wait_for_jobs());
@@ -162,56 +162,56 @@ BOOST_AUTO_TEST_CASE (isdcf_name_test)
 
 	AudioMapping mapping = sound->audio->mapping ();
 
-	mapping.set (0, dcp::LEFT, 1.0);
+	mapping.set (0, dcp::Channel::LEFT, 1.0);
 	sound->audio->set_mapping (mapping);
 	BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-fr_US-R_20_4K_DI_20140704_PP_SMPTE_OV");
-	mapping.set (0, dcp::RIGHT, 1.0);
+	mapping.set (0, dcp::Channel::RIGHT, 1.0);
 	sound->audio->set_mapping (mapping);
 	BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-fr_US-R_30_4K_DI_20140704_PP_SMPTE_OV");
-	mapping.set (0, dcp::LFE, 1.0);
+	mapping.set (0, dcp::Channel::LFE, 1.0);
 	sound->audio->set_mapping (mapping);
 	BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-fr_US-R_31_4K_DI_20140704_PP_SMPTE_OV");
-	mapping.set (0, dcp::LS, 1.0);
+	mapping.set (0, dcp::Channel::LS, 1.0);
 	sound->audio->set_mapping (mapping);
 	BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-fr_US-R_41_4K_DI_20140704_PP_SMPTE_OV");
-	mapping.set (0, dcp::RS, 1.0);
+	mapping.set (0, dcp::Channel::RS, 1.0);
 	sound->audio->set_mapping (mapping);
 	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);
+	mapping.set (0, dcp::Channel::HI, 1.0);
 	sound->audio->set_mapping (mapping);
 	BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-fr_US-R_51_4K_DI_20140704_PP_SMPTE_OV");
 
 	film->set_audio_channels (8);
-	mapping.set (0, dcp::HI, 1.0);
+	mapping.set (0, dcp::Channel::HI, 1.0);
 	sound->audio->set_mapping (mapping);
 	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);
+	mapping.set (0, dcp::Channel::VI, 1.0);
 	sound->audio->set_mapping (mapping);
 	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::HI, 0.0);
-	mapping.set (0, dcp::VI, 0.0);
+	mapping.set (0, dcp::Channel::HI, 0.0);
+	mapping.set (0, dcp::Channel::VI, 0.0);
 	sound->audio->set_mapping (mapping);
 	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);
+	mapping.set (0, dcp::Channel::HI, 1.0);
 	sound->audio->set_mapping (mapping);
 	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);
+	mapping.set (0, dcp::Channel::VI, 1.0);
 	sound->audio->set_mapping (mapping);
 	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::BSL, 1.0);
-	mapping.set (0, dcp::BSR, 1.0);
-	mapping.set (0, dcp::HI, 0.0);
-	mapping.set (0, dcp::VI, 0.0);
+	mapping.set (0, dcp::Channel::BSL, 1.0);
+	mapping.set (0, dcp::Channel::BSR, 1.0);
+	mapping.set (0, dcp::Channel::HI, 0.0);
+	mapping.set (0, dcp::Channel::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");
-	mapping.set (0, dcp::HI, 1.0);
+	mapping.set (0, dcp::Channel::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");
-	mapping.set (0, dcp::VI, 1.0);
+	mapping.set (0, dcp::Channel::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");
 }