Remove some dcp prefixes; better logging of content on DCP creation.

5 files changed, 11 insertions, 11 deletions

diff --git a/test/ffmpeg_dcp_test.cc b/test/ffmpeg_dcp_test.cc
index 66f3af839..ef10e6098 100644
--- a/test/ffmpeg_dcp_test.cc
+++ b/test/ffmpeg_dcp_test.cc
@@ -58,7 +58,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_have_dcp_test)
 	BOOST_CHECK (f->have_dcp());
 
 	p /= f->dcp_name();
-	p /= f->dcp_video_mxf_filename();
+	p /= f->video_mxf_filename();
 	boost::filesystem::remove (p);
 	BOOST_CHECK (!f->have_dcp ());
 }
diff --git a/test/frame_rate_test.cc b/test/frame_rate_test.cc
index 2ea7e60a5..5cdea8c6b 100644
--- a/test/frame_rate_test.cc
+++ b/test/frame_rate_test.cc
@@ -228,7 +228,7 @@ BOOST_AUTO_TEST_CASE (audio_sampling_rate_test)
 	Config::instance()->set_allowed_dcp_frame_rates (afr);
 
 	content->_video_frame_rate = 24;
-	film->set_dcp_video_frame_rate (24);
+	film->set_video_frame_rate (24);
 	content->set_audio_stream (shared_ptr<FFmpegAudioStream> (new FFmpegAudioStream ("a", 42, 48000, 0)));
 	BOOST_CHECK_EQUAL (content->output_audio_frame_rate(), 48000);
 
@@ -239,30 +239,30 @@ BOOST_AUTO_TEST_CASE (audio_sampling_rate_test)
 	BOOST_CHECK_EQUAL (content->output_audio_frame_rate(), 96000);
 
 	content->_video_frame_rate = 23.976;
-	film->set_dcp_video_frame_rate (24);
+	film->set_video_frame_rate (24);
 	content->set_audio_stream (shared_ptr<FFmpegAudioStream> (new FFmpegAudioStream ("a", 42, 48000, 0)));
 	BOOST_CHECK_EQUAL (content->output_audio_frame_rate(), 47952);
 
 	content->_video_frame_rate = 29.97;
-	film->set_dcp_video_frame_rate (30);
-	BOOST_CHECK_EQUAL (film->dcp_video_frame_rate (), 30);
+	film->set_video_frame_rate (30);
+	BOOST_CHECK_EQUAL (film->video_frame_rate (), 30);
 	content->set_audio_stream (shared_ptr<FFmpegAudioStream> (new FFmpegAudioStream ("a", 42, 48000, 0)));
 	BOOST_CHECK_EQUAL (content->output_audio_frame_rate(), 47952);
 
 	content->_video_frame_rate = 25;
-	film->set_dcp_video_frame_rate (24);
+	film->set_video_frame_rate (24);
 	content->set_audio_stream (shared_ptr<FFmpegAudioStream> (new FFmpegAudioStream ("a", 42, 48000, 0)));
 	BOOST_CHECK_EQUAL (content->output_audio_frame_rate(), 50000);
 
 	content->_video_frame_rate = 25;
-	film->set_dcp_video_frame_rate (24);
+	film->set_video_frame_rate (24);
 	content->set_audio_stream (shared_ptr<FFmpegAudioStream> (new FFmpegAudioStream ("a", 42, 44100, 0)));
 	BOOST_CHECK_EQUAL (content->output_audio_frame_rate(), 50000);
 
 	/* Check some out-there conversions (not the best) */
 	
 	content->_video_frame_rate = 14.99;
-	film->set_dcp_video_frame_rate (25);
+	film->set_video_frame_rate (25);
 	content->set_audio_stream (shared_ptr<FFmpegAudioStream> (new FFmpegAudioStream ("a", 42, 16000, 0)));
 	/* The FrameRateConversion within output_audio_frame_rate should choose to double-up
 	   the 14.99 fps video to 30 and then run it slow at 25.
diff --git a/test/play_test.cc b/test/play_test.cc
index c1dabe620..52b54408b 100644
--- a/test/play_test.cc
+++ b/test/play_test.cc
@@ -98,7 +98,7 @@ BOOST_AUTO_TEST_CASE (play_test)
 	BOOST_CHECK_EQUAL (B->video_length(), 16);
 	
 	/* Film should have been set to 25fps */
-	BOOST_CHECK_EQUAL (film->dcp_video_frame_rate(), 25);
+	BOOST_CHECK_EQUAL (film->video_frame_rate(), 25);
 
 	BOOST_CHECK_EQUAL (A->start(), 0);
 	/* A is 16 frames long at 25 fps */
diff --git a/test/silence_padding_test.cc b/test/silence_padding_test.cc
index a8748f851..82cbad080 100644
--- a/test/silence_padding_test.cc
+++ b/test/silence_padding_test.cc
@@ -45,7 +45,7 @@ static void test_silence_padding (int channels)
 	film->examine_and_add_content (content);
 	wait_for_jobs ();
 
-	film->set_dcp_audio_channels (channels);
+	film->set_audio_channels (channels);
 	film->make_dcp ();
 	wait_for_jobs ();
 
diff --git a/test/threed_test.cc b/test/threed_test.cc
index 4fd5a50c8..31a95e382 100644
--- a/test/threed_test.cc
+++ b/test/threed_test.cc
@@ -40,7 +40,7 @@ BOOST_AUTO_TEST_CASE (threed_test)
 	
 	film->set_container (Ratio::from_id ("185"));
 	film->set_dcp_content_type (DCPContentType::from_pretty_name ("Test"));
-	film->set_dcp_3d (true);
+	film->set_three_d (true);
 	film->make_dcp ();
 	film->write_metadata ();