Use ISDCF rather than DCI when talking about the digital cinema

naming convention (#362).

Reported-by: Mattias Mattsson

9 files changed, 9 insertions, 9 deletions

diff --git a/test/4k_test.cc b/test/4k_test.cc
index 5224fae83..e65804aa5 100644
--- a/test/4k_test.cc
+++ b/test/4k_test.cc
@@ -33,7 +33,7 @@ BOOST_AUTO_TEST_CASE (fourk_test)
 	shared_ptr<FFmpegContent> c (new FFmpegContent (film, "test/data/test.mp4"));
 	c->set_scale (VideoContentScale (Ratio::from_id ("185")));
 	film->set_resolution (RESOLUTION_4K);
-	film->set_dcp_content_type (DCPContentType::from_dci_name ("FTR"));
+	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR"));
 	film->set_container (Ratio::from_id ("185"));
 	film->examine_and_add_content (c);
 	wait_for_jobs ();
diff --git a/test/audio_delay_test.cc b/test/audio_delay_test.cc
index 77243ea6d..8ac5f746c 100644
--- a/test/audio_delay_test.cc
+++ b/test/audio_delay_test.cc
@@ -38,7 +38,7 @@ void test_audio_delay (int delay_in_ms)
 {
 	string const film_name = "audio_delay_test_" + lexical_cast<string> (delay_in_ms);
 	shared_ptr<Film> film = new_test_film (film_name);
-	film->set_dcp_content_type (DCPContentType::from_dci_name ("FTR"));
+	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR"));
 	film->set_container (Ratio::from_id ("185"));
 	film->set_name (film_name);
 
diff --git a/test/black_fill_test.cc b/test/black_fill_test.cc
index c2170d891..5c594f68c 100644
--- a/test/black_fill_test.cc
+++ b/test/black_fill_test.cc
@@ -33,7 +33,7 @@ using boost::shared_ptr;
 BOOST_AUTO_TEST_CASE (black_fill_test)
 {
 	shared_ptr<Film> film = new_test_film ("black_fill_test");
-	film->set_dcp_content_type (DCPContentType::from_dci_name ("FTR"));
+	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR"));
 	film->set_name ("black_fill_test");
 	film->set_container (Ratio::from_id ("185"));
 	film->set_sequence_video (false);
diff --git a/test/film_metadata_test.cc b/test/film_metadata_test.cc
index 1f06aa538..7440e4338 100644
--- a/test/film_metadata_test.cc
+++ b/test/film_metadata_test.cc
@@ -40,7 +40,7 @@ BOOST_AUTO_TEST_CASE (film_metadata_test)
 	}
 
 	shared_ptr<Film> f (new Film (test_film));
-	f->_dci_date = boost::gregorian::from_undelimited_string ("20130211");
+	f->_isdcf_date = boost::gregorian::from_undelimited_string ("20130211");
 	BOOST_CHECK (f->container() == 0);
 	BOOST_CHECK (f->dcp_content_type() == 0);
 
diff --git a/test/play_test.cc b/test/play_test.cc
index 92d1a8dce..067f772ff 100644
--- a/test/play_test.cc
+++ b/test/play_test.cc
@@ -82,7 +82,7 @@ private:
 BOOST_AUTO_TEST_CASE (play_test)
 {
 	shared_ptr<Film> film = new_test_film ("play_test");
-	film->set_dcp_content_type (DCPContentType::from_dci_name ("FTR"));
+	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR"));
 	film->set_container (Ratio::from_id ("185"));
 	film->set_name ("play_test");
 
diff --git a/test/recover_test.cc b/test/recover_test.cc
index d8caf17fa..284895e0a 100644
--- a/test/recover_test.cc
+++ b/test/recover_test.cc
@@ -39,7 +39,7 @@ note (libdcp::NoteType, string n)
 BOOST_AUTO_TEST_CASE (recover_test)
 {
 	shared_ptr<Film> film = new_test_film ("recover_test");
-	film->set_dcp_content_type (DCPContentType::from_dci_name ("FTR"));
+	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR"));
 	film->set_container (Ratio::from_id ("185"));
 	film->set_name ("recover_test");
 	film->set_three_d (true);
diff --git a/test/scaling_test.cc b/test/scaling_test.cc
index f0cf3fe4a..cdf1653cd 100644
--- a/test/scaling_test.cc
+++ b/test/scaling_test.cc
@@ -56,7 +56,7 @@ static void scaling_test_for (shared_ptr<Film> film, shared_ptr<VideoContent> co
 BOOST_AUTO_TEST_CASE (scaling_test)
 {
 	shared_ptr<Film> film = new_test_film ("scaling_test");
-	film->set_dcp_content_type (DCPContentType::from_dci_name ("FTR"));
+	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR"));
 	film->set_name ("scaling_test");
 	shared_ptr<ImageContent> imc (new ImageContent (film, "test/data/simple_testcard_640x480.png"));
 
diff --git a/test/silence_padding_test.cc b/test/silence_padding_test.cc
index d5236c144..f1136a3f1 100644
--- a/test/silence_padding_test.cc
+++ b/test/silence_padding_test.cc
@@ -37,7 +37,7 @@ static void test_silence_padding (int channels)
 {
 	string const film_name = "silence_padding_test_" + lexical_cast<string> (channels);
 	shared_ptr<Film> film = new_test_film (film_name);
-	film->set_dcp_content_type (DCPContentType::from_dci_name ("FTR"));
+	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR"));
 	film->set_container (Ratio::from_id ("185"));
 	film->set_name (film_name);
 
diff --git a/test/test.cc b/test/test.cc
index be2cf1538..0b87b8062 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -59,7 +59,7 @@ struct TestConfig
 
 		Config::instance()->set_num_local_encoding_threads (1);
 		Config::instance()->set_server_port_base (61920);
-		Config::instance()->set_default_dci_metadata (DCIMetadata ());
+		Config::instance()->set_default_isdcf_metadata (ISDCFMetadata ());
 		Config::instance()->set_default_container (static_cast<Ratio*> (0));
 		Config::instance()->set_default_dcp_content_type (static_cast<DCPContentType*> (0));