X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Frecover_test.cc;h=317b455205042ed80b58fb5a725ebe4248d46d6d;hp=c9a5932418252ab6246467fc8c2749483b43e8d9;hb=c5c0e55b2d2ec97a8dd96f4d3e93f85d13cc9d84;hpb=74fe68e5895654e27a7cf8097917c1e95fa89519 diff --git a/test/recover_test.cc b/test/recover_test.cc index c9a593241..317b45520 100644 --- a/test/recover_test.cc +++ b/test/recover_test.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2014 Carl Hetherington + Copyright (C) 2014-2015 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -22,7 +22,7 @@ */ #include -#include +#include #include "lib/film.h" #include "lib/dcp_content_type.h" #include "lib/image_content.h" @@ -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_e8efb95857b62aa6ff94e3d669e75776_24_bicubic_100000000_P_S_3D.mxf"; + boost::filesystem::path const video = "build/test/recover_test/video/185_2K_40c62abb30c0c1185678d71d58674459_24_100000000_P_S_3D.mxf"; boost::filesystem::copy_file ( video, @@ -69,10 +69,9 @@ BOOST_AUTO_TEST_CASE (recover_test) film->make_dcp (); wait_for_jobs (); - shared_ptr A (new dcp::StereoPictureMXF ("build/test/recover_test/original.mxf")); - shared_ptr B (new dcp::StereoPictureMXF (video)); + shared_ptr A (new dcp::StereoPictureAsset ("build/test/recover_test/original.mxf")); + shared_ptr B (new dcp::StereoPictureAsset (video)); dcp::EqualityOptions eq; - eq.mxf_names_can_differ = true; BOOST_CHECK (A->equals (B, eq, boost::bind (¬e, _1, _2))); }