X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Frecover_test.cc;h=f6a6e08aae45daf5bae05d54b13850861cf907ea;hb=2e9855c34f861ed59affb0cfc021f78ea5417808;hp=31b882a2eaeeeb81ca4e99450c594f96fad73798;hpb=8102046b2f29e0c7b234c29bf204b056cb30e64f;p=dcpomatic.git diff --git a/test/recover_test.cc b/test/recover_test.cc index 31b882a2e..f6a6e08aa 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,7 +44,7 @@ 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); @@ -57,7 +57,7 @@ BOOST_AUTO_TEST_CASE (recover_test) 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_e01c58c5783da57b689e65d9123ad3a3_24_bicubic_100000000_P_S_3D.mxf"; boost::filesystem::copy_file ( video, @@ -73,6 +73,6 @@ BOOST_AUTO_TEST_CASE (recover_test) shared_ptr B (new dcp::StereoPictureMXF (video)); dcp::EqualityOptions eq; - eq.mxf_names_can_differ = true; + eq.mxf_filenames_can_differ = true; BOOST_CHECK (A->equals (B, eq, boost::bind (¬e, _1, _2))); }