X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Frecovery_test.cc;h=1d51a711555fda23e65c4724a266e4de43e2d556;hb=986bb0acba0aa73fc2ac0190a32e8fa8c6e636b4;hp=df9a839cbe2a3eb90f87032c958e847b0be17a02;hpb=fe95c6dfbeda97ec88ffa5e2fded883ffb609b81;p=libdcp.git

diff --git a/test/recovery_test.cc b/test/recovery_test.cc
index df9a839c..1d51a711 100644
--- a/test/recovery_test.cc
+++ b/test/recovery_test.cc
@@ -17,7 +17,14 @@
 
 */
 
-#include "picture_asset_writer.h"
+#include <boost/test/unit_test.hpp>
+#include <boost/filesystem.hpp>
+#include "mono_picture_mxf_writer.h"
+#include "mono_picture_mxf.h"
+#include "KM_util.h"
+
+using std::string;
+using boost::shared_ptr;
 
 /* Check that recovery from a partially-written MXF works */
 BOOST_AUTO_TEST_CASE (recovery)
@@ -41,12 +48,12 @@ BOOST_AUTO_TEST_CASE (recovery)
 	
 	boost::filesystem::remove_all ("build/test/baz");
 	boost::filesystem::create_directories ("build/test/baz");
-	shared_ptr<libdcp::MonoPictureAsset> mp (new libdcp::MonoPictureAsset ("build/test/baz", "video1.mxf", 24, libdcp::Size (32, 32)));
-	shared_ptr<libdcp::PictureAssetWriter> writer = mp->start_write (false);
+	shared_ptr<dcp::MonoPictureMXF> mp (new dcp::MonoPictureMXF (dcp::Fraction (24, 1)));
+	shared_ptr<dcp::PictureMXFWriter> writer = mp->start_write ("build/test/baz/video1.mxf", dcp::SMPTE, false);
 
 	int written_size = 0;
 	for (int i = 0; i < 24; ++i) {
-		libdcp::FrameInfo info = writer->write (data, size);
+		dcp::FrameInfo info = writer->write (data, size);
 		written_size = info.size;
 	}
 
@@ -69,8 +76,8 @@ BOOST_AUTO_TEST_CASE (recovery)
 	Kumu::ResetTestRNG ();
 #endif	
 
-	mp.reset (new libdcp::MonoPictureAsset ("build/test/baz", "video2.mxf", 24, libdcp::Size (32, 32)));
-	writer = mp->start_write (true);
+	mp.reset (new dcp::MonoPictureMXF (dcp::Fraction (24, 1)));
+	writer = mp->start_write ("build/test/baz/video2.mxf", dcp::SMPTE, true);
 
 	writer->write (data, size);