Replace dcp::File with dcp::ArrayData.

5 files changed, 6 insertions, 11 deletions

diff --git a/test/dcp_test.cc b/test/dcp_test.cc
index cf8d91c8..3f395c53 100644
--- a/test/dcp_test.cc
+++ b/test/dcp_test.cc
@@ -43,7 +43,6 @@
 #include "atmos_asset.h"
 #include "reel.h"
 #include "test.h"
-#include "file.h"
 #include "reel_mono_picture_asset.h"
 #include "reel_stereo_picture_asset.h"
 #include "reel_sound_asset.h"
@@ -100,7 +99,7 @@ BOOST_AUTO_TEST_CASE (dcp_test2)
 	shared_ptr<dcp::StereoPictureAsset> mp (new dcp::StereoPictureAsset (dcp::Fraction (24, 1), dcp::SMPTE));
 	mp->set_metadata (mxf_meta);
 	shared_ptr<dcp::PictureAssetWriter> picture_writer = mp->start_write ("build/test/DCP/dcp_test2/video.mxf", false);
-	dcp::File j2c ("test/data/flat_red.j2c");
+	dcp::ArrayData j2c ("test/data/flat_red.j2c");
 	for (int i = 0; i < 24; ++i) {
 		/* Left */
 		picture_writer->write (j2c.data (), j2c.size ());
@@ -282,7 +281,7 @@ BOOST_AUTO_TEST_CASE (dcp_test5)
 	shared_ptr<dcp::MonoPictureAsset> mp (new dcp::MonoPictureAsset (dcp::Fraction (24, 1), dcp::SMPTE));
 	mp->set_metadata (mxf_meta);
 	shared_ptr<dcp::PictureAssetWriter> picture_writer = mp->start_write ("build/test/DCP/dcp_test5/video.mxf", false);
-	dcp::File j2c ("test/data/flat_red.j2c");
+	dcp::ArrayData j2c ("test/data/flat_red.j2c");
 	for (int i = 0; i < 24; ++i) {
 		picture_writer->write (j2c.data (), j2c.size ());
 	}
diff --git a/test/encryption_test.cc b/test/encryption_test.cc
index 7bf83c4c..0cba37fc 100644
--- a/test/encryption_test.cc
+++ b/test/encryption_test.cc
@@ -42,7 +42,6 @@
 #include "sound_asset.h"
 #include "reel.h"
 #include "test.h"
-#include "file.h"
 #include "subtitle_asset.h"
 #include "reel_mono_picture_asset.h"
 #include "reel_sound_asset.h"
@@ -92,7 +91,7 @@ BOOST_AUTO_TEST_CASE (encryption_test)
 	mp->set_key (key);
 
 	shared_ptr<dcp::PictureAssetWriter> writer = mp->start_write ("build/test/DCP/encryption_test/video.mxf", false);
-	dcp::File j2c ("test/data/flat_red.j2c");
+	dcp::ArrayData j2c ("test/data/flat_red.j2c");
 	for (int i = 0; i < 24; ++i) {
 		writer->write (j2c.data (), j2c.size ());
 	}
diff --git a/test/kdm_test.cc b/test/kdm_test.cc
index 63b65ad8..6e0dcb67 100644
--- a/test/kdm_test.cc
+++ b/test/kdm_test.cc
@@ -40,7 +40,6 @@
 #include "mono_picture_asset.h"
 #include "reel_mono_picture_asset.h"
 #include "reel.h"
-#include "file.h"
 #include "types.h"
 #include "picture_asset_writer.h"
 #include <libcxml/cxml.h>
@@ -241,7 +240,7 @@ BOOST_AUTO_TEST_CASE (validity_period_test1)
 	auto asset = make_shared<dcp::MonoPictureAsset>(dcp::Fraction(24, 1), dcp::SMPTE);
 	asset->set_key (dcp::Key());
 	auto writer = asset->start_write ("build/test/validity_period_test1.mxf", false);
-	dcp::File frame ("test/data/flat_red.j2c");
+	dcp::ArrayData frame ("test/data/flat_red.j2c");
 	writer->write (frame.data(), frame.size());
 	auto reel = make_shared<dcp::Reel>();
 	reel->add(make_shared<dcp::ReelMonoPictureAsset>(asset, 0));
diff --git a/test/round_trip_test.cc b/test/round_trip_test.cc
index 2e7984ca..3fa61fd0 100644
--- a/test/round_trip_test.cc
+++ b/test/round_trip_test.cc
@@ -46,7 +46,6 @@
 #include "mono_picture_asset_reader.h"
 #include "reel_picture_asset.h"
 #include "reel_mono_picture_asset.h"
-#include "file.h"
 #include "openjpeg_image.h"
 #include "rgb_xyz.h"
 #include "colour_conversion.h"
@@ -70,7 +69,7 @@ BOOST_AUTO_TEST_CASE (round_trip_test)
 
 	shared_ptr<dcp::MonoPictureAsset> asset_A (new dcp::MonoPictureAsset (dcp::Fraction (24, 1), dcp::SMPTE));
 	shared_ptr<dcp::PictureAssetWriter> writer = asset_A->start_write (work_dir / "video.mxf", false);
-	dcp::File j2c ("test/data/flat_red.j2c");
+	dcp::ArrayData j2c ("test/data/flat_red.j2c");
 	for (int i = 0; i < 24; ++i) {
 		writer->write (j2c.data (), j2c.size ());
 	}
diff --git a/test/test.cc b/test/test.cc
index 9f285dbc..af005e50 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -36,7 +36,6 @@
 #include "compose.hpp"
 #include "cpl.h"
 #include "dcp.h"
-#include "file.h"
 #include "interop_subtitle_asset.h"
 #include "mono_picture_asset.h"
 #include "picture_asset_writer.h"
@@ -267,7 +266,7 @@ simple_picture (boost::filesystem::path path, string suffix)
 	shared_ptr<dcp::MonoPictureAsset> mp (new dcp::MonoPictureAsset (dcp::Fraction (24, 1), dcp::SMPTE));
 	mp->set_metadata (mxf_meta);
 	shared_ptr<dcp::PictureAssetWriter> picture_writer = mp->start_write (path / dcp::String::compose("video%1.mxf", suffix), false);
-	dcp::File j2c ("test/data/flat_red.j2c");
+	dcp::ArrayData j2c ("test/data/flat_red.j2c");
 	for (int i = 0; i < 24; ++i) {
 		picture_writer->write (j2c.data (), j2c.size ());
 	}