X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fisdcf_name_test.cc;h=dad2ba7d971783d781c09b59b3bbedf2264ea10e;hb=5baecb091f5f3f956be002668ce74291c7826b95;hp=487f80ea21e04aa85546c5c1dc23a42336387f26;hpb=4edc14c8b1410e24f68b510cc14409b96c0338a3;p=dcpomatic.git

diff --git a/test/isdcf_name_test.cc b/test/isdcf_name_test.cc
index 487f80ea2..dad2ba7d9 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,11 +38,11 @@
 #include <iostream>
 
 using std::cout;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 BOOST_AUTO_TEST_CASE (isdcf_name_test)
 {
-	shared_ptr<Film> film = new_test_film ("isdcf_name_test");
+	auto film = new_test_film ("isdcf_name_test");
 
 	/* A basic test */
 
@@ -61,6 +61,11 @@ BOOST_AUTO_TEST_CASE (isdcf_name_test)
 	film->set_interop (true);
 	BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilm_FTR-1_F_EN-XX_UK-PG_MOS_2K_ST_20140704_FA_IOP_OV");
 
+	/* Check that specifying no audio language writes XX */
+	m.audio_language = "";
+	film->set_isdcf_metadata (m);
+	BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilm_FTR-1_F_XX-XX_UK-PG_MOS_2K_ST_20140704_FA_IOP_OV");
+
 	/* Test a long name and some different data */
 
 	film->set_name ("My Nice Film With A Very Long Name");
@@ -68,10 +73,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(), 1);
-	text->text.front()->set_language ("fr");
+	BOOST_REQUIRE_EQUAL (text->text.size(), 1U);
 	text->text.front()->set_burn (true);
 	film->examine_and_add_content (text);
 	BOOST_REQUIRE (!wait_for_jobs());
@@ -162,60 +167,57 @@ 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::LC, 1.0);
-	mapping.set (0, dcp::RC, 1.0);
-	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_71_4K_DI_20140704_PP_SMPTE_OV");
-	mapping.set (0, dcp::HI, 1.0);
+	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::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);
+	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::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");
+	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);
-	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");
 }
+