X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=test%2Frecover_test.cc;h=56a8a2f2046dd61b256c4fc9d390f0e8b041ff6b;hb=bee98cdc1ddc5f87749de3bbf2ae5e4b2ef498c3;hp=acb4acaf8c58c73c87aa2b4f6c7a9240b58b28be;hpb=034feb503b0a38eb82c21ae8d9f83522fc63a25c;p=dcpomatic.git

diff --git a/test/recover_test.cc b/test/recover_test.cc
index acb4acaf8..56a8a2f20 100644
--- a/test/recover_test.cc
+++ b/test/recover_test.cc
@@ -17,6 +17,10 @@
 
 */
 
+/** @file  test/recover_test.cc
+ *  @brief Test recovery of a DCP transcode after a crash.
+ */
+
 #include <boost/test/unit_test.hpp>
 #include <dcp/stereo_picture_mxf.h>
 #include "lib/film.h"
@@ -30,29 +34,30 @@ using std::string;
 using boost::shared_ptr;
 
 static void
-note (dcp::NoteType, string n)
+note (dcp::NoteType t, string n)
 {
-	cout << n << "\n";
+	if (t == dcp::DCP_ERROR) {
+		cout << n << "\n";
+	}
 }
 
-/** Test recovery of a DCP transcode after a crash */
 BOOST_AUTO_TEST_CASE (recover_test)
 {
 	shared_ptr<Film> 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<ImageContent> 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_aa7e8a4665281568bbe11645a3d4ba4e_24_bicubic_200000000_P_S_3D.mxf";
+	boost::filesystem::path const video = "build/test/recover_test/video/185_2K_80b0300a477c0792f2d9386482cd2ad5_24_bicubic_100000000_P_S_3D.mxf";
 
 	boost::filesystem::copy_file (
 		video,