X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fthreed_test.cc;h=78e656830b65158afde56a2a8ca1e12b613fcc87;hp=b12eb328d661230e412cb8afefc94700d20d56af;hb=8fedaaa75c4586a4cc7ffb393bd71d1fdb091dc8;hpb=4985d87750c87019dfe5dc7ef44e12c45326dd0e

diff --git a/test/threed_test.cc b/test/threed_test.cc
index b12eb328d..78e656830 100644
--- a/test/threed_test.cc
+++ b/test/threed_test.cc
@@ -39,7 +39,7 @@
 using std::cout;
 using std::shared_ptr;
 
-/** Basic sanity check of 3D_LEFT_RIGHT */
+/** Basic sanity check of THREE_D_LEFT_RIGHT */
 BOOST_AUTO_TEST_CASE (threed_test1)
 {
 	shared_ptr<Film> film = new_test_film ("threed_test1");
@@ -48,7 +48,7 @@ BOOST_AUTO_TEST_CASE (threed_test1)
 	film->examine_and_add_content (c);
 	BOOST_REQUIRE (!wait_for_jobs());
 
-	c->video->set_frame_type (VIDEO_FRAME_TYPE_3D_LEFT_RIGHT);
+	c->video->set_frame_type (VideoFrameType::THREE_D_LEFT_RIGHT);
 
 	film->set_container (Ratio::from_id ("185"));
 	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
@@ -59,7 +59,7 @@ BOOST_AUTO_TEST_CASE (threed_test1)
 	BOOST_REQUIRE (!wait_for_jobs ());
 }
 
-/** Basic sanity check of 3D_ALTERNATE; at the moment this is just to make sure
+/** Basic sanity check of THREE_D_ALTERNATE; at the moment this is just to make sure
  *  that such a transcode completes without error.
  */
 BOOST_AUTO_TEST_CASE (threed_test2)
@@ -70,7 +70,7 @@ BOOST_AUTO_TEST_CASE (threed_test2)
 	film->examine_and_add_content (c);
 	BOOST_REQUIRE (!wait_for_jobs());
 
-	c->video->set_frame_type (VIDEO_FRAME_TYPE_3D_ALTERNATE);
+	c->video->set_frame_type (VideoFrameType::THREE_D_ALTERNATE);
 
 	film->set_container (Ratio::from_id ("185"));
 	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
@@ -81,7 +81,7 @@ BOOST_AUTO_TEST_CASE (threed_test2)
 	BOOST_REQUIRE (!wait_for_jobs ());
 }
 
-/** Basic sanity check of 3D_LEFT and 3D_RIGHT; at the moment this is just to make sure
+/** Basic sanity check of THREE_D_LEFT and THREE_D_RIGHT; at the moment this is just to make sure
  *  that such a transcode completes without error.
  */
 BOOST_AUTO_TEST_CASE (threed_test3)
@@ -93,8 +93,8 @@ BOOST_AUTO_TEST_CASE (threed_test3)
 	film->examine_and_add_content (R);
 	BOOST_REQUIRE (!wait_for_jobs());
 
-	L->video->set_frame_type (VIDEO_FRAME_TYPE_3D_LEFT);
-	R->video->set_frame_type (VIDEO_FRAME_TYPE_3D_RIGHT);
+	L->video->set_frame_type (VideoFrameType::THREE_D_LEFT);
+	R->video->set_frame_type (VideoFrameType::THREE_D_RIGHT);
 
 	film->set_three_d (true);
 	film->make_dcp ();
@@ -112,8 +112,8 @@ BOOST_AUTO_TEST_CASE (threed_test4)
 	film->examine_and_add_content (R);
 	BOOST_REQUIRE (!wait_for_jobs());
 
-	L->video->set_frame_type (VIDEO_FRAME_TYPE_3D_LEFT);
-	R->video->set_frame_type (VIDEO_FRAME_TYPE_3D_RIGHT);
+	L->video->set_frame_type (VideoFrameType::THREE_D_LEFT);
+	R->video->set_frame_type (VideoFrameType::THREE_D_RIGHT);
 	/* There doesn't seem much point in encoding the whole input, especially as we're only
 	 * checking for errors during the encode and not the result.  Also decoding these files
 	 * (4K HQ Prores) is very slow.
@@ -137,8 +137,8 @@ BOOST_AUTO_TEST_CASE (threed_test5)
 	film->examine_and_add_content (R);
 	BOOST_REQUIRE (!wait_for_jobs());
 
-	L->video->set_frame_type (VIDEO_FRAME_TYPE_3D_LEFT);
-	R->video->set_frame_type (VIDEO_FRAME_TYPE_3D_RIGHT);
+	L->video->set_frame_type (VideoFrameType::THREE_D_LEFT);
+	R->video->set_frame_type (VideoFrameType::THREE_D_RIGHT);
 	/* There doesn't seem much point in encoding the whole input, especially as we're only
 	 * checking for errors during the encode and not the result.
 	 */
@@ -161,8 +161,8 @@ BOOST_AUTO_TEST_CASE (threed_test6)
 	film->examine_and_add_content (R);
 	BOOST_REQUIRE (!wait_for_jobs());
 
-	L->video->set_frame_type (VIDEO_FRAME_TYPE_3D_LEFT);
-	R->video->set_frame_type (VIDEO_FRAME_TYPE_3D_RIGHT);
+	L->video->set_frame_type (VideoFrameType::THREE_D_LEFT);
+	R->video->set_frame_type (VideoFrameType::THREE_D_RIGHT);
 
 	film->set_three_d (true);
 	film->make_dcp ();
@@ -183,7 +183,7 @@ BOOST_AUTO_TEST_CASE (threed_test7)
 	film->examine_and_add_content (c);
 	BOOST_REQUIRE (!wait_for_jobs());
 
-	c->video->set_frame_type (VIDEO_FRAME_TYPE_3D);
+	c->video->set_frame_type (VideoFrameType::THREE_D);
 
 	film->set_three_d (true);
 	film->make_dcp ();