Comment / tidy.

[libdcp.git] / test / recovery_test.cc

diff --git a/test/recovery_test.cc b/test/recovery_test.cc
index 277ea67899e3f6949973ec99d5def1884c29a85a..1d51a711555fda23e65c4724a266e4de43e2d556 100644 (file)
--- 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), false));
-       shared_ptr<libdcp::PictureAssetWriter> writer = mp->start_write (false, 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), false));
-       writer = mp->start_write (true, false);
+       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);