X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=test%2Fisdcf_name_test.cc;h=cf39c112e5ceabeff448b01ffef35226b95c08e1;hb=94695fc3214917ad7310af36270ce1e0b88cdfa3;hp=b55cea1adfaf487f0a27539136276f18772f11a4;hpb=ea51ac3483161343b7aefabe54420c6cb431c0fe;p=dcpomatic.git

diff --git a/test/isdcf_name_test.cc b/test/isdcf_name_test.cc
index b55cea1ad..cf39c112e 100644
--- a/test/isdcf_name_test.cc
+++ b/test/isdcf_name_test.cc
@@ -66,8 +66,6 @@ BOOST_AUTO_TEST_CASE (isdcf_name_test)
 	film->set_ratings({dcp::Rating("BBFC", "PG")});
 	film->set_studio (string("ST"));
 	film->set_facility (string("FAC"));
-	ISDCFMetadata m;
-	film->set_isdcf_metadata (m);
 	film->set_interop (true);
 	BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilm_FTR-1_F_EN-XX_GB-PG_10_2K_ST_20140704_FAC_IOP_OV");
 
@@ -99,7 +97,6 @@ BOOST_AUTO_TEST_CASE (isdcf_name_test)
 	BOOST_REQUIRE (!wait_for_jobs());
 	BOOST_REQUIRE (audio->audio);
 	audio->audio->set_language (dcp::LanguageTag("de-DE"));
-	film->set_isdcf_metadata (m);
 	film->set_interop (false);
 	BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilmWith_TLR-2_S_DE-fr_US-R_MOS_4K_DI_20140704_PPF_SMPTE_OV");
 
@@ -139,26 +136,24 @@ BOOST_AUTO_TEST_CASE (isdcf_name_test)
 	/* Test content type modifiers */
 
 	film->set_three_d (false);
-	m.temp_version = true;
-	m.pre_release = true;
-	m.red_band = true;
-	m.chain = "MyChain";
-	m.two_d_version_of_three_d = true;
-	m.mastered_luminance = "4fl";
-	film->set_isdcf_metadata (m);
+	film->set_temp_version (true);
+	film->set_pre_release (true);
+	film->set_red_band (true);
+	film->set_two_d_version_of_three_d (true);
+	film->set_chain (string("MyChain"));
+	film->set_luminance (dcp::Luminance(4.5, dcp::Luminance::Unit::FOOT_LAMBERT));
 	film->set_video_frame_rate (48);
-	BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilmWith_XSN-2-Temp-Pre-RedBand-MyChain-2D-4fl-48_F-133_DE-fr_US-R_MOS_4K_DI_20140704_PPF_SMPTE_OV");
+	BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilmWith_XSN-2-Temp-Pre-RedBand-MyChain-2D-4.5fl-48_F-133_DE-fr_US-R_MOS_4K_DI_20140704_PPF_SMPTE_OV");
 
 	/* Test a name which is already in camelCase */
 
 	film->set_three_d (false);
-	m.temp_version = false;
-	m.pre_release = false;
-	m.red_band = false;
-	m.chain = "";
-	m.two_d_version_of_three_d = false;
-	m.mastered_luminance = "";
-	film->set_isdcf_metadata (m);
+	film->set_temp_version (false);
+	film->set_pre_release (false);
+	film->set_red_band (false);
+	film->set_two_d_version_of_three_d (false);
+	film->set_chain (string(""));
+	film->set_luminance (boost::none);
 	film->set_video_frame_rate (24);
 	film->set_name ("IKnowCamels");
 	BOOST_CHECK_EQUAL (film->isdcf_name(false), "IKnowCamels_XSN-2_F-133_DE-fr_US-R_MOS_4K_DI_20140704_PPF_SMPTE_OV");