X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Frecover_test.cc;h=13cb37a07c873c72fdfbb240b7f1bdccba3b8255;hb=28111007e2e6fd62f5810be780706ae1618bd33f;hp=496e31724e846a1b03db22829a9b0d9233b18821;hpb=2bdade2d90219889999c036fbf3566990fb5edd6;p=dcpomatic.git

diff --git a/test/recover_test.cc b/test/recover_test.cc
index 496e31724..13cb37a07 100644
--- a/test/recover_test.cc
+++ b/test/recover_test.cc
@@ -20,7 +20,7 @@
 
 /** @file  test/recover_test.cc
  *  @brief Test recovery of a DCP transcode after a crash.
- *  @ingroup specific
+ *  @ingroup feature
  */
 
 #include "test.h"
@@ -37,12 +37,15 @@
 
 using std::cout;
 using std::string;
-using boost::shared_ptr;
+using std::shared_ptr;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 static void
 note (dcp::NoteType t, string n)
 {
-	if (t == dcp::DCP_ERROR) {
+	if (t == dcp::NoteType::ERROR) {
 		cout << n << "\n";
 	}
 }
@@ -62,7 +65,7 @@ BOOST_AUTO_TEST_CASE (recover_test_2d)
 	film->make_dcp ();
 	BOOST_REQUIRE (!wait_for_jobs());
 
-	boost::filesystem::path const video = "build/test/recover_test_2d/video/185_2K_d4343facdd66ca71f62a964fbade89f3_24_100000000_P_S_0_1200000.mxf";
+	boost::filesystem::path const video = "build/test/recover_test_2d/video/185_2K_02543352c540f4b083bff3f1e309d4a9_24_100000000_P_S_0_1200000.mxf";
 	boost::filesystem::copy_file (
 		video,
 		"build/test/recover_test_2d/original.mxf"
@@ -97,7 +100,7 @@ BOOST_AUTO_TEST_CASE (recover_test_3d, * boost::unit_test::depends_on("recover_t
 	film->make_dcp ();
 	BOOST_REQUIRE (!wait_for_jobs());
 
-	boost::filesystem::path const video = "build/test/recover_test_3d/video/185_2K_342fe9115d2b446914b31f7602e48cc6_24_100000000_P_S_3D_0_96000.mxf";
+	boost::filesystem::path const video = "build/test/recover_test_3d/video/185_2K_70e6661af92ae94458784c16a21a9748_24_100000000_P_S_3D_0_96000.mxf";
 
 	boost::filesystem::copy_file (
 		video,
@@ -125,6 +128,7 @@ BOOST_AUTO_TEST_CASE (recover_test_2d_encrypted, * boost::unit_test::depends_on(
 	film->set_container (Ratio::from_id ("185"));
 	film->set_name ("recover_test");
 	film->set_encrypted (true);
+	film->_key = dcp::Key("eafcb91c9f5472edf01f3a2404c57258");
 
 	shared_ptr<FFmpegContent> content (new FFmpegContent("test/data/count300bd24.m2ts"));
 	film->examine_and_add_content (content);
@@ -134,7 +138,7 @@ BOOST_AUTO_TEST_CASE (recover_test_2d_encrypted, * boost::unit_test::depends_on(
 	BOOST_REQUIRE (!wait_for_jobs());
 
 	boost::filesystem::path const video =
-		"build/test/recover_test_2d_encrypted/video/185_2K_e18078ba81a58b44b62d9153460c898b_24_100000000_E_S_0_1200000.mxf";
+		"build/test/recover_test_2d_encrypted/video/185_2K_02543352c540f4b083bff3f1e309d4a9_24_100000000_Eeafcb91c9f5472edf01f3a2404c57258_S_0_1200000.mxf";
 
 	boost::filesystem::copy_file (
 		video,