Asset -> MXF in some cases.

5 files changed, 18 insertions, 17 deletions

diff --git a/test/cpl_sar.cc b/test/cpl_sar.cc
index 5628363a..e280dbd3 100644
--- a/test/cpl_sar.cc
+++ b/test/cpl_sar.cc
@@ -20,7 +20,7 @@
 #include <boost/test/unit_test.hpp>
 #include <libcxml/cxml.h>
 #include "cpl.h"
-#include "mono_picture_asset.h"
+#include "mono_picture_mxf.h"
 
 using boost::shared_ptr;
 
@@ -29,7 +29,7 @@ using boost::shared_ptr;
 */
 BOOST_AUTO_TEST_CASE (cpl_sar)
 {
-	shared_ptr<dcp::MonoPictureAsset> mp (new dcp::MonoPictureAsset ("build/test/foo", "video.mxf"));
+	shared_ptr<dcp::MonoPictureMXF> mp (new dcp::MonoPictureMXF ("build/test/foo", "video.mxf"));
 	mp->set_interop (true);
 
 	{
diff --git a/test/decryption_test.cc b/test/decryption_test.cc
index 5fd29c6c..b1cb5265 100644
--- a/test/decryption_test.cc
+++ b/test/decryption_test.cc
@@ -23,7 +23,7 @@
 #include "mono_picture_frame.h"
 #include "cpl.h"
 #include "argb_frame.h"
-#include "mono_picture_asset.h"
+#include "mono_picture_mxf.h"
 #include "reel.h"
 #include "test.h"
 
@@ -34,10 +34,10 @@ static shared_ptr<const dcp::ARGBFrame>
 get_frame (dcp::DCP const & dcp)
 {
 	shared_ptr<const dcp::Reel> reel = dcp.cpls().front()->reels().front ();
-	shared_ptr<const dcp::PictureAsset> picture = reel->main_picture ();
+	shared_ptr<const dcp::PictureMXF> picture = reel->main_picture ();
 	BOOST_CHECK (picture);
 
-	shared_ptr<const dcp::MonoPictureAsset> mono_picture = dynamic_pointer_cast<const dcp::MonoPictureAsset> (picture);
+	shared_ptr<const dcp::MonoPictureMXF> mono_picture = dynamic_pointer_cast<const dcp::MonoPictureMXF> (picture);
 	shared_ptr<const dcp::MonoPictureFrame> j2k_frame = mono_picture->get_frame (0);
 	return j2k_frame->argb_frame ();
 }
diff --git a/test/frame_info_test.cc b/test/frame_info_test.cc
index bf4181a0..02ff83aa 100644
--- a/test/frame_info_test.cc
+++ b/test/frame_info_test.cc
@@ -19,7 +19,8 @@
 
 #include <fstream>
 #include <boost/test/unit_test.hpp>
-#include "picture_asset_writer.h"
+#include "picture_mxf.h"
+#include "picture_mxf_writer.h"
 
 using namespace std;
 
diff --git a/test/recovery_test.cc b/test/recovery_test.cc
index 27a4c150..4cde723f 100644
--- a/test/recovery_test.cc
+++ b/test/recovery_test.cc
@@ -19,8 +19,8 @@
 
 #include <boost/test/unit_test.hpp>
 #include <boost/filesystem.hpp>
-#include "mono_picture_asset_writer.h"
-#include "mono_picture_asset.h"
+#include "mono_picture_mxf_writer.h"
+#include "mono_picture_mxf.h"
 #include "KM_util.h"
 
 using std::string;
@@ -48,10 +48,10 @@ BOOST_AUTO_TEST_CASE (recovery)
 	
 	boost::filesystem::remove_all ("build/test/baz");
 	boost::filesystem::create_directories ("build/test/baz");
-	shared_ptr<dcp::MonoPictureAsset> mp (new dcp::MonoPictureAsset ("build/test/baz", "video1.mxf"));
+	shared_ptr<dcp::MonoPictureMXF> mp (new dcp::MonoPictureMXF ("build/test/baz", "video1.mxf"));
 	mp->set_edit_rate (24);
 	mp->set_size (dcp::Size (32, 32));
-	shared_ptr<dcp::PictureAssetWriter> writer = mp->start_write (false);
+	shared_ptr<dcp::PictureMXFWriter> writer = mp->start_write (false);
 
 	int written_size = 0;
 	for (int i = 0; i < 24; ++i) {
@@ -78,7 +78,7 @@ BOOST_AUTO_TEST_CASE (recovery)
 	Kumu::ResetTestRNG ();
 #endif	
 
-	mp.reset (new dcp::MonoPictureAsset ("build/test/baz", "video2.mxf"));
+	mp.reset (new dcp::MonoPictureMXF ("build/test/baz", "video2.mxf"));
 	mp->set_edit_rate (24);
 	mp->set_size (dcp::Size (32, 32));
 	writer = mp->start_write (true);
diff --git a/test/round_trip_test.cc b/test/round_trip_test.cc
index 51edf111..0e6fe5f5 100644
--- a/test/round_trip_test.cc
+++ b/test/round_trip_test.cc
@@ -22,8 +22,8 @@
 #include "certificates.h"
 #include "kdm.h"
 #include "signer.h"
-#include "mono_picture_asset.h"
-#include "sound_asset.h"
+#include "mono_picture_mxf.h"
+#include "sound_mxf.h"
 #include "reel.h"
 #include "test.h"
 #include "cpl.h"
@@ -56,7 +56,7 @@ BOOST_AUTO_TEST_CASE (round_trip_test)
 	boost::filesystem::path work_dir = "build/test/round_trip_test";
 	boost::filesystem::create_directory (work_dir);
 
-	shared_ptr<dcp::MonoPictureAsset> asset_A (new dcp::MonoPictureAsset (work_dir, "video.mxf"));
+	shared_ptr<dcp::MonoPictureMXF> asset_A (new dcp::MonoPictureMXF (work_dir, "video.mxf"));
 	asset_A->set_edit_rate (24);
 	asset_A->set_intrinsic_duration (24);
 	asset_A->set_size (dcp::Size (32, 32));
@@ -67,7 +67,7 @@ BOOST_AUTO_TEST_CASE (round_trip_test)
 	asset_A->set_key (key);
 
 	shared_ptr<dcp::CPL> cpl (new dcp::CPL (work_dir, "A Test DCP", dcp::FEATURE, 24, 24));
-	cpl->add_reel (shared_ptr<dcp::Reel> (new dcp::Reel (asset_A, shared_ptr<dcp::SoundAsset> (), shared_ptr<dcp::SubtitleAsset> ())));
+	cpl->add_reel (shared_ptr<dcp::Reel> (new dcp::Reel (asset_A, shared_ptr<dcp::SoundMXF> (), shared_ptr<dcp::SubtitleAsset> ())));
 
 	/* A KDM using our certificate chain's leaf key pair */
 	dcp::KDM kdm_A (
@@ -100,8 +100,8 @@ BOOST_AUTO_TEST_CASE (round_trip_test)
 	}
 
 	/* Reload the picture MXF */
-	shared_ptr<dcp::MonoPictureAsset> asset_B (
-		new dcp::MonoPictureAsset (work_dir, "video.mxf")
+	shared_ptr<dcp::MonoPictureMXF> asset_B (
+		new dcp::MonoPictureMXF (work_dir, "video.mxf")
 		);
 
 	asset_B->set_key (kdm_B.keys().front().key());