Move video frame rate ('prepared-for') into Content.

1 files changed, 27 insertions, 27 deletions

diff --git a/test/frame_rate_test.cc b/test/frame_rate_test.cc
index 35cd5523a..9c2e9ec3f 100644
--- a/test/frame_rate_test.cc
+++ b/test/frame_rate_test.cc
@@ -54,7 +54,7 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single)
 	afr.push_back (30);
 	Config::instance()->set_allowed_dcp_frame_rates (afr);
 
-	content->video->_frame_rate = 60;
+	content->_video_frame_rate = 60;
 	int best = film->best_video_frame_rate ();
 	FrameRateChange frc = FrameRateChange (60, best);
 	BOOST_CHECK_EQUAL (best, 30);
@@ -63,7 +63,7 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single)
 	BOOST_CHECK_EQUAL (frc.change_speed, false);
 	BOOST_CHECK_CLOSE (frc.speed_up, 1, 0.1);
 
-	content->video->_frame_rate = 50;
+	content->_video_frame_rate = 50;
 	best = film->best_video_frame_rate ();
 	frc = FrameRateChange (50, best);
 	BOOST_CHECK_EQUAL (best, 25);
@@ -72,7 +72,7 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single)
 	BOOST_CHECK_EQUAL (frc.change_speed, false);
 	BOOST_CHECK_CLOSE (frc.speed_up, 1, 0.1);
 
-	content->video->_frame_rate = 48;
+	content->_video_frame_rate = 48;
 	best = film->best_video_frame_rate ();
 	frc = FrameRateChange (48, best);
 	BOOST_CHECK_EQUAL (best, 24);
@@ -81,7 +81,7 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single)
 	BOOST_CHECK_EQUAL (frc.change_speed, false);
 	BOOST_CHECK_CLOSE (frc.speed_up, 1, 0.1);
 
-	content->video->_frame_rate = 30;
+	content->_video_frame_rate = 30;
 	best = film->best_video_frame_rate ();
 	frc = FrameRateChange (30, best);
 	BOOST_CHECK_EQUAL (best, 30);
@@ -90,7 +90,7 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single)
 	BOOST_CHECK_EQUAL (frc.change_speed, false);
 	BOOST_CHECK_CLOSE (frc.speed_up, 1, 0.1);
 
-	content->video->_frame_rate = 29.97;
+	content->_video_frame_rate = 29.97;
 	best = film->best_video_frame_rate ();
 	frc = FrameRateChange (29.97, best);
 	BOOST_CHECK_EQUAL (best, 30);
@@ -99,7 +99,7 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single)
 	BOOST_CHECK_EQUAL (frc.change_speed, true);
 	BOOST_CHECK_CLOSE (frc.speed_up, 30 / 29.97, 0.1);
 
-	content->video->_frame_rate = 25;
+	content->_video_frame_rate = 25;
 	best = film->best_video_frame_rate ();
 	frc = FrameRateChange (25, best);
 	BOOST_CHECK_EQUAL (best, 25);
@@ -108,7 +108,7 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single)
 	BOOST_CHECK_EQUAL (frc.change_speed, false);
 	BOOST_CHECK_CLOSE (frc.speed_up, 1, 0.1);
 
-	content->video->_frame_rate = 24;
+	content->_video_frame_rate = 24;
 	best = film->best_video_frame_rate ();
 	frc = FrameRateChange (24, best);
 	BOOST_CHECK_EQUAL (best, 24);
@@ -117,7 +117,7 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single)
 	BOOST_CHECK_EQUAL (frc.change_speed, false);
 	BOOST_CHECK_CLOSE (frc.speed_up, 1, 0.1);
 
-	content->video->_frame_rate = 14.5;
+	content->_video_frame_rate = 14.5;
 	best = film->best_video_frame_rate ();
 	frc = FrameRateChange (14.5, best);
 	BOOST_CHECK_EQUAL (best, 30);
@@ -126,7 +126,7 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single)
 	BOOST_CHECK_EQUAL (frc.change_speed, true);
 	BOOST_CHECK_CLOSE (frc.speed_up, 15 / 14.5, 0.1);
 
-	content->video->_frame_rate = 12.6;
+	content->_video_frame_rate = 12.6;
 	best = film->best_video_frame_rate ();
 	frc = FrameRateChange (12.6, best);
 	BOOST_CHECK_EQUAL (best, 25);
@@ -135,7 +135,7 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single)
 	BOOST_CHECK_EQUAL (frc.change_speed, true);
 	BOOST_CHECK_CLOSE (frc.speed_up, 25 / 25.2, 0.1);
 
-	content->video->_frame_rate = 12.4;
+	content->_video_frame_rate = 12.4;
 	best = film->best_video_frame_rate ();
 	frc = FrameRateChange (12.4, best);
 	BOOST_CHECK_EQUAL (best, 25);
@@ -144,7 +144,7 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single)
 	BOOST_CHECK_EQUAL (frc.change_speed, true);
 	BOOST_CHECK_CLOSE (frc.speed_up, 25 / 24.8, 0.1);
 
