Merge master.

[dcpomatic.git] / test / threed_test.cc

diff --git a/test/threed_test.cc b/test/threed_test.cc
index 50fe87b4aa8cb2066d0098087ed3792c1e680511..8da9b46a891fa8daeed4cd406eb784d23b8c7cc6 100644 (file)
--- a/test/threed_test.cc
+++ b/test/threed_test.cc
@@ -29,11 +29,10 @@ using boost::shared_ptr;
 
 BOOST_AUTO_TEST_CASE (threed_test)
 {
-       cout << "here we go.\n";
        shared_ptr<Film> film = new_test_film ("threed_test");
        film->set_name ("test_film2");
        shared_ptr<FFmpegContent> c (new FFmpegContent (film, "test/data/test.mp4"));
-       c->set_ratio (Ratio::from_id ("185"));
+       c->set_scale (VideoContentScale (Ratio::from_id ("185")));
        c->set_video_frame_type (VIDEO_FRAME_TYPE_3D_LEFT_RIGHT);
        film->examine_and_add_content (c);
 
@@ -41,11 +40,9 @@ 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 ();
 
        wait_for_jobs ();
-
-       exit (EXIT_SUCCESS);
 }