X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Frecover_test.cc;h=cb5c26858192fa09b45b419b02f76e061c371cfe;hb=6d25faad09cec21a39fd81d140c57542eceb0a6f;hp=31b882a2eaeeeb81ca4e99450c594f96fad73798;hpb=39bc73fe192f932ed6695eb87b19de446e8b4f55;p=dcpomatic.git diff --git a/test/recover_test.cc b/test/recover_test.cc index 31b882a2e..cb5c26858 100644 --- a/test/recover_test.cc +++ b/test/recover_test.cc @@ -36,7 +36,7 @@ using boost::shared_ptr; static void note (dcp::NoteType t, string n) { - if (t == dcp::ERROR) { + if (t == dcp::DCP_ERROR) { cout << n << "\n"; } } @@ -44,20 +44,20 @@ note (dcp::NoteType t, string n) BOOST_AUTO_TEST_CASE (recover_test) { shared_ptr 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); shared_ptr content (new ImageContent (film, "test/data/3d_test")); content->set_video_frame_type (VIDEO_FRAME_TYPE_3D_LEFT_RIGHT); - film->examine_and_add_content (content); + film->examine_and_add_content (content, true); wait_for_jobs (); film->make_dcp (); wait_for_jobs (); - boost::filesystem::path const video = "build/test/recover_test/video/185_2K_3651eded785682b85f4baca4b1d3b7a9_24_bicubic_200000000_P_S_3D.mxf"; + boost::filesystem::path const video = "build/test/recover_test/video/185_2K_1918f67fe87ecfc4e8c09fe1c2dcefcc_24_bicubic_100000000_P_S_3D.mxf"; boost::filesystem::copy_file ( video,