-	content->video->_frame_rate = 12;
+	content->_video_frame_rate = 12;
 	best = film->best_video_frame_rate ();
 	frc = FrameRateChange (12, best);
 	BOOST_CHECK_EQUAL (best, 24);
@@ -162,7 +162,7 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single)
 	afr.push_back (60);
 	Config::instance()->set_allowed_dcp_frame_rates (afr);
 
-	content->video->_frame_rate = 60;
+	content->_video_frame_rate = 60;
 	best = film->best_video_frame_rate ();
 	frc = FrameRateChange (60, best);
 	BOOST_CHECK_EQUAL (best, 60);
@@ -171,7 +171,7 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single)
 	BOOST_CHECK_EQUAL (frc.change_speed, false);
 	BOOST_CHECK_CLOSE (frc.speed_up, 1, 0.1);
 
-	content->video->_frame_rate = 50;
+	content->_video_frame_rate = 50;
 	best = film->best_video_frame_rate ();
 	frc = FrameRateChange (50, best);
 	BOOST_CHECK_EQUAL (best, 50);
@@ -180,7 +180,7 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single)
 	BOOST_CHECK_EQUAL (frc.change_speed, false);
 	BOOST_CHECK_CLOSE (frc.speed_up, 1, 0.1);
 
-	content->video->_frame_rate = 48;
+	content->_video_frame_rate = 48;
 	best = film->best_video_frame_rate ();
 	frc = FrameRateChange (48, best);
 	BOOST_CHECK_EQUAL (best, 48);
@@ -203,7 +203,7 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single)
 	afr.push_back (24);
 	Config::instance()->set_allowed_dcp_frame_rates (afr);
 
-	content->video->_frame_rate = 25;
+	content->_video_frame_rate = 25;
 	best = film->best_video_frame_rate ();
 	frc = FrameRateChange (25, best);
 	BOOST_CHECK_EQUAL (best, 24);
@@ -234,16 +234,16 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_double)
 	afr.push_back (30);
 	Config::instance()->set_allowed_dcp_frame_rates (afr);
 
-	A->video->_frame_rate = 30;
-	B->video->_frame_rate = 24;
+	A->_video_frame_rate = 30;
+	B->_video_frame_rate = 24;
 	BOOST_CHECK_EQUAL (film->best_video_frame_rate(), 25);
 
-	A->video->_frame_rate = 24;
-	B->video->_frame_rate = 24;
+	A->_video_frame_rate = 24;
+	B->_video_frame_rate = 24;
 	BOOST_CHECK_EQUAL (film->best_video_frame_rate(), 24);
 
-	A->video->_frame_rate = 24;
-	B->video->_frame_rate = 48;
+	A->_video_frame_rate = 24;
+	B->_video_frame_rate = 48;
 	BOOST_CHECK_EQUAL (film->best_video_frame_rate(), 24);
 }
 
@@ -263,7 +263,7 @@ BOOST_AUTO_TEST_CASE (audio_sampling_rate_test)
 
 	shared_ptr<FFmpegAudioStream> stream (new FFmpegAudioStream ("foo", 0, 0, 0));
 	content->audio->add_stream (stream);
-	content->video->_frame_rate = 24;
+	content->_video_frame_rate = 24;
 	film->set_video_frame_rate (24);
 	stream->_frame_rate = 48000;
 	BOOST_CHECK_EQUAL (content->audio->resampled_frame_rate(), 48000);
@@ -274,30 +274,30 @@ BOOST_AUTO_TEST_CASE (audio_sampling_rate_test)
 	stream->_frame_rate = 80000;
 	BOOST_CHECK_EQUAL (content->audio->resampled_frame_rate(), 96000);
 
-	content->video->_frame_rate = 23.976;
+	content->_video_frame_rate = 23.976;
 	film->set_video_frame_rate (24);
 	stream->_frame_rate = 48000;
 	BOOST_CHECK_EQUAL (content->audio->resampled_frame_rate(), 47952);
 
-	content->video->_frame_rate = 29.97;
+	content->_video_frame_rate = 29.97;
 	film->set_video_frame_rate (30);
 	BOOST_CHECK_EQUAL (film->video_frame_rate (), 30);
 	stream->_frame_rate = 48000;
 	BOOST_CHECK_EQUAL (content->audio->resampled_frame_rate(), 47952);
 
-	content->video->_frame_rate = 25;
+	content->_video_frame_rate = 25;
 	film->set_video_frame_rate (24);
 	stream->_frame_rate = 48000;
 	BOOST_CHECK_EQUAL (content->audio->resampled_frame_rate(), 50000);
 
-	content->video->_frame_rate = 25;
+	content->_video_frame_rate = 25;
 	film->set_video_frame_rate (24);
 	stream->_frame_rate = 44100;
 	BOOST_CHECK_EQUAL (content->audio->resampled_frame_rate(), 50000);
 
 	/* Check some out-there conversions (not the best) */
 
-	content->video->_frame_rate = 14.99;
+	content->_video_frame_rate = 14.99;
 	film->set_video_frame_rate (25);
 	stream->_frame_rate = 16000;
 	/* The FrameRateChange within resampled_frame_rate should choose to double-